From 0501b637a3177cce441166b5fcfe27c9bd9fbe0f Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 18 Jan 2011 18:00:57 +0000
Subject: Merge branch devel-addressbook (r4193:4382) back into trunk

---
 program/localization/en_US/labels.inc   | 39 ++++++++++++++++++++++++++++-----
 program/localization/en_US/messages.inc |  3 ++-
 2 files changed, 36 insertions(+), 6 deletions(-)

(limited to 'program/localization')

diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index e2e23c4a1..59e396f2b 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -243,11 +243,38 @@ $labels['yourmessage'] = 'This is a Return Receipt for your message';
 $labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
 
 // address boook
-$labels['name']      = 'Display name';
-$labels['firstname'] = 'First name';
-$labels['surname']   = 'Last name';
-$labels['email']     = 'E-Mail';
-
+$labels['name']         = 'Display name';
+$labels['firstname']    = 'First name';
+$labels['surname']      = 'Last name';
+$labels['middlename']   = 'Middle name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job title';
+$labels['organization'] = 'Company';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden name';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'Zip code';
+$labels['region']       = 'Region';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Add new contact';
 $labels['editcontact'] = 'Edit contact';
 $labels['contacts'] = 'Contacts';
@@ -258,6 +285,8 @@ $labels['cancel'] = 'Cancel';
 $labels['save']   = 'Save';
 $labels['delete'] = 'Delete';
 $labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
 
 $labels['newcontact']     = 'Create new contact card';
 $labels['deletecontact']  = 'Delete selected contacts';
diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc
index cca6e916a..df347d1db 100644
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@@ -104,7 +104,7 @@ $messages['forbiddencharacter'] = 'Folder name contains a forbidden character';
 $messages['selectimportfile'] = 'Please select a file to upload';
 $messages['addresswriterror'] = 'The selected address book is not writeable';
 $messages['contactaddedtogroup'] = 'Successfully added the contacts to this group';
-$messages['contactremovedfromgroup'] = 'Successfully remove contacts from this group';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group';
 $messages['importwait'] = 'Importing, please wait...';
 $messages['importerror'] = 'Import failed! The uploaded file is not a valid vCard file.';
 $messages['importconfirm'] = '<b>Successfully imported $inserted contacts, $skipped existing entries skipped</b>:<p><em>$names</em></p>';
@@ -137,5 +137,6 @@ $messages['namecannotbeempty'] = 'Name cannot be empty';
 $messages['nametoolong'] = 'Name is too long';
 $messages['folderupdated'] = 'Folder updated successfully';
 $messages['foldercreated'] = 'Folder created successfully';
+$messages['invalidimageformat'] = 'Not a valid image format';
 
 ?>
-- 
cgit v1.2.3