Code

Updated plugin messages
[gosa.git] / gosa-plugins / gofon / locale / de / LC_MESSAGES / messages.po
index c3ac385b7639828e6dcaaf121f45a6e537f61ea7..8875da27b316d55062fdbd987b006822cadbd360 100644 (file)
@@ -12,193 +12,204 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-27 10:06+0100\n"
-"PO-Revision-Date: 2008-07-28 08:22+0200\n"
-"Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
+"POT-Creation-Date: 2010-11-04 15:23+0100\n"
+"PO-Revision-Date: 2010-09-15 09:35+0100\n"
+"Last-Translator: Fabian Hickert <Fabian.Hickert@GONICUS.DE>\n"
 "Language-Team: German <de@li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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 ""
 "Nur Benutzer mit demselben Asterisk Home-Server werden in die Warteschlange "
 "aufgenommen."
 
-#: admin/ogroups/gofon/phonequeue.tpl:5
+#: admin/ogroups/gofon/phonequeue.tpl:6
 msgid "Queue Settings"
 msgstr "Warteschlangen-Einstellungen"
 
-#: 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 "Telefonnummern"
 
-#: 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 "Allgemeine Warteschlangen-Einstellungen"
 
-#: admin/ogroups/gofon/phonequeue.tpl:24
+#: admin/ogroups/gofon/phonequeue.tpl:27
 msgid "Up"
 msgstr "Auf"
 
-#: admin/ogroups/gofon/phonequeue.tpl:27
+#: admin/ogroups/gofon/phonequeue.tpl:31
 msgid "Down"
 msgstr "Ab"
 
-#: 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 "Optionen"
 
-#: 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/class_phoneAccount.inc:1277
-#: gofon/phoneaccount/class_phoneAccount.inc:1616
-#: gofon/conference/generic.tpl:68
-#: gofon/conference/class_phoneConferenceGeneric.inc:782
+#: 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 "Home-Server"
 
-#: admin/ogroups/gofon/phonequeue.tpl:62
-#: admin/ogroups/gofon/class_phonequeue.inc:948
-#: gofon/conference/generic.tpl:78
-#: gofon/conference/class_phoneConferenceGeneric.inc:780
+#: 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 "Sprache"
 
-#: 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 "Wartezeit"
 
-#: 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 "Wiederholen"
 
-#: admin/ogroups/gofon/phonequeue.tpl:95
+#: admin/ogroups/gofon/phonequeue.tpl:102
 msgid "Strategy"
 msgstr "Strategie"
 
-#: 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 "Maximale Grösse der Warteschlange"
 
-#: 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 "Benachrichtigungsfrequenz"
 
-#: admin/ogroups/gofon/phonequeue.tpl:125
+#: admin/ogroups/gofon/phonequeue.tpl:132
 msgid "(in seconds)"
 msgstr "(in Sekunden)"
 
-#: admin/ogroups/gofon/phonequeue.tpl:133
+#: admin/ogroups/gofon/phonequeue.tpl:142
 msgid "Queue sound setup"
 msgstr "Einstellung der Ansagen/Töne"
 
-#: admin/ogroups/gofon/phonequeue.tpl:138
+#: admin/ogroups/gofon/phonequeue.tpl:147
 msgid "Use music on hold instead of ringing"
 msgstr "Benutze Wartemusik statt Klingelton"
 
-#: 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 "Wartemusik"
 
-#: admin/ogroups/gofon/phonequeue.tpl:159
+#: admin/ogroups/gofon/phonequeue.tpl:168
 msgid "Welcome sound file"
 msgstr "'Willkommen'"
 
-#: admin/ogroups/gofon/phonequeue.tpl:169
+#: admin/ogroups/gofon/phonequeue.tpl:178
 msgid "Announce message"
 msgstr "Benachrichtigung"
 
-#: admin/ogroups/gofon/phonequeue.tpl:179
+#: admin/ogroups/gofon/phonequeue.tpl:188
 msgid "Sound file for 'You are next ...'"
 msgstr "Klangdatei für Ansage 'Sie sind der Nächste...'"
 
-#: admin/ogroups/gofon/phonequeue.tpl:189
+#: admin/ogroups/gofon/phonequeue.tpl:198
 msgid "'There are ...'"
 msgstr "'Es gibt ...'"
 
-#: admin/ogroups/gofon/phonequeue.tpl:199
+#: admin/ogroups/gofon/phonequeue.tpl:208
 msgid "'... calls waiting'"
 msgstr "'... wartende Anrufe'"
 
-#: admin/ogroups/gofon/phonequeue.tpl:209
+#: admin/ogroups/gofon/phonequeue.tpl:218
 msgid "'Thank you' message"
 msgstr "'Vielen Dank'"
 
-#: admin/ogroups/gofon/phonequeue.tpl:219
+#: admin/ogroups/gofon/phonequeue.tpl:228
 msgid "'minutes' sound file"
 msgstr "'Minuten'"
 
-#: admin/ogroups/gofon/phonequeue.tpl:229
+#: admin/ogroups/gofon/phonequeue.tpl:238
 msgid "'seconds' sound file"
 msgstr "'Sekunden'"
 
-#: admin/ogroups/gofon/phonequeue.tpl:239
+#: admin/ogroups/gofon/phonequeue.tpl:248
 msgid "Hold sound file"
 msgstr "Gespräch halten"
 
-#: admin/ogroups/gofon/phonequeue.tpl:249
+#: admin/ogroups/gofon/phonequeue.tpl:258
 msgid "Less Than sound file"
 msgstr "'Weniger als...''"
 
-#: admin/ogroups/gofon/phonequeue.tpl:267
+#: admin/ogroups/gofon/phonequeue.tpl:276
 msgid "Phone attributes "
 msgstr "Telefon-Attribute"
 
-#: admin/ogroups/gofon/phonequeue.tpl:277
-#: admin/ogroups/gofon/class_phonequeue.inc:950
-msgid "Announce holdtime"
+#: admin/ogroups/gofon/phonequeue.tpl:281
+msgid "Additional queue settings"
+msgstr "Erweiterte Warteschlangen-Einstellungen"
+
+#: admin/ogroups/gofon/phonequeue.tpl:288
+#: admin/ogroups/gofon/class_phonequeue.inc:955
+msgid "Announce hold time"
 msgstr "Benachrichtige über Wartezeit"
 
-#: 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 "Erlaube Weiterleiten des Gesprächs (Angerufener)"
 
-#: 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 "Erlaube Weiterleiten des Gesprächs (Anrufer)"
 
-#: admin/ogroups/gofon/phonequeue.tpl:305
-#: admin/ogroups/gofon/class_phonequeue.inc:933
+#: admin/ogroups/gofon/phonequeue.tpl:311
+msgid "Dial options"
+msgstr "Wähl-Optionen"
+
+#: admin/ogroups/gofon/phonequeue.tpl:318
+#: admin/ogroups/gofon/class_phonequeue.inc:938
 msgid "Allow the called to hangup by pressing *"
 msgstr "Auflegen durch Drücken der Taste '*' (Angerufener)"
 
-#: 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 "Auflegen durch Drücken der Taste '*' (Anrufer)"
 
-#: 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 "Klingelton statt Hintergrund-Musik"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:135
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/phoneaccount/class_phoneAccount.inc:140
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 msgid "Obsolete entry"
 msgstr "Veralteter Eintrag"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:135
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/phoneaccount/class_phoneAccount.inc:140
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 #, php-format
 msgid ""
 "The current home server is not available anymore. It will be moved to '%s' "
@@ -257,8 +268,7 @@ msgid "Queue length"
 msgstr "Größe der Warteschlange"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
-#: gofon/conference/class_phoneConferenceGeneric.inc:392
-#: gofon/conference/class_divListConferences.inc:56
+#: gofon/conference/class_phoneConferenceGeneric.inc:371
 msgid "Number"
 msgstr "Nummer"
 
@@ -269,14 +279,15 @@ msgstr "Asterisk"
 
 #: 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/class_phoneAccount.inc:364
-#: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/conference/class_phoneConferenceGeneric.inc:430
-#: gofon/fonreports/class_fonreport.inc:166
-#: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: 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
 msgid "GOfon"
 msgstr "GOfon"
 
@@ -300,53 +311,61 @@ msgstr "Telefonnummer"
 
 #: 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/class_phoneAccount.inc:959
-#: gofon/phoneaccount/class_phoneAccount.inc:1075
-#: gofon/phoneaccount/class_phoneAccount.inc:1081
-#: gofon/phoneaccount/class_phoneAccount.inc:1354
-#: gofon/phoneaccount/class_phoneAccount.inc:1426
-#: gofon/phoneaccount/class_phoneAccount.inc:1436
-#: gofon/phoneaccount/class_phoneAccount.inc:1470
-#: gofon/conference/class_phoneConferenceGeneric.inc:260
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
-#: gofon/fonreports/class_fonreport.inc:176
-#: gofon/fonreports/class_fonreport.inc:180
-#: gofon/fonreports/class_fonreport.inc:198
+#: 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 "Fehler"
 
 #: 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/class_phoneAccount.inc:1381
-#: gofon/phoneaccount/class_phoneAccount.inc:1517
-#: gofon/conference/class_phoneConferenceGeneric.inc:718
+#: 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
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
-#: 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 "Telefonnummer"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:918
-#: gofon/phoneaccount/class_phoneAccount.inc:6
-#: gofon/phoneaccount/class_phoneAccount.inc:912
-#: gofon/phoneaccount/class_phoneAccount.inc:925
-#: gofon/phoneaccount/class_phoneAccount.inc:937
-#: gofon/phoneaccount/class_phoneAccount.inc:941
-#: gofon/phoneaccount/class_phoneAccount.inc:944
-#: gofon/phoneaccount/class_phoneAccount.inc:1601
+#: 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 "Telefon"
 
@@ -354,55 +373,56 @@ msgstr "Telefon"
 msgid "Phone group"
 msgstr "Telefon-Gruppe"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:938
+#: admin/ogroups/gofon/class_phonequeue.inc:943
 msgid "Welcome music"
 msgstr "Begrüßungsmusik"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:939
+#: admin/ogroups/gofon/class_phonequeue.inc:944
 msgid "Report hold time"
 msgstr "Benachrichtige über Wartezeit"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:940
+#: admin/ogroups/gofon/class_phonequeue.inc:945
 msgid "'You are next' sound"
 msgstr "'Sie sind der Nächste'-Ton"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:941
+#: admin/ogroups/gofon/class_phonequeue.inc:946
 msgid "'There are' sound"
 msgstr "'Es gibt ...'-Ton"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:942
+#: admin/ogroups/gofon/class_phonequeue.inc:947
 msgid "'Call waiting' sound"
 msgstr "'wartender Anruf'-Ton"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:943
+#: admin/ogroups/gofon/class_phonequeue.inc:948
 msgid "'Thank you' sound"
 msgstr "'Vielen Dank'-Ton"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:944
+#: admin/ogroups/gofon/class_phonequeue.inc:949
 msgid "'Minutes' sound"
 msgstr "'Minuten'-Ton"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:945
+#: admin/ogroups/gofon/class_phonequeue.inc:950
 msgid "'Seconds' sound"
 msgstr "'Sekunden'-Ton"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:946
+#: admin/ogroups/gofon/class_phonequeue.inc:951
 msgid "'Less than' sound"
 msgstr "'Weniger als'-Ton"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:947
+#: admin/ogroups/gofon/class_phonequeue.inc:952
 msgid "Queue phone number"
 msgstr "Telefonnummer der Warteschlange"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:949
+#: admin/ogroups/gofon/class_phonequeue.inc:954
 msgid "Method"
 msgstr "Methode"
 
-#: admin/ogroups/gofon/class_phonequeue.inc:951
+#: admin/ogroups/gofon/class_phonequeue.inc:956
 msgid "Announce"
 msgstr "Ankündigung"
 
 #: admin/systems/services/gofon/goFonServer.tpl:1
+#: admin/systems/services/gofon/goFonServer.tpl:2
 msgid "VoIP database information"
 msgstr "Informationen der VoIP-Datenbank"
 
@@ -412,7 +432,7 @@ msgstr "Asterisk-DB Benutzer"
 
 #: 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 "Passwort"
 
@@ -460,31 +480,34 @@ msgstr "VoIP - Asterisk Verwaltung"
 msgid "Services"
 msgstr "Dienste"
 
-#: admin/systems/services/gofon/class_goFonServer.inc:174
+#: admin/systems/services/gofon/class_goFonServer.inc:179
 msgid "Start"
 msgstr "Start"
 
-#: admin/systems/services/gofon/class_goFonServer.inc:175
+#: admin/systems/services/gofon/class_goFonServer.inc:180
 msgid "Stop"
 msgstr "Beenden"
 
-#: admin/systems/services/gofon/class_goFonServer.inc:176
+#: admin/systems/services/gofon/class_goFonServer.inc:181
 msgid "Restart"
 msgstr "Neustart"
 
-#: admin/systems/services/gofon/class_goFonServer.inc:178
-msgid "Admin"
+#: admin/systems/services/gofon/class_goFonServer.inc:183
+msgid "Administrator"
 msgstr "Administrator"
 
-#: admin/systems/services/gofon/class_goFonServer.inc:180
+#: admin/systems/services/gofon/class_goFonServer.inc:185
 msgid "Area code"
 msgstr "Ortsvorwahl"
 
-#: admin/systems/services/gofon/class_goFonServer.inc:181
+#: admin/systems/services/gofon/class_goFonServer.inc:186
 msgid "Country code"
 msgstr "Landesvorwahl"
 
 #: 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 "Erweiterte Telefon-Einstellungen"
 
@@ -493,12 +516,12 @@ msgid "Phone type"
 msgstr "Telefon-Modell"
 
 #: 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 "Wählen Sie das Telefon-Modell"
 
@@ -506,298 +529,272 @@ msgstr "Wählen Sie das Telefon-Modell"
 msgid "refresh"
 msgstr "Aktualisieren"
 
-#: admin/systems/gofon/phonesettings.tpl:25
+#: admin/systems/gofon/phonesettings.tpl:24 admin/systems/gofon/phone.tpl:5
+#: gofon/conference/generic.tpl:6
+msgid "Generic settings"
+msgstr "Allgemeine Benutzereinstellungen"
+
+#: admin/systems/gofon/phonesettings.tpl:27
 msgid "Mode"
 msgstr "Modus"
 
-#: admin/systems/gofon/phonesettings.tpl:38
+#: admin/systems/gofon/phonesettings.tpl:40
 msgid "DTMF mode"
 msgstr "DTMF-Modus"
 
-#: admin/systems/gofon/phonesettings.tpl:54
-#: admin/systems/gofon/phonesettings.tpl:99
+#: admin/systems/gofon/phonesettings.tpl:53 gofon/conference/generic.tpl:83
+msgid "Additional settings"
+msgstr "Erweiterte Einstellungen"
+
+#: admin/systems/gofon/phonesettings.tpl:56
+#: admin/systems/gofon/phonesettings.tpl:102
 msgid "Default IP"
 msgstr "Standard IP-Adresse"
 
-#: 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 "Wartezeit bis Antwort"
 
-#: admin/systems/gofon/phonesettings.tpl:87
+#: admin/systems/gofon/phonesettings.tpl:90
 msgid "Modus"
 msgstr "Modus"
 
-#: admin/systems/gofon/phonesettings.tpl:124
-msgid "Authtype"
-msgstr "Authentifizierung"
+#: admin/systems/gofon/phonesettings.tpl:127
+msgid "Authentication type"
+msgstr "Authentifikations-Typ"
 
-#: admin/systems/gofon/phonesettings.tpl:136
+#: admin/systems/gofon/phonesettings.tpl:139
 msgid "Secret"
 msgstr "Passwort"
 
-#: admin/systems/gofon/phonesettings.tpl:146
-msgid "GoFonInkeys"
-msgstr "GOFon-Schlüssel (eingehend)"
-
-#: admin/systems/gofon/phonesettings.tpl:154
-msgid "GoFonOutKeys"
-msgstr "GOFon-Schlüssel (ausgehend)"
-
-#: admin/systems/gofon/phonesettings.tpl:167
+#: admin/systems/gofon/phonesettings.tpl:170
 msgid "Account code"
 msgstr "Konto-Identifikation"
 
-#: admin/systems/gofon/phonesettings.tpl:177
+#: admin/systems/gofon/phonesettings.tpl:180
 msgid "Trunk lines"
 msgstr "Leitungen zusammenfassen"
 
-#: admin/systems/gofon/phonesettings.tpl:194
+#: admin/systems/gofon/phonesettings.tpl:195
+msgid "Permissions"
+msgstr "Berechtigungen"
+
+#: admin/systems/gofon/phonesettings.tpl:199
 msgid "Hosts that are allowed to connect"
 msgstr "Erlaube diesen Rechnern die Verbindung"
 
-#: 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 "Liste alternativer Mail-Adressen"
 
-#: admin/systems/gofon/phonesettings.tpl:217
+#: admin/systems/gofon/phonesettings.tpl:225
 msgid "Hosts that are not allowed to connect"
 msgstr "Verbiete diesen Rechnern die Verbindung"
 
-#: 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
+msgid "Paste phone"
+msgstr "Telefon einfügen"
+
+#: admin/systems/gofon/paste_generic.tpl:3 admin/systems/gofon/phone.tpl:7
 msgid "Phone name"
 msgstr "Telefon-Name"
 
-#: admin/systems/gofon/phone.tpl:17
-#: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/class_divListMacros.inc:79
-#: gofon/macro/generic.tpl:27 gofon/conference/generic.tpl:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:776
-#: gofon/conference/class_divListConferences.inc:83
+#: 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 "Basis"
 
-#: admin/systems/gofon/phone.tpl:20 gofon/macro/generic.tpl:30
-msgid "Choose subtree to place group in"
-msgstr "Wählen Sie den Teilbaum, in den die Gruppe eingepflegt werden soll"
-
-#: 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 "Wählen Sie eine Basis"
-
-#: 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/conference/generic.tpl:98
-#: gofon/conference/class_phoneConferenceGeneric.inc:777
+#: 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 "Beschreibung"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:124
+#: admin/systems/gofon/class_phoneGeneric.inc:131
 msgid "phone"
 msgstr "Telefon"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:121
+#: admin/systems/gofon/class_phoneGeneric.inc:208
 msgid "yes"
 msgstr "ja"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
-#: gofon/macro/class_divListMacros.inc:122
+#: admin/systems/gofon/class_phoneGeneric.inc:208
 msgid "no"
 msgstr "nein"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:225
 msgid "dynamic"
 msgstr "dynamisch"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
-msgid "Networksettings"
+#: admin/systems/gofon/class_phoneGeneric.inc:225
+msgid "Network settings"
 msgstr "Netzwerk-Einstellungen"
 
-#: 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 "Konnte Eintrag nicht entfernen, da er noch von '%s' verwendet wird!"
 
-#: 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
 msgid "IP address"
 msgstr "IP-Adresse"
 
-#: 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
-#: gofon/macro/class_divListMacros.inc:56 gofon/macro/parameter.tpl:6
-#: gofon/conference/class_phoneConferenceGeneric.inc:388
-#: gofon/conference/class_phoneConferenceGeneric.inc:410
-#: gofon/conference/class_phoneConferenceGeneric.inc:775
-#: gofon/conference/class_divListConferences.inc:56
+#: 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:367
+#: gofon/conference/class_phoneConferenceGeneric.inc:389
+#: gofon/conference/class_phoneConferenceGeneric.inc:842
 msgid "Name"
 msgstr "Name"
 
-#: 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 "Allgemein"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:508
+#: admin/systems/gofon/class_phoneGeneric.inc:494
 msgid "Phone generic"
 msgstr "Telefon (Allgemein)"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/class_phoneAccount.inc:1615
+#: admin/systems/gofon/class_phoneGeneric.inc:503
+#: gofon/phoneaccount/class_phoneAccount.inc:1866
 msgid "Phone hardware"
 msgstr "Telefon-Hardware"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:519
+#: admin/systems/gofon/class_phoneGeneric.inc:511
+msgid "RDN for phone storage."
+msgstr "RDN für die Telefon Ablage."
+
+#: admin/systems/gofon/class_phoneGeneric.inc:523
 msgid "SIP Mode"
 msgstr "SIP Modus"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:520
+#: admin/systems/gofon/class_phoneGeneric.inc:524
 msgid "SIP DTMF mode"
 msgstr "SIP DTMF-Modus"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:521
-msgid "SIP Default ip"
+#: admin/systems/gofon/class_phoneGeneric.inc:525
+msgid "SIP Default IP"
 msgstr "SIP Standard IP-Adresse"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:522
+#: admin/systems/gofon/class_phoneGeneric.inc:526
 msgid "SIP Qualify"
 msgstr "SIP Qualifizieren"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:523
+#: admin/systems/gofon/class_phoneGeneric.inc:527
 msgid "IAX authentication type"
 msgstr "IAX Authentifikations-Typ"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:524
+#: admin/systems/gofon/class_phoneGeneric.inc:528
 msgid "IAX secret"
 msgstr "IAX Kennwort"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:525
+#: admin/systems/gofon/class_phoneGeneric.inc:529
 msgid "IAX account code"
 msgstr "IAX Konto-Identifikation"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:526
+#: admin/systems/gofon/class_phoneGeneric.inc:530
 msgid "IAX trunk lines"
 msgstr "IAX Leitungen zusammenfassen"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:527
+#: admin/systems/gofon/class_phoneGeneric.inc:531
 msgid "IAX permit settings"
 msgstr "IAX Zulassungs-Einstellungen"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:528
+#: admin/systems/gofon/class_phoneGeneric.inc:532
 msgid "IAX deny settings"
 msgstr "IAX Ablehnungs-Einstellungen"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:529
+#: admin/systems/gofon/class_phoneGeneric.inc:533
 msgid "CAPI MSN"
 msgstr "CAPI MSN"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:530
+#: admin/systems/gofon/class_phoneGeneric.inc:534
 msgid "Hardware type"
 msgstr "Hardware-Typ"
 
-#: gofon/macro/headpage.tpl:6 gofon/macro/class_divListMacros.inc:31
-#: gofon/macro/class_divListMacros.inc:32
-msgid "List of macros"
-msgstr "Liste der Makros"
-
-#: gofon/macro/headpage.tpl:20 gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/class_phoneAccount.inc:1508
-#: gofon/conference/headpage.tpl:20
-msgid "Information"
-msgstr "Information"
-
-#: gofon/macro/headpage.tpl:24
-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 with a "
-"large number of macros."
-msgstr ""
-"Dieses Menü erlaubt es Ihnen Makros hinzuzufügen, zu bearbeiten oder zu "
-"entfernen. Bei einer großen Anzahl von Makros bietet sich die Verwendung der "
-"Bereichsauswahl an."
-
-#: gofon/macro/headpage.tpl:29 gofon/conference/headpage.tpl:29
-msgid "Filters"
-msgstr "Filter"
-
-#: gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
-msgstr "Zeige Makros, auf die zutrifft"
-
-#: gofon/macro/headpage.tpl:38
-msgid "Display macros  matching"
-msgstr "Zeige Makros, auf die zutrifft"
-
-#: gofon/macro/headpage.tpl:41 gofon/macro/class_divListMacros.inc:64
-msgid "Regular expression for matching macro names"
-msgstr "Regulärer Ausdruck zum Erkennen von Makro-Namen"
-
-#: gofon/macro/remove.tpl:2 gofon/conference/remove.tpl:2
+#: 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 "Warnung"
 
-#: gofon/macro/remove.tpl:6
+#: gofon/macro/remove.tpl:7
 msgid ""
-"This may be used by several groups. Please double check if your really want "
-"to do this since there is no way for GOsa to get your data back."
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
-"Dieser Eintrag wird unter Umständen von verschiedenen Gruppen genutzt. Bitte "
-"überprüfen Sie genau was Sie tun, da GOsa keine Möglichkeit hat, die Daten "
-"wiederherzustellen."
+"Bitte überprüfen Sie genau was Sie tun, weil GOsa keine Möglichkeit hat, die "
+"Daten wiederherzustellen."
 
-#: gofon/macro/remove.tpl:9
+#: gofon/macro/remove.tpl:11
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "Wenn Sie sicher sind, drücken Sie 'Entfernen' um fortzufahren oder "
 "'Abbrechen' zum Abbruch."
 
-#: 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 "Telefon-Makro"
 
-#: gofon/macro/class_gofonMacroParameters.inc:256
+#: gofon/macro/class_gofonMacroParameters.inc:255
 msgid "String"
 msgstr "Zeichenkette"
 
-#: gofon/macro/class_gofonMacroParameters.inc:257
-msgid "Combobox"
-msgstr "Auswahl-Gruppe"
+#: gofon/macro/class_gofonMacroParameters.inc:256
+msgid "Select box"
+msgstr "Auswahlbox"
 
-#: gofon/macro/class_gofonMacroParameters.inc:258
-msgid "Bool"
+#: gofon/macro/class_gofonMacroParameters.inc:257
+msgid "Boolean"
 msgstr "Schalter"
 
-#: gofon/macro/class_gofonMacroParameters.inc:264
+#: gofon/macro/class_gofonMacroParameters.inc:263
 msgid "Delete unused"
 msgstr "Entferne"
 
-#: gofon/macro/class_gofonMacroParameters.inc:340
+#: gofon/macro/class_gofonMacroParameters.inc:343
 #, php-format
-msgid "Parameter %s contains invalid character. '!,#' is used as delimiter!"
-msgstr ""
-"Der Parameter %s enthält ungültige Zeichen. '!,#' werden als Feldtrenner "
-"verwendet!"
+msgid "Parameter %s contains invalid character!"
+msgstr "Das Feld '%s' enthält ungültige Zeichen!"
 
-#: gofon/macro/class_gofonMacroParameters.inc:345
+#: gofon/macro/class_gofonMacroParameters.inc:349
 #, php-format
 msgid "Parameter %s is invalid!"
 msgstr "Der Parameter %s ist ungültig!"
 
-#: gofon/macro/class_gofonMacroParameters.inc:374
+#: gofon/macro/class_gofonMacroParameters.inc:378
+#: gofon/phoneaccount/class_phoneAccount.inc:1755
+msgid "Information"
+msgstr "Information"
+
+#: gofon/macro/class_gofonMacroParameters.inc:378
 msgid ""
 "Number of parameters for this macro has changed. Please update all users "
 "using it!"
@@ -805,192 +802,168 @@ msgstr ""
 "Die Anzahl der Parameter für dieses Makro wurde verändert. Bitte "
 "aktualisieren Sie alle Benutzer, die es verwenden!"
 
-#: 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 ""
+"Das Makro kommte nicht vom dem Server '%s' entfernt werden, bitte überprüfen "
+"Sie die Datenbankkonsistenz!"
+
+#: gofon/macro/class_gofonMacro.inc:287
 #, php-format
 msgid "Application missing in line %s!"
 msgstr "Anwendung fehlt in Zeile %s!"
 
-#: gofon/macro/class_gofonMacro.inc:304
+#: gofon/macro/class_gofonMacro.inc:290
+#, php-format
+msgid "Priority missing in line %s!"
+msgstr "Priorität fehlt in Zeile %s!"
+
+#: gofon/macro/class_gofonMacro.inc:294
 #, php-format
 msgid "Extension missing in line %s!"
 msgstr "Erweiterung fehlt in Zeile %s!"
 
-#: 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 "Doppelte Verwendung von 'extension' und 'priority' in Zeile %s!"
+
+#: gofon/macro/class_gofonMacro.inc:333
+#, php-format
+msgid ""
+"Macro could not be added to server '%s', please check database consistency!"
+msgstr ""
+"Das Makro kommte nicht auf dem Server '%s' hinzugefügt werden, bitte "
+"überprüfen Sie die Datenbankkonsistenz!"
+
+#: gofon/macro/class_gofonMacro.inc:426
 msgid "Name can be 20 characters at maximum!"
 msgstr "Der Name kann höchstens 20 Zeichen lang sein!"
 
-#: gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/class_gofonMacro.inc:435
 msgid "Macro is still in use!"
 msgstr "Das Makro wird noch verwendet!"
 
-#: gofon/macro/class_gofonMacro.inc:432
+#: gofon/macro/class_gofonMacro.inc:442
 msgid "Macro is empty!"
 msgstr "Das Makro ist leer!"
 
-#: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/class_phoneAccount.inc:364
-#: gofon/phoneaccount/class_phoneAccount.inc:372
-#: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1475
-#: gofon/fonreports/class_fonreport.inc:166
-#: gofon/fonreports/class_fonreport.inc:169
+#: 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
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
-#: gofon/macro/class_gofonMacro.inc:563
+#: gofon/macro/class_gofonMacro.inc:573
 msgid "Asterisk macro management"
 msgstr "Asterisk-Makro-Verwaltung"
 
-#: gofon/macro/class_gofonMacro.inc:568
+#: gofon/macro/class_gofonMacro.inc:582
 msgid "GOfon macro"
 msgstr "GOfon-Makro"
 
-#: gofon/macro/class_gofonMacro.inc:572 gofon/macro/generic.tpl:6
+#: gofon/macro/class_gofonMacro.inc:591
+msgid "RDN for macro storage."
+msgstr "RDN für die Marko Ablage"
+
+#: 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 "Makro-Name"
 
-#: 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 "Angezeigter Name"
 
-#: gofon/macro/class_gofonMacro.inc:576
+#: gofon/macro/class_gofonMacro.inc:606
 msgid "Macro content and parameter"
 msgstr "Makro-Inhalt und Parameter"
 
-#: gofon/macro/class_gofonMacro.inc:577
+#: gofon/macro/class_gofonMacro.inc:607
 msgid "Visibility flag"
 msgstr "Sichtbarkeits-Flag"
 
-#: gofon/macro/class_divListMacros.inc:50
-#: gofon/conference/class_divListConferences.inc:50
-msgid "Select all"
-msgstr "Alle auswählen"
-
-#: gofon/macro/class_divListMacros.inc:56
-msgid "Department"
-msgstr "Abteilung"
-
-#: gofon/macro/class_divListMacros.inc:57
-msgid "Visible"
-msgstr "Sichtbar"
-
-#: gofon/macro/class_divListMacros.inc:58
-#: gofon/macro/class_divListMacros.inc:84
-#: gofon/conference/class_divListConferences.inc:59
-#: gofon/conference/class_divListConferences.inc:88
-msgid "Actions"
-msgstr "Aktionen"
-
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-msgid "Submit department"
-msgstr "Aktualisieren"
-
-#: gofon/macro/class_divListMacros.inc:81
-#: gofon/conference/class_divListConferences.inc:85
-msgid "Submit"
-msgstr "Übertragen"
-
-#: gofon/macro/class_divListMacros.inc:89
-#: gofon/conference/class_divListConferences.inc:93
-msgid "Create"
-msgstr "Anlegen"
-
-#: gofon/macro/class_divListMacros.inc:91
-#: gofon/macro/class_divListMacros.inc:120
+#: gofon/macro/generic.tpl:1 gofon/macro/macro-list.xml:15
+#: gofon/macro/macro-list.xml:74
 msgid "Macro"
 msgstr "Makro"
 
-#: gofon/macro/class_divListMacros.inc:97
-#: gofon/conference/class_divListConferences.inc:101
-msgid "Remove"
-msgstr "Entfernen"
-
-#: gofon/macro/class_divListMacros.inc:121
-msgid "visible"
-msgstr "sichtbar"
-
-#: gofon/macro/class_divListMacros.inc:122
-msgid "invisible"
-msgstr "unsichtbar"
-
-#: gofon/macro/class_divListMacros.inc:146
-#: gofon/conference/class_divListConferences.inc:150
-msgid "edit"
-msgstr "Bearbeiten"
-
-#: gofon/macro/class_divListMacros.inc:147
-msgid "Edit macro"
-msgstr "Makro bearbeiten"
-
-#: gofon/macro/class_divListMacros.inc:153
-#: gofon/conference/class_divListConferences.inc:158
-msgid "delete"
-msgstr "Entfernen"
-
-#: gofon/macro/class_divListMacros.inc:154
-msgid "Delete macro"
-msgstr "Makro entfernen"
-
-#: gofon/macro/class_divListMacros.inc:202
-#: gofon/macro/class_divListMacros.inc:203
-#, php-format
-msgid "Number of listed %s"
-msgstr "Anzahl der angezeigten %s"
-
-#: gofon/macro/class_divListMacros.inc:202
-msgid "macros"
-msgstr "Makros"
-
-#: gofon/macro/class_divListMacros.inc:203
-#: gofon/conference/class_divListConferences.inc:226
-msgid "departments"
-msgstr "Abteilungen"
+#: gofon/macro/generic.tpl:4
+msgid "Macro generic"
+msgstr "Makro allgemein"
 
 #: gofon/macro/generic.tpl:18
 msgid "Macro name to be displayed"
 msgstr "Makro-Name der angezeigt wird"
 
-#: gofon/macro/generic.tpl:60
+#: gofon/macro/generic.tpl:40
+msgid "Visibility"
+msgstr "Sichtbarkeit"
+
+#: gofon/macro/generic.tpl:53
 msgid "Visible for user"
 msgstr "Sichtbar für Benutzer"
 
-#: gofon/macro/generic.tpl:70
+#: gofon/macro/generic.tpl:63
 msgid "Macro text"
 msgstr "Makro-Inhalt"
 
-#: gofon/macro/class_gofonMacroManagement.inc:24
-msgid "Phone macros"
-msgstr "Telefon-Makros"
+#: gofon/macro/macro-list.xml:11
+msgid "List of macros"
+msgstr "Liste der Makros"
+
+#: gofon/macro/macro-list.xml:57 gofon/conference/conf-list.xml:57
+msgid "Actions"
+msgstr "Aktionen"
+
+#: gofon/macro/macro-list.xml:68 gofon/conference/conf-list.xml:68
+msgid "Create"
+msgstr "Anlegen"
+
+#: 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 "Bearbeiten"
+
+#: 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 "Entfernen"
+
+#: gofon/macro/paste_generic.tpl:1
+msgid "Paste macro"
+msgstr "Marko einfügen"
 
 #: gofon/macro/class_gofonMacroManagement.inc:25
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Dies tut etwas"
+msgid "Phone Macros"
+msgstr "Telefon-Makro"
 
-#: gofon/macro/class_gofonMacroManagement.inc:273
-#: gofon/conference/class_phoneConferenceManagment.inc:187
-msgid "Permission"
-msgstr "Berechtigung"
-
-#: gofon/macro/class_gofonMacroManagement.inc:320
-#: gofon/macro/class_gofonMacroManagement.inc:373
-#: gofon/macro/class_gofonMacroManagement.inc:397
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
-msgid "Permission error"
-msgstr "Berechtigungsfehler"
-
-#: gofon/macro/class_gofonMacroManagement.inc:366
-msgid "macro"
-msgstr "Makro"
+#: gofon/macro/class_gofonMacroManagement.inc:26
+msgid "Manage phone macros for setups using the Asterisk VoIP service"
+msgstr ""
+"Verwalten von Telefon-Makros für Asterisk VoIP-Service gestütze "
+"Infrastrukturen"
 
-#: gofon/macro/main.inc:51 gofon/macro/main.inc:55
-msgid "Phone macro management"
-msgstr "Telefon-Makro-Verwaltung"
+#: gofon/macro/macro-filter.xml:17
+msgid "Default filter"
+msgstr "Standard-Filter"
+
+#: gofon/macro/macro-filter.xml:31
+msgid "Enabled"
+msgstr "Aktiviert"
+
+#: gofon/macro/parameter.tpl:2
+msgid "Macro parameter"
+msgstr "Makro-Parameter"
 
 #: gofon/macro/parameter.tpl:4
 msgid "Argument"
@@ -1009,102 +982,124 @@ msgid "You are not allowed to view the macro parameter settings"
 msgstr ""
 "Sie haben keine Berechtigung, die Makro-Parameter Einstellungen anzuzeigen."
 
-#: 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 "Telefon-Hardware"
 
-#: 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 "Telefon"
 
-#: gofon/phoneaccount/generic.tpl:62
+#: gofon/phoneaccount/generic.tpl:59
 msgid "Select the accounts home server"
 msgstr "Wählen Sie den Home-Server des Kontos."
 
-#: gofon/phoneaccount/generic.tpl:69
+#: gofon/phoneaccount/generic.tpl:66
 msgid "Context"
 msgstr "Kontext"
 
-#: gofon/phoneaccount/generic.tpl:73 gofon/phoneaccount/generic.tpl:84
+#: gofon/phoneaccount/generic.tpl:70 gofon/phoneaccount/generic.tpl:81
 msgid "Select the accounts context"
 msgstr "Wählen Sie den Kontext des Kontos"
 
-#: gofon/phoneaccount/generic.tpl:80
-msgid "Voicemail context"
+#: gofon/phoneaccount/generic.tpl:77
+#: gofon/phoneaccount/class_phoneAccount.inc:1869
+msgid "Voice mail context"
 msgstr "Voicemail-Kontext"
 
-#: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/class_phoneAccount.inc:1281
-#: gofon/phoneaccount/class_phoneAccount.inc:1284
-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
+msgid "Voice mail PIN"
 msgstr "Voicemail-PIN"
 
-#: gofon/phoneaccount/generic.tpl:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/class_phoneAccount.inc:1289
+#: gofon/phoneaccount/generic.tpl:100 gofon/phoneaccount/paste_generic.tpl:35
+#: gofon/phoneaccount/class_phoneAccount.inc:1471
 msgid "Phone PIN"
 msgstr "Telefon-PIN"
 
-#: gofon/phoneaccount/generic.tpl:138
+#: gofon/phoneaccount/generic.tpl:132
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: gofon/phoneaccount/paste_generic.tpl:1 gofon/phoneaccount/main.inc:133
+#: gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
 msgstr "Telefon-Einstellungen"
 
-#: gofon/phoneaccount/main.inc:123
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr ""
-"Betätigen sie den 'Bearbeiten'-Schalter unten um Informationen in diesem "
-"Dialog zu ändern"
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+msgid "This does something"
+msgstr "Dies tut etwas"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:173
+#: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr "automatisch"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:209
+#: gofon/phoneaccount/class_phoneAccount.inc:214
 msgid "no macro"
 msgstr "kein Makro"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:237
+#: gofon/phoneaccount/class_phoneAccount.inc:242
 msgid "undefined"
 msgstr "nicht definiert"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:490
-#: gofon/phoneaccount/class_phoneAccount.inc:497
-#: gofon/phoneaccount/class_phoneAccount.inc:515
-#: gofon/phoneaccount/class_phoneAccount.inc:522
+#: gofon/phoneaccount/class_phoneAccount.inc:368
+#, php-format
+msgid ""
+"Cannot identify telephone extension in database, please try to save again."
+msgstr ""
+"Die Telefon-Erweiterung kann nicht in der Datenbank gefunden werden. "
+"Versuchen Sie noch einmal zu Speichern."
+
+#: gofon/phoneaccount/class_phoneAccount.inc:597
+#: gofon/phoneaccount/class_phoneAccount.inc:604
+#: gofon/phoneaccount/class_phoneAccount.inc:622
+#: gofon/phoneaccount/class_phoneAccount.inc:629
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 "Das Speichern der Einträge abbrechen, um die Datenbank konsistent zu halten."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:936
+#: 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 "GOsa hat Probleme mit der Datenbank-Definition festgestellt!"
+
+#: 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 "Bitte Aktivieren Sie das Debuggung für mehr Informationen!"
+
+#: gofon/phoneaccount/class_phoneAccount.inc:1111
 msgid "Remove phone account"
 msgstr "Telefon-Konto entfernen"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:940
-#: gofon/phoneaccount/class_phoneAccount.inc:943
+#: gofon/phoneaccount/class_phoneAccount.inc:1115
+#: gofon/phoneaccount/class_phoneAccount.inc:1118
 msgid "Create phone account"
 msgstr "Telefon-Konto erstellen"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:941
-msgid "User uid"
-msgstr "Benutzer uid"
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
+msgid "User UID"
+msgstr "Benutzer-ID"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:959
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
 msgid "Selected macro is not available anymore!"
 msgstr "Das gewählte Makro ist nirgendwo verfügbar!"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:983
+#: gofon/phoneaccount/class_phoneAccount.inc:1159
 msgid "Parameter"
 msgstr "Parameter"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1130
+#: gofon/phoneaccount/class_phoneAccount.inc:1312
 msgid "Choose your private phone"
 msgstr "Wählen Sie Ihr privates Telefon"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1273
+#: gofon/phoneaccount/class_phoneAccount.inc:1455
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
@@ -1112,27 +1107,32 @@ msgstr ""
 "Es muss mindestens ein Server mit einer Asterisk-Datenbank bestehen, um ein "
 "Telefon-Konto zu erstellen."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1281
-msgid "Between 1-4 charactes"
+#: gofon/phoneaccount/class_phoneAccount.inc:1463
+msgid "Between 1-4 characters"
 msgstr "1-4 Zeichen"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1307
+#: gofon/phoneaccount/class_phoneAccount.inc:1511
 #, php-format
 msgid "macro parameter %s"
 msgstr "Makro-Parameter %s"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1508
+#: gofon/phoneaccount/class_phoneAccount.inc:1559
+msgid "An error occurred while updating the database entries!"
+msgstr ""
+"Es ist ein Fehler beim Aktualisieren der Datenbankeinträge aufgetreten!"
+
+#: gofon/phoneaccount/class_phoneAccount.inc:1755
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "Benutzer '%s' aus Warteschlange '%s' entfernt."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1545
-#: gofon/phoneaccount/class_phoneAccount.inc:1547
+#: gofon/phoneaccount/class_phoneAccount.inc:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1794
 #, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+msgid "The specified telephone number '%s' is already assigned to '%s'."
 msgstr "Die angegebene Telefonnummer '%s' wird bereits von '%s' verwendet."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1593
+#: gofon/phoneaccount/class_phoneAccount.inc:1840
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1141,415 +1141,326 @@ msgstr ""
 "Der zuvor ausgewählte Asterisk Home-Server ('%s') ist nicht mehr verfügbar."
 "Entfernen wurde abgebrochen."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1602
+#: gofon/phoneaccount/class_phoneAccount.inc:1849
 msgid "Phone account settings"
 msgstr "Telefon-Konto-Einstellungen"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1606
+#: gofon/phoneaccount/class_phoneAccount.inc:1853
 msgid "My account"
 msgstr "Mein Konto"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1613
-#: gofon/conference/class_phoneConferenceGeneric.inc:793
+#: gofon/phoneaccount/class_phoneAccount.inc:1864
+#: gofon/conference/class_phoneConferenceGeneric.inc:860
 msgid "Telephone number"
 msgstr "Telefonnummer"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1614
+#: gofon/phoneaccount/class_phoneAccount.inc:1865
 msgid "Macro settings"
 msgstr "Makro-Einstellungen"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1617
+#: gofon/phoneaccount/class_phoneAccount.inc:1868
 msgid "Phone context"
 msgstr "Telefon-Kontext"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1618
-msgid "Voice mail context"
-msgstr "Voicemail-Kontext"
-
-#: gofon/phoneaccount/class_phoneAccount.inc:1619
-msgid "Telephone pin"
-msgstr "Telefon-PIN"
-
-#: gofon/phoneaccount/class_phoneAccount.inc:1620
-msgid "Voicemail pin"
-msgstr "Voicemail-PIN"
+#: gofon/phoneaccount/class_phoneAccount.inc:1870
+msgid "Telephone PIN"
+msgstr "Telefon PIN"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1702
+#: gofon/phoneaccount/class_phoneAccount.inc:1953
 msgid "There is currently no asterisk server defined!"
 msgstr "Es ist momentan kein Asterisk-Server definiert!"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1706
+#: gofon/phoneaccount/class_phoneAccount.inc:1957
 msgid "Asterisk server is invalid!"
 msgstr "Der Asterisk-Server ist ungültig!"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1712
-msgid "Voicemail PIN must be 4 characters long!"
+#: gofon/phoneaccount/class_phoneAccount.inc:1963
+msgid "Voice mail PIN must be 4 characters long!"
 msgstr "Die Voicemail-PIN muss 4 Zeichen lang sein!"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1715
-msgid "Voicemail PIN contains invalid characters!"
+#: gofon/phoneaccount/class_phoneAccount.inc:1966
+msgid "Voice mail PIN contains invalid characters!"
 msgstr "Die Voicemail-PIN enthält ungültige Zeichen!"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1720
-msgid "Phone pin contains invalid characters!"
+#: gofon/phoneaccount/class_phoneAccount.inc:1971
+msgid "Phone PIN contains invalid characters!"
 msgstr "Die Telefon-PIN enthält ungültige Zeichen!"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1727
+#: gofon/phoneaccount/class_phoneAccount.inc:1978
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 "Der Parameter '%s' enthält ungültige Zeichen. '!,#' werden als Feldtrenner "
 "verwendet"
 
-#: gofon/conference/headpage.tpl:6
-#: gofon/conference/class_divListConferences.inc:31
-#: gofon/conference/class_divListConferences.inc:32
-msgid "List of conference rooms"
-msgstr "Liste der Konferenz-Räume"
-
-#: gofon/conference/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected phone conferences. "
-"Having a large number of phone conferences, you might prefer the range "
-"selectors on top of the conferences list."
-msgstr ""
-"Dieses Menü erlaubt es Ihnen Telefon-Konferenzen hinzuzufügen, zu bearbeiten "
-"oder zu entfernen. Bei einer großen Anzahl von Abteilungen bietet sich die "
-"Verwendung der Bereichswahl an."
-
-#: gofon/conference/headpage.tpl:35
-msgid "Display users matching"
-msgstr "Zeige die Benutzer, auf die Folgendes passt"
-
-#: gofon/conference/headpage.tpl:36
-msgid "Regular expression for        matching user names"
-msgstr "Regulärer Ausdruck zum Erkennen von Benutzernamen"
-
-#: gofon/conference/remove.tpl:6
-msgid ""
-"This includes 'all' accounts, systems, etc. in this subtree. Please double "
-"check if your really want to do this since there is no way for GOsa to get "
-"your data back."
-msgstr ""
-"Dies umfasst 'alle' Konten, System- und Setup-Informationen dieses "
-"Teilbaums. Bitte prüfen Sie genau, da es keine Möglichkeit für GOsa gibt, "
-"die Daten wiederherzustellen. "
-
-#: gofon/conference/remove.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Eine Sicherung der LDAP-Datenbank bietet sich an. Wenn Sie dies erledigt "
-"haben, drücken Sie 'Entfernen' um Fortzufahren oder 'Abbrechen', um den "
-"Vorgang abzubrechen."
-
-#: gofon/conference/class_phoneConferenceManagment.inc:24
-msgid "Phone conferences"
-msgstr "Telefon-Konferenzen"
+#: gofon/conference/conf-filter.xml:18
+msgid "Default"
+msgstr "Standard"
 
 #: gofon/conference/class_phoneConferenceManagment.inc:25
-msgid "Management"
-msgstr "Verwaltung"
-
-#: gofon/conference/class_phoneConferenceManagment.inc:206
-#: gofon/conference/class_phoneConferenceManagment.inc:267
-msgid "conference"
-msgstr "Konferenz"
+msgid "Phone Conferences"
+msgstr "Telefon-Konferenzen"
 
-#: gofon/conference/class_phoneConferenceManagment.inc:228
-#: gofon/conference/class_phoneConferenceManagment.inc:288
-msgid "You have not permission to delete this entry!"
-msgstr "Sie haben keine Berechtigung, diesen Eintrag zu entfernen!"
+#: gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Manage phone conference rooms in setups using the Asterisk VoIP service"
+msgstr ""
+"Verwalten von Telefon-Konferenzen in Asterisk VoIP-Service gestützten "
+"Infrastrukturen"
 
-#: gofon/conference/generic.tpl:5
+#: gofon/conference/generic.tpl:1
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: 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 "Konferenz"
+
+#: gofon/conference/generic.tpl:10 gofon/conference/paste_generic.tpl:5
 msgid "Conference name"
 msgstr "Konferenz-Name"
 
-#: 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 "Name der zu erzeugenden Konferenz"
 
-#: gofon/conference/generic.tpl:28
+#: gofon/conference/generic.tpl:23
 msgid "Type"
 msgstr "Typ"
 
-#: gofon/conference/generic.tpl:35
+#: gofon/conference/generic.tpl:30
 msgid "Choose subtree to place conference in"
 msgstr "Wählen Sie den Teilbaum, in den die Konferenz eingepflegt werden soll"
 
-#: gofon/conference/generic.tpl:82
+#: gofon/conference/generic.tpl:71
 msgid "Select language"
 msgstr "Auswahl der Sprache"
 
-#: gofon/conference/generic.tpl:104
+#: gofon/conference/generic.tpl:93
 msgid "Descriptive text for department"
 msgstr "Beschreibender Text zu dieser Abteilung"
 
-#: gofon/conference/generic.tpl:110
+#: gofon/conference/generic.tpl:99
 msgid "Lifetime (in days)"
 msgstr "Lebenszeit (in Tagen)"
 
-#: gofon/conference/generic.tpl:157
-#: gofon/conference/class_phoneConferenceGeneric.inc:783
+#: gofon/conference/generic.tpl:144
+#: gofon/conference/class_phoneConferenceGeneric.inc:850
 msgid "Preset PIN"
 msgstr "PIN voreinstellen"
 
-#: gofon/conference/generic.tpl:165
-#: gofon/conference/class_phoneConferenceGeneric.inc:384
-#: gofon/conference/class_divListConferences.inc:58
+#: 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:784
+#: gofon/conference/generic.tpl:164
+#: gofon/conference/class_phoneConferenceGeneric.inc:851
 msgid "Record conference"
 msgstr "Konferenz aufnehmen"
 
-#: gofon/conference/generic.tpl:185
+#: gofon/conference/generic.tpl:172
 msgid "Sound file format"
 msgstr "Format der Audiodatei"
 
-#: gofon/conference/generic.tpl:188
+#: gofon/conference/generic.tpl:175
 msgid "Choose subtree to place department in"
 msgstr "Wählen Sie den Teilbaum, in den die Abteilung eingepflegt werden soll"
 
-#: gofon/conference/generic.tpl:208
-#: gofon/conference/class_phoneConferenceGeneric.inc:785
+#: gofon/conference/generic.tpl:189
+msgid "Flags"
+msgstr "Schalter"
+
+#: gofon/conference/generic.tpl:195
+#: gofon/conference/class_phoneConferenceGeneric.inc:852
 msgid "Play music on hold"
 msgstr "Wartemusik bei Halten"
 
-#: gofon/conference/generic.tpl:216
+#: gofon/conference/generic.tpl:203
 msgid "Activate session menu"
 msgstr "Sitzungsmenü aktivieren"
 
-#: gofon/conference/generic.tpl:224
+#: gofon/conference/generic.tpl:211
 msgid "Announce users joining or leaving the conference"
 msgstr "Benachrichtige über Abgang/Zugang von Teilnehmern"
 
-#: gofon/conference/generic.tpl:232
+#: gofon/conference/generic.tpl:219
 msgid "Count users"
 msgstr "Zähle Benutzer"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
+#: gofon/conference/paste_generic.tpl:1
+msgid "Paste confernece"
+msgstr "Konferenz einfügen"
+
+#: gofon/conference/conf-list.xml:11
+msgid "List of conference rooms"
+msgstr "Liste der Konferenz-Räume"
+
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
 msgstr ""
 "Kann Eintrag nicht von Server '%s' entfernen, da er scheinbar bereits "
 "entfernt wurde!"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:379
+#: gofon/conference/class_phoneConferenceGeneric.inc:353
 #, php-format
 msgid ""
 "The previously selected asterisk home server '%s' is no longer available!"
 msgstr ""
 "Der zuvor ausgewählte Asterisk Anmelde-Server '%s' ist nicht mehr verfügbar."
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:396
-#: gofon/conference/class_phoneConferenceGeneric.inc:792
+#: gofon/conference/class_phoneConferenceGeneric.inc:375
+#: gofon/conference/class_phoneConferenceGeneric.inc:859
 msgid "Lifetime"
 msgstr "Lebenszeit"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:641
-#: gofon/conference/class_phoneConferenceGeneric.inc:643
+#: gofon/conference/class_phoneConferenceGeneric.inc:443
+#, php-format
+msgid ""
+"GOsa identified problems with your MySQL table definition, please activate "
+"debugging for details."
+msgstr ""
+"GOsa hat Probleme mit der Datenbank-Definition festgestellt. Bitte "
+"aktivieren Sie das Debugging für mehr Informationen."
+
+#: gofon/conference/class_phoneConferenceGeneric.inc:690
+#: gofon/conference/class_phoneConferenceGeneric.inc:692
 #, php-format
 msgid "'%s' is already assigned to '%s'!"
 msgstr "'%s' wird bereits von '%s' verwendet!"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:765
-#: gofon/conference/class_divListConferences.inc:95
-#: gofon/conference/class_divListConferences.inc:208
-msgid "Conference"
-msgstr "Konferenz"
-
-#: gofon/conference/class_phoneConferenceGeneric.inc:766
+#: gofon/conference/class_phoneConferenceGeneric.inc:814
 msgid "Phone conference management"
 msgstr "Telefonkonferenz-Verwaltung"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:771
+#: gofon/conference/class_phoneConferenceGeneric.inc:823
 msgid "GOfon conference"
 msgstr "GOfon-Konferenz"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:778
+#: gofon/conference/class_phoneConferenceGeneric.inc:832
+msgid "RDN for phone conference storage."
+msgstr "RDN für die Telefon-Konferenz Ablage"
+
+#: gofon/conference/class_phoneConferenceGeneric.inc:845
 msgid "Conference PIN"
 msgstr "Konferenz-PIN"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:786
+#: gofon/conference/class_phoneConferenceGeneric.inc:853
 msgid "Activate menu"
 msgstr "Menü aktivieren"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:787
+#: gofon/conference/class_phoneConferenceGeneric.inc:854
 msgid "Announce user activity"
 msgstr "Melde Benutzer-Aktivität"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:788
+#: gofon/conference/class_phoneConferenceGeneric.inc:855
 msgid "Count user"
 msgstr "Zähle Benutzer"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:789
+#: gofon/conference/class_phoneConferenceGeneric.inc:856
 msgid "Conference type"
 msgstr "Konferenz-Typ"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:791
+#: gofon/conference/class_phoneConferenceGeneric.inc:858
 msgid "Format"
 msgstr "Format"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:794
-#: gofon/conference/class_divListConferences.inc:57
+#: gofon/conference/class_phoneConferenceGeneric.inc:861
 msgid "Owner"
 msgstr "Besitzer"
 
-#: gofon/conference/main.inc:48 gofon/conference/main.inc:50
-msgid "Conference management"
-msgstr "Konferenz-Verwaltung"
-
-#: gofon/conference/class_divListConferences.inc:65
-msgid "Regular expression for matching conference names"
-msgstr "Regulärer Ausdruck zum Erkennen von Konferenznamen"
-
-#: gofon/conference/class_divListConferences.inc:150
-msgid "Edit this entry"
-msgstr "Diesen Eintrag bearbeiten"
-
-#: gofon/conference/class_divListConferences.inc:158
-msgid "Delete this entry"
-msgstr "Diesen Eintrag entfernen"
-
-#: gofon/conference/class_divListConferences.inc:185
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: gofon/conference/class_divListConferences.inc:225
-#: gofon/conference/class_divListConferences.inc:226
-#, php-format
-msgid "Number of listed '%s'"
-msgstr "Anzahl der angezeigten '%s'"
-
-#: gofon/conference/class_divListConferences.inc:225
-msgid "conferences"
-msgstr "Konferenzen"
-
 #: gofon/fonreports/class_fonreport.inc:6
 msgid "Phone Reports"
 msgstr "Telefon-Berichte"
 
-#: gofon/fonreports/class_fonreport.inc:210
+#: gofon/fonreports/class_fonreport.inc:7
+msgid "View the phone report for incoming and outgoing calls"
+msgstr "Telefon-Berichte für eingehende und ausgehende Anrufe betrachten"
+
+#: gofon/fonreports/class_fonreport.inc:237
 msgid "Insufficient permissions"
 msgstr "Unzureichende Berechtigungen"
 
-#: gofon/fonreports/class_fonreport.inc:229
+#: gofon/fonreports/class_fonreport.inc:269
 msgid "Y-M-D"
 msgstr "D.M.Y"
 
-#: gofon/fonreports/class_fonreport.inc:396
-#: gofon/fonreports/class_fonreport.inc:397
-#: gofon/fonreports/class_fonreport.inc:404 gofon/fonreports/main.inc:22
-msgid "Phone reports"
+#: gofon/fonreports/class_fonreport.inc:429
+#: gofon/fonreports/class_fonreport.inc:430
+msgid "View phone reports"
 msgstr "Telefon-Berichte"
 
-#: gofon/fonreports/class_fonreport.inc:397
-msgid "All entries are readonly"
+#: gofon/fonreports/class_fonreport.inc:430
+msgid "All entries are read-only"
 msgstr "Alle Einträge sind nur lesbar"
 
-#: gofon/fonreports/class_fonreport.inc:409 gofon/fonreports/contents.tpl:30
+#: gofon/fonreports/class_fonreport.inc:438 gofon/fonreports/contents.tpl:14
+#: gofon/fonreports/contents.tpl:43
 msgid "Date"
 msgstr "Datum"
 
-#: gofon/fonreports/class_fonreport.inc:410 gofon/fonreports/contents.tpl:31
+#: gofon/fonreports/class_fonreport.inc:439 gofon/fonreports/contents.tpl:44
 msgid "Source"
 msgstr "Quelle"
 
-#: gofon/fonreports/class_fonreport.inc:411 gofon/fonreports/contents.tpl:32
+#: gofon/fonreports/class_fonreport.inc:440 gofon/fonreports/contents.tpl:45
 msgid "Destination"
 msgstr "Ziel"
 
-#: gofon/fonreports/class_fonreport.inc:412 gofon/fonreports/contents.tpl:33
+#: gofon/fonreports/class_fonreport.inc:441 gofon/fonreports/contents.tpl:46
 msgid "Channel"
 msgstr "Kanal"
 
-#: gofon/fonreports/class_fonreport.inc:413
+#: gofon/fonreports/class_fonreport.inc:442
 msgid "Application called"
 msgstr "Name der Anwendung"
 
-#: gofon/fonreports/class_fonreport.inc:414
+#: gofon/fonreports/class_fonreport.inc:443
 msgid "Disposition"
 msgstr "Disposition"
 
-#: gofon/fonreports/class_fonreport.inc:415 gofon/fonreports/contents.tpl:36
+#: gofon/fonreports/class_fonreport.inc:444 gofon/fonreports/contents.tpl:49
 msgid "Duration"
 msgstr "Dauer"
 
-#: gofon/fonreports/contents.tpl:2
+#: gofon/fonreports/contents.tpl:3 gofon/fonreports/contents.tpl:40
+msgid "Phone reports"
+msgstr "Telefon-Berichte"
+
+#: gofon/fonreports/contents.tpl:6
 msgid "Filter"
 msgstr "Filter"
 
-#: gofon/fonreports/contents.tpl:6
+#: gofon/fonreports/contents.tpl:9
+msgid "Server"
+msgstr "Server"
+
+#: gofon/fonreports/contents.tpl:10
+msgid "Select server to search on"
+msgstr "Wählen Sie den Server, auf dem gesucht werden soll"
+
+#: gofon/fonreports/contents.tpl:22
 msgid "Search for"
 msgstr "Suche nach"
 
-#: gofon/fonreports/contents.tpl:7
+#: gofon/fonreports/contents.tpl:24
 msgid "Enter user name to search for"
 msgstr "Benutzername, nach dem gesucht werden soll"
 
-#: gofon/fonreports/contents.tpl:8 gofon/fonreports/contents.tpl:16
-msgid "in"
-msgstr "in"
-
-#: gofon/fonreports/contents.tpl:9
-msgid "Select subtree to base search on"
-msgstr "Wählen Sie den Teilbaum, in dem gesucht werden soll"
-
-#: gofon/fonreports/contents.tpl:12
-msgid "during"
-msgstr "während"
-
-#: gofon/fonreports/contents.tpl:21
+#: gofon/fonreports/contents.tpl:28
 msgid "Search"
 msgstr "Suchen"
 
-#: gofon/fonreports/contents.tpl:34
+#: gofon/fonreports/contents.tpl:47
 msgid "Application"
 msgstr "Anwendung"
 
-#: gofon/fonreports/contents.tpl:35
+#: gofon/fonreports/contents.tpl:48
 msgid "Status"
 msgstr "Status"
 
-#: gofon/fonreports/contents.tpl:51
+#: gofon/fonreports/contents.tpl:74
 msgid "Search returned no results..."
 msgstr "Die Suche verlief ergebnislos..."
-
-#~ msgid "Addons"
-#~ msgstr "Zusätzliches"
-
-#~ msgid "Not supported multiple brace in line %s!"
-#~ msgstr "Nicht unterstützte Mehrfach-Klammerung in Zeile %s!"
-
-#~ msgid "GOfon reports"
-#~ msgstr "GOfon-Berichte"
-
-#~ msgid "Copy"
-#~ msgstr "Kopieren"
-
-#~ msgid "Cut"
-#~ msgstr "Ausschneiden"
-
-#~ msgid "Paste"
-#~ msgstr "Einfügen"
-
-#~ msgid "cut"
-#~ msgstr "Ausschneiden"
-
-#~ msgid "Cut this entry"
-#~ msgstr "Diesen Eintrag ausschneiden"
-
-#~ msgid "copy"
-#~ msgstr "Kopieren"
-
-#~ msgid "Copy this entry"
-#~ msgstr "Diesen Eintrag kopieren"