Merge branch 'master' into filesystem

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" => "先生",