Merge branch 'master' of github.com:owncloud/apps into contacts_rework

Fix conflicts:
	contacts/ajax/contact/saveproperty.php
	contacts/js/contacts.js
	contacts/lib/hooks.php
	contacts/lib/search.php
	contacts/lib/vcard.php

ajax/contact/addproperty.php

@@ -133,7 +133,7 @@ switch($name) {
 
 $line = count($vcard->children) - 1;
 
-// Apparently Sabre_VObject_Parameter doesn't do well with
+// Apparently Sabre\VObject\Parameter doesn't do well with
 // multiple values or I don't know how to do it. Tanghus.
 foreach ($parameters as $key=>$element) {
 	if(is_array($element) /*&& strtoupper($key) == 'TYPE'*/) {
@@ -142,13 +142,13 @@ foreach ($parameters as $key=>$element) {
 		foreach($element as $e) {
 			if($e != '' && !is_null($e)) {
 				if(trim($e)) {
-					$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key, $e);
+					$vcard->children[$line]->parameters[] = new Sabre\VObject\Parameter($key, $e);
 				}
 			}
 		}
 	} else {
 		if(trim($element)) {
-			$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key, $element);
+			$vcard->children[$line]->parameters[] = new Sabre\VObject\Parameter($key, $element);
 		}
 	}
 }

ajax/contact/saveproperty.php

@@ -151,7 +151,7 @@ if(!$value) {
 						foreach($parameter as $val) {
 							if(trim($val)) {
 								debug('Adding parameter: '.$key.'=>'.$val);
-								$property->add(new Sabre_VObject_Parameter(
+								$property->add(new Sabre\VObject\Parameter(
 									$key,
 									strtoupper(strip_tags($val)))
 								);
@@ -159,7 +159,7 @@ if(!$value) {
 						}
 					} else {
 						if(trim($parameter)) {
-							$property->add(new Sabre_VObject_Parameter(
+							$property->add(new Sabre\VObject\Parameter(
 								$key,
 								strtoupper(strip_tags($parameter)))
 							);

ajax/savecrop.php

@@ -81,9 +81,9 @@ if($data) {
 					}
 					$property->setValue($image->__toString());
 					$property->parameters[]
-						= new Sabre_VObject_Parameter('ENCODING', 'b');
+						= new Sabre\VObject\Parameter('ENCODING', 'b');
 					$property->parameters[]
-						= new Sabre_VObject_Parameter('TYPE', $image->mimeType());
+						= new Sabre\VObject\Parameter('TYPE', $image->mimeType());
 					$vcard->__set('PHOTO', $property);
 				} else {
 					OCP\Util::writeLog('contacts',

l10n/et_EE.php

@@ -50,6 +50,7 @@
 "Not implemented" => "Pole implementeeritud",
 "Couldn't get a valid address." => "Kehtiva aadressi hankimine ebaõnnestus",
 "Error" => "Viga",
+"Please enter an email address." => "Palun sisesta e-posti aadress.",
 "Enter name" => "Sisesta nimi",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Kohandatud vorming, Lühike nimi, Täielik nimi, vastupidine või vastupidine komadega",
 "Select type" => "Vali tüüp",
@@ -57,15 +58,24 @@
 "You do not have permission to add contacts to " => "Sul pole luba lisada kontakti aadressiraamatusse",
 "Please select one of your own address books." => "Palun vali üks oma aadressiraamatutest.",
 "Permission error" => "Õiguse viga",
+"Click to undo deletion of \"" => "Kliki kustutamise tühistamiseks \"",
+"Cancelled deletion of: \"" => "Kustutamine tühistati: \"",
 "This property has to be non-empty." => "See omadus ei tohi olla tühi.",
+"Couldn't serialize elements." => "Elemente ei saa sarjana esitleda.",
+"Unknown error. Please check logs." => "Tundmatu viga. Palun kontrolli vealogisid.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' kutsuti välja ilma tüübi argumendita. Palun teavita leitud veast aadressil bugs.owncloud.org",
 "Edit name" => "Muuda nime",
 "No files selected for upload." => "Üleslaadimiseks pole faile valitud.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Fail , mida sa proovid üles laadida ületab sinu serveri poolt määratud maksimaalse üleslaadimise limiidi.",
 "Error loading profile picture." => "Viga profiilipildi laadimisel",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Mõned kontaktid on märgitud kustutamiseks, aga pole veel kustutatud. Palun oota, kuni need kustutatakse.",
 "Do you want to merge these address books?" => "Kas sa soovid liita neid aadressiraamatuid?",
 "Shared by " => "Jagas",
 "Upload too large" => "Üleslaadimine on liiga suur",
+"Only image files can be used as profile picture." => "Profiilipildina saab kasutada ainult pilte.",
 "Wrong file type" => "Vale failitüüp",
+"Your browser doesn't support AJAX upload. Please click on the profile picture to select a photo to upload." => "Sinu veebilehitseja ei toeta AJAX-põhist üleslaadimist. Palun kliki profiili pildil, et valida üleslaetav foto.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti",
 "Upload Error" => "Üleslaadimise viga",
 "Pending" => "Ootel",
 "Import done" => "Importimine on tehtud",
@@ -229,6 +239,7 @@
 "create a new addressbook" => "loo uus aadressiraamat",
 "Name of new addressbook" => "Uue aadressiraamatu nimi",
 "Importing contacts" => "Kontaktide importimine",
+"<h3>You have no contacts in your addressbook.</h3><p>You can import VCF files by dragging them to the contacts list and either drop them on an addressbook to import into it, or on an empty spot to create a new addressbook and import into that.<br />You can also import by clicking on the import button at the bottom of the list.</p>" => "<h3>Sinu aadressiraamatus pole ühtegi kontakti.</h3><p>Sa võid importida VCF faile lohistades neid kontaktide nimekirja sellele aadressiraamatule, millesse sa soovid neid importida või tühjale kohale, et luua uus aadressiraamat, millesse importida.<br />Sa võid importida ka kasutades nimekirja all olevat nuppu Impordi.</p>",
 "Add contact" => "Lisa kontakt",
 "Select Address Books" => "Vali aadressiraamatud",
 "Enter description" => "Sisesta kirjeldus",

l10n/nl.php

@@ -239,7 +239,7 @@
 "create a new addressbook" => "Maak een nieuw adresboek",
 "Name of new addressbook" => "Naam van nieuw adresboek",
 "Importing contacts" => "Importeren van contacten",
-"<h3>You have no contacts in your addressbook.</h3><p>You can import VCF files by dragging them to the contacts list and either drop them on an addressbook to import into it, or on an empty spot to create a new addressbook and import into that.<br />You can also import by clicking on the import button at the bottom of the list.</p>" => "<h3>Uw heeft geen contacten in uw adresboek.</h3><p>U kunt VCF bestanden importeren door ze naar de contactenlijst te slepen en ze daar op een adresboek los te laten om ze in het desbetreffende adresboek op te nemen of laat ze op een lege ruimte los om een nieuw adresboek te maken met de contacten uit de VCF bestanden.<br />Uw kunt ook importeren door op de import knop te klikken aan de onderkant van de lijst.</p>",
+"<h3>You have no contacts in your addressbook.</h3><p>You can import VCF files by dragging them to the contacts list and either drop them on an addressbook to import into it, or on an empty spot to create a new addressbook and import into that.<br />You can also import by clicking on the import button at the bottom of the list.</p>" => "<h3>U heeft geen contacten in uw adresboek.</h3><p>U kunt VCF bestanden importeren door ze naar de contactenlijst te slepen en ze daar op een adresboek los te laten om ze in het desbetreffende adresboek op te nemen of laat ze op het lege gedeelte los om een nieuw adresboek te maken met de contacten uit het bestand.<br />Uw kunt ook importeren door op de import knop te klikken aan de onderkant van de lijst.</p>",
 "Add contact" => "Contactpersoon toevoegen",
 "Select Address Books" => "Selecteer adresboeken",
 "Enter description" => "Beschrijving",

l10n/si_LK.php

@@ -13,6 +13,7 @@
 "Error reading contact photo." => "හඳුනාගැනීමේ ඡායාරූපය කියවීම දෝෂ සහිතයි.",
 "Error saving temporary file." => "තාවකාලික ගොනුව සුරැකීම දෝෂ සහිතයි.",
 "Contact ID is missing." => "සබඳතා හැඳිනුම් අංකය නොමැත.",
+"File doesn't exist:" => "ගොනුව නොපවතී",
 "Error loading image." => "රූපය පූරණය දෝෂ සහිතයි.",
 "Contacts" => "සබඳතා",
 "Download" => "බාගත කිරීම",
@@ -26,13 +27,24 @@
 "Mobile" => "ජංගම",
 "Text" => "පෙළ",
 "Voice" => "හඬ",
+"Message" => "පණිවිඩය",
 "Fax" => "ෆැක්ස්",
 "Video" => "වීඩියෝව",
 "Pager" => "පේජරය",
+"Internet" => "අන්තර්ජාලය",
 "Birthday" => "උපන් දිනය",
+"{name}'s Birthday" => "{name}ගේ උපන්දිනය",
 "Contact" => "සබඳතාව",
 "Add Contact" => "සබඳතාවක් එක් කරන්න",
+"Drop photo to upload" => "උඩුගත කිරීමට මෙතැනට දමන්න",
+"Edit name details" => "නමේ විස්තර සංස්කරණය කරන්න",
 "Organization" => "ආයතනය",
+"Nickname" => "පටබැඳි නම",
+"Enter nickname" => "පටබැඳි නම ඇතුලත් කරන්න",
+"dd-mm-yyyy" => "දිදි-මාමා-වවවව",
+"Groups" => "කණ්ඩායම්",
+"Separate groups with commas" => "කණ්ඩායම් කොමා භාවිතයෙන් වෙන් කරන්න",
+"Edit groups" => "කණ්ඩායම් සංස්කරණය කරන්න",
 "Preferred" => "රුචි",
 "Phone" => "දුරකථන",
 "Email" => "ඉ-තැපැල්",

l10n/sk_SK.php

@@ -8,6 +8,7 @@
 "No address books found." => "Žiadny adresár nenájdený.",
 "No contacts found." => "Žiadne kontakty nenájdené.",
 "element name is not set." => "meno elementu nie je nastavené.",
+"Could not parse contact: " => "Nedá sa spracovať kontakt:",
 "Cannot add empty property." => "Nemôžem pridať prázdny údaj.",
 "At least one of the address fields has to be filled out." => "Musí byť uvedený aspoň jeden adresný údaj.",
 "Trying to add duplicate property: " => "Pokúšate sa pridať rovnaký atribút:",
@@ -57,8 +58,11 @@
 "You do not have permission to add contacts to " => "Nemáte oprávnenie pre pridanie kontaktu do",
 "Please select one of your own address books." => "Zvoľte jeden z vašich adresárov.",
 "Permission error" => "Porucha oprávnenia.",
+"Click to undo deletion of \"" => "Kliknite pre zrušenie zmazania \"",
+"Cancelled deletion of: \"" => "Zrušené mazanie: \"",
 "This property has to be non-empty." => "Tento parameter nemôže byť prázdny.",
 "Couldn't serialize elements." => "Nemôžem previesť prvky.",
+"Unknown error. Please check logs." => "Neznáma chyba. Prosím skontrolujte záznamy.",
 "'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' zavolané bez argument. Prosím oznámte chybu na bugs.owncloud.org",
 "Edit name" => "Upraviť meno",
 "No files selected for upload." => "Žiadne súbory neboli vybrané k nahratiu",
@@ -68,10 +72,15 @@
 "Do you want to merge these address books?" => "Chcete zlúčiť tieto adresáre?",
 "Shared by " => "Zdieľané",
 "Upload too large" => "Nahrávanie je príliš veľké",
+"Only image files can be used as profile picture." => "Ako profilový obrázok sa dajú použiť len obrázkové súbory.",
 "Wrong file type" => "Nesprávny typ súboru",
+"Your browser doesn't support AJAX upload. Please click on the profile picture to select a photo to upload." => "Váš prehliadač nepodporuje odosielanie cez AJAX. Prosím kliknite na profilový obrázok pre výber fotografie na odoslanie.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nedá sa odoslať Váš súbor, pretože je to adresár, alebo je jeho veľkosť 0 bajtov",
 "Upload Error" => "Chyba pri posielaní",
 "Pending" => "Prebieha",
 "Import done" => "Import ukončený",
+"Not all files uploaded. Retrying..." => "Všetky súbory neboli odoslané. Opakujem...",
+"Something went wrong with the upload, please retry." => "Stalo sa niečo zlé s odosielaným súborom, skúste ho prosím odoslať znovu.",
 "Importing..." => "Importujem...",
 "The address book name cannot be empty." => "Názov adresára nemôže byť prázdny.",
 "Result: " => "Výsledok: ",
@@ -86,6 +95,7 @@
 "Cancel" => "Zrušiť",
 "More..." => "Viac...",
 "Less..." => "Menej...",
+"You do not have the permissions to read this addressbook." => "Nemáte oprávnenie na čítanie tejto adresnej knihy.",
 "You do not have the permissions to update this addressbook." => "Nemáte oprávnenie k zmenám v tomto adresári.",
 "There was an error updating the addressbook." => "Nastala chyba pri pokuse o úpravy v adresári.",
 "You do not have the permissions to delete this addressbook." => "Nemáte oprávnenie pre zmazanie tohto adresára.",
@@ -120,6 +130,7 @@
 "Business" => "Biznis",
 "Call" => "Zavolať",
 "Clients" => "Klienti",
+"Deliverer" => "Dodávateľ",
 "Holidays" => "Prázdniny",
 "Ideas" => "Nápady",
 "Journey" => "Cesta",
@@ -228,6 +239,7 @@
 "create a new addressbook" => "vytvoriť nový adresár",
 "Name of new addressbook" => "Meno nového adresára",
 "Importing contacts" => "Importovanie kontaktov",
+"<h3>You have no contacts in your addressbook.</h3><p>You can import VCF files by dragging them to the contacts list and either drop them on an addressbook to import into it, or on an empty spot to create a new addressbook and import into that.<br />You can also import by clicking on the import button at the bottom of the list.</p>" => "<h3>Vo vašej knihe adries nemáte kontakty.</h3><p>Môžete importovať súbory VCF pretiahnutím na zoznam kontaktov a pustením na knihu pre pridanie, alebo do prázdneho miesta pre vytvorenie novej knihy adries.<br />Tiež môžete importovať kliknutím na tlačidlo Importovať na konci zoznamu.</p>",
 "Add contact" => "Pridať kontakt",
 "Select Address Books" => "Zvoliť adresáre",
 "Enter description" => "Zadať popis",

l10n/vi.php

@@ -11,8 +11,12 @@
 "Cannot add empty property." => "Không thể thêm thuộc tính rỗng",
 "At least one of the address fields has to be filled out." => "Ít nhất một địa chỉ phải được điền.",
 "Trying to add duplicate property: " => "Thêm hai thuộc tính trùng nhau",
+"Missing IM parameter." => "Thiếu tham số IM",
+"Unknown IM: " => "Không biết IM:",
 "Information about vCard is incorrect. Please reload the page." => "Thông tin vCard không chính xác. Vui lòng tải lại trang.",
 "Missing ID" => "Missing ID",
+"checksum is not set." => "tổng kiểm tra không được thiết lập.",
+"Information about vCard is incorrect. Please reload the page: " => "Thông tin về vCard không chính xác. Vui lòng tải lại trang:",
 "No contact ID was submitted." => "Không có ID của liên lạc được tìm thấy",
 "Error reading contact photo." => "Lỗi đọc liên lạc hình ảnh.",
 "Error saving temporary file." => "Lỗi trong quá trình lưu file tạm",
@@ -21,35 +25,75 @@
 "No photo path was submitted." => "Đường dẫn hình ảnh bị thiếu",
 "File doesn't exist:" => "Tập tin không tồn tại",
 "Error loading image." => "Lỗi khi tải hình ảnh.",
+"Error getting contact object." => "Lỗi liên lạc đối tượng.",
+"Error getting PHOTO property." => "Lỗi lấy thuộc tính ảnh",
 "Error saving contact." => "Lỗi khi lưu liên lạc",
 "Error resizing image" => "Lỗi khi chỉnh kích thước ảnh",
 "Error cropping image" => "Lỗi khi cắt ảnh",
 "Error creating temporary image" => "Lỗi khi tạo tệp tin tạm",
+"Error finding image: " => "Lỗi khi tìm hình ảnh:",
 "Error uploading contacts to storage." => "Lỗi tải lên danh sách địa chỉ để lưu trữ.",
 "There is no error, the file uploaded with success" => "Không có lỗi, các tập tin tải lên thành công",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Dung lượng file tải lên vượt quá giới hạn cho phép.",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Tập tin được tải lên vượt quá MAX_FILE_SIZE được quy định trong mẫu HTML",
+"The uploaded file was only partially uploaded" => "Các tập tin được tải lên chỉ tải lên được một phần",
 "No file was uploaded" => "Chưa có file nào được tải lên",
+"Missing a temporary folder" => "Không tìm thấy thư mục tạm",
+"Couldn't save temporary image: " => "Không thể lưu ảnh tạm thời:",
+"Couldn't load temporary image: " => "Không thể tải hình ảnh tạm thời:",
+"No file was uploaded. Unknown error" => "Không có tập tin nào được tải lên. Lỗi không xác định",
 "Contacts" => "Liên lạc",
 "Enter name" => "Nhập tên",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Định dạng tùy chỉnh, Tên viết tắt, Tên đầy đủ, hoặc đảo ngược với dấu phẩy",
+"You do not have permission to add contacts to " => "Bạn không có quyền để thêm địa chỉ liên lạc",
+"Please select one of your own address books." => "Vui lòng chọn một trong những danh bạ địa chỉ của riêng bạn.",
+"Permission error" => "Lỗi quyền truy cập",
 "Edit name" => "Sửa tên",
+"Error loading profile picture." => "Lỗi khi tải lên hồ sơ hình ảnh.",
+"Do you want to merge these address books?" => "Bạn có muốn kết hợp những cuốn sách địa chỉ?",
 "Result: " => "Kết quả:",
 "Download" => "Tải về",
 "Edit" => "Sửa",
 "Delete" => "Xóa",
 "Cancel" => "Hủy",
+"You do not have the permissions to update this addressbook." => "Bạn không có quyền truy cập để cập nhật danh bạ này.",
+"There was an error updating the addressbook." => "Có một lỗi khi cập nhật danh bạ.",
+"You do not have the permissions to delete this addressbook." => "Bạn không có quyền truy cập để xóa danh bạ này.",
+"There was an error deleting this addressbook." => "Có một lỗi khi xóa danh bạ này.",
 "This is not your addressbook." => "Đây không phải là sổ địa chỉ của bạn.",
 "Contact could not be found." => "Liên lạc không được tìm thấy",
+"Jabber" => "Jabber",
+"AIM" => "AIM",
+"MSN" => "MSN",
+"Twitter" => "Twitter",
+"GoogleTalk" => "GoogleTalk",
+"Facebook" => "Facebook",
+"XMPP" => "XMPP",
+"ICQ" => "ICQ",
+"Yahoo" => "Yahoo",
+"Skype" => "Skype",
+"QQ" => "QQ",
+"GaduGadu" => "GaduGadu",
 "Work" => "Công việc",
 "Home" => "Nhà",
 "Mobile" => "Di động",
 "Text" => "Văn bản",
 "Voice" => "Giọng nói",
+"Message" => "Tin nhắn",
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "số trang",
+"Internet" => "Mạng internet",
 "Birthday" => "Ngày sinh nhật",
 "Call" => "Gọi",
+"{name}'s Birthday" => "Sinh nhật của {name}",
 "Contact" => "Danh sách",
+"Could not find the vCard with ID." => "Không thể tìm thấy ID vCard.",
+"You do not have the permissions to edit this contact." => "Bạn không có quyền truy cập để chỉnh sửa địa chỉ liên hệ này.",
+"Could not find the vCard with ID: " => "Không thể tìm thấy ID vCard: ",
+"Could not find the Addressbook with ID: " => "Không thể tìm thấy ID danh bạ:",
+"You do not have the permissions to delete this contact." => "Bạn không có quyền truy cập để xóa địa chỉ liên hệ này.",
+"There was an error deleting this contact." => "Có một lỗi khi xóa địa chỉ liên lạc này.",
 "Add Contact" => "Thêm liên lạc",
 "Import" => "Nhập",
 "Settings" => "Tùy chỉnh",
@@ -66,9 +110,12 @@
 "Edit current photo" => "Sửa hình ảnh hiện tại",
 "Upload new photo" => "Tải hình ảnh mới",
 "Select photo from ownCloud" => "Chọn hình đã tải lên Kcloud",
+"Edit name details" => "Chỉnh sửa chi tiết tên",
 "Organization" => "Tổ chức",
+"Nickname" => "Biệt danh",
 "Enter nickname" => "Nhập nickname",
 "Go to web site" => "Đi tới website",
+"dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Nhóm",
 "Separate groups with commas" => "Phân cách bởi dấu phẩy",
 "Edit groups" => "Sửa nhóm",
@@ -79,12 +126,15 @@
 "Delete email address" => "Xóa Email",
 "Enter phone number" => "Nhập số điện thoại",
 "Delete phone number" => "Xóa số điện thoại",
+"Instant Messenger" => "Tin nhắn khẩn cấp",
+"Delete IM" => "Xóa IM",
 "View on map" => "Xem trên bản đồ",
 "Edit address details" => "Sửa thông tin địa chỉ",
 "Add notes here." => "Thêm chú thích",
 "Add field" => "Thêm trường mới",
 "Phone" => "Điện thoại",
 "Email" => "Email",
+"Instant Messaging" => "Hệ thống tin nhắn khẩn cấp",
 "Address" => "Địa chỉ",
 "Note" => "Chú thích",
 "Download contact" => "Tải liên lạc",
@@ -103,13 +153,39 @@
 "Postal code" => "Mã bưu chính",
 "Country" => "Quốc gia",
 "Addressbook" => "Sổ địa chỉ",
+"Hon. prefixes" => "Tiền tốt Hon.",
+"Miss" => "Miss",
+"Ms" => "Ms",
+"Mr" => "Mr",
+"Sir" => "Sir",
+"Mrs" => "Sir",
+"Dr" => "Sir",
+"Given name" => "Được đặt tên",
+"Additional names" => "Tên bổ sung",
+"Family name" => "Tên gia đình",
+"Hon. suffixes" => "Hậu tố Hon.",
+"J.D." => "J.D.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
+"Import a contacts file" => "Xuất ra một tập tin liên lạc",
 "Please choose the addressbook" => "Chọn sổ địa chỉ",
 "create a new addressbook" => "Tạo một sổ địa chỉ mới",
+"Name of new addressbook" => "Tên danh bạ mới",
 "Importing contacts" => "Nhập liên lạc",
 "Add contact" => "Thêm liên lạc",
 "Select Address Books" => "Chọn sổ địa chỉ",
 "Enter description" => "Nhập mô tả",
+"CardDAV syncing addresses" => "CardDAV đồng bộ địa chỉ",
+"more info" => "Thông tin thêm",
+"Primary address (Kontact et al)" => "Địa chỉ chính (Kontact et al)",
+"iOS/OS X" => "iOS/OS X",
 "Addressbooks" => "Sổ địa chỉ",
+"Share" => "Chia sẽ",
 "New Address Book" => "Sổ địa chỉ mới",
 "Save" => "Lưu"
 );

l10n/zh_CN.php

@@ -8,12 +8,12 @@
 "No address books found." => "找不到地址簿。",
 "No contacts found." => "找不到联系人。",
 "element name is not set." => "元素名称未设置",
-"Could not parse contact: " => "无法解析内容：",
+"Could not parse contact: " => "无法解析联系人：",
 "Cannot add empty property." => "无法添加空属性。",
 "At least one of the address fields has to be filled out." => "至少需要填写一项地址。",
 "Trying to add duplicate property: " => "试图添加重复属性： ",
-"Missing IM parameter." => "缺少IM参数",
+"Missing IM parameter." => "缺少即时通讯IM参数",
-"Unknown IM: " => "未知IM：",
+"Unknown IM: " => "未知即时通讯服务：",
 "Information about vCard is incorrect. Please reload the page." => "vCard 的信息不正确。请重新加载页面。",
 "Missing ID" => "缺少 ID",
 "Error parsing VCard for ID: \"" => "无法解析如下ID的 VCard：“",
@@ -21,14 +21,14 @@
 "Information about vCard is incorrect. Please reload the page: " => "vCard 信息不正确。请刷新页面: ",
 "Something went FUBAR. " => "有一些信息无法被处理。",
 "No contact ID was submitted." => "未提交联系人 ID。",
-"Error reading contact photo." => "读取联系人照片错误。",
+"Error reading contact photo." => "读取联系人照片时错误。",
 "Error saving temporary file." => "保存临时文件错误。",
-"The loading photo is not valid." => "装入的照片不正确。",
+"The loading photo is not valid." => "载入的照片无效。",
 "Contact ID is missing." => "缺少联系人 ID。",
 "No photo path was submitted." => "未提供照片路径。",
 "File doesn't exist:" => "文件不存在:",
 "Error loading image." => "加载图片错误。",
-"Error getting contact object." => "获取联系人目标时出错。",
+"Error getting contact object." => "获取联系人对象时出错。",
 "Error getting PHOTO property." => "获取照片属性时出错。",
 "Error saving contact." => "保存联系人时出错。",
 "Error resizing image" => "缩放图像时出错",
@@ -39,7 +39,7 @@
 "There is no error, the file uploaded with success" => "文件上传成功，没有错误发生",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "上传的文件长度超出了 php.ini 中 upload_max_filesize 的限制",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件长度超出了 HTML 表单中 MAX_FILE_SIZE 的限制",
-"The uploaded file was only partially uploaded" => "已上传文件只上传了部分",
+"The uploaded file was only partially uploaded" => "已上传文件只上传了部分（不完整）",
 "No file was uploaded" => "没有文件被上传",
 "Missing a temporary folder" => "缺少临时目录",
 "Couldn't save temporary image: " => "无法保存临时图像: ",
@@ -70,7 +70,7 @@
 "Error loading profile picture." => "载入档案图片时出错",
 "Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "一些联系人已被标注为删除，但是尚未完成，请稍候。",
 "Do you want to merge these address books?" => "是否想合并这些地址簿？",
-"Shared by " => "共享人",
+"Shared by " => "分享自",
 "Upload too large" => "上传文件过大",
 "Only image files can be used as profile picture." => "只有图像文件才可用作头像",
 "Wrong file type" => "错误的文件类型",
@@ -80,7 +80,7 @@
 "Pending" => "等待",
 "Import done" => "导入完毕",
 "Not all files uploaded. Retrying..." => "仍有文件未上传，重试中",
-"Something went wrong with the upload, please retry." => "上传中出现些问题，正在重试哟。",
+"Something went wrong with the upload, please retry." => "上传中出现些问题，请重试。",
 "Importing..." => "导入中",
 "The address book name cannot be empty." => "地址簿名称不能为空",
 "Result: " => "结果: ",
@@ -94,9 +94,9 @@
 "Delete" => "删除",
 "Cancel" => "取消",
 "More..." => "更多",
-"Less..." => "概要...",
+"Less..." => "更少...",
 "You do not have the permissions to read this addressbook." => "你没有权限查看地址簿",
-"You do not have the permissions to update this addressbook." => "你没有权限更新地址簿",
+"You do not have the permissions to update this addressbook." => "你没有权限更新此地址簿",
 "There was an error updating the addressbook." => "更新地址簿时出错",
 "You do not have the permissions to delete this addressbook." => "你没有权限编辑此地址簿",
 "There was an error deleting this addressbook." => "删除地址簿时出错",
@@ -118,7 +118,7 @@
 "Work" => "工作",
 "Home" => "家庭",
 "Other" => "其它",
-"Mobile" => "移动电话",
+"Mobile" => "手机",
 "Text" => "文本",
 "Voice" => "语音",
 "Message" => "消息",
@@ -130,7 +130,7 @@
 "Business" => "商务",
 "Call" => "电话",
 "Clients" => "客户",
-"Deliverer" => "Deliverer",
+"Deliverer" => "供应商",
 "Holidays" => "假期",
 "Ideas" => "创意",
 "Journey" => "旅行",
@@ -142,7 +142,7 @@
 "{name}'s Birthday" => "{name} 的生日",
 "Contact" => "联系人",
 "You do not have the permissions to add contacts to this addressbook." => "您没有权限增加联系人到此地址簿",
-"Could not find the vCard with ID." => "无法根据ID找到联系人。",
+"Could not find the vCard with ID." => "未能找到此 ID 的 vCard。",
 "You do not have the permissions to edit this contact." => "你没有权限编辑此联系人",
 "Could not find the vCard with ID: " => "无法找到联系人，根据ID：",
 "Could not find the Addressbook with ID: " => "无法找到地址簿，根据ID：",
@@ -156,7 +156,7 @@
 "Navigation" => "导航",
 "Next contact in list" => "列表中的下一个联系人",
 "Previous contact in list" => "列表中的上一个联系人",
-"Expand/collapse current addressbook" => "展开、收起此地址簿",
+"Expand/collapse current addressbook" => "展开/收起此地址簿",
 "Next addressbook" => "下一个地址簿",
 "Previous addressbook" => "上一个地址簿",
 "Actions" => "地址",
@@ -175,7 +175,7 @@
 "Enter nickname" => "输入昵称",
 "Web site" => "网址",
 "http://www.somesite.com" => "http://www.wodewangzhan.com",
-"Go to web site" => "前往网站",
+"Go to web site" => "访问网址",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "分组",
 "Separate groups with commas" => "用逗号隔开分组",
@@ -187,15 +187,15 @@
 "Delete email address" => "删除电子邮件地址",
 "Enter phone number" => "输入电话号码",
 "Delete phone number" => "删除电话号码",
-"Instant Messenger" => "即时聊天",
+"Instant Messenger" => "即时通讯",
-"Delete IM" => "删除即时聊天工具",
+"Delete IM" => "删除即时通讯工具",
 "View on map" => "在地图上显示",
-"Edit address details" => "编辑地址细节。",
+"Edit address details" => "编辑详细地址。",
 "Add notes here." => "添加注释。",
 "Add field" => "添加字段",
 "Phone" => "电话",
 "Email" => "电子邮件",
-"Instant Messaging" => "即时信息",
+"Instant Messaging" => "即时通讯",
 "Address" => "地址",
 "Note" => "注释",
 "Download contact" => "下载联系人",
@@ -205,7 +205,7 @@
 "Type" => "类型",
 "PO Box" => "邮箱",
 "Street address" => "街道地址",
-"Street and number" => "街道号码",
+"Street and number" => "街道门牌号码",
 "Extended" => "扩展",
 "Apartment number etc." => "公寓号码",
 "City" => "城市",
@@ -215,7 +215,7 @@
 "Postal code" => "邮政编码",
 "Country" => "国家",
 "Addressbook" => "地址簿",
-"Hon. prefixes" => "名誉字首",
+"Hon. prefixes" => "荣誉头衔",
 "Miss" => "小姐",
 "Ms" => "女士",
 "Mr" => "先生",

lib/hooks.php

@@ -94,7 +94,7 @@ class Hooks{
 				$vevent = new \OC_VObject('VEVENT');
 				//$vevent->setDateTime('LAST-MODIFIED', new DateTime($vcard->REV));
 				$vevent->setDateTime('DTSTART', $date,
-					\Sabre_VObject_Element_DateTime::DATE);
+					\Sabre\VObject\Property\DateTime::DATE);
 				$vevent->setString('DURATION', 'P1D');
 				$vevent->setString('UID', substr(md5(rand().time()), 0, 10));
 				// DESCRIPTION?

lib/search.php

@@ -4,17 +4,17 @@ namespace OCA\Contacts;
 
 class SearchProvider extends \OC_Search_Provider{
 	function search($query) {
-		$addressbooks = OCA\Contacts\Addressbook::all(\OCP\USER::getUser(), 1);
+		$addressbooks = Addressbook::all(\OCP\USER::getUser(), 1);
 		if(count($addressbooks)==0 || !\OCP\App::isEnabled('contacts')) {
 			return array();
 		}
 		$results=array();
 		$l = new OC_l10n('contacts');
 		foreach($addressbooks as $addressbook) {
-			$vcards = OCA\Contacts\VCard::all($addressbook['id']);
+			$vcards = VCard::all($addressbook['id']);
 			foreach($vcards as $vcard) {
 				if(substr_count(strtolower($vcard['fullname']), strtolower($query)) > 0) {
-					$link = \OCP\Util::linkTo('contacts', 'index.php').'&id='.urlencode($vcard['id']);
+					$link = \OCP\Util::linkTo('contacts', 'index.php').'?id='.urlencode($vcard['id']);
 					$results[]=new \OC_Search_Result($vcard['fullname'], '', $link, (string)$l->t('Contact'));//$name,$text,$link,$type
 				}
 			}

lib/vcard.php

@@ -136,7 +136,7 @@ class VCard {
 		foreach($property->parameters as $key=>&$parameter) {
 			$types = App::getTypesOfProperty($property->name);
 			if(is_array($types) && in_array(strtoupper($parameter->name), array_keys($types)) || strtoupper($parameter->name) == 'PREF') {
-				$property->parameters[] = new \Sabre_VObject_Parameter('TYPE', $parameter->name);
+				$property->parameters[] = new \Sabre\VObject\Parameter('TYPE', $parameter->name);
 			}
 			unset($property->parameters[$key]);
 		}