From 60662d67733eedf668cddd8981aa1a3213b89f10 Mon Sep 17 00:00:00 2001
From: Dart Raiden <wowemuh@gmail.com>
Date: Wed, 11 Dec 2013 18:32:55 +0000
Subject: langpacks: update according to commit [7021]

git-svn-id: http://svn.miranda-ng.org/main/trunk@7129 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 langpacks/chinese/Plugins/BasicHistory.txt |  2 +-
 langpacks/chinese/Plugins/Contacts.txt     |  2 +-
 langpacks/chinese/Plugins/Dbx_mmap.txt     | 48 ------------------------------
 langpacks/chinese/Plugins/Facebook.txt     |  2 +-
 langpacks/chinese/Plugins/ICQ.txt          | 34 ++++++++++-----------
 langpacks/chinese/Plugins/Msg_Export.txt   |  2 +-
 langpacks/chinese/Plugins/Scriver.txt      |  4 +--
 langpacks/chinese/Plugins/TabSRMM.txt      | 14 +++------
 langpacks/chinese/Plugins/UInfoEx.txt      |  2 +-
 9 files changed, 28 insertions(+), 82 deletions(-)

(limited to 'langpacks/chinese/Plugins')

diff --git a/langpacks/chinese/Plugins/BasicHistory.txt b/langpacks/chinese/Plugins/BasicHistory.txt
index a62b194a29..61f9233f26 100644
--- a/langpacks/chinese/Plugins/BasicHistory.txt
+++ b/langpacks/chinese/Plugins/BasicHistory.txt
@@ -68,7 +68,7 @@
 选项
 [Filters]
 过滤器
-[Fonts & Colors]
+[Fonts and colors]
 字体及颜色
 [Icons]
 图标
diff --git a/langpacks/chinese/Plugins/Contacts.txt b/langpacks/chinese/Plugins/Contacts.txt
index e006f7987c..7d9fd80028 100644
--- a/langpacks/chinese/Plugins/Contacts.txt
+++ b/langpacks/chinese/Plugins/Contacts.txt
@@ -32,7 +32,7 @@
 再试一次
 [Add to List]
 加至列表
-[User Details]
+[User details]
 用户详细资料
 ;file \plugins\ContactsPlus\src\main.cpp
 [Contacts received from]
diff --git a/langpacks/chinese/Plugins/Dbx_mmap.txt b/langpacks/chinese/Plugins/Dbx_mmap.txt
index 7fe098172c..806ef18464 100644
--- a/langpacks/chinese/Plugins/Dbx_mmap.txt
+++ b/langpacks/chinese/Plugins/Dbx_mmap.txt
@@ -6,54 +6,6 @@
 ;  Authors: Miranda-NG project
 ;============================================================
 ;file \plugins\Db3x_mmap\res\db3x_mmap.rc
-[Install Database Settings]
-安装数据库设置
-[Yes]
-是
-[No]
-否
-[A file containing new database settings has been placed in the Miranda NG directory.]
-Miranda NG 目录下有包含新数据库设置的文件. 
-[Do you want to import the settings now?]
-您想现在导入这些设置吗? 
-[No to all]
-全部否
-[&View contents]
-查看内容(&V)
-[Security systems to prevent malicious changes are in place and you will be warned before changes that are not known to be safe.]
-防恶意变更安全系统已启用, 任何无法确知是否安全的变更, 都将警告. 
-[Database Setting Change]
-数据库设置变更
-[Database settings are being imported from]
-数据库设置正准备导入于
-[This file wishes to change the setting]
-此文件希望变更设置
-[to the value]
-的值
-[Do you want to allow this change?]
-您是否允许此项变更? 
-[&Allow all further changes to this section]
-允许此部分中所有其它变更(&A)
-[&Yes]
-是(&Y)
-[&No]
-否(&N)
-[Cancel Import]
-取消导入
-[Database Import Complete]
-数据库导入完成
-[The import has completed from]
-导入已完成于
-[What do you want to do with the file now?]
-您现在想对此文件做什么? 
-[&Recycle]
-循环使用(&R)
-[&Delete]
-删除(&D)
-[&Move/Rename]
-移动/重命名(&L)
-[&Leave]
-离开(&L)
 ;file \plugins\Db3x_mmap\src\database.cpp
 [Disk is full. Miranda will now shutdown.]
 磁盘已满. Miranda 现在将关闭. 
diff --git a/langpacks/chinese/Plugins/Facebook.txt b/langpacks/chinese/Plugins/Facebook.txt
index 2ad61511aa..cf30d77331 100644
--- a/langpacks/chinese/Plugins/Facebook.txt
+++ b/langpacks/chinese/Plugins/Facebook.txt
@@ -18,7 +18,7 @@
 分享
 [Cancel]
 取消
-[User Details]
+[User details]
 用户详细资料
 [Text]
 文本
diff --git a/langpacks/chinese/Plugins/ICQ.txt b/langpacks/chinese/Plugins/ICQ.txt
index 5c761ec128..45c7502bd3 100644
--- a/langpacks/chinese/Plugins/ICQ.txt
+++ b/langpacks/chinese/Plugins/ICQ.txt
@@ -428,7 +428,7 @@ ICQ 提示
 加拿大
 [Canary Islands]
 加那利群岛
-[Cape Verde Islands]
+[Cape Verde]
 佛得角群岛
 [Cayman Islands]
 开曼群岛
@@ -436,7 +436,7 @@ ICQ 提示
 中非共和国
 [Chad]
 乍得
-[Chile, Republic of]
+[Chile]
 智利共和国
 [China]
 中国
@@ -444,16 +444,16 @@ ICQ 提示
 哥伦比亚
 [Comoros]
 科摩罗
-[Congo, Democratic Republic of (Zaire)]
-刚果民主共和国 (扎伊尔)
+[Congo, Democratic Republic of the]
+刚果民主共和国
 [Congo, Republic of the]
 刚果共和国
 [Cook Islands]
 库克群岛
 [Costa Rica]
 哥斯达黎加
-[Cote d'Ivoire (Ivory Coast)]
-科特迪瓦(象牙海岸)
+[Cote d'Ivoire]
+科特迪瓦
 [Croatia]
 克罗地亚
 [Cuba]
@@ -488,7 +488,7 @@ ICQ 提示
 埃塞俄比亚
 [Europe]
 欧洲
-[Faeroe Islands]
+[Faroe Islands]
 法罗群岛
 [Falkland Islands]
 福克兰群岛
@@ -548,8 +548,8 @@ ICQ 提示
 印度
 [Indonesia]
 印度尼西亚
-[Iran (Islamic Republic of)]
-伊朗 (伊斯兰共和国)
+[Iran]
+伊朗
 [Iraq]
 伊拉克
 [Ireland]
@@ -588,7 +588,7 @@ ICQ 提示
 莱索托
 [Liberia]
 利比里亚
-[Libyan Arab Jamahiriya]
+[Libya]
 阿拉伯利比亚
 [Liechtenstein]
 列支敦士登
@@ -620,13 +620,13 @@ ICQ 提示
 毛里塔尼亚
 [Mauritius]
 毛里求斯
-[Mayotte Island]
+[Mayotte]
 马约特岛
 [Mexico]
 墨西哥
 [Micronesia, Federated States of]
 密克罗西尼亚联邦国
-[Moldova, Republic of]
+[Moldova]
 摩尔多瓦共和国
 [Monaco]
 摩纳哥
@@ -700,7 +700,7 @@ ICQ 提示
 波多黎各
 [Qatar]
 卡塔尔
-[Reunion Island]
+[Reunion]
 留尼旺岛
 [Romania]
 罗马尼亚
@@ -764,7 +764,7 @@ ICQ 提示
 瑞典
 [Switzerland]
 瑞士
-[Syrian Arab Republic]
+[Syria]
 阿拉伯叙利亚共和国
 [Taiwan]
 台湾
@@ -824,17 +824,17 @@ ICQ 提示
 维尔京群岛 (美国)
 [Wales]
 威尔士
-[Wallis and Futuna Islands]
+[Wallis and Futuna]
 瓦利斯群岛和富图纳群岛
 [Yemen]
 也门
 [Yugoslavia]
 南斯拉夫
-[Serbia, Republic of]
+[Serbia]
 塞尔维亚共和国
 [Kosovo, Republic of]
 科索沃共和国
-[Montenegro, Republic of]
+[Montenegro]
 黑山共和国
 [Zambia]
 赞比亚
diff --git a/langpacks/chinese/Plugins/Msg_Export.txt b/langpacks/chinese/Plugins/Msg_Export.txt
index 5ac1cad81d..b6e8dfe24a 100644
--- a/langpacks/chinese/Plugins/Msg_Export.txt
+++ b/langpacks/chinese/Plugins/Msg_Export.txt
@@ -54,7 +54,7 @@
 当用户删除时
 [Delete file]
 删除文件
-[User &Details]
+[User &details]
 用户详细资料(&D)
 [Export selected]
 导出选定
diff --git a/langpacks/chinese/Plugins/Scriver.txt b/langpacks/chinese/Plugins/Scriver.txt
index ba760269d7..0b2fc7b6fd 100644
--- a/langpacks/chinese/Plugins/Scriver.txt
+++ b/langpacks/chinese/Plugins/Scriver.txt
@@ -36,7 +36,7 @@
 启用标签
 [Always show tab bar]
 永远显示标签栏
-[Tabs at bottom]
+[Tabs at the bottom]
 标签放在底部
 [Limit names on tabs to]
 限制标签名称为
@@ -381,7 +381,7 @@ Unicode 已关闭
 添加联系人
 [User Menu]
 用户菜单
-[User Details]
+[User details]
 用户详细资料
 [History]
 历史
diff --git a/langpacks/chinese/Plugins/TabSRMM.txt b/langpacks/chinese/Plugins/TabSRMM.txt
index 9baa82250f..97e203f79f 100644
--- a/langpacks/chinese/Plugins/TabSRMM.txt
+++ b/langpacks/chinese/Plugins/TabSRMM.txt
@@ -573,9 +573,9 @@ Esc 关闭会话 (如禁用则最小化窗口)
 创建最小化状态新窗口
 [Send on Shift+Enter]
 Shift+Enter 发送
-[Send message on Enter]
+[Send message on 'Enter']
 回车发送消息
-[Send message on double Enter]
+[Send message on double 'Enter']
 按两下回车发送消息
 [Minimize the message window on send]
 发送时最小化消息窗口
@@ -761,7 +761,7 @@ Ctrl+Enter 发送消息 (总是启用)
 在底部放置工具栏
 [Title Bar]
 标题栏
-[Tabs at Bottom]
+[Tabs at the bottom]
 标签在底部
 [Window Flashing]
 窗口闪动
@@ -868,8 +868,6 @@ Ctrl+Enter 发送消息 (总是启用)
 配置容器选项于\n%s
 [Tabs at the top]
 标签位于上方
-[Tabs at the bottom]
-标签栏在底部
 [Switch bar on the left side]
 切换栏位于左侧
 [Switch bar on the right side]
@@ -1199,7 +1197,7 @@ History++ 插件
 传入消息
 [Outgoing message]
 发送消息
-[Statuschange]
+[Status change]
 状态变更
 [Static container icon]
 静态容器图标
@@ -1392,10 +1390,6 @@ TabSRMM 消息 (%s)
 发送消息
 [Send on SHIFT - Enter]
 SHIFT - Enter 发送
-[Send message on 'Enter']
-按 "Enter" 发送消息
-[Send message on double 'Enter']
-按两次 "Enter" 发送消息
 [Close the message window on send]
 发送时关闭消息窗口
 [Always flash contact list and tray icon for new messages]
diff --git a/langpacks/chinese/Plugins/UInfoEx.txt b/langpacks/chinese/Plugins/UInfoEx.txt
index ebfaef0373..093c60c118 100644
--- a/langpacks/chinese/Plugins/UInfoEx.txt
+++ b/langpacks/chinese/Plugins/UInfoEx.txt
@@ -444,7 +444,7 @@ IM 命名
 ;file \plugins\UserInfoEx\src\mir_menuitems.cpp
 [Ex-/Import contact]
 导出/入联系人
-[User &Details]
+[User &details]
 用户详细资料(&D)
 [View/Change My &Details...]
 查看/变更我的详细资料(&D)...
-- 
cgit v1.2.3