diff --git a/addressbook/inc/class.addressbook_bo.inc.php b/addressbook/inc/class.addressbook_bo.inc.php
index 80ca74b604..6a5aff80b8 100755
--- a/addressbook/inc/class.addressbook_bo.inc.php
+++ b/addressbook/inc/class.addressbook_bo.inc.php
@@ -205,36 +205,36 @@ class addressbook_bo extends addressbook_so
'role' => lang('role'),
'assistent' => lang('Assistent'),
'room' => lang('Room'),
- 'adr_one_street' => lang('street').' ('.lang('business').')',
- 'adr_one_street2' => lang('address line 2').' ('.lang('business').')',
- 'adr_one_locality' => lang('city').' ('.lang('business').')',
- '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 code').' ('.lang('business').')',
+ 'adr_one_street' => lang('business street'),
+ 'adr_one_street2' => lang('business address line 2'),
+ 'adr_one_locality' => lang('business city'),
+ 'adr_one_region' => lang('business state'),
+ 'adr_one_postalcode' => lang('business zip code'),
+ 'adr_one_countryname' => lang('business country'),
+ 'adr_one_countrycode' => lang('business country code'),
'label' => lang('label'),
- 'adr_two_street' => lang('street').' ('.lang('private').')',
- 'adr_two_street2' => lang('address line 2').' ('.lang('private').')',
- 'adr_two_locality' => lang('city').' ('.lang('private').')',
- '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 code').' ('.lang('private').')',
+ 'adr_two_street' => lang('street (private)'),
+ 'adr_two_street2' => lang('address line 2 (private)'),
+ 'adr_two_locality' => lang('city (private)'),
+ 'adr_two_region' => lang('state (private)'),
+ 'adr_two_postalcode' => lang('zip code (private)'),
+ 'adr_two_countryname' => lang('country (private)'),
+ 'adr_two_countrycode' => lang('country code (private)'),
'tel_work' => lang('work phone'),
'tel_cell' => lang('mobile phone'),
- 'tel_fax' => lang('fax').' ('.lang('business').')',
+ 'tel_fax' => lang('business fax'),
'tel_assistent' => lang('assistent phone'),
'tel_car' => lang('car phone'),
'tel_pager' => lang('pager'),
'tel_home' => lang('home phone'),
- 'tel_fax_home' => lang('fax').' ('.lang('private').')',
- 'tel_cell_private' => lang('mobile phone').' ('.lang('private').')',
+ 'tel_fax_home' => lang('fax (private)'),
+ 'tel_cell_private' => lang('mobile phone (private)'),
'tel_other' => lang('other phone'),
'tel_prefer' => lang('preferred phone'),
- 'email' => lang('email').' ('.lang('business').')',
- 'email_home' => lang('email').' ('.lang('private').')',
- 'url' => lang('url').' ('.lang('business').')',
- 'url_home' => lang('url').' ('.lang('private').')',
+ 'email' => lang('business email'),
+ 'email_home' => lang('email (private)'),
+ 'url' => lang('url (business)'),
+ 'url_home' => lang('url (private)'),
'freebusy_uri' => lang('Freebusy URI'),
'calendar_uri' => lang('Calendar URI'),
'note' => lang('note'),
diff --git a/addressbook/lang/egw_de.lang b/addressbook/lang/egw_de.lang
index f1f74f1ef3..6c18d17102 100644
--- a/addressbook/lang/egw_de.lang
+++ b/addressbook/lang/egw_de.lang
@@ -37,6 +37,7 @@ address book common de Adressbuch
address book - vcard in addressbook de Adressbuch - VCard in
address book - view addressbook de Adressbuch - Anzeigen
address line 2 addressbook de Adresszeile 2
+address line 2 (private) addressbook de Adresszeile 2 (Privat)
address type addressbook de Adresstyp
addressbook common de Adressbuch
addressbook csv export addressbook de Adressbuch CSV Export
@@ -68,8 +69,10 @@ birthdays common de Geburtstage
blank addressbook de Leer
business common de Geschäftlich
business address addressbook de Geschäftsadresse
+business address line 2 addressbook de Straße Zeile 2 geschäftl.
business city addressbook de Stadt geschäftl.
business country addressbook de Land geschäftl.
+business country code addressbook de Ländervorwahl geschäftl.
business email addressbook de E-Mail geschäftl.
business fax addressbook de Fax geschäftl.
business phone addressbook de Tel. geschäftl.
@@ -100,6 +103,7 @@ choose export options addressbook de Wählen Sie die Export Optionen
choose owner of imported data addressbook de Wählen Sie den Besitzer der importierten Daten
chosse an etemplate for this contact type admin de Wählen Sie ein eTemplate für diesen Kontakt Typ
city common de Stadt
+city (private) addressbook de Stadt (Privat)
cleanup addressbook fields (apply if synchronization creates duplicates) addressbook de Bereinige Adressbuch Felder (anwenden, wenn die Synchronisation Duplikate erzeugt)
company common de Firma
company name addressbook de Firmenname
@@ -128,7 +132,9 @@ copied by %1, from record #%2. addressbook de Kopiert von %1, vom Datensatz Nr.
copy a contact and edit the copy addressbook de Kopiert einen Kontakt und bearbeitet dann die Kopie
copy your changes to the clipboard, %1reload the entry%2 and merge them. addressbook de Kopieren Sie Ihre Änderungen in die Zwischenablage, %1laden Sie den Eintrag neu%2 und fügen diese wieder ein.
country common de Land
+country (private) addressbook de Land (Privat)
country code addressbook de Länderkennung
+country code (private) addressbook de Länderkennung (Privat)
create new links addressbook de Neue Verknüpfung erstellen
created addressbook de Angelegt
credit addressbook de Darlehen
@@ -393,7 +399,9 @@ stadt addressbook de Stadt
start admin de Starten
startrecord addressbook de Startdatensatz
state common de Bundesland
+state (private) addressbook de Bundesland (Privat)
street common de Straße
+street (private) addressbook de Straße (Privat)
subject for email addressbook de Betreff der E-Mail
successfully imported %1 records into your addressbook. addressbook de %1 Kontakte wurden erfolgreich in Ihr Adressbuch importiert
suffix addressbook de Zusatz
@@ -477,4 +485,5 @@ you must select at least 1 column to display addressbook de Sie müssen mindeste
you need to select a distribution list addressbook de Sie müssen eine Verteilerliste auswählen
you need to select some contacts first addressbook de Sie müssen zuerst Kontakte auswählen
zip code common de PLZ
+zip code (private) addressbook de PLZ (Privat)
zip_note addressbook de Notiz:Die Datei kann ein zip Archiv sein, bestehend aus .csv, .vcf oder .ldif Dateien. Sie dürfen die Dateitypen pro Import nicht mischen!
diff --git a/addressbook/lang/egw_en.lang b/addressbook/lang/egw_en.lang
index 1a08a77533..5cbbeb146d 100644
--- a/addressbook/lang/egw_en.lang
+++ b/addressbook/lang/egw_en.lang
@@ -37,6 +37,7 @@ address book common en Address Book
address book - vcard in addressbook en Address book - vCard in
address book - view addressbook en Address book - view
address line 2 addressbook en Address line 2
+address line 2 (private) addressbook en Address line 2 (private)
address type addressbook en Address type
addressbook common en Address Book
addressbook csv export addressbook en Address Book CSV export
@@ -68,8 +69,10 @@ birthdays common en Birthdays
blank addressbook en Blank
business common en Business
business address addressbook en Business address
+business address line 2 addressbook en Business address line 2
business city addressbook en Business city
business country addressbook en Business country
+business country code addressbook en Business country code
business email addressbook en Business email
business fax addressbook en Business fax
business phone addressbook en Business phone
@@ -100,6 +103,7 @@ choose export options addressbook en Choose export options
choose owner of imported data addressbook en Choose owner of imported data
chosse an etemplate for this contact type admin en Chose an eTemplate for this contact type
city common en City
+city (private) addressbook en City (private)
cleanup addressbook fields (apply if synchronization creates duplicates) addressbook en Cleanup address book fields, apply if synchronization creates duplicates.
company common en Company
company name addressbook en Company name
@@ -128,7 +132,9 @@ 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 (private) addressbook en Country (private)
country code addressbook en Country code
+country code (private) addressbook en Country code (private)
create new links addressbook en Create new links
created addressbook en Created
credit addressbook en Credit
@@ -393,7 +399,9 @@ stadt addressbook en City
start admin en Start
startrecord addressbook en Start record
state common en State
+state (private) addressbook en State (private)
street common en Street
+street (private) addressbook en Street (private)
subject for email addressbook en Subject for email
successfully imported %1 records into your addressbook. addressbook en Imported %1 record(s) successfully into address book.
suffix addressbook en Suffix
@@ -477,4 +485,5 @@ you must select at least 1 column to display addressbook en Select at least 1 co
you need to select a distribution list addressbook en Select a distribution list
you need to select some contacts first addressbook en Select some contacts first
zip code common en ZIP code
+zip code (private) addressbook en ZIP code (private)
zip_note addressbook en
Note: The file may be a zip file collection of .csv, .vcf, or .ldif files. Do not mix file types per import.
diff --git a/addressbook/setup/importexport_default.xml b/addressbook/setup/importexport_default.xml
index 85b9a977bc..2de29d1ce3 100644
--- a/addressbook/setup/importexport_default.xml
+++ b/addressbook/setup/importexport_default.xml
@@ -18,7 +18,8 @@
user
personal
- 2012-11-14 09:10:11
+ 2013-04-04 10:26:22
+
export-addressbook-vcard
@@ -28,10 +29,11 @@
Default
-
+
user
- 2012-10-23 09:46:56
+ 2013-04-04 10:26:22
+
import-addressbook-csv
@@ -66,36 +68,36 @@
Occupation
Assistent
Room
- Street (Business)
- Address line 2 (Business)
- City (Business)
- State (Business)
- ZIP code (Business)
- Country (Business)
- Country code (Business)
+ Business street
+ Business address line 2
+ Business city
+ Business state
+ Business postal code
+ Business country
+ Business country code
Label
- Street (Private)
- Address line 2 (Private)
- City (Private)
- State (Private)
- ZIP code (Private)
- Country (Private)
- Country code (Private)
+ Street (private)
+ Address line 2 (private)
+ City (private)
+ State (private)
+ ZIP code (private)
+ Country (private)
+ Country code (private)
Work phone
Mobile phone
- Fax (Business)
+ Business fax
Assistent phone
Car phone
Pager
Home phone
- Fax (Private)
- Mobile phone (Private)
+ fax (private)
+ mobile phone (private)
Other phone
Preferred phone
- Email (Business)
- Email (Private)
- URL (Business)
- URL (Private)
+ Business email
+ email (private)
+ url (business)
+ url (private)
FreeBusy URI
Calendar URI
Note
@@ -190,7 +192,8 @@
0
1
- 2012-10-23 09:49:04
+ 2013-04-23 14:01:30
+
export-addressbook-csv
@@ -204,63 +207,63 @@
Contact ID
Type
- Addressbook
+ Address Book
Private
Category
Prefix
First name
- Middle Name
+ Middle name
Last name
Suffix
- Full Name
+ Full name
Own sorting
Birthday
- Company
+ Organisation
Department
- Job Title
- Role
+ Job title
+ Occupation
Assistent
Room
- Street (Business)
- Address Line 2 (Business)
- City (Business)
- State (Business)
- ZIP Code (Business)
- Country (Business)
- country code (Business)
+ Business street
+ Business address line 2
+ Business city
+ Business state
+ Business postal code
+ Business country
+ Business country code
Label
- Street (Private)
- Address Line 2 (Private)
- City (Private)
- State (Private)
- ZIP Code (Private)
- Country (Private)
- country code (Private)
- Work Phone
- Mobile Phone
- Fax (Business)
+ Street (private)
+ Address line 2 (private)
+ City (private)
+ State (private)
+ ZIP code (private)
+ Country (private)
+ Country code (private)
+ Work phone
+ Mobile phone
+ Business fax
Assistent phone
- Car Phone
+ Car phone
Pager
- Home Phone
- Fax (Private)
- Mobile Phone (Private)
- Other Phone
- preferred phone
- E-Mail (Business)
- E-Mail (Private)
- URL (Business)
- URL (Private)
- Freebusy URI
+ Home phone
+ fax (private)*
+ mobile phone (private)*
+ Other phone
+ Preferred phone
+ Business email
+ email (private)*
+ url (business)*
+ url (private)*
+ FreeBusy URI
Calendar URI
Note
- Timezone
+ Time zone
GEO
- Public Key
+ Public key
Created
- Created By
- last modified
- last modified by
+ Created by
+ Last modified
+ Last modified by
Account ID
addressbook
@@ -270,7 +273,8 @@
1
- 2012-10-23 09:46:56
+ 2013-04-23 13:59:33
+