diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 6886f4aad..a9a326e6b 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -919,8 +919,8 @@ static void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vta
 	linphone_core_assign_payload_type(&payload_type_gsm,3,NULL);
 	linphone_core_assign_payload_type(&payload_type_pcma8000,8,NULL);
 	linphone_core_assign_payload_type(&payload_type_lpc1015,115,NULL);
-	linphone_core_assign_payload_type(&payload_type_speex_nb,110,"vbr=vad");
-	linphone_core_assign_payload_type(&payload_type_speex_wb,111,"vbr=vad");
+	linphone_core_assign_payload_type(&payload_type_speex_nb,110,"vbr=on");
+	linphone_core_assign_payload_type(&payload_type_speex_wb,111,"vbr=on");
 	linphone_core_assign_payload_type(&payload_type_speex_uwb,112,"vbr=on");
 	linphone_core_assign_payload_type(&payload_type_telephone_event,101,"0-11");
 	linphone_core_assign_payload_type(&payload_type_ilbc,113,"mode=30");
diff --git a/oRTP b/oRTP
index d4c36bf26..37c60a638 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit d4c36bf268d696be0823ae3650aacc6d8b2f9dbd
+Subproject commit 37c60a638fd108404ca437e2bbef78f227178450
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 92b458054..a18bf0d06 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,41 +1,45 @@
 # SIP Telephony Application.
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2011 Free Software Foundation, Inc.
 # Simon Morlat <linphone@free.fr>, 2001.
+# Jiang Honglei<jhonglei@gmail.com>, 2002.
+# Aron Xu <happyaron.xu@gmail.com>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: linphone 0.7.1\n"
+"Project-Id-Version: linphone 3.3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 17:16+0200\n"
-"PO-Revision-Date: 2009-09-24 18:39+0300\n"
-"Last-Translator: Jiang Honglei<jhonglei@gmail.com>\n"
-"Language-Team: Jiang Honglei<jhonglei@gmail.com>\n"
+"POT-Creation-Date: 2011-01-08 16:31+0800\n"
+"PO-Revision-Date: 2011-01-08 23:51+0800\n"
+"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language: zh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../gtk-glade/support.c:49 ../gtk-glade/support.c:73
 #: ../gtk-glade/support.c:102
 #, c-format
 msgid "Couldn't find pixmap file: %s"
-msgstr "无法打开图像文件: %s"
+msgstr "无法打开位图文件：%s"
 
 #: ../gtk-glade/chat.c:27
 #, c-format
 msgid "Chat with %s"
-msgstr "与 %s 聊天"
+msgstr "与 %s 通话"
 
 #: ../gtk-glade/main.c:94
 msgid "log to stdout some debug information while running."
-msgstr ""
+msgstr "运行时向标准输出记录调试信息。"
 
 #: ../gtk-glade/main.c:101
 msgid "Start only in the system tray, do not show the main interface."
-msgstr ""
+msgstr "启动到系统托盘，不显示主界面。"
 
 #: ../gtk-glade/main.c:108
 msgid "address to call right now"
-msgstr ""
+msgstr "现在呼叫的地址"
 
 #: ../gtk-glade/main.c:115
 msgid "if set automatically answer incoming calls"
@@ -46,11 +50,12 @@ msgid ""
 "Specifiy a working directory (should be the base of the installation, eg: c:"
 "\\Program Files\\Linphone)"
 msgstr ""
+"指定工作目录(应为安装目录例如 C:\\Program Files\\Linphone)"
 
 #: ../gtk-glade/main.c:402
-#, fuzzy, c-format
+#, c-format
 msgid "Call with %s"
-msgstr "与 %s 聊天"
+msgstr "与 %s 通话"
 
 #: ../gtk-glade/main.c:720
 #, c-format
@@ -65,20 +70,20 @@ msgid ""
 "list ?\n"
 "If you answer no, this person will be temporarily blacklisted."
 msgstr ""
-"%s 想加你为好友。\n"
-"你是否允许他看到你的在线状态或者将它加为你的好友允许?\n"
-"如果你回答否，则会将该人临时性的放入黑名单"
+"%s 想加您为联系人。\n"
+"您是否允许他看到您的在线状态或者将它加为您的联系人允许?\n"
+"如果您回答否，则会将该人临时性的放入黑名单"
 
 #: ../gtk-glade/main.c:837
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Please enter your password for username <i>%s</i>\n"
 " at domain <i>%s</i>:"
-msgstr "请输入你的密码 %s:"
+msgstr "请输入 %s@%s 的密码："
 
 #: ../gtk-glade/main.c:934
 msgid "Website link"
-msgstr ""
+msgstr "网站"
 
 #: ../gtk-glade/main.c:970
 msgid "Linphone - a video internet phone"
@@ -87,22 +92,24 @@ msgstr "Linphone - 互联网视频电话"
 #: ../gtk-glade/main.c:989
 #, c-format
 msgid "%s (Default)"
-msgstr "%s (缺省)"
+msgstr "%s (默认)"
 
 #: ../gtk-glade/main.c:1221
 msgid ""
 "No sound cards have been detected on this computer.\n"
 "You won't be able to send or receive audio calls."
 msgstr ""
+"未在此计算机上检测到声卡。\n"
+"您无法发送或接收音频呼叫。"
 
-#: ../gtk-glade/main.c:1275
+#: ../gtk-glade/main.c:1280
 msgid "A free SIP video-phone"
 msgstr "免费的 SIP 视频电话"
 
 #: ../gtk-glade/friendlist.c:192 ../gtk-glade/propertybox.c:258
 #: ../gtk-glade/contact.glade.h:3
 msgid "Name"
-msgstr "名字"
+msgstr "名称"
 
 #: ../gtk-glade/friendlist.c:205
 msgid "Presence status"
@@ -115,7 +122,7 @@ msgstr "在 %s 目录中查找 "
 
 #: ../gtk-glade/friendlist.c:450
 msgid "Invalid sip contact !"
-msgstr "无效的SIP contact"
+msgstr "无效的 SIP 联系人！"
 
 #: ../gtk-glade/friendlist.c:492
 #, c-format
@@ -130,21 +137,21 @@ msgstr "发送消息给 %s"
 #: ../gtk-glade/friendlist.c:494
 #, c-format
 msgid "Edit contact '%s'"
-msgstr "编辑好友 '%s'"
+msgstr "编辑联系人 %s"
 
 #: ../gtk-glade/friendlist.c:495
 #, c-format
 msgid "Delete contact '%s'"
-msgstr "删除好友 '%s'"
+msgstr "删除联系人 %s"
 
 #: ../gtk-glade/friendlist.c:537
 #, c-format
 msgid "Add new contact from %s directory"
-msgstr "从 %s 目录增加好友 "
+msgstr "从 %s 目录增加联系人 "
 
 #: ../gtk-glade/propertybox.c:264
 msgid "Rate (Hz)"
-msgstr "采样率 (Hz)"
+msgstr "采样率(Hz)"
 
 #: ../gtk-glade/propertybox.c:270
 msgid "Status"
@@ -152,11 +159,11 @@ msgstr "状态"
 
 #: ../gtk-glade/propertybox.c:276
 msgid "Min bitrate (kbit/s)"
-msgstr "最小速率 (kbit/s)"
+msgstr "最小比特率(kbit/s)"
 
 #: ../gtk-glade/propertybox.c:283
 msgid "Parameters"
-msgstr "参数设置"
+msgstr "参数"
 
 #: ../gtk-glade/propertybox.c:312 ../gtk-glade/propertybox.c:451
 msgid "Enabled"
@@ -168,68 +175,68 @@ msgstr "禁用"
 
 #: ../gtk-glade/propertybox.c:496
 msgid "Account"
-msgstr "账号"
+msgstr "帐户"
 
 #: ../gtk-glade/propertybox.c:636
 msgid "English"
-msgstr ""
+msgstr "英语"
 
 #: ../gtk-glade/propertybox.c:637
 msgid "French"
-msgstr "Français"
+msgstr "法语"
 
 #: ../gtk-glade/propertybox.c:638
 msgid "Swedish"
-msgstr ""
+msgstr "瑞典语"
 
 #: ../gtk-glade/propertybox.c:639
 msgid "Italian"
-msgstr ""
+msgstr "意大利语"
 
 #: ../gtk-glade/propertybox.c:640
 msgid "Spanish"
-msgstr ""
+msgstr "西班牙语"
 
 #: ../gtk-glade/propertybox.c:641
 msgid "Brazilian Portugese"
-msgstr ""
+msgstr "巴西葡萄牙语"
 
 #: ../gtk-glade/propertybox.c:642
 msgid "Polish"
-msgstr ""
+msgstr "波兰语"
 
 #: ../gtk-glade/propertybox.c:643
 msgid "German"
-msgstr ""
+msgstr "德语"
 
 #: ../gtk-glade/propertybox.c:644
 msgid "Russian"
-msgstr "русский язык"
+msgstr "俄语"
 
 #: ../gtk-glade/propertybox.c:645
 msgid "Japanese"
-msgstr "日本語"
+msgstr "日语"
 
 #: ../gtk-glade/propertybox.c:646
 msgid "Dutch"
-msgstr "Nederlands"
+msgstr "荷兰语"
 
 #: ../gtk-glade/propertybox.c:647
 msgid "Hungarian"
-msgstr "Magyar"
+msgstr "匈牙利语"
 
 #: ../gtk-glade/propertybox.c:648
 msgid "Czech"
-msgstr "čeština"
+msgstr "捷克语"
 
 #: ../gtk-glade/propertybox.c:649
 msgid "Chinese"
-msgstr "简体中文"
+msgstr "中文"
 
 #: ../gtk-glade/propertybox.c:706
 msgid ""
 "You need to restart linphone for the new language selection to take effect."
-msgstr "你需要重新启动linphone以使你的语言选择生效"
+msgstr "您需要重启 linphone 以使语言选择生效。"
 
 #: ../gtk-glade/update.c:80
 #, c-format
@@ -237,14 +244,16 @@ msgid ""
 "A more recent version is availalble from %s.\n"
 "Would you like to open a browser to download it ?"
 msgstr ""
+"%s 有新版本。\n"
+"您是否要打开浏览器下载它？"
 
 #: ../gtk-glade/update.c:91
 msgid "You are running the lastest version."
-msgstr ""
+msgstr "您正在运行最新版。"
 
 #: ../gtk-glade/buddylookup.c:85
 msgid "Firstname, Lastname"
-msgstr "姓 ，名"
+msgstr "姓名"
 
 #: ../gtk-glade/buddylookup.c:160
 msgid "Error communicating with server."
@@ -267,23 +276,22 @@ msgstr "正在接收数据..."
 msgid "Found %i contact"
 msgid_plural "Found %i contacts"
 msgstr[0] "找到 %i 联系方式"
-msgstr[1] "找到 %i 联系方式(多个)"
 
 #: ../gtk-glade/setupwizard.c:25
 msgid ""
 "Welcome !\n"
 "This assistant will help you to use a SIP account for your calls."
 msgstr ""
-"欢迎使用linphone!\n"
-"该设置向导用于帮助你配置打网络电话的SIP账号"
+"欢迎使用 Linphone！\n"
+"设置向导将帮助您配置打网络电话的 SIP 帐户。"
 
 #: ../gtk-glade/setupwizard.c:34
 msgid "Create an account by choosing a username"
-msgstr "通过选择一个用户名创建一个新的账户"
+msgstr "通过选择一个用户名创建一个新的帐户"
 
 #: ../gtk-glade/setupwizard.c:35
 msgid "I have already an account and just want to use it"
-msgstr "我已经有一个账号，并想使用原来的账号"
+msgstr "我已经有一个帐户，并想使用原来的帐户"
 
 #: ../gtk-glade/setupwizard.c:53
 msgid "Please choose a username:"
@@ -296,15 +304,15 @@ msgstr "用户名:"
 #: ../gtk-glade/setupwizard.c:92
 #, c-format
 msgid "Checking if '%s' is available..."
-msgstr "检查'%s'是否可用"
+msgstr "检查 %s 是否可用..."
 
 #: ../gtk-glade/setupwizard.c:97 ../gtk-glade/setupwizard.c:164
 msgid "Please wait..."
-msgstr "请等待..."
+msgstr "请稍候..."
 
 #: ../gtk-glade/setupwizard.c:101
 msgid "Sorry this username already exists. Please try a new one."
-msgstr "对不起，该用户已经存在"
+msgstr "对不起，该用户已经存在，请换一个尝试。"
 
 #: ../gtk-glade/setupwizard.c:103 ../gtk-glade/setupwizard.c:168
 msgid "Ok !"
@@ -316,75 +324,69 @@ msgstr "连接错误，请稍后重试。"
 
 #: ../gtk-glade/setupwizard.c:134
 msgid "Thank you. Your account is now configured and ready for use."
-msgstr "Thank you.你的账号已经可以使用"
+msgstr "谢谢，您的帐户已经配置完毕，可以使用。"
 
 #: ../gtk-glade/setupwizard.c:228
 msgid "Welcome to the account setup assistant"
-msgstr "欢迎使用账号设置向导"
+msgstr "欢迎使用帐户设置向导"
 
 #: ../gtk-glade/setupwizard.c:232
 msgid "Account setup assistant"
-msgstr "账号设置向导"
+msgstr "帐户设置向导"
 
 #: ../gtk-glade/setupwizard.c:236
-#, fuzzy
 msgid "Choosing a username"
-msgstr "选择用户名:"
+msgstr "选择用户名："
 
 #: ../gtk-glade/setupwizard.c:240
 msgid "Verifying"
 msgstr "验证中"
 
 #: ../gtk-glade/setupwizard.c:244
-#, fuzzy
 msgid "Confirmation"
 msgstr "确认"
 
 #: ../gtk-glade/setupwizard.c:249
 msgid "Creating your account"
-msgstr "正在创建您的账号"
+msgstr "正在创建您的帐户"
 
 #: ../gtk-glade/setupwizard.c:253
 msgid "Now ready !"
 msgstr "就绪！"
 
-#: ../gtk-glade/incall_view.c:113
-#, fuzzy
+#: ../gtk-glade/incall_view.c:109
 msgid "<b>Calling...</b>"
 msgstr "<b>正在呼叫...</b>"
 
-#: ../gtk-glade/incall_view.c:116 ../gtk-glade/incall_view.c:138
+#: ../gtk-glade/incall_view.c:112 ../gtk-glade/incall_view.c:134
 msgid "00::00::00"
-msgstr ""
+msgstr "00::00::00"
 
-#: ../gtk-glade/incall_view.c:136
-#, fuzzy
+#: ../gtk-glade/incall_view.c:132
 msgid "<b>In call with</b>"
-msgstr "<b>呼入</b>"
+msgstr "<b>正在呼叫</b>"
 
-#: ../gtk-glade/incall_view.c:154
+#: ../gtk-glade/incall_view.c:150
 #, c-format
 msgid "%02i::%02i::%02i"
-msgstr ""
+msgstr "%02i::%02i::%02i"
 
-#: ../gtk-glade/incall_view.c:170
-#, fuzzy
+#: ../gtk-glade/incall_view.c:166
 msgid "<b>Call ended.</b>"
-msgstr "<b>通话结束</b>"
+msgstr "<b>通话结束。</b>"
 
-#: ../gtk-glade/incall_view.c:188
-#, fuzzy
+#: ../gtk-glade/incall_view.c:184
 msgid "Unmute"
-msgstr "静音"
+msgstr "取消静音"
 
-#: ../gtk-glade/incall_view.c:195 ../gtk-glade/main.glade.h:43
+#: ../gtk-glade/incall_view.c:191 ../gtk-glade/main.glade.h:43
 msgid "Mute"
 msgstr "静音"
 
 #: ../gtk-glade/loginframe.c:83
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter login information for %s"
-msgstr "请输入 %s 的登录信息:"
+msgstr "请输入 %s 的登录信息"
 
 #: ../gtk-glade/main.glade.h:1
 msgid "#"
@@ -435,34 +437,36 @@ msgid "9"
 msgstr "9"
 
 #: ../gtk-glade/main.glade.h:13
-#, fuzzy
 msgid "<b>Add contacts from directory</b>"
-msgstr "从 %s 目录增加好友 "
+msgstr "<b>从目录增加联系人</b>"
 
 #: ../gtk-glade/main.glade.h:14
 msgid "<b>Contact list</b>"
-msgstr "<b>好友列表</b>"
+msgstr "<b>联系人列表</b>"
 
 #: ../gtk-glade/main.glade.h:15
-#, fuzzy
 msgid "<b>Welcome !</b>"
-msgstr "<b>欢迎 ！</b>"
+msgstr "<b>欢迎！</b>"
 
 #: ../gtk-glade/main.glade.h:16
 msgid "A"
-msgstr ""
+msgstr "A"
 
 #: ../gtk-glade/main.glade.h:17
 msgid ""
 "ADSL\n"
 "Fiber Channel"
 msgstr ""
+"ADSL\n"
+"光纤"
 
 #: ../gtk-glade/main.glade.h:19
 msgid ""
 "All users\n"
 "Online users"
 msgstr ""
+"全部用户\n"
+"在线用户"
 
 #: ../gtk-glade/main.glade.h:21
 msgid "Assistant"
@@ -470,7 +474,7 @@ msgstr "配置向导"
 
 #: ../gtk-glade/main.glade.h:22
 msgid "Audio & Video"
-msgstr "音频 & 视频"
+msgstr "音频和视频"
 
 #: ../gtk-glade/main.glade.h:23
 msgid "Audio only"
@@ -478,20 +482,19 @@ msgstr "音频"
 
 #: ../gtk-glade/main.glade.h:24
 msgid "Automatically log me in"
-msgstr ""
+msgstr "自动登录"
 
 #: ../gtk-glade/main.glade.h:25
 msgid "B"
-msgstr ""
+msgstr "B"
 
 #: ../gtk-glade/main.glade.h:26 ../gtk-glade/parameters.glade.h:21
 msgid "C"
-msgstr ""
+msgstr "C"
 
 #: ../gtk-glade/main.glade.h:27
-#, fuzzy
 msgid "Call Details"
-msgstr "呼叫 %s"
+msgstr "呼叫详情"
 
 #: ../gtk-glade/main.glade.h:28 ../gtk-glade/call_logs.glade.h:1
 msgid "Call history"
@@ -499,20 +502,19 @@ msgstr "呼叫历史"
 
 #: ../gtk-glade/main.glade.h:29
 msgid "Check for updates"
-msgstr ""
+msgstr "检查更新"
 
 #: ../gtk-glade/main.glade.h:30
-#, fuzzy
 msgid "Contacts"
-msgstr "联系中"
+msgstr "联系人"
 
 #: ../gtk-glade/main.glade.h:31
 msgid "D"
-msgstr ""
+msgstr "D"
 
 #: ../gtk-glade/main.glade.h:32
 msgid "Default"
-msgstr "缺省"
+msgstr "默认"
 
 #: ../gtk-glade/main.glade.h:33
 msgid "Duration"
@@ -524,15 +526,15 @@ msgstr "通话计时："
 
 #: ../gtk-glade/main.glade.h:35
 msgid "Enable self-view"
-msgstr "启用self-view"
+msgstr "启用自视"
 
 #: ../gtk-glade/main.glade.h:36
 msgid "Enter username, phone number, or full sip address"
-msgstr "请输入用户名、电话号码或者SIP地址"
+msgstr "请输入用户名、电话号码或完整的 SIP 地址"
 
 #: ../gtk-glade/main.glade.h:37
 msgid "Homepage"
-msgstr ""
+msgstr "主页"
 
 #: ../gtk-glade/main.glade.h:38
 msgid "In call"
@@ -544,39 +546,35 @@ msgstr "网络连接："
 
 #: ../gtk-glade/main.glade.h:40
 msgid "Keypad"
-msgstr ""
+msgstr "数字键盘"
 
 #: ../gtk-glade/main.glade.h:41
-#, fuzzy
 msgid "Login information"
-msgstr "登陆信息"
+msgstr "登录信息"
 
 #: ../gtk-glade/main.glade.h:42
 msgid "Lookup:"
 msgstr "查找："
 
 #: ../gtk-glade/main.glade.h:44
-#, fuzzy
 msgid "My current identity:"
-msgstr "我的当前ID:"
+msgstr "当前地址："
 
 #: ../gtk-glade/main.glade.h:45
-#, fuzzy
 msgid "Password"
 msgstr "密码"
 
 #: ../gtk-glade/main.glade.h:46
-#, fuzzy
 msgid "SIP address or phone number:"
-msgstr "SIP地址或电话号码"
+msgstr "SIP 地址或电话号码："
 
 #: ../gtk-glade/main.glade.h:47
 msgid "Search"
-msgstr ""
+msgstr "搜索"
 
 #: ../gtk-glade/main.glade.h:48
 msgid "Show debug messages"
-msgstr ""
+msgstr "显示调试信息"
 
 #: ../gtk-glade/main.glade.h:49
 msgid "Start call"
@@ -587,40 +585,36 @@ msgid "Terminate call"
 msgstr "终止呼叫"
 
 #: ../gtk-glade/main.glade.h:51
-#, fuzzy
 msgid "Username"
-msgstr "用户名:"
+msgstr "用户名"
 
 #: ../gtk-glade/main.glade.h:52
-#, fuzzy
 msgid "_Linphone"
 msgstr "_Linphone"
 
 #: ../gtk-glade/main.glade.h:53
 msgid "_Modes"
-msgstr "_模式"
+msgstr "模式(_M)"
 
 #: ../gtk-glade/main.glade.h:54
 msgid "in"
-msgstr ""
+msgstr "于"
 
 #: ../gtk-glade/main.glade.h:55
-#, fuzzy
 msgid "label"
-msgstr "label"
+msgstr "标签"
 
 #: ../gtk-glade/about.glade.h:1
 msgid "About linphone"
-msgstr "关于 linphone"
+msgstr "关于 Linphone"
 
 #: ../gtk-glade/about.glade.h:2
-#, fuzzy
 msgid "An internet video phone using the standard SIP (rfc3261) protocol."
-msgstr "一个采用标准 SIP (rfc3261) 协议的互联网视频电话."
+msgstr "一个采用标准 SIP (rfc3261) 协议的互联网视频电话"
 
 #: ../gtk-glade/about.glade.h:3
 msgid "Created by Simon Morlat\n"
-msgstr "由Simon Morlat创建\n"
+msgstr "由 Simon Morlat 创建\n"
 
 #: ../gtk-glade/about.glade.h:5
 msgid ""
@@ -647,12 +641,11 @@ msgstr ""
 "pl: Robert Nasiadek <darkone@darkone.pl>\n"
 "cs: Petr Pisar <petr.pisar@atlas.cz>\n"
 "hu: anonymous\n"
-"zh_CN: Jiang Honglei <hongleij@126.com>\n"
+"zh_CN: Jiang Honglei <hongleij@126.com> 和 Aron Xu <happyaron.xu@gmail.com>\n"
 
 #: ../gtk-glade/contact.glade.h:1
-#, fuzzy
 msgid "<b>Contact information</b>"
-msgstr "好友信息"
+msgstr "<b>联系人信息</b>"
 
 #: ../gtk-glade/contact.glade.h:2
 msgid "Allow this contact to see my presence status"
@@ -664,15 +657,13 @@ msgstr "SIP 地址"
 
 #: ../gtk-glade/contact.glade.h:5
 msgid "Show this contact presence status"
-msgstr "显示该好友的在线状态"
+msgstr "显示该联系人的在线状态"
 
 #: ../gtk-glade/contact.glade.h:6 ../gtk-glade/password.glade.h:5
-#: ../gtk-glade/sip_account.glade.h:9
 msgid "gtk-cancel"
 msgstr ""
 
 #: ../gtk-glade/contact.glade.h:7 ../gtk-glade/password.glade.h:6
-#: ../gtk-glade/sip_account.glade.h:10
 msgid "gtk-ok"
 msgstr ""
 
@@ -694,45 +685,52 @@ msgid "Password:"
 msgstr "密码："
 
 #: ../gtk-glade/password.glade.h:3
-#, fuzzy
 msgid "Please enter the domain password"
-msgstr "请输入密码..."
+msgstr "请输入密码"
 
 #: ../gtk-glade/password.glade.h:4
 msgid "UserID"
-msgstr ""
+msgstr "用户 ID"
 
 #: ../gtk-glade/sip_account.glade.h:1
 msgid "Configure a SIP account"
-msgstr "配置 SIP 账户"
+msgstr "配置 SIP 帐户"
 
 #: ../gtk-glade/sip_account.glade.h:2
 msgid "Linphone - Configure a SIP account"
-msgstr "Linphone - 配置 SIP 账户"
+msgstr "Linphone - 配置 SIP 帐户"
 
 #: ../gtk-glade/sip_account.glade.h:3
-msgid "Publish presence information"
-msgstr "发布自己的在线状态"
+msgid "Looks like sip:<proxy hostname>"
+msgstr "类似于 sip:<代理主机名>"
 
 #: ../gtk-glade/sip_account.glade.h:4
+msgid "Looks like sip:<username>@<domain>"
+msgstr "类似于 sip:<用户名>@<域>"
+
+#: ../gtk-glade/sip_account.glade.h:5
+msgid "Publish presence information"
+msgstr "发布在线状态"
+
+#: ../gtk-glade/sip_account.glade.h:6
 msgid "Register at startup"
 msgstr "在启动时注册"
 
-#: ../gtk-glade/sip_account.glade.h:5
-msgid "Registration duration (sec):"
-msgstr "注册间隔(秒):"
-
-#: ../gtk-glade/sip_account.glade.h:6
-msgid "Route (optional):"
-msgstr "路由 (可选项):"
-
 #: ../gtk-glade/sip_account.glade.h:7
-msgid "SIP Proxy address:"
-msgstr "SIP Proxy地址:"
+msgid "Registration duration (sec):"
+msgstr "注册间隔(秒)："
 
 #: ../gtk-glade/sip_account.glade.h:8
+msgid "Route (optional):"
+msgstr "路由(可选)："
+
+#: ../gtk-glade/sip_account.glade.h:9
+msgid "SIP Proxy address:"
+msgstr "SIP 代理地址："
+
+#: ../gtk-glade/sip_account.glade.h:10
 msgid "Your SIP identity:"
-msgstr "你的 SIP 账号:"
+msgstr "您的 SIP 地址："
 
 #: ../gtk-glade/sip_account.glade.h:11
 msgid "sip:"
@@ -750,7 +748,7 @@ msgstr "接受"
 msgid "Decline"
 msgstr "拒绝"
 
-#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:369
+#: ../gtk-glade/incoming_call.glade.h:3 ../coreapi/linphonecore.c:370
 msgid "Incoming call"
 msgstr "呼入"
 
@@ -764,40 +762,35 @@ msgstr "Linphone - 呼入"
 
 #: ../gtk-glade/parameters.glade.h:1
 msgid "0 stands for \"unlimited\""
-msgstr "0 表示 \"没有限制\""
+msgstr "0 表示 “没有限制”"
 
 #: ../gtk-glade/parameters.glade.h:2
-#, fuzzy
 msgid "<b>Audio</b>"
 msgstr "<b>音频</b>"
 
 #: ../gtk-glade/parameters.glade.h:3
-#, fuzzy
 msgid "<b>Bandwidth control</b>"
 msgstr "<b>带宽控制</b>"
 
 #: ../gtk-glade/parameters.glade.h:4
 msgid "<b>Codecs</b>"
-msgstr "<b>编码</b>"
+msgstr "<b>编解码器</b>"
 
 #: ../gtk-glade/parameters.glade.h:5
 msgid "<b>Default identity</b>"
-msgstr "<b>缺省账户</b>"
+msgstr "<b>默认帐户</b>"
 
 #: ../gtk-glade/parameters.glade.h:6
-#, fuzzy
 msgid "<b>Language</b>"
-msgstr "<b>语言设置</b>"
+msgstr "<b>语言</b>"
 
 #: ../gtk-glade/parameters.glade.h:7
-#, fuzzy
 msgid "<b>Level</b>"
-msgstr "<b>语言设置</b>"
-
+msgstr "<b>级别</b>"
+	
 #: ../gtk-glade/parameters.glade.h:8
-#, fuzzy
 msgid "<b>NAT and Firewall</b>"
-msgstr "<b>NAT及防火墙</b>"
+msgstr "<b>NAT 及防火墙</b>"
 
 #: ../gtk-glade/parameters.glade.h:9
 msgid "<b>Ports</b>"
@@ -809,10 +802,9 @@ msgstr "<b>隐私</b>"
 
 #: ../gtk-glade/parameters.glade.h:11
 msgid "<b>Proxy accounts</b>"
-msgstr "<b>Proxy 账户</b>"
+msgstr "<b>代理帐户</b>"
 
 #: ../gtk-glade/parameters.glade.h:12
-#, fuzzy
 msgid "<b>Transport</b>"
 msgstr "<b>传输协议</b>"
 
@@ -822,49 +814,47 @@ msgstr "<b>视频</b>"
 
 #: ../gtk-glade/parameters.glade.h:14
 msgid "ALSA special device (optional):"
-msgstr ""
+msgstr "ALSA 特殊设备(可选)："
 
 #: ../gtk-glade/parameters.glade.h:15
 msgid "Add"
 msgstr "添加"
 
 #: ../gtk-glade/parameters.glade.h:16
-#, fuzzy
 msgid "Audio RTP/UDP:"
-msgstr "音频 RTP/UDP"
+msgstr "音频 RTP/UDP："
 
 #: ../gtk-glade/parameters.glade.h:17
 msgid ""
 "Audio codecs\n"
 "Video codecs"
 msgstr ""
-"音频编码\n"
-"视频编码"
+"音频编解码器\n"
+"视频编解码器"
 
 #: ../gtk-glade/parameters.glade.h:19
 msgid "Behind NAT / Firewall (specify gateway IP below)"
-msgstr "位于NAT或防火墙之后（请填写防火墙地址）"
+msgstr "在 NAT 或防火墙后(填写网关 IP)"
 
 #: ../gtk-glade/parameters.glade.h:20
 msgid "Behind NAT / Firewall (use STUN to resolve)"
-msgstr "STUN服务器地址"
+msgstr "在 NAT 或防火墙后(使用 STUN 解决)"
 
 #: ../gtk-glade/parameters.glade.h:22
 msgid "CIF"
-msgstr ""
+msgstr "CIF"
 
 #: ../gtk-glade/parameters.glade.h:23
-#, fuzzy
 msgid "Capture device:"
-msgstr "录音设备"
+msgstr "录音设备："
 
 #: ../gtk-glade/parameters.glade.h:24
 msgid "Codecs"
-msgstr "编码"
+msgstr "编解码器"
 
 #: ../gtk-glade/parameters.glade.h:25
 msgid "Direct connection to the Internet"
-msgstr "直连"
+msgstr "直接连接到互联网"
 
 #: ../gtk-glade/parameters.glade.h:26
 msgid "Disable"
@@ -872,12 +862,11 @@ msgstr "禁用"
 
 #: ../gtk-glade/parameters.glade.h:27
 msgid "Done"
-msgstr "确认"
+msgstr "完成"
 
 #: ../gtk-glade/parameters.glade.h:28
-#, fuzzy
 msgid "Download speed limit in Kbit/sec:"
-msgstr "下传速率限制 kbit/sec"
+msgstr "下载速率限制 kbit/s："
 
 #: ../gtk-glade/parameters.glade.h:29
 msgid "Edit"
@@ -893,11 +882,11 @@ msgstr "启用回声抑制"
 
 #: ../gtk-glade/parameters.glade.h:32
 msgid "Erase all passwords"
-msgstr "删除所有编码"
+msgstr "清除所有密码"
 
 #: ../gtk-glade/parameters.glade.h:33
 msgid "Manage SIP Accounts"
-msgstr "SIP账户管理"
+msgstr "SIP 帐户管理"
 
 #: ../gtk-glade/parameters.glade.h:34
 msgid "Multimedia settings"
@@ -909,15 +898,15 @@ msgstr "网络设置"
 
 #: ../gtk-glade/parameters.glade.h:36
 msgid "Playback device:"
-msgstr "回放设备"
+msgstr "回放设备："
 
 #: ../gtk-glade/parameters.glade.h:37
 msgid "Prefered video resolution:"
-msgstr "视频分辨率"
+msgstr "视频分辨率："
 
 #: ../gtk-glade/parameters.glade.h:38
 msgid "Public IP address:"
-msgstr "公网 IP 地址"
+msgstr "公网 IP 地址："
 
 #: ../gtk-glade/parameters.glade.h:39
 msgid ""
@@ -933,23 +922,23 @@ msgstr "移除"
 
 #: ../gtk-glade/parameters.glade.h:42
 msgid "Ring device:"
-msgstr "响铃设备"
+msgstr "响铃设备："
 
 #: ../gtk-glade/parameters.glade.h:43
 msgid "Ring sound:"
-msgstr "铃声："
+msgstr "铃声文件："
 
 #: ../gtk-glade/parameters.glade.h:44
 msgid "SIP (UDP):"
-msgstr "SIP (UDP)"
+msgstr "SIP (UDP)："
 
 #: ../gtk-glade/parameters.glade.h:45
 msgid "Send DTMFs as SIP info"
-msgstr ""
+msgstr "以 SIP 消息发送 DTMF"
 
 #: ../gtk-glade/parameters.glade.h:46
 msgid "Set Maximum Transmission Unit:"
-msgstr "设置Maximum Transmission Unit(MTU):"
+msgstr "设置最大传输单元(MTU)："
 
 #: ../gtk-glade/parameters.glade.h:47
 msgid "Settings"
@@ -957,52 +946,47 @@ msgstr "设置"
 
 #: ../gtk-glade/parameters.glade.h:48
 msgid "Show advanced settings"
-msgstr ""
+msgstr "显示高级设置"
 
 #: ../gtk-glade/parameters.glade.h:49
-#, fuzzy
 msgid "Stun server:"
-msgstr "Stun 服务器地址："
+msgstr "Stun 服务器："
 
 #: ../gtk-glade/parameters.glade.h:50
 msgid "This section defines your SIP address when not using a SIP account"
-msgstr "该段在你不使用SIP账号时的SIP地址"
+msgstr "该段在您不使用SIP帐户时的SIP地址"
 
 #: ../gtk-glade/parameters.glade.h:51
-#, fuzzy
 msgid "Upload speed limit in Kbit/sec:"
-msgstr "上传速率限制 kbit/sec"
+msgstr "上传速率限制 kbit/s："
 
 #: ../gtk-glade/parameters.glade.h:52
 msgid "Use IPv6 instead of IPv4"
-msgstr "使用 IPv6"
+msgstr "使用 IPv6 而非 IPv4"
 
 #: ../gtk-glade/parameters.glade.h:53
-#, fuzzy
 msgid "User interface"
-msgstr "界面设置:"
+msgstr "用户界面"
 
 #: ../gtk-glade/parameters.glade.h:54
-#, fuzzy
 msgid "Video RTP/UDP:"
-msgstr "视频 RTP/UDP"
+msgstr "视频 RTP/UDP："
 
 #: ../gtk-glade/parameters.glade.h:55
-#, fuzzy
 msgid "Video input device:"
-msgstr "视频输入设备"
+msgstr "视频输入设备："
 
 #: ../gtk-glade/parameters.glade.h:56
 msgid "Your display name (eg: John Doe):"
-msgstr "你的显示名 (如：张三):"
+msgstr "您的显示名："
 
 #: ../gtk-glade/parameters.glade.h:57
 msgid "Your resulting SIP address:"
-msgstr "你的SIP地址结果:"
+msgstr "您的 SIP 地址结果："
 
 #: ../gtk-glade/parameters.glade.h:58
 msgid "Your username:"
-msgstr "你的用户名:"
+msgstr "您的用户名："
 
 #: ../gtk-glade/parameters.glade.h:59
 msgid "a sound card\n"
@@ -1010,27 +994,27 @@ msgstr "声卡\n"
 
 #: ../gtk-glade/parameters.glade.h:61
 msgid "default camera"
-msgstr "缺省摄像头"
+msgstr "默认摄像头"
 
 #: ../gtk-glade/parameters.glade.h:62
 msgid "default soundcard"
-msgstr "缺省声卡"
+msgstr "默认声卡"
 
 #: ../gtk-glade/parameters.glade.h:63
 msgid "default soundcard\n"
-msgstr "缺省声卡\n"
+msgstr "默认声卡\n"
 
 #: ../gtk-glade/buddylookup.glade.h:1
 msgid "<b>Search somebody</b>"
-msgstr "<b>查找用户</b>"
+msgstr "<b>找人</b>"
 
 #: ../gtk-glade/buddylookup.glade.h:2
 msgid "Add to my list"
-msgstr "添加为好友"
+msgstr "添加为联系人"
 
 #: ../gtk-glade/buddylookup.glade.h:3
 msgid "Search contacts in directory"
-msgstr "查找好友"
+msgstr "查找联系人"
 
 #: ../gtk-glade/waiting.glade.h:1
 msgid "Linphone"
@@ -1038,28 +1022,27 @@ msgstr "Linphone"
 
 #: ../gtk-glade/waiting.glade.h:2
 msgid "Please wait"
-msgstr "请等待"
+msgstr "请稍候"
 
-#: ../coreapi/linphonecore.c:311
-#, fuzzy, c-format
+#: ../coreapi/linphonecore.c:312
+#, c-format
 msgid "You have missed %i call."
 msgid_plural "You have missed %i calls."
-msgstr[0] "你丢失 %i 呼叫."
-msgstr[1] "你共丢失 %i 次呼叫."
+msgstr[0] "您错过了 %i 个呼叫。"
 
-#: ../coreapi/linphonecore.c:357
+#: ../coreapi/linphonecore.c:358
 msgid "aborted"
 msgstr "中断"
 
-#: ../coreapi/linphonecore.c:360
+#: ../coreapi/linphonecore.c:361
 msgid "completed"
 msgstr "完成"
 
-#: ../coreapi/linphonecore.c:363
+#: ../coreapi/linphonecore.c:364
 msgid "missed"
 msgstr "丢失"
 
-#: ../coreapi/linphonecore.c:368
+#: ../coreapi/linphonecore.c:369
 #, c-format
 msgid ""
 "%s at %s\n"
@@ -1068,62 +1051,64 @@ msgid ""
 "Status: %s\n"
 "Duration: %i mn %i sec\n"
 msgstr ""
-"%s at %s\n"
-"From: %s\n"
-"To: %s\n"
-"Status: %s\n"
-"Status: %i min %i sec\n"
+"%s @ %s\n"
+"主叫：%s\n"
+"被叫: %s\n"
+"状态：%s\n"
+"状态：%i 分 %i 秒\n"
 
-#: ../coreapi/linphonecore.c:369
+#: ../coreapi/linphonecore.c:370
 msgid "Outgoing call"
 msgstr "呼出"
 
-#: ../coreapi/linphonecore.c:626
+#: ../coreapi/linphonecore.c:644
 msgid ""
 "Your machine appears to be connected to an IPv6 network. By default linphone "
 "always uses IPv4. Please update your configuration if you want to use IPv6"
 msgstr ""
-"你的机器缺省配置为IPv6. Linphone 缺省使用IPv4. 请修改配置如果你想使用IPv6. "
+"您的机器有 IPv6 网络连接。Linphone 默认使用IPv4，如果您希望使用 IPv6 请"
+"更该配置。"
 
-#: ../coreapi/linphonecore.c:1083
+#: ../coreapi/linphonecore.c:1124
 msgid "Ready"
 msgstr "就绪"
 
-#: ../coreapi/linphonecore.c:1513
+#: ../coreapi/linphonecore.c:1621
 msgid "Remote end seems to have disconnected, the call is going to be closed."
-msgstr "对方断开连接, 通话终止."
+msgstr "对方断开连接，通话终止。"
 
-#: ../coreapi/linphonecore.c:1725
+#: ../coreapi/linphonecore.c:1843
 msgid "Looking for telephone number destination..."
-msgstr "查询对方电话号码.."
+msgstr "查询电话号码目的地..."
 
-#: ../coreapi/linphonecore.c:1727
+#: ../coreapi/linphonecore.c:1845
 msgid "Could not resolve this number."
-msgstr "该号码无法解析."
+msgstr "该号码无法解析。"
 
-#: ../coreapi/linphonecore.c:1771
+#: ../coreapi/linphonecore.c:1889
 msgid ""
 "Could not parse given sip address. A sip url usually looks like sip:"
 "user@domain"
-msgstr "无法解析给定的SIP地址. SIP url 应有如下格式: <sip:username@domainname>"
+msgstr "无法解析给定的 SIP 地址，SIP 地址应有如下格式：\n"
+"sip:用户名@域名"
 
-#: ../coreapi/linphonecore.c:1912
+#: ../coreapi/linphonecore.c:2032
 msgid "Contacting"
 msgstr "联系中"
 
-#: ../coreapi/linphonecore.c:1918
+#: ../coreapi/linphonecore.c:2038
 msgid "could not call"
 msgstr "无法呼叫"
 
-#: ../coreapi/linphonecore.c:1965
+#: ../coreapi/linphonecore.c:2085
 msgid "Sorry, having multiple simultaneous calls is not supported yet !"
 msgstr "抱歉, 还不支持并发多路呼叫!"
 
-#: ../coreapi/linphonecore.c:2370 ../coreapi/callbacks.c:32
+#: ../coreapi/linphonecore.c:2520 ../coreapi/callbacks.c:32
 msgid "Connected."
-msgstr "连接建立."
+msgstr "已连接。"
 
-#: ../coreapi/linphonecore.c:2404
+#: ../coreapi/linphonecore.c:2554
 msgid "Call ended"
 msgstr "呼叫结束"
 
@@ -1134,10 +1119,9 @@ msgid ""
 "is missing and linphone needs it. Please execute\n"
 "'modprobe snd-pcm-oss' as root to load it."
 msgstr ""
-"Your computer appears to be using ALSA sound drivers.\n"
-"This is the best choice. However the pcm oss emulation module\n"
-"is missing and linphone needs it. Please execute\n"
-"'modprobe snd-pcm-oss' as root to load it."
+"您的计算机正使用 ALSA 声音驱动。\n"
+"ALSA 是最佳选择，然而 Linphone 必须的 PCM OSS 模拟模块缺失。\n"
+"请以 root 用户运行 modprobe snd-pcm-oss 载入它。"
 
 #: ../coreapi/misc.c:150
 msgid ""
@@ -1146,14 +1130,13 @@ msgid ""
 "is missing and linphone needs it. Please execute\n"
 " 'modprobe snd-mixer-oss' as root to load it."
 msgstr ""
-"Your computer appears to be using ALSA sound drivers.\n"
-"This is the best choice. However the mixer oss emulation module\n"
-"is missing and linphone needs it. Please execute\n"
-" 'modprobe snd-mixer-oss' as root to load it."
+"您的计算机正使用 ALSA 声音驱动。\n"
+"ALSA 是最佳选择，然而 Linphone 必须的 Mixer OSS 模拟模块缺失。\n"
+"请以 root 用户运行 modprobe snd-mixer-oss 载入它。"
 
 #: ../coreapi/misc.c:497
 msgid "Stun lookup in progress..."
-msgstr "正在进行Stun查找..."
+msgstr "正在进行 Stun 查找..."
 
 #: ../coreapi/friend.c:33
 msgid "Online"
@@ -1161,26 +1144,23 @@ msgstr "在线"
 
 #: ../coreapi/friend.c:36
 msgid "Busy"
-msgstr "用户忙"
+msgstr "忙碌"
 
 #: ../coreapi/friend.c:39
-#, fuzzy
 msgid "Be right back"
-msgstr "离开"
+msgstr "很快回来"
 
 #: ../coreapi/friend.c:42
 msgid "Away"
 msgstr "离开"
 
 #: ../coreapi/friend.c:45
-#, fuzzy
 msgid "On the phone"
-msgstr "通话中"
+msgstr "正在通话"
 
 #: ../coreapi/friend.c:48
-#, fuzzy
 msgid "Out to lunch"
-msgstr "外出吃饭中.."
+msgstr "外出吃饭"
 
 #: ../coreapi/friend.c:51
 msgid "Do not disturb"
@@ -1188,14 +1168,13 @@ msgstr "请勿打扰"
 
 #: ../coreapi/friend.c:54
 msgid "Moved"
-msgstr ""
+msgstr "已转到其他服务"
 
 #: ../coreapi/friend.c:57
 msgid "Using another messaging service"
-msgstr ""
+msgstr "正在使用其他消息服务"
 
 #: ../coreapi/friend.c:60
-#, fuzzy
 msgid "Offline"
 msgstr "离线"
 
@@ -1207,304 +1186,302 @@ msgstr "挂起"
 msgid "Unknown-bug"
 msgstr "未知错误"
 
-#: ../coreapi/proxy.c:176
+#: ../coreapi/proxy.c:182
 msgid ""
 "The sip proxy address you entered is invalid, it must start with \"sip:\" "
 "followed by a hostname."
 msgstr ""
+"您输入的 SIP 代理地址无效，它必须是以“sip:”开头，并紧随一个主机名。"
 
-#: ../coreapi/proxy.c:182
+#: ../coreapi/proxy.c:188
 msgid ""
 "The sip identity you entered is invalid.\n"
 "It should look like sip:username@proxydomain, such as sip:alice@example.net"
 msgstr ""
+"您输入的地址无效。\n"
+"它应具有“sip:用户名@代理域”的形式，例如 sip:alice@example.net"
 
-#: ../coreapi/proxy.c:621
-#, fuzzy, c-format
+#: ../coreapi/proxy.c:663
+#, c-format
 msgid "Could not login as %s"
-msgstr "无法登陆: %s"
+msgstr "无法登录为 %s"
 
 #: ../coreapi/callbacks.c:95
-#, fuzzy
 msgid "is contacting you"
-msgstr "真正联系你."
+msgstr "正在联系您"
 
 #: ../coreapi/callbacks.c:96
 msgid " and asked autoanswer."
-msgstr ""
+msgstr " 并询问了自动回答。"
 
 #: ../coreapi/callbacks.c:96
 msgid "."
-msgstr ""
+msgstr "."
 
 #: ../coreapi/callbacks.c:120
 msgid "Remote ringing."
-msgstr ""
+msgstr "响铃。"
 
-#: ../coreapi/callbacks.c:139
+#: ../coreapi/callbacks.c:140
 msgid "Early media."
 msgstr ""
 
-#: ../coreapi/callbacks.c:248
+#: ../coreapi/callbacks.c:252
 msgid "Call terminated."
-msgstr "通话结束."
-
-#: ../coreapi/callbacks.c:265
-msgid "User is busy."
-msgstr "被叫忙."
-
-#: ../coreapi/callbacks.c:266
-msgid "User is temporarily unavailable."
-msgstr "你呼叫的用户无法接通."
-
-#. char *retrymsg=_("%s. Retry after %i minute(s).");
-#: ../coreapi/callbacks.c:268
-msgid "User does not want to be disturbed."
-msgstr "用户开启免打扰功能."
+msgstr "通话结束。"
 
 #: ../coreapi/callbacks.c:269
+msgid "User is busy."
+msgstr "被叫正忙。"
+
+#: ../coreapi/callbacks.c:270
+msgid "User is temporarily unavailable."
+msgstr "您呼叫的用户暂时无法接通。"
+
+#. char *retrymsg=_("%s. Retry after %i minute(s).");
+#: ../coreapi/callbacks.c:272
+msgid "User does not want to be disturbed."
+msgstr "用户已开启免打扰功能。"
+
+#: ../coreapi/callbacks.c:273
 msgid "Call declined."
-msgstr "呼叫被拒绝."
+msgstr "呼叫被拒绝。"
 
-#: ../coreapi/callbacks.c:281
-#, fuzzy
+#: ../coreapi/callbacks.c:285
 msgid "No response."
-msgstr "没有响应，超时"
+msgstr "没有响应。"
 
-#: ../coreapi/callbacks.c:284
+#: ../coreapi/callbacks.c:288
 msgid "Protocol error."
-msgstr ""
+msgstr "协议错误。"
 
-#: ../coreapi/callbacks.c:298
-#, fuzzy
+#: ../coreapi/callbacks.c:302
 msgid "Redirected"
-msgstr "重定向到 %s..."
+msgstr "已重定向"
 
-#: ../coreapi/callbacks.c:308
+#: ../coreapi/callbacks.c:312
 msgid "Not found"
-msgstr ""
+msgstr "未找到"
 
-#: ../coreapi/callbacks.c:318
+#: ../coreapi/callbacks.c:322
 msgid "No common codecs"
-msgstr ""
+msgstr "未找到常用编解码器"
 
-#: ../coreapi/callbacks.c:324
-#, fuzzy
+#: ../coreapi/callbacks.c:328
 msgid "Call failed."
-msgstr "呼叫被拒绝."
+msgstr "呼叫失败。"
 
-#: ../coreapi/callbacks.c:374
+#: ../coreapi/callbacks.c:378
 #, c-format
 msgid "Registration on %s successful."
-msgstr "成功注册到 %s "
+msgstr "成功注册到 %s"
 
-#: ../coreapi/callbacks.c:375
-#, fuzzy, c-format
+#: ../coreapi/callbacks.c:379
+#, c-format
 msgid "Unregistration on %s done."
-msgstr "成功注册到 %s "
+msgstr "已在 %s 解除注册。"
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:387
 #, c-format
 msgid "Registration on %s failed: %s"
 msgstr "注册到 %s 失败: %s"
 
-#: ../coreapi/callbacks.c:383
+#: ../coreapi/callbacks.c:387
 msgid "no response timeout"
 msgstr "没有响应，超时"
 
 #: ../mediastreamer2/src/alaw.c:144 ../mediastreamer2/src/alaw.c:162
 msgid "ITU-G.711 alaw encoder"
-msgstr ""
+msgstr "ITU-G.711 alaw 编码器"
 
 #: ../mediastreamer2/src/alaw.c:194 ../mediastreamer2/src/alaw.c:211
 msgid "ITU-G.711 alaw decoder"
-msgstr ""
+msgstr "ITU-G.711 alaw 解码器"
 
-#: ../mediastreamer2/src/alsa.c:935
-#, fuzzy
+#: ../mediastreamer2/src/alsa.c:950
 msgid "Alsa sound source"
-msgstr "ALSA音频源"
+msgstr "Alsa 音频源"
 
-#: ../mediastreamer2/src/alsa.c:1039
+#: ../mediastreamer2/src/alsa.c:1054
 msgid "Alsa sound output"
-msgstr "ALSA音频输出"
+msgstr "Alsa 音频输出"
 
 #: ../mediastreamer2/src/aqsnd.c:1008
 msgid "Sound capture filter for MacOS X Audio Queue Service"
-msgstr ""
+msgstr "MacOS X 音频队列服务音频输入过滤器"
 
 #: ../mediastreamer2/src/aqsnd.c:1032
 msgid "Sound playback filter for MacOS X Audio Queue Service"
-msgstr ""
+msgstr "MacOS X 音频队列服务音频回放过滤器"
 
 #: ../mediastreamer2/src/dtmfgen.c:173 ../mediastreamer2/src/dtmfgen.c:191
 msgid "DTMF generator"
-msgstr ""
+msgstr "DTMF 生成器"
 
-#: ../mediastreamer2/src/gsm.c:111 ../mediastreamer2/src/gsm.c:129
+#: ../mediastreamer2/src/gsm.c:114 ../mediastreamer2/src/gsm.c:132
 msgid "The GSM full-rate codec"
-msgstr ""
+msgstr "GSM 全速编解码器"
 
-#: ../mediastreamer2/src/gsm.c:178 ../mediastreamer2/src/gsm.c:196
+#: ../mediastreamer2/src/gsm.c:181 ../mediastreamer2/src/gsm.c:199
 msgid "The GSM codec"
-msgstr ""
+msgstr "GSM 编解码器"
 
 #: ../mediastreamer2/src/macsnd.c:1083
 msgid "Sound capture filter for MacOS X Core Audio drivers"
-msgstr ""
+msgstr "MacOS X 核心声音驱动音频输入过滤器"
 
 #: ../mediastreamer2/src/macsnd.c:1098
 msgid "Sound playback filter for MacOS X Core Audio drivers"
-msgstr ""
+msgstr "MacOS X 核心声音驱动音频回放过滤器"
 
 #: ../mediastreamer2/src/msconf.c:787 ../mediastreamer2/src/msconf.c:805
 msgid "A filter to make conferencing"
 msgstr ""
 
-#: ../mediastreamer2/src/msfileplayer.c:295
-#: ../mediastreamer2/src/msfileplayer.c:313
+#: ../mediastreamer2/src/msfileplayer.c:311
+#: ../mediastreamer2/src/msfileplayer.c:329
 msgid "Raw files and wav reader"
-msgstr ""
+msgstr "原始文件和 Wav 读取器"
 
 #: ../mediastreamer2/src/msfilerec.c:170 ../mediastreamer2/src/msfilerec.c:188
 #: ../mediastreamer2/src/msfilerec_win.c:216
 #: ../mediastreamer2/src/msfilerec_win.c:234
 msgid "Wav file recorder"
-msgstr ""
+msgstr "Wav 文件记录器"
 
 #: ../mediastreamer2/src/msjoin.c:45 ../mediastreamer2/src/msjoin.c:63
 msgid "A filter that send several inputs to one output."
-msgstr ""
+msgstr "将多个输入发送至单个输出。"
 
-#: ../mediastreamer2/src/msresample.c:221
-#: ../mediastreamer2/src/msresample.c:239
-msgid "frequency resampler"
-msgstr ""
+#: ../mediastreamer2/src/msresample.c:159
+#: ../mediastreamer2/src/msresample.c:177
+msgid "Audio resampler"
+msgstr "音频重采样"
 
 #: ../mediastreamer2/src/msrtp.c:358 ../mediastreamer2/src/msrtp.c:376
 msgid "RTP output filter"
-msgstr ""
+msgstr "RTP 输出过滤器"
 
 #: ../mediastreamer2/src/msrtp.c:493 ../mediastreamer2/src/msrtp.c:511
 msgid "RTP input filter"
-msgstr ""
+msgstr "RTP 输入过滤器"
 
 #: ../mediastreamer2/src/msspeex.c:359 ../mediastreamer2/src/msspeex.c:377
-#: ../mediastreamer2/src/msspeex.c:504 ../mediastreamer2/src/msspeex.c:522
+#: ../mediastreamer2/src/msspeex.c:519 ../mediastreamer2/src/msspeex.c:537
 msgid "The free and wonderful speex codec"
-msgstr ""
+msgstr "优秀的自由软件编解码器 Speex"
 
-#: ../mediastreamer2/src/msvolume.c:415 ../mediastreamer2/src/msvolume.c:430
+#: ../mediastreamer2/src/msvolume.c:499 ../mediastreamer2/src/msvolume.c:514
 msgid "A filter that controls and measure sound volume"
-msgstr ""
+msgstr "控制和调节音量的过滤器"
 
 #: ../mediastreamer2/src/msv4l.c:1011
 msgid "A video4linux compatible source filter to stream pictures."
-msgstr ""
+msgstr "用于图像流的 video4linux 兼容源过滤器"
 
-#: ../mediastreamer2/src/msv4l2.c:470
+#: ../mediastreamer2/src/msv4l2.c:580
 msgid "A filter to grab pictures from Video4Linux2-powered cameras"
-msgstr ""
+msgstr "用于从 Video4Linux2 驱动的摄像头获取图像的过滤器"
 
-#: ../mediastreamer2/src/nowebcam.c:1836
+#: ../mediastreamer2/src/nowebcam.c:1838
 msgid "A filter that outputs a static image."
-msgstr ""
+msgstr "输出静态图像的过滤器"
 
 #: ../mediastreamer2/src/oss.c:567
 msgid "Sound capture filter for OSS drivers"
-msgstr ""
+msgstr "OSS 驱动的音频输入过滤器"
 
 #: ../mediastreamer2/src/oss.c:581
 msgid "Sound playback filter for OSS drivers"
-msgstr ""
+msgstr "OSS 驱动的音频回放过滤器"
 
 #: ../mediastreamer2/src/pixconv.c:177 ../mediastreamer2/src/pixconv.c:195
 msgid "A pixel format converter"
-msgstr ""
+msgstr "像素格式转换器"
 
 #: ../mediastreamer2/src/sizeconv.c:204
 msgid "A video size converter"
-msgstr ""
+msgstr "视频尺寸转换器"
 
 #: ../mediastreamer2/src/sizeconv.c:222
 msgid "a small video size converter"
-msgstr ""
+msgstr "小的视频尺寸转换器"
 
-#: ../mediastreamer2/src/speexec.c:349 ../mediastreamer2/src/speexec.c:367
+#: ../mediastreamer2/src/speexec.c:267 ../mediastreamer2/src/speexec.c:285
 msgid "Echo canceller using speex library"
-msgstr ""
+msgstr "使用 Speex 库的回声抑制器"
 
 #: ../mediastreamer2/src/tee.c:80 ../mediastreamer2/src/tee.c:98
 msgid "A filter that reads from input and copy to its multiple outputs."
-msgstr ""
+msgstr "用于读取输入并复制到多个输出的过滤器"
 
 #: ../mediastreamer2/src/theora.c:375
 msgid "The theora video encoder from xiph.org"
-msgstr ""
+msgstr "来自 xiph.org 的 Theora 视频编码器"
 
 #: ../mediastreamer2/src/theora.c:393
 msgid "The open-source and royalty-free 'theora' video codec from xiph.org"
-msgstr ""
+msgstr "来自 xiph.org 的开源的自由软件编解码器 Theora"
 
 #: ../mediastreamer2/src/theora.c:561 ../mediastreamer2/src/theora.c:579
 msgid "The theora video decoder from xiph.org"
-msgstr ""
+msgstr "来自 xiph.org 的 Theora 视频解码器"
 
 #: ../mediastreamer2/src/ulaw.c:146 ../mediastreamer2/src/ulaw.c:164
 msgid "ITU-G.711 ulaw encoder"
-msgstr ""
+msgstr "ITU-G.711 ulaw 编码器"
 
 #: ../mediastreamer2/src/ulaw.c:196 ../mediastreamer2/src/ulaw.c:214
 msgid "ITU-G.711 ulaw decoder"
-msgstr ""
+msgstr "ITU-G.711 ulaw 解码器"
 
-#: ../mediastreamer2/src/videodec.c:669 ../mediastreamer2/src/videodec.c:685
-#: ../mediastreamer2/src/videodec.c:768 ../mediastreamer2/src/videodec.c:784
+#: ../mediastreamer2/src/videodec.c:701 ../mediastreamer2/src/videodec.c:717
+#: ../mediastreamer2/src/videodec.c:800 ../mediastreamer2/src/videodec.c:816
 msgid "A H.263 decoder using ffmpeg library"
-msgstr ""
-
-#: ../mediastreamer2/src/videodec.c:702
-msgid "A MPEG4 decoder using ffmpeg library"
-msgstr ""
-
-#: ../mediastreamer2/src/videodec.c:718
-msgid "A RTP/JPEG decoder using ffmpeg library"
-msgstr ""
+msgstr "使用 ffmpeg 库的 H.263 解码器"
 
 #: ../mediastreamer2/src/videodec.c:734
-msgid "A MJPEG decoder using ffmpeg library"
-msgstr ""
+msgid "A MPEG4 decoder using ffmpeg library"
+msgstr "使用 ffmpeg 库的 MPEG4 解码器"
 
 #: ../mediastreamer2/src/videodec.c:750
+msgid "A RTP/JPEG decoder using ffmpeg library"
+msgstr "使用 ffmpeg 库的 RTP/JPEG 解码器"
+
+#: ../mediastreamer2/src/videodec.c:766
+msgid "A MJPEG decoder using ffmpeg library"
+msgstr "使用 ffmpeg 库的 MJPEG 解码器"
+
+#: ../mediastreamer2/src/videodec.c:782
 msgid "A snow decoder using ffmpeg library"
-msgstr ""
+msgstr "使用 ffmpeg 库的 snow 解码器"
 
 #: ../mediastreamer2/src/videoenc.c:861 ../mediastreamer2/src/videoenc.c:943
 msgid "A video H.263 encoder using ffmpeg library."
-msgstr ""
+msgstr "使用 ffmpeg 库的 H.263 编码器"
 
 #: ../mediastreamer2/src/videoenc.c:877
 msgid ""
 "A video H.263 encoder using ffmpeg library. It is compliant with old RFC2190 "
 "spec."
-msgstr ""
+msgstr "使用 ffmpeg 库的 H.263 视频编码器，符合旧的 RFC2190"
 
 #: ../mediastreamer2/src/videoenc.c:893 ../mediastreamer2/src/videoenc.c:975
 msgid "A video MPEG4 encoder using ffmpeg library."
-msgstr ""
+msgstr "使用 ffmpeg 库的 MPEG4 视频编码器"
 
 #: ../mediastreamer2/src/videoenc.c:909
 msgid "A video snow encoder using ffmpeg library."
-msgstr ""
+msgstr "使用 ffmpeg 库的 snow 编码器"
 
 #: ../mediastreamer2/src/videoenc.c:925
 msgid "A RTP/MJPEG encoder using ffmpeg library."
-msgstr ""
+msgstr "使用 ffmpeg 库的 RTP/MJPEG 编码器"
 
 #: ../mediastreamer2/src/videoenc.c:959
 msgid ""
 "A video H.263 encoder using ffmpeg library, compliant with old RFC2190 spec."
-msgstr ""
+msgstr "使用 ffmpeg 库的 H.263 编码器，符合旧的 RFC2190"
 
 #: ../mediastreamer2/src/videoenc.c:991
 msgid ""
@@ -1514,14 +1491,17 @@ msgid ""
 "However it is under development, quite unstable and compatibility with other "
 "versions cannot be guaranteed."
 msgstr ""
+"Snow 编解码器是开源的自由软件。\n"
+"创新科技使 Snow 成为当今最有希望的视频编解码器。它在 ffmpeg 项目内实现。\n"
+"然而它仍处于开发中，稳定性和与其他版本的兼容性尚无法保证。"
 
 #: ../mediastreamer2/src/videoenc.c:1011
 msgid "A MJPEG encoder using ffmpeg library."
-msgstr ""
+msgstr "使用 ffmpeg 库的 MJPEG 编码器"
 
-#: ../mediastreamer2/src/videoout.c:1812 ../mediastreamer2/src/videoout.c:1830
+#: ../mediastreamer2/src/videoout.c:1821 ../mediastreamer2/src/videoout.c:1839
 msgid "A generic video display"
-msgstr ""
+msgstr "通用视频显示"
 
 #: ../mediastreamer2/src/wincevideods.c:969
 #: ../mediastreamer2/src/wincevideods.c:987
@@ -1537,7 +1517,7 @@ msgstr ""
 
 #: ../mediastreamer2/src/ice.c:1349 ../mediastreamer2/src/ice.c:1367
 msgid "ICE filter"
-msgstr ""
+msgstr "ICE 过滤器"
 
 #: ../mediastreamer2/src/void.c:35 ../mediastreamer2/src/void.c:52
 msgid "A filter that trashes its input (useful for terminating some graphs)."
@@ -1549,71 +1529,27 @@ msgstr ""
 
 #: ../mediastreamer2/src/msdscap-mingw.cc:1003
 msgid "A webcam grabber based on directshow."
+msgstr "使用 DirectShow 的摄像头抓取器"
+
+#: ../mediastreamer2/src/drawdib-display.c:679
+#: ../mediastreamer2/src/drawdib-display.c:697
+msgid "A video display based on windows DrawDib api"
 msgstr ""
 
-#~ msgid "Could not reach destination."
-#~ msgstr "目标不可达."
+#: ../mediastreamer2/src/audiomixer.c:192
+#: ../mediastreamer2/src/audiomixer.c:211
+msgid "A filter that mixes down 16 bit sample audio streams"
+msgstr ""
 
-#~ msgid "Request Cancelled."
-#~ msgstr "取消请求."
+#: ../mediastreamer2/src/chanadapt.c:110 ../mediastreamer2/src/chanadapt.c:128
+msgid "A filter that converts from mono to stereo and vice versa."
+msgstr ""
 
-#~ msgid "Bad request"
-#~ msgstr "错误请求"
+#: ../mediastreamer2/src/itc.c:97 ../mediastreamer2/src/itc.c:115
+#: ../mediastreamer2/src/itc.c:197 ../mediastreamer2/src/itc.c:215
+msgid "Inter ticker communication filter."
+msgstr ""
 
-#~ msgid "User cannot be found at given address."
-#~ msgstr "用给定地址无法找到该用户."
-
-#~ msgid "Remote user cannot support any of proposed codecs."
-#~ msgstr "对方不支持相关编码."
-
-#~ msgid "Timeout."
-#~ msgstr "超时."
-
-#~ msgid "Remote host was found but refused connection."
-#~ msgstr "找到该用户，但是连接被拒绝."
-
-#~ msgid ""
-#~ "User is not reachable at the moment but he invites you\n"
-#~ "to contact him using the following alternate resource:"
-#~ msgstr ""
-#~ "用户当前不可达，但是他向你发出呼叫请求\n"
-#~ " 要联系该用户，请使用如下地址:"
-
-#~ msgid "<b>Terminate call</b>"
-#~ msgstr "挂断电话"
-
-#~ msgid "No nat/firewall address supplied !"
-#~ msgstr "没有提供NAT/firewall地址!"
-
-#~ msgid "Invalid nat address '%s' : %s"
-#~ msgstr "无效NAT地址 '%s' : '%s'"
-
-#~ msgid "Gone"
-#~ msgstr "离开"
-
-#~ msgid "Waiting for Approval"
-#~ msgstr "等待批准"
-
-#~ msgid "Be Right Back"
-#~ msgstr "马上回来"
-
-#~ msgid "On The Phone"
-#~ msgstr "通话中"
-
-#~ msgid "Out To Lunch"
-#~ msgstr "外出就餐"
-
-#~ msgid "Closed"
-#~ msgstr "离线"
-
-#, fuzzy
-#~ msgid "Unknown"
-#~ msgstr "未知错误"
-
-#, fuzzy
-#~ msgid "gtk-connect"
-#~ msgstr "连接"
-
-#, fuzzy
-#~ msgid "SIP address"
-#~ msgstr "SIP 地址"
+#: ../mediastreamer2/src/extdisplay.c:62 ../mediastreamer2/src/extdisplay.c:79
+msgid "A display filter sending the buffers to draw to the upper layer"
+msgstr ""