From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 5 Oct 2009 13:54:40 +0000 (+0000)
Subject: Updated locales
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b402d76610215e405fb4bb808efc082de3b2716c;p=gosa.git

Updated locales


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14524 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc b/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc
index bf60b3668..a250fa1dd 100644
--- a/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc
+++ b/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc
@@ -339,7 +339,7 @@ class phoneAccount extends plugin
         $vp  = mysql_fetch_assoc($res);
         if(!isset($vp['context'])){
           $this->is_modified= TRUE;
-          msg_dialog::display(_("Warning"), sprintf(_("Could not identify telephone extension in database, please try to save again. Activate debugging if error remains.")), WARNING_DIALOG);
+          msg_dialog::display(_("Warning"), sprintf(_("Cannot identify telephone extension in database, please try to save again.")), WARNING_DIALOG);
         } 
  
         @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,$query_tmp, "Database query");
@@ -609,7 +609,7 @@ class phoneAccount extends plugin
          */
         if(!phoneAccount::checkRealtimeTables($a_Remove)){
           msg_dialog::display(_("Warning"),
-              sprintf(_("GOsa identified problems with your MySQL table definition, please activate debugging for details.")),
+              sprintf(_("GOsa identified problems with your MySQL table definition!")),
               WARNING_DIALOG);
         }
 
@@ -675,7 +675,7 @@ class phoneAccount extends plugin
        */
       if(!phoneAccount::checkRealtimeTables($a_New)){
         msg_dialog::display(_("Warning"),
-            sprintf(_("GOsa identified problems with your MySQL table definition, please activate debugging for details.")),
+            sprintf(_("GOsa identified problems with your MySQL table definition!")),
             WARNING_DIALOG);
       }
 
@@ -1489,7 +1489,7 @@ class phoneAccount extends plugin
      */
     $str = $this->generate_mysql_entension_entries(true);
     if(!$str){
-      msg_dialog::display(_("Error"),_("An error occured while updating the database entries, activate debugging for details.") , ERROR_DIALOG);
+      msg_dialog::display(_("Error"),_("An error occured while updating the database entries!") , ERROR_DIALOG);
     }
 
     if($this->attrs['goFonMacro']==""){
@@ -1559,7 +1559,7 @@ class phoneAccount extends plugin
        */
       if(!phoneAccount::checkRealtimeTables($a_SETUP)){
         msg_dialog::display(_("Warning"),
-            sprintf(_("GOsa identified problems with your MySQL table definition, please activate debugging for details.")),
+            sprintf(_("GOsa identified problems with your MySQL table definition!")),
             WARNING_DIALOG);
       }
 
diff --git a/gosa-plugins/gofon/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/de/LC_MESSAGES/messages.po
index 257afa5e4..4c9dae73c 100644
--- a/gosa-plugins/gofon/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2009-10-05 16:06+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"
@@ -58,8 +58,10 @@ msgstr "Optionen"
 #: admin/ogroups/gofon/class_phonequeue.inc:305
 #: admin/ogroups/gofon/class_phonequeue.inc:929
 #: gofon/phoneaccount/generic.tpl:58
-#: gofon/phoneaccount/class_phoneAccount.inc:1407
-#: gofon/phoneaccount/class_phoneAccount.inc:1782
+#: 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:1788
 #: gofon/conference/generic.tpl:68
 #: gofon/conference/class_phoneConferenceGeneric.inc:853
 msgid "Home server"
@@ -191,13 +193,15 @@ 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/phoneaccount/.svn/tmp/tempfile.tmp:140
+#: gofon/phoneaccount/class_phoneAccount.inc:140
 #: gofon/conference/class_phoneConferenceGeneric.inc:103
 msgid "Obsolete entry"
 msgstr "Veralteter Eintrag"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:135
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
+#: gofon/phoneaccount/class_phoneAccount.inc:140
 #: gofon/conference/class_phoneConferenceGeneric.inc:103
 #, php-format
 msgid ""
@@ -270,8 +274,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/class_phoneAccount.inc:426
-#: gofon/phoneaccount/class_phoneAccount.inc:1103
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
+#: gofon/phoneaccount/class_phoneAccount.inc:431
+#: gofon/phoneaccount/class_phoneAccount.inc:1109
 #: gofon/conference/class_phoneConferenceGeneric.inc:430
 #: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:176
@@ -303,16 +309,26 @@ msgstr "Telefonnummer"
 #: 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:644
-#: gofon/phoneaccount/class_phoneAccount.inc:966
-#: gofon/phoneaccount/class_phoneAccount.inc:1089
-#: gofon/phoneaccount/class_phoneAccount.inc:1205
+#: 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:1425
-#: gofon/phoneaccount/class_phoneAccount.inc:1486
-#: gofon/phoneaccount/class_phoneAccount.inc:1565
-#: gofon/phoneaccount/class_phoneAccount.inc:1575
-#: gofon/phoneaccount/class_phoneAccount.inc:1622
+#: gofon/phoneaccount/class_phoneAccount.inc:1217
+#: gofon/phoneaccount/class_phoneAccount.inc:1431
+#: gofon/phoneaccount/class_phoneAccount.inc:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1571
+#: gofon/phoneaccount/class_phoneAccount.inc:1581
+#: gofon/phoneaccount/class_phoneAccount.inc:1628
 #: gofon/conference/class_phoneConferenceGeneric.inc:260
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #: gofon/conference/class_phoneConferenceGeneric.inc:618
@@ -332,8 +348,10 @@ msgstr "Fehler"
 #: 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:1512
-#: gofon/phoneaccount/class_phoneAccount.inc:1683
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
+#: gofon/phoneaccount/class_phoneAccount.inc:1518
+#: gofon/phoneaccount/class_phoneAccount.inc:1689
 #: gofon/conference/class_phoneConferenceGeneric.inc:789
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
@@ -344,13 +362,19 @@ 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:1042
-#: gofon/phoneaccount/class_phoneAccount.inc:1055
-#: gofon/phoneaccount/class_phoneAccount.inc:1067
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1074
-#: gofon/phoneaccount/class_phoneAccount.inc:1767
+#: 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:1773
 msgid "Phone"
 msgstr "Telefon"
 
@@ -660,7 +684,8 @@ msgid "Phone generic"
 msgstr "Telefon (Allgemein)"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/class_phoneAccount.inc:1781
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
+#: gofon/phoneaccount/class_phoneAccount.inc:1787
 msgid "Phone hardware"
 msgstr "Telefon-Hardware"
 
@@ -718,7 +743,8 @@ msgid "List of macros"
 msgstr "Liste der Makros"
 
 #: gofon/macro/headpage.tpl:20 gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/class_phoneAccount.inc:1674
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1680
 #: gofon/conference/headpage.tpl:20
 msgid "Information"
 msgstr "Information"
@@ -749,11 +775,18 @@ msgstr "Zeige Makros, auf die zutrifft"
 msgid "Regular expression for matching macro names"
 msgstr "Regulärer Ausdruck zum Erkennen von Makro-Namen"
 
-#: gofon/macro/remove.tpl:2 gofon/phoneaccount/class_phoneAccount.inc:323
-#: gofon/phoneaccount/class_phoneAccount.inc:337
-#: gofon/phoneaccount/class_phoneAccount.inc:606
-#: gofon/phoneaccount/class_phoneAccount.inc:672
-#: gofon/phoneaccount/class_phoneAccount.inc:1555
+#: 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:1561
+#: gofon/phoneaccount/class_phoneAccount.inc:1938
 #: gofon/conference/remove.tpl:2
 #: gofon/conference/class_phoneConferenceGeneric.inc:463
 msgid "Warning"
@@ -838,10 +871,14 @@ msgid "Macro is empty!"
 msgstr "Das Makro ist leer!"
 
 #: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/class_phoneAccount.inc:426
-#: gofon/phoneaccount/class_phoneAccount.inc:434
-#: gofon/phoneaccount/class_phoneAccount.inc:1103
-#: gofon/phoneaccount/class_phoneAccount.inc:1641
+#: 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:1647
 #: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:169
 msgid "Configuration error"
@@ -1045,13 +1082,16 @@ msgid "Voicemail context"
 msgstr "Voicemail-Kontext"
 
 #: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/class_phoneAccount.inc:1411
-#: gofon/phoneaccount/class_phoneAccount.inc:1414
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1420
+#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1420
 msgid "Voicemail PIN"
 msgstr "Voicemail-PIN"
 
 #: gofon/phoneaccount/generic.tpl:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/class_phoneAccount.inc:1419
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1425
+#: gofon/phoneaccount/class_phoneAccount.inc:1425
 msgid "Phone PIN"
 msgstr "Telefon-PIN"
 
@@ -1063,82 +1103,96 @@ msgstr "Aktualisieren"
 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:173
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr "automatisch"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:209
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
+#: gofon/phoneaccount/class_phoneAccount.inc:214
 msgid "no macro"
 msgstr "kein Makro"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:237
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
+#: gofon/phoneaccount/class_phoneAccount.inc:242
 msgid "undefined"
 msgstr "nicht definiert"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:337
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
+#: gofon/phoneaccount/class_phoneAccount.inc:342
 #, php-format
 msgid ""
-"Could not identify telephone extension in database, please try to save "
-"again. Activate debugging if error remains."
+"Cannot identify telephone extension in database, please try to save again."
 msgstr ""
-
-#: gofon/phoneaccount/class_phoneAccount.inc:552
-#: gofon/phoneaccount/class_phoneAccount.inc:559
-#: gofon/phoneaccount/class_phoneAccount.inc:577
-#: gofon/phoneaccount/class_phoneAccount.inc:584
+"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
 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:607
-#: gofon/phoneaccount/class_phoneAccount.inc:673
-#: gofon/phoneaccount/class_phoneAccount.inc:1556
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#: 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:1562
 #, php-format
-msgid ""
-"GOsa identified problems with your MySQL table definition, please activate "
-"debugging for details."
-msgstr ""
-
-#: gofon/phoneaccount/class_phoneAccount.inc:646
-#: gofon/phoneaccount/class_phoneAccount.inc:968
-#: gofon/phoneaccount/class_phoneAccount.inc:1624
+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:1630
 #: gofon/conference/class_phoneConferenceGeneric.inc:620
 msgid "Please activate debugging for details!"
-msgstr ""
+msgstr "Bitte Aktivieren Sie das Debuggung für mehr Informationen!"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1066
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1071
 msgid "Remove phone account"
 msgstr "Telefon-Konto entfernen"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1070
-#: gofon/phoneaccount/class_phoneAccount.inc:1073
+#: 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
 msgid "Create phone account"
 msgstr "Telefon-Konto erstellen"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1076
 msgid "User uid"
 msgstr "Benutzer uid"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1089
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
+#: gofon/phoneaccount/class_phoneAccount.inc:1094
 msgid "Selected macro is not available anymore!"
 msgstr "Das gewählte Makro ist nirgendwo verfügbar!"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1113
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1119
 msgid "Parameter"
 msgstr "Parameter"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1260
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1266
 msgid "Choose your private phone"
 msgstr "Wählen Sie Ihr privates Telefon"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1403
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1409
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
@@ -1146,33 +1200,39 @@ msgstr ""
 "Es muss mindestens ein Server mit einer Asterisk-Datenbank bestehen, um ein "
 "Telefon-Konto zu erstellen."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1411
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1417
 msgid "Between 1-4 charactes"
 msgstr "1-4 Zeichen"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1438
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
+#: gofon/phoneaccount/class_phoneAccount.inc:1444
 #, php-format
 msgid "macro parameter %s"
 msgstr "Makro-Parameter %s"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1486
-msgid ""
-"An error occured while updating the database entries, activate debugging for "
-"details."
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1492
+msgid "An error occured while updating the database entries!"
 msgstr ""
+"Es ist ein Fehler beim Aktualisieren der Datenbankeinträge aufgetreten!"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1674
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1680
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "Benutzer '%s' aus Warteschlange '%s' entfernt."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1711
-#: gofon/phoneaccount/class_phoneAccount.inc:1713
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
+#: gofon/phoneaccount/class_phoneAccount.inc:1717
+#: gofon/phoneaccount/class_phoneAccount.inc:1719
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Die angegebene Telefonnummer '%s' wird bereits von '%s' verwendet."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1759
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
+#: gofon/phoneaccount/class_phoneAccount.inc:1765
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1181,66 +1241,86 @@ msgstr ""
 "Der zuvor ausgewählte Asterisk Home-Server ('%s') ist nicht mehr verfügbar."
 "Entfernen wurde abgebrochen."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1768
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
+#: gofon/phoneaccount/class_phoneAccount.inc:1774
 msgid "Phone account settings"
 msgstr "Telefon-Konto-Einstellungen"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1772
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
+#: gofon/phoneaccount/class_phoneAccount.inc:1778
 msgid "My account"
 msgstr "Mein Konto"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1779
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
+#: gofon/phoneaccount/class_phoneAccount.inc:1785
 #: gofon/conference/class_phoneConferenceGeneric.inc:864
 msgid "Telephone number"
 msgstr "Telefonnummer"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1780
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1786
 msgid "Macro settings"
 msgstr "Makro-Einstellungen"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1783
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
+#: gofon/phoneaccount/class_phoneAccount.inc:1789
 msgid "Phone context"
 msgstr "Telefon-Kontext"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1784
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
+#: gofon/phoneaccount/class_phoneAccount.inc:1790
 msgid "Voice mail context"
 msgstr "Voicemail-Kontext"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1785
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
+#: gofon/phoneaccount/class_phoneAccount.inc:1791
 msgid "Telephone pin"
 msgstr "Telefon-PIN"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1792
 msgid "Voicemail pin"
 msgstr "Voicemail-PIN"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1868
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
+#: gofon/phoneaccount/class_phoneAccount.inc:1874
 msgid "There is currently no asterisk server defined!"
 msgstr "Es ist momentan kein Asterisk-Server definiert!"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1872
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
+#: gofon/phoneaccount/class_phoneAccount.inc:1878
 msgid "Asterisk server is invalid!"
 msgstr "Der Asterisk-Server ist ungültig!"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1878
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
+#: gofon/phoneaccount/class_phoneAccount.inc:1884
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr "Die Voicemail-PIN muss 4 Zeichen lang sein!"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1881
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
+#: gofon/phoneaccount/class_phoneAccount.inc:1887
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "Die Voicemail-PIN enthält ungültige Zeichen!"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1886
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
+#: gofon/phoneaccount/class_phoneAccount.inc:1892
 msgid "Phone pin contains invalid characters!"
 msgstr "Die Telefon-PIN enthält ungültige Zeichen!"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1893
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1899
 #, 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/conference/headpage.tpl:6
 #: gofon/conference/class_divListConferences.inc:31
 #: gofon/conference/class_divListConferences.inc:32
@@ -1395,6 +1475,15 @@ msgstr ""
 msgid "Lifetime"
 msgstr "Lebenszeit"
 
+#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#, 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:712
 #: gofon/conference/class_phoneConferenceGeneric.inc:714
 #, php-format
@@ -1563,33 +1652,3 @@ msgstr "Status"
 #: gofon/fonreports/contents.tpl:51
 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"
diff --git a/gosa-plugins/gofon/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/es/LC_MESSAGES/messages.po
index b7247b309..2b8df9922 100644
--- a/gosa-plugins/gofon/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2009-10-05 16:06+0200\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
@@ -56,8 +56,10 @@ msgstr "Opciones"
 #: admin/ogroups/gofon/class_phonequeue.inc:305
 #: admin/ogroups/gofon/class_phonequeue.inc:929
 #: gofon/phoneaccount/generic.tpl:58
-#: gofon/phoneaccount/class_phoneAccount.inc:1407
-#: gofon/phoneaccount/class_phoneAccount.inc:1782
+#: 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:1788
 #: gofon/conference/generic.tpl:68
 #: gofon/conference/class_phoneConferenceGeneric.inc:853
 #, fuzzy
@@ -197,14 +199,16 @@ msgid "Ring instead of playing background music"
 msgstr ""
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:135
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
+#: gofon/phoneaccount/class_phoneAccount.inc:140
 #: gofon/conference/class_phoneConferenceGeneric.inc:103
 #, fuzzy
 msgid "Obsolete entry"
 msgstr "Eliminar esta entrada"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:135
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
+#: gofon/phoneaccount/class_phoneAccount.inc:140
 #: gofon/conference/class_phoneConferenceGeneric.inc:103
 #, php-format
 msgid ""
@@ -279,8 +283,10 @@ msgstr "Usuarios"
 #: 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:426
-#: gofon/phoneaccount/class_phoneAccount.inc:1103
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
+#: gofon/phoneaccount/class_phoneAccount.inc:431
+#: gofon/phoneaccount/class_phoneAccount.inc:1109
 #: gofon/conference/class_phoneConferenceGeneric.inc:430
 #: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:176
@@ -313,16 +319,26 @@ msgstr "Teléfono"
 #: 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:644
-#: gofon/phoneaccount/class_phoneAccount.inc:966
-#: gofon/phoneaccount/class_phoneAccount.inc:1089
-#: gofon/phoneaccount/class_phoneAccount.inc:1205
+#: 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:1425
-#: gofon/phoneaccount/class_phoneAccount.inc:1486
-#: gofon/phoneaccount/class_phoneAccount.inc:1565
-#: gofon/phoneaccount/class_phoneAccount.inc:1575
-#: gofon/phoneaccount/class_phoneAccount.inc:1622
+#: gofon/phoneaccount/class_phoneAccount.inc:1217
+#: gofon/phoneaccount/class_phoneAccount.inc:1431
+#: gofon/phoneaccount/class_phoneAccount.inc:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1571
+#: gofon/phoneaccount/class_phoneAccount.inc:1581
+#: gofon/phoneaccount/class_phoneAccount.inc:1628
 #: gofon/conference/class_phoneConferenceGeneric.inc:260
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #: gofon/conference/class_phoneConferenceGeneric.inc:618
@@ -342,8 +358,10 @@ msgstr "Error"
 #: 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:1512
-#: gofon/phoneaccount/class_phoneAccount.inc:1683
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
+#: gofon/phoneaccount/class_phoneAccount.inc:1518
+#: gofon/phoneaccount/class_phoneAccount.inc:1689
 #: gofon/conference/class_phoneConferenceGeneric.inc:789
 #, fuzzy
 msgid "LDAP error"
@@ -356,13 +374,19 @@ msgid "Phone number"
 msgstr "Número de teléfono personal"
 
 #: 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:1042
-#: gofon/phoneaccount/class_phoneAccount.inc:1055
-#: gofon/phoneaccount/class_phoneAccount.inc:1067
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1074
-#: gofon/phoneaccount/class_phoneAccount.inc:1767
+#: 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:1773
 msgid "Phone"
 msgstr "Teléfono"
 
@@ -692,7 +716,8 @@ msgid "Phone generic"
 msgstr "Teléfono genérico"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/class_phoneAccount.inc:1781
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
+#: gofon/phoneaccount/class_phoneAccount.inc:1787
 msgid "Phone hardware"
 msgstr "Teléfono hardware"
 
@@ -751,7 +776,8 @@ msgid "List of macros"
 msgstr "Lista de acls"
 
 #: gofon/macro/headpage.tpl:20 gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/class_phoneAccount.inc:1674
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1680
 #: gofon/conference/headpage.tpl:20
 msgid "Information"
 msgstr "Información"
@@ -786,11 +812,18 @@ msgstr "Mostrar las acl que coincidan con"
 msgid "Regular expression for matching macro names"
 msgstr "Expresión regular para buscar nombres de grupos"
 
-#: gofon/macro/remove.tpl:2 gofon/phoneaccount/class_phoneAccount.inc:323
-#: gofon/phoneaccount/class_phoneAccount.inc:337
-#: gofon/phoneaccount/class_phoneAccount.inc:606
-#: gofon/phoneaccount/class_phoneAccount.inc:672
-#: gofon/phoneaccount/class_phoneAccount.inc:1555
+#: 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:1561
+#: gofon/phoneaccount/class_phoneAccount.inc:1938
 #: gofon/conference/remove.tpl:2
 #: gofon/conference/class_phoneConferenceGeneric.inc:463
 msgid "Warning"
@@ -876,10 +909,14 @@ msgid "Macro is empty!"
 msgstr "¡El certificado esta vacío!"
 
 #: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/class_phoneAccount.inc:426
-#: gofon/phoneaccount/class_phoneAccount.inc:434
-#: gofon/phoneaccount/class_phoneAccount.inc:1103
-#: gofon/phoneaccount/class_phoneAccount.inc:1641
+#: 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:1647
 #: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:169
 #, fuzzy
@@ -1105,13 +1142,16 @@ msgid "Voicemail context"
 msgstr ""
 
 #: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/class_phoneAccount.inc:1411
-#: gofon/phoneaccount/class_phoneAccount.inc:1414
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1420
+#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1420
 msgid "Voicemail PIN"
 msgstr ""
 
 #: gofon/phoneaccount/generic.tpl:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/class_phoneAccount.inc:1419
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1425
+#: gofon/phoneaccount/class_phoneAccount.inc:1425
 #, fuzzy
 msgid "Phone PIN"
 msgstr "Teléfono"
@@ -1125,187 +1165,224 @@ msgstr "Refresco"
 msgid "Phone settings"
 msgstr "Caracteristicas Posix"
 
-#: gofon/phoneaccount/main.inc:123
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr ""
-"Pulse en el botón - Editar - para cambiar la información en esta ventana"
-
-#: gofon/phoneaccount/class_phoneAccount.inc:173
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr "automático"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:209
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
+#: gofon/phoneaccount/class_phoneAccount.inc:214
 msgid "no macro"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:237
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
+#: gofon/phoneaccount/class_phoneAccount.inc:242
 msgid "undefined"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:337
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
+#: gofon/phoneaccount/class_phoneAccount.inc:342
 #, php-format
 msgid ""
-"Could not identify telephone extension in database, please try to save "
-"again. Activate debugging if error remains."
+"Cannot identify telephone extension in database, please try to save again."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:552
-#: gofon/phoneaccount/class_phoneAccount.inc:559
-#: gofon/phoneaccount/class_phoneAccount.inc:577
-#: gofon/phoneaccount/class_phoneAccount.inc:584
+#: 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
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:607
-#: gofon/phoneaccount/class_phoneAccount.inc:673
-#: gofon/phoneaccount/class_phoneAccount.inc:1556
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#: 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:1562
 #, php-format
-msgid ""
-"GOsa identified problems with your MySQL table definition, please activate "
-"debugging for details."
+msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:646
-#: gofon/phoneaccount/class_phoneAccount.inc:968
-#: gofon/phoneaccount/class_phoneAccount.inc:1624
+#: 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:1630
 #: gofon/conference/class_phoneConferenceGeneric.inc:620
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1066
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1071
 #, fuzzy
 msgid "Remove phone account"
 msgstr "Eliminar cuenta Posix"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1070
-#: gofon/phoneaccount/class_phoneAccount.inc:1073
+#: 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
 #, fuzzy
 msgid "Create phone account"
 msgstr "Crear cuenta posix"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1076
 #, fuzzy
 msgid "User uid"
 msgstr "Identificador (ID) de usuario"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1089
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
+#: gofon/phoneaccount/class_phoneAccount.inc:1094
 msgid "Selected macro is not available anymore!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1113
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1119
 msgid "Parameter"
 msgstr "Parámetro"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1260
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1266
 #, fuzzy
 msgid "Choose your private phone"
 msgstr "Teléfono privado"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1403
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1409
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1411
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1417
 msgid "Between 1-4 charactes"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1438
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
+#: gofon/phoneaccount/class_phoneAccount.inc:1444
 #, php-format
 msgid "macro parameter %s"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1486
-msgid ""
-"An error occured while updating the database entries, activate debugging for "
-"details."
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1492
+msgid "An error occured while updating the database entries!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1674
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1680
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1711
-#: gofon/phoneaccount/class_phoneAccount.inc:1713
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
+#: gofon/phoneaccount/class_phoneAccount.inc:1717
+#: gofon/phoneaccount/class_phoneAccount.inc:1719
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1759
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
+#: gofon/phoneaccount/class_phoneAccount.inc:1765
 #, fuzzy, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
 "Remove aborted."
 msgstr "El método de contraseña seleccionado no está disponible."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1768
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
+#: gofon/phoneaccount/class_phoneAccount.inc:1774
 #, fuzzy
 msgid "Phone account settings"
 msgstr "Parámetros genéricos del grupo"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1772
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
+#: gofon/phoneaccount/class_phoneAccount.inc:1778
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1779
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
+#: gofon/phoneaccount/class_phoneAccount.inc:1785
 #: gofon/conference/class_phoneConferenceGeneric.inc:864
 #, fuzzy
 msgid "Telephone number"
 msgstr "Número de teléfono"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1780
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1786
 #, fuzzy
 msgid "Macro settings"
 msgstr "Parámetros de correo"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1783
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
+#: gofon/phoneaccount/class_phoneAccount.inc:1789
 #, fuzzy
 msgid "Phone context"
 msgstr "Teléfono genérico"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1784
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
+#: gofon/phoneaccount/class_phoneAccount.inc:1790
 msgid "Voice mail context"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1785
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
+#: gofon/phoneaccount/class_phoneAccount.inc:1791
 #, fuzzy
 msgid "Telephone pin"
 msgstr "Teléfono"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1792
 msgid "Voicemail pin"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1868
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
+#: gofon/phoneaccount/class_phoneAccount.inc:1874
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1872
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
+#: gofon/phoneaccount/class_phoneAccount.inc:1878
 msgid "Asterisk server is invalid!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1878
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
+#: gofon/phoneaccount/class_phoneAccount.inc:1884
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1881
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
+#: gofon/phoneaccount/class_phoneAccount.inc:1887
 #, fuzzy
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "El atributo contraseña está vacío o tiene caracteres no validos"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1886
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
+#: gofon/phoneaccount/class_phoneAccount.inc:1892
 #, fuzzy
 msgid "Phone pin contains invalid characters!"
 msgstr "El atributo contraseña está vacío o tiene caracteres no validos"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1893
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1899
 #, fuzzy, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr "El campo '%s' tiene caracteres no validos."
 
+#: gofon/phoneaccount/main.inc:123
+msgid "Click the 'Edit' button below to change informations in this dialog"
+msgstr ""
+"Pulse en el botón - Editar - para cambiar la información en esta ventana"
+
 #: gofon/conference/headpage.tpl:6
 #: gofon/conference/class_divListConferences.inc:31
 #: gofon/conference/class_divListConferences.inc:32
@@ -1470,6 +1547,13 @@ msgstr "El método de contraseña seleccionado no está disponible."
 msgid "Lifetime"
 msgstr ""
 
+#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#, php-format
+msgid ""
+"GOsa identified problems with your MySQL table definition, please activate "
+"debugging for details."
+msgstr ""
+
 #: gofon/conference/class_phoneConferenceGeneric.inc:712
 #: gofon/conference/class_phoneConferenceGeneric.inc:714
 #, fuzzy, php-format
diff --git a/gosa-plugins/gofon/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/fr/LC_MESSAGES/messages.po
index 201a80f12..475605fb1 100644
--- a/gosa-plugins/gofon/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2009-10-05 16:06+0200\n"
 "PO-Revision-Date: 2009-06-30 11:04+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -52,8 +52,10 @@ msgstr "Options"
 #: admin/ogroups/gofon/class_phonequeue.inc:305
 #: admin/ogroups/gofon/class_phonequeue.inc:929
 #: gofon/phoneaccount/generic.tpl:58
-#: gofon/phoneaccount/class_phoneAccount.inc:1407
-#: gofon/phoneaccount/class_phoneAccount.inc:1782
+#: 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:1788
 #: gofon/conference/generic.tpl:68
 #: gofon/conference/class_phoneConferenceGeneric.inc:853
 msgid "Home server"
@@ -185,13 +187,15 @@ msgid "Ring instead of playing background music"
 msgstr "Sonner au lieu de mettre une musique d'ambiance"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:135
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
+#: gofon/phoneaccount/class_phoneAccount.inc:140
 #: gofon/conference/class_phoneConferenceGeneric.inc:103
 msgid "Obsolete entry"
 msgstr "Entrée obsolète"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:135
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
+#: gofon/phoneaccount/class_phoneAccount.inc:140
 #: gofon/conference/class_phoneConferenceGeneric.inc:103
 #, php-format
 msgid ""
@@ -264,8 +268,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/class_phoneAccount.inc:426
-#: gofon/phoneaccount/class_phoneAccount.inc:1103
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
+#: gofon/phoneaccount/class_phoneAccount.inc:431
+#: gofon/phoneaccount/class_phoneAccount.inc:1109
 #: gofon/conference/class_phoneConferenceGeneric.inc:430
 #: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:176
@@ -297,16 +303,26 @@ msgstr "numéro de téléphone"
 #: 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:644
-#: gofon/phoneaccount/class_phoneAccount.inc:966
-#: gofon/phoneaccount/class_phoneAccount.inc:1089
-#: gofon/phoneaccount/class_phoneAccount.inc:1205
+#: 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:1425
-#: gofon/phoneaccount/class_phoneAccount.inc:1486
-#: gofon/phoneaccount/class_phoneAccount.inc:1565
-#: gofon/phoneaccount/class_phoneAccount.inc:1575
-#: gofon/phoneaccount/class_phoneAccount.inc:1622
+#: gofon/phoneaccount/class_phoneAccount.inc:1217
+#: gofon/phoneaccount/class_phoneAccount.inc:1431
+#: gofon/phoneaccount/class_phoneAccount.inc:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1571
+#: gofon/phoneaccount/class_phoneAccount.inc:1581
+#: gofon/phoneaccount/class_phoneAccount.inc:1628
 #: gofon/conference/class_phoneConferenceGeneric.inc:260
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #: gofon/conference/class_phoneConferenceGeneric.inc:618
@@ -326,8 +342,10 @@ msgstr "Erreur"
 #: 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:1512
-#: gofon/phoneaccount/class_phoneAccount.inc:1683
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
+#: gofon/phoneaccount/class_phoneAccount.inc:1518
+#: gofon/phoneaccount/class_phoneAccount.inc:1689
 #: gofon/conference/class_phoneConferenceGeneric.inc:789
 msgid "LDAP error"
 msgstr "Erreur LDAP"
@@ -338,13 +356,19 @@ msgid "Phone number"
 msgstr "Numéro de téléphone"
 
 #: 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:1042
-#: gofon/phoneaccount/class_phoneAccount.inc:1055
-#: gofon/phoneaccount/class_phoneAccount.inc:1067
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1074
-#: gofon/phoneaccount/class_phoneAccount.inc:1767
+#: 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:1773
 msgid "Phone"
 msgstr "Téléphone"
 
@@ -655,7 +679,8 @@ msgid "Phone generic"
 msgstr "Téléphone générique"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/class_phoneAccount.inc:1781
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
+#: gofon/phoneaccount/class_phoneAccount.inc:1787
 msgid "Phone hardware"
 msgstr "Matériel téléphonique"
 
@@ -713,7 +738,8 @@ msgid "List of macros"
 msgstr "Liste des macros"
 
 #: gofon/macro/headpage.tpl:20 gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/class_phoneAccount.inc:1674
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1680
 #: gofon/conference/headpage.tpl:20
 msgid "Information"
 msgstr "Information"
@@ -744,11 +770,18 @@ msgstr "Afficher les macros correspondantes"
 msgid "Regular expression for matching macro names"
 msgstr "Expression régulière correspondant à des noms de macro"
 
-#: gofon/macro/remove.tpl:2 gofon/phoneaccount/class_phoneAccount.inc:323
-#: gofon/phoneaccount/class_phoneAccount.inc:337
-#: gofon/phoneaccount/class_phoneAccount.inc:606
-#: gofon/phoneaccount/class_phoneAccount.inc:672
-#: gofon/phoneaccount/class_phoneAccount.inc:1555
+#: 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:1561
+#: gofon/phoneaccount/class_phoneAccount.inc:1938
 #: gofon/conference/remove.tpl:2
 #: gofon/conference/class_phoneConferenceGeneric.inc:463
 msgid "Warning"
@@ -833,10 +866,14 @@ msgid "Macro is empty!"
 msgstr "La macro est vide !"
 
 #: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/class_phoneAccount.inc:426
-#: gofon/phoneaccount/class_phoneAccount.inc:434
-#: gofon/phoneaccount/class_phoneAccount.inc:1103
-#: gofon/phoneaccount/class_phoneAccount.inc:1641
+#: 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:1647
 #: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:169
 msgid "Configuration error"
@@ -1039,13 +1076,16 @@ msgid "Voicemail context"
 msgstr "Contexte de la boite vocale"
 
 #: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/class_phoneAccount.inc:1411
-#: gofon/phoneaccount/class_phoneAccount.inc:1414
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1420
+#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1420
 msgid "Voicemail PIN"
 msgstr "Code PIN de la boite vocale"
 
 #: gofon/phoneaccount/generic.tpl:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/class_phoneAccount.inc:1419
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1425
+#: gofon/phoneaccount/class_phoneAccount.inc:1425
 msgid "Phone PIN"
 msgstr "Code PIN du téléphone"
 
@@ -1057,88 +1097,100 @@ msgstr "Rafraîchir"
 msgid "Phone settings"
 msgstr "Configuration du téléphone"
 
-#: gofon/phoneaccount/main.inc:123
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr ""
-"Cliquez sur le bouton 'Editer' ci-dessous pour changer les informations dans "
-"cette boite de dialogue"
-
-#: gofon/phoneaccount/class_phoneAccount.inc:173
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr "automatique"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:209
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
+#: gofon/phoneaccount/class_phoneAccount.inc:214
 msgid "no macro"
 msgstr "pas de macros"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:237
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
+#: gofon/phoneaccount/class_phoneAccount.inc:242
 msgid "undefined"
 msgstr "non défini"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:337
-#, php-format
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
+#: gofon/phoneaccount/class_phoneAccount.inc:342
+#, fuzzy, php-format
 msgid ""
-"Could not identify telephone extension in database, please try to save "
-"again. Activate debugging if error remains."
+"Cannot identify telephone extension in database, please try to save again."
 msgstr ""
 "Impossible d'identifier l'extension téléphonique dans la base de données, "
 "veuillez essayer de sauver à nouveau. Activez le mode debug si l'erreur "
 "persiste"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:552
-#: gofon/phoneaccount/class_phoneAccount.inc:559
-#: gofon/phoneaccount/class_phoneAccount.inc:577
-#: gofon/phoneaccount/class_phoneAccount.inc:584
+#: 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
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 "Abandon de la sauvegarde des données pour garder la base de données "
 "consistante."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:607
-#: gofon/phoneaccount/class_phoneAccount.inc:673
-#: gofon/phoneaccount/class_phoneAccount.inc:1556
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
-#, php-format
-msgid ""
-"GOsa identified problems with your MySQL table definition, please activate "
-"debugging for details."
+#: 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:1562
+#, fuzzy, php-format
+msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
 "GOsa à identifié des problèmes dans les définitions de vos tables MySQL, "
 "veuillez activer le mode debug pour plus de détail."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:646
-#: gofon/phoneaccount/class_phoneAccount.inc:968
-#: gofon/phoneaccount/class_phoneAccount.inc:1624
+#: 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:1630
 #: gofon/conference/class_phoneConferenceGeneric.inc:620
 msgid "Please activate debugging for details!"
 msgstr "Veuillez activer le mode debug pour plus de détail !"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1066
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1071
 msgid "Remove phone account"
 msgstr "Supprimer l'extension téléphonique"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1070
-#: gofon/phoneaccount/class_phoneAccount.inc:1073
+#: 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
 msgid "Create phone account"
 msgstr "Créer un compte téléphone"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1076
 msgid "User uid"
 msgstr "id utilisateur"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1089
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
+#: gofon/phoneaccount/class_phoneAccount.inc:1094
 msgid "Selected macro is not available anymore!"
 msgstr "la macro sélectionnée n'est plus disponible !"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1113
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1119
 msgid "Parameter"
 msgstr "Paramètres"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1260
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1266
 msgid "Choose your private phone"
 msgstr "Choisissez votre téléphone privé"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1403
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1409
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
@@ -1146,35 +1198,41 @@ msgstr ""
 "Il doit y avoir au moins un serveur avec une base de données asterisk pour "
 "créer un compte téléphonique."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1411
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1417
 msgid "Between 1-4 charactes"
 msgstr "Entre 1-4 caractères."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1438
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
+#: gofon/phoneaccount/class_phoneAccount.inc:1444
 #, php-format
 msgid "macro parameter %s"
 msgstr "paramètre de la macro %s"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1486
-msgid ""
-"An error occured while updating the database entries, activate debugging for "
-"details."
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1492
+#, fuzzy
+msgid "An error occured while updating the database entries!"
 msgstr ""
 "Une erreur est survenue lors de la mise à jour de la base de données, "
 "activer le mode debug pour plus de détails."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1674
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1680
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "L'utilisateur '%s' à été enlevé de la queue '%s'."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1711
-#: gofon/phoneaccount/class_phoneAccount.inc:1713
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
+#: gofon/phoneaccount/class_phoneAccount.inc:1717
+#: gofon/phoneaccount/class_phoneAccount.inc:1719
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Le numéro de téléphone %s est déjà utilisé par '%s'."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1759
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
+#: gofon/phoneaccount/class_phoneAccount.inc:1765
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1183,66 +1241,86 @@ msgstr ""
 "Le serveur asterisk primaire précédemment sélectionné n'existe plus (%s). "
 "Effacement interrompu."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1768
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
+#: gofon/phoneaccount/class_phoneAccount.inc:1774
 msgid "Phone account settings"
 msgstr "Paramètres compte téléphonique"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1772
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
+#: gofon/phoneaccount/class_phoneAccount.inc:1778
 msgid "My account"
 msgstr "Mon Compte"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1779
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
+#: gofon/phoneaccount/class_phoneAccount.inc:1785
 #: gofon/conference/class_phoneConferenceGeneric.inc:864
 msgid "Telephone number"
 msgstr "Numéro de téléphone"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1780
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1786
 msgid "Macro settings"
 msgstr "Paramètres des macros"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1783
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
+#: gofon/phoneaccount/class_phoneAccount.inc:1789
 msgid "Phone context"
 msgstr "Contexte téléphonique"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1784
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
+#: gofon/phoneaccount/class_phoneAccount.inc:1790
 msgid "Voice mail context"
 msgstr "Contexte de la boite vocale"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1785
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
+#: gofon/phoneaccount/class_phoneAccount.inc:1791
 msgid "Telephone pin"
 msgstr "Code PIN du téléphone"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1792
 msgid "Voicemail pin"
 msgstr "Code PIN de la boite vocale"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1868
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
+#: gofon/phoneaccount/class_phoneAccount.inc:1874
 msgid "There is currently no asterisk server defined!"
 msgstr "Il n'y a pas de serveur asterisk défini !"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1872
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
+#: gofon/phoneaccount/class_phoneAccount.inc:1878
 msgid "Asterisk server is invalid!"
 msgstr "Le serveur Asterisk est non valide !"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1878
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
+#: gofon/phoneaccount/class_phoneAccount.inc:1884
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr "Le code pin de la boîte vocale doit être long de 4 caractères."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1881
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
+#: gofon/phoneaccount/class_phoneAccount.inc:1887
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "Le code pin de la boîte vocale contient des caractères non valides !"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1886
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
+#: gofon/phoneaccount/class_phoneAccount.inc:1892
 msgid "Phone pin contains invalid characters!"
 msgstr "Le mot de passe contient des caractères invalides."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1893
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1899
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 "Le paramètre %s contient des caractères invalides. '!#' est utilisé comme "
 "séparateur"
 
+#: gofon/phoneaccount/main.inc:123
+msgid "Click the 'Edit' button below to change informations in this dialog"
+msgstr ""
+"Cliquez sur le bouton 'Editer' ci-dessous pour changer les informations dans "
+"cette boite de dialogue"
+
 #: gofon/conference/headpage.tpl:6
 #: gofon/conference/class_divListConferences.inc:31
 #: gofon/conference/class_divListConferences.inc:32
@@ -1400,6 +1478,15 @@ msgstr ""
 msgid "Lifetime"
 msgstr "Durée"
 
+#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#, php-format
+msgid ""
+"GOsa identified problems with your MySQL table definition, please activate "
+"debugging for details."
+msgstr ""
+"GOsa à identifié des problèmes dans les définitions de vos tables MySQL, "
+"veuillez activer le mode debug pour plus de détail."
+
 #: gofon/conference/class_phoneConferenceGeneric.inc:712
 #: gofon/conference/class_phoneConferenceGeneric.inc:714
 #, php-format
diff --git a/gosa-plugins/gofon/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/it/LC_MESSAGES/messages.po
index aa59cad25..1f94de51f 100644
--- a/gosa-plugins/gofon/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2009-10-05 16:06+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -54,8 +54,10 @@ msgstr "Opzioni"
 #: admin/ogroups/gofon/class_phonequeue.inc:305
 #: admin/ogroups/gofon/class_phonequeue.inc:929
 #: gofon/phoneaccount/generic.tpl:58
-#: gofon/phoneaccount/class_phoneAccount.inc:1407
-#: gofon/phoneaccount/class_phoneAccount.inc:1782
+#: 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:1788
 #: gofon/conference/generic.tpl:68
 #: gofon/conference/class_phoneConferenceGeneric.inc:853
 #, fuzzy
@@ -196,14 +198,16 @@ msgid "Ring instead of playing background music"
 msgstr ""
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:135
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
+#: gofon/phoneaccount/class_phoneAccount.inc:140
 #: gofon/conference/class_phoneConferenceGeneric.inc:103
 #, fuzzy
 msgid "Obsolete entry"
 msgstr "Elimina questo record"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:135
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
+#: gofon/phoneaccount/class_phoneAccount.inc:140
 #: gofon/conference/class_phoneConferenceGeneric.inc:103
 #, php-format
 msgid ""
@@ -280,8 +284,10 @@ msgstr "Data"
 #: 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:426
-#: gofon/phoneaccount/class_phoneAccount.inc:1103
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
+#: gofon/phoneaccount/class_phoneAccount.inc:431
+#: gofon/phoneaccount/class_phoneAccount.inc:1109
 #: gofon/conference/class_phoneConferenceGeneric.inc:430
 #: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:176
@@ -315,16 +321,26 @@ msgstr "Numero di telefono"
 #: 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:644
-#: gofon/phoneaccount/class_phoneAccount.inc:966
-#: gofon/phoneaccount/class_phoneAccount.inc:1089
-#: gofon/phoneaccount/class_phoneAccount.inc:1205
+#: 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:1425
-#: gofon/phoneaccount/class_phoneAccount.inc:1486
-#: gofon/phoneaccount/class_phoneAccount.inc:1565
-#: gofon/phoneaccount/class_phoneAccount.inc:1575
-#: gofon/phoneaccount/class_phoneAccount.inc:1622
+#: gofon/phoneaccount/class_phoneAccount.inc:1217
+#: gofon/phoneaccount/class_phoneAccount.inc:1431
+#: gofon/phoneaccount/class_phoneAccount.inc:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1571
+#: gofon/phoneaccount/class_phoneAccount.inc:1581
+#: gofon/phoneaccount/class_phoneAccount.inc:1628
 #: gofon/conference/class_phoneConferenceGeneric.inc:260
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #: gofon/conference/class_phoneConferenceGeneric.inc:618
@@ -344,8 +360,10 @@ msgstr ""
 #: 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:1512
-#: gofon/phoneaccount/class_phoneAccount.inc:1683
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
+#: gofon/phoneaccount/class_phoneAccount.inc:1518
+#: gofon/phoneaccount/class_phoneAccount.inc:1689
 #: gofon/conference/class_phoneConferenceGeneric.inc:789
 #, fuzzy
 msgid "LDAP error"
@@ -357,13 +375,19 @@ msgid "Phone number"
 msgstr "Numero di telefono"
 
 #: 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:1042
-#: gofon/phoneaccount/class_phoneAccount.inc:1055
-#: gofon/phoneaccount/class_phoneAccount.inc:1067
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1074
-#: gofon/phoneaccount/class_phoneAccount.inc:1767
+#: 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:1773
 msgid "Phone"
 msgstr "Telefono"
 
@@ -708,7 +732,8 @@ msgid "Phone generic"
 msgstr "Numero di telefono"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/class_phoneAccount.inc:1781
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
+#: gofon/phoneaccount/class_phoneAccount.inc:1787
 #, fuzzy
 msgid "Phone hardware"
 msgstr "Dispositivo telefonico"
@@ -774,7 +799,8 @@ msgid "List of macros"
 msgstr "Lista dei gruppi"
 
 #: gofon/macro/headpage.tpl:20 gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/class_phoneAccount.inc:1674
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1680
 #: gofon/conference/headpage.tpl:20
 msgid "Information"
 msgstr "Informazioni"
@@ -809,11 +835,18 @@ msgstr "Mosra gruppi corrispondenti a"
 msgid "Regular expression for matching macro names"
 msgstr "Espressioni regolare per selezionare il nome del gruppo"
 
-#: gofon/macro/remove.tpl:2 gofon/phoneaccount/class_phoneAccount.inc:323
-#: gofon/phoneaccount/class_phoneAccount.inc:337
-#: gofon/phoneaccount/class_phoneAccount.inc:606
-#: gofon/phoneaccount/class_phoneAccount.inc:672
-#: gofon/phoneaccount/class_phoneAccount.inc:1555
+#: 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:1561
+#: gofon/phoneaccount/class_phoneAccount.inc:1938
 #: gofon/conference/remove.tpl:2
 #: gofon/conference/class_phoneConferenceGeneric.inc:463
 msgid "Warning"
@@ -896,10 +929,14 @@ msgid "Macro is empty!"
 msgstr "Nome gruppo"
 
 #: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/class_phoneAccount.inc:426
-#: gofon/phoneaccount/class_phoneAccount.inc:434
-#: gofon/phoneaccount/class_phoneAccount.inc:1103
-#: gofon/phoneaccount/class_phoneAccount.inc:1641
+#: 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:1647
 #: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:169
 #, fuzzy
@@ -1129,13 +1166,16 @@ msgid "Voicemail context"
 msgstr ""
 
 #: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/class_phoneAccount.inc:1411
-#: gofon/phoneaccount/class_phoneAccount.inc:1414
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1420
+#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1420
 msgid "Voicemail PIN"
 msgstr ""
 
 #: gofon/phoneaccount/generic.tpl:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/class_phoneAccount.inc:1419
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1425
+#: gofon/phoneaccount/class_phoneAccount.inc:1425
 #, fuzzy
 msgid "Phone PIN"
 msgstr "Telefono"
@@ -1150,187 +1190,224 @@ msgstr "Riferimenti"
 msgid "Phone settings"
 msgstr "Impostazioni Unix"
 
-#: gofon/phoneaccount/main.inc:123
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr ""
-"Click sul bottone 'Modifica' qui sotto per cambiare le informazioni in "
-"questo dialogo"
-
-#: gofon/phoneaccount/class_phoneAccount.inc:173
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr "automatico"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:209
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
+#: gofon/phoneaccount/class_phoneAccount.inc:214
 #, fuzzy
 msgid "no macro"
 msgstr "Rapporti telefono"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:237
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
+#: gofon/phoneaccount/class_phoneAccount.inc:242
 #, fuzzy
 msgid "undefined"
 msgstr "non definito"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:337
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
+#: gofon/phoneaccount/class_phoneAccount.inc:342
 #, php-format
 msgid ""
-"Could not identify telephone extension in database, please try to save "
-"again. Activate debugging if error remains."
+"Cannot identify telephone extension in database, please try to save again."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:552
-#: gofon/phoneaccount/class_phoneAccount.inc:559
-#: gofon/phoneaccount/class_phoneAccount.inc:577
-#: gofon/phoneaccount/class_phoneAccount.inc:584
+#: 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
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:607
-#: gofon/phoneaccount/class_phoneAccount.inc:673
-#: gofon/phoneaccount/class_phoneAccount.inc:1556
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#: 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:1562
 #, php-format
-msgid ""
-"GOsa identified problems with your MySQL table definition, please activate "
-"debugging for details."
+msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:646
-#: gofon/phoneaccount/class_phoneAccount.inc:968
-#: gofon/phoneaccount/class_phoneAccount.inc:1624
+#: 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:1630
 #: gofon/conference/class_phoneConferenceGeneric.inc:620
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1066
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1071
 msgid "Remove phone account"
 msgstr "Elimina estensioni telefoniche"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1070
-#: gofon/phoneaccount/class_phoneAccount.inc:1073
+#: 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
 msgid "Create phone account"
 msgstr "Crea estensioni telefoniche"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1076
 #, fuzzy
 msgid "User uid"
 msgstr "elimina"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1089
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
+#: gofon/phoneaccount/class_phoneAccount.inc:1094
 msgid "Selected macro is not available anymore!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1113
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1119
 msgid "Parameter"
 msgstr "Parametro"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1260
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1266
 msgid "Choose your private phone"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1403
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1409
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1411
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1417
 msgid "Between 1-4 charactes"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1438
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
+#: gofon/phoneaccount/class_phoneAccount.inc:1444
 #, fuzzy, php-format
 msgid "macro parameter %s"
 msgstr "Nome gruppo"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1486
-msgid ""
-"An error occured while updating the database entries, activate debugging for "
-"details."
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1492
+msgid "An error occured while updating the database entries!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1674
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1680
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1711
-#: gofon/phoneaccount/class_phoneAccount.inc:1713
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
+#: gofon/phoneaccount/class_phoneAccount.inc:1717
+#: gofon/phoneaccount/class_phoneAccount.inc:1719
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1759
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
+#: gofon/phoneaccount/class_phoneAccount.inc:1765
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
 "Remove aborted."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1768
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
+#: gofon/phoneaccount/class_phoneAccount.inc:1774
 #, fuzzy
 msgid "Phone account settings"
 msgstr "Opzioni di posta dell'identità"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1772
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
+#: gofon/phoneaccount/class_phoneAccount.inc:1778
 msgid "My account"
 msgstr "Identità"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1779
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
+#: gofon/phoneaccount/class_phoneAccount.inc:1785
 #: gofon/conference/class_phoneConferenceGeneric.inc:864
 #, fuzzy
 msgid "Telephone number"
 msgstr "Numero di telefono"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1780
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1786
 #, fuzzy
 msgid "Macro settings"
 msgstr "Opzioni di posta dell'identità"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1783
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
+#: gofon/phoneaccount/class_phoneAccount.inc:1789
 #, fuzzy
 msgid "Phone context"
 msgstr "Telefono"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1784
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
+#: gofon/phoneaccount/class_phoneAccount.inc:1790
 msgid "Voice mail context"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1785
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
+#: gofon/phoneaccount/class_phoneAccount.inc:1791
 #, fuzzy
 msgid "Telephone pin"
 msgstr "Telefono"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1792
 msgid "Voicemail pin"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1868
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
+#: gofon/phoneaccount/class_phoneAccount.inc:1874
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1872
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
+#: gofon/phoneaccount/class_phoneAccount.inc:1878
 msgid "Asterisk server is invalid!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1878
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
+#: gofon/phoneaccount/class_phoneAccount.inc:1884
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1881
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
+#: gofon/phoneaccount/class_phoneAccount.inc:1887
 #, fuzzy
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1886
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
+#: gofon/phoneaccount/class_phoneAccount.inc:1892
 #, fuzzy
 msgid "Phone pin contains invalid characters!"
 msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1893
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1899
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 
+#: gofon/phoneaccount/main.inc:123
+msgid "Click the 'Edit' button below to change informations in this dialog"
+msgstr ""
+"Click sul bottone 'Modifica' qui sotto per cambiare le informazioni in "
+"questo dialogo"
+
 #: gofon/conference/headpage.tpl:6
 #: gofon/conference/class_divListConferences.inc:31
 #: gofon/conference/class_divListConferences.inc:32
@@ -1489,6 +1566,13 @@ msgstr ""
 msgid "Lifetime"
 msgstr ""
 
+#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#, php-format
+msgid ""
+"GOsa identified problems with your MySQL table definition, please activate "
+"debugging for details."
+msgstr ""
+
 #: gofon/conference/class_phoneConferenceGeneric.inc:712
 #: gofon/conference/class_phoneConferenceGeneric.inc:714
 #, php-format
diff --git a/gosa-plugins/gofon/locale/messages.po b/gosa-plugins/gofon/locale/messages.po
index eff39ba12..74fb1e7ce 100644
--- a/gosa-plugins/gofon/locale/messages.po
+++ b/gosa-plugins/gofon/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2009-10-05 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -52,8 +52,10 @@ msgstr ""
 #: admin/ogroups/gofon/class_phonequeue.inc:305
 #: admin/ogroups/gofon/class_phonequeue.inc:929
 #: gofon/phoneaccount/generic.tpl:58
-#: gofon/phoneaccount/class_phoneAccount.inc:1407
-#: gofon/phoneaccount/class_phoneAccount.inc:1782
+#: 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:1788
 #: gofon/conference/generic.tpl:68
 #: gofon/conference/class_phoneConferenceGeneric.inc:853
 msgid "Home server"
@@ -185,13 +187,15 @@ msgid "Ring instead of playing background music"
 msgstr ""
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:135
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
+#: gofon/phoneaccount/class_phoneAccount.inc:140
 #: gofon/conference/class_phoneConferenceGeneric.inc:103
 msgid "Obsolete entry"
 msgstr ""
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:135
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
+#: gofon/phoneaccount/class_phoneAccount.inc:140
 #: gofon/conference/class_phoneConferenceGeneric.inc:103
 #, php-format
 msgid ""
@@ -260,8 +264,10 @@ msgstr ""
 #: admin/ogroups/gofon/class_phonequeue.inc:378
 #: admin/ogroups/gofon/class_phonequeue.inc:732
 #: gofon/macro/class_gofonMacro.inc:392 gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/class_phoneAccount.inc:426
-#: gofon/phoneaccount/class_phoneAccount.inc:1103
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
+#: gofon/phoneaccount/class_phoneAccount.inc:431
+#: gofon/phoneaccount/class_phoneAccount.inc:1109
 #: gofon/conference/class_phoneConferenceGeneric.inc:430
 #: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:176
@@ -291,16 +297,26 @@ msgstr ""
 #: 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:644
-#: gofon/phoneaccount/class_phoneAccount.inc:966
-#: gofon/phoneaccount/class_phoneAccount.inc:1089
-#: gofon/phoneaccount/class_phoneAccount.inc:1205
+#: 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:1425
-#: gofon/phoneaccount/class_phoneAccount.inc:1486
-#: gofon/phoneaccount/class_phoneAccount.inc:1565
-#: gofon/phoneaccount/class_phoneAccount.inc:1575
-#: gofon/phoneaccount/class_phoneAccount.inc:1622
+#: gofon/phoneaccount/class_phoneAccount.inc:1217
+#: gofon/phoneaccount/class_phoneAccount.inc:1431
+#: gofon/phoneaccount/class_phoneAccount.inc:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1571
+#: gofon/phoneaccount/class_phoneAccount.inc:1581
+#: gofon/phoneaccount/class_phoneAccount.inc:1628
 #: gofon/conference/class_phoneConferenceGeneric.inc:260
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #: gofon/conference/class_phoneConferenceGeneric.inc:618
@@ -320,8 +336,10 @@ msgstr ""
 #: 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:1512
-#: gofon/phoneaccount/class_phoneAccount.inc:1683
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
+#: gofon/phoneaccount/class_phoneAccount.inc:1518
+#: gofon/phoneaccount/class_phoneAccount.inc:1689
 #: gofon/conference/class_phoneConferenceGeneric.inc:789
 msgid "LDAP error"
 msgstr ""
@@ -332,13 +350,19 @@ msgid "Phone number"
 msgstr ""
 
 #: admin/ogroups/gofon/class_phonequeue.inc:918
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1047
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1060
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1072
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1079
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1773
 #: gofon/phoneaccount/class_phoneAccount.inc:6
-#: gofon/phoneaccount/class_phoneAccount.inc:1042
-#: gofon/phoneaccount/class_phoneAccount.inc:1055
-#: gofon/phoneaccount/class_phoneAccount.inc:1067
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1074
-#: gofon/phoneaccount/class_phoneAccount.inc:1767
+#: 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:1773
 msgid "Phone"
 msgstr ""
 
@@ -646,7 +670,8 @@ msgid "Phone generic"
 msgstr ""
 
 #: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/class_phoneAccount.inc:1781
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
+#: gofon/phoneaccount/class_phoneAccount.inc:1787
 msgid "Phone hardware"
 msgstr ""
 
@@ -704,7 +729,8 @@ msgid "List of macros"
 msgstr ""
 
 #: gofon/macro/headpage.tpl:20 gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/class_phoneAccount.inc:1674
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1680
 #: gofon/conference/headpage.tpl:20
 msgid "Information"
 msgstr ""
@@ -732,11 +758,18 @@ msgstr ""
 msgid "Regular expression for matching macro names"
 msgstr ""
 
-#: gofon/macro/remove.tpl:2 gofon/phoneaccount/class_phoneAccount.inc:323
-#: gofon/phoneaccount/class_phoneAccount.inc:337
-#: gofon/phoneaccount/class_phoneAccount.inc:606
-#: gofon/phoneaccount/class_phoneAccount.inc:672
-#: gofon/phoneaccount/class_phoneAccount.inc:1555
+#: 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:1561
+#: gofon/phoneaccount/class_phoneAccount.inc:1938
 #: gofon/conference/remove.tpl:2
 #: gofon/conference/class_phoneConferenceGeneric.inc:463
 msgid "Warning"
@@ -812,10 +845,14 @@ msgid "Macro is empty!"
 msgstr ""
 
 #: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/class_phoneAccount.inc:426
-#: gofon/phoneaccount/class_phoneAccount.inc:434
-#: gofon/phoneaccount/class_phoneAccount.inc:1103
-#: gofon/phoneaccount/class_phoneAccount.inc:1641
+#: 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:1647
 #: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:169
 msgid "Configuration error"
@@ -1018,13 +1055,16 @@ msgid "Voicemail context"
 msgstr ""
 
 #: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/class_phoneAccount.inc:1411
-#: gofon/phoneaccount/class_phoneAccount.inc:1414
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1420
+#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1420
 msgid "Voicemail PIN"
 msgstr ""
 
 #: gofon/phoneaccount/generic.tpl:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/class_phoneAccount.inc:1419
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1425
+#: gofon/phoneaccount/class_phoneAccount.inc:1425
 msgid "Phone PIN"
 msgstr ""
 
@@ -1036,175 +1076,212 @@ msgstr ""
 msgid "Phone settings"
 msgstr ""
 
-#: gofon/phoneaccount/main.inc:123
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr ""
-
-#: gofon/phoneaccount/class_phoneAccount.inc:173
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:209
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
+#: gofon/phoneaccount/class_phoneAccount.inc:214
 msgid "no macro"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:237
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
+#: gofon/phoneaccount/class_phoneAccount.inc:242
 msgid "undefined"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:337
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
+#: gofon/phoneaccount/class_phoneAccount.inc:342
 #, php-format
 msgid ""
-"Could not identify telephone extension in database, please try to save "
-"again. Activate debugging if error remains."
+"Cannot identify telephone extension in database, please try to save again."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:552
-#: gofon/phoneaccount/class_phoneAccount.inc:559
-#: gofon/phoneaccount/class_phoneAccount.inc:577
-#: gofon/phoneaccount/class_phoneAccount.inc:584
+#: 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
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:607
-#: gofon/phoneaccount/class_phoneAccount.inc:673
-#: gofon/phoneaccount/class_phoneAccount.inc:1556
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#: 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:1562
 #, php-format
-msgid ""
-"GOsa identified problems with your MySQL table definition, please activate "
-"debugging for details."
+msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:646
-#: gofon/phoneaccount/class_phoneAccount.inc:968
-#: gofon/phoneaccount/class_phoneAccount.inc:1624
+#: 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:1630
 #: gofon/conference/class_phoneConferenceGeneric.inc:620
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1066
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1071
 msgid "Remove phone account"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1070
-#: gofon/phoneaccount/class_phoneAccount.inc:1073
+#: 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
 msgid "Create phone account"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1076
 msgid "User uid"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1089
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
+#: gofon/phoneaccount/class_phoneAccount.inc:1094
 msgid "Selected macro is not available anymore!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1113
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1119
 msgid "Parameter"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1260
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1266
 msgid "Choose your private phone"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1403
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1409
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1411
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1417
 msgid "Between 1-4 charactes"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1438
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
+#: gofon/phoneaccount/class_phoneAccount.inc:1444
 #, php-format
 msgid "macro parameter %s"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1486
-msgid ""
-"An error occured while updating the database entries, activate debugging for "
-"details."
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1492
+msgid "An error occured while updating the database entries!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1674
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1680
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1711
-#: gofon/phoneaccount/class_phoneAccount.inc:1713
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
+#: gofon/phoneaccount/class_phoneAccount.inc:1717
+#: gofon/phoneaccount/class_phoneAccount.inc:1719
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1759
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
+#: gofon/phoneaccount/class_phoneAccount.inc:1765
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
 "Remove aborted."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1768
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
+#: gofon/phoneaccount/class_phoneAccount.inc:1774
 msgid "Phone account settings"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1772
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
+#: gofon/phoneaccount/class_phoneAccount.inc:1778
 msgid "My account"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1779
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
+#: gofon/phoneaccount/class_phoneAccount.inc:1785
 #: gofon/conference/class_phoneConferenceGeneric.inc:864
 msgid "Telephone number"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1780
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1786
 msgid "Macro settings"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1783
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
+#: gofon/phoneaccount/class_phoneAccount.inc:1789
 msgid "Phone context"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1784
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
+#: gofon/phoneaccount/class_phoneAccount.inc:1790
 msgid "Voice mail context"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1785
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
+#: gofon/phoneaccount/class_phoneAccount.inc:1791
 msgid "Telephone pin"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1792
 msgid "Voicemail pin"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1868
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
+#: gofon/phoneaccount/class_phoneAccount.inc:1874
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1872
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
+#: gofon/phoneaccount/class_phoneAccount.inc:1878
 msgid "Asterisk server is invalid!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1878
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
+#: gofon/phoneaccount/class_phoneAccount.inc:1884
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1881
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
+#: gofon/phoneaccount/class_phoneAccount.inc:1887
 msgid "Voicemail PIN contains invalid characters!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1886
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
+#: gofon/phoneaccount/class_phoneAccount.inc:1892
 msgid "Phone pin contains invalid characters!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1893
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1899
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 
+#: gofon/phoneaccount/main.inc:123
+msgid "Click the 'Edit' button below to change informations in this dialog"
+msgstr ""
+
 #: gofon/conference/headpage.tpl:6
 #: gofon/conference/class_divListConferences.inc:31
 #: gofon/conference/class_divListConferences.inc:32
@@ -1347,6 +1424,13 @@ msgstr ""
 msgid "Lifetime"
 msgstr ""
 
+#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#, php-format
+msgid ""
+"GOsa identified problems with your MySQL table definition, please activate "
+"debugging for details."
+msgstr ""
+
 #: gofon/conference/class_phoneConferenceGeneric.inc:712
 #: gofon/conference/class_phoneConferenceGeneric.inc:714
 #, php-format
diff --git a/gosa-plugins/gofon/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/nl/LC_MESSAGES/messages.po
index 2d405d81b..66d93856d 100644
--- a/gosa-plugins/gofon/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2009-10-05 16:06+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -55,8 +55,10 @@ msgstr "Opties"
 #: admin/ogroups/gofon/class_phonequeue.inc:305
 #: admin/ogroups/gofon/class_phonequeue.inc:929
 #: gofon/phoneaccount/generic.tpl:58
-#: gofon/phoneaccount/class_phoneAccount.inc:1407
-#: gofon/phoneaccount/class_phoneAccount.inc:1782
+#: 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:1788
 #: gofon/conference/generic.tpl:68
 #: gofon/conference/class_phoneConferenceGeneric.inc:853
 #, fuzzy
@@ -189,14 +191,16 @@ msgid "Ring instead of playing background music"
 msgstr "Rinkel i.p.v. achtergrond muziek afspelen"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:135
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
+#: gofon/phoneaccount/class_phoneAccount.inc:140
 #: gofon/conference/class_phoneConferenceGeneric.inc:103
 #, fuzzy
 msgid "Obsolete entry"
 msgstr "Verwijder deze invoer"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:135
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
+#: gofon/phoneaccount/class_phoneAccount.inc:140
 #: gofon/conference/class_phoneConferenceGeneric.inc:103
 #, php-format
 msgid ""
@@ -270,8 +274,10 @@ msgstr "Plakken"
 #: 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:426
-#: gofon/phoneaccount/class_phoneAccount.inc:1103
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
+#: gofon/phoneaccount/class_phoneAccount.inc:431
+#: gofon/phoneaccount/class_phoneAccount.inc:1109
 #: gofon/conference/class_phoneConferenceGeneric.inc:430
 #: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:176
@@ -305,16 +311,26 @@ msgstr "Telefoonnummer"
 #: 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:644
-#: gofon/phoneaccount/class_phoneAccount.inc:966
-#: gofon/phoneaccount/class_phoneAccount.inc:1089
-#: gofon/phoneaccount/class_phoneAccount.inc:1205
+#: 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:1425
-#: gofon/phoneaccount/class_phoneAccount.inc:1486
-#: gofon/phoneaccount/class_phoneAccount.inc:1565
-#: gofon/phoneaccount/class_phoneAccount.inc:1575
-#: gofon/phoneaccount/class_phoneAccount.inc:1622
+#: gofon/phoneaccount/class_phoneAccount.inc:1217
+#: gofon/phoneaccount/class_phoneAccount.inc:1431
+#: gofon/phoneaccount/class_phoneAccount.inc:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1571
+#: gofon/phoneaccount/class_phoneAccount.inc:1581
+#: gofon/phoneaccount/class_phoneAccount.inc:1628
 #: gofon/conference/class_phoneConferenceGeneric.inc:260
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #: gofon/conference/class_phoneConferenceGeneric.inc:618
@@ -334,8 +350,10 @@ msgstr "Fout"
 #: 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:1512
-#: gofon/phoneaccount/class_phoneAccount.inc:1683
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
+#: gofon/phoneaccount/class_phoneAccount.inc:1518
+#: gofon/phoneaccount/class_phoneAccount.inc:1689
 #: gofon/conference/class_phoneConferenceGeneric.inc:789
 #, fuzzy
 msgid "LDAP error"
@@ -347,13 +365,19 @@ msgid "Phone number"
 msgstr "Telefoonnummer"
 
 #: 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:1042
-#: gofon/phoneaccount/class_phoneAccount.inc:1055
-#: gofon/phoneaccount/class_phoneAccount.inc:1067
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1074
-#: gofon/phoneaccount/class_phoneAccount.inc:1767
+#: 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:1773
 msgid "Phone"
 msgstr "Telefoon"
 
@@ -688,7 +712,8 @@ msgid "Phone generic"
 msgstr "Telefoonnummer"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/class_phoneAccount.inc:1781
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
+#: gofon/phoneaccount/class_phoneAccount.inc:1787
 #, fuzzy
 msgid "Phone hardware"
 msgstr "Telefoon hardware"
@@ -756,7 +781,8 @@ msgid "List of macros"
 msgstr "Lijst met macro's"
 
 #: gofon/macro/headpage.tpl:20 gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/class_phoneAccount.inc:1674
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1680
 #: gofon/conference/headpage.tpl:20
 msgid "Information"
 msgstr "Informatie"
@@ -787,11 +813,18 @@ msgstr "Toon overeenkomende macro's"
 msgid "Regular expression for matching macro names"
 msgstr "Reguliere expressie voor overeenkomende macronamen"
 
-#: gofon/macro/remove.tpl:2 gofon/phoneaccount/class_phoneAccount.inc:323
-#: gofon/phoneaccount/class_phoneAccount.inc:337
-#: gofon/phoneaccount/class_phoneAccount.inc:606
-#: gofon/phoneaccount/class_phoneAccount.inc:672
-#: gofon/phoneaccount/class_phoneAccount.inc:1555
+#: 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:1561
+#: gofon/phoneaccount/class_phoneAccount.inc:1938
 #: gofon/conference/remove.tpl:2
 #: gofon/conference/class_phoneConferenceGeneric.inc:463
 msgid "Warning"
@@ -876,10 +909,14 @@ msgid "Macro is empty!"
 msgstr "Macro tekst"
 
 #: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/class_phoneAccount.inc:426
-#: gofon/phoneaccount/class_phoneAccount.inc:434
-#: gofon/phoneaccount/class_phoneAccount.inc:1103
-#: gofon/phoneaccount/class_phoneAccount.inc:1641
+#: 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:1647
 #: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:169
 #, fuzzy
@@ -1099,13 +1136,16 @@ msgid "Voicemail context"
 msgstr "Voicemail PIN-code"
 
 #: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/class_phoneAccount.inc:1411
-#: gofon/phoneaccount/class_phoneAccount.inc:1414
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1420
+#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1420
 msgid "Voicemail PIN"
 msgstr "Voicemail PIN-code"
 
 #: gofon/phoneaccount/generic.tpl:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/class_phoneAccount.inc:1419
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1425
+#: gofon/phoneaccount/class_phoneAccount.inc:1425
 msgid "Phone PIN"
 msgstr "Telefoon PIN-code"
 
@@ -1117,82 +1157,94 @@ msgstr "Ververs"
 msgid "Phone settings"
 msgstr "Telefoon instellingen"
 
-#: gofon/phoneaccount/main.inc:123
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr ""
-"Gebruik de 'Bewerk' knop hieronder om de informatie in deze dialoog te "
-"veranderen"
-
-#: gofon/phoneaccount/class_phoneAccount.inc:173
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr "automatisch"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:209
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
+#: gofon/phoneaccount/class_phoneAccount.inc:214
 msgid "no macro"
 msgstr "geen macro"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:237
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
+#: gofon/phoneaccount/class_phoneAccount.inc:242
 msgid "undefined"
 msgstr "niet gedefiniëerd"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:337
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
+#: gofon/phoneaccount/class_phoneAccount.inc:342
 #, php-format
 msgid ""
-"Could not identify telephone extension in database, please try to save "
-"again. Activate debugging if error remains."
+"Cannot identify telephone extension in database, please try to save again."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:552
-#: gofon/phoneaccount/class_phoneAccount.inc:559
-#: gofon/phoneaccount/class_phoneAccount.inc:577
-#: gofon/phoneaccount/class_phoneAccount.inc:584
+#: 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
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:607
-#: gofon/phoneaccount/class_phoneAccount.inc:673
-#: gofon/phoneaccount/class_phoneAccount.inc:1556
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#: 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:1562
 #, php-format
-msgid ""
-"GOsa identified problems with your MySQL table definition, please activate "
-"debugging for details."
+msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:646
-#: gofon/phoneaccount/class_phoneAccount.inc:968
-#: gofon/phoneaccount/class_phoneAccount.inc:1624
+#: 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:1630
 #: gofon/conference/class_phoneConferenceGeneric.inc:620
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1066
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1071
 msgid "Remove phone account"
 msgstr "Verwijder telefoon account"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1070
-#: gofon/phoneaccount/class_phoneAccount.inc:1073
+#: 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
 msgid "Create phone account"
 msgstr "Telefoon account aanmaken"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1076
 #, fuzzy
 msgid "User uid"
 msgstr "Gebruikers ID"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1089
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
+#: gofon/phoneaccount/class_phoneAccount.inc:1094
 msgid "Selected macro is not available anymore!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1113
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1119
 msgid "Parameter"
 msgstr "Parameters"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1260
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1266
 msgid "Choose your private phone"
 msgstr "Kies uw privé telefoon"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1403
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1409
 #, fuzzy
 msgid ""
 "There must be at least one server with an asterisk database to create a "
@@ -1201,34 +1253,39 @@ msgstr ""
 "Er moet tenminste een NTP server geselecteerd zijn of de overervings mode "
 "moet geactiveerd zijn."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1411
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1417
 #, fuzzy
 msgid "Between 1-4 charactes"
 msgstr "Voicemail PIN-code moet tussen 1 en 4 karakters zijn"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1438
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
+#: gofon/phoneaccount/class_phoneAccount.inc:1444
 #, fuzzy, php-format
 msgid "macro parameter %s"
 msgstr "Macro tekst"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1486
-msgid ""
-"An error occured while updating the database entries, activate debugging for "
-"details."
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1492
+msgid "An error occured while updating the database entries!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1674
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1680
 #, fuzzy, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "Gebruiker '%s' is van telefoonwachtrij '%s' verwijderd"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1711
-#: gofon/phoneaccount/class_phoneAccount.inc:1713
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
+#: gofon/phoneaccount/class_phoneAccount.inc:1717
+#: gofon/phoneaccount/class_phoneAccount.inc:1719
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Het opgegeven telefoonnummer '%s' is al toegekend aan '%s'."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1759
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
+#: gofon/phoneaccount/class_phoneAccount.inc:1765
 #, fuzzy, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1237,76 +1294,96 @@ msgstr ""
 "Het geselecteerde kiosk profiel '%s' is niet meer beschikbaar. Het huidige "
 "profiel wordt op 'geen' ingesteld."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1768
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
+#: gofon/phoneaccount/class_phoneAccount.inc:1774
 #, fuzzy
 msgid "Phone account settings"
 msgstr "Telefoon instellingen"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1772
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
+#: gofon/phoneaccount/class_phoneAccount.inc:1778
 msgid "My account"
 msgstr "Mijn account"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1779
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
+#: gofon/phoneaccount/class_phoneAccount.inc:1785
 #: gofon/conference/class_phoneConferenceGeneric.inc:864
 #, fuzzy
 msgid "Telephone number"
 msgstr "Telefoonnummer"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1780
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1786
 #, fuzzy
 msgid "Macro settings"
 msgstr "E-mail instellingen"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1783
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
+#: gofon/phoneaccount/class_phoneAccount.inc:1789
 #, fuzzy
 msgid "Phone context"
 msgstr "Telefoonnaam"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1784
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
+#: gofon/phoneaccount/class_phoneAccount.inc:1790
 #, fuzzy
 msgid "Voice mail context"
 msgstr "Voicemail PIN-code"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1785
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
+#: gofon/phoneaccount/class_phoneAccount.inc:1791
 #, fuzzy
 msgid "Telephone pin"
 msgstr "Telefoon"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1792
 #, fuzzy
 msgid "Voicemail pin"
 msgstr "Voicemail PIN-code"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1868
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
+#: gofon/phoneaccount/class_phoneAccount.inc:1874
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1872
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
+#: gofon/phoneaccount/class_phoneAccount.inc:1878
 msgid "Asterisk server is invalid!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1878
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
+#: gofon/phoneaccount/class_phoneAccount.inc:1884
 #, fuzzy
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr "Voicemail PIN-code moet tussen 1 en 4 karakters zijn"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1881
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
+#: gofon/phoneaccount/class_phoneAccount.inc:1887
 #, fuzzy
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "Voicemail PIN-code moet tussen 1 en 4 karakters zijn"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1886
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
+#: gofon/phoneaccount/class_phoneAccount.inc:1892
 #, fuzzy
 msgid "Phone pin contains invalid characters!"
 msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1893
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1899
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 "De bevat '%s' bevat ongeldige karakters. '!,#' worden gebruikt als "
 "scheidingstekens"
 
+#: gofon/phoneaccount/main.inc:123
+msgid "Click the 'Edit' button below to change informations in this dialog"
+msgstr ""
+"Gebruik de 'Bewerk' knop hieronder om de informatie in deze dialoog te "
+"veranderen"
+
 #: gofon/conference/headpage.tpl:6
 #: gofon/conference/class_divListConferences.inc:31
 #: gofon/conference/class_divListConferences.inc:32
@@ -1462,6 +1539,13 @@ msgstr "Dit programma is niet meer beschikbaar."
 msgid "Lifetime"
 msgstr "Geldigheidsduur (in dagen)"
 
+#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#, php-format
+msgid ""
+"GOsa identified problems with your MySQL table definition, please activate "
+"debugging for details."
+msgstr ""
+
 #: gofon/conference/class_phoneConferenceGeneric.inc:712
 #: gofon/conference/class_phoneConferenceGeneric.inc:714
 #, fuzzy, php-format
diff --git a/gosa-plugins/gofon/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/pl/LC_MESSAGES/messages.po
index dcd458f06..50a785f30 100644
--- a/gosa-plugins/gofon/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2009-10-05 16:06+0200\n"
 "PO-Revision-Date: 2009-09-05 15:32+0100\n"
 "Last-Translator: Piort Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -50,8 +50,10 @@ msgstr "Opcje"
 #: admin/ogroups/gofon/class_phonequeue.inc:305
 #: admin/ogroups/gofon/class_phonequeue.inc:929
 #: gofon/phoneaccount/generic.tpl:58
-#: gofon/phoneaccount/class_phoneAccount.inc:1407
-#: gofon/phoneaccount/class_phoneAccount.inc:1782
+#: 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:1788
 #: gofon/conference/generic.tpl:68
 #: gofon/conference/class_phoneConferenceGeneric.inc:853
 #, fuzzy
@@ -184,14 +186,16 @@ msgid "Ring instead of playing background music"
 msgstr "Dzwoń zamiast odtwarzać muzyki w tle"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:135
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
+#: gofon/phoneaccount/class_phoneAccount.inc:140
 #: gofon/conference/class_phoneConferenceGeneric.inc:103
 #, fuzzy
 msgid "Obsolete entry"
 msgstr "Usuń ten obiekt"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:135
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
+#: gofon/phoneaccount/class_phoneAccount.inc:140
 #: gofon/conference/class_phoneConferenceGeneric.inc:103
 #, php-format
 msgid ""
@@ -264,8 +268,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/class_phoneAccount.inc:426
-#: gofon/phoneaccount/class_phoneAccount.inc:1103
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
+#: gofon/phoneaccount/class_phoneAccount.inc:431
+#: gofon/phoneaccount/class_phoneAccount.inc:1109
 #: gofon/conference/class_phoneConferenceGeneric.inc:430
 #: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:176
@@ -296,16 +302,26 @@ msgstr "numer telefonu"
 #: 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:644
-#: gofon/phoneaccount/class_phoneAccount.inc:966
-#: gofon/phoneaccount/class_phoneAccount.inc:1089
-#: gofon/phoneaccount/class_phoneAccount.inc:1205
+#: 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:1425
-#: gofon/phoneaccount/class_phoneAccount.inc:1486
-#: gofon/phoneaccount/class_phoneAccount.inc:1565
-#: gofon/phoneaccount/class_phoneAccount.inc:1575
-#: gofon/phoneaccount/class_phoneAccount.inc:1622
+#: gofon/phoneaccount/class_phoneAccount.inc:1217
+#: gofon/phoneaccount/class_phoneAccount.inc:1431
+#: gofon/phoneaccount/class_phoneAccount.inc:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1571
+#: gofon/phoneaccount/class_phoneAccount.inc:1581
+#: gofon/phoneaccount/class_phoneAccount.inc:1628
 #: gofon/conference/class_phoneConferenceGeneric.inc:260
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #: gofon/conference/class_phoneConferenceGeneric.inc:618
@@ -325,8 +341,10 @@ msgstr "Błąd"
 #: 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:1512
-#: gofon/phoneaccount/class_phoneAccount.inc:1683
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
+#: gofon/phoneaccount/class_phoneAccount.inc:1518
+#: gofon/phoneaccount/class_phoneAccount.inc:1689
 #: gofon/conference/class_phoneConferenceGeneric.inc:789
 msgid "LDAP error"
 msgstr "błąd LDAP"
@@ -337,13 +355,19 @@ msgid "Phone number"
 msgstr "Numer telefonu"
 
 #: 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:1042
-#: gofon/phoneaccount/class_phoneAccount.inc:1055
-#: gofon/phoneaccount/class_phoneAccount.inc:1067
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1074
-#: gofon/phoneaccount/class_phoneAccount.inc:1767
+#: 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:1773
 msgid "Phone"
 msgstr "Telefon"
 
@@ -655,7 +679,8 @@ msgid "Phone generic"
 msgstr "Numer telefonu"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/class_phoneAccount.inc:1781
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
+#: gofon/phoneaccount/class_phoneAccount.inc:1787
 msgid "Phone hardware"
 msgstr "Sprzęt telefoniczny"
 
@@ -723,7 +748,8 @@ msgid "List of macros"
 msgstr "Lista makr"
 
 #: gofon/macro/headpage.tpl:20 gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/class_phoneAccount.inc:1674
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1680
 #: gofon/conference/headpage.tpl:20
 msgid "Information"
 msgstr "Informacja"
@@ -754,11 +780,18 @@ msgstr "Wyświetl makra pasujące"
 msgid "Regular expression for matching macro names"
 msgstr "Wyrażenie regularne dla dopasowania nazw makr"
 
-#: gofon/macro/remove.tpl:2 gofon/phoneaccount/class_phoneAccount.inc:323
-#: gofon/phoneaccount/class_phoneAccount.inc:337
-#: gofon/phoneaccount/class_phoneAccount.inc:606
-#: gofon/phoneaccount/class_phoneAccount.inc:672
-#: gofon/phoneaccount/class_phoneAccount.inc:1555
+#: 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:1561
+#: gofon/phoneaccount/class_phoneAccount.inc:1938
 #: gofon/conference/remove.tpl:2
 #: gofon/conference/class_phoneConferenceGeneric.inc:463
 msgid "Warning"
@@ -840,10 +873,14 @@ msgid "Macro is empty!"
 msgstr "Makro jest puste!"
 
 #: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/class_phoneAccount.inc:426
-#: gofon/phoneaccount/class_phoneAccount.inc:434
-#: gofon/phoneaccount/class_phoneAccount.inc:1103
-#: gofon/phoneaccount/class_phoneAccount.inc:1641
+#: 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:1647
 #: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:169
 #, fuzzy
@@ -1056,13 +1093,16 @@ msgid "Voicemail context"
 msgstr "PIN poczty głosowej"
 
 #: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/class_phoneAccount.inc:1411
-#: gofon/phoneaccount/class_phoneAccount.inc:1414
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1420
+#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1420
 msgid "Voicemail PIN"
 msgstr "PIN poczty głosowej"
 
 #: gofon/phoneaccount/generic.tpl:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/class_phoneAccount.inc:1419
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1425
+#: gofon/phoneaccount/class_phoneAccount.inc:1425
 msgid "Phone PIN"
 msgstr "PIN telefonu"
 
@@ -1074,80 +1114,94 @@ msgstr "Odśwież"
 msgid "Phone settings"
 msgstr "Ustawienia telefonu"
 
-#: gofon/phoneaccount/main.inc:123
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "Kliknij przycisk 'Edytuj' poniżej, aby zmienić informacje w tym oknie"
-
-#: gofon/phoneaccount/class_phoneAccount.inc:173
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr "automatyczne"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:209
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
+#: gofon/phoneaccount/class_phoneAccount.inc:214
 msgid "no macro"
 msgstr "brak makra"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:237
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
+#: gofon/phoneaccount/class_phoneAccount.inc:242
 msgid "undefined"
 msgstr "niezdefiniowany"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:337
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
+#: gofon/phoneaccount/class_phoneAccount.inc:342
 #, php-format
 msgid ""
-"Could not identify telephone extension in database, please try to save "
-"again. Activate debugging if error remains."
+"Cannot identify telephone extension in database, please try to save again."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:552
-#: gofon/phoneaccount/class_phoneAccount.inc:559
-#: gofon/phoneaccount/class_phoneAccount.inc:577
-#: gofon/phoneaccount/class_phoneAccount.inc:584
+#: 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
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:607
-#: gofon/phoneaccount/class_phoneAccount.inc:673
-#: gofon/phoneaccount/class_phoneAccount.inc:1556
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#: 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:1562
 #, php-format
-msgid ""
-"GOsa identified problems with your MySQL table definition, please activate "
-"debugging for details."
+msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:646
-#: gofon/phoneaccount/class_phoneAccount.inc:968
-#: gofon/phoneaccount/class_phoneAccount.inc:1624
+#: 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:1630
 #: gofon/conference/class_phoneConferenceGeneric.inc:620
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1066
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1071
 msgid "Remove phone account"
 msgstr "Usuń konto telefoniczne"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1070
-#: gofon/phoneaccount/class_phoneAccount.inc:1073
+#: 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
 msgid "Create phone account"
 msgstr "Utwórz konto telefoniczne"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1076
 #, fuzzy
 msgid "User uid"
 msgstr "Identyfikator użytkownika"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1089
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
+#: gofon/phoneaccount/class_phoneAccount.inc:1094
 msgid "Selected macro is not available anymore!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1113
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1119
 msgid "Parameter"
 msgstr "Parametr"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1260
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1266
 msgid "Choose your private phone"
 msgstr "Wybierz swój telefon prywatny"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1403
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1409
 #, fuzzy
 msgid ""
 "There must be at least one server with an asterisk database to create a "
@@ -1156,34 +1210,39 @@ msgstr ""
 "Musi być zaznaczony co najmniej jeden serwer NTP lub zaznaczony tryb "
 "dziedziczenia."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1411
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1417
 #, fuzzy
 msgid "Between 1-4 charactes"
 msgstr "PIN Voicemail musi zawierać od 1 do 4 znaków."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1438
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
+#: gofon/phoneaccount/class_phoneAccount.inc:1444
 #, fuzzy, php-format
 msgid "macro parameter %s"
 msgstr "Zawartość makro"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1486
-msgid ""
-"An error occured while updating the database entries, activate debugging for "
-"details."
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1492
+msgid "An error occured while updating the database entries!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1674
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1680
 #, fuzzy, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "Usunięto użytkownika '%s' z kolejki telefonicznej '%s'."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1711
-#: gofon/phoneaccount/class_phoneAccount.inc:1713
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
+#: gofon/phoneaccount/class_phoneAccount.inc:1717
+#: gofon/phoneaccount/class_phoneAccount.inc:1719
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Podany numer telefonu '%s' jest już przypisany do '%s'."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1759
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
+#: gofon/phoneaccount/class_phoneAccount.inc:1765
 #, fuzzy, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1192,70 +1251,88 @@ msgstr ""
 "Wybrany profil kiosk '%s' nie jest już dostępny, ustawiam aktualny profil na "
 "'brak'."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1768
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
+#: gofon/phoneaccount/class_phoneAccount.inc:1774
 msgid "Phone account settings"
 msgstr "Ustawienia konta telefonicznego"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1772
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
+#: gofon/phoneaccount/class_phoneAccount.inc:1778
 msgid "My account"
 msgstr "Moje konto "
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1779
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
+#: gofon/phoneaccount/class_phoneAccount.inc:1785
 #: gofon/conference/class_phoneConferenceGeneric.inc:864
 msgid "Telephone number"
 msgstr "Numer telefonu"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1780
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1786
 msgid "Macro settings"
 msgstr "Ustawienia makra"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1783
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
+#: gofon/phoneaccount/class_phoneAccount.inc:1789
 #, fuzzy
 msgid "Phone context"
 msgstr "Nazwa telefonu"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1784
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
+#: gofon/phoneaccount/class_phoneAccount.inc:1790
 #, fuzzy
 msgid "Voice mail context"
 msgstr "PIN poczty głosowej"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1785
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
+#: gofon/phoneaccount/class_phoneAccount.inc:1791
 msgid "Telephone pin"
 msgstr "PIN Telefonu"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1792
 msgid "Voicemail pin"
 msgstr "PIN poczty głosowej"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1868
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
+#: gofon/phoneaccount/class_phoneAccount.inc:1874
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1872
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
+#: gofon/phoneaccount/class_phoneAccount.inc:1878
 msgid "Asterisk server is invalid!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1878
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
+#: gofon/phoneaccount/class_phoneAccount.inc:1884
 #, fuzzy
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr "PIN Voicemail musi zawierać od 1 do 4 znaków."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1881
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
+#: gofon/phoneaccount/class_phoneAccount.inc:1887
 #, fuzzy
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "PIN Voicemail musi zawierać od 1 do 4 znaków."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1886
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
+#: gofon/phoneaccount/class_phoneAccount.inc:1892
 #, fuzzy
 msgid "Phone pin contains invalid characters!"
 msgstr "Atrybut hasło jest pusty lub zawiera nieprawidłowe znaki."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1893
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1899
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 "Parametr %s zawiera nieprawidłowy znak. '!,#' jest użyty jako separator"
 
+#: gofon/phoneaccount/main.inc:123
+msgid "Click the 'Edit' button below to change informations in this dialog"
+msgstr "Kliknij przycisk 'Edytuj' poniżej, aby zmienić informacje w tym oknie"
+
 #: gofon/conference/headpage.tpl:6
 #: gofon/conference/class_divListConferences.inc:31
 #: gofon/conference/class_divListConferences.inc:32
@@ -1407,6 +1484,13 @@ msgstr "Ta aplikacja nie jest już dostępna."
 msgid "Lifetime"
 msgstr "Wiek"
 
+#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#, php-format
+msgid ""
+"GOsa identified problems with your MySQL table definition, please activate "
+"debugging for details."
+msgstr ""
+
 #: gofon/conference/class_phoneConferenceGeneric.inc:712
 #: gofon/conference/class_phoneConferenceGeneric.inc:714
 #, fuzzy, php-format
diff --git a/gosa-plugins/gofon/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/ru/LC_MESSAGES/messages.po
index b7639a5d0..5d79b22d9 100644
--- a/gosa-plugins/gofon/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2009-10-05 16:06+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -53,8 +53,10 @@ msgstr "Параметры"
 #: admin/ogroups/gofon/class_phonequeue.inc:305
 #: admin/ogroups/gofon/class_phonequeue.inc:929
 #: gofon/phoneaccount/generic.tpl:58
-#: gofon/phoneaccount/class_phoneAccount.inc:1407
-#: gofon/phoneaccount/class_phoneAccount.inc:1782
+#: 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:1788
 #: gofon/conference/generic.tpl:68
 #: gofon/conference/class_phoneConferenceGeneric.inc:853
 #, fuzzy
@@ -195,14 +197,16 @@ msgid "Ring instead of playing background music"
 msgstr ""
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:135
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
+#: gofon/phoneaccount/class_phoneAccount.inc:140
 #: gofon/conference/class_phoneConferenceGeneric.inc:103
 #, fuzzy
 msgid "Obsolete entry"
 msgstr "Удалить"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:135
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
+#: gofon/phoneaccount/class_phoneAccount.inc:140
 #: gofon/conference/class_phoneConferenceGeneric.inc:103
 #, php-format
 msgid ""
@@ -279,8 +283,10 @@ msgstr "Дата"
 #: admin/ogroups/gofon/class_phonequeue.inc:378
 #: admin/ogroups/gofon/class_phonequeue.inc:732
 #: gofon/macro/class_gofonMacro.inc:392 gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/class_phoneAccount.inc:426
-#: gofon/phoneaccount/class_phoneAccount.inc:1103
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
+#: gofon/phoneaccount/class_phoneAccount.inc:431
+#: gofon/phoneaccount/class_phoneAccount.inc:1109
 #: gofon/conference/class_phoneConferenceGeneric.inc:430
 #: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:176
@@ -315,16 +321,26 @@ msgstr "Телефонные номера"
 #: 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:644
-#: gofon/phoneaccount/class_phoneAccount.inc:966
-#: gofon/phoneaccount/class_phoneAccount.inc:1089
-#: gofon/phoneaccount/class_phoneAccount.inc:1205
+#: 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:1425
-#: gofon/phoneaccount/class_phoneAccount.inc:1486
-#: gofon/phoneaccount/class_phoneAccount.inc:1565
-#: gofon/phoneaccount/class_phoneAccount.inc:1575
-#: gofon/phoneaccount/class_phoneAccount.inc:1622
+#: gofon/phoneaccount/class_phoneAccount.inc:1217
+#: gofon/phoneaccount/class_phoneAccount.inc:1431
+#: gofon/phoneaccount/class_phoneAccount.inc:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1571
+#: gofon/phoneaccount/class_phoneAccount.inc:1581
+#: gofon/phoneaccount/class_phoneAccount.inc:1628
 #: gofon/conference/class_phoneConferenceGeneric.inc:260
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #: gofon/conference/class_phoneConferenceGeneric.inc:618
@@ -344,8 +360,10 @@ msgstr ""
 #: 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:1512
-#: gofon/phoneaccount/class_phoneAccount.inc:1683
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
+#: gofon/phoneaccount/class_phoneAccount.inc:1518
+#: gofon/phoneaccount/class_phoneAccount.inc:1689
 #: gofon/conference/class_phoneConferenceGeneric.inc:789
 #, fuzzy
 msgid "LDAP error"
@@ -358,13 +376,19 @@ msgid "Phone number"
 msgstr "Телефонные номера"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:918
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1047
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1060
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1072
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1079
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1773
 #: gofon/phoneaccount/class_phoneAccount.inc:6
-#: gofon/phoneaccount/class_phoneAccount.inc:1042
-#: gofon/phoneaccount/class_phoneAccount.inc:1055
-#: gofon/phoneaccount/class_phoneAccount.inc:1067
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1074
-#: gofon/phoneaccount/class_phoneAccount.inc:1767
+#: 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:1773
 msgid "Phone"
 msgstr "Телефон"
 
@@ -711,7 +735,8 @@ msgid "Phone generic"
 msgstr "Телефонные номера"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/class_phoneAccount.inc:1781
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
+#: gofon/phoneaccount/class_phoneAccount.inc:1787
 #, fuzzy
 msgid "Phone hardware"
 msgstr "Телефонное оборудование"
@@ -780,7 +805,8 @@ msgid "List of macros"
 msgstr "Список групп"
 
 #: gofon/macro/headpage.tpl:20 gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/class_phoneAccount.inc:1674
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1680
 #: gofon/conference/headpage.tpl:20
 msgid "Information"
 msgstr "Информация"
@@ -815,11 +841,18 @@ msgstr "Шаблон для групп"
 msgid "Regular expression for matching macro names"
 msgstr "Регулярное выражение, соответствующее именам групп"
 
-#: gofon/macro/remove.tpl:2 gofon/phoneaccount/class_phoneAccount.inc:323
-#: gofon/phoneaccount/class_phoneAccount.inc:337
-#: gofon/phoneaccount/class_phoneAccount.inc:606
-#: gofon/phoneaccount/class_phoneAccount.inc:672
-#: gofon/phoneaccount/class_phoneAccount.inc:1555
+#: 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:1561
+#: gofon/phoneaccount/class_phoneAccount.inc:1938
 #: gofon/conference/remove.tpl:2
 #: gofon/conference/class_phoneConferenceGeneric.inc:463
 msgid "Warning"
@@ -906,10 +939,14 @@ msgid "Macro is empty!"
 msgstr "Название"
 
 #: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/class_phoneAccount.inc:426
-#: gofon/phoneaccount/class_phoneAccount.inc:434
-#: gofon/phoneaccount/class_phoneAccount.inc:1103
-#: gofon/phoneaccount/class_phoneAccount.inc:1641
+#: 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:1647
 #: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:169
 #, fuzzy
@@ -1142,13 +1179,16 @@ msgid "Voicemail context"
 msgstr ""
 
 #: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/class_phoneAccount.inc:1411
-#: gofon/phoneaccount/class_phoneAccount.inc:1414
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1420
+#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1420
 msgid "Voicemail PIN"
 msgstr ""
 
 #: gofon/phoneaccount/generic.tpl:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/class_phoneAccount.inc:1419
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1425
+#: gofon/phoneaccount/class_phoneAccount.inc:1425
 #, fuzzy
 msgid "Phone PIN"
 msgstr "Телефон"
@@ -1162,186 +1202,223 @@ msgstr "Ссылки"
 msgid "Phone settings"
 msgstr "Настройки телефона"
 
-#: gofon/phoneaccount/main.inc:123
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "Нажмите 'Изменить' чтобы отредактировать данные в этой форме."
-
-#: gofon/phoneaccount/class_phoneAccount.inc:173
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr "автоматически"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:209
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
+#: gofon/phoneaccount/class_phoneAccount.inc:214
 #, fuzzy
 msgid "no macro"
 msgstr "Телефонные отчеты"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:237
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
+#: gofon/phoneaccount/class_phoneAccount.inc:242
 #, fuzzy
 msgid "undefined"
 msgstr "не определена"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:337
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
+#: gofon/phoneaccount/class_phoneAccount.inc:342
 #, php-format
 msgid ""
-"Could not identify telephone extension in database, please try to save "
-"again. Activate debugging if error remains."
+"Cannot identify telephone extension in database, please try to save again."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:552
-#: gofon/phoneaccount/class_phoneAccount.inc:559
-#: gofon/phoneaccount/class_phoneAccount.inc:577
-#: gofon/phoneaccount/class_phoneAccount.inc:584
+#: 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
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:607
-#: gofon/phoneaccount/class_phoneAccount.inc:673
-#: gofon/phoneaccount/class_phoneAccount.inc:1556
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#: 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:1562
 #, php-format
-msgid ""
-"GOsa identified problems with your MySQL table definition, please activate "
-"debugging for details."
+msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:646
-#: gofon/phoneaccount/class_phoneAccount.inc:968
-#: gofon/phoneaccount/class_phoneAccount.inc:1624
+#: 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:1630
 #: gofon/conference/class_phoneConferenceGeneric.inc:620
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1066
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1071
 msgid "Remove phone account"
 msgstr "Удалить телефонный аккаунт"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1070
-#: gofon/phoneaccount/class_phoneAccount.inc:1073
+#: 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
 msgid "Create phone account"
 msgstr "Создать телефонный аккаунт"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1076
 #, fuzzy
 msgid "User uid"
 msgstr "Идентификатор пользователя"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1089
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
+#: gofon/phoneaccount/class_phoneAccount.inc:1094
 msgid "Selected macro is not available anymore!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1113
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1119
 #, fuzzy
 msgid "Parameter"
 msgstr "Параметры загрузки"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1260
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1266
 msgid "Choose your private phone"
 msgstr "Укажите личный телефон"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1403
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1409
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1411
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1417
 msgid "Between 1-4 charactes"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1438
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
+#: gofon/phoneaccount/class_phoneAccount.inc:1444
 #, fuzzy, php-format
 msgid "macro parameter %s"
 msgstr "Название"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1486
-msgid ""
-"An error occured while updating the database entries, activate debugging for "
-"details."
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1492
+msgid "An error occured while updating the database entries!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1674
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1680
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1711
-#: gofon/phoneaccount/class_phoneAccount.inc:1713
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
+#: gofon/phoneaccount/class_phoneAccount.inc:1717
+#: gofon/phoneaccount/class_phoneAccount.inc:1719
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1759
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
+#: gofon/phoneaccount/class_phoneAccount.inc:1765
 #, fuzzy, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
 "Remove aborted."
 msgstr "У выбранного приложения нет параметров."
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1768
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
+#: gofon/phoneaccount/class_phoneAccount.inc:1774
 #, fuzzy
 msgid "Phone account settings"
 msgstr "Настройки телефона"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1772
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
+#: gofon/phoneaccount/class_phoneAccount.inc:1778
 msgid "My account"
 msgstr "Моя учетная запись"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1779
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
+#: gofon/phoneaccount/class_phoneAccount.inc:1785
 #: gofon/conference/class_phoneConferenceGeneric.inc:864
 #, fuzzy
 msgid "Telephone number"
 msgstr "Телефонные номера"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1780
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1786
 #, fuzzy
 msgid "Macro settings"
 msgstr "Почтовые настройки пользователя"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1783
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
+#: gofon/phoneaccount/class_phoneAccount.inc:1789
 #, fuzzy
 msgid "Phone context"
 msgstr "Название"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1784
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
+#: gofon/phoneaccount/class_phoneAccount.inc:1790
 msgid "Voice mail context"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1785
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
+#: gofon/phoneaccount/class_phoneAccount.inc:1791
 #, fuzzy
 msgid "Telephone pin"
 msgstr "Телефон"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1792
 msgid "Voicemail pin"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1868
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
+#: gofon/phoneaccount/class_phoneAccount.inc:1874
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1872
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
+#: gofon/phoneaccount/class_phoneAccount.inc:1878
 msgid "Asterisk server is invalid!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1878
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
+#: gofon/phoneaccount/class_phoneAccount.inc:1884
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1881
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
+#: gofon/phoneaccount/class_phoneAccount.inc:1887
 #, fuzzy
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "Неправильное указание таймаута '%s'"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1886
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
+#: gofon/phoneaccount/class_phoneAccount.inc:1892
 #, fuzzy
 msgid "Phone pin contains invalid characters!"
 msgstr "Неправильное указание таймаута '%s'"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1893
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1899
 #, fuzzy, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr "Неправильное указание таймаута '%s'"
 
+#: gofon/phoneaccount/main.inc:123
+msgid "Click the 'Edit' button below to change informations in this dialog"
+msgstr "Нажмите 'Изменить' чтобы отредактировать данные в этой форме."
+
 #: gofon/conference/headpage.tpl:6
 #: gofon/conference/class_divListConferences.inc:31
 #: gofon/conference/class_divListConferences.inc:32
@@ -1510,6 +1587,13 @@ msgstr "У выбранного приложения нет параметров
 msgid "Lifetime"
 msgstr ""
 
+#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#, php-format
+msgid ""
+"GOsa identified problems with your MySQL table definition, please activate "
+"debugging for details."
+msgstr ""
+
 #: gofon/conference/class_phoneConferenceGeneric.inc:712
 #: gofon/conference/class_phoneConferenceGeneric.inc:714
 #, php-format
diff --git a/gosa-plugins/gofon/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/zh/LC_MESSAGES/messages.po
index 1857b82e8..4f7b0e6cf 100644
--- a/gosa-plugins/gofon/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2009-10-05 16:06+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -52,8 +52,10 @@ msgstr "选项"
 #: admin/ogroups/gofon/class_phonequeue.inc:305
 #: admin/ogroups/gofon/class_phonequeue.inc:929
 #: gofon/phoneaccount/generic.tpl:58
-#: gofon/phoneaccount/class_phoneAccount.inc:1407
-#: gofon/phoneaccount/class_phoneAccount.inc:1782
+#: 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:1788
 #: gofon/conference/generic.tpl:68
 #: gofon/conference/class_phoneConferenceGeneric.inc:853
 msgid "Home server"
@@ -185,14 +187,16 @@ msgid "Ring instead of playing background music"
 msgstr "振铃而非播放背景音乐"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:135
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
+#: gofon/phoneaccount/class_phoneAccount.inc:140
 #: gofon/conference/class_phoneConferenceGeneric.inc:103
 #, fuzzy
 msgid "Obsolete entry"
 msgstr "删除这个条目"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/class_phoneAccount.inc:135
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
+#: gofon/phoneaccount/class_phoneAccount.inc:140
 #: gofon/conference/class_phoneConferenceGeneric.inc:103
 #, php-format
 msgid ""
@@ -267,8 +271,10 @@ msgstr "粘贴"
 #: admin/ogroups/gofon/class_phonequeue.inc:378
 #: admin/ogroups/gofon/class_phonequeue.inc:732
 #: gofon/macro/class_gofonMacro.inc:392 gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/class_phoneAccount.inc:426
-#: gofon/phoneaccount/class_phoneAccount.inc:1103
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
+#: gofon/phoneaccount/class_phoneAccount.inc:431
+#: gofon/phoneaccount/class_phoneAccount.inc:1109
 #: gofon/conference/class_phoneConferenceGeneric.inc:430
 #: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:176
@@ -301,16 +307,26 @@ msgstr "电话号码"
 #: 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:644
-#: gofon/phoneaccount/class_phoneAccount.inc:966
-#: gofon/phoneaccount/class_phoneAccount.inc:1089
-#: gofon/phoneaccount/class_phoneAccount.inc:1205
+#: 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:1425
-#: gofon/phoneaccount/class_phoneAccount.inc:1486
-#: gofon/phoneaccount/class_phoneAccount.inc:1565
-#: gofon/phoneaccount/class_phoneAccount.inc:1575
-#: gofon/phoneaccount/class_phoneAccount.inc:1622
+#: gofon/phoneaccount/class_phoneAccount.inc:1217
+#: gofon/phoneaccount/class_phoneAccount.inc:1431
+#: gofon/phoneaccount/class_phoneAccount.inc:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1571
+#: gofon/phoneaccount/class_phoneAccount.inc:1581
+#: gofon/phoneaccount/class_phoneAccount.inc:1628
 #: gofon/conference/class_phoneConferenceGeneric.inc:260
 #: gofon/conference/class_phoneConferenceGeneric.inc:264
 #: gofon/conference/class_phoneConferenceGeneric.inc:618
@@ -330,8 +346,10 @@ msgstr "错误"
 #: 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:1512
-#: gofon/phoneaccount/class_phoneAccount.inc:1683
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
+#: gofon/phoneaccount/class_phoneAccount.inc:1518
+#: gofon/phoneaccount/class_phoneAccount.inc:1689
 #: gofon/conference/class_phoneConferenceGeneric.inc:789
 #, fuzzy
 msgid "LDAP error"
@@ -343,13 +361,19 @@ msgid "Phone number"
 msgstr "电话号码"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:918
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1047
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1060
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1072
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1079
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1773
 #: gofon/phoneaccount/class_phoneAccount.inc:6
-#: gofon/phoneaccount/class_phoneAccount.inc:1042
-#: gofon/phoneaccount/class_phoneAccount.inc:1055
-#: gofon/phoneaccount/class_phoneAccount.inc:1067
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1074
-#: gofon/phoneaccount/class_phoneAccount.inc:1767
+#: 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:1773
 msgid "Phone"
 msgstr "电话"
 
@@ -682,7 +706,8 @@ msgid "Phone generic"
 msgstr "电话号码"
 
 #: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/class_phoneAccount.inc:1781
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
+#: gofon/phoneaccount/class_phoneAccount.inc:1787
 #, fuzzy
 msgid "Phone hardware"
 msgstr "电话硬件"
@@ -749,7 +774,8 @@ msgid "List of macros"
 msgstr "宏列表"
 
 #: gofon/macro/headpage.tpl:20 gofon/macro/class_gofonMacroParameters.inc:374
-#: gofon/phoneaccount/class_phoneAccount.inc:1674
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1680
 #: gofon/conference/headpage.tpl:20
 msgid "Information"
 msgstr "提示信息"
@@ -779,11 +805,18 @@ msgstr "显示匹配的宏"
 msgid "Regular expression for matching macro names"
 msgstr "匹配宏名的正则表达式"
 
-#: gofon/macro/remove.tpl:2 gofon/phoneaccount/class_phoneAccount.inc:323
-#: gofon/phoneaccount/class_phoneAccount.inc:337
-#: gofon/phoneaccount/class_phoneAccount.inc:606
-#: gofon/phoneaccount/class_phoneAccount.inc:672
-#: gofon/phoneaccount/class_phoneAccount.inc:1555
+#: 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:1561
+#: gofon/phoneaccount/class_phoneAccount.inc:1938
 #: gofon/conference/remove.tpl:2
 #: gofon/conference/class_phoneConferenceGeneric.inc:463
 msgid "Warning"
@@ -863,10 +896,14 @@ msgid "Macro is empty!"
 msgstr "宏文本"
 
 #: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/class_phoneAccount.inc:426
-#: gofon/phoneaccount/class_phoneAccount.inc:434
-#: gofon/phoneaccount/class_phoneAccount.inc:1103
-#: gofon/phoneaccount/class_phoneAccount.inc:1641
+#: 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:1647
 #: gofon/fonreports/class_fonreport.inc:166
 #: gofon/fonreports/class_fonreport.inc:169
 #, fuzzy
@@ -1084,13 +1121,16 @@ msgid "Voicemail context"
 msgstr "语音邮件 PIN"
 
 #: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/class_phoneAccount.inc:1411
-#: gofon/phoneaccount/class_phoneAccount.inc:1414
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1420
+#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1420
 msgid "Voicemail PIN"
 msgstr "语音邮件 PIN"
 
 #: gofon/phoneaccount/generic.tpl:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/class_phoneAccount.inc:1419
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1425
+#: gofon/phoneaccount/class_phoneAccount.inc:1425
 msgid "Phone PIN"
 msgstr "电话 PIN"
 
@@ -1102,190 +1142,227 @@ msgstr "刷新"
 msgid "Phone settings"
 msgstr "电话设置"
 
-#: gofon/phoneaccount/main.inc:123
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "点击下面的“编辑”按钮修改该对话框内的信息"
-
-#: gofon/phoneaccount/class_phoneAccount.inc:173
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr "自动"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:209
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
+#: gofon/phoneaccount/class_phoneAccount.inc:214
 msgid "no macro"
 msgstr "没有宏"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:237
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
+#: gofon/phoneaccount/class_phoneAccount.inc:242
 msgid "undefined"
 msgstr "未定义"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:337
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
+#: gofon/phoneaccount/class_phoneAccount.inc:342
 #, php-format
 msgid ""
-"Could not identify telephone extension in database, please try to save "
-"again. Activate debugging if error remains."
+"Cannot identify telephone extension in database, please try to save again."
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:552
-#: gofon/phoneaccount/class_phoneAccount.inc:559
-#: gofon/phoneaccount/class_phoneAccount.inc:577
-#: gofon/phoneaccount/class_phoneAccount.inc:584
+#: 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
 #, fuzzy
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 "无法查询数据库 '%s' 于 '%s'。取消保存将保持数据库的完整性，通过 GOsa 日志来查"
 "看 mysql 错误。"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:607
-#: gofon/phoneaccount/class_phoneAccount.inc:673
-#: gofon/phoneaccount/class_phoneAccount.inc:1556
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#: 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:1562
 #, php-format
-msgid ""
-"GOsa identified problems with your MySQL table definition, please activate "
-"debugging for details."
+msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:646
-#: gofon/phoneaccount/class_phoneAccount.inc:968
-#: gofon/phoneaccount/class_phoneAccount.inc:1624
+#: 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:1630
 #: gofon/conference/class_phoneConferenceGeneric.inc:620
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1066
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1071
 msgid "Remove phone account"
 msgstr "删除电话账号"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1070
-#: gofon/phoneaccount/class_phoneAccount.inc:1073
+#: 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
 msgid "Create phone account"
 msgstr "创建电话账号"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1076
 #, fuzzy
 msgid "User uid"
 msgstr "用户 ID"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1089
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
+#: gofon/phoneaccount/class_phoneAccount.inc:1094
 msgid "Selected macro is not available anymore!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1113
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1119
 msgid "Parameter"
 msgstr "参数"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1260
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1266
 msgid "Choose your private phone"
 msgstr "选择您私人电话"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1403
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1409
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
 msgstr "必须有至少一个带有 asterisk 数据库的服务器来创建一个电话账号。"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1411
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1417
 #, fuzzy
 msgid "Between 1-4 charactes"
 msgstr "语音邮件 PIN 必须包含 1-4 个字符。"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1438
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
+#: gofon/phoneaccount/class_phoneAccount.inc:1444
 #, fuzzy, php-format
 msgid "macro parameter %s"
 msgstr "启动参数"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1486
-msgid ""
-"An error occured while updating the database entries, activate debugging for "
-"details."
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
+#: gofon/phoneaccount/class_phoneAccount.inc:1492
+msgid "An error occured while updating the database entries!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1674
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
+#: gofon/phoneaccount/class_phoneAccount.inc:1680
 #, fuzzy, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "删除用户 '%s'，从电话队列 '%s'。"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1711
-#: gofon/phoneaccount/class_phoneAccount.inc:1713
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
+#: gofon/phoneaccount/class_phoneAccount.inc:1717
+#: gofon/phoneaccount/class_phoneAccount.inc:1719
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "指定的电话号码 '%s' 已经分配给了 '%s'。"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1759
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
+#: gofon/phoneaccount/class_phoneAccount.inc:1765
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
 "Remove aborted."
 msgstr "之前选择的 asterisk 主服务器 (%s) 不存在了。删除终止。"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1768
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
+#: gofon/phoneaccount/class_phoneAccount.inc:1774
 #, fuzzy
 msgid "Phone account settings"
 msgstr "电话设置"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1772
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
+#: gofon/phoneaccount/class_phoneAccount.inc:1778
 msgid "My account"
 msgstr "我的账号"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1779
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
+#: gofon/phoneaccount/class_phoneAccount.inc:1785
 #: gofon/conference/class_phoneConferenceGeneric.inc:864
 #, fuzzy
 msgid "Telephone number"
 msgstr "电话号码"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1780
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1786
 #, fuzzy
 msgid "Macro settings"
 msgstr "邮件选项"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1783
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
+#: gofon/phoneaccount/class_phoneAccount.inc:1789
 #, fuzzy
 msgid "Phone context"
 msgstr "电话名称"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1784
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
+#: gofon/phoneaccount/class_phoneAccount.inc:1790
 #, fuzzy
 msgid "Voice mail context"
 msgstr "语音邮件 PIN"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1785
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
+#: gofon/phoneaccount/class_phoneAccount.inc:1791
 #, fuzzy
 msgid "Telephone pin"
 msgstr "电话"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
+#: gofon/phoneaccount/class_phoneAccount.inc:1792
 #, fuzzy
 msgid "Voicemail pin"
 msgstr "语音邮件 PIN"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1868
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
+#: gofon/phoneaccount/class_phoneAccount.inc:1874
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1872
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
+#: gofon/phoneaccount/class_phoneAccount.inc:1878
 msgid "Asterisk server is invalid!"
 msgstr ""
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1878
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
+#: gofon/phoneaccount/class_phoneAccount.inc:1884
 #, fuzzy
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr "语音邮件 PIN 必须包含 1-4 个字符。"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1881
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
+#: gofon/phoneaccount/class_phoneAccount.inc:1887
 #, fuzzy
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "语音邮件 PIN 必须包含 1-4 个字符。"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1886
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
+#: gofon/phoneaccount/class_phoneAccount.inc:1892
 #, fuzzy
 msgid "Phone pin contains invalid characters!"
 msgstr "属性 '%s' 为空或者包含无效字符。"
 
-#: gofon/phoneaccount/class_phoneAccount.inc:1893
+#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1899
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr "参数 %s 包含无效字符。'!,#' 用做分隔符"
 
+#: gofon/phoneaccount/main.inc:123
+msgid "Click the 'Edit' button below to change informations in this dialog"
+msgstr "点击下面的“编辑”按钮修改该对话框内的信息"
+
 #: gofon/conference/headpage.tpl:6
 #: gofon/conference/class_divListConferences.inc:31
 #: gofon/conference/class_divListConferences.inc:32
@@ -1439,6 +1516,13 @@ msgstr "之前选择的 asterisk 主服务器 (%s) 不存在了。"
 msgid "Lifetime"
 msgstr "生存期（天）"
 
+#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#, php-format
+msgid ""
+"GOsa identified problems with your MySQL table definition, please activate "
+"debugging for details."
+msgstr ""
+
 #: gofon/conference/class_phoneConferenceGeneric.inc:712
 #: gofon/conference/class_phoneConferenceGeneric.inc:714
 #, fuzzy, php-format