From d0e46b7a6faf46eb0f09e81e8f25ef7d6c38b2b6 Mon Sep 17 00:00:00 2001
From: PhilW <roundcube@tehinterweb.co.uk>
Date: Sat, 1 Jun 2024 13:12:44 +0100
Subject: [PATCH] remove unwanted label

---
 program/actions/contacts/import.php   | 4 ++--
 program/localization/en_US/labels.inc | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/program/actions/contacts/import.php b/program/actions/contacts/import.php
index a8ce4d2130f..b75b0453f7b 100644
--- a/program/actions/contacts/import.php
+++ b/program/actions/contacts/import.php
@@ -381,10 +381,10 @@ public static function import_map($attrib)
                 for ($i = 0; $i < count($field['subtypes']); $i++) {
                     if (!empty($field['childs'])) {
                         foreach ($field['childs'] as $cid => $child) {
-                            $available_fields[$cid . ':' . $field['subtypes'][$i]] = $rcmail->gettext(['name' => 'contactaddressfieldtype', 'vars' => ['field' => $child['label'], 'subtype' => $subtype_names[$i]]]);
+                            $available_fields[$cid . ':' . $field['subtypes'][$i]] = $child['label'] . ' - ' . $subtype_names[$i];
                         }
                     } else {
-                        $available_fields[$id . ':' . $field['subtypes'][$i]] = $rcmail->gettext(['name' => 'contactfieldsubtype', 'vars' => ['field' => $field['label'], 'subtype' => $subtype_names[$i]]]);
+                        $available_fields[$id . ':' . $field['subtypes'][$i]] = $field['label'] . ' - ' . $subtype_names[$i];
                     }
                 }
             } else {
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index f3292564e98..781063f5c5a 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -507,8 +507,6 @@ $labels['importmapdesc'] = 'Confirm the field mapping information below is corre
 $labels['fieldnotmapped'] = 'Field not mapped (do not import)';
 $labels['skipheader'] = 'Do not import first line (headers)';
 $labels['done'] = 'Done';
-$labels['contactfieldsubtype'] = '$field $subtype';
-$labels['contactaddressfieldtype'] = '$subtype $field';
 $labels['birth_day'] = 'Birth Day';
 $labels['birth_month'] = 'Birth Month';
 $labels['birth_year'] = 'Birth Year';