diff --git a/addressbook/inc/class.addressbook_bo.inc.php b/addressbook/inc/class.addressbook_bo.inc.php index e38b5effcf..6ae016cae0 100755 --- a/addressbook/inc/class.addressbook_bo.inc.php +++ b/addressbook/inc/class.addressbook_bo.inc.php @@ -211,7 +211,7 @@ class addressbook_bo extends addressbook_so 'adr_one_region' => lang('state').' ('.lang('business').')', 'adr_one_postalcode' => lang('zip code').' ('.lang('business').')', 'adr_one_countryname' => lang('country').' ('.lang('business').')', - 'adr_one_countrycode' => lang('country').' ('.lang('business').')', + 'adr_one_countrycode' => lang('country code').' ('.lang('business').')', 'label' => lang('label'), 'adr_two_street' => lang('street').' ('.lang('private').')', 'adr_two_street2' => lang('address line 2').' ('.lang('private').')', @@ -219,7 +219,7 @@ class addressbook_bo extends addressbook_so 'adr_two_region' => lang('state').' ('.lang('private').')', 'adr_two_postalcode' => lang('zip code').' ('.lang('private').')', 'adr_two_countryname' => lang('country').' ('.lang('private').')', - 'adr_two_countrycode' => lang('country').' ('.lang('private').')', + 'adr_two_countrycode' => lang('country code').' ('.lang('private').')', 'tel_work' => lang('work phone'), 'tel_cell' => lang('mobile phone'), 'tel_fax' => lang('fax').' ('.lang('business').')', diff --git a/addressbook/lang/egw_en.lang b/addressbook/lang/egw_en.lang index da43cfe546..e27aa4121e 100644 --- a/addressbook/lang/egw_en.lang +++ b/addressbook/lang/egw_en.lang @@ -124,6 +124,7 @@ copied by %1, from record #%2. addressbook en Copied by %1, from record #%2. copy a contact and edit the copy addressbook en Copy a contact and edit the copy copy your changes to the clipboard, %1reload the entry%2 and merge them. addressbook en Copy your changes to the clipboard, %1reload the entry%2 and merge them. country common en Country +country code addressbook en Country code create new links addressbook en Create new links created addressbook en Created credit addressbook en Credit diff --git a/addressbook/setup/importexport_default.xml b/addressbook/setup/importexport_default.xml index ceb0e72290..c5ce4f243c 100644 --- a/addressbook/setup/importexport_default.xml +++ b/addressbook/setup/importexport_default.xml @@ -41,7 +41,7 @@ State (Business) ZIP Code (Business) Country (Business) - Country (Business) + country code (Business) Label Street (Private) Address Line 2 (Private) @@ -49,7 +49,7 @@ State (Private) ZIP Code (Private) Country (Private) - Country (Private) + country code (Private) Work Phone Mobile Phone Fax (Business) @@ -84,6 +84,7 @@ 1 + 2011-03-14 13:31:29 import-addressbook @@ -245,6 +246,7 @@ -1 0 + 2011-02-03 11:02:34