Code

Updated plugin messages
[gosa.git] / gosa-plugins / gofon / locale / zh / LC_MESSAGES / messages.po
index d6bc8528f0d0b768feff5f00ff98a12c5e62a0a5..05b3f5088fc101aeaef15aa676804ab6f5297db0 100644 (file)
@@ -7,15 +7,197 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-15 03:17-0400\n"
+"POT-Creation-Date: 2010-11-04 15:23+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: admin/ogroups/gofon/phonequeue.tpl:3
+msgid ""
+"Only users with the same asterisk home server will be included to this queue."
+msgstr "只有有着相同 asterisk 主服务器的用户才会被包含在这个队列中。"
+
+#: admin/ogroups/gofon/phonequeue.tpl:6
+msgid "Queue Settings"
+msgstr "队列设置"
+
+#: admin/ogroups/gofon/phonequeue.tpl:10 admin/ogroups/gofon/phonequeue.tpl:11
+#: gofon/phoneaccount/generic.tpl:1 gofon/phoneaccount/generic.tpl:4
+#: gofon/phoneaccount/paste_generic.tpl:2
+#: gofon/phoneaccount/paste_generic.tpl:5
+msgid "Phone numbers"
+msgstr "电话号码"
+
+#: admin/ogroups/gofon/phonequeue.tpl:14
+#: admin/ogroups/gofon/phonequeue.tpl:144
+msgid "Generic queue Settings"
+msgstr "通用队列设置"
+
+#: admin/ogroups/gofon/phonequeue.tpl:27
+msgid "Up"
+msgstr "上"
+
+#: admin/ogroups/gofon/phonequeue.tpl:31
+msgid "Down"
+msgstr "关闭"
+
+#: admin/ogroups/gofon/phonequeue.tpl:54 gofon/conference/generic.tpl:129
+#: gofon/conference/generic.tpl:135
+msgid "Options"
+msgstr "选项"
+
+#: admin/ogroups/gofon/phonequeue.tpl:57
+#: admin/ogroups/gofon/class_phonequeue.inc:305
+#: admin/ogroups/gofon/class_phonequeue.inc:934
+#: gofon/phoneaccount/generic.tpl:55
+#: gofon/phoneaccount/class_phoneAccount.inc:1459
+#: gofon/phoneaccount/class_phoneAccount.inc:1867
+#: gofon/conference/generic.tpl:57
+#: gofon/conference/class_phoneConferenceGeneric.inc:849
+msgid "Home server"
+msgstr "主服务器"
+
+#: admin/ogroups/gofon/phonequeue.tpl:69
+#: admin/ogroups/gofon/class_phonequeue.inc:953
+#: gofon/conference/generic.tpl:67
+#: gofon/conference/class_phoneConferenceGeneric.inc:847
+msgid "Language"
+msgstr "语言"
+
+#: admin/ogroups/gofon/phonequeue.tpl:82
+#: admin/ogroups/gofon/class_phonequeue.inc:311
+#: admin/ogroups/gofon/class_phonequeue.inc:932
+msgid "Timeout"
+msgstr "过期"
+
+#: admin/ogroups/gofon/phonequeue.tpl:92
+#: admin/ogroups/gofon/class_phonequeue.inc:314
+#: admin/ogroups/gofon/class_phonequeue.inc:957
+msgid "Retry"
+msgstr "重试"
+
+#: admin/ogroups/gofon/phonequeue.tpl:102
+msgid "Strategy"
+msgstr "策略"
+
+#: admin/ogroups/gofon/phonequeue.tpl:116
+#: admin/ogroups/gofon/class_phonequeue.inc:933
+msgid "Max queue length"
+msgstr "最大队列长度"
+
+#: admin/ogroups/gofon/phonequeue.tpl:126
+#: admin/ogroups/gofon/class_phonequeue.inc:320
+#: admin/ogroups/gofon/class_phonequeue.inc:935
+msgid "Announce frequency"
+msgstr "公告频率"
+
+#: admin/ogroups/gofon/phonequeue.tpl:132
+msgid "(in seconds)"
+msgstr "(秒)"
+
+#: admin/ogroups/gofon/phonequeue.tpl:142
+msgid "Queue sound setup"
+msgstr "队列声音设置"
+
+#: admin/ogroups/gofon/phonequeue.tpl:147
+msgid "Use music on hold instead of ringing"
+msgstr "播放音乐保持锁定而非播放"
+
+#: admin/ogroups/gofon/phonequeue.tpl:158
+#: admin/ogroups/gofon/class_phonequeue.inc:942
+msgid "Music on hold"
+msgstr "暂停的音乐"
+
+#: admin/ogroups/gofon/phonequeue.tpl:168
+msgid "Welcome sound file"
+msgstr "欢迎声音文件"
+
+#: admin/ogroups/gofon/phonequeue.tpl:178
+msgid "Announce message"
+msgstr "公告信息"
+
+#: admin/ogroups/gofon/phonequeue.tpl:188
+msgid "Sound file for 'You are next ...'"
+msgstr "声音文件“您是下一个...”"
+
+#: admin/ogroups/gofon/phonequeue.tpl:198
+msgid "'There are ...'"
+msgstr "'这里有 ...'"
+
+#: admin/ogroups/gofon/phonequeue.tpl:208
+msgid "'... calls waiting'"
+msgstr "'... 电话在等待'"
+
+#: admin/ogroups/gofon/phonequeue.tpl:218
+msgid "'Thank you' message"
+msgstr "'谢谢您' 消息"
+
+#: admin/ogroups/gofon/phonequeue.tpl:228
+msgid "'minutes' sound file"
+msgstr "'分钟' 声音文件"
+
+#: admin/ogroups/gofon/phonequeue.tpl:238
+msgid "'seconds' sound file"
+msgstr "'秒' 声音文件"
+
+#: admin/ogroups/gofon/phonequeue.tpl:248
+msgid "Hold sound file"
+msgstr "暂停声音文件"
+
+#: admin/ogroups/gofon/phonequeue.tpl:258
+msgid "Less Than sound file"
+msgstr "声音文件“小于...”"
+
+#: admin/ogroups/gofon/phonequeue.tpl:276
+msgid "Phone attributes "
+msgstr "电话属性"
+
+#: admin/ogroups/gofon/phonequeue.tpl:281
+#, fuzzy
+msgid "Additional queue settings"
+msgstr "应用程序设置"
+
+#: admin/ogroups/gofon/phonequeue.tpl:288
+#: admin/ogroups/gofon/class_phonequeue.inc:955
+#, fuzzy
+msgid "Announce hold time"
+msgstr "公告期限"
+
+#: admin/ogroups/gofon/phonequeue.tpl:296
+#: admin/ogroups/gofon/class_phonequeue.inc:936
+msgid "Allow the called user to transfer his call"
+msgstr "允许被叫用户转移呼叫"
+
+#: admin/ogroups/gofon/phonequeue.tpl:304
+#: admin/ogroups/gofon/class_phonequeue.inc:937
+msgid "Allows calling user to transfer call"
+msgstr "允许拨叫用户转移呼叫"
+
+#: admin/ogroups/gofon/phonequeue.tpl:311
+#, fuzzy
+msgid "Dial options"
+msgstr "邮件选项"
+
+#: admin/ogroups/gofon/phonequeue.tpl:318
+#: admin/ogroups/gofon/class_phonequeue.inc:938
+msgid "Allow the called to hangup by pressing *"
+msgstr "允许被叫用户按 * 键挂起"
+
+#: admin/ogroups/gofon/phonequeue.tpl:326
+#: admin/ogroups/gofon/class_phonequeue.inc:940
+msgid "Allows calling to hangup by pressing *"
+msgstr "允许拨叫用户按 * 键挂起"
+
+#: admin/ogroups/gofon/phonequeue.tpl:334
+#: admin/ogroups/gofon/class_phonequeue.inc:939
+msgid "Ring instead of playing background music"
+msgstr "振铃而非播放背景音乐"
+
 #: admin/ogroups/gofon/class_phonequeue.inc:91
 #: gofon/phoneaccount/class_phoneAccount.inc:140
 #: gofon/conference/class_phoneConferenceGeneric.inc:102
@@ -78,39 +260,11 @@ msgid ""
 "phone queue."
 msgstr "必须有至少一个带有 asterisk 数据库的服务器来创建一个电话队列。"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:305
-#: admin/ogroups/gofon/class_phonequeue.inc:934
-#: admin/ogroups/gofon/phonequeue.tpl:57 gofon/phoneaccount/generic.tpl:55
-#: gofon/phoneaccount/class_phoneAccount.inc:1459
-#: gofon/phoneaccount/class_phoneAccount.inc:1867
-#: gofon/conference/class_phoneConferenceGeneric.inc:849
-#: gofon/conference/generic.tpl:57
-msgid "Home server"
-msgstr "主服务器"
-
-#: admin/ogroups/gofon/class_phonequeue.inc:311
-#: admin/ogroups/gofon/class_phonequeue.inc:932
-#: admin/ogroups/gofon/phonequeue.tpl:82
-msgid "Timeout"
-msgstr "过期"
-
-#: admin/ogroups/gofon/class_phonequeue.inc:314
-#: admin/ogroups/gofon/class_phonequeue.inc:957
-#: admin/ogroups/gofon/phonequeue.tpl:92
-msgid "Retry"
-msgstr "重试"
-
 #: admin/ogroups/gofon/class_phonequeue.inc:317
 #, fuzzy
 msgid "Queue length"
 msgstr "最大队列长度"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:320
-#: admin/ogroups/gofon/class_phonequeue.inc:935
-#: admin/ogroups/gofon/phonequeue.tpl:126
-msgid "Announce frequency"
-msgstr "公告频率"
-
 #: admin/ogroups/gofon/class_phonequeue.inc:323
 #: gofon/conference/class_phoneConferenceGeneric.inc:371
 #, fuzzy
@@ -125,15 +279,15 @@ msgstr "粘贴"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:378
 #: admin/ogroups/gofon/class_phonequeue.inc:732
+#: gofon/macro/class_gofonMacro.inc:397 gofon/macro/class_gofonMacro.inc:481
 #: gofon/phoneaccount/class_phoneAccount.inc:468
 #: gofon/phoneaccount/class_phoneAccount.inc:1149
 #: gofon/phoneaccount/class_phoneAccount.inc:1627
+#: gofon/conference/class_phoneConferenceGeneric.inc:409
 #: gofon/fonreports/class_fonreport.inc:181
 #: gofon/fonreports/class_fonreport.inc:202
 #: gofon/fonreports/class_fonreport.inc:207
 #: gofon/fonreports/class_fonreport.inc:224
-#: gofon/macro/class_gofonMacro.inc:397 gofon/macro/class_gofonMacro.inc:481
-#: gofon/conference/class_phoneConferenceGeneric.inc:409
 #, fuzzy
 msgid "GOfon"
 msgstr "没有宏"
@@ -160,6 +314,8 @@ msgstr "电话号码"
 #: admin/ogroups/gofon/class_phonequeue.inc:865
 #: admin/systems/gofon/class_phoneGeneric.inc:245
 #: admin/systems/gofon/class_phoneGeneric.inc:290
+#: gofon/macro/class_gofonMacro.inc:359 gofon/macro/class_gofonMacro.inc:468
+#: gofon/macro/class_gofonMacro.inc:477 gofon/macro/class_gofonMacro.inc:515
 #: gofon/phoneaccount/class_phoneAccount.inc:689
 #: gofon/phoneaccount/class_phoneAccount.inc:1011
 #: gofon/phoneaccount/class_phoneAccount.inc:1134
@@ -170,15 +326,13 @@ msgstr "电话号码"
 #: gofon/phoneaccount/class_phoneAccount.inc:1653
 #: gofon/phoneaccount/class_phoneAccount.inc:1663
 #: gofon/phoneaccount/class_phoneAccount.inc:1710
-#: gofon/fonreports/class_fonreport.inc:201
-#: gofon/fonreports/class_fonreport.inc:206
-#: gofon/fonreports/class_fonreport.inc:223
-#: gofon/macro/class_gofonMacro.inc:359 gofon/macro/class_gofonMacro.inc:468
-#: gofon/macro/class_gofonMacro.inc:477 gofon/macro/class_gofonMacro.inc:515
 #: gofon/conference/class_phoneConferenceGeneric.inc:227
 #: gofon/conference/class_phoneConferenceGeneric.inc:231
 #: gofon/conference/class_phoneConferenceGeneric.inc:267
 #: gofon/conference/class_phoneConferenceGeneric.inc:596
+#: gofon/fonreports/class_fonreport.inc:201
+#: gofon/fonreports/class_fonreport.inc:206
+#: gofon/fonreports/class_fonreport.inc:223
 msgid "Error"
 msgstr "错误"
 
@@ -189,11 +343,11 @@ msgstr "错误"
 #: admin/systems/gofon/class_phoneGeneric.inc:414
 #: admin/systems/gofon/class_phoneGeneric.inc:428
 #: admin/systems/gofon/class_phoneGeneric.inc:445
-#: gofon/phoneaccount/class_phoneAccount.inc:1585
-#: gofon/phoneaccount/class_phoneAccount.inc:1764
 #: gofon/macro/class_gofonMacroParameters.inc:405
 #: gofon/macro/class_gofonMacro.inc:489 gofon/macro/class_gofonMacro.inc:500
 #: gofon/macro/class_gofonMacro.inc:537
+#: gofon/phoneaccount/class_phoneAccount.inc:1585
+#: gofon/phoneaccount/class_phoneAccount.inc:1764
 #: gofon/conference/class_phoneConferenceGeneric.inc:767
 #, fuzzy
 msgid "LDAP error"
@@ -201,8 +355,8 @@ msgstr "LDAP 错误:"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
 #: gofon/phoneaccount/class_phoneAccount.inc:1503
-#: gofon/conference/conf-filter.xml:32 gofon/conference/paste_generic.tpl:15
-#: gofon/conference/generic.tpl:109
+#: gofon/conference/conf-filter.xml:32 gofon/conference/generic.tpl:109
+#: gofon/conference/paste_generic.tpl:15
 msgid "Phone number"
 msgstr "电话号码"
 
@@ -222,59 +376,24 @@ msgstr "电话"
 msgid "Phone group"
 msgstr "电话宏"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:933
-#: admin/ogroups/gofon/phonequeue.tpl:116
-msgid "Max queue length"
-msgstr "æ\9c\80大é\98\9få\88\97é\95¿åº¦"
+#: admin/ogroups/gofon/class_phonequeue.inc:943
+#, fuzzy
+msgid "Welcome music"
+msgstr "欢è¿\8e %s!"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:936
-#: admin/ogroups/gofon/phonequeue.tpl:296
-msgid "Allow the called user to transfer his call"
-msgstr "å\85\81许被å\8f«ç\94¨æ\88·è½¬ç§»å\91¼å\8f«"
+#: admin/ogroups/gofon/class_phonequeue.inc:944
+#, fuzzy
+msgid "Report hold time"
+msgstr "å\85¬å\91\8aæ\9c\9fé\99\90"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:937
-#: admin/ogroups/gofon/phonequeue.tpl:304
-msgid "Allows calling user to transfer call"
-msgstr "允许拨叫用户转移呼叫"
+#: admin/ogroups/gofon/class_phonequeue.inc:945
+msgid "'You are next' sound"
+msgstr ""
 
-#: admin/ogroups/gofon/class_phonequeue.inc:938
-#: admin/ogroups/gofon/phonequeue.tpl:318
-msgid "Allow the called to hangup by pressing *"
-msgstr "允许被叫用户按 * 键挂起"
-
-#: admin/ogroups/gofon/class_phonequeue.inc:939
-#: admin/ogroups/gofon/phonequeue.tpl:334
-msgid "Ring instead of playing background music"
-msgstr "振铃而非播放背景音乐"
-
-#: admin/ogroups/gofon/class_phonequeue.inc:940
-#: admin/ogroups/gofon/phonequeue.tpl:326
-msgid "Allows calling to hangup by pressing *"
-msgstr "允许拨叫用户按 * 键挂起"
-
-#: admin/ogroups/gofon/class_phonequeue.inc:942
-#: admin/ogroups/gofon/phonequeue.tpl:158
-msgid "Music on hold"
-msgstr "暂停的音乐"
-
-#: admin/ogroups/gofon/class_phonequeue.inc:943
-#, fuzzy
-msgid "Welcome music"
-msgstr "欢迎 %s!"
-
-#: admin/ogroups/gofon/class_phonequeue.inc:944
-#, fuzzy
-msgid "Report hold time"
-msgstr "公告期限"
-
-#: admin/ogroups/gofon/class_phonequeue.inc:945
-msgid "'You are next' sound"
-msgstr ""
-
-#: admin/ogroups/gofon/class_phonequeue.inc:946
-#, fuzzy
-msgid "'There are' sound"
-msgstr "'这里有 ...'"
+#: admin/ogroups/gofon/class_phonequeue.inc:946
+#, fuzzy
+msgid "'There are' sound"
+msgstr "'这里有 ...'"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:947
 #, fuzzy
@@ -306,132 +425,40 @@ msgstr "声音文件“小于...”"
 msgid "Queue phone number"
 msgstr "电话号码"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:953
-#: admin/ogroups/gofon/phonequeue.tpl:69
-#: gofon/conference/class_phoneConferenceGeneric.inc:847
-#: gofon/conference/generic.tpl:67
-msgid "Language"
-msgstr "语言"
-
 #: admin/ogroups/gofon/class_phonequeue.inc:954
 #, fuzzy
 msgid "Method"
 msgstr "方法"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:955
-#: admin/ogroups/gofon/phonequeue.tpl:288
-#, fuzzy
-msgid "Announce hold time"
-msgstr "公告期限"
-
 #: admin/ogroups/gofon/class_phonequeue.inc:956
 #, fuzzy
 msgid "Announce"
 msgstr "公告信息"
 
-#: admin/ogroups/gofon/phonequeue.tpl:3
-msgid ""
-"Only users with the same asterisk home server will be included to this queue."
-msgstr "只有有着相同 asterisk 主服务器的用户才会被包含在这个队列中。"
-
-#: admin/ogroups/gofon/phonequeue.tpl:6
-msgid "Queue Settings"
-msgstr "队列设置"
-
-#: admin/ogroups/gofon/phonequeue.tpl:10 admin/ogroups/gofon/phonequeue.tpl:11
-#: gofon/phoneaccount/paste_generic.tpl:2
-#: gofon/phoneaccount/paste_generic.tpl:5 gofon/phoneaccount/generic.tpl:1
-#: gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
-msgstr "电话号码"
-
-#: admin/ogroups/gofon/phonequeue.tpl:14
-#: admin/ogroups/gofon/phonequeue.tpl:144
-msgid "Generic queue Settings"
-msgstr "通用队列设置"
-
-#: admin/ogroups/gofon/phonequeue.tpl:27
-msgid "Up"
-msgstr "上"
-
-#: admin/ogroups/gofon/phonequeue.tpl:31
-msgid "Down"
-msgstr "关闭"
-
-#: admin/ogroups/gofon/phonequeue.tpl:54 gofon/conference/generic.tpl:129
-#: gofon/conference/generic.tpl:135
-msgid "Options"
-msgstr "选项"
-
-#: admin/ogroups/gofon/phonequeue.tpl:102
-msgid "Strategy"
-msgstr "策略"
-
-#: admin/ogroups/gofon/phonequeue.tpl:132
-msgid "(in seconds)"
-msgstr "(秒)"
-
-#: admin/ogroups/gofon/phonequeue.tpl:142
-msgid "Queue sound setup"
-msgstr "队列声音设置"
-
-#: admin/ogroups/gofon/phonequeue.tpl:147
-msgid "Use music on hold instead of ringing"
-msgstr "播放音乐保持锁定而非播放"
-
-#: admin/ogroups/gofon/phonequeue.tpl:168
-msgid "Welcome sound file"
-msgstr "欢迎声音文件"
-
-#: admin/ogroups/gofon/phonequeue.tpl:178
-msgid "Announce message"
-msgstr "公告信息"
-
-#: admin/ogroups/gofon/phonequeue.tpl:188
-msgid "Sound file for 'You are next ...'"
-msgstr "声音文件“您是下一个...”"
-
-#: admin/ogroups/gofon/phonequeue.tpl:198
-msgid "'There are ...'"
-msgstr "'这里有 ...'"
-
-#: admin/ogroups/gofon/phonequeue.tpl:208
-msgid "'... calls waiting'"
-msgstr "'... 电话在等待'"
-
-#: admin/ogroups/gofon/phonequeue.tpl:218
-msgid "'Thank you' message"
-msgstr "'谢谢您' 消息"
-
-#: admin/ogroups/gofon/phonequeue.tpl:228
-msgid "'minutes' sound file"
-msgstr "'分钟' 声音文件"
-
-#: admin/ogroups/gofon/phonequeue.tpl:238
-msgid "'seconds' sound file"
-msgstr "'秒' 声音文件"
-
-#: admin/ogroups/gofon/phonequeue.tpl:248
-msgid "Hold sound file"
-msgstr "暂停声音文件"
+#: admin/systems/services/gofon/goFonServer.tpl:1
+#: admin/systems/services/gofon/goFonServer.tpl:2
+#, fuzzy
+msgid "VoIP database information"
+msgstr "切换信息"
 
-#: admin/ogroups/gofon/phonequeue.tpl:258
-msgid "Less Than sound file"
-msgstr "声音文件“小于...”"
+#: admin/systems/services/gofon/goFonServer.tpl:4
+msgid "Asterisk DB user"
+msgstr "Asterisk DB 用户"
 
-#: admin/ogroups/gofon/phonequeue.tpl:276
-msgid "Phone attributes "
-msgstr "电话属性"
+#: admin/systems/services/gofon/goFonServer.tpl:12
+#: admin/systems/services/gofon/class_goFonServer.inc:77
+#: admin/systems/services/gofon/class_goFonServer.inc:184
+msgid "Password"
+msgstr "口令"
 
-#: admin/ogroups/gofon/phonequeue.tpl:281
-#, fuzzy
-msgid "Additional queue settings"
-msgstr "应用程序设置"
+#: admin/systems/services/gofon/goFonServer.tpl:20
+msgid "Country dial prefix"
+msgstr "国内拨号前缀"
 
-#: admin/ogroups/gofon/phonequeue.tpl:311
-#, fuzzy
-msgid "Dial options"
-msgstr "邮件选项"
+#: admin/systems/services/gofon/goFonServer.tpl:28
+#: admin/systems/services/gofon/class_goFonServer.inc:80
+msgid "Local dial prefix"
+msgstr "内部拨号前缀"
 
 #: admin/systems/services/gofon/class_goFonServer.inc:34
 #: admin/systems/services/gofon/class_goFonServer.inc:65
@@ -449,17 +476,6 @@ msgstr "Asterisk 管理"
 msgid "User"
 msgstr "用户"
 
-#: admin/systems/services/gofon/class_goFonServer.inc:77
-#: admin/systems/services/gofon/class_goFonServer.inc:184
-#: admin/systems/services/gofon/goFonServer.tpl:12
-msgid "Password"
-msgstr "口令"
-
-#: admin/systems/services/gofon/class_goFonServer.inc:80
-#: admin/systems/services/gofon/goFonServer.tpl:28
-msgid "Local dial prefix"
-msgstr "内部拨号前缀"
-
 #: admin/systems/services/gofon/class_goFonServer.inc:83
 #, fuzzy
 msgid "Country prefix"
@@ -510,69 +526,151 @@ msgstr "SOA 记录"
 msgid "Country code"
 msgstr "账号号码"
 
-#: admin/systems/services/gofon/goFonServer.tpl:1
-#: admin/systems/services/gofon/goFonServer.tpl:2
-#, fuzzy
-msgid "VoIP database information"
-msgstr "切换信息"
+#: admin/systems/gofon/phonesettings.tpl:1
+#: admin/systems/gofon/phonesettings.tpl:3
+#: admin/systems/gofon/phonesettings.tpl:87
+#: admin/systems/gofon/phonesettings.tpl:254
+msgid "Advanced phone settings"
+msgstr "高级电话设置"
 
-#: admin/systems/services/gofon/goFonServer.tpl:4
-msgid "Asterisk DB user"
-msgstr "Asterisk DB 用户"
+#: admin/systems/gofon/phonesettings.tpl:6
+msgid "Phone type"
+msgstr "电话类型"
 
-#: admin/systems/services/gofon/goFonServer.tpl:20
-msgid "Country dial prefix"
-msgstr "国内拨号前缀"
+#: admin/systems/gofon/phonesettings.tpl:8
+#: admin/systems/gofon/phonesettings.tpl:32
+#: admin/systems/gofon/phonesettings.tpl:44
+#: admin/systems/gofon/phonesettings.tpl:60
+#: admin/systems/gofon/phonesettings.tpl:94
+#: admin/systems/gofon/phonesettings.tpl:131
+#: admin/systems/gofon/phonesettings.tpl:184
+msgid "Choose a phone type"
+msgstr "选择一个电话类型"
+
+#: admin/systems/gofon/phonesettings.tpl:13
+msgid "refresh"
+msgstr "刷新"
 
-#: admin/systems/gofon/phone.tpl:5 admin/systems/gofon/phonesettings.tpl:24
+#: admin/systems/gofon/phonesettings.tpl:24 admin/systems/gofon/phone.tpl:5
 #: gofon/conference/generic.tpl:6
 #, fuzzy
 msgid "Generic settings"
 msgstr "通用队列设置"
 
-#: admin/systems/gofon/phone.tpl:7 admin/systems/gofon/paste_generic.tpl:3
-msgid "Phone name"
-msgstr "电话名称"
-
-#: admin/systems/gofon/phone.tpl:18
-#: admin/systems/gofon/class_phoneGeneric.inc:521
-#: gofon/macro/macro-list.tpl:12 gofon/macro/class_gofonMacro.inc:603
-#: gofon/macro/generic.tpl:27
-#: gofon/conference/class_phoneConferenceGeneric.inc:843
-#: gofon/conference/generic.tpl:44 gofon/conference/conf-list.tpl:12
-msgid "Base"
-msgstr "位置"
+#: admin/systems/gofon/phonesettings.tpl:27
+msgid "Mode"
+msgstr "模式"
 
-#: admin/systems/gofon/phone.tpl:29
-#: admin/systems/gofon/class_phoneGeneric.inc:522
-#: gofon/macro/class_gofonMacro.inc:604 gofon/macro/macro-list.xml:49
-#: gofon/macro/generic.tpl:42 gofon/conference/conf-list.xml:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:844
-#: gofon/conference/generic.tpl:87
-msgid "Description"
-msgstr "描述"
+#: admin/systems/gofon/phonesettings.tpl:40
+msgid "DTMF mode"
+msgstr "DTMF 模式"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:131
+#: admin/systems/gofon/phonesettings.tpl:53 gofon/conference/generic.tpl:83
 #, fuzzy
-msgid "phone"
-msgstr "电话"
+msgid "Additional settings"
+msgstr "应用程序设置"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:208
-msgid "yes"
-msgstr "是"
+#: admin/systems/gofon/phonesettings.tpl:56
+#: admin/systems/gofon/phonesettings.tpl:102
+msgid "Default IP"
+msgstr "缺省 IP"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:208
-msgid "no"
-msgstr "否"
+#: admin/systems/gofon/phonesettings.tpl:68
+#: admin/systems/gofon/phonesettings.tpl:112
+msgid "Response timeout"
+msgstr "响应超时"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:225
-msgid "dynamic"
-msgstr "动态"
+#: admin/systems/gofon/phonesettings.tpl:90
+msgid "Modus"
+msgstr "模块"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:225
+#: admin/systems/gofon/phonesettings.tpl:127
 #, fuzzy
-msgid "Network settings"
-msgstr "网络设置"
+msgid "Authentication type"
+msgstr "Nagios 鉴权"
+
+#: admin/systems/gofon/phonesettings.tpl:139
+msgid "Secret"
+msgstr "秘密"
+
+#: admin/systems/gofon/phonesettings.tpl:170
+msgid "Account code"
+msgstr "账号号码"
+
+#: admin/systems/gofon/phonesettings.tpl:180
+msgid "Trunk lines"
+msgstr ""
+
+#: admin/systems/gofon/phonesettings.tpl:195
+#, fuzzy
+msgid "Permissions"
+msgstr "允许"
+
+#: admin/systems/gofon/phonesettings.tpl:199
+msgid "Hosts that are allowed to connect"
+msgstr "允许连接的主机"
+
+#: admin/systems/gofon/phonesettings.tpl:202
+#: admin/systems/gofon/phonesettings.tpl:228
+msgid "List of alternative mail addresses"
+msgstr "替代邮件地址列表"
+
+#: admin/systems/gofon/phonesettings.tpl:225
+msgid "Hosts that are not allowed to connect"
+msgstr "不允许连接的主机"
+
+#: admin/systems/gofon/phonesettings.tpl:257
+msgid "MSN"
+msgstr "MSN"
+
+#: admin/systems/gofon/paste_generic.tpl:1
+#, fuzzy
+msgid "Paste phone"
+msgstr "私人电话"
+
+#: admin/systems/gofon/paste_generic.tpl:3 admin/systems/gofon/phone.tpl:7
+msgid "Phone name"
+msgstr "电话名称"
+
+#: admin/systems/gofon/phone.tpl:18
+#: admin/systems/gofon/class_phoneGeneric.inc:521
+#: gofon/macro/class_gofonMacro.inc:603 gofon/macro/generic.tpl:27
+#: gofon/macro/macro-list.tpl:12 gofon/conference/generic.tpl:44
+#: gofon/conference/class_phoneConferenceGeneric.inc:843
+#: gofon/conference/conf-list.tpl:12
+msgid "Base"
+msgstr "位置"
+
+#: admin/systems/gofon/phone.tpl:29
+#: admin/systems/gofon/class_phoneGeneric.inc:522
+#: gofon/macro/class_gofonMacro.inc:604 gofon/macro/generic.tpl:42
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:87
+#: gofon/conference/conf-list.xml:49
+#: gofon/conference/class_phoneConferenceGeneric.inc:844
+msgid "Description"
+msgstr "描述"
+
+#: admin/systems/gofon/class_phoneGeneric.inc:131
+#, fuzzy
+msgid "phone"
+msgstr "电话"
+
+#: admin/systems/gofon/class_phoneGeneric.inc:208
+msgid "yes"
+msgstr "是"
+
+#: admin/systems/gofon/class_phoneGeneric.inc:208
+msgid "no"
+msgstr "否"
+
+#: admin/systems/gofon/class_phoneGeneric.inc:225
+msgid "dynamic"
+msgstr "动态"
+
+#: admin/systems/gofon/class_phoneGeneric.inc:225
+#, fuzzy
+msgid "Network settings"
+msgstr "网络设置"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:245
 #: gofon/macro/class_gofonMacro.inc:468
@@ -592,7 +690,7 @@ msgstr "地址"
 #: admin/systems/gofon/class_phoneGeneric.inc:348
 #: admin/systems/gofon/class_phoneGeneric.inc:520
 #: gofon/macro/class_gofonMacro.inc:411 gofon/macro/class_gofonMacro.inc:422
-#: gofon/macro/parameter.tpl:6 gofon/macro/macro-list.xml:41
+#: gofon/macro/macro-list.xml:41 gofon/macro/parameter.tpl:6
 #: gofon/conference/conf-list.xml:41
 #: gofon/conference/class_phoneConferenceGeneric.inc:367
 #: gofon/conference/class_phoneConferenceGeneric.inc:389
@@ -617,10 +715,9 @@ msgid "Phone hardware"
 msgstr "电话硬件"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:511
-msgid ""
-"The 'phoneRDN' statement defines the location where new phones will be "
-"created. The default is 'ou=phones,ou=systems,'."
-msgstr ""
+#, fuzzy
+msgid "RDN for phone storage."
+msgstr "口令存储"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:523
 #, fuzzy
@@ -678,127 +775,266 @@ msgstr ""
 msgid "Hardware type"
 msgstr ""
 
-#: admin/systems/gofon/paste_generic.tpl:1
-#, fuzzy
-msgid "Paste phone"
-msgstr "私人电话"
-
-#: admin/systems/gofon/phonesettings.tpl:1
-#: admin/systems/gofon/phonesettings.tpl:3
-#: admin/systems/gofon/phonesettings.tpl:87
-#: admin/systems/gofon/phonesettings.tpl:254
-msgid "Advanced phone settings"
-msgstr "高级电话设置"
-
-#: admin/systems/gofon/phonesettings.tpl:6
-msgid "Phone type"
-msgstr "电话类型"
+#: gofon/macro/remove.tpl:2 gofon/phoneaccount/class_phoneAccount.inc:354
+#: gofon/phoneaccount/class_phoneAccount.inc:368
+#: gofon/phoneaccount/class_phoneAccount.inc:651
+#: gofon/phoneaccount/class_phoneAccount.inc:717
+#: gofon/phoneaccount/class_phoneAccount.inc:1643
+#: gofon/phoneaccount/class_phoneAccount.inc:2017
+#: gofon/conference/class_phoneConferenceGeneric.inc:442
+msgid "Warning"
+msgstr "警告"
 
-#: admin/systems/gofon/phonesettings.tpl:8
-#: admin/systems/gofon/phonesettings.tpl:32
-#: admin/systems/gofon/phonesettings.tpl:44
-#: admin/systems/gofon/phonesettings.tpl:60
-#: admin/systems/gofon/phonesettings.tpl:94
-#: admin/systems/gofon/phonesettings.tpl:131
-#: admin/systems/gofon/phonesettings.tpl:184
-msgid "Choose a phone type"
-msgstr "选择一个电话类型"
+#: gofon/macro/remove.tpl:7
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr "请再次检查您是否要这么做,因为 GOsa 没有办法将您的数据找回。"
 
-#: admin/systems/gofon/phonesettings.tpl:13
-msgid "refresh"
-msgstr "刷新"
+#: gofon/macro/remove.tpl:11
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr "所以,如果您确定,请按“删除”继续,否则按“取消”退出。"
 
-#: admin/systems/gofon/phonesettings.tpl:27
-msgid "Mode"
-msgstr "模式"
+#: gofon/macro/class_gofonMacroParameters.inc:199
+#: gofon/phoneaccount/generic.tpl:120 gofon/phoneaccount/generic.tpl:121
+msgid "Phone macro"
+msgstr "电话宏"
 
-#: admin/systems/gofon/phonesettings.tpl:40
-msgid "DTMF mode"
-msgstr "DTMF 模式"
+#: gofon/macro/class_gofonMacroParameters.inc:255
+msgid "String"
+msgstr "字符串"
 
-#: admin/systems/gofon/phonesettings.tpl:53 gofon/conference/generic.tpl:83
+#: gofon/macro/class_gofonMacroParameters.inc:256
 #, fuzzy
-msgid "Additional settings"
-msgstr "应用程序设置"
-
-#: admin/systems/gofon/phonesettings.tpl:56
-#: admin/systems/gofon/phonesettings.tpl:102
-msgid "Default IP"
-msgstr "缺省 IP"
+msgid "Select box"
+msgstr "选择"
 
-#: admin/systems/gofon/phonesettings.tpl:68
-#: admin/systems/gofon/phonesettings.tpl:112
-msgid "Response timeout"
-msgstr "å\93\8dåº\94è¶\85æ\97"
+#: gofon/macro/class_gofonMacroParameters.inc:257
+#, fuzzy
+msgid "Boolean"
+msgstr "å¸\83å°\94å\80¼"
 
-#: admin/systems/gofon/phonesettings.tpl:90
-msgid "Modus"
-msgstr "模块"
+#: gofon/macro/class_gofonMacroParameters.inc:263
+msgid "Delete unused"
+msgstr "删除未使用的"
 
-#: admin/systems/gofon/phonesettings.tpl:127
-#, fuzzy
-msgid "Authentication type"
-msgstr "Nagios 鉴权"
+#: gofon/macro/class_gofonMacroParameters.inc:343
+#, fuzzy, php-format
+msgid "Parameter %s contains invalid character!"
+msgstr "“姓名”字段包含无效字符。"
 
-#: admin/systems/gofon/phonesettings.tpl:139
-msgid "Secret"
-msgstr "秘密"
+#: gofon/macro/class_gofonMacroParameters.inc:349
+#, fuzzy, php-format
+msgid "Parameter %s is invalid!"
+msgstr "指定的 branch 名称无效。"
 
-#: admin/systems/gofon/phonesettings.tpl:170
-msgid "Account code"
-msgstr "账号号码"
+#: gofon/macro/class_gofonMacroParameters.inc:378
+#: gofon/phoneaccount/class_phoneAccount.inc:1755
+msgid "Information"
+msgstr "提示信息"
 
-#: admin/systems/gofon/phonesettings.tpl:180
-msgid "Trunk lines"
+#: gofon/macro/class_gofonMacroParameters.inc:378
+msgid ""
+"Number of parameters for this macro has changed. Please update all users "
+"using it!"
 msgstr ""
 
-#: admin/systems/gofon/phonesettings.tpl:195
-#, fuzzy
-msgid "Permissions"
-msgstr "允许"
+#: gofon/macro/class_gofonMacro.inc:214
+#, php-format
+msgid ""
+"Macro could not be removed from server '%s', please check database "
+"consistency!"
+msgstr ""
 
-#: admin/systems/gofon/phonesettings.tpl:199
-msgid "Hosts that are allowed to connect"
-msgstr "允许连接的主机"
+#: gofon/macro/class_gofonMacro.inc:287
+#, fuzzy, php-format
+msgid "Application missing in line %s!"
+msgstr "没有给出应用程序,在行: '%s'。"
 
-#: admin/systems/gofon/phonesettings.tpl:202
-#: admin/systems/gofon/phonesettings.tpl:228
-msgid "List of alternative mail addresses"
-msgstr "æ\9b¿ä»£é\82®ä»¶å\9c°å\9d\80å\88\97表"
+#: gofon/macro/class_gofonMacro.inc:290
+#, fuzzy, php-format
+msgid "Priority missing in line %s!"
+msgstr "没æ\9c\89ç»\99å\87ºåº\94ç\94¨ç¨\8båº\8fï¼\8cå\9c¨è¡\8c: '%s'ã\80\82"
 
-#: admin/systems/gofon/phonesettings.tpl:225
-msgid "Hosts that are not allowed to connect"
-msgstr "不允许连接的主机"
+#: gofon/macro/class_gofonMacro.inc:294
+#, php-format
+msgid "Extension missing in line %s!"
+msgstr ""
 
-#: admin/systems/gofon/phonesettings.tpl:257
-msgid "MSN"
-msgstr "MSN"
+#: gofon/macro/class_gofonMacro.inc:304
+#, php-format
+msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
+msgstr ""
 
-#: gofon/phoneaccount/paste_generic.tpl:1
-msgid "Phone settings"
-msgstr "电话设置"
+#: gofon/macro/class_gofonMacro.inc:333
+#, php-format
+msgid ""
+"Macro could not be added to server '%s', please check database consistency!"
+msgstr ""
 
-#: gofon/phoneaccount/paste_generic.tpl:23 gofon/phoneaccount/generic.tpl:39
-msgid "Telephone hardware"
-msgstr "电话硬件"
+#: gofon/macro/class_gofonMacro.inc:426
+msgid "Name can be 20 characters at maximum!"
+msgstr ""
 
-#: gofon/phoneaccount/paste_generic.tpl:24 gofon/phoneaccount/generic.tpl:41
-#: gofon/phoneaccount/generic.tpl:45
-msgid "Telephone"
-msgstr "电话"
+#: gofon/macro/class_gofonMacro.inc:435
+#, fuzzy
+msgid "Macro is still in use!"
+msgstr "邮件选项"
 
-#: gofon/phoneaccount/paste_generic.tpl:27 gofon/phoneaccount/generic.tpl:90
-#: gofon/phoneaccount/class_phoneAccount.inc:1463
-#: gofon/phoneaccount/class_phoneAccount.inc:1466
-#: gofon/phoneaccount/class_phoneAccount.inc:1871
+#: gofon/macro/class_gofonMacro.inc:442
 #, fuzzy
-msgid "Voice mail PIN"
-msgstr "语音邮件 PIN"
+msgid "Macro is empty!"
+msgstr "宏文本"
 
-#: gofon/phoneaccount/paste_generic.tpl:35 gofon/phoneaccount/generic.tpl:100
-#: gofon/phoneaccount/class_phoneAccount.inc:1471
-msgid "Phone PIN"
-msgstr "电话 PIN"
+#: gofon/macro/class_gofonMacro.inc:481
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:476
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/phoneaccount/class_phoneAccount.inc:1621
+#: gofon/phoneaccount/class_phoneAccount.inc:1627
+#: gofon/fonreports/class_fonreport.inc:180
+#: gofon/fonreports/class_fonreport.inc:184
+#, fuzzy
+msgid "Configuration error"
+msgstr "配置文件"
+
+#: gofon/macro/class_gofonMacro.inc:573
+#, fuzzy
+msgid "Asterisk macro management"
+msgstr "Asterisk 管理"
+
+#: gofon/macro/class_gofonMacro.inc:582
+#, fuzzy
+msgid "GOfon macro"
+msgstr "没有宏"
+
+#: gofon/macro/class_gofonMacro.inc:591
+#, fuzzy
+msgid "RDN for macro storage."
+msgstr "口令存储"
+
+#: gofon/macro/class_gofonMacro.inc:602 gofon/macro/generic.tpl:6
+#: gofon/macro/generic.tpl:9 gofon/macro/paste_generic.tpl:4
+#: gofon/macro/paste_generic.tpl:6
+msgid "Macro name"
+msgstr "宏名称"
+
+#: gofon/macro/class_gofonMacro.inc:605 gofon/macro/generic.tpl:14
+msgid "Display name"
+msgstr "显示名称"
+
+#: gofon/macro/class_gofonMacro.inc:606
+#, fuzzy
+msgid "Macro content and parameter"
+msgstr "启动参数"
+
+#: gofon/macro/class_gofonMacro.inc:607
+msgid "Visibility flag"
+msgstr ""
+
+#: gofon/macro/generic.tpl:1 gofon/macro/macro-list.xml:15
+#: gofon/macro/macro-list.xml:74
+msgid "Macro"
+msgstr "宏"
+
+#: gofon/macro/generic.tpl:4
+#, fuzzy
+msgid "Macro generic"
+msgstr "宏名称"
+
+#: gofon/macro/generic.tpl:18
+msgid "Macro name to be displayed"
+msgstr "要显示的宏名称"
+
+#: gofon/macro/generic.tpl:40
+#, fuzzy
+msgid "Visibility"
+msgstr "可见"
+
+#: gofon/macro/generic.tpl:53
+msgid "Visible for user"
+msgstr "用户可见"
+
+#: gofon/macro/generic.tpl:63
+msgid "Macro text"
+msgstr "宏文本"
+
+#: gofon/macro/macro-list.xml:11
+msgid "List of macros"
+msgstr "宏列表"
+
+#: gofon/macro/macro-list.xml:57 gofon/conference/conf-list.xml:57
+msgid "Actions"
+msgstr "动作"
+
+#: gofon/macro/macro-list.xml:68 gofon/conference/conf-list.xml:68
+msgid "Create"
+msgstr "创建"
+
+#: gofon/macro/macro-list.xml:86 gofon/macro/macro-list.xml:125
+#: gofon/conference/conf-list.xml:86 gofon/conference/conf-list.xml:125
+msgid "Edit"
+msgstr "编辑"
+
+#: gofon/macro/macro-list.xml:93 gofon/macro/macro-list.xml:138
+#: gofon/conference/conf-list.xml:93 gofon/conference/conf-list.xml:138
+msgid "Remove"
+msgstr "删除"
+
+#: gofon/macro/paste_generic.tpl:1
+#, fuzzy
+msgid "Paste macro"
+msgstr "删除宏"
+
+#: gofon/macro/class_gofonMacroManagement.inc:25
+#, fuzzy
+msgid "Phone Macros"
+msgstr "电话宏"
+
+#: gofon/macro/class_gofonMacroManagement.inc:26
+msgid "Manage phone macros for setups using the Asterisk VoIP service"
+msgstr ""
+
+#: gofon/macro/macro-filter.xml:17
+#, fuzzy
+msgid "Default filter"
+msgstr "参数"
+
+#: gofon/macro/macro-filter.xml:31
+#, fuzzy
+msgid "Enabled"
+msgstr "禁用"
+
+#: gofon/macro/parameter.tpl:2
+#, fuzzy
+msgid "Macro parameter"
+msgstr "启动参数"
+
+#: gofon/macro/parameter.tpl:4
+msgid "Argument"
+msgstr "参数"
+
+#: gofon/macro/parameter.tpl:8
+msgid "type"
+msgstr "类型"
+
+#: gofon/macro/parameter.tpl:10
+msgid "Default value"
+msgstr "缺省值"
+
+#: gofon/macro/parameter.tpl:19
+#, fuzzy
+msgid "You are not allowed to view the macro parameter settings"
+msgstr "您无权删除这个宏!"
+
+#: gofon/phoneaccount/generic.tpl:39 gofon/phoneaccount/paste_generic.tpl:23
+msgid "Telephone hardware"
+msgstr "电话硬件"
+
+#: gofon/phoneaccount/generic.tpl:41 gofon/phoneaccount/generic.tpl:45
+#: gofon/phoneaccount/paste_generic.tpl:24
+msgid "Telephone"
+msgstr "电话"
 
 #: gofon/phoneaccount/generic.tpl:59
 msgid "Select the accounts home server"
@@ -820,15 +1056,27 @@ msgstr "选择账号的主服务器"
 msgid "Voice mail context"
 msgstr "语音邮件 PIN"
 
-#: gofon/phoneaccount/generic.tpl:120 gofon/phoneaccount/generic.tpl:121
-#: gofon/macro/class_gofonMacroParameters.inc:199
-msgid "Phone macro"
-msgstr "电话宏"
+#: gofon/phoneaccount/generic.tpl:90 gofon/phoneaccount/paste_generic.tpl:27
+#: gofon/phoneaccount/class_phoneAccount.inc:1463
+#: gofon/phoneaccount/class_phoneAccount.inc:1466
+#: gofon/phoneaccount/class_phoneAccount.inc:1871
+#, fuzzy
+msgid "Voice mail PIN"
+msgstr "语音邮件 PIN"
+
+#: gofon/phoneaccount/generic.tpl:100 gofon/phoneaccount/paste_generic.tpl:35
+#: gofon/phoneaccount/class_phoneAccount.inc:1471
+msgid "Phone PIN"
+msgstr "电话 PIN"
 
 #: gofon/phoneaccount/generic.tpl:132
 msgid "Refresh"
 msgstr "刷新"
 
+#: gofon/phoneaccount/paste_generic.tpl:1
+msgid "Phone settings"
+msgstr "电话设置"
+
 #: gofon/phoneaccount/class_phoneAccount.inc:7
 #, fuzzy
 msgid "This does something"
@@ -846,34 +1094,12 @@ msgstr "没有宏"
 msgid "undefined"
 msgstr "未定义"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:354
-#: gofon/phoneaccount/class_phoneAccount.inc:368
-#: gofon/phoneaccount/class_phoneAccount.inc:651
-#: gofon/phoneaccount/class_phoneAccount.inc:717
-#: gofon/phoneaccount/class_phoneAccount.inc:1643
-#: gofon/phoneaccount/class_phoneAccount.inc:2017 gofon/macro/remove.tpl:2
-#: gofon/conference/class_phoneConferenceGeneric.inc:442
-msgid "Warning"
-msgstr "警告"
-
 #: gofon/phoneaccount/class_phoneAccount.inc:368
 #, php-format
 msgid ""
 "Cannot identify telephone extension in database, please try to save again."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:468
-#: gofon/phoneaccount/class_phoneAccount.inc:476
-#: gofon/phoneaccount/class_phoneAccount.inc:1149
-#: gofon/phoneaccount/class_phoneAccount.inc:1621
-#: gofon/phoneaccount/class_phoneAccount.inc:1627
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:184
-#: gofon/macro/class_gofonMacro.inc:481
-#, fuzzy
-msgid "Configuration error"
-msgstr "配置文件"
-
 #: gofon/phoneaccount/class_phoneAccount.inc:597
 #: gofon/phoneaccount/class_phoneAccount.inc:604
 #: gofon/phoneaccount/class_phoneAccount.inc:622
@@ -944,11 +1170,6 @@ msgstr "启动参数"
 msgid "An error occurred while updating the database entries!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1755
-#: gofon/macro/class_gofonMacroParameters.inc:378
-msgid "Information"
-msgstr "提示信息"
-
 #: gofon/phoneaccount/class_phoneAccount.inc:1755
 #, fuzzy, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
@@ -1025,343 +1246,114 @@ msgstr "属性 '%s' 为空或者包含无效字符。"
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr "参数 %s 包含无效字符。'!,#' 用做分隔符"
 
-#: gofon/fonreports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr "电话记录"
-
-#: gofon/fonreports/class_fonreport.inc:7
-msgid "View the phone report for incoming and outgoing calls"
-msgstr ""
-
-#: gofon/fonreports/class_fonreport.inc:237
+#: gofon/conference/conf-filter.xml:18
 #, fuzzy
-msgid "Insufficient permissions"
-msgstr "缺省权限"
-
-#: gofon/fonreports/class_fonreport.inc:269
-msgid "Y-M-D"
-msgstr "Y-M-D"
+msgid "Default"
+msgstr "缺省 IP"
 
-#: gofon/fonreports/class_fonreport.inc:429
-#: gofon/fonreports/class_fonreport.inc:430
+#: gofon/conference/class_phoneConferenceManagment.inc:25
 #, fuzzy
-msgid "View phone reports"
-msgstr "电话记录"
+msgid "Phone Conferences"
+msgstr "电话会议"
 
-#: gofon/fonreports/class_fonreport.inc:430
-#, fuzzy
-msgid "All entries are read-only"
-msgstr "所有字段均可写"
+#: gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Manage phone conference rooms in setups using the Asterisk VoIP service"
+msgstr ""
 
-#: gofon/fonreports/class_fonreport.inc:438 gofon/fonreports/contents.tpl:14
-#: gofon/fonreports/contents.tpl:43
-msgid "Date"
-msgstr "日期"
+#: gofon/conference/generic.tpl:1
+msgid "Properties"
+msgstr "属性"
 
-#: gofon/fonreports/class_fonreport.inc:439 gofon/fonreports/contents.tpl:44
-msgid "Source"
-msgstr "源"
+#: gofon/conference/generic.tpl:3 gofon/conference/conf-list.xml:15
+#: gofon/conference/conf-list.xml:74
+#: gofon/conference/class_phoneConferenceGeneric.inc:813
+msgid "Conference"
+msgstr "会议"
 
-#: gofon/fonreports/class_fonreport.inc:440 gofon/fonreports/contents.tpl:45
-msgid "Destination"
-msgstr "目标"
+#: gofon/conference/generic.tpl:10 gofon/conference/paste_generic.tpl:5
+msgid "Conference name"
+msgstr "会议名称"
 
-#: gofon/fonreports/class_fonreport.inc:441 gofon/fonreports/contents.tpl:46
-msgid "Channel"
-msgstr "频道"
+#: gofon/conference/generic.tpl:16 gofon/conference/paste_generic.tpl:10
+msgid "Name of conference to create"
+msgstr "要创建会议的名称"
 
-#: gofon/fonreports/class_fonreport.inc:442
-#, fuzzy
-msgid "Application called"
-msgstr "应用程序名称"
+#: gofon/conference/generic.tpl:23
+msgid "Type"
+msgstr "类型"
 
-#: gofon/fonreports/class_fonreport.inc:443
+#: gofon/conference/generic.tpl:30
+msgid "Choose subtree to place conference in"
+msgstr "选择放置会议的子树"
+
+#: gofon/conference/generic.tpl:71
 #, fuzzy
-msgid "Disposition"
-msgstr "æ\96­å¼\80"
+msgid "Select language"
+msgstr "æ\9c\8då\8a¡å\99¨å\90\8d称"
 
-#: gofon/fonreports/class_fonreport.inc:444 gofon/fonreports/contents.tpl:49
-msgid "Duration"
-msgstr "持续时间"
-
-#: gofon/fonreports/contents.tpl:3 gofon/fonreports/contents.tpl:40
-msgid "Phone reports"
-msgstr "电话记录"
-
-#: gofon/fonreports/contents.tpl:6
-msgid "Filter"
-msgstr "过滤器"
-
-#: gofon/fonreports/contents.tpl:9
-msgid "Server"
-msgstr "服务器"
-
-#: gofon/fonreports/contents.tpl:10
-#, fuzzy
-msgid "Select server to search on"
-msgstr "选择查询基于的子树"
-
-#: gofon/fonreports/contents.tpl:22
-msgid "Search for"
-msgstr "查询"
-
-#: gofon/fonreports/contents.tpl:24
-msgid "Enter user name to search for"
-msgstr "输入要查询的用户名"
-
-#: gofon/fonreports/contents.tpl:28
-msgid "Search"
-msgstr "查找"
-
-#: gofon/fonreports/contents.tpl:47
-msgid "Application"
-msgstr "应用程序"
-
-#: gofon/fonreports/contents.tpl:48
-msgid "Status"
-msgstr "状态"
-
-#: gofon/fonreports/contents.tpl:74
-msgid "Search returned no results..."
-msgstr "查无结果..."
-
-#: gofon/macro/remove.tpl:7
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr "请再次检查您是否要这么做,因为 GOsa 没有办法将您的数据找回。"
-
-#: gofon/macro/remove.tpl:11
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "所以,如果您确定,请按“删除”继续,否则按“取消”退出。"
-
-#: gofon/macro/macro-filter.xml:17
-#, fuzzy
-msgid "Default filter"
-msgstr "参数"
-
-#: gofon/macro/macro-filter.xml:31
-#, fuzzy
-msgid "Enabled"
-msgstr "禁用"
-
-#: gofon/macro/class_gofonMacroManagement.inc:25
-#, fuzzy
-msgid "Phone Macros"
-msgstr "电话宏"
-
-#: gofon/macro/class_gofonMacroManagement.inc:26
-msgid "Manage phone macros for setups using the Asterisk VoIP service"
-msgstr ""
-
-#: gofon/macro/paste_generic.tpl:1
-#, fuzzy
-msgid "Paste macro"
-msgstr "删除宏"
-
-#: gofon/macro/paste_generic.tpl:4 gofon/macro/paste_generic.tpl:6
-#: gofon/macro/class_gofonMacro.inc:602 gofon/macro/generic.tpl:6
-#: gofon/macro/generic.tpl:9
-msgid "Macro name"
-msgstr "宏名称"
-
-#: gofon/macro/class_gofonMacroParameters.inc:255
-msgid "String"
-msgstr "字符串"
-
-#: gofon/macro/class_gofonMacroParameters.inc:256
-#, fuzzy
-msgid "Select box"
-msgstr "选择"
-
-#: gofon/macro/class_gofonMacroParameters.inc:257
-#, fuzzy
-msgid "Boolean"
-msgstr "布尔值"
-
-#: gofon/macro/class_gofonMacroParameters.inc:263
-msgid "Delete unused"
-msgstr "删除未使用的"
-
-#: gofon/macro/class_gofonMacroParameters.inc:343
-#, fuzzy, php-format
-msgid "Parameter %s contains invalid character!"
-msgstr "“姓名”字段包含无效字符。"
-
-#: gofon/macro/class_gofonMacroParameters.inc:349
-#, fuzzy, php-format
-msgid "Parameter %s is invalid!"
-msgstr "指定的 branch 名称无效。"
-
-#: gofon/macro/class_gofonMacroParameters.inc:378
-msgid ""
-"Number of parameters for this macro has changed. Please update all users "
-"using it!"
-msgstr ""
-
-#: gofon/macro/class_gofonMacro.inc:214
-#, php-format
-msgid ""
-"Macro could not be removed from server '%s', please check database "
-"consistency!"
-msgstr ""
-
-#: gofon/macro/class_gofonMacro.inc:287
-#, fuzzy, php-format
-msgid "Application missing in line %s!"
-msgstr "没有给出应用程序,在行: '%s'。"
-
-#: gofon/macro/class_gofonMacro.inc:290
-#, fuzzy, php-format
-msgid "Priority missing in line %s!"
-msgstr "没有给出应用程序,在行: '%s'。"
-
-#: gofon/macro/class_gofonMacro.inc:294
-#, php-format
-msgid "Extension missing in line %s!"
-msgstr ""
-
-#: gofon/macro/class_gofonMacro.inc:304
-#, php-format
-msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
-msgstr ""
-
-#: gofon/macro/class_gofonMacro.inc:333
-#, php-format
-msgid ""
-"Macro could not be added to server '%s', please check database consistency!"
-msgstr ""
-
-#: gofon/macro/class_gofonMacro.inc:426
-msgid "Name can be 20 characters at maximum!"
-msgstr ""
-
-#: gofon/macro/class_gofonMacro.inc:435
-#, fuzzy
-msgid "Macro is still in use!"
-msgstr "邮件选项"
-
-#: gofon/macro/class_gofonMacro.inc:442
-#, fuzzy
-msgid "Macro is empty!"
-msgstr "宏文本"
-
-#: gofon/macro/class_gofonMacro.inc:573
-#, fuzzy
-msgid "Asterisk macro management"
-msgstr "Asterisk 管理"
-
-#: gofon/macro/class_gofonMacro.inc:582
-#, fuzzy
-msgid "GOfon macro"
-msgstr "没有宏"
-
-#: gofon/macro/class_gofonMacro.inc:591
-msgid ""
-"The 'phoneMacroRDN' statement defines the location where new phone macros "
-"will be created. The default is 'ou=macros,ou=asterisk,ou=configs,"
-"ou=systems,'."
-msgstr ""
-
-#: gofon/macro/class_gofonMacro.inc:605 gofon/macro/generic.tpl:14
-msgid "Display name"
-msgstr "显示名称"
+#: gofon/conference/generic.tpl:93
+msgid "Descriptive text for department"
+msgstr "部门描述文件"
 
-#: gofon/macro/class_gofonMacro.inc:606
-#, fuzzy
-msgid "Macro content and parameter"
-msgstr "启动参数"
+#: gofon/conference/generic.tpl:99
+msgid "Lifetime (in days)"
+msgstr "生存期(天)"
 
-#: gofon/macro/class_gofonMacro.inc:607
-msgid "Visibility flag"
-msgstr ""
+#: gofon/conference/generic.tpl:144
+#: gofon/conference/class_phoneConferenceGeneric.inc:850
+msgid "Preset PIN"
+msgstr "预置 PIN"
 
-#: gofon/macro/parameter.tpl:2
-#, fuzzy
-msgid "Macro parameter"
-msgstr "启动参数"
+#: gofon/conference/generic.tpl:152
+#: gofon/conference/class_phoneConferenceGeneric.inc:358
+msgid "PIN"
+msgstr "PIN"
 
-#: gofon/macro/parameter.tpl:4
-msgid "Argument"
-msgstr "参数"
+#: gofon/conference/generic.tpl:164
+#: gofon/conference/class_phoneConferenceGeneric.inc:851
+msgid "Record conference"
+msgstr "会议记录"
 
-#: gofon/macro/parameter.tpl:8
-msgid "type"
-msgstr "类型"
+#: gofon/conference/generic.tpl:172
+msgid "Sound file format"
+msgstr "声音文件类型"
 
-#: gofon/macro/parameter.tpl:10
-msgid "Default value"
-msgstr "缺省值"
+#: gofon/conference/generic.tpl:175
+msgid "Choose subtree to place department in"
+msgstr "选择放置部门的子树"
 
-#: gofon/macro/parameter.tpl:19
+#: gofon/conference/generic.tpl:189
 #, fuzzy
-msgid "You are not allowed to view the macro parameter settings"
-msgstr "您无权删除这个宏!"
-
-#: gofon/macro/macro-list.xml:11
-msgid "List of macros"
-msgstr "宏列表"
-
-#: gofon/macro/macro-list.xml:15 gofon/macro/macro-list.xml:74
-#: gofon/macro/generic.tpl:1
-msgid "Macro"
-msgstr "宏"
-
-#: gofon/macro/macro-list.xml:57 gofon/conference/conf-list.xml:57
-msgid "Actions"
-msgstr "动作"
-
-#: gofon/macro/macro-list.xml:68 gofon/conference/conf-list.xml:68
-msgid "Create"
-msgstr "创建"
-
-#: gofon/macro/macro-list.xml:86 gofon/macro/macro-list.xml:125
-#: gofon/conference/conf-list.xml:86 gofon/conference/conf-list.xml:125
-msgid "Edit"
-msgstr "编辑"
+msgid "Flags"
+msgstr "类"
 
-#: gofon/macro/macro-list.xml:93 gofon/macro/macro-list.xml:138
-#: gofon/conference/conf-list.xml:93 gofon/conference/conf-list.xml:138
-msgid "Remove"
-msgstr "删除"
+#: gofon/conference/generic.tpl:195
+#: gofon/conference/class_phoneConferenceGeneric.inc:852
+msgid "Play music on hold"
+msgstr "播放暂停音乐"
 
-#: gofon/macro/generic.tpl:4
-#, fuzzy
-msgid "Macro generic"
-msgstr "宏名称"
+#: gofon/conference/generic.tpl:203
+msgid "Activate session menu"
+msgstr "激活会话菜单"
 
-#: gofon/macro/generic.tpl:18
-msgid "Macro name to be displayed"
-msgstr "要显示的宏名称"
+#: gofon/conference/generic.tpl:211
+msgid "Announce users joining or leaving the conference"
+msgstr "通知用户加入或者离开会议"
 
-#: gofon/macro/generic.tpl:40
+#: gofon/conference/generic.tpl:219
 #, fuzzy
-msgid "Visibility"
-msgstr "可见"
-
-#: gofon/macro/generic.tpl:53
-msgid "Visible for user"
-msgstr "用户可见"
-
-#: gofon/macro/generic.tpl:63
-msgid "Macro text"
-msgstr "宏文本"
+msgid "Count users"
+msgstr "计算机"
 
-#: gofon/conference/conf-filter.xml:18
+#: gofon/conference/paste_generic.tpl:1
 #, fuzzy
-msgid "Default"
-msgstr "缺ç\9c\81 IP"
+msgid "Paste confernece"
+msgstr "ç\94µè¯\9dä¼\9aè®®"
 
 #: gofon/conference/conf-list.xml:11
 msgid "List of conference rooms"
 msgstr "会议室列表"
 
-#: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
-#: gofon/conference/class_phoneConferenceGeneric.inc:813
-#: gofon/conference/generic.tpl:3
-msgid "Conference"
-msgstr "会议"
-
 #: gofon/conference/class_phoneConferenceGeneric.inc:231
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
@@ -1373,11 +1365,6 @@ msgid ""
 "The previously selected asterisk home server '%s' is no longer available!"
 msgstr "之前选择的 asterisk 主服务器 (%s) 不存在了。"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:358
-#: gofon/conference/generic.tpl:152
-msgid "PIN"
-msgstr "PIN"
-
 #: gofon/conference/class_phoneConferenceGeneric.inc:375
 #: gofon/conference/class_phoneConferenceGeneric.inc:859
 #, fuzzy
@@ -1408,32 +1395,15 @@ msgid "GOfon conference"
 msgstr "电话会议"
 
 #: gofon/conference/class_phoneConferenceGeneric.inc:832
-msgid ""
-"The 'phoneConferenceRDN' statement defines the location where new phone "
-"conferences will be created. The default is 'ou=conferences,ou=asterisk,"
-"ou=configs,ou=systems,'."
-msgstr ""
+#, fuzzy
+msgid "RDN for phone conference storage."
+msgstr "要创建会议的名称"
 
 #: gofon/conference/class_phoneConferenceGeneric.inc:845
 #, fuzzy
 msgid "Conference PIN"
 msgstr "会议"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:850
-#: gofon/conference/generic.tpl:144
-msgid "Preset PIN"
-msgstr "预置 PIN"
-
-#: gofon/conference/class_phoneConferenceGeneric.inc:851
-#: gofon/conference/generic.tpl:164
-msgid "Record conference"
-msgstr "会议记录"
-
-#: gofon/conference/class_phoneConferenceGeneric.inc:852
-#: gofon/conference/generic.tpl:195
-msgid "Play music on hold"
-msgstr "播放暂停音乐"
-
 #: gofon/conference/class_phoneConferenceGeneric.inc:853
 #, fuzzy
 msgid "Activate menu"
@@ -1463,78 +1433,105 @@ msgstr "格式"
 msgid "Owner"
 msgstr "所有者"
 
-#: gofon/conference/paste_generic.tpl:1
+#: gofon/fonreports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "电话记录"
+
+#: gofon/fonreports/class_fonreport.inc:7
+msgid "View the phone report for incoming and outgoing calls"
+msgstr ""
+
+#: gofon/fonreports/class_fonreport.inc:237
 #, fuzzy
-msgid "Paste confernece"
-msgstr "ç\94µè¯\9dä¼\9aè®®"
+msgid "Insufficient permissions"
+msgstr "缺ç\9c\81æ\9d\83é\99\90"
 
-#: gofon/conference/paste_generic.tpl:5 gofon/conference/generic.tpl:10
-msgid "Conference name"
-msgstr "会议名称"
+#: gofon/fonreports/class_fonreport.inc:269
+msgid "Y-M-D"
+msgstr "Y-M-D"
 
-#: gofon/conference/paste_generic.tpl:10 gofon/conference/generic.tpl:16
-msgid "Name of conference to create"
-msgstr "要创建会议的名称"
+#: gofon/fonreports/class_fonreport.inc:429
+#: gofon/fonreports/class_fonreport.inc:430
+#, fuzzy
+msgid "View phone reports"
+msgstr "电话记录"
 
-#: gofon/conference/class_phoneConferenceManagment.inc:25
+#: gofon/fonreports/class_fonreport.inc:430
 #, fuzzy
-msgid "Phone Conferences"
-msgstr "电话会议"
+msgid "All entries are read-only"
+msgstr "所有字段均可写"
 
-#: gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Manage phone conference rooms in setups using the Asterisk VoIP service"
-msgstr ""
+#: gofon/fonreports/class_fonreport.inc:438 gofon/fonreports/contents.tpl:14
+#: gofon/fonreports/contents.tpl:43
+msgid "Date"
+msgstr "日期"
 
-#: gofon/conference/generic.tpl:1
-msgid "Properties"
-msgstr "属性"
+#: gofon/fonreports/class_fonreport.inc:439 gofon/fonreports/contents.tpl:44
+msgid "Source"
+msgstr ""
 
-#: gofon/conference/generic.tpl:23
-msgid "Type"
-msgstr "ç±»å\9e\8b"
+#: gofon/fonreports/class_fonreport.inc:440 gofon/fonreports/contents.tpl:45
+msgid "Destination"
+msgstr "ç\9b®æ \87"
 
-#: gofon/conference/generic.tpl:30
-msgid "Choose subtree to place conference in"
-msgstr "é\80\89æ\8b©æ\94¾ç½®ä¼\9aè®®ç\9a\84å­\90æ \91"
+#: gofon/fonreports/class_fonreport.inc:441 gofon/fonreports/contents.tpl:46
+msgid "Channel"
+msgstr "é¢\91é\81\93"
 
-#: gofon/conference/generic.tpl:71
+#: gofon/fonreports/class_fonreport.inc:442
 #, fuzzy
-msgid "Select language"
-msgstr "服务器名称"
+msgid "Application called"
+msgstr "应用程序名称"
 
-#: gofon/conference/generic.tpl:93
-msgid "Descriptive text for department"
-msgstr "部门描述文件"
+#: gofon/fonreports/class_fonreport.inc:443
+#, fuzzy
+msgid "Disposition"
+msgstr "断开"
 
-#: gofon/conference/generic.tpl:99
-msgid "Lifetime (in days)"
-msgstr "生存期(天)"
+#: gofon/fonreports/class_fonreport.inc:444 gofon/fonreports/contents.tpl:49
+msgid "Duration"
+msgstr "持续时间"
 
-#: gofon/conference/generic.tpl:172
-msgid "Sound file format"
-msgstr "声音文件类型"
+#: gofon/fonreports/contents.tpl:3 gofon/fonreports/contents.tpl:40
+msgid "Phone reports"
+msgstr "电话记录"
 
-#: gofon/conference/generic.tpl:175
-msgid "Choose subtree to place department in"
-msgstr "选择放置部门的子树"
+#: gofon/fonreports/contents.tpl:6
+msgid "Filter"
+msgstr "过滤器"
 
-#: gofon/conference/generic.tpl:189
+#: gofon/fonreports/contents.tpl:9
+msgid "Server"
+msgstr "服务器"
+
+#: gofon/fonreports/contents.tpl:10
 #, fuzzy
-msgid "Flags"
-msgstr ""
+msgid "Select server to search on"
+msgstr "选择查询基于的子树"
 
-#: gofon/conference/generic.tpl:203
-msgid "Activate session menu"
-msgstr "æ¿\80æ´»ä¼\9aè¯\9dè\8f\9cå\8d\95"
+#: gofon/fonreports/contents.tpl:22
+msgid "Search for"
+msgstr "æ\9f¥è¯¢"
 
-#: gofon/conference/generic.tpl:211
-msgid "Announce users joining or leaving the conference"
-msgstr "通知用户加入或者离开会议"
+#: gofon/fonreports/contents.tpl:24
+msgid "Enter user name to search for"
+msgstr "输入要查询的用户名"
 
-#: gofon/conference/generic.tpl:219
-#, fuzzy
-msgid "Count users"
-msgstr "计算机"
+#: gofon/fonreports/contents.tpl:28
+msgid "Search"
+msgstr "查找"
+
+#: gofon/fonreports/contents.tpl:47
+msgid "Application"
+msgstr "应用程序"
+
+#: gofon/fonreports/contents.tpl:48
+msgid "Status"
+msgstr "状态"
+
+#: gofon/fonreports/contents.tpl:74
+msgid "Search returned no results..."
+msgstr "查无结果..."
 
 #~ msgid "Click the 'Edit' button below to change informations in this dialog"
 #~ msgstr "点击下面的“编辑”按钮修改该对话框内的信息"