merge and translate for fr

1 files changed, 13 insertions, 13 deletions

diff --git a/po/zh_CN.pom b/po/zh_CN.pom
index dd520e57..377153d4 100644
--- a/po/zh_CN.pom
+++ b/po/zh_CN.pom
@@ -11,7 +11,7 @@ msgstr "图形环境"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Development"
-msgstr "开发平台"
+msgstr "开发"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -29,17 +29,17 @@ msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr ""
-"办公程序：字处理（kword、abiword），电子表格（kspread、gnumeric）pdf 阅读器等"
+"办公程序：字处理(kword、abiword), 电子表格(kspread、gnumeric)pdf 阅读器等"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Game station"
-msgstr "游戏工作站"
+msgstr "游戏机"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "游戏程序：街机、棋盘、战略等等"
+msgstr "游戏程序: 街机、棋盘、战略等等"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -61,17 +61,17 @@ msgstr "Internet 工作站"
 msgid ""
 "Set of tools to read and send mail and news (pine, mutt, tin..) and to "
 "browse the Web"
-msgstr "上网工具，如收发电子邮件及新闻组（pine, mutt, tin..），浏览网站"
+msgstr "上网工具, 如收发电子邮件及新闻组(pine, mutt, tin..), 浏览网站"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Network Computer (client)"
-msgstr "网络计算机（客户端）"
+msgstr "网络计算机(客户端)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Clients for different protocols including ssh"
-msgstr "SSH 等协议客户端"
+msgstr "SSH 等不同协议客户端"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -101,7 +101,7 @@ msgstr "控制台工具"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Editors, shells, file tools, terminals"
-msgstr "编辑器，shell，文件工具，终端"
+msgstr "编辑器, shell, 文件工具, 终端"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -113,7 +113,7 @@ msgstr "KDE 工作站"
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
-msgstr "KDE 桌面环境，基本的图形环境和一组配套的工具"
+msgstr "KDE 桌面环境, 基本的图形环境和一组配套的工具"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -140,7 +140,7 @@ msgstr "Icewm, Window Maker, Enlightenment, Fvwm 等"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "C and C++ development libraries, programs and include files"
-msgstr "C和C++开发库，程序及头文件"
+msgstr "C 和C++开发库, 程序及头文件"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
@@ -215,15 +215,15 @@ msgstr "域名和网络信息服务 DNS/NIS"
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Network Computer server"
-msgstr "网络计算机 NC 服务器"
+msgstr "网络计算机(服务器)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS 服务器，SMB 服务器，代理服务器，SSH 服务器"
+msgstr "NFS 服务器, SMB 服务器, 代理服务器, SSH 服务器"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: ../../share/compssUsers:999
 msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "一组上网工具，用于收发邮件和新闻，或者浏览网站"
+msgstr "一组上网工具, 用于收发邮件和新闻, 或者浏览网站"