diff --git a/addressbook/lang/egw_de.lang b/addressbook/lang/egw_de.lang index 38faa78796..42b00eda2c 100644 --- a/addressbook/lang/egw_de.lang +++ b/addressbook/lang/egw_de.lang @@ -419,6 +419,7 @@ prevent deleting of contacts admin de Das Löschen von Adressen verhindern private address addressbook de Privatadresse private custom fields addressbook de Private Benutzerdefinierte Felder public key addressbook de öffentlicher Schlüssel +public sharing url addressbook de Geteilt mit Link publish into groups: addressbook de In folgenden Gruppen veröffentlichen: read a list / search for entries. addressbook de Lese die Liste / Suche nach Einträgen read a list of entries. addressbook de Liest eine Liste von Einträgen. diff --git a/addressbook/lang/egw_en.lang b/addressbook/lang/egw_en.lang index e4a423ef86..871eb6fa46 100644 --- a/addressbook/lang/egw_en.lang +++ b/addressbook/lang/egw_en.lang @@ -419,6 +419,7 @@ prevent deleting of contacts admin en Prevent deleting of contacts private address addressbook en Private address private custom fields addressbook en Private custom fields public key addressbook en Public key +public sharing url addressbook en Public sharing URL publish into groups: addressbook en Publish into groups: read a list / search for entries. addressbook en Read a list / search for entries. read a list of entries. addressbook en Read a list of entries. diff --git a/api/src/Contacts/Merge.php b/api/src/Contacts/Merge.php index 169e233abc..2a4295511e 100644 --- a/api/src/Contacts/Merge.php +++ b/api/src/Contacts/Merge.php @@ -203,7 +203,7 @@ class Merge extends Api\Storage\Merge $group = 'private'; break; case 'tel_work': - $group = 'phone'; + $group = 'phone numbers'; break; case 'email': case 'email_home': @@ -232,16 +232,16 @@ class Merge extends Api\Storage\Merge // Correctly formatted address by country / preference $placeholders['business'][] = [ 'value' => $this->prefix($prefix, 'adr_one_formatted', '{'), - 'label' => "Formatted business address" + 'label' => lang('Formatted business address') ]; $placeholders['private'][] = [ 'value' => $this->prefix($prefix, 'adr_two_formatted', '{'), - 'label' => "Formatted private address" + 'label' => lang('Formatted private address') ]; $placeholders['EPL only'][] = [ 'value' => $this->prefix($prefix, 'share', '{'), - 'label' => 'Public sharing URL' + 'label' => lang('Public sharing URL') ]; $this->add_customfield_placeholders($placeholders, $prefix); diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php index 93d8e696d2..57906cb9bf 100644 --- a/api/src/Storage/Merge.php +++ b/api/src/Storage/Merge.php @@ -3118,7 +3118,7 @@ abstract class Merge } else { - $placeholders['customfields'][] = [ + $placeholders['custom fields'][] = [ 'value' => $this->prefix($prefix, '#' . $name, '{'), 'label' => $field['label'] . ($field['type'] == 'select-account' ? '*' : '') ]; @@ -3294,7 +3294,7 @@ abstract class Merge else { $new_list[] = [ - 'title' => ($title_prefix ? $title_prefix . ': ' : '') . $group_title, + 'title' => ($title_prefix ? lang($title_prefix) . ': ' : '') . lang($group_title), 'placeholders' => $group_placeholders ]; }