Code

Updated locale
[gosa.git] / gosa-plugins / gofon / locale / de / LC_MESSAGES / messages.po
index 0a3f98da1370d141de9c2f1b3f802e4fa8040601..d6597a1b5ac96eb8583b59f638a355443b99cfff 100644 (file)
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2008-07-28 08:22+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@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"
@@ -50,7 +51,7 @@ msgstr "Auf"
 msgid "Down"
 msgstr "Ab"
 
-#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:141
+#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:135
 msgid "Options"
 msgstr "Optionen"
 
@@ -58,19 +59,17 @@ msgstr "Optionen"
 #: 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
+#: gofon/phoneaccount/class_phoneAccount.inc:1456
+#: gofon/phoneaccount/class_phoneAccount.inc:1852
+#: gofon/conference/generic.tpl:62
+#: gofon/conference/class_phoneConferenceGeneric.inc:828
 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:851
+#: gofon/conference/generic.tpl:72
+#: gofon/conference/class_phoneConferenceGeneric.inc:826
 msgid "Language"
 msgstr "Sprache"
 
@@ -193,16 +192,14 @@ msgid "Ring instead of playing background music"
 msgstr "Klingelton statt Hintergrund-Musik"
 
 #: 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
 msgid "Obsolete entry"
 msgstr "Veralteter Eintrag"
 
 #: 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' "
@@ -261,7 +258,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_phoneConferenceGeneric.inc:368
 msgid "Number"
 msgstr "Nummer"
 
@@ -272,12 +269,10 @@ 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/.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/macro/class_gofonMacro.inc:400 gofon/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/conference/class_phoneConferenceGeneric.inc:406
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
@@ -305,32 +300,24 @@ 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/.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
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: admin/systems/gofon/class_phoneGeneric.inc:288
+#: gofon/macro/class_gofonMacro.inc:362 gofon/macro/class_gofonMacro.inc:471
+#: gofon/macro/class_gofonMacro.inc:480 gofon/macro/class_gofonMacro.inc:518
+#: gofon/phoneaccount/class_phoneAccount.inc:689
+#: gofon/phoneaccount/class_phoneAccount.inc:1011
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
+#: gofon/phoneaccount/class_phoneAccount.inc:1254
+#: gofon/phoneaccount/class_phoneAccount.inc:1260
+#: gofon/phoneaccount/class_phoneAccount.inc:1474
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
+#: gofon/phoneaccount/class_phoneAccount.inc:1635
+#: gofon/phoneaccount/class_phoneAccount.inc:1645
+#: gofon/phoneaccount/class_phoneAccount.inc:1692
+#: gofon/conference/class_phoneConferenceGeneric.inc:227
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
+#: gofon/conference/class_phoneConferenceGeneric.inc:267
+#: gofon/conference/class_phoneConferenceGeneric.inc:593
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
 #: gofon/fonreports/class_fonreport.inc:217
@@ -340,41 +327,33 @@ 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:428
-#: admin/systems/gofon/class_phoneGeneric.inc:442
-#: admin/systems/gofon/class_phoneGeneric.inc:459
+#: admin/systems/gofon/class_phoneGeneric.inc:257
+#: admin/systems/gofon/class_phoneGeneric.inc:412
+#: admin/systems/gofon/class_phoneGeneric.inc:426
+#: admin/systems/gofon/class_phoneGeneric.inc:443
 #: gofon/macro/class_gofonMacroParameters.inc:400
-#: 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
+#: gofon/macro/class_gofonMacro.inc:492 gofon/macro/class_gofonMacro.inc:503
+#: gofon/macro/class_gofonMacro.inc:540
+#: gofon/phoneaccount/class_phoneAccount.inc:1582
+#: gofon/phoneaccount/class_phoneAccount.inc:1753
+#: gofon/conference/class_phoneConferenceGeneric.inc:764
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
 #: 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:1500
+#: gofon/conference/generic.tpl:114 gofon/conference/paste_generic.tpl:15
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #: 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
+#: 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:1837
 msgid "Phone"
 msgstr "Telefon"
 
@@ -602,154 +581,139 @@ 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/generic.tpl:27
+#: admin/systems/gofon/class_phoneGeneric.inc:501
+#: gofon/macro/class_gofonMacro.inc:586 gofon/macro/generic.tpl:27
 #: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:847
+#: gofon/conference/class_phoneConferenceGeneric.inc:822
 #: gofon/conference/conf-list.tpl:13
 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/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: admin/systems/gofon/phone.tpl:29
+#: admin/systems/gofon/class_phoneGeneric.inc:502
+#: gofon/macro/class_gofonMacro.inc:587 gofon/macro/generic.tpl:42
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:92
 #: gofon/conference/conf-list.xml:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:848
+#: gofon/conference/class_phoneConferenceGeneric.inc:823
 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
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 msgid "yes"
 msgstr "ja"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 msgid "no"
 msgstr "nein"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 msgid "dynamic"
 msgstr "dynamisch"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 msgid "Networksettings"
 msgstr "Netzwerk-Einstellungen"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: gofon/macro/class_gofonMacro.inc:471
 #, 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:310
+#: admin/systems/gofon/class_phoneGeneric.inc:313
 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/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
+#: admin/systems/gofon/class_phoneGeneric.inc:324
+#: admin/systems/gofon/class_phoneGeneric.inc:328
+#: admin/systems/gofon/class_phoneGeneric.inc:331
+#: admin/systems/gofon/class_phoneGeneric.inc:346
+#: admin/systems/gofon/class_phoneGeneric.inc:500
+#: gofon/macro/class_gofonMacro.inc:414 gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/macro-list.xml:41 gofon/macro/macro-filter.tpl:17
+#: gofon/macro/parameter.tpl:6 gofon/conference/conf-list.xml:41
+#: gofon/conference/class_phoneConferenceGeneric.inc:364
+#: gofon/conference/class_phoneConferenceGeneric.inc:386
+#: gofon/conference/class_phoneConferenceGeneric.inc:821
+#: gofon/conference/conf-filter.tpl:17
 msgid "Name"
 msgstr "Name"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:507
-#: gofon/macro/class_gofonMacro.inc:562
+#: admin/systems/gofon/class_phoneGeneric.inc:491
+#: gofon/macro/class_gofonMacro.inc:575
 msgid "Generic"
 msgstr "Allgemein"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:508
+#: admin/systems/gofon/class_phoneGeneric.inc:492
 msgid "Phone generic"
 msgstr "Telefon (Allgemein)"
 
-#: 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:497
+#: gofon/phoneaccount/class_phoneAccount.inc:1851
 msgid "Phone hardware"
 msgstr "Telefon-Hardware"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:519
+#: admin/systems/gofon/class_phoneGeneric.inc:503
 msgid "SIP Mode"
 msgstr "SIP Modus"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:520
+#: admin/systems/gofon/class_phoneGeneric.inc:504
 msgid "SIP DTMF mode"
 msgstr "SIP DTMF-Modus"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:521
+#: admin/systems/gofon/class_phoneGeneric.inc:505
 msgid "SIP Default ip"
 msgstr "SIP Standard IP-Adresse"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:522
+#: admin/systems/gofon/class_phoneGeneric.inc:506
 msgid "SIP Qualify"
 msgstr "SIP Qualifizieren"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:523
+#: admin/systems/gofon/class_phoneGeneric.inc:507
 msgid "IAX authentication type"
 msgstr "IAX Authentifikations-Typ"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:524
+#: admin/systems/gofon/class_phoneGeneric.inc:508
 msgid "IAX secret"
 msgstr "IAX Kennwort"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:525
+#: admin/systems/gofon/class_phoneGeneric.inc:509
 msgid "IAX account code"
 msgstr "IAX Konto-Identifikation"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:526
+#: admin/systems/gofon/class_phoneGeneric.inc:510
 msgid "IAX trunk lines"
 msgstr "IAX Leitungen zusammenfassen"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:527
+#: admin/systems/gofon/class_phoneGeneric.inc:511
 msgid "IAX permit settings"
 msgstr "IAX Zulassungs-Einstellungen"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:528
+#: admin/systems/gofon/class_phoneGeneric.inc:512
 msgid "IAX deny settings"
 msgstr "IAX Ablehnungs-Einstellungen"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:529
+#: admin/systems/gofon/class_phoneGeneric.inc:513
 msgid "CAPI MSN"
 msgstr "CAPI MSN"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:530
+#: admin/systems/gofon/class_phoneGeneric.inc:514
 msgid "Hardware type"
 msgstr "Hardware-Typ"
 
-#: 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/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:1625
+#: gofon/phoneaccount/class_phoneAccount.inc:2002
 #: gofon/conference/remove.tpl:2
-#: gofon/conference/class_phoneConferenceGeneric.inc:463
+#: gofon/conference/class_phoneConferenceGeneric.inc:439
 msgid "Warning"
 msgstr "Warnung"
 
@@ -801,8 +765,7 @@ msgid "Parameter %s is invalid!"
 msgstr "Der Parameter %s ist ungültig!"
 
 #: gofon/macro/class_gofonMacroParameters.inc:373
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 msgid "Information"
 msgstr "Information"
 
@@ -814,65 +777,85 @@ 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:218
+#, php-format
+msgid ""
+"Macro could not be removed from server '%s', please check database "
+"consistency!"
+msgstr ""
+"Makro kann nicht vom Server '%s' entfernt werden, bitte prüfen Sie die Datenbank! "
+
+#: gofon/macro/class_gofonMacro.inc:286
 #, 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:289
+msgid "Priority missing in line %s!"
+msgstr "Priorität fehlt in Zeile %s!"
+
+#: gofon/macro/class_gofonMacro.inc:293
 #, 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:303
+#, php-format
+msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
+msgstr "Doppelte Kombination von 'extension' und 'priority' in Zeile %s!"
+
+#: gofon/macro/class_gofonMacro.inc:336
+#, php-format
+msgid ""
+"Macro could not be added to server '%s', please check database consistency!"
+msgstr ""
+"Kann Makro nicht auf Server '%s' hinzufügen, bitte prüfen Sie die Datenbank!"
+
+#: gofon/macro/class_gofonMacro.inc:429
 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:438
 msgid "Macro is still in use!"
 msgstr "Das Makro wird noch verwendet!"
 
-#: gofon/macro/class_gofonMacro.inc:432
+#: gofon/macro/class_gofonMacro.inc:445
 msgid "Macro is empty!"
 msgstr "Das Makro ist leer!"
 
-#: 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/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:476
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/phoneaccount/class_phoneAccount.inc:1711
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:179
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
-#: gofon/macro/class_gofonMacro.inc:563
+#: gofon/macro/class_gofonMacro.inc:576
 msgid "Asterisk macro management"
 msgstr "Asterisk-Makro-Verwaltung"
 
-#: gofon/macro/class_gofonMacro.inc:568
+#: gofon/macro/class_gofonMacro.inc:581
 msgid "GOfon macro"
 msgstr "GOfon-Makro"
 
-#: gofon/macro/class_gofonMacro.inc:572 gofon/macro/generic.tpl:6
+#: gofon/macro/class_gofonMacro.inc:585 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:588 gofon/macro/generic.tpl:14
 msgid "Display name"
 msgstr "Angezeigter Name"
 
-#: gofon/macro/class_gofonMacro.inc:576
+#: gofon/macro/class_gofonMacro.inc:589
 msgid "Macro content and parameter"
 msgstr "Makro-Inhalt und Parameter"
 
-#: gofon/macro/class_gofonMacro.inc:577
+#: gofon/macro/class_gofonMacro.inc:590
 msgid "Visibility flag"
 msgstr "Sichtbarkeits-Flag"
 
@@ -880,11 +863,11 @@ msgstr "Sichtbarkeits-Flag"
 msgid "Macro name to be displayed"
 msgstr "Makro-Name der angezeigt wird"
 
-#: gofon/macro/generic.tpl:60
+#: 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"
 
@@ -970,16 +953,13 @@ msgid "Voicemail context"
 msgstr "Voicemail-Kontext"
 
 #: 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
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
+#: gofon/phoneaccount/class_phoneAccount.inc:1463
 msgid "Voicemail PIN"
 msgstr "Voicemail-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/class_phoneAccount.inc:1468
 msgid "Phone PIN"
 msgstr "Telefon-PIN"
 
@@ -991,23 +971,30 @@ msgstr "Aktualisieren"
 msgid "Phone settings"
 msgstr "Telefon-Einstellungen"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: 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
+#: gofon/fonreports/class_fonreport.inc:7
+msgid "This does something"
+msgstr "Dies tut etwas"
+
 #: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr "automatisch"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
 #: gofon/phoneaccount/class_phoneAccount.inc:214
 msgid "no macro"
 msgstr "kein Makro"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
 #: gofon/phoneaccount/class_phoneAccount.inc:242
 msgid "undefined"
 msgstr "nicht definiert"
 
-#: 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."
@@ -1015,72 +1002,54 @@ msgstr ""
 "Die Telefon-Erweiterung kann nicht in der Datenbank gefunden werden. "
 "Versuchen Sie noch einmal zu Speichern."
 
-#: 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
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 "Das Speichern der Einträge abbrechen, um die Datenbank konsistent zu halten."
 
-#: 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:1626
 #, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
 msgstr "GOsa hat Probleme mit der Datenbank-Definition festgestellt!"
 
-#: 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:1694
+#: gofon/conference/class_phoneConferenceGeneric.inc:595
 msgid "Please activate debugging for details!"
 msgstr "Bitte Aktivieren Sie das Debuggung für mehr Informationen!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1111
 msgid "Remove phone account"
 msgstr "Telefon-Konto entfernen"
 
-#: 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 "Telefon-Konto erstellen"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
 msgid "User uid"
 msgstr "Benutzer uid"
 
-#: 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 "Das gewählte Makro ist nirgendwo verfügbar!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
-#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1159
 msgid "Parameter"
 msgstr "Parameter"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
-#: gofon/phoneaccount/class_phoneAccount.inc:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Choose your private phone"
 msgstr "Wählen Sie Ihr privates Telefon"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
-#: gofon/phoneaccount/class_phoneAccount.inc:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1452
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
@@ -1088,39 +1057,32 @@ msgstr ""
 "Es muss mindestens ein Server mit einer Asterisk-Datenbank bestehen, um ein "
 "Telefon-Konto zu erstellen."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
 msgid "Between 1-4 charactes"
 msgstr "1-4 Zeichen"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1465
+#: gofon/phoneaccount/class_phoneAccount.inc:1508
 #, php-format
 msgid "macro parameter %s"
 msgstr "Makro-Parameter %s"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
 msgid "An error occured while updating the database entries!"
 msgstr ""
 "Es ist ein Fehler beim Aktualisieren der Datenbankeinträge aufgetreten!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "Benutzer '%s' aus Warteschlange '%s' entfernt."
 
-#: 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
+#: gofon/phoneaccount/class_phoneAccount.inc:1781
+#: gofon/phoneaccount/class_phoneAccount.inc:1783
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Die angegebene Telefonnummer '%s' wird bereits von '%s' verwendet."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1829
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1129,91 +1091,66 @@ msgstr ""
 "Der zuvor ausgewählte Asterisk Home-Server ('%s') ist nicht mehr verfügbar."
 "Entfernen wurde abgebrochen."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1795
+#: gofon/phoneaccount/class_phoneAccount.inc:1838
 msgid "Phone account settings"
 msgstr "Telefon-Konto-Einstellungen"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1799
+#: gofon/phoneaccount/class_phoneAccount.inc:1842
 msgid "My account"
 msgstr "Mein Konto"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1806
-#: gofon/conference/class_phoneConferenceGeneric.inc:864
+#: gofon/phoneaccount/class_phoneAccount.inc:1849
+#: gofon/conference/class_phoneConferenceGeneric.inc:839
 msgid "Telephone number"
 msgstr "Telefonnummer"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1807
+#: gofon/phoneaccount/class_phoneAccount.inc:1850
 msgid "Macro settings"
 msgstr "Makro-Einstellungen"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1810
+#: gofon/phoneaccount/class_phoneAccount.inc:1853
 msgid "Phone context"
 msgstr "Telefon-Kontext"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1811
+#: gofon/phoneaccount/class_phoneAccount.inc:1854
 msgid "Voice mail context"
 msgstr "Voicemail-Kontext"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1812
+#: gofon/phoneaccount/class_phoneAccount.inc:1855
 msgid "Telephone pin"
 msgstr "Telefon-PIN"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1813
+#: gofon/phoneaccount/class_phoneAccount.inc:1856
 msgid "Voicemail pin"
 msgstr "Voicemail-PIN"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1895
+#: gofon/phoneaccount/class_phoneAccount.inc:1938
 msgid "There is currently no asterisk server defined!"
 msgstr "Es ist momentan kein Asterisk-Server definiert!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1942
 msgid "Asterisk server is invalid!"
 msgstr "Der Asterisk-Server ist ungültig!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1905
+#: gofon/phoneaccount/class_phoneAccount.inc:1948
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr "Die Voicemail-PIN muss 4 Zeichen lang sein!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1908
+#: gofon/phoneaccount/class_phoneAccount.inc:1951
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "Die Voicemail-PIN enthält ungültige Zeichen!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1913
+#: gofon/phoneaccount/class_phoneAccount.inc:1956
 msgid "Phone pin contains invalid characters!"
 msgstr "Die Telefon-PIN enthält ungültige Zeichen!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1920
+#: gofon/phoneaccount/class_phoneAccount.inc:1963
 #, 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/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
-#: gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Dies tut etwas"
-
 #: gofon/conference/class_phoneConferenceManagment.inc:25
 msgid "conferences"
 msgstr "Konferenzen"
@@ -1242,55 +1179,55 @@ msgstr "Typ"
 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:76
 msgid "Select language"
 msgstr "Auswahl der Sprache"
 
-#: gofon/conference/generic.tpl:104
+#: gofon/conference/generic.tpl:98
 msgid "Descriptive text for department"
 msgstr "Beschreibender Text zu dieser Abteilung"
 
-#: gofon/conference/generic.tpl:110
+#: gofon/conference/generic.tpl:104
 msgid "Lifetime (in days)"
 msgstr "Lebenszeit (in Tagen)"
 
-#: gofon/conference/generic.tpl:157
-#: gofon/conference/class_phoneConferenceGeneric.inc:854
+#: gofon/conference/generic.tpl:151
+#: gofon/conference/class_phoneConferenceGeneric.inc:829
 msgid "Preset PIN"
 msgstr "PIN voreinstellen"
 
-#: gofon/conference/generic.tpl:165
-#: gofon/conference/class_phoneConferenceGeneric.inc:384
+#: gofon/conference/generic.tpl:159
+#: gofon/conference/class_phoneConferenceGeneric.inc:355
 msgid "PIN"
 msgstr "PIN"
 
-#: gofon/conference/generic.tpl:177
-#: gofon/conference/class_phoneConferenceGeneric.inc:855
+#: gofon/conference/generic.tpl:171
+#: gofon/conference/class_phoneConferenceGeneric.inc:830
 msgid "Record conference"
 msgstr "Konferenz aufnehmen"
 
-#: gofon/conference/generic.tpl:185
+#: gofon/conference/generic.tpl:179
 msgid "Sound file format"
 msgstr "Format der Audiodatei"
 
-#: gofon/conference/generic.tpl:188
+#: gofon/conference/generic.tpl:182
 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:856
+#: gofon/conference/generic.tpl:202
+#: gofon/conference/class_phoneConferenceGeneric.inc:831
 msgid "Play music on hold"
 msgstr "Wartemusik bei Halten"
 
-#: gofon/conference/generic.tpl:216
+#: gofon/conference/generic.tpl:210
 msgid "Activate session menu"
 msgstr "Sitzungsmenü aktivieren"
 
-#: gofon/conference/generic.tpl:224
+#: gofon/conference/generic.tpl:218
 msgid "Announce users joining or leaving the conference"
 msgstr "Benachrichtige über Abgang/Zugang von Teilnehmern"
 
-#: gofon/conference/generic.tpl:232
+#: gofon/conference/generic.tpl:226
 msgid "Count users"
 msgstr "Zähle Benutzer"
 
@@ -1299,30 +1236,30 @@ msgid "List of conference rooms"
 msgstr "Liste der Konferenz-Räume"
 
 #: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
-#: gofon/conference/class_phoneConferenceGeneric.inc:836
+#: gofon/conference/class_phoneConferenceGeneric.inc:811
 msgid "Conference"
 msgstr "Konferenz"
 
-#: 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 ""
 "Kann Eintrag nicht von Server '%s' entfernen, da er scheinbar bereits "
 "entfernt wurde!"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:379
+#: gofon/conference/class_phoneConferenceGeneric.inc:350
 #, 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:863
+#: gofon/conference/class_phoneConferenceGeneric.inc:372
+#: gofon/conference/class_phoneConferenceGeneric.inc:838
 msgid "Lifetime"
 msgstr "Lebenszeit"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#: gofon/conference/class_phoneConferenceGeneric.inc:440
 #, php-format
 msgid ""
 "GOsa identified problems with your MySQL table definition, please activate "
@@ -1331,45 +1268,45 @@ msgstr ""
 "GOsa hat Probleme mit der Datenbank-Definition festgestellt. Bitte "
 "aktivieren Sie das Debugging für mehr Informationen."
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:712
-#: gofon/conference/class_phoneConferenceGeneric.inc:714
+#: gofon/conference/class_phoneConferenceGeneric.inc:687
+#: gofon/conference/class_phoneConferenceGeneric.inc:689
 #, php-format
 msgid "'%s' is already assigned to '%s'!"
 msgstr "'%s' wird bereits von '%s' verwendet!"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:837
+#: gofon/conference/class_phoneConferenceGeneric.inc:812
 msgid "Phone conference management"
 msgstr "Telefonkonferenz-Verwaltung"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:842
+#: gofon/conference/class_phoneConferenceGeneric.inc:817
 msgid "GOfon conference"
 msgstr "GOfon-Konferenz"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:849
+#: gofon/conference/class_phoneConferenceGeneric.inc:824
 msgid "Conference PIN"
 msgstr "Konferenz-PIN"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:857
+#: gofon/conference/class_phoneConferenceGeneric.inc:832
 msgid "Activate menu"
 msgstr "Menü aktivieren"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:858
+#: gofon/conference/class_phoneConferenceGeneric.inc:833
 msgid "Announce user activity"
 msgstr "Melde Benutzer-Aktivität"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:859
+#: gofon/conference/class_phoneConferenceGeneric.inc:834
 msgid "Count user"
 msgstr "Zähle Benutzer"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:860
+#: gofon/conference/class_phoneConferenceGeneric.inc:835
 msgid "Conference type"
 msgstr "Konferenz-Typ"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:862
+#: gofon/conference/class_phoneConferenceGeneric.inc:837
 msgid "Format"
 msgstr "Format"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:865
+#: gofon/conference/class_phoneConferenceGeneric.inc:840
 msgid "Owner"
 msgstr "Besitzer"
 
@@ -1467,6 +1404,12 @@ msgstr "Status"
 msgid "Search returned no results..."
 msgstr "Die Suche verlief ergebnislos..."
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Wählen Sie den Teilbaum, in den die Gruppe eingepflegt werden soll"
+
+#~ msgid "Select a base"
+#~ msgstr "Wählen Sie eine Basis"
+
 #~ msgid "Update"
 #~ msgstr "Aktualisieren"