diff --git a/src/commands/CmdUDAs.cpp b/src/commands/CmdUDAs.cpp
index 179854da3..5b06c7d75 100644
--- a/src/commands/CmdUDAs.cpp
+++ b/src/commands/CmdUDAs.cpp
@@ -35,7 +35,6 @@
 #include <format.h>
 #include <shared.h>
 #include <util.h>
-#include <i18n.h>
 
 extern Context context;
 
@@ -86,12 +85,12 @@ int CmdUDAs::execute (std::string& output)
     // possible default value, and finally the usage count.
     Table table;
     table.width (context.getWidth ());
-    table.add (STRING_COLUMN_LABEL_UDA);
+    table.add ("Name");
     table.add ("Type");
-    table.add (STRING_COLUMN_LABEL_LABEL);
-    table.add (STRING_COLUMN_LABEL_VALUES);
+    table.add ("Label");
+    table.add ("Allowed Values");
     table.add ("Default");
-    table.add (STRING_COLUMN_LABEL_UDACOUNT);
+    table.add ("Usage Count");
     setHeaderUnderline (table);
 
     for (auto& uda : udas)
@@ -147,8 +146,8 @@ int CmdUDAs::execute (std::string& output)
     // Display the orphans and their counts.
     Table orphanTable;
     orphanTable.width (context.getWidth ());
-    orphanTable.add (STRING_COLUMN_LABEL_ORPHAN);
-    orphanTable.add (STRING_COLUMN_LABEL_UDACOUNT);
+    orphanTable.add ("Orphan UDA");
+    orphanTable.add ("Usage Count");
     setHeaderUnderline (orphanTable);
 
     for (auto& o : orphans)
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index d9d0e47e8..9809fa8f5 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_LABEL    "Beschreibung"
 #define STRING_COLUMN_LABEL_MOD      "Geändert"
-#define STRING_COLUMN_LABEL_ORPHAN   "Verwaiste UDA"
 #define STRING_COLUMN_LABEL_RECUR    "Wiederh."
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STAT_C   "E"
@@ -43,13 +41,10 @@
 #define STRING_COLUMN_LABEL_STAT_W   "A"
 #define STRING_COLUMN_LABEL_STAT_WA  "Wartet"
 #define STRING_COLUMN_LABEL_TAG      "Schlagwort"
-#define STRING_COLUMN_LABEL_UDA      "Name"
-#define STRING_COLUMN_LABEL_UDACOUNT "Nutzungshäufigkeit"
 #define STRING_COLUMN_LABEL_UNTIL    "Bis"
-#define STRING_COLUMN_LABEL_URGENCY  "Dringlichkeit"
-#define STRING_COLUMN_LABEL_UUID     "UUID"
-#define STRING_COLUMN_LABEL_VALUE    "Wert"
-#define STRING_COLUMN_LABEL_VALUES   "Erlaubte Werte"
+#define string_column_label_urgency  "dringlichkeit"
+#define string_column_label_uuid     "uuid"
+#define string_column_label_value    "wert"
 #define STRING_FEEDBACK_ANN_ADD      "Kommentar von '{1}' hinzugefügt."
 #define STRING_FEEDBACK_ANN_DEL      "Kommentar '{1}' gelöscht."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Kommentar zu '{1}' geändert."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 861d465df..531a69c02 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_LABEL    "Label"
 #define STRING_COLUMN_LABEL_MOD      "Modified"
-#define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
@@ -43,13 +41,10 @@
 #define STRING_COLUMN_LABEL_STAT_W   "W"
 #define STRING_COLUMN_LABEL_STAT_WA  "Waiting"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
-#define STRING_COLUMN_LABEL_UDA      "Name"
-#define STRING_COLUMN_LABEL_UDACOUNT "Usage Count"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgency"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Value"
-#define STRING_COLUMN_LABEL_VALUES   "Allowed Values"
 #define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
 #define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotation changed to '{1}'."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index e84b2d6ce..ea7603147 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_LABEL    "Label"
 #define STRING_COLUMN_LABEL_MOD      "Modified"
-#define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STAT_C   "Fn"
@@ -43,13 +41,10 @@
 #define STRING_COLUMN_LABEL_STAT_W   "At"
 #define STRING_COLUMN_LABEL_STAT_WA  "Atendanta"
 #define STRING_COLUMN_LABEL_TAG      "Etik"
-#define STRING_COLUMN_LABEL_UDA      "Nomo"
-#define STRING_COLUMN_LABEL_UDACOUNT "Nombro de uzoj"
 #define STRING_COLUMN_LABEL_UNTIL    "Ĝis"
 #define STRING_COLUMN_LABEL_URGENCY  "Urĝeco"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Valoro"
-#define STRING_COLUMN_LABEL_VALUES   "Valoroj permesataj"
 #define STRING_FEEDBACK_ANN_ADD      "Aldonis komenton '{1}'."
 #define STRING_FEEDBACK_ANN_DEL      "Viŝis komenton '{1}'."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Komento iĝis '{1}'."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index c5ab019b3..8996329a5 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_LABEL    "Etiqueta"
 #define STRING_COLUMN_LABEL_MOD      "Modificada"
-#define STRING_COLUMN_LABEL_ORPHAN   "UDA huérfano"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_STAT     "Est"
 #define STRING_COLUMN_LABEL_STAT_C   "C"  // |esp-ESP|==|eng-USA|
@@ -43,13 +41,10 @@
 #define STRING_COLUMN_LABEL_STAT_W   "E"
 #define STRING_COLUMN_LABEL_STAT_WA  "Esperando"
 #define STRING_COLUMN_LABEL_TAG      "Marca"
-#define STRING_COLUMN_LABEL_UDA      "Nombre"
-#define STRING_COLUMN_LABEL_UDACOUNT "Recuento de uso"
 #define STRING_COLUMN_LABEL_UNTIL    "Hasta"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgencia"
 #define STRING_COLUMN_LABEL_UUID     "UUID"  // |esp-ESP|==|eng-USA|
 #define STRING_COLUMN_LABEL_VALUE    "Valor"
-#define STRING_COLUMN_LABEL_VALUES   "Valores permitidos"
 #define STRING_FEEDBACK_ANN_ADD      "Anotación de '{1}' añadida."
 #define STRING_FEEDBACK_ANN_DEL      "Anotación '{1}' eliminada."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Anotación cambiada a '{1}'."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 2439efcca..2c0034c94 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_LABEL    "Étiq"
 #define STRING_COLUMN_LABEL_MOD      "Modifiée"
-#define STRING_COLUMN_LABEL_ORPHAN   "ADU orphelins"
 #define STRING_COLUMN_LABEL_RECUR    "Récur"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
@@ -43,13 +41,10 @@
 #define STRING_COLUMN_LABEL_STAT_W   "A"
 #define STRING_COLUMN_LABEL_STAT_WA  "En attente"
 #define STRING_COLUMN_LABEL_TAG      "Étiq"
-#define STRING_COLUMN_LABEL_UDA      "Nom"
-#define STRING_COLUMN_LABEL_UDACOUNT "Compte d’utilisation"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgence"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Valeur"
-#define STRING_COLUMN_LABEL_VALUES   "Valeurs autorisées"
 #define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
 #define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotation changed to '{1}'."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index d01452550..2f8a3e27c 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_LABEL    "Etichetta"
 #define STRING_COLUMN_LABEL_MOD      "Modificato"
-#define STRING_COLUMN_LABEL_ORPHAN   "UDA Orfano"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
@@ -43,13 +41,10 @@
 #define STRING_COLUMN_LABEL_STAT_W   "W"
 #define STRING_COLUMN_LABEL_STAT_WA  "In attesa"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
-#define STRING_COLUMN_LABEL_UDA      "Nome"
-#define STRING_COLUMN_LABEL_UDACOUNT "Conteggio Uso"
 #define STRING_COLUMN_LABEL_UNTIL    "Fino a"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgenza"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Valore"
-#define STRING_COLUMN_LABEL_VALUES   "Valori consentiti"
 #define STRING_FEEDBACK_ANN_ADD      "Annotazione di '{1}' aggiunta."
 #define STRING_FEEDBACK_ANN_DEL      "Annotazione '{1}' cancellata."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotazione modificata in '{1}'."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index f9f214329..a5b00e197 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_LABEL    "Label"
 #define STRING_COLUMN_LABEL_MOD      "Modified"
-#define STRING_COLUMN_LABEL_ORPHAN   "Orphan UDA"
 #define STRING_COLUMN_LABEL_RECUR    "Recur"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
@@ -43,13 +41,10 @@
 #define STRING_COLUMN_LABEL_STAT_W   "W"
 #define STRING_COLUMN_LABEL_STAT_WA  "Waiting"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
-#define STRING_COLUMN_LABEL_UDA      "Name"
-#define STRING_COLUMN_LABEL_UDACOUNT "Usage Count"
 #define STRING_COLUMN_LABEL_UNTIL    "Until"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgency"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Value"
-#define STRING_COLUMN_LABEL_VALUES   "Allowed Values"
 #define STRING_FEEDBACK_ANN_ADD      "Annotation of '{1}' added."
 #define STRING_FEEDBACK_ANN_DEL      "Annotation '{1}' deleted."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Annotation changed to '{1}'."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 5512a9ec4..9ab876592 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_LABEL    "Etykieta"
 #define STRING_COLUMN_LABEL_MOD      "Zmienione"
-#define STRING_COLUMN_LABEL_ORPHAN   "Osierocone UDA"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_STAT     "St"
 #define STRING_COLUMN_LABEL_STAT_C   "C"
@@ -43,13 +41,10 @@
 #define STRING_COLUMN_LABEL_STAT_W   "W"
 #define STRING_COLUMN_LABEL_STAT_WA  "Zawieszone"
 #define STRING_COLUMN_LABEL_TAG      "Tag"
-#define STRING_COLUMN_LABEL_UDA      "Nazwa"
-#define STRING_COLUMN_LABEL_UDACOUNT "Licznik Użycia"
 #define STRING_COLUMN_LABEL_UNTIL    "Do"
 #define STRING_COLUMN_LABEL_URGENCY  "Pilność"
 #define STRING_COLUMN_LABEL_UUID     "UUID"
 #define STRING_COLUMN_LABEL_VALUE    "Wartość"
-#define STRING_COLUMN_LABEL_VALUES   "Dozwolone Wartości"
 #define STRING_FEEDBACK_ANN_ADD      "Notatka '{1}' dodana."
 #define STRING_FEEDBACK_ANN_DEL      "Notatka '{1}' usunięta."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Notatka zmieniona na '{1}'."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index a0057c4ce..996d0c4d5 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -27,9 +27,7 @@
 #ifndef INCLUDED_STRINGS
 #define INCLUDED_STRINGS
 
-#define STRING_COLUMN_LABEL_LABEL    "Rótulo"
 #define STRING_COLUMN_LABEL_MOD      "Modificada"
-#define STRING_COLUMN_LABEL_ORPHAN   "UDA Orfão"
 #define STRING_COLUMN_LABEL_RECUR    "Period"
 #define STRING_COLUMN_LABEL_STAT     "Es"
 #define STRING_COLUMN_LABEL_STAT_C   "C"  // |por-PRT|==|eng-USA|
@@ -43,13 +41,10 @@
 #define STRING_COLUMN_LABEL_STAT_W   "A"
 #define STRING_COLUMN_LABEL_STAT_WA  "Adiadas"
 #define STRING_COLUMN_LABEL_TAG      "Marca"
-#define STRING_COLUMN_LABEL_UDA      "Nome"
-#define STRING_COLUMN_LABEL_UDACOUNT "Contagem de Uso"
 #define STRING_COLUMN_LABEL_UNTIL    "Até"
 #define STRING_COLUMN_LABEL_URGENCY  "Urgência"
 #define STRING_COLUMN_LABEL_UUID     "UUID"  // |por-PRT|==|eng-USA|
 #define STRING_COLUMN_LABEL_VALUE    "Valor"
-#define STRING_COLUMN_LABEL_VALUES   "Valores Permitidos"
 #define STRING_FEEDBACK_ANN_ADD      "Adicionada anotação de '{1}'."
 #define STRING_FEEDBACK_ANN_DEL      "Eliminada anotação '{1}'."
 #define STRING_FEEDBACK_ANN_WAS_MOD  "Anotação alterada para '{1}'."