i18n(zh_CN): Update ChineseChina translations

SoObjects/Appointments/ChineseChina.lproj/Localizable.strings

@@ -7,13 +7,18 @@ vevent_class2 = "(机密事件)";
 vtodo_class0 = "(公开任务)";
 vtodo_class1 = "(私人任务)";
 vtodo_class2 = "(机密任务)";
+
 /* Receipts */
 "The event \"%{Summary}\" was created" = "事件\"%{Summary}\"已创建";
 "The event \"%{Summary}\" was deleted" = "事件\"%{Summary}\"已删除";
 "The event \"%{Summary}\" was updated" = "事件\"%{Summary}\"已更新";
+"The task \"%{Summary}\" was created" = "The task \"%{Summary}\" was created";
+"The task \"%{Summary}\" was deleted" = "The task \"%{Summary}\" was deleted";
+"The task \"%{Summary}\" was updated" = "The task \"%{Summary}\" was updated";
 "The following attendees(s) were notified" = "已通知下列出席者";
 "The following attendees(s) were added" = "已增加下列出席者";
 "The following attendees(s) were removed" = "已删除下列出席者";
+
 /* IMIP messages */
 "calendar_label" = "日程";
 "startDate_label" = "开始";
@@ -26,17 +31,20 @@ vtodo_class2 = "(机密任务)";
 "comment_label" = "备注";
 "organizer_label" = "组织者";
 "attendee_label" = "参与者";
+
 /* Invitation */
 "Event Invitation: \"%{Summary}\"" = "邀请事件: \"%{Summary}\"";
 "(sent by %{SentBy}) " = "(来自 %{SentBy}) ";
 "%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}" = "%{Organizer} %{SentByText} 邀请你到 %{Summary}.\n\n开始: %{StartDate}\n结束: %{EndDate}\n说明: %{Description}";
 "%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = "%{Organizer} %{SentByText} 邀请你去 %{Summary}。\n\n开始: %{StartDate} 的 %{StartTime}\n结束: %{EndDate} 的 %{EndTime}\n说明: %{Description}";
+
 /* Deletion */
 "Event Cancelled: \"%{Summary}\"" = "事件已取消: \"%{Summary}\"";
 "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}"
 = "%{Organizer} %{SentByText} 取消了安排: %{Summary}.\n\n开始: %{StartDate}\n结束: %{EndDate}\n说明: %{Description}";
 "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
 = "%{Organizer} %{SentByText} 取消了事件: %{Summary}。\n\n开始: %{StartDate} 的 %{StartTime}\n结束: %{EndDate} 的 %{EndTime}\n说明: %{Description}";
+
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} has changed"
 = "安排 \"%{Summary}\"  的开始时间 %{OldStartDate} 已更新";
@@ -46,6 +54,7 @@ vtodo_class2 = "(机密任务)";
 = "会议 \"%{Summary}\" 的下面参数已被修改:";
 "Please accept or decline those changes."
 = "请接受或拒绝这些更改。";
+
 /* Reply */
 "Accepted invitation: \"%{Summary}\"" = "接受的邀请: \"%{Summary}\"";
 "Declined invitation: \"%{Summary}\"" = "拒绝的邀请: \"%{Summary}\"";
@@ -59,6 +68,15 @@ vtodo_class2 = "(机密任务)";
 = "%{Attendee} %{SentByText} 已把邀请委派给 %{Delegate}.";
 "%{Attendee} %{SentByText}has not yet decided upon your event invitation."
 = "%{Attendee} %{SentByText} 尚未决定接受事件邀请。";
+
+/* Reminder */
+"Reminder: \"%{Summary}\" - %{StartDate}" = "Reminder: \"%{Summary}\" - %{StartDate}";
+
 /* Resources */
 "Cannot access resource: \"%{Cn} %{SystemEmail}\"" = "无法获取资源: \"%{Cn} %{SystemEmail}\"";
 "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}." = "\"%{Cn} %{SystemEmail}\" 的同一时间的预定数达到上限 (%{NumberOfSimultaneousBookings})。 冲突事件为 \"%{EventTitle}\", 开始于 %{StartDate}。";
+
+/* Participation role */
+"Your participation is required to this event" = "Your participation is required to this event";
+"Your participation is optional to this event" = "Your participation is optional to this event";
+"Your participation is not required to this event" = "Your participation is not required to this event";

SoObjects/Mailer/ChineseChina.lproj/Localizable.strings

@@ -1,2 +1,5 @@
 "OtherUsersFolderName"   = "其他用户";
 "SharedFoldersName" = "共享文件夹";
+
+"Report: Marked messages as junk" = "Report: Marked messages as junk";
+"Report: Marked messages as not junk" = "Report: Marked messages as not junk";

UI/AdministrationUI/ChineseChina.lproj/Localizable.strings

@@ -10,6 +10,7 @@
 /* Modules descriptions */
 "ACLs_description" = "<p>访问控制列表管理模块可以更改每个用户的日历和地址簿的访问控制权限</p><p>变更用户目录的访问控制权限时，通过在窗口上部的搜索栏里输入用户名，然后双击目录来实现。</p>";
 "Name or Email" = "姓名或电子邮件";
+"ACLs saved" = "ACLs saved";
 /* Rights module: initial search message */
 "Start a search to edit the rights" = "搜索要修改的权限";
 /* Rights module: Empty search result */

UI/Common/ChineseChina.lproj/Localizable.strings

@@ -6,7 +6,7 @@
 "Edit User Rights" = "编辑用户权限";
 "Home" = "主页";
 "Calendar" = "日历";
-"Address Book"	= "通讯录";
+"Address Book"  = "通讯录";
 "Mail" = "邮件";
 "Preferences" = "个人设定";
 "Administration" = "管理";
@@ -41,19 +41,21 @@
      = "网络上的任何人都可以访问您的通讯录 \"%{0}\", 即使非本系统账户。是否确定在网络上公开此通讯录？";
 "Give Access" = "授权访问";
 "Keep Private" = "保留私用";
+"Expand" = "Expand";
+"Reduce" = "Reduce";
 
 /* generic.js */
 "Unable to subscribe to that folder!"
-	= "不能订阅该目录！";
+        = "不能订阅该目录！";
 "You cannot subscribe to a folder that you own!"
-	= "不能订阅自己的目录！";
+        = "不能订阅自己的目录！";
 "Unable to unsubscribe from that folder!"
-	= "不能取消订阅该目录！";
+        = "不能取消订阅该目录！";
 "You cannot unsubscribe from a folder that you own!"
-	= "不能取消订阅自己的目录！";
+        = "不能取消订阅自己的目录！";
 "Unable to rename that folder!" = "不能修改该目录名！";
 "You have already subscribed to that folder!"
-	= "你已经订阅该目录！";
+        = "你已经订阅该目录！";
 "The user rights cannot be edited for this object!"
         = "对不起，该用户不能编辑该项。";
 "A folder by that name already exists." = "目录名称已存在。";
@@ -76,6 +78,13 @@
 "Yes" = "是";
 "No" = "否";
 
+/* generic messages */
+"Error" = "Error";
+"Success" = "Success";
+
+/* confirmation dialog box */
+"Confirmation" = "Confirmation";
+
 /* alarms */
 "Reminder" = "提醒";
 "Start" = "开始";
@@ -97,6 +106,8 @@
 "Personal" = "个人";
 "To Do" = "待办";
 "Later" = "稍后";
+"Forwarded" = "Forwarded";
+"Return Receipt Sent" = "Return Receipt Sent";
 "a2_Sunday" = "周日";
 "a2_Monday" = "周一";
 "a2_Tuesday" = "周二";
@@ -110,6 +121,22 @@
 "No such user." = "查无此人。";
 "You cannot (un)subscribe to a folder that you own!" = "不能订阅(退订)自己的目录";
 
+/* SMIME Certificate field */
+"S/MIME Certificate" = "S/MIME Certificate";
+"Subject Name" = "Subject Name";
+"Issuer" = "Issuer";
+"streetAddress" = "Street";
+"stateOrProvinceName" = "State or Province";
+"localityName" = "Locality";
+"countryName" = "Country";
+"organizationName" = "Organization";
+"organizationalUnitName" = "Organizational Unit";
+"commonName" = "Common Name";
+"surname" = "Surname";
+"givenName" = "Given Name";
+"emailAddress" = "Email Address";
+
+
 /* Authentication username */
 "Username" = "用户名称";
 
@@ -125,9 +152,20 @@
 /* Error message displayed when a file upload exceeds WOMaxUploadSize */
 "File size upload limit reached" = "已到达文件大小上传上限";
 
+/* Generic server error */
+"An error occured, please try again." = "An error occured, please try again.";
+
+/* Open datepicker */
+"Open Calendar" = "Open Calendar";
+
 /* Toggle visibility (ex: mail account in left navigation menu) */
 "Toggle visibility" = "切换视图";
 
+"Keyboard Shortcuts" = "Keyboard Shortcuts";
+
+/* Aria label for avatar button to select and unselect an item */
+"Toggle item" = "Toggle item";
+
 /* Toggle multiple items at the same time (hotkeys cheatsheet) */
 "Toggle range of items" = "切换项目范围";
 
@@ -137,6 +175,9 @@
 /* Space key */
 "key_space" = "空格";
 
+/* Delete key */
+"key_delete" = "delete";
+
 /* Shift and space key */
 "key_shift+space" = "shift + 空格";
 
@@ -181,3 +222,11 @@
 
 /* Hotkey description to move forward in current view */
 "Move forward" = "向前移动";
+
+/* Password Recovery */
+"passwordRecovery_Disabled" = "Disabled";
+"passwordRecovery_SecretQuestion" = "Secret question";
+"passwordRecovery_SecretQuestion1" = "What is the name of your first pet ?";
+"passwordRecovery_SecretQuestion2" = "What was your first car ?";
+"passwordRecovery_SecretQuestion3" = "What is your favorite movie ?";
+"passwordRecovery_SecondaryEmail" = "Secondary E-mail";

UI/Contacts/ChineseChina.lproj/Localizable.strings

@@ -27,6 +27,9 @@
 "OfficePhone" = "工作电话";
 "Organization" = " 组织";
 "Work Phone" = "单位电话";
+"Cell" = "Cell";
+"Pager" = "传呼";
+"Pref" = "Pref";
 "Phone" = "电话";
 "Phones" = "电话";
 "Postal" = "邮政编码";
@@ -45,6 +48,90 @@
 "Carbon Copy (Cc)" = "抄送 (Cc)";
 "Blind Carbon Copy (Bcc)" = "密送 (Bcc)";
 
+/* Search scope: name fields */
+"name" = "Name";
+
+/* Search scope: name fields */
+"c_cn" = "Name";
+
+/* Search scope: secondary email field */
+"mozillanickname" = "Secondary email";
+
+/* Search scope: screen name field */
+"nsaimid" = "Screen name";
+
+/* Search scope: mail fields */
+"mail" = "Mail";
+
+/* Search scope: mail fields */
+"c_mail" = "Mail";
+
+/* Search scope: telephone field */
+"telephonenumber" = "Telephone";
+
+/* Search scope: telephone field */
+"homephone" = "Telephone";
+
+/* Search scope: mobile field */
+"mobile" = "Mobile";
+
+/* Search scope: fax field */
+"facsimiletelephonenumber" = "Fax";
+
+/* Search scope: pager field */
+"pager" = "Pager";
+
+/* Search scope: categories field */
+"c_categories" = "Categories";
+
+/* Search scope: categories field */
+"vcardcategories" = "Categories";
+
+/* Search scope: title field */
+"title" = "Title";
+
+/* Search scope: organization field */
+"c_o" = "Organization";
+
+/* Search scope: organization field */
+"o" = "Organization";
+
+/* Search scope: department field */
+"ou" = "Department";
+
+/* Search scope: city field */
+"l" = "City";
+
+/* Search scope: country field */
+"c" = "Country";
+
+/* Search scope: home address field */
+"mozillahomestreet" = "Home Address";
+
+/* Search scope: state/province field */
+"st" = "State/Province";
+
+/* Search scope: home state/province field */
+"mozillahomestate" = "Home State/Province";
+
+/* Search scope: zip/postal code field */
+"postalCode" = "Zip/Postal Code";
+
+/* Search scope: home zip/postal code field */
+"mozillahomepostalcode" = "Zip/Postal Code";
+
+/* Search scope: home country field */
+"mozillahomecountryname" = "Home Country";
+
+/* Search scope: home web page field */
+"mozillahomeurl" = "Home page";
+
+/* Search scope: work web page field */
+"mozillaworkurl" = "Web page";
+
+/* Search scope: note field */
+"description" = "Note";
+
 /* Subheader of empty addressbook */
 "No contact" = "无联系人";
 
@@ -134,7 +221,7 @@
 "New Addressbook..." = "新通讯录...";
 "Subscribe to an Addressbook..." = "订阅通讯录...";
 "Remove the selected Addressbook" = "删除选中的通讯录";
-"Subscribe to a shared folder" = "订阅到共享目录";
+"Subscribe to a shared contact" = "Subscribe to a shared addressbook";
 "Search User" = "搜索用户";
 "Name of the Address Book" = "通讯录名称";
 "Are you sure you want to delete the selected address book?"
@@ -155,6 +242,12 @@
 "Unable to subscribe to that folder!"
 = "不能订阅到该目录。";
 
+/* security */
+"Security" = "Security";
+"Uninstall" = "Uninstall";
+"Error reading the card certificate." = "Error reading the card certificate.";
+"No certificate associated to card." = "No certificate associated to card.";
+
 /* acls */
 "Access rights to" = "获得权限访问";
 "For user" = "给用户";
@@ -234,6 +327,7 @@
 "URL" = "网址";
 "New URL" = "新网址";
 "street" = "街道";
+"street (continued)" = "street (continued)";
 "Postoffice" = "邮局";
 "Region" = "地区";
 "Postal Code" = "邮编";
@@ -256,6 +350,7 @@
 "Synchronization" = "同步";
 "Synchronize" = "同步";
 "Sucessfully subscribed to address book" = "已成功订阅通讯录";
+"A similar card already exists. Would you like to save it anyway?" = "A similar card already exists. Would you like to save it anyway?";
 
 /* Aria label for scope of search on contacts */
 "Search scope" = "搜索范围";

UI/MailPartViewers/ChineseChina.lproj/Localizable.strings

@@ -34,8 +34,6 @@ reply_info = "这事你邀请信的答复。";
 "to" = "到";
 "Untitled" = "没有标题";
 "Size" = "大小";
-"Digital signature is not valid" = "无效的数字签名";
-"Message is signed" = "已签署的消息";
 "Subject" = "主题";
 "From" = "发件人";
 "Date" = "日期";
@@ -48,3 +46,4 @@ reply_info = "这事你邀请信的答复。";
 "Cancel" = "取消";
 "OK" = "OK";
 "Comment" = "评论";
+"Description" = "Description";

UI/MailerUI/ChineseChina.lproj/Localizable.strings

@@ -3,6 +3,7 @@
 /* Icon's label */
 "Create"      = "新建";
 "Empty Trash" = "清空回收站";
+"Empty Junk Folder" = "Empty Junk Folder";
 "Delete"      = "删除";
 "Expunge"     = "清空";
 "Forward"     = "转发";
@@ -73,8 +74,13 @@
 "An error occured while communicating with the mail server" = "连接服务器发生错误";
 
 /* Mailbox actions */
+
 /* Compact Folder success message */
 "Folder compacted" = "文件夹已压缩";
+
+/* Empty Junk Folder success message */
+"Junk folder emptied" = "Junk folder emptied";
+
 /* Empty Trash success message */
 "Trash emptied" = "回收站已清空";
 
@@ -82,7 +88,7 @@
 "Access rights to" = "访问权限到";
 "For user" = "给用户";
 "Any Authenticated User" = "任何认证的用户";
-"List and see this folder" = "列出并查看该目录";
+"View this folder" = "View this folder";
 "Read mails from this folder" = "读取该目录邮件";
 "Mark mails read and unread" = "邮件标记为已读或未读";
 "Modify the flags of the mails in this folder" = "修改该目录里的邮件标记";
@@ -104,7 +110,7 @@
 "To"            = "收件人";
 "Cc"            = "抄送";
 "Bcc"           = "密送";
-"Reply-To"	    = "回复到";
+"Reply-To"	= "回复到";
 "Add address"   = "新增地址";
 "Body"          = "正文";
 "Open" = "打开";
@@ -121,6 +127,7 @@
 "Edit Draft..." = "编辑草稿...";
 "Load Images" = "加载图片";
 "Return Receipt" = "回复回执";
+"Choose which identity to send this message from" = "Choose which identity to send this message from";
 "The sender of this message has asked to be notified when you read this message. Do you with to notify the sender?" = "此消息的发件人要求当你阅读该消息时得到通知。你是否希望通知发件人？";
 "Return Receipt (displayed) - %@"= "回复回执(已标示)- %@";
 "This is a Return Receipt for the mail that you sent to %@.\n\nNote: This Return 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." = "这是你发送邮件给 %@ 的回执。\n\n附注: 回执只通知邮件已收到， 并不保证收件人已经阅读内容。 ";
@@ -165,12 +172,22 @@
 "Mark Read"   = "标记为已读";
 "Untitled" = "无主题";
 
+/* Filter option in messages list */
+"Show unread messages only" = "Show unread messages only";
+
+/* Filter option in messages list */
+"Show flagged messages only" = "Show flagged messages only";
+
+/* Aria label for icon of labels */
+"Filtered by label" = "Filtered by label";
+
 /* Tree */
 "SentFolderName"   = "已发送";
 "TrashFolderName"  = "回收站";
 "InboxFolderName"  = "收件箱";
 "DraftsFolderName" = "草稿箱";
 "JunkFolderName" = "垃圾邮件";
+"TemplatesFolderName" = "Templates";
 "SieveFolderName"  = "过滤器";
 "Folders"          = "目录"; /* title line */
 
@@ -179,6 +196,7 @@
 
 /* Address Popup menu */
 "Add to Address Book..." = "添加到通讯录...";
+"Successfully created card" = "Successfully created card";
 "Compose Mail To" = "撰写邮件";
 "Create Filter From Message..." = "新增规则...";
 
@@ -228,6 +246,12 @@
 /* Message view "more" menu: create a task from message */
 "Convert To Task" = "转换成任务";
 
+/* Message view "more" menu: download message as an eml file */
+"Download message" = "Download message";
+
+/* Message view "more" menu: download message as a zip archive */
+"Download message (zip)" = "Download message (zip)";
+
 /* Message view "more" menu: download all attachments as a zip archive */
 "Download all attachments" = "下载所有的附件";
 
@@ -249,6 +273,12 @@
 /* Number of selected messages in list */
 "selected" = "已选";
 
+/* Date formatting from one time to another time */
+"to_time" = "to";
+
+/* Date formatting from one day to another day */
+"to_date" = "to";
+
 /* Encrypted message notification */
 "This message is encrypted" = "此消息已加密";
 
@@ -267,6 +297,18 @@
 /* Trying to access a non-existent certificate */
 "No certificate associated to account." = "没有与帐户关联的证书。";
 
+/* Invalid S/MIME signature */
+"Digital signature is not valid" = "Digital signature is not valid";
+
+/* Valid S/MIME signature */
+"Message is signed" = "Message is signed";
+
+/* Valid S/MIME signature but common name not found */
+"Message is signed but the certificate doesn't match the sender email address" = "Message is signed but the certificate doesn't match the sender email address";
+
+/* Unknown error while validating message signature */
+"Digital signature is not valid" = "Digital signature is not valid";
+
 "This Folder" = "该目录";
 
 /* Label popup menu */
@@ -302,6 +344,7 @@
 "Operation failed" = "操作失败";
 "Quota" = "使用空间";
 "quotasFormat" = "%{1} MB中已用 %{0}%";
+"messageQuotasFormat" = "%{0}% of %{1} msgs";
 "Unable to move/delete folder." = "无法移动/删除目录。";
 
 /* Alternative operation when folder cannot be deleted */
@@ -348,6 +391,12 @@
 "Send Anyway" = "一直发送";
 "Error while saving the draft" = "保存草稿時发生错误";
 
+/* Error when emptying trash */
+"Unable to empty the trash folder." = "Unable to empty the trash folder.";
+
+/* Error when emptying junk folder */
+"Unable to empty the junk folder." = "Unable to empty the junk folder.";
+
 /* Error when uploading a file attachment */
 "Error while uploading the file \"%{0}\":" = "上传文件\"%{0}\"出错";
 "There is an active file upload. Closing the window will interrupt it." = "关闭窗口将中断当前文件上传";
@@ -362,6 +411,9 @@
 "cannot send message: (smtp) all recipients discarded" = "无法发送： 所有收件人都无效。";
 "cannot send message (smtp) - recipients discarded" = "无法发送，下列帐号无法发送";
 "cannot send message: (smtp) error when connecting" = "无法发送： SMTP服务器接续失败。";
+"cannot sign email without certificate" = "The message can't be signed because there's no certificate associated to the mail account.";
+"cannot sign message because the certificate can't be read" = "The message can't be signed becasue the certificate associated to the mail account can't be read.";
+"cannot sign message because the certificate doesn't include the specified sender address" = "The message can't be signed because the sender address is not included in the certificate associated to the mail account.";
 
 /* Contacts list in mail editor */
 "Email" = "邮件帐号";
@@ -381,6 +433,9 @@
 "Set as Sent" = "设为已发送";
 "Set as Trash" = "设为放入回收站";
 
+/* Set the folder as the one holding the Templates */
+"Set as Templates" = "Set as Templates";
+
 /* Set the folder as the one holding Junk mails */
 "Set as Junk" = "设为垃圾邮件";
 
@@ -403,6 +458,18 @@
 "Your email has been sent" = "您的电子邮件已发送";
 "Folder compacted" = "文件夹已压缩";
 
+"New draft" = "New draft";
+"Create new draft with this template" = "Create new draft with this template";
+
+/* Advanced search */
+"Enter Subject" = "Enter Subject";
+"Enter From" = "Enter From";
+"Enter To" = "Enter To";
+"Enter Cc" = "Enter Cc";
+"Enter Body" = "Enter Body";
+"match" = "match";
+"does not match" = "does not match";
+
 /* Aria label for scope of search on messages */
 "Search scope" = "搜索范围";
 

UI/PreferencesUI/ChineseChina.lproj/Localizable.strings

@@ -40,14 +40,26 @@
 "Auto reply subject" = "自动回复主题";
 "You can write ${subject} to insert the original subject" = "你可以插入${subject}到原主题？";
 "Auto reply message" = "自动回复消息";
-"Email addresses (separated by commas)" = "邮件地址(用逗号分隔)";
+"Email addresses" = "Email addresses";
 "Add default email addresses" = "增加默认邮件地址";
 "Days between responses" = "回复间隔日数";
 "Do not send responses to mailing lists" = "不要回复到邮件列表";
+"Activation Constraints" = "Activation Constraints";
 "Enable auto reply on" = "启用自动回复功能";
-"Disable auto reply after" = "禁用回复无效";
+"First day of vacation" = "First day of vacation";
+"Disable auto reply after" = "Disable auto reply after";
+"Last day of vacation" = "Last day of vacation";
+"Enter date" = "Enter date";
+/* Enable auto reply at this time of the day */
+"Enable auto reply at" = "Enable auto reply at";
+"Enter time" = "Enter time";
+/* Disable auto reply at this time of the day */
+"Disable auto reply at" = "Disable auto reply at";
+"Enable auto reply on these days" = "Enable auto reply on these days";
 "Always send vacation message response" = "总是发送休假消息回复";
+"The vacation message is sent prior to apply your filters." = "The vacation message is sent prior to apply your filters.";
 "Discard incoming mails during vacation" = "丢弃假期收到的邮件";
+"The vacation message is sent but incoming messages are not delivered to your inbox." = "The vacation message is sent but incoming messages are not delivered to your inbox.";
 "Please specify your message and your email addresses for which you want to enable auto reply."
 = "请指定要自动回复的邮件内容和邮件地址。";
 "Your vacation message must not end with a single dot on a line." = "假期消息行不能以一个.结束。";
@@ -56,14 +68,19 @@
 
 /* forward messages */
 "Forward incoming messages" = "转发收到的邮件";
+"Always forward" = "Always forward";
+"Incoming messages are forwarded prior to apply your filters." = "Incoming messages are forwarded prior to apply your filters.";
 "Keep a copy" = "保留副本";
+"Enter an email" = "Enter an email";
+"Add another email" = "Add another email";
 "Please specify an address to which you want to forward your messages."
 = "请指定要转发的邮件地址。";
 "You are not allowed to forward your messages to an external email address." = "你未获准将消息转发至外部电子邮件地址。";
 "You are not allowed to forward your messages to an internal email address." = "你未获准将消息转发至内部电子邮件地址。";
+"You are not allowed to forward your messages to this domain:" = "You are not allowed to forward your messages to this domain:";
 
 /* d & t */
-"Current Time Zone" = "当前时区";
+"Time Zone" = "Time Zone";
 "Short Date Format" = "短日期格式";
 "Long Date Format" = "长日期格式";
 "Time Format" = "时间格式";
@@ -85,7 +102,9 @@
 "shortDateFmt_12" = "%Y-%m-%d";
 "shortDateFmt_13" = "%Y/%m/%d";
 "shortDateFmt_14" = "%Y.%m.%d";
-"shortDateFmt_15" = "";
+"shortDateFmt_15" = "%d.%m.%Y";
+"shortDateFmt_16" = "%d.%m.%y";
+"shortDateFmt_17" = "";
 
 "longDateFmt_0" = "%Y年%B%d日 %A";
 "longDateFmt_1" = "%Y年%B%d日";
@@ -124,6 +143,8 @@
 "Prevent from being invited to appointments" = "防止被邀请";
 "White list for appointment invitations" = "行程白名单";
 "Contacts Names" = "联系人姓名";
+"Duplicate name" = "Duplicate name";
+"Calendar categories must have unique names." = "Calendar categories must have unique names.";
 
 /* Default Calendar */
 "Default calendar" = "默认日程";
@@ -154,6 +175,7 @@
 "New label" = "新标签";
 "Show subscribed mailboxes only" = "仅显示订阅的邮箱";
 "Synchronize only default mail folders (EAS)" = "仅同步系统默认邮箱文件夹";
+"Fetch count of unseen messages for all mailboxes" = "Fetch count of unseen messages for all mailboxes";
 "Sort messages by threads" = "邮件按线索排序";
 "Always open mail composer" = "总是打开邮件编辑器";
 "Inside current window" = "在当前窗口内";
@@ -181,10 +203,15 @@
 "displayremoteinlineimages_always" = "一直";
 "Auto save every" = "自动保存";
 "minutes" = "分钟";
+"Automatically mark messages as read" = "Automatically mark messages as read";
+"Immediately on display" = "Immediately on display";
+"After displaying for" = "After displaying for";
+"seconds" = "seconds";
 
 /* Contact */
 "Personal Address Book" = "个人地址簿";
 "Collected Address Book" = "收集的地址簿";
+"Contact categories must have unique names." = "Contact categories must have unique names.";
 
 /* IMAP Accounts */
 "Settings" = "设定";
@@ -200,6 +227,10 @@
 "Email" = "邮件";
 "Reply To Email" = "回复邮件";
 "Signature" = "签名";
+"Identities" = "Identities";
+"Always use the default identity when replying to messages" = "Always use the default identity when replying to messages";
+"Default Identity" = "Default Identity";
+"New Identity" = "New Identity";
 "(Click to create)" = "(点击生成)";
 "Please enter your signature below" = "请在下面输入签名";
 "Please specify a valid sender address." = " 请指定有效的发件人地址。";
@@ -215,14 +246,23 @@
 "When composing a message" = "撰写邮件时";
 "Digitally sign the message by default" = "默认对消息进行数字签名";
 "Always try to encrypt the message" = "总是尝试加密消息";
+"An error occurred while importing the certificate. Verify your password." = "An error occurred while importing the certificate. Verify your password.";
 
 /* Additional Parameters */
 "Additional Parameters" = "附加设置";
 
 /* password */
+"Current password" = "Current password";
 "New password" = "新密码";
 "Confirmation" = "确认";
 "Change" = "修改";
+"Passwords don't match" = "Passwords don't match";
+"POLICY_MIN_LOWERCASE_LETTER" = "Minimum of %{0} lowercase letter";
+"POLICY_MIN_UPPERCASE_LETTER" = "Minimum of %{0} uppercase letter";
+"POLICY_MIN_DIGIT" = "Minimum of %{0} digit";
+"POLICY_MIN_SPECIAL_SYMBOLS" = "Minimum of %{0}special symbols";
+"POLICY_MIN_LENGTH" = "Minimum length of %{0} characters";
+
 
 /* Event+task classifications */
 "Default events classification" = "默认事项分类";
@@ -235,6 +275,7 @@
 "Calendar Category" = "日程类别";
 "Add Calendar Category" = "增加日程类别";
 "New category" = "新类别";
+"Reset to defaults" = "Reset to defaults";
 "Remove Calendar Category" = "移除日程类别";
 "Contact Category" = "联系人类别";
 "Add Contact Category" = "增加联系人分类";
@@ -307,6 +348,7 @@
 "refreshview_every_20_minutes" = "每20分钟";
 "refreshview_every_30_minutes" = "每30分钟";
 "refreshview_once_per_hour" = "每小时1次";
+"Enable Desktop Notifications" = "Enable Desktop Notifications";
 
 /* Return receipts */
 "When I receive a request for a return receipt" = "当我收到回执请求时";
@@ -438,3 +480,23 @@
 /* Limited Animation Mode */
 "animation_LIMITED" = "受限";
 "animation_NONE" = "无";
+
+/* 2FA */
+"Enable two-factor authentication using a TOTP application" = "Enable two-factor authentication using a TOTP application";
+"You must enter this key into your TOTP application." = "You must enter this key into your TOTP application.";
+"If you do not and you log out you will not be able to login again." = "If you do not and you log out you will not be able to login again.";
+"Enter TOTP verification code :" = "Enter TOTP verification code :";
+"Invalid TOTP verification code" = "Invalid TOTP verification code";
+
+/* External Sieve scripts */
+"An external Sieve script is active" = "An external Sieve script is active";
+"Sieve is a programming language that can be used for email filtering. If you let SOGo handle your filters, vacation and forward settings, your active script will be disabled." = "Sieve is a programming language that can be used for email filtering. If you let SOGo handle your filters, vacation and forward settings, your active script will be disabled.";
+"Let SOGo handle everything" = "Let SOGo handle everything";
+
+/* Password Recovery */
+"Password recovery mode" = "Password recovery";
+"Question" = "Question";
+"Secondary e-mail" = "Secondary e-mail";
+"Answer" = "Answer";
+"Password recovery" = "Password recovery";
+"Password change" = "Password change";

UI/Scheduler/ChineseChina.lproj/Localizable.strings

@@ -37,6 +37,8 @@
 "this month" = "当月";
 "Previous Month" = "前月";
 "Next Month" = "下月";
+/* Week number prefix */
+"W" = "W";
 
 /* Year */
 "this year" = "今年";
@@ -107,6 +109,7 @@
 "Name of the Calendar" = "日程名称";
 "new" = "新建";
 "Print view" = "预览打印";
+"Print" = "Print";
 "edit" = "编辑";
 "delete" = "删除";
 "proposal" = "建议";
@@ -147,6 +150,7 @@
 "Display events and tasks colors" = "显示事件和任务的颜色";
 "Borders" = "边界";
 "Backgrounds" = "背景";
+"Page Format" = "Page Format";
 
 /* Appointments */
 "Appointment viewer" = "查看邀约";
@@ -219,6 +223,11 @@
 "view_next31" = "接下来的31天";
 "view_thismonth" = "本月";
 "view_thisyear" = "今年";
+"view_last7" = "Last 7 days";
+"view_last14" = "Last 14 days";
+"view_last31" = "Last 31 days";
+"view_lastmonth" = "Last Month";
+"view_lastyear" = "Last Year";
 "view_future" = "全部未来事件";
 "view_selectedday" = "选中的日期";
 "view_not_started" = "尚未开始的任务";
@@ -391,6 +400,10 @@
 "From" = "发件人";
 "To" = "收件人";
 
+/* dates */
+"DateFrom" = "From";
+"DateTo" = "To";
+
 /* validation errors */
 validate_notitle           = "没有标题, 是否继续？";
 validate_invalid_startdate = "开始日期不正确";
@@ -437,16 +450,48 @@ validate_untilbeforeend    = "重复设定的时间必须晚于第一次开始
 = "你不能删除或退订自己的日程。";
 "Are you sure you want to delete the calendar \"%{0}\"?"
 = "确认删除%{0}\"?";
+"Are you sure you want to delete the selected components?"
+= "Are you sure you want to delete the selected components?";
 
-/* Legend */
+/* Participation role */
+"Role" = "Role";
+
+/* Participant role: participation is required */
 "Participant" = "参与者";
+
+/* Participant role: participation is required */
+"req-participant" = "Participant";
+
+/* Participant role: participation is optional */
 "Optional Participant" = "可选参与者";
+
+/* Participant role: participation is optional */
+"opt-participant" = "Optional Participant";
+
+/* Participant role: participant is copied for information purposes only */
 "Non Participant" = "非参与者";
+
+/* Participant role: participant is copied for information purposes only */
+"non-participant" = "Non Participant";
+
+/* Participant role: participant is chair of the calendar entity */
 "Chair" = "席位";
+
+/* Participant role: participant is chair of the calendar entity */
+"chair" = "Chair";
+
+/* Participant status: needs action */
 "Needs action" = "需要操作";
+
+/* Participant status: event accepted */
 "Accepted" = "已接受";
+
+/* Participant status: event declined */
 "Declined" = "已拒绝";
+
+/* Participant status: tentatively accepted */
 "Tentative" = "暂定";
+
 "Free" = "空闲";
 "Busy" = "忙碌";
 "Maybe busy" = "可能忙";
@@ -465,6 +510,8 @@ validate_untilbeforeend    = "重复设定的时间必须晚于第一次开始
 "and" = "和";
 "A time conflict exists with one or more attendees.\nWould you like to keep the current settings anyway?"
 = "在参加者里有一个事件冲突。\n你要保持现在的设定吗？";
+"Would you like to remove them and send the invitation to the remaining attendees?"
+= "Would you like to remove them and send the invitation to the remaining attendees?";
 
 /* events list */
 "Due" = "到期";
@@ -545,7 +592,7 @@ vtodo_class2 = "(机密任务)";
 "Move To" = "移至";
 "Copy To" = "复制到";
 "Subscriptions" = "订阅";
-"Subscribe to a shared folder" = "订阅共享的资料夹";
+"Subscribe to a shared calendar" = "Subscribe to a shared calendar";
 "Subscribe to a web calendar..." = "订阅到网页日程";
 "URL of the Calendar" = "日历链接";
 "Web Calendar" = "网页日程";
@@ -582,6 +629,7 @@ vtodo_class2 = "(机密任务)";
 "Rename" = "重命名";
 "Import Calendar" = "导入日程";
 "Select an ICS file." = "选择一个ICS文件。";
+"You have modified data unsaved. Do you want to close popup and loose data ?" = "You have modified data unsaved. Do you want to close popup and loose data ?";
 
 /* Notification when user subscribes to a calendar */
 "Successfully subscribed to calendar" = "已成功订阅日程";
@@ -611,4 +659,4 @@ vtodo_class2 = "(机密任务)";
 "hotkey_monthview" = "m";
 
 /* Hotkey to switch to multicolumn day view */
-"hotkey_multicolumndayview" = "c";
+"hotkey_multicolumndayview" = "c";