langpacks: update according to commit [6389]

git-svn-id: http://svn.miranda-ng.org/main/trunk@6410 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

19 files changed, 26 insertions, 27 deletions

diff --git a/langpacks/chinese/Plugins/AIM.txt b/langpacks/chinese/Plugins/AIM.txt
index acfd4e067a..08a37a1fb6 100644
--- a/langpacks/chinese/Plugins/AIM.txt
+++ b/langpacks/chinese/Plugins/AIM.txt
@@ -123,7 +123,7 @@ AIM 立即闲置
 不匹配的显示名称或密码.

 [You are connecting too frequently. Try waiting 10 minutes to reconnect.]

 您连接过于频繁. 请 10 分钟后再试.

-[Unknown error occured when attempting to connect.]

+[Unknown error occurred when attempting to connect.]

 尝试连接时发生未知错误.

 [Invalid SNAC header.]

 无效 SNAC 头.

@@ -209,7 +209,7 @@ SNAC 格式不正确.
 可写字段.

 [Unsupported Type.]

 尚未支持类型.

-[An Error has occured.]

+[An Error has occurred.]

 发生错误.

 [Invalid Account.]

 账户无效.

diff --git a/langpacks/chinese/Plugins/Alarms.txt b/langpacks/chinese/Plugins/Alarms.txt
index f530b8741e..ebd773665b 100644
--- a/langpacks/chinese/Plugins/Alarms.txt
+++ b/langpacks/chinese/Plugins/Alarms.txt
@@ -66,7 +66,7 @@
 我正在隐藏

 [Date and Time]

 日期及时间

-[Disable next occurence]

+[Disable next occurrence]

 禁用下次发生

 [Don't trigger on startup]

 不要在启动时触发

diff --git a/langpacks/chinese/Plugins/Clist_modern.txt b/langpacks/chinese/Plugins/Clist_modern.txt
index 4adefbe386..69f85967a6 100644
--- a/langpacks/chinese/Plugins/Clist_modern.txt
+++ b/langpacks/chinese/Plugins/Clist_modern.txt
@@ -527,7 +527,7 @@ x100 毫秒
 您想将联系人 '%s' 加至中继联系人 '%s'? 

 [Adding contact to MetaContact]

 添加联系人至中继联系人

-[Do you want contact '%s' to be default ?]

+[Do you want contact '%s' to be default?]

 您想将联系人 '%s' 设为默认值? 

 [Set default contact]

 设置默认联系人

diff --git a/langpacks/chinese/Plugins/CmdLine.txt b/langpacks/chinese/Plugins/CmdLine.txt
index 3e71b23608..dcd3803477 100644
--- a/langpacks/chinese/Plugins/CmdLine.txt
+++ b/langpacks/chinese/Plugins/CmdLine.txt
@@ -12,7 +12,7 @@
 无 '%s' 相关帮助.

 [Available commands: ]

 可用命令: 

-[Miranda has been closed or an error has occured while waiting for the result, could not process request.]

+[Miranda has been closed or an error has occurred while waiting for the result, could not process request.]

 Miranda 已被关闭或发生错误正在等待结果, 无法处理请求.

 ;file \plugins\CmdLine\MimCmd\src\MimCmd.cpp

 [%s usage:\n]

diff --git a/langpacks/chinese/Plugins/Contacts.txt b/langpacks/chinese/Plugins/Contacts.txt
index 88d16d0fd0..e006f7987c 100644
--- a/langpacks/chinese/Plugins/Contacts.txt
+++ b/langpacks/chinese/Plugins/Contacts.txt
@@ -26,7 +26,7 @@
 关闭

 [Contacts send error]

 联系人发送错误

-[An error has occured. The protocol reported the following error:]

+[An error has occurred. The protocol reported the following error:]

 发生错误. 协议已回报了此错误: 

 [Try again]

 再试一次

diff --git a/langpacks/chinese/Plugins/FTPFile.txt b/langpacks/chinese/Plugins/FTPFile.txt
index 8af2663906..eee633ec0f 100644
--- a/langpacks/chinese/Plugins/FTPFile.txt
+++ b/langpacks/chinese/Plugins/FTPFile.txt
@@ -168,7 +168,7 @@ FTP 文件 - 选择一个目录
 [UNKNOWN]

 未知

 ;file \plugins\FTPFileYM\src\job_packer.cpp

-[Error occured when zipping the file(s).]

+[Error occurred when zipping the file(s).]

 压缩文件时发生错误.

 [Do you really want to cancel this upload?]

 您真的想取消此上传?

diff --git a/langpacks/chinese/Plugins/FileAsMessage.txt b/langpacks/chinese/Plugins/FileAsMessage.txt
index 902eb2d7ea..e94bcd8816 100644
--- a/langpacks/chinese/Plugins/FileAsMessage.txt
+++ b/langpacks/chinese/Plugins/FileAsMessage.txt
@@ -53,7 +53,7 @@
 已由远程用户取消

 [New incoming file request. Do you want to proceed?]

 新到文件请求. 您是否想继续?

-[Paused, 'coz connection dropped]

+[Paused, because connection dropped]

 暂停, 'coz 连接已断开

 [Failed on file initialization]

 文件初始化失败

diff --git a/langpacks/chinese/Plugins/Folders.txt b/langpacks/chinese/Plugins/Folders.txt
index 9067aa7343..acc637ee65 100644
--- a/langpacks/chinese/Plugins/Folders.txt
+++ b/langpacks/chinese/Plugins/Folders.txt
@@ -19,7 +19,7 @@
 [Close]

 关闭

 ;file \plugins\Folders\src\dlg_handlers.cpp

-[Some changes weren't saved. Apply the changes now ?]

+[Some changes weren't saved. Apply the changes now?]

 某些变更尚未保存. 现在要应用变更吗? 

 [Changes not saved]

 变更尚未保存

diff --git a/langpacks/chinese/Plugins/GG.txt b/langpacks/chinese/Plugins/GG.txt
index 354171b39f..c080b7d399 100644
--- a/langpacks/chinese/Plugins/GG.txt
+++ b/langpacks/chinese/Plugins/GG.txt
@@ -149,9 +149,9 @@ Gadu-Gadu 号码:
 通信使用 [img] BBCode

 [You need to specify your registration e-mail first.]

 您需要先指定注册邮箱. 

-[Your password will be sent to your registration e-mail.\nDo you want to continue ?]

+[Your password will be sent to your registration e-mail.\nDo you want to continue?]

 您的密码将会发送到注册邮箱. \n要继续吗? 

-[You should disconnect before making any permanent changes with your account.\nDo you want to disconnect now ?]

+[You should disconnect before making any permanent changes with your account.\nDo you want to disconnect now?]

 您应该在做出任何帐号永久变更前先断开连接. \n您想立即断开连接吗? 

 [Allow]

 允许

@@ -181,7 +181,7 @@ Gadu-Gadu 号码
 打开会议(&C)...

 [&Clear ignored conferences]

 清除已忽略会议(&C)

-[%s has initiated conference with %d participants (%d unknowns).\nDo you want to participate ?]

+[%s has initiated conference with %d participants (%d unknowns).\nDo you want to participate?]

 %s 已发起会议, 有 %d 名参与者 (其中 %d 已知). \n您要加入吗? 

 [%s initiated the conference.]

 %s 已经开始会议. 

diff --git a/langpacks/chinese/Plugins/ICQ.txt b/langpacks/chinese/Plugins/ICQ.txt
index e00c5eef02..e3689d49f8 100644
--- a/langpacks/chinese/Plugins/ICQ.txt
+++ b/langpacks/chinese/Plugins/ICQ.txt
@@ -327,7 +327,7 @@ ICQ 提示
 [Secure login failed.\nInvalid key length.]

 安全登录失败. \n密钥长度无效. 

 ;file \protocols\IcqOscarJ\src\icqosc_svcs.cpp

-[Are you sure you want to revoke user's authorization (this will remove you from his/her list on some clients) ?]

+[Are you sure you want to revoke user's authorization? (this will remove you from his/her list on some clients)]

 您确定要撤销用户的授权 (某些客户端会将您从他/她的列表中移除)? 

 [** This message was blocked by the ICQ server ** The message was invalid.]

 ** 此消息已被 ICQ 服务器封锁 ** 消息无效. 

diff --git a/langpacks/chinese/Plugins/Jabber.txt b/langpacks/chinese/Plugins/Jabber.txt
index 0d0b3d2ed6..6ac6ce93b3 100644
--- a/langpacks/chinese/Plugins/Jabber.txt
+++ b/langpacks/chinese/Plugins/Jabber.txt
@@ -1235,7 +1235,7 @@ Facebook 聊天
 ;file \protocols\JabberG\src\jabber_rc.cpp

 [Command completed successfully]

 命令已成功完成

-[Error occured during processing command]

+[Error occurred during processing command]

 处理命令期间发生错误

 [Set status]

 设置状态

@@ -1285,7 +1285,7 @@ Facebook 聊天
 %d 消息转发

 [Workstation successfully locked]

 工作站成功锁定

-[Error %d occured during workstation lock]

+[Error %d occurred during workstation lock]

 工作站锁定后发生错误 %d

 [Confirmation needed]

 确认需要

diff --git a/langpacks/chinese/Plugins/Msg_Export.txt b/langpacks/chinese/Plugins/Msg_Export.txt
index e494849de3..9a57faba15 100644
--- a/langpacks/chinese/Plugins/Msg_Export.txt
+++ b/langpacks/chinese/Plugins/Msg_Export.txt
@@ -94,8 +94,8 @@
 文件

 [Nick]

 昵称

-[You have unapplyed changes do you wish to apply these first ?]

-您已取消变更套用, 是否想首先套用这些 ?

+[You have unapplyed changes do you wish to apply these first?]

+您已取消变更套用, 是否想首先套用这些?

 [Select Destination Directory]

 选择目标目录

 [Export Protocols]

diff --git a/langpacks/chinese/Plugins/Scriver.txt b/langpacks/chinese/Plugins/Scriver.txt
index 708947b932..e14adee4cc 100644
--- a/langpacks/chinese/Plugins/Scriver.txt
+++ b/langpacks/chinese/Plugins/Scriver.txt
@@ -114,7 +114,7 @@
 显示气球式弹出窗口

 [Send Error]

 发送错误

-[An error has occured. The protocol reported the following error:]

+[An error has occurred. The protocol reported the following error:]

 发生错误. 协议已回报了此错误: 

 [while sending the following message:]

 发送下列消息时: 

@@ -126,8 +126,8 @@
 消息会话

 [Send To All Tabs]

 发送到所有标签

-[You are about to send a message to all open tabs.\nAre you sure ?]

-您正准备发送消息至所有已打开标签. \n您确定吗? 

+[You are about to send a message to all open tabs.\nAre you sure?]

+您正准备发送消息至所有已打开标签.\n您确定吗? 

 [Remember my choice for this container]

 记住针对此容器的决定

 [Yes]

@@ -549,7 +549,7 @@ Miranda 无法加载内置消息模块, riched20.dll 丢失. 如您在使用 Win
 [Outgoing]

 发送

 ;file \plugins\Scriver\src\msgtimedout.cpp

-[An unknown error has occured.]

+[An unknown error has occurred.]

 发生未知错误

 ;file \plugins\Scriver\src\msgwindow.cpp

 [Always On Top]

diff --git a/langpacks/chinese/Plugins/SendSS.txt b/langpacks/chinese/Plugins/SendSS.txt
index b6f504155b..71a6d2d126 100644
--- a/langpacks/chinese/Plugins/SendSS.txt
+++ b/langpacks/chinese/Plugins/SendSS.txt
@@ -47,7 +47,7 @@
 [Size (HxW) :]

 大小 (HxW): 

 ;file \plugins\SendScreenshotPlus\src\CSend.cpp

-[An unknown error has occured.]

+[An unknown error has occurred.]

 发生未知错误

 [Error]

 错误

diff --git a/langpacks/chinese/Plugins/UInfoEx.txt b/langpacks/chinese/Plugins/UInfoEx.txt
index 70d774b5b7..a19fd49238 100644
--- a/langpacks/chinese/Plugins/UInfoEx.txt
+++ b/langpacks/chinese/Plugins/UInfoEx.txt
@@ -268,7 +268,7 @@
 ;file \plugins\UserInfoEx\src\classPsTree.cpp

 [Due to a parameter error, one of the treeitems can't be added!]

 由于参数错误, 其中一个树项目不能添加!

-[An fatal error occured on adding a property sheet page!\nDialog creation aborted!]

+[An fatal error occurred on adding a property sheet page!\nDialog creation aborted!]

 添加属性表页时发生一个致命的错误!\n对话框创建中止!

 [Rename Item]

 重命名项目

diff --git a/langpacks/chinese/Plugins/VersionInfo.txt b/langpacks/chinese/Plugins/VersionInfo.txt
index c3c9bde798..7b350c4ed1 100644
--- a/langpacks/chinese/Plugins/VersionInfo.txt
+++ b/langpacks/chinese/Plugins/VersionInfo.txt
@@ -76,7 +76,7 @@ Miranda 版本消息
 使用文件夹插件自定义

 [Are you sure you want to enable this option ?\nPlease only enable this option if you really know what you're doing and what the option is for or if someone asked you to do it.]

 您确定要启用此选项? \n如您知道在做什么, 知道此选项功用或某人让您这样做时, 请启用此项目. 

-[Show plugin UUIDs ?]

+[Show plugin UUIDs?]

 显示插件 UUID? 

 ;file \plugins\VersionInfo\src\hooked_events.cpp

 [VersionInfo]

diff --git a/langpacks/chinese/Plugins/WhenWasIt.txt b/langpacks/chinese/Plugins/WhenWasIt.txt
index 6d5aaecb7c..9825bfa933 100644
--- a/langpacks/chinese/Plugins/WhenWasIt.txt
+++ b/langpacks/chinese/Plugins/WhenWasIt.txt
@@ -83,7 +83,7 @@ mBirthday 模块
 除忽略外所有联系人

 [All contacts except hidden and ignored ones]

 除隐藏及忽略外所有联系人

-[Set popup delay when notifying of upcoming birthdays.\nFormat: default delay [ | delay for birthdays occuring today]]

+[Set popup delay when notifying of upcoming birthdays.\nFormat: default delay [ | delay for birthdays occurring today]]

 通知即将到来生日时设置弹出窗口延时.\n格式: 默认延时 [ | 今日生日延时]

 [Please select the module where you want the date of birth to be saved.\r\n"UserInfo" is the default location.\r\nUse "Protocol module" to make the data visible in User Details.\n"mBirthday module" uses the same module as mBirthday plugin.]

 您想挽救生日数据时请选择模块.\r\n"用户信息" 于默认位置.\r\n使用 "协议模块" 使数据显示在用户详细资料中.\n"mBirthday 模块" 为 mBirthday 插件使用相同模块.

diff --git a/langpacks/chinese/Plugins/Xfire.txt b/langpacks/chinese/Plugins/Xfire.txt
index a05c25db04..d925583f3b 100644
--- a/langpacks/chinese/Plugins/Xfire.txt
+++ b/langpacks/chinese/Plugins/Xfire.txt
@@ -1,5 +1,4 @@
 #muuid {9b8e1735-970d-4ce0-930c-a561956bdca2}

-;langpack template for Xfire

 ;file \protocols\Xfire\res\Kopie von resource.rc

 [Password:]

 密码: 

diff --git a/langpacks/chinese/Plugins/YAMN.txt b/langpacks/chinese/Plugins/YAMN.txt
index ef27acd0ca..101c5cac69 100644
--- a/langpacks/chinese/Plugins/YAMN.txt
+++ b/langpacks/chinese/Plugins/YAMN.txt
@@ -200,7 +200,7 @@ YAMN (内置 POP3) 读取错误
 读取资料时发生内存分配错误

 [Reading file error. File already in use?]

 文件读取时发生错误. 文件已在使用中? 

-[Error while copying data to disk occured. File in use?]

+[Error while copying data to disk occurred. Is file in use?]

 复制资料至磁盘时发生错误. 文件正在使用中? 

 [POP3 plugin- write file error]

 POP3 插件- 读取文件错误