langpacks: update according to commit [6343]

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

7 files changed, 18 insertions, 20 deletions

diff --git a/langpacks/chinese/=CORE=.txt b/langpacks/chinese/=CORE=.txt
index f3917d82d3..1a1d22c257 100644
--- a/langpacks/chinese/=CORE=.txt
+++ b/langpacks/chinese/=CORE=.txt
@@ -1987,7 +1987,7 @@ Miranda 无法加载内置消息模块, riched20.dll 丢失. 按下 '是' 继续
 [&Add permanently to list]

 永久加至列表(&A)

 ;file \src\modules\clist\contacts.cpp

-[My custom name (not moveable)]

+[My custom name (not movable)]

 我的自定义名称 (不可移动)

 [Nick]

 昵称

@@ -2001,7 +2001,7 @@ Miranda 无法加载内置消息模块, riched20.dll 丢失. 按下 '是' 继续
 用户名

 [FirstName LastName]

 名字 姓氏

-['(Unknown Contact)' (not moveable)]

+['(Unknown Contact)' (not movable)]

  "(未知联系人)"  (不可移动)

 ['(Unknown Contact)']

 '(未知联系人)'

diff --git a/langpacks/chinese/Plugins/Clist_modern.txt b/langpacks/chinese/Plugins/Clist_modern.txt
index 3e47778f64..4adefbe386 100644
--- a/langpacks/chinese/Plugins/Clist_modern.txt
+++ b/langpacks/chinese/Plugins/Clist_modern.txt
@@ -515,28 +515,26 @@ x100 毫秒
 ;file \plugins\Clist_modern\src\modern_clc.cpp

 [Contact List smileys]

 联系人列表表情

-[Do You want contact '%s' to be converted to MetaContact and '%s' be added to it?]

+[Do you want contact '%s' to be converted to MetaContact and '%s' be added to it?]

 您想将联系人 '%s' 转换为中继联系人并将 '%s' 加至该中继联系人? 

 [Converting to MetaContact]

 转换为中继联系人

-[Do You want contact '%s' to be converted to MetaContact and '%s' be added to it (remove it from '%s')?]

+[Do you want contact '%s' to be converted to MetaContact and '%s' be added to it (remove it from '%s')?]

 您想将联系人 '%s' 转换为中继联系人并将 '%s' 加至该中继联系人 (从 %s 移除)? 

 [Converting to MetaContact (Moving)]

 转换为中继联系人 (正在移动)

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

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

 您想将联系人 '%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]

 设置默认联系人

-[Do You want contact '%s' to be removed from MetaContact '%s' and added to '%s'?]

+[Do you want contact '%s' to be removed from MetaContact '%s' and added to '%s'?]

 您想将联系人 '%s' 从中继联系人 '%s' 移除, 并加至 '%s'? 

 [Changing MetaContacts (Moving)]

 变更中继联系人 (正在移动)

-[Do You want contact '%s' to be added to MetaContact '%s'?]

-您想将联系人 '%s' 加至中继联系人 '%s' 移除 '%s'? 

 ;file \plugins\Clist_modern\src\modern_clcopts.cpp

 [Standard contacts]

 标准联系人

diff --git a/langpacks/chinese/Plugins/FileAsMessage.txt b/langpacks/chinese/Plugins/FileAsMessage.txt
index 004209e67c..902eb2d7ea 100644
--- a/langpacks/chinese/Plugins/FileAsMessage.txt
+++ b/langpacks/chinese/Plugins/FileAsMessage.txt
@@ -47,11 +47,11 @@
 接收...

 [Sent successfully]

 发送成功

-[Incoming file request. Do you want proceed?]

+[Incoming file request. Do you want to proceed?]

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

 [Cancelled by remote user]

 已由远程用户取消

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

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

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

 [Paused, 'coz connection dropped]

 暂停, 'coz 连接已断开

diff --git a/langpacks/chinese/Plugins/GG.txt b/langpacks/chinese/Plugins/GG.txt
index cad4045a6a..354171b39f 100644
--- a/langpacks/chinese/Plugins/GG.txt
+++ b/langpacks/chinese/Plugins/GG.txt
@@ -181,7 +181,7 @@ Gadu-Gadu 号码
 打开会议(&C)...

 [&Clear ignored conferences]

 清除已忽略会议(&C)

-[%s has initiated conference with %d participants (%d unknowns).\nDo you want do 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/NimContact.txt b/langpacks/chinese/Plugins/NimContact.txt
index fe8b57af2b..c1b0d198e8 100644
--- a/langpacks/chinese/Plugins/NimContact.txt
+++ b/langpacks/chinese/Plugins/NimContact.txt
@@ -20,7 +20,7 @@
 更新网址于每

 [Intervals]

 间隔

-[If the protocol timer is disabled web pages wont be updated]

+[If the protocol timer is disabled web pages won't be updated]

 如协议计时禁用, 网页将不会被更新

 [contact display info]

 联系人显示信息

diff --git a/langpacks/chinese/Plugins/TabSRMM.txt b/langpacks/chinese/Plugins/TabSRMM.txt
index 09ebb89476..bc0874a37d 100644
--- a/langpacks/chinese/Plugins/TabSRMM.txt
+++ b/langpacks/chinese/Plugins/TabSRMM.txt
@@ -1287,7 +1287,7 @@ History++ 插件
 一项消息递送已失败. \n请点击打开消息窗口. 

 [A message delivery has failed after the contacts chat window was closed. You may want to resend the last message]

 一项消息递送在聊天窗口关闭后失败. 您可能想重新发送最后消息

-[There are unsent messages waiting for confirmation.\nWhen you close the window now, Miranda will try to send them but may be unable to inform you about possible delivery errors.\nDo you really want to close the Window(s)?]

+[There are unsent messages waiting for confirmation.\nIf you close the window now, Miranda will try to send them but may be unable to inform you about possible delivery errors.\nDo you really want to close the window(s)?]

 有正等候确认的未发消息. \n如果您现在关闭窗口, Miranda 将尝试发送他们, 但可能无法通知您任何递送错误. \n您确定要关闭窗口? 

 [Message window warning]

 消息窗口警告

diff --git a/langpacks/chinese/Plugins/Xfire.txt b/langpacks/chinese/Plugins/Xfire.txt
index e1676662bf..a05c25db04 100644
--- a/langpacks/chinese/Plugins/Xfire.txt
+++ b/langpacks/chinese/Plugins/Xfire.txt
@@ -61,7 +61,7 @@
 如您右键好友列表中的联系人并选择封锁用户, 可非常简单的封锁某人 ...

 [This file is used for the game search, game detection and gameid resolving. It contains all xfire supported games.]

 此文件用于游戏搜索, 游戏检测及游戏解析. 它包含所有 Xfire 支持的游戏.

-[This file contains all original game icons. You can also activate the option for icon downloading, if you dont have it.]

+[This file contains all original game icons. You can also activate the option for icon downloading, if you don't have it.]

 此文件包含所有原版游戏图标. 如您没有此文件, 可启用选项下载图标.

 [Be sure you put these files in following folder:]

 请确认您已把这些文件放至以下目录:

@@ -75,11 +75,11 @@
 如您退出游戏, 状态消息及状态将被重置.

 [Game:]

 游戏:

-[Dont detect this game as running]

+[Don't detect this game as running]

 不要检测此游戏是否运行

 [Apply]

 应用

-[Dont set status message for other protocols]

+[Don't set status message for other protocols]

 其它协议不要设置状态信息

 [Remove]

 移除

@@ -182,7 +182,7 @@ XFire 不支持离线消息!
 未设置登录名!

 [No Password is set!]

 未设置密码!

-[Do you really want delete your friend %s?]

+[Do you really want to delete your friend %s?]

 您真的想删除好友 %s?

 [Confirm Delete]

 确认删除

@@ -207,9 +207,9 @@ XFire 不支持离线消息!
 从数据库中将自身从对方好友列表中移除

 [Hide yourself in buddylist]

 在好友列表中隐藏自身

-[Dont display game search results]

+[Don't display game search results]

 不要显示游戏搜索结果

-[Dont display game search status window]

+[Don't display game search status window]

 不要显示游戏搜索状态窗口

 [Display popup, if someone start a game]

 如某人开始游戏, 则显示弹出窗口