15 files changed, 55 insertions, 81 deletions
diff --git a/langpacks/chinese/=CORE=.txt b/langpacks/chinese/=CORE=.txt
index b290ff14a2..ed7e742d0a 100644
--- a/langpacks/chinese/=CORE=.txt
+++ b/langpacks/chinese/=CORE=.txt
@@ -260,11 +260,11 @@ SSL 传输
 请填写以下表格以创建新配置文件
 [Profile]
 配置文件
-[e.g. Workplace]
+[e.g., Workplace]
 例如工作地点
 [You can select a different profile driver from the default, it may offer more features or abilities, if in doubt use the default.]
 您可以不使用默认配置驱动程序, 可提供更多功能. 如有疑问, 请使用默认. 
-[e.g. Miranda Database]
+[e.g., Miranda Database]
 例如 Miranda 数据库
 [Driver]
 驱动程序
@@ -1758,12 +1758,6 @@ Miranda NG 主页(&M)
 发送消息 (10x10)
 [Last message received on %s at %s.]
 最后消息接收于 %s %s. 
-[signed off (was %s)]
-已注销 (之前是 %s)
-[signed on (%s)]
-已登录 (%s)
-[is now %s (was %s)]
-现在 %s (之前是 %s)
 [%s is typing a message...]
 %s 正在键入消息...
 [File sent]
@@ -2120,7 +2114,7 @@ Miranda NG 选项
 无法以服务模式加载插件! 
 [Unable to start any of the installed contact list plugins, I even ignored your preferences for which contact list couldn't load any.]
 无法启用任何已安装联系人列表插件, 甚至忽略参数选项中选定联系人列表都无法加载. 
-[Can't find a contact list plugin! You need StdClist or any other clist plugin.]
+[Can't find a contact list plugin! You need StdClist or any other contact list plugin.]
 无法找到联系人列表插件! 您需要 clist_classic 或其它 clist 插件.
 [Plugin]
 插件
diff --git a/langpacks/chinese/Plugins/Clist_modern.txt b/langpacks/chinese/Plugins/Clist_modern.txt
index 1ba61b2f69..d006f70db4 100644
--- a/langpacks/chinese/Plugins/Clist_modern.txt
+++ b/langpacks/chinese/Plugins/Clist_modern.txt
@@ -135,7 +135,7 @@ W x H: 0 x 0 像素
 多行状态栏: 
 [Accounts per line]
 在每一行显示帐号
-[* To increase Status Bar height:\nSet in Main menu: Frames->Status Bar->Show TitleBar then pull appeared title of status bar up or down.]
+[* To increase Status Bar height:\nSet in Main menu: Frames->Status Bar->Show title then pull appeared title of status bar up or down.]
 * 增加状态栏高度: \n由主菜单: 框架->状态栏->显示标题栏, 然后将状态栏标题向上或向下拉. 
 [Hold [Shift] to inverse [Right Click] behavior]
 按下 [Shift] 键反向 [右击] 行为
@@ -409,7 +409,7 @@ x100 毫秒
 以层叠方式显示标准状态
 [Right-To-Left reading mode (mirror template)]
 由右至左阅读模式 (镜像模板)
-[Replace smileys in clist]
+[Replace smileys in contact list]
 替换联系人列表中的表情符号
 [Draw smileys on first line]
 在第一行绘制表情符号
@@ -529,9 +529,9 @@ x100 毫秒
 删除群组(&D)
 [Contact List smileys]
 联系人列表表情
-[List Background]
+[List background]
 列表背景
-[StatusBar Background]
+[Status bar background]
 状态栏背景
 [Do you want contact '%s' to be converted to MetaContact and '%s' be added to it?]
 您想将联系人 '%s' 转换为中继联系人并将 '%s' 加至该中继联系人? 
@@ -617,16 +617,8 @@ x100 毫秒
 选定菜单文本
 [Frame title text]
 框架标题文本
-[Statusbar text]
-状态栏文本
 [3rd party frames transparent back color]
 第三方框架使用透明背景色
-[General]
-常规
-[List]
-列表
-[Window]
-窗口
 [Not focused]
 未获取焦点
 [Offline]
@@ -669,6 +661,12 @@ x100 毫秒
 左方边缘后
 [Behind right edge]
 右方边缘后
+[General]
+常规
+[List]
+列表
+[Window]
+窗口
 [Event Area]
 事件区域
 [No Events]
@@ -809,7 +807,7 @@ Angeli-Ka (图形), FYR (模板)
 显示标题(&S)
 [&Expanded]
 扩展(&E)
-[Show TitleBar]
+[Show title bar]
 显示标题栏
 [&New SubGroup]
 新增子群组(&N)
diff --git a/langpacks/chinese/Plugins/Clist_mw.txt b/langpacks/chinese/Plugins/Clist_mw.txt
index 5522622484..6dd5cf0b80 100644
--- a/langpacks/chinese/Plugins/Clist_mw.txt
+++ b/langpacks/chinese/Plugins/Clist_mw.txt
@@ -3,7 +3,7 @@
 ;  File: Clist_mw.dll
 ;  Plugin: MultiWindow contact list
 ;  Version: 0.9.0.0
-;  Authors: 
+;  Authors: Bethoven 
 ;============================================================
 [Stretch to width]
 拉伸至宽度
@@ -177,7 +177,7 @@
 下列清况将整个列表变灰: 
 [Dim idle contacts]
 暗淡化闲置联系人
-[Contact List Background]
+[Contact list background]
 联系人列表背景
 [MetaContacts supporting]
 支持中继联系人
@@ -203,7 +203,7 @@
 显示面板斜角
 [Use connecting Icon]
 使用连接图标
-[Use New Drawer for StatusBar]
+[Use new drawer for status bar]
 状态栏使用新绘制方法
 [&Main menu]
 主菜单(&M)
@@ -291,11 +291,11 @@
 快速搜索文本
 [List]
 列表
-[List Background]
+[List background]
 列表背景
 [List MetaContacts]
 列出中继联系人
-[StatusBar Background]
+[Status bar background]
 状态栏背景
 [Not focused]
 未获取焦点
@@ -333,5 +333,3 @@
 关闭 Miranda
 [Frames]
 框架
-[Show TitleBar]
-显示标题栏
diff --git a/langpacks/chinese/Plugins/Clist_nicer.txt b/langpacks/chinese/Plugins/Clist_nicer.txt
index 8d42d7e984..4621b041b2 100644
--- a/langpacks/chinese/Plugins/Clist_nicer.txt
+++ b/langpacks/chinese/Plugins/Clist_nicer.txt
@@ -333,7 +333,7 @@
 边角半径
 [Group top padding]
 群组顶端补位
-[Frame titlebar height]
+[Frame title bar height]
 框架标题栏高度
 [Ignore selection for groups]
 群组忽略选择
@@ -603,9 +603,9 @@
 细框线
 [No border]
 无框线
-[The clist cannot be docked when using the default title bar and border. Use a toolwindow or borderless style instead.]
+[The contact list cannot be docked when using the default title bar and border. Use a toolwindow or borderless style instead.]
 使用默认标题栏及框线时无法停靠联系人列表. 请改用工具窗口或无框线样式. 
-[Clist docking]
+[Contact list docking]
 停靠联系人列表
 [No events...]
 无事件...
@@ -621,7 +621,7 @@
 框架使用皮肤(&S)
 [Frames]
 框架
-[Show TitleBar]
+[Show title bar]
 显示标题栏
 [Skinned frame]
 框架使用皮肤
diff --git a/langpacks/chinese/Plugins/IRC.txt b/langpacks/chinese/Plugins/IRC.txt
index 55794309ce..c35dc1854c 100644
--- a/langpacks/chinese/Plugins/IRC.txt
+++ b/langpacks/chinese/Plugins/IRC.txt
@@ -469,8 +469,6 @@ WhoIs 信息(&W)
 请输入要加入频道
 [Please select IRC network and enter the password if needed]
 请选择 IRC 网络并在需要时输入密码
-[Change nick name]
-变更昵称
 [Please enter a unique nickname]
 请输入独有的昵称
 [Please enter your authentification code]
diff --git a/langpacks/chinese/Plugins/Jabber.txt b/langpacks/chinese/Plugins/Jabber.txt
index fb34a0f5e0..c668a8ae02 100644
--- a/langpacks/chinese/Plugins/Jabber.txt
+++ b/langpacks/chinese/Plugins/Jabber.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Jabber.dll
 ;  Plugin: Jabber Protocol
-;  Version: 0.11.0.3
+;  Version: 0.11.0.4
 ;  Authors: George Hazan, Maxim Mluhov, Victor Pavlychko, Artem Shpynov, Michael Stepura
 ;============================================================
 [Edit Note]
@@ -703,8 +703,6 @@ Jabber 资源
 已注册传输
 [Local Server Transports]
 本地服务器传输
-[Browse Chatrooms]
-浏览聊天室
 [Create/Join group chat]
 建立/加入群组聊天
 [Roster editor]
@@ -1073,8 +1071,6 @@ Jabber 协议选项
 角色变更
 [Status changes]
 状态变更
-[Nick Name]
-呢称
 [Group]
 群组
 [Subscription]
diff --git a/langpacks/chinese/Plugins/NimContact.txt b/langpacks/chinese/Plugins/NimContact.txt
index 1f0be497fa..73ae7758d4 100644
--- a/langpacks/chinese/Plugins/NimContact.txt
+++ b/langpacks/chinese/Plugins/NimContact.txt
@@ -37,7 +37,7 @@
 打开文件(&P)
 [O&pen Folder]
 打开文件夹(&P)
-[CList Settings]
+[Contact list settings]
 联系人列表设置
 [Group:]
 群组: 
diff --git a/langpacks/chinese/Plugins/Nudge.txt b/langpacks/chinese/Plugins/Nudge.txt
index 56802b0dc3..31c38a2fa9 100644
--- a/langpacks/chinese/Plugins/Nudge.txt
+++ b/langpacks/chinese/Plugins/Nudge.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Nudge.dll
 ;  Plugin: Nudge
-;  Version: 0.0.2.0
+;  Version: 0.1.0.0
 ;  Authors: Tweety/GouZ, FREAK_THEMIGHTY
 ;============================================================
 [Protocol options]
@@ -51,7 +51,7 @@
 接听电话
 [Out to lunch]
 外出用餐
-[Shaking Clist Options]
+[Shaking contact list options]
 震动联系人列表选项
 [Number of moves]
 移动数量
diff --git a/langpacks/chinese/Plugins/Scriver.txt b/langpacks/chinese/Plugins/Scriver.txt
index c661c590de..e21d33d3ac 100644
--- a/langpacks/chinese/Plugins/Scriver.txt
+++ b/langpacks/chinese/Plugins/Scriver.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Scriver.dll
 ;  Plugin: Scriver
-;  Version: 2.10.0.2
+;  Version: 2.10.1.0
 ;  Authors: Miranda NG Development Team
 ;============================================================
 [Behavior]
@@ -51,13 +51,13 @@
 群组聊天使用独立窗口
 [Limit number of group chats tabs per window to]
 群组聊天每窗口限制标签数量为
-[Show titlebar]
+[Show title bar]
 显示标题栏
 [Show status bar]
 显示状态栏
 [Show toolbar]
 显示工具栏
-[Show infobar]
+[Show info bar]
 显示信息栏
 [Use the contact's status icon as the window icon]
 使用联系人状态图标作为窗口图标
@@ -371,25 +371,25 @@ Unicode 已关闭
 导航: 下一个标签
 [Navigate: Tab %d]
 浏览: Tab %d
-[Window: Toggle Statusbar]
+[Window: Toggle status bar]
 窗口: 切换状态栏
-[Window: Toggle Titlebar]
+[Window: Toggle title bar]
 窗口: 切换标题栏
-[Window: Toggle Toolbar]
+[Window: Toggle toolbar]
 窗口: 切换工具栏
-[Window: Toggle Infobar]
+[Window: Toggle info bar]
 窗口: 切换信息栏
-[Window: Clear Log]
+[Window: Clear log]
 窗口: 清除记录
 [Window: Minimize]
 窗口: 最小化
-[Window: Close Tab]
+[Window: Close tab]
 窗口: 关闭标签
 [Action: Quote]
 操作: 报价
-[Action: Send to All]
+[Action: Send to all]
 活动: 发送至所有
-[Action: Paste & Send]
+[Action: Paste and send]
 操作: 粘贴并发送
 [Smiley]
 表情
@@ -415,12 +415,6 @@ Unicode 已关闭
 引用文本
 [User Menu - %s]
 用户菜单 - %s
-[signed off (was %s)]
-已注销 (之前是 %s)
-[signed on (%s)]
-已登录 (%s)
-[is now %s (was %s)]
-现在 %s (之前是 %s)
 [Sending in progress: %d message(s) left...]
 发送中: 尚余 %d 个消息
 [%s is typing a message...]
@@ -459,11 +453,11 @@ Unicode 已关闭
 发送网址
 [Incoming URL]
 传入网址
-[Infobar contact name]
+[Info bar contact name]
 信息栏 联系人名称
-[Infobar background]
+[Info bar background]
 信息栏背景
-[Infobar status message]
+[Info bar status message]
 信息栏 状态消息
 [Others nicknames]
 其它昵称
@@ -771,7 +765,7 @@ Miranda 无法加载内置消息模块, riched20.dll 丢失. 如您在使用 Win
 控制此房间 (CTRL+O)
 [Enable/disable the event filter (CTRL+F)]
 启用/禁用事件过滤器 (CTRL+F)
-[Nick name]
+[Nickname]
 昵称
 [Unique ID]
 独有 ID
diff --git a/langpacks/chinese/Plugins/TabSRMM.txt b/langpacks/chinese/Plugins/TabSRMM.txt
index 81a27740e8..04272f2fd8 100644
--- a/langpacks/chinese/Plugins/TabSRMM.txt
+++ b/langpacks/chinese/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.2.0.0
+;  Version: 3.2.0.1
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [You can add the user by user name or his ID. Wildcards are allowed and recommended.]
@@ -95,9 +95,9 @@
 消息文本突出显示
 [Enable highlighting for message text]
 启用消息文本突出显示
-[Words to highlight, wildcards like * and ? are allowed, separate multiple entries with spaces. Leave it empty if you only want to highlight your own nick name.]
+[Words to highlight, wildcards like * and ? are allowed, separate multiple entries with spaces. Leave it empty if you only want to highlight your own nickname.]
 突出显示字词, 允许通配符像 * 和 ?, 用空格分隔多个条目. 如果您只想突出显示自己的呢称请留空.
-[Highlight messages containing my own nick name]
+[Highlight messages containing my own nickname]
 突出显示消息中自己的呢称
 [List]
 列表
@@ -839,8 +839,6 @@ Ctrl+Enter 发送消息 (总是启用)
 事件过滤器 - 按右键设置, 左键激活/失效
 [<Separator>]
 <分隔线>
-[Hide titlebar]
-隐藏标题栏
 [Message Session...]
 消息会话...
 [Default container]
@@ -1417,7 +1415,7 @@ TabSRMM 消息 (%s)
 使用传入/发送图标
 [Use Message Grouping]
 使用消息分组
-[Simple text formatting (*bold* etc.)]
+[Simple text formatting (*bold*, etc.)]
 简单文本格式化 (例如 *bold*)
 [Support BBCode formatting]
 支持 BBCode 格式化
@@ -1859,8 +1857,6 @@ Aero 发光效果
 突出显示用户...
 [Edit Highlight List...]
 编辑高亮列表...
-[Nick name]
-昵称
 [Unique ID]
 独有 ID
 [Nick]
diff --git a/langpacks/chinese/Plugins/Tipper.txt b/langpacks/chinese/Plugins/Tipper.txt
index 8a13b6f066..5ae04ce862 100644
--- a/langpacks/chinese/Plugins/Tipper.txt
+++ b/langpacks/chinese/Plugins/Tipper.txt
@@ -123,7 +123,7 @@
 状态
 [Miranda uptime]
 运行时间
-[Clist event]
+[Contact list event]
 联系人列表事件
 [Jabber activity]
 Jabber 活动
diff --git a/langpacks/chinese/Plugins/UInfoEx.txt b/langpacks/chinese/Plugins/UInfoEx.txt
index d2ca216487..d6e8263b4b 100644
--- a/langpacks/chinese/Plugins/UInfoEx.txt
+++ b/langpacks/chinese/Plugins/UInfoEx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: UInfoEx.dll
 ;  Plugin: User info ext
-;  Version: 0.8.4.2
+;  Version: 0.8.5.0
 ;  Authors: DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
 ;============================================================
 [Edit Contact Information]
@@ -361,17 +361,17 @@ IM 命名
 导出: 文件夹
 [Default]
 默认
-[Details Infobar]
+[Details info bar]
 详细资料信息栏
-[Phone Infobar]
+[Phone info bar]
 电话信息栏
-[E-Mail Infobar]
+[E-Mail info bar]
 邮件信息栏
 [Export VCard]
 导出 VCard
 [Import VCard]
 导入 vCard
-[Anniversary Infobar]
+[Anniversary info bar]
 周年纪念信息栏
 [Goto]
 转到
diff --git a/langpacks/chinese/Plugins/Xfire.txt b/langpacks/chinese/Plugins/Xfire.txt
index 8efa705e6d..eec7bea9b2 100644
--- a/langpacks/chinese/Plugins/Xfire.txt
+++ b/langpacks/chinese/Plugins/Xfire.txt
@@ -57,7 +57,7 @@
 封锁用户列表
 [This list contains all your blocked Xfire users. You can remove one, if you wanna allow him to send you a friend request.]
 此列表包含您的所有 Xfire 封锁用户. 如果您想允许其发送好友邀请可于此移除.
-[You can simply block someone, if you right click on his friend request in clist and choose Block User...]
+[You can simply block someone, if you right click on his friend request in contact list and choose Block User...]
 如您右键好友列表中的联系人并选择封锁用户, 可非常简单的封锁某人...
 [This file is used for the game search, game detection and game ID resolving. It contains all Xfire supported games.]
 此文件用于游戏搜索, 游戏检测及游戏解析. 它包含所有 Xfire 支持的游戏.
diff --git a/langpacks/chinese/Plugins/YAMN.txt b/langpacks/chinese/Plugins/YAMN.txt
index f4b2807246..3160bc8deb 100644
--- a/langpacks/chinese/Plugins/YAMN.txt
+++ b/langpacks/chinese/Plugins/YAMN.txt
@@ -43,7 +43,7 @@
 从菜单检查
 [Use contact notification for this account]
 为此帐号使用联系人通知
-[Replace nick name]
+[Replace nickname]
 替换昵称
 [Disable Events]
 禁用事件
diff --git a/langpacks/chinese/Plugins/ZeroNotify.txt b/langpacks/chinese/Plugins/ZeroNotify.txt
index e90431cd0a..6258db8a93 100644
--- a/langpacks/chinese/Plugins/ZeroNotify.txt
+++ b/langpacks/chinese/Plugins/ZeroNotify.txt
@@ -9,7 +9,7 @@
 增加选项当协议处于特定状态时自动禁用通知.
 [No sounds when:]
 无声音于:
-[No CLIST blink when:]
+[No CList blink when:]
 无联系人列表闪烁于:
 [No SysTray blink when:]
 无系统托盘闪烁于: