Updated plugin messages

[gosa.git] / gosa-plugins / gofon / locale / zh / LC_MESSAGES / messages.po

diff --git a/gosa-plugins/gofon/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/zh/LC_MESSAGES/messages.po
index 5215b7da28bbd92891e5b7734b4c909f122730e5..05b3f5088fc101aeaef15aa676804ab6f5297db0 100644 (file)
--- a/gosa-plugins/gofon/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/zh/LC_MESSAGES/messages.po
@@ -7,197 +7,207 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 18:49+0100\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:2
+#: 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:5
+#: admin/ogroups/gofon/phonequeue.tpl:6
 msgid "Queue Settings"
 msgstr "队列设置"
 
-#: admin/ogroups/gofon/phonequeue.tpl:8 gofon/phoneaccount/generic.tpl:1
-#: gofon/phoneaccount/generic.tpl:6 gofon/phoneaccount/paste_generic.tpl:2
-#: gofon/phoneaccount/paste_generic.tpl:6
+#: 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:12
-#: admin/ogroups/gofon/phonequeue.tpl:135
+#: admin/ogroups/gofon/phonequeue.tpl:14
+#: admin/ogroups/gofon/phonequeue.tpl:144
 msgid "Generic queue Settings"
 msgstr "通用队列设置"
 
-#: admin/ogroups/gofon/phonequeue.tpl:24
+#: admin/ogroups/gofon/phonequeue.tpl:27
 msgid "Up"
 msgstr "上"
 
-#: admin/ogroups/gofon/phonequeue.tpl:27
+#: admin/ogroups/gofon/phonequeue.tpl:31
 msgid "Down"
 msgstr "关闭"
 
-#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:141
+#: admin/ogroups/gofon/phonequeue.tpl:54 gofon/conference/generic.tpl:129
+#: gofon/conference/generic.tpl:135
 msgid "Options"
 msgstr "选项"
 
-#: admin/ogroups/gofon/phonequeue.tpl:50
+#: admin/ogroups/gofon/phonequeue.tpl:57
 #: admin/ogroups/gofon/class_phonequeue.inc:305
-#: admin/ogroups/gofon/class_phonequeue.inc:929
-#: gofon/phoneaccount/generic.tpl:58
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1413
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1788
-#: gofon/phoneaccount/class_phoneAccount.inc:1413
-#: gofon/phoneaccount/class_phoneAccount.inc:1809
-#: gofon/conference/generic.tpl:68
-#: gofon/conference/class_phoneConferenceGeneric.inc:853
+#: 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:62
-#: admin/ogroups/gofon/class_phonequeue.inc:948
-#: gofon/conference/generic.tpl:78
-#: gofon/conference/class_phoneConferenceGeneric.inc:851
+#: 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:75
+#: admin/ogroups/gofon/phonequeue.tpl:82
 #: admin/ogroups/gofon/class_phonequeue.inc:311
-#: admin/ogroups/gofon/class_phonequeue.inc:927
+#: admin/ogroups/gofon/class_phonequeue.inc:932
 msgid "Timeout"
 msgstr "过期"
 
-#: admin/ogroups/gofon/phonequeue.tpl:85
+#: admin/ogroups/gofon/phonequeue.tpl:92
 #: admin/ogroups/gofon/class_phonequeue.inc:314
-#: admin/ogroups/gofon/class_phonequeue.inc:952
+#: admin/ogroups/gofon/class_phonequeue.inc:957
 msgid "Retry"
 msgstr "重试"
 
-#: admin/ogroups/gofon/phonequeue.tpl:95
+#: admin/ogroups/gofon/phonequeue.tpl:102
 msgid "Strategy"
 msgstr "策略"
 
-#: admin/ogroups/gofon/phonequeue.tpl:109
-#: admin/ogroups/gofon/class_phonequeue.inc:928
+#: admin/ogroups/gofon/phonequeue.tpl:116
+#: admin/ogroups/gofon/class_phonequeue.inc:933
 msgid "Max queue length"
 msgstr "最大队列长度"
 
-#: admin/ogroups/gofon/phonequeue.tpl:119
+#: admin/ogroups/gofon/phonequeue.tpl:126
 #: admin/ogroups/gofon/class_phonequeue.inc:320
-#: admin/ogroups/gofon/class_phonequeue.inc:930
+#: admin/ogroups/gofon/class_phonequeue.inc:935
 msgid "Announce frequency"
 msgstr "公告频率"
 
-#: admin/ogroups/gofon/phonequeue.tpl:125
+#: admin/ogroups/gofon/phonequeue.tpl:132
 msgid "(in seconds)"
 msgstr "(秒)"
 
-#: admin/ogroups/gofon/phonequeue.tpl:133
+#: admin/ogroups/gofon/phonequeue.tpl:142
 msgid "Queue sound setup"
 msgstr "队列声音设置"
 
-#: admin/ogroups/gofon/phonequeue.tpl:138
+#: admin/ogroups/gofon/phonequeue.tpl:147
 msgid "Use music on hold instead of ringing"
 msgstr "播放音乐保持锁定而非播放"
 
-#: admin/ogroups/gofon/phonequeue.tpl:149
-#: admin/ogroups/gofon/class_phonequeue.inc:937
+#: admin/ogroups/gofon/phonequeue.tpl:158
+#: admin/ogroups/gofon/class_phonequeue.inc:942
 msgid "Music on hold"
 msgstr "暂停的音乐"
 
-#: admin/ogroups/gofon/phonequeue.tpl:159
+#: admin/ogroups/gofon/phonequeue.tpl:168
 msgid "Welcome sound file"
 msgstr "欢迎声音文件"
 
-#: admin/ogroups/gofon/phonequeue.tpl:169
+#: admin/ogroups/gofon/phonequeue.tpl:178
 msgid "Announce message"
 msgstr "公告信息"
 
-#: admin/ogroups/gofon/phonequeue.tpl:179
+#: admin/ogroups/gofon/phonequeue.tpl:188
 msgid "Sound file for 'You are next ...'"
 msgstr "声音文件“您是下一个...”"
 
-#: admin/ogroups/gofon/phonequeue.tpl:189
+#: admin/ogroups/gofon/phonequeue.tpl:198
 msgid "'There are ...'"
 msgstr "'这里有 ...'"
 
-#: admin/ogroups/gofon/phonequeue.tpl:199
+#: admin/ogroups/gofon/phonequeue.tpl:208
 msgid "'... calls waiting'"
 msgstr "'... 电话在等待'"
 
-#: admin/ogroups/gofon/phonequeue.tpl:209
+#: admin/ogroups/gofon/phonequeue.tpl:218
 msgid "'Thank you' message"
 msgstr "'谢谢您' 消息"
 
-#: admin/ogroups/gofon/phonequeue.tpl:219
+#: admin/ogroups/gofon/phonequeue.tpl:228
 msgid "'minutes' sound file"
 msgstr "'分钟' 声音文件"
 
-#: admin/ogroups/gofon/phonequeue.tpl:229
+#: admin/ogroups/gofon/phonequeue.tpl:238
 msgid "'seconds' sound file"
 msgstr "'秒' 声音文件"
 
-#: admin/ogroups/gofon/phonequeue.tpl:239
+#: admin/ogroups/gofon/phonequeue.tpl:248
 msgid "Hold sound file"
 msgstr "暂停声音文件"
 
-#: admin/ogroups/gofon/phonequeue.tpl:249
+#: admin/ogroups/gofon/phonequeue.tpl:258
 msgid "Less Than sound file"
 msgstr "声音文件“小于...”"
 
-#: admin/ogroups/gofon/phonequeue.tpl:267
+#: admin/ogroups/gofon/phonequeue.tpl:276
 msgid "Phone attributes "
 msgstr "电话属性"
 
-#: admin/ogroups/gofon/phonequeue.tpl:277
-#: admin/ogroups/gofon/class_phonequeue.inc:950
-msgid "Announce holdtime"
+#: 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:285
-#: admin/ogroups/gofon/class_phonequeue.inc:931
+#: 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:293
-#: admin/ogroups/gofon/class_phonequeue.inc:932
+#: 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:305
-#: admin/ogroups/gofon/class_phonequeue.inc:933
+#: 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:313
-#: admin/ogroups/gofon/class_phonequeue.inc:935
+#: 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:321
-#: admin/ogroups/gofon/class_phonequeue.inc:934
+#: 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/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 #, fuzzy
 msgid "Obsolete entry"
 msgstr "删除这个条目"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 #, php-format
 msgid ""
 "The current home server is not available anymore. It will be moved to '%s' "
@@ -256,7 +266,7 @@ msgid "Queue length"
 msgstr "最大队列长度"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
-#: gofon/conference/class_phoneConferenceGeneric.inc:392
+#: gofon/conference/class_phoneConferenceGeneric.inc:371
 #, fuzzy
 msgid "Number"
 msgstr "名称 - 数字"
@@ -269,16 +279,15 @@ msgstr "粘贴"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:378
 #: admin/ogroups/gofon/class_phonequeue.inc:732
-#: gofon/macro/class_gofonMacro.inc:392 gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/conference/class_phoneConferenceGeneric.inc:430
-#: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:196
-#: gofon/fonreports/class_fonreport.inc:200
-#: gofon/fonreports/class_fonreport.inc:217
+#: 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
 #, fuzzy
 msgid "GOfon"
 msgstr "没有宏"
@@ -303,77 +312,62 @@ msgstr "电话号码"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:823
 #: admin/ogroups/gofon/class_phonequeue.inc:865
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458 gofon/macro/class_gofonMacro.inc:467
-#: gofon/macro/class_gofonMacro.inc:505
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:649
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:971
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1211
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1217
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1571
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1581
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1628
-#: gofon/phoneaccount/class_phoneAccount.inc:649
-#: gofon/phoneaccount/class_phoneAccount.inc:971
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1211
-#: gofon/phoneaccount/class_phoneAccount.inc:1217
-#: gofon/phoneaccount/class_phoneAccount.inc:1431
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
-#: gofon/phoneaccount/class_phoneAccount.inc:1592
-#: gofon/phoneaccount/class_phoneAccount.inc:1602
-#: gofon/phoneaccount/class_phoneAccount.inc:1649
-#: gofon/conference/class_phoneConferenceGeneric.inc:260
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
-#: gofon/conference/class_phoneConferenceGeneric.inc:618
-#: gofon/fonreports/class_fonreport.inc:196
-#: gofon/fonreports/class_fonreport.inc:200
-#: gofon/fonreports/class_fonreport.inc:217
+#: 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
+#: gofon/phoneaccount/class_phoneAccount.inc:1257
+#: gofon/phoneaccount/class_phoneAccount.inc:1263
+#: gofon/phoneaccount/class_phoneAccount.inc:1477
+#: gofon/phoneaccount/class_phoneAccount.inc:1559
+#: gofon/phoneaccount/class_phoneAccount.inc:1653
+#: gofon/phoneaccount/class_phoneAccount.inc:1663
+#: gofon/phoneaccount/class_phoneAccount.inc:1710
+#: 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 "错误"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:838
 #: admin/ogroups/gofon/class_phonequeue.inc:893
 #: admin/systems/services/gofon/class_goFonServer.inc:146
-#: admin/systems/gofon/class_phoneGeneric.inc:282
+#: admin/systems/gofon/class_phoneGeneric.inc:255
+#: admin/systems/gofon/class_phoneGeneric.inc:414
 #: admin/systems/gofon/class_phoneGeneric.inc:428
-#: admin/systems/gofon/class_phoneGeneric.inc:442
-#: admin/systems/gofon/class_phoneGeneric.inc:459
-#: gofon/macro/class_gofonMacroParameters.inc:401
-#: gofon/macro/class_gofonMacro.inc:479 gofon/macro/class_gofonMacro.inc:490
-#: gofon/macro/class_gofonMacro.inc:526
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
-#: gofon/phoneaccount/class_phoneAccount.inc:1539
-#: gofon/phoneaccount/class_phoneAccount.inc:1710
-#: gofon/conference/class_phoneConferenceGeneric.inc:789
+#: admin/systems/gofon/class_phoneGeneric.inc:445
+#: 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"
 msgstr "LDAP 错误:"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
-#: gofon/phoneaccount/class_phoneAccount.inc:1457
-#: gofon/conference/generic.tpl:120 gofon/conference/paste_generic.tpl:15
+#: gofon/phoneaccount/class_phoneAccount.inc:1503
+#: gofon/conference/conf-filter.xml:32 gofon/conference/generic.tpl:109
+#: gofon/conference/paste_generic.tpl:15
 msgid "Phone number"
 msgstr "电话号码"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:918
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1047
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1060
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1072
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1079
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1773
-#: gofon/phoneaccount/class_phoneAccount.inc:6
-#: gofon/phoneaccount/class_phoneAccount.inc:1047
-#: gofon/phoneaccount/class_phoneAccount.inc:1060
-#: gofon/phoneaccount/class_phoneAccount.inc:1072
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1079
-#: gofon/phoneaccount/class_phoneAccount.inc:1794
+#: admin/systems/gofon/phone.tpl:1 gofon/phoneaccount/class_phoneAccount.inc:6
+#: gofon/phoneaccount/class_phoneAccount.inc:1087
+#: gofon/phoneaccount/class_phoneAccount.inc:1100
+#: gofon/phoneaccount/class_phoneAccount.inc:1112
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
+#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1848
 msgid "Phone"
 msgstr "电话"
 
@@ -382,66 +376,67 @@ msgstr "电话"
 msgid "Phone group"
 msgstr "电话宏"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:938
+#: admin/ogroups/gofon/class_phonequeue.inc:943
 #, fuzzy
 msgid "Welcome music"
 msgstr "欢迎 %s!"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:939
+#: admin/ogroups/gofon/class_phonequeue.inc:944
 #, fuzzy
 msgid "Report hold time"
 msgstr "公告期限"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:940
+#: admin/ogroups/gofon/class_phonequeue.inc:945
 msgid "'You are next' sound"
 msgstr ""
 
-#: admin/ogroups/gofon/class_phonequeue.inc:941
+#: admin/ogroups/gofon/class_phonequeue.inc:946
 #, fuzzy
 msgid "'There are' sound"
 msgstr "'这里有 ...'"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:942
+#: admin/ogroups/gofon/class_phonequeue.inc:947
 #, fuzzy
 msgid "'Call waiting' sound"
 msgstr "'... 电话在等待'"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:943
+#: admin/ogroups/gofon/class_phonequeue.inc:948
 #, fuzzy
 msgid "'Thank you' sound"
 msgstr "'谢谢您' 消息"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:944
+#: admin/ogroups/gofon/class_phonequeue.inc:949
 #, fuzzy
 msgid "'Minutes' sound"
 msgstr "'分钟' 声音文件"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:945
+#: admin/ogroups/gofon/class_phonequeue.inc:950
 #, fuzzy
 msgid "'Seconds' sound"
 msgstr "'秒' 声音文件"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:946
+#: admin/ogroups/gofon/class_phonequeue.inc:951
 #, fuzzy
 msgid "'Less than' sound"
 msgstr "声音文件“小于...”"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:947
+#: admin/ogroups/gofon/class_phonequeue.inc:952
 #, fuzzy
 msgid "Queue phone number"
 msgstr "电话号码"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:949
+#: admin/ogroups/gofon/class_phonequeue.inc:954
 #, fuzzy
 msgid "Method"
 msgstr "方法"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:951
+#: admin/ogroups/gofon/class_phonequeue.inc:956
 #, fuzzy
 msgid "Announce"
 msgstr "公告信息"
 
 #: admin/systems/services/gofon/goFonServer.tpl:1
+#: admin/systems/services/gofon/goFonServer.tpl:2
 #, fuzzy
 msgid "VoIP database information"
 msgstr "切换信息"
@@ -452,7 +447,7 @@ msgstr "Asterisk DB 用户"
 
 #: admin/systems/services/gofon/goFonServer.tpl:12
 #: admin/systems/services/gofon/class_goFonServer.inc:77
-#: admin/systems/services/gofon/class_goFonServer.inc:179
+#: admin/systems/services/gofon/class_goFonServer.inc:184
 msgid "Password"
 msgstr "口令"
 
@@ -502,36 +497,39 @@ msgstr "Asterisk 管理"
 msgid "Services"
 msgstr "服务"
 
-#: admin/systems/services/gofon/class_goFonServer.inc:174
+#: admin/systems/services/gofon/class_goFonServer.inc:179
 #, fuzzy
 msgid "Start"
 msgstr "启动"
 
-#: admin/systems/services/gofon/class_goFonServer.inc:175
+#: admin/systems/services/gofon/class_goFonServer.inc:180
 msgid "Stop"
 msgstr "停止"
 
-#: admin/systems/services/gofon/class_goFonServer.inc:176
+#: admin/systems/services/gofon/class_goFonServer.inc:181
 #, fuzzy
 msgid "Restart"
 msgstr "重试"
 
-#: admin/systems/services/gofon/class_goFonServer.inc:178
+#: admin/systems/services/gofon/class_goFonServer.inc:183
 #, fuzzy
-msgid "Admin"
-msgstr "管ç\90\86å\91\98"
+msgid "Administrator"
+msgstr "ç³»ç»\9f管ç\90\86"
 
-#: admin/systems/services/gofon/class_goFonServer.inc:180
+#: admin/systems/services/gofon/class_goFonServer.inc:185
 #, fuzzy
 msgid "Area code"
 msgstr "SOA 记录"
 
-#: admin/systems/services/gofon/class_goFonServer.inc:181
+#: admin/systems/services/gofon/class_goFonServer.inc:186
 #, fuzzy
 msgid "Country code"
 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 "高级电话设置"
 
@@ -540,12 +538,12 @@ msgid "Phone type"
 msgstr "电话类型"
 
 #: admin/systems/gofon/phonesettings.tpl:8
-#: admin/systems/gofon/phonesettings.tpl:30
-#: admin/systems/gofon/phonesettings.tpl:42
-#: admin/systems/gofon/phonesettings.tpl:58
-#: admin/systems/gofon/phonesettings.tpl:91
-#: admin/systems/gofon/phonesettings.tpl:128
-#: admin/systems/gofon/phonesettings.tpl:181
+#: 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 "选择一个电话类型"
 
@@ -553,367 +551,411 @@ msgstr "选择一个电话类型"
 msgid "refresh"
 msgstr "刷新"
 
-#: admin/systems/gofon/phonesettings.tpl:25
+#: 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/phonesettings.tpl:27
 msgid "Mode"
 msgstr "模式"
 
-#: admin/systems/gofon/phonesettings.tpl:38
+#: admin/systems/gofon/phonesettings.tpl:40
 msgid "DTMF mode"
 msgstr "DTMF 模式"
 
-#: admin/systems/gofon/phonesettings.tpl:54
-#: admin/systems/gofon/phonesettings.tpl:99
+#: admin/systems/gofon/phonesettings.tpl:53 gofon/conference/generic.tpl:83
+#, fuzzy
+msgid "Additional settings"
+msgstr "应用程序设置"
+
+#: admin/systems/gofon/phonesettings.tpl:56
+#: admin/systems/gofon/phonesettings.tpl:102
 msgid "Default IP"
 msgstr "缺省 IP"
 
-#: admin/systems/gofon/phonesettings.tpl:66
-#: admin/systems/gofon/phonesettings.tpl:109
+#: admin/systems/gofon/phonesettings.tpl:68
+#: admin/systems/gofon/phonesettings.tpl:112
 msgid "Response timeout"
 msgstr "响应超时"
 
-#: admin/systems/gofon/phonesettings.tpl:87
+#: admin/systems/gofon/phonesettings.tpl:90
 msgid "Modus"
 msgstr "模块"
 
-#: admin/systems/gofon/phonesettings.tpl:124
-msgid "Authtype"
-msgstr "认证类型"
+#: admin/systems/gofon/phonesettings.tpl:127
+#, fuzzy
+msgid "Authentication type"
+msgstr "Nagios 鉴权"
 
-#: admin/systems/gofon/phonesettings.tpl:136
+#: admin/systems/gofon/phonesettings.tpl:139
 msgid "Secret"
 msgstr "秘密"
 
-#: admin/systems/gofon/phonesettings.tpl:146
-msgid "GoFonInkeys"
-msgstr ""
-
-#: admin/systems/gofon/phonesettings.tpl:154
-msgid "GoFonOutKeys"
-msgstr ""
-
-#: admin/systems/gofon/phonesettings.tpl:167
+#: admin/systems/gofon/phonesettings.tpl:170
 msgid "Account code"
 msgstr "账号号码"
 
-#: admin/systems/gofon/phonesettings.tpl:177
+#: admin/systems/gofon/phonesettings.tpl:180
 msgid "Trunk lines"
 msgstr ""
 
-#: admin/systems/gofon/phonesettings.tpl:194
+#: 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:197
-#: admin/systems/gofon/phonesettings.tpl:220
+#: admin/systems/gofon/phonesettings.tpl:202
+#: admin/systems/gofon/phonesettings.tpl:228
 msgid "List of alternative mail addresses"
 msgstr "替代邮件地址列表"
 
-#: admin/systems/gofon/phonesettings.tpl:217
+#: admin/systems/gofon/phonesettings.tpl:225
 msgid "Hosts that are not allowed to connect"
 msgstr "不允许连接的主机"
 
-#: admin/systems/gofon/phonesettings.tpl:247
+#: admin/systems/gofon/phonesettings.tpl:257
 msgid "MSN"
 msgstr "MSN"
 
-#: admin/systems/gofon/paste_generic.tpl:3 admin/systems/gofon/phone.tpl:6
+#: 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:17
-#: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/generic.tpl:27
-#: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:847
-#: gofon/conference/conf-list.tpl:13
+#: 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:20 gofon/macro/generic.tpl:30
-msgid "Choose subtree to place group in"
-msgstr "选择来放置组的子树"
-
-#: admin/systems/gofon/phone.tpl:25 gofon/macro/generic.tpl:36
-#: gofon/conference/generic.tpl:56 gofon/conference/generic.tpl:62
-msgid "Select a base"
-msgstr "选择一个位置"
-
-#: admin/systems/gofon/phone.tpl:34
-#: admin/systems/gofon/class_phoneGeneric.inc:518
-#: gofon/macro/class_gofonMacro.inc:574 gofon/macro/generic.tpl:49
-#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: 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:848
+#: gofon/conference/class_phoneConferenceGeneric.inc:844
 msgid "Description"
 msgstr "描述"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:124
+#: admin/systems/gofon/class_phoneGeneric.inc:131
 #, fuzzy
 msgid "phone"
 msgstr "电话"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:208
 msgid "yes"
 msgstr "是"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:208
 msgid "no"
 msgstr "否"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:225
 msgid "dynamic"
 msgstr "动态"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
-msgid "Networksettings"
+#: admin/systems/gofon/class_phoneGeneric.inc:225
+#, fuzzy
+msgid "Network settings"
 msgstr "网络设置"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458
+#: admin/systems/gofon/class_phoneGeneric.inc:245
+#: gofon/macro/class_gofonMacro.inc:468
 #, php-format
 msgid "Cannot delete entry because it is still in use by '%s'!"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:331
-#: admin/systems/gofon/class_phoneGeneric.inc:334
+#: admin/systems/gofon/class_phoneGeneric.inc:312
+#: admin/systems/gofon/class_phoneGeneric.inc:315
 #, fuzzy
 msgid "IP address"
 msgstr "地址"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:340
-#: admin/systems/gofon/class_phoneGeneric.inc:344
-#: admin/systems/gofon/class_phoneGeneric.inc:347
-#: admin/systems/gofon/class_phoneGeneric.inc:362
-#: admin/systems/gofon/class_phoneGeneric.inc:516
-#: gofon/macro/class_gofonMacro.inc:406 gofon/macro/class_gofonMacro.inc:412
+#: admin/systems/gofon/class_phoneGeneric.inc:326
+#: admin/systems/gofon/class_phoneGeneric.inc:330
+#: admin/systems/gofon/class_phoneGeneric.inc:333
+#: 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/macro-list.xml:41 gofon/macro/parameter.tpl:6
 #: gofon/conference/conf-list.xml:41
-#: gofon/conference/class_phoneConferenceGeneric.inc:388
-#: gofon/conference/class_phoneConferenceGeneric.inc:410
-#: gofon/conference/class_phoneConferenceGeneric.inc:846
+#: gofon/conference/class_phoneConferenceGeneric.inc:367
+#: gofon/conference/class_phoneConferenceGeneric.inc:389
+#: gofon/conference/class_phoneConferenceGeneric.inc:842
 msgid "Name"
 msgstr "名称"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:507
-#: gofon/macro/class_gofonMacro.inc:562
+#: admin/systems/gofon/class_phoneGeneric.inc:493
+#: gofon/macro/class_gofonMacro.inc:572
 msgid "Generic"
 msgstr "通用配置"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:508
+#: admin/systems/gofon/class_phoneGeneric.inc:494
 #, fuzzy
 msgid "Phone generic"
 msgstr "电话号码"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
-#: gofon/phoneaccount/class_phoneAccount.inc:1808
+#: admin/systems/gofon/class_phoneGeneric.inc:503
+#: gofon/phoneaccount/class_phoneAccount.inc:1866
 #, fuzzy
 msgid "Phone hardware"
 msgstr "电话硬件"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:519
+#: admin/systems/gofon/class_phoneGeneric.inc:511
+#, fuzzy
+msgid "RDN for phone storage."
+msgstr "口令存储"
+
+#: admin/systems/gofon/class_phoneGeneric.inc:523
 #, fuzzy
 msgid "SIP Mode"
 msgstr "模式"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:520
+#: admin/systems/gofon/class_phoneGeneric.inc:524
 #, fuzzy
 msgid "SIP DTMF mode"
 msgstr "DTMF 模式"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:521
+#: admin/systems/gofon/class_phoneGeneric.inc:525
 #, fuzzy
-msgid "SIP Default ip"
+msgid "SIP Default IP"
 msgstr "缺省 IP"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:522
+#: admin/systems/gofon/class_phoneGeneric.inc:526
 msgid "SIP Qualify"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:523
+#: admin/systems/gofon/class_phoneGeneric.inc:527
 #, fuzzy
 msgid "IAX authentication type"
 msgstr "Nagios 鉴权"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:524
+#: admin/systems/gofon/class_phoneGeneric.inc:528
 #, fuzzy
 msgid "IAX secret"
 msgstr "IMAP 服务"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:525
+#: admin/systems/gofon/class_phoneGeneric.inc:529
 #, fuzzy
 msgid "IAX account code"
 msgstr "账号号码"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:526
+#: admin/systems/gofon/class_phoneGeneric.inc:530
 msgid "IAX trunk lines"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:527
+#: admin/systems/gofon/class_phoneGeneric.inc:531
 #, fuzzy
 msgid "IAX permit settings"
 msgstr "传真设置"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:528
+#: admin/systems/gofon/class_phoneGeneric.inc:532
 #, fuzzy
 msgid "IAX deny settings"
 msgstr "传真设置"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:529
+#: admin/systems/gofon/class_phoneGeneric.inc:533
 msgid "CAPI MSN"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:530
+#: admin/systems/gofon/class_phoneGeneric.inc:534
 msgid "Hardware type"
 msgstr ""
 
-#: gofon/macro/remove.tpl:2 gofon/phoneaccount/.svn/tmp/tempfile.tmp:328
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:611
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:677
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1561
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1938
-#: gofon/phoneaccount/class_phoneAccount.inc:328
-#: gofon/phoneaccount/class_phoneAccount.inc:342
-#: gofon/phoneaccount/class_phoneAccount.inc:611
-#: gofon/phoneaccount/class_phoneAccount.inc:677
-#: gofon/phoneaccount/class_phoneAccount.inc:1582
-#: gofon/phoneaccount/class_phoneAccount.inc:1959
-#: gofon/conference/remove.tpl:2
-#: gofon/conference/class_phoneConferenceGeneric.inc:463
+#: 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 "警告"
 
-#: gofon/macro/remove.tpl:6 gofon/conference/remove.tpl:6
+#: 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:10 gofon/conference/remove.tpl:10
+#: gofon/macro/remove.tpl:11
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "所以，如果您确定，请按“删除”继续，否则按“取消”退出。"
 
-#: gofon/macro/class_gofonMacroParameters.inc:200
-#: gofon/phoneaccount/generic.tpl:125 gofon/phoneaccount/generic.tpl:127
+#: gofon/macro/class_gofonMacroParameters.inc:199
+#: gofon/phoneaccount/generic.tpl:120 gofon/phoneaccount/generic.tpl:121
 msgid "Phone macro"
 msgstr "电话宏"
 
-#: gofon/macro/class_gofonMacroParameters.inc:256
+#: gofon/macro/class_gofonMacroParameters.inc:255
 msgid "String"
 msgstr "字符串"
 
-#: gofon/macro/class_gofonMacroParameters.inc:257
-msgid "Combobox"
-msgstr "单选框"
+#: gofon/macro/class_gofonMacroParameters.inc:256
+#, fuzzy
+msgid "Select box"
+msgstr "选择"
 
-#: gofon/macro/class_gofonMacroParameters.inc:258
-msgid "Bool"
+#: gofon/macro/class_gofonMacroParameters.inc:257
+#, fuzzy
+msgid "Boolean"
 msgstr "布尔值"
 
-#: gofon/macro/class_gofonMacroParameters.inc:264
+#: gofon/macro/class_gofonMacroParameters.inc:263
 msgid "Delete unused"
 msgstr "删除未使用的"
 
-#: gofon/macro/class_gofonMacroParameters.inc:340
+#: gofon/macro/class_gofonMacroParameters.inc:343
 #, fuzzy, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr "参数 %s 包含无效字符。'!,#' 用做分隔符"
+msgid "Parameter %s contains invalid character!"
+msgstr "“姓名”字段包含无效字符。"
 
-#: gofon/macro/class_gofonMacroParameters.inc:345
+#: gofon/macro/class_gofonMacroParameters.inc:349
 #, fuzzy, php-format
 msgid "Parameter %s is invalid!"
 msgstr "指定的 branch 名称无效。"
 
-#: gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/macro/class_gofonMacroParameters.inc:378
+#: gofon/phoneaccount/class_phoneAccount.inc:1755
 msgid "Information"
 msgstr "提示信息"
 
-#: gofon/macro/class_gofonMacroParameters.inc:374
+#: 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:300
+#: 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:304
+#: 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:416
+#: 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:425
+#: gofon/macro/class_gofonMacro.inc:435
 #, fuzzy
 msgid "Macro is still in use!"
 msgstr "邮件选项"
 
-#: gofon/macro/class_gofonMacro.inc:432
+#: gofon/macro/class_gofonMacro.inc:442
 #, fuzzy
 msgid "Macro is empty!"
 msgstr "宏文本"
 
-#: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:439
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1647
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:439
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:1668
-#: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:179
+#: 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:563
+#: gofon/macro/class_gofonMacro.inc:573
 #, fuzzy
 msgid "Asterisk macro management"
 msgstr "Asterisk 管理"
 
-#: gofon/macro/class_gofonMacro.inc:568
+#: gofon/macro/class_gofonMacro.inc:582
 #, fuzzy
 msgid "GOfon macro"
 msgstr "没有宏"
 
-#: gofon/macro/class_gofonMacro.inc:572 gofon/macro/generic.tpl:6
+#: 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:575 gofon/macro/generic.tpl:14
+#: gofon/macro/class_gofonMacro.inc:605 gofon/macro/generic.tpl:14
 msgid "Display name"
 msgstr "显示名称"
 
-#: gofon/macro/class_gofonMacro.inc:576
+#: gofon/macro/class_gofonMacro.inc:606
 #, fuzzy
 msgid "Macro content and parameter"
 msgstr "启动参数"
 
-#: gofon/macro/class_gofonMacro.inc:577
+#: 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:60
+#: gofon/macro/generic.tpl:40
+#, fuzzy
+msgid "Visibility"
+msgstr "可见"
+
+#: gofon/macro/generic.tpl:53
 msgid "Visible for user"
 msgstr "用户可见"
 
-#: gofon/macro/generic.tpl:70
+#: gofon/macro/generic.tpl:63
 msgid "Macro text"
 msgstr "宏文本"
 
@@ -921,10 +963,6 @@ msgstr "宏文本"
 msgid "List of macros"
 msgstr "宏列表"
 
-#: gofon/macro/macro-list.xml:15 gofon/macro/macro-list.xml:74
-msgid "Macro"
-msgstr "宏"
-
 #: gofon/macro/macro-list.xml:57 gofon/conference/conf-list.xml:57
 msgid "Actions"
 msgstr "动作"
@@ -943,19 +981,34 @@ msgstr "编辑"
 msgid "Remove"
 msgstr "删除"
 
-#: gofon/macro/macro-filter.tpl:3 gofon/conference/conf-filter.tpl:3
-#: gofon/fonreports/contents.tpl:2
-msgid "Filter"
-msgstr "过滤器"
+#: gofon/macro/paste_generic.tpl:1
+#, fuzzy
+msgid "Paste macro"
+msgstr "删除宏"
 
 #: gofon/macro/class_gofonMacroManagement.inc:25
 #, fuzzy
-msgid "Macros"
-msgstr "宏"
+msgid "Phone Macros"
+msgstr "电话宏"
 
 #: gofon/macro/class_gofonMacroManagement.inc:26
-msgid "Phone macro management"
-msgstr "电话宏管理"
+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"
@@ -974,454 +1027,409 @@ msgstr "缺省值"
 msgid "You are not allowed to view the macro parameter settings"
 msgstr "您无权删除这个宏！"
 
-#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
-msgid "Update"
-msgstr ""
-
-#: gofon/macro/macro-list.tpl:13 gofon/conference/conf-list.tpl:13
-msgid "Submit"
-msgstr "提交"
-
-#: gofon/phoneaccount/generic.tpl:42 gofon/phoneaccount/paste_generic.tpl:27
+#: gofon/phoneaccount/generic.tpl:39 gofon/phoneaccount/paste_generic.tpl:23
 msgid "Telephone hardware"
 msgstr "电话硬件"
 
-#: gofon/phoneaccount/generic.tpl:44 gofon/phoneaccount/generic.tpl:48
-#: gofon/phoneaccount/paste_generic.tpl:29
+#: gofon/phoneaccount/generic.tpl:41 gofon/phoneaccount/generic.tpl:45
+#: gofon/phoneaccount/paste_generic.tpl:24
 msgid "Telephone"
 msgstr "电话"
 
-#: gofon/phoneaccount/generic.tpl:62
+#: gofon/phoneaccount/generic.tpl:59
 msgid "Select the accounts home server"
 msgstr "选择账号的主服务器"
 
-#: gofon/phoneaccount/generic.tpl:69
+#: gofon/phoneaccount/generic.tpl:66
 #, fuzzy
 msgid "Context"
 msgstr "内容"
 
-#: gofon/phoneaccount/generic.tpl:73 gofon/phoneaccount/generic.tpl:84
+#: gofon/phoneaccount/generic.tpl:70 gofon/phoneaccount/generic.tpl:81
 #, fuzzy
 msgid "Select the accounts context"
 msgstr "选择账号的主服务器"
 
-#: gofon/phoneaccount/generic.tpl:80
+#: gofon/phoneaccount/generic.tpl:77
+#: gofon/phoneaccount/class_phoneAccount.inc:1869
 #, fuzzy
-msgid "Voicemail context"
+msgid "Voice mail context"
 msgstr "语音邮件 PIN"
 
-#: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1420
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1420
-msgid "Voicemail PIN"
+#: 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:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1425
-#: gofon/phoneaccount/class_phoneAccount.inc:1425
+#: 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:138
+#: gofon/phoneaccount/generic.tpl:132
 msgid "Refresh"
 msgstr "刷新"
 
-#: gofon/phoneaccount/paste_generic.tpl:1 gofon/phoneaccount/main.inc:133
+#: gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
 msgstr "电话设置"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+#, fuzzy
+msgid "This does something"
+msgstr "******"
+
 #: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr "自动"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
 #: gofon/phoneaccount/class_phoneAccount.inc:214
 msgid "no macro"
 msgstr "没有宏"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
 #: gofon/phoneaccount/class_phoneAccount.inc:242
 msgid "undefined"
 msgstr "未定义"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/class_phoneAccount.inc:342
+#: gofon/phoneaccount/class_phoneAccount.inc:368
 #, php-format
 msgid ""
 "Cannot identify telephone extension in database, please try to save again."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:557
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:564
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:582
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:589
-#: gofon/phoneaccount/class_phoneAccount.inc:557
-#: gofon/phoneaccount/class_phoneAccount.inc:564
-#: gofon/phoneaccount/class_phoneAccount.inc:582
-#: gofon/phoneaccount/class_phoneAccount.inc:589
+#: gofon/phoneaccount/class_phoneAccount.inc:597
+#: gofon/phoneaccount/class_phoneAccount.inc:604
+#: gofon/phoneaccount/class_phoneAccount.inc:622
+#: gofon/phoneaccount/class_phoneAccount.inc:629
 #, fuzzy
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 "无法查询数据库 '%s' 于 '%s'。取消保存将保持数据库的完整性，通过 GOsa 日志来查"
 "看 mysql 错误。"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:612
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:678
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1562
-#: gofon/phoneaccount/class_phoneAccount.inc:612
-#: gofon/phoneaccount/class_phoneAccount.inc:678
-#: gofon/phoneaccount/class_phoneAccount.inc:1583
+#: gofon/phoneaccount/class_phoneAccount.inc:652
+#: gofon/phoneaccount/class_phoneAccount.inc:718
+#: gofon/phoneaccount/class_phoneAccount.inc:1644
 #, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:651
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:973
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1630
-#: gofon/phoneaccount/class_phoneAccount.inc:651
-#: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1651
-#: gofon/conference/class_phoneConferenceGeneric.inc:620
+#: gofon/phoneaccount/class_phoneAccount.inc:691
+#: gofon/phoneaccount/class_phoneAccount.inc:1013
+#: gofon/phoneaccount/class_phoneAccount.inc:1712
+#: gofon/conference/class_phoneConferenceGeneric.inc:598
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1111
 msgid "Remove phone account"
 msgstr "删除电话账号"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1075
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1078
-#: gofon/phoneaccount/class_phoneAccount.inc:1075
-#: gofon/phoneaccount/class_phoneAccount.inc:1078
+#: gofon/phoneaccount/class_phoneAccount.inc:1115
+#: gofon/phoneaccount/class_phoneAccount.inc:1118
 msgid "Create phone account"
 msgstr "创建电话账号"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
 #, fuzzy
-msgid "User uid"
+msgid "User UID"
 msgstr "用户 ID"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
 msgid "Selected macro is not available anymore!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
-#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1159
 msgid "Parameter"
 msgstr "参数"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
-#: gofon/phoneaccount/class_phoneAccount.inc:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1312
 msgid "Choose your private phone"
 msgstr "选择您私人电话"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
-#: gofon/phoneaccount/class_phoneAccount.inc:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1455
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
 msgstr "必须有至少一个带有 asterisk 数据库的服务器来创建一个电话账号。"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1463
 #, fuzzy
-msgid "Between 1-4 charactes"
+msgid "Between 1-4 characters"
 msgstr "语音邮件 PIN 必须包含 1-4 个字符。"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1465
+#: gofon/phoneaccount/class_phoneAccount.inc:1511
 #, fuzzy, php-format
 msgid "macro parameter %s"
 msgstr "启动参数"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
-msgid "An error occured while updating the database entries!"
+#: gofon/phoneaccount/class_phoneAccount.inc:1559
+msgid "An error occurred while updating the database entries!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1755
 #, fuzzy, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "删除用户 '%s'，从电话队列 '%s'。"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
-#: gofon/phoneaccount/class_phoneAccount.inc:1738
-#: gofon/phoneaccount/class_phoneAccount.inc:1740
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+#: gofon/phoneaccount/class_phoneAccount.inc:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1794
+#, fuzzy, php-format
+msgid "The specified telephone number '%s' is already assigned to '%s'."
 msgstr "指定的电话号码 '%s' 已经分配给了 '%s'。"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1840
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
 "Remove aborted."
 msgstr "之前选择的 asterisk 主服务器 (%s) 不存在了。删除终止。"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1795
+#: gofon/phoneaccount/class_phoneAccount.inc:1849
 #, fuzzy
 msgid "Phone account settings"
 msgstr "电话设置"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1799
+#: gofon/phoneaccount/class_phoneAccount.inc:1853
 msgid "My account"
 msgstr "我的账号"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1806
-#: gofon/conference/class_phoneConferenceGeneric.inc:864
+#: gofon/phoneaccount/class_phoneAccount.inc:1864
+#: gofon/conference/class_phoneConferenceGeneric.inc:860
 #, fuzzy
 msgid "Telephone number"
 msgstr "电话号码"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1807
+#: gofon/phoneaccount/class_phoneAccount.inc:1865
 #, fuzzy
 msgid "Macro settings"
 msgstr "邮件选项"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1810
+#: gofon/phoneaccount/class_phoneAccount.inc:1868
 #, fuzzy
 msgid "Phone context"
 msgstr "电话名称"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1811
-#, fuzzy
-msgid "Voice mail context"
-msgstr "语音邮件 PIN"
-
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1812
+#: gofon/phoneaccount/class_phoneAccount.inc:1870
 #, fuzzy
-msgid "Telephone pin"
+msgid "Telephone PIN"
 msgstr "电话"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1813
-#, fuzzy
-msgid "Voicemail pin"
-msgstr "语音邮件 PIN"
-
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1895
+#: gofon/phoneaccount/class_phoneAccount.inc:1953
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1957
 msgid "Asterisk server is invalid!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1905
+#: gofon/phoneaccount/class_phoneAccount.inc:1963
 #, fuzzy
-msgid "Voicemail PIN must be 4 characters long!"
+msgid "Voice mail PIN must be 4 characters long!"
 msgstr "语音邮件 PIN 必须包含 1-4 个字符。"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1908
+#: gofon/phoneaccount/class_phoneAccount.inc:1966
 #, fuzzy
-msgid "Voicemail PIN contains invalid characters!"
+msgid "Voice mail PIN contains invalid characters!"
 msgstr "语音邮件 PIN 必须包含 1-4 个字符。"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1913
+#: gofon/phoneaccount/class_phoneAccount.inc:1971
 #, fuzzy
-msgid "Phone pin contains invalid characters!"
+msgid "Phone PIN contains invalid characters!"
 msgstr "属性 '%s' 为空或者包含无效字符。"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1920
+#: gofon/phoneaccount/class_phoneAccount.inc:1978
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr "参数 %s 包含无效字符。'!,#' 用做分隔符"
 
-#: gofon/phoneaccount/main.inc:123
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "点击下面的“编辑”按钮修改该对话框内的信息"
-
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
+#: gofon/conference/conf-filter.xml:18
 #, fuzzy
-msgid "This does something"
-msgstr "******"
+msgid "Default"
+msgstr "缺省 IP"
 
 #: gofon/conference/class_phoneConferenceManagment.inc:25
 #, fuzzy
-msgid "conferences"
-msgstr "会议"
+msgid "Phone Conferences"
+msgstr "电话会议"
 
 #: gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Conference management"
-msgstr "会议管理"
+msgid "Manage phone conference rooms in setups using the Asterisk VoIP service"
+msgstr ""
 
-#: gofon/conference/generic.tpl:5
+#: gofon/conference/generic.tpl:1
 msgid "Properties"
 msgstr "属性"
 
-#: gofon/conference/generic.tpl:15 gofon/conference/paste_generic.tpl:5
+#: 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/conference/generic.tpl:10 gofon/conference/paste_generic.tpl:5
 msgid "Conference name"
 msgstr "会议名称"
 
-#: gofon/conference/generic.tpl:21 gofon/conference/paste_generic.tpl:10
+#: gofon/conference/generic.tpl:16 gofon/conference/paste_generic.tpl:10
 msgid "Name of conference to create"
 msgstr "要创建会议的名称"
 
-#: gofon/conference/generic.tpl:28
+#: gofon/conference/generic.tpl:23
 msgid "Type"
 msgstr "类型"
 
-#: gofon/conference/generic.tpl:35
+#: gofon/conference/generic.tpl:30
 msgid "Choose subtree to place conference in"
 msgstr "选择放置会议的子树"
 
-#: gofon/conference/generic.tpl:82
+#: gofon/conference/generic.tpl:71
 #, fuzzy
 msgid "Select language"
 msgstr "服务器名称"
 
-#: gofon/conference/generic.tpl:104
+#: gofon/conference/generic.tpl:93
 msgid "Descriptive text for department"
 msgstr "部门描述文件"
 
-#: gofon/conference/generic.tpl:110
+#: gofon/conference/generic.tpl:99
 msgid "Lifetime (in days)"
 msgstr "生存期（天）"
 
-#: gofon/conference/generic.tpl:157
-#: gofon/conference/class_phoneConferenceGeneric.inc:854
+#: gofon/conference/generic.tpl:144
+#: gofon/conference/class_phoneConferenceGeneric.inc:850
 msgid "Preset PIN"
 msgstr "预置 PIN"
 
-#: gofon/conference/generic.tpl:165
-#: gofon/conference/class_phoneConferenceGeneric.inc:384
+#: gofon/conference/generic.tpl:152
+#: gofon/conference/class_phoneConferenceGeneric.inc:358
 msgid "PIN"
 msgstr "PIN"
 
-#: gofon/conference/generic.tpl:177
-#: gofon/conference/class_phoneConferenceGeneric.inc:855
+#: gofon/conference/generic.tpl:164
+#: gofon/conference/class_phoneConferenceGeneric.inc:851
 msgid "Record conference"
 msgstr "会议记录"
 
-#: gofon/conference/generic.tpl:185
+#: gofon/conference/generic.tpl:172
 msgid "Sound file format"
 msgstr "声音文件类型"
 
-#: gofon/conference/generic.tpl:188
+#: gofon/conference/generic.tpl:175
 msgid "Choose subtree to place department in"
 msgstr "选择放置部门的子树"
 
-#: gofon/conference/generic.tpl:208
-#: gofon/conference/class_phoneConferenceGeneric.inc:856
+#: gofon/conference/generic.tpl:189
+#, fuzzy
+msgid "Flags"
+msgstr "类"
+
+#: gofon/conference/generic.tpl:195
+#: gofon/conference/class_phoneConferenceGeneric.inc:852
 msgid "Play music on hold"
 msgstr "播放暂停音乐"
 
-#: gofon/conference/generic.tpl:216
+#: gofon/conference/generic.tpl:203
 msgid "Activate session menu"
 msgstr "激活会话菜单"
 
-#: gofon/conference/generic.tpl:224
+#: gofon/conference/generic.tpl:211
 msgid "Announce users joining or leaving the conference"
 msgstr "通知用户加入或者离开会议"
 
-#: gofon/conference/generic.tpl:232
+#: gofon/conference/generic.tpl:219
 #, fuzzy
 msgid "Count users"
 msgstr "计算机"
 
+#: gofon/conference/paste_generic.tpl:1
+#, fuzzy
+msgid "Paste confernece"
+msgstr "电话会议"
+
 #: 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:836
-msgid "Conference"
-msgstr "会议"
-
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:379
+#: gofon/conference/class_phoneConferenceGeneric.inc:353
 #, fuzzy, php-format
 msgid ""
 "The previously selected asterisk home server '%s' is no longer available!"
 msgstr "之前选择的 asterisk 主服务器 (%s) 不存在了。"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:396
-#: gofon/conference/class_phoneConferenceGeneric.inc:863
+#: gofon/conference/class_phoneConferenceGeneric.inc:375
+#: gofon/conference/class_phoneConferenceGeneric.inc:859
 #, fuzzy
 msgid "Lifetime"
 msgstr "生存期（天）"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#: gofon/conference/class_phoneConferenceGeneric.inc:443
 #, php-format
 msgid ""
 "GOsa identified problems with your MySQL table definition, please activate "
 "debugging for details."
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:712
-#: gofon/conference/class_phoneConferenceGeneric.inc:714
+#: gofon/conference/class_phoneConferenceGeneric.inc:690
+#: gofon/conference/class_phoneConferenceGeneric.inc:692
 #, fuzzy, php-format
 msgid "'%s' is already assigned to '%s'!"
 msgstr "指定的电话号码 '%s' 已经分配给了 '%s'。"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:837
+#: gofon/conference/class_phoneConferenceGeneric.inc:814
 #, fuzzy
 msgid "Phone conference management"
 msgstr "会议管理"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:842
+#: gofon/conference/class_phoneConferenceGeneric.inc:823
 #, fuzzy
 msgid "GOfon conference"
 msgstr "电话会议"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:849
+#: gofon/conference/class_phoneConferenceGeneric.inc:832
+#, fuzzy
+msgid "RDN for phone conference storage."
+msgstr "要创建会议的名称"
+
+#: gofon/conference/class_phoneConferenceGeneric.inc:845
 #, fuzzy
 msgid "Conference PIN"
 msgstr "会议"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:857
+#: gofon/conference/class_phoneConferenceGeneric.inc:853
 #, fuzzy
 msgid "Activate menu"
 msgstr "激活会话菜单"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:858
+#: gofon/conference/class_phoneConferenceGeneric.inc:854
 #, fuzzy
 msgid "Announce user activity"
 msgstr "公告频率"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:859
+#: gofon/conference/class_phoneConferenceGeneric.inc:855
 #, fuzzy
 msgid "Count user"
 msgstr "国家"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:860
+#: gofon/conference/class_phoneConferenceGeneric.inc:856
 #, fuzzy
 msgid "Conference type"
 msgstr "会议名称"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:862
+#: gofon/conference/class_phoneConferenceGeneric.inc:858
 #, fuzzy
 msgid "Format"
 msgstr "格式"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:865
+#: gofon/conference/class_phoneConferenceGeneric.inc:861
 msgid "Owner"
 msgstr "所有者"
 
@@ -1429,102 +1437,171 @@ msgstr "所有者"
 msgid "Phone Reports"
 msgstr "电话记录"
 
-#: gofon/fonreports/class_fonreport.inc:229
+#: 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 "Insufficient permissions"
 msgstr "缺省权限"
 
-#: gofon/fonreports/class_fonreport.inc:248
+#: gofon/fonreports/class_fonreport.inc:269
 msgid "Y-M-D"
 msgstr "Y-M-D"
 
-#: gofon/fonreports/class_fonreport.inc:415
-#: gofon/fonreports/class_fonreport.inc:416
-#: gofon/fonreports/class_fonreport.inc:423 gofon/fonreports/main.inc:22
-msgid "Phone reports"
+#: gofon/fonreports/class_fonreport.inc:429
+#: gofon/fonreports/class_fonreport.inc:430
+#, fuzzy
+msgid "View phone reports"
 msgstr "电话记录"
 
-#: gofon/fonreports/class_fonreport.inc:416
+#: gofon/fonreports/class_fonreport.inc:430
 #, fuzzy
-msgid "All entries are readonly"
+msgid "All entries are read-only"
 msgstr "所有字段均可写"
 
-#: gofon/fonreports/class_fonreport.inc:428 gofon/fonreports/contents.tpl:34
+#: gofon/fonreports/class_fonreport.inc:438 gofon/fonreports/contents.tpl:14
+#: gofon/fonreports/contents.tpl:43
 msgid "Date"
 msgstr "日期"
 
-#: gofon/fonreports/class_fonreport.inc:429 gofon/fonreports/contents.tpl:35
+#: gofon/fonreports/class_fonreport.inc:439 gofon/fonreports/contents.tpl:44
 msgid "Source"
 msgstr "源"
 
-#: gofon/fonreports/class_fonreport.inc:430 gofon/fonreports/contents.tpl:36
+#: gofon/fonreports/class_fonreport.inc:440 gofon/fonreports/contents.tpl:45
 msgid "Destination"
 msgstr "目标"
 
-#: gofon/fonreports/class_fonreport.inc:431 gofon/fonreports/contents.tpl:37
+#: gofon/fonreports/class_fonreport.inc:441 gofon/fonreports/contents.tpl:46
 msgid "Channel"
 msgstr "频道"
 
-#: gofon/fonreports/class_fonreport.inc:432
+#: gofon/fonreports/class_fonreport.inc:442
 #, fuzzy
 msgid "Application called"
 msgstr "应用程序名称"
 
-#: gofon/fonreports/class_fonreport.inc:433
+#: gofon/fonreports/class_fonreport.inc:443
 #, fuzzy
 msgid "Disposition"
 msgstr "断开"
 
-#: gofon/fonreports/class_fonreport.inc:434 gofon/fonreports/contents.tpl:40
+#: gofon/fonreports/class_fonreport.inc:444 gofon/fonreports/contents.tpl:49
 msgid "Duration"
 msgstr "持续时间"
 
-#: gofon/fonreports/contents.tpl:6
-msgid "Search for"
-msgstr "查询"
-
-#: gofon/fonreports/contents.tpl:7
-msgid "Enter user name to search for"
-msgstr "输入要查询的用户名"
+#: gofon/fonreports/contents.tpl:3 gofon/fonreports/contents.tpl:40
+msgid "Phone reports"
+msgstr "电话记录"
 
-#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:20
-msgid "in"
-msgstr "于"
+#: gofon/fonreports/contents.tpl:6
+msgid "Filter"
+msgstr "过滤器"
 
 #: gofon/fonreports/contents.tpl:9
-msgid "Select subtree to base search on"
-msgstr "选择查询基于的子树"
+msgid "Server"
+msgstr "服务器"
 
-#: gofon/fonreports/contents.tpl:12
-#, fuzzy
-msgid "on"
-msgstr "关闭"
-
-#: gofon/fonreports/contents.tpl:13
+#: gofon/fonreports/contents.tpl:10
 #, fuzzy
 msgid "Select server to search on"
 msgstr "选择查询基于的子树"
 
-#: gofon/fonreports/contents.tpl:16
-msgid "during"
-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:25
+#: gofon/fonreports/contents.tpl:28
 msgid "Search"
 msgstr "查找"
 
-#: gofon/fonreports/contents.tpl:38
+#: gofon/fonreports/contents.tpl:47
 msgid "Application"
 msgstr "应用程序"
 
-#: gofon/fonreports/contents.tpl:39
+#: gofon/fonreports/contents.tpl:48
 msgid "Status"
 msgstr "状态"
 
-#: gofon/fonreports/contents.tpl:55
+#: gofon/fonreports/contents.tpl:74
 msgid "Search returned no results..."
 msgstr "查无结果..."
 
+#~ msgid "Click the 'Edit' button below to change informations in this dialog"
+#~ msgstr "点击下面的“编辑”按钮修改该对话框内的信息"
+
+#, fuzzy
+#~ msgid "Admin"
+#~ msgstr "管理员"
+
+#~ msgid "Authtype"
+#~ msgstr "认证类型"
+
+#~ msgid "Combobox"
+#~ msgstr "单选框"
+
+#, fuzzy
+#~ msgid "Voicemail context"
+#~ msgstr "语音邮件 PIN"
+
+#, fuzzy
+#~ msgid "User uid"
+#~ msgstr "用户 ID"
+
+#, fuzzy
+#~ msgid "Telephone pin"
+#~ msgstr "电话"
+
+#, fuzzy
+#~ msgid "Voicemail pin"
+#~ msgstr "语音邮件 PIN"
+
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "选择来放置组的子树"
+
+#~ msgid "Select a base"
+#~ msgstr "选择一个位置"
+
+#, fuzzy
+#~ msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
+#~ msgstr "参数 %s 包含无效字符。'!,#' 用做分隔符"
+
+#, fuzzy
+#~ msgid "Macros"
+#~ msgstr "宏"
+
+#~ msgid "Phone macro management"
+#~ msgstr "电话宏管理"
+
+#, fuzzy
+#~ msgid "conferences"
+#~ msgstr "会议"
+
+#~ msgid "Conference management"
+#~ msgstr "会议管理"
+
+#~ msgid "in"
+#~ msgstr "于"
+
+#~ msgid "Select subtree to base search on"
+#~ msgstr "选择查询基于的子树"
+
+#, fuzzy
+#~ msgid "on"
+#~ msgstr "关闭"
+
+#~ msgid "during"
+#~ msgstr "在"
+
+#~ msgid "Submit"
+#~ msgstr "提交"
+
 #~ msgid ""
 #~ "This menu allows you to add, edit and remove selected macros. You may "
 #~ "want to use the range selector on top of the macro listbox, when working "
@@ -1552,16 +1629,9 @@ msgstr "查无结果..."
 #~ "这可能被好几个组使用。请再次检查您是否要这么做，因为 GOsa 没有办法将您的数"
 #~ "据找回。"
 
-#, fuzzy
-#~ msgid "Select all"
-#~ msgstr "选择"
-
 #~ msgid "Department"
 #~ msgstr "部门"
 
-#~ msgid "Visible"
-#~ msgstr "可见"
-
 #~ msgid "Submit department"
 #~ msgstr "提交部门"
 
@@ -1595,9 +1665,6 @@ msgstr "查无结果..."
 #~ msgid "departments"
 #~ msgstr "部门"
 
-#~ msgid "Phone macros"
-#~ msgstr "电话宏"
-
 #, fuzzy
 #~ msgid "Permission"
 #~ msgstr "允许"
@@ -1640,9 +1707,6 @@ msgstr "查无结果..."
 #~ "最好在执行这个操作之前，保存当前 LDAP 树中的内容到一个文件。所以，如果您已"
 #~ "经这么做了，按“删除”继续或者按“取消”退出。"
 
-#~ msgid "Phone conferences"
-#~ msgstr "电话会议"
-
 #~ msgid "Management"
 #~ msgstr "管理"