Updated strings and translations

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

diff --git a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
index f0b852789a293cece29046055fc57903a60e9a21..4d035aa43cea387fe8e88bf048734f0563be0fbc 100644 (file)
--- a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
+++ b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
@@ -89,36 +89,36 @@ class mailgroup extends plugin
         /* Read quota */
         $this->gosaMailQuota = $this->mailMethod->getQuota($this->gosaMailQuota);
         if($this->mailMethod->is_error()){
-          msg_dialog::display(_("Mail error"), sprintf(_("Cannot read quota settings! Error was: %s."),
+          msg_dialog::display(_("Mail error"), sprintf(_("Cannot read quota settings: %s"),
                 $this->mailMethod->get_error()), ERROR_DIALOG);
         }
 
         /* Read mailboxes */
         $this->MailBoxes = $this->mailMethod->getMailboxList($this->MailBoxes);
         if($this->mailMethod->is_error()){
-          msg_dialog::display(_("Mail error"), sprintf(_("Cannot get list of mailboxes! Error was: %s."),
+          msg_dialog::display(_("Mail error"), sprintf(_("Cannot get list of mailboxes: %s"),
                 $this->mailMethod->get_error()), ERROR_DIALOG);
         }
 
         /* Receive folder types */
         $this->FolderType = $this->mailMethod->getFolderType($this->FolderType);
         if($this->mailMethod->is_error()){
-          msg_dialog::display(_("Mail error"), sprintf(_("Could not receive folder types! Error was: %s."),
+          msg_dialog::display(_("Mail error"), sprintf(_("Cannot receive folder types: %s"),
                 $this->mailMethod->get_error()), ERROR_DIALOG);
         }
 
         /* Receive permissions */  
         $this->folder_acls = $this->mailMethod->getFolderACLs($this->folder_acls);
         if($this->mailMethod->is_error()){
-          msg_dialog::display(_("Mail error"), sprintf(_("Could not receive folder permissions! Error was: %s."),
+          msg_dialog::display(_("Mail error"), sprintf(_("Cannot receive folder permissions: %s"),
                 $this->mailMethod->get_error()), ERROR_DIALOG);
         }
 
       }elseif(!$this->mailMethod->is_connected()){
-        msg_dialog::display(_("Mail error"), sprintf(_("Cannot connect mail method! Error was: %s."),
+        msg_dialog::display(_("Mail error"), sprintf(_("Mail method cannot connect: %s"),
               $this->mailMethod->get_error()), ERROR_DIALOG);
       }elseif(!$this->mailMethod->account_exists()){
-        msg_dialog::display(_("Mail error"), sprintf(_("Mailbox '%s' doesn't exists on mail server: %s."),
+        msg_dialog::display(_("Mail error"), sprintf(_("Mailbox '%s' doesn't exists on mail server: %s"),
               $this->mailMethod->get_account_id(),$this->gosaMailServer), ERROR_DIALOG);
       }
 
@@ -510,15 +510,15 @@ class mailgroup extends plugin
     if (!$this->is_template && $this->remove_folder_from_imap){
 
       if(!$this->mailMethod->connect()){
-        msg_dialog::display(_("Mail error"), sprintf(_("Cannot connect mail method! Error was: %s."),
+        msg_dialog::display(_("Mail error"), sprintf(_("Mail method cannot connect: %s"),
               $this->mailMethod->get_error()), ERROR_DIALOG);
       }else{
         if(!$this->mailMethod->deleteMailbox()){
-          msg_dialog::display(_("Mail error"), sprintf(_("Cannot remove mailbox! Error was: %s."),
+          msg_dialog::display(_("Mail error"), sprintf(_("Cannot remove mailbox: %s"),
                 $this->mailMethod->get_error()), ERROR_DIALOG);
         }
         if(!$this->mailMethod->updateSharedFolder()){
-          msg_dialog::display(_("Mail error"), sprintf(_("Cannot update shared folder permissions! Error was: %s."),
+          msg_dialog::display(_("Mail error"), sprintf(_("Cannot update shared folder permissions: %s"),
                 $this->mailMethod->get_error()), ERROR_DIALOG);
         }
       }
@@ -608,7 +608,7 @@ class mailgroup extends plugin
           }
         }
         if(isset($_POST['add_acl_user'])){
-          $new_acls[_('new')] = $this->folder_acls['__anyone__'];
+          $new_acls[_('New')] = $this->folder_acls['__anyone__'];
         }
         $this->folder_acls = $new_acls;
       }
@@ -726,15 +726,15 @@ class mailgroup extends plugin
      */
     $this->mailMethod->connect();
     if(!$this->mailMethod->is_connected()){
-      msg_dialog::display(_("Mail error"), sprintf(_("Cannot connect mail method! Error was: %s."),
+      msg_dialog::display(_("Mail error"), sprintf(_("Mail method cannot connect: %s"),
             $this->mailMethod->get_error()), ERROR_DIALOG);
     }else{
       if(!$this->mailMethod->updateMailbox()){
-        msg_dialog::display(_("Mail error"), sprintf(_("Cannot update mailbox! Error was: %s."),
+        msg_dialog::display(_("Mail error"), sprintf(_("Cannot update mailbox: %s"),
               $this->mailMethod->get_error()), ERROR_DIALOG);
       }
       if(!$this->mailMethod->setQuota($this->gosaMailQuota)){
-        msg_dialog::display(_("Mail error"), sprintf(_("Cannot write quota settings! Error was: %s."),
+        msg_dialog::display(_("Mail error"), sprintf(_("Cannot write quota settings: %s"),
               $this->mailMethod->get_error()), ERROR_DIALOG);
       }
       /* Save Folder Types, if available 
@@ -743,7 +743,7 @@ class mailgroup extends plugin
         $this->mailMethod->setFolderType($this->FolderType);
       }
       if(!$this->mailMethod->setFolderACLs($this->folder_acls)){
-        msg_dialog::display(_("Mail error"), sprintf(_("Cannot update shared folder permissions! Error was: %s."),
+        msg_dialog::display(_("Mail error"), sprintf(_("Cannot update shared folder permissions: %s"),
               $this->mailMethod->get_error()), ERROR_DIALOG);
       }
     }

diff --git a/gosa-plugins/mail/admin/groups/mail/mail.tpl b/gosa-plugins/mail/admin/groups/mail/mail.tpl
index 30eb89f1614621df528ded670be6424bf18ec289..25203886a3d771ff110b4842bb85f4575f3f8ee3 100644 (file)
--- a/gosa-plugins/mail/admin/groups/mail/mail.tpl
+++ b/gosa-plugins/mail/admin/groups/mail/mail.tpl
@@ -36,7 +36,7 @@
      <td>
 {render acl=$gosaMailServerACL}
       <select size="1" id="gosaMailServer" name="gosaMailServer" 
-               title="{t}Specify the mail server where the user will  be hosted on{/t}">
+               title="{t}Specify the mail server where the user will be hosted on{/t}">
         {html_options values=$MailServers output=$MailServers selected=$gosaMailServer}
         <option disabled>&nbsp;</option>
       </select>

diff --git a/gosa-plugins/mail/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/de/LC_MESSAGES/messages.po
index a952fdc96ca28f95575aa613affef9e972b8560c..9db8ccd067895f4d1eadd928a35a868709b99299 100644 (file)
--- a/gosa-plugins/mail/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/locale/de/LC_MESSAGES/messages.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-03 15:05+0100\n"
-"PO-Revision-Date: 2008-12-03 15:13+0100\n"
+"POT-Creation-Date: 2008-12-10 10:53+0100\n"
+"PO-Revision-Date: 2008-12-10 10:52+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,9 +25,10 @@ msgstr ""
 msgid "Mail distribution list"
 msgstr "Mail-Verteilerliste"
 
-#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/mail.tpl:10
-#: admin/groups/mail/paste_mail.tpl:8 personal/mail/copypaste.tpl:7
-#: personal/mail/generic.tpl:8 personal/mail/class_mailAccount.inc:931
+#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/mail.tpl:7
+#: admin/groups/mail/paste_mail.tpl:8
+#: admin/groups/mail/class_groupMail.inc:784 personal/mail/copypaste.tpl:7
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1060
 msgid "Primary address"
 msgstr "Primäre Adresse"
 
@@ -36,7 +37,6 @@ msgid "Primary mail address for this distribution list"
 msgstr "Primäre Mail-Adresse der Verteilerliste"
 
 #: admin/ogroups/mail/class_mailogroup.inc:50
-#: admin/groups/mail/class_groupMail.inc:390
 msgid "Remove mail account"
 msgstr "Mail-Konto entfernen"
 
@@ -46,31 +46,30 @@ msgid "mail group"
 msgstr "Mail-Gruppe"
 
 #: admin/ogroups/mail/class_mailogroup.inc:53
-#: admin/groups/mail/class_groupMail.inc:393
 msgid "Create mail account"
 msgstr "Neues Mail-Konto erzeugen"
 
 #: admin/ogroups/mail/class_mailogroup.inc:86
 #: admin/ogroups/mail/class_mailogroup.inc:93
 #: admin/ogroups/mail/class_mailogroup.inc:194
-#: admin/groups/mail/class_groupMail.inc:499
-#: admin/groups/mail/class_groupMail.inc:1084
-#: admin/groups/mail/class_groupMail.inc:1087
-#: admin/groups/mail/class_groupMail.inc:1093
-#: admin/groups/mail/class_groupMail.inc:1295
-#: personal/mail/class_mailAccount.inc:364
-#: personal/mail/class_mailAccount.inc:400
-#: personal/mail/class_mailAccount.inc:408
-#: personal/mail/class_mailAccount.inc:419
-#: personal/mail/class_mailAccount.inc:935
-#: personal/mail/class_mailAccount.inc:939
-#: personal/mail/class_mailAccount.inc:950
-#: personal/mail/class_mailAccount.inc:1180
+#: admin/groups/mail/class_groupMail.inc:325
+#: admin/groups/mail/class_groupMail.inc:360
+#: admin/groups/mail/class_groupMail.inc:366
+#: admin/groups/mail/class_groupMail.inc:375
+#: admin/groups/mail/class_groupMail.inc:786
+#: admin/groups/mail/class_groupMail.inc:917
+#: personal/mail/class_mailAccount.inc:306
+#: personal/mail/class_mailAccount.inc:341
+#: personal/mail/class_mailAccount.inc:346
+#: personal/mail/class_mailAccount.inc:354
+#: personal/mail/class_mailAccount.inc:1064
+#: personal/mail/class_mailAccount.inc:1068
+#: personal/mail/class_mailAccount.inc:1079
+#: personal/mail/class_mailAccount.inc:1396
 msgid "Mail address"
 msgstr "Mail-Adresse"
 
 #: admin/ogroups/mail/class_mailogroup.inc:86
-#: admin/groups/mail/class_groupMail.inc:1087
 msgid "your-name@your-domain.com"
 msgstr "Ihr-Name@ihre-domain.com"
 
@@ -80,26 +79,32 @@ msgstr "Ihr-Name@ihre-domain.com"
 #: admin/systems/services/spam/class_goSpamServer.inc:277
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/mail/class_goMailServer.inc:582
-#: admin/groups/mail/class_groupMail.inc:794
-#: admin/groups/mail/class_groupMail.inc:1048
-#: personal/mail/class_mailAccount.inc:694
-#: personal/mail/class_mailAccount.inc:862
+#: admin/groups/mail/class_groupMail.inc:501
+#: admin/groups/mail/class_groupMail.inc:716
+#: personal/mail/class_mailAccount.inc:889
+#: personal/mail/class_mailAccount.inc:956
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
 #: admin/ogroups/mail/class_mailogroup.inc:186
 #: admin/ogroups/mail/paste_mail.tpl:4
-#: admin/groups/mail/class_groupMail.inc:1287
-#: personal/mail/class_mailAccount.inc:15
-#: personal/mail/class_mailAccount.inc:288
-#: personal/mail/class_mailAccount.inc:298
-#: personal/mail/class_mailAccount.inc:301
-#: personal/mail/class_mailAccount.inc:302
-#: personal/mail/class_mailAccount.inc:305
-#: personal/mail/class_mailAccount.inc:306
-#: personal/mail/class_mailAccount.inc:926
-#: personal/mail/class_mailAccount.inc:1170
-#: personal/mail/class_mailAccount.inc:1346
+#: admin/groups/mail/class_groupMail.inc:257
+#: admin/groups/mail/class_groupMail.inc:259
+#: admin/groups/mail/class_groupMail.inc:260
+#: admin/groups/mail/class_groupMail.inc:265
+#: admin/groups/mail/class_groupMail.inc:267
+#: admin/groups/mail/class_groupMail.inc:268
+#: admin/groups/mail/class_groupMail.inc:774
+#: admin/groups/mail/class_groupMail.inc:909
+#: personal/mail/class_mailAccount.inc:50
+#: personal/mail/class_mailAccount.inc:222
+#: personal/mail/class_mailAccount.inc:230
+#: personal/mail/class_mailAccount.inc:232
+#: personal/mail/class_mailAccount.inc:237
+#: personal/mail/class_mailAccount.inc:239
+#: personal/mail/class_mailAccount.inc:1048
+#: personal/mail/class_mailAccount.inc:1240
+#: personal/mail/class_mailAccount.inc:1386
 msgid "Mail"
 msgstr "Mail"
 
@@ -216,7 +221,7 @@ msgid "Start POP3 SSL service"
 msgstr "POP3/SSL-Dienst starten"
 
 #: admin/systems/services/imap/goImapServer.tpl:1
-#: admin/systems/services/mail/goMailServer.tpl:1 admin/groups/mail/mail.tpl:7
+#: admin/systems/services/mail/goMailServer.tpl:1 admin/groups/mail/mail.tpl:4
 #: personal/mail/generic.tpl:5
 msgid "Generic"
 msgstr "Allgemein"
@@ -267,22 +272,24 @@ msgstr "Spamassassin"
 
 #: admin/systems/services/spam/class_goSpamServer.inc:143
 #: admin/systems/services/spam/class_goSpamServer.inc:216
-#: admin/groups/mail/class_groupMail.inc:464
-#: admin/groups/mail/class_groupMail.inc:468
-#: admin/groups/mail/class_groupMail.inc:494
-#: admin/groups/mail/class_groupMail.inc:499
+#: admin/groups/mail/class_groupMail.inc:312
+#: admin/groups/mail/class_groupMail.inc:325
+#: admin/groups/mail/class_groupMail.inc:331
+#: admin/groups/mail/class_groupMail.inc:360
+#: admin/groups/mail/class_groupMail.inc:366
+#: admin/groups/mail/class_groupMail.inc:375
 #: personal/mail/sieve/class_sieveManagement.inc:201
 #: personal/mail/sieve/class_sieveManagement.inc:206
 #: personal/mail/sieve/class_sieveManagement.inc:212
 #: personal/mail/sieve/class_sieveManagement.inc:218
 #: personal/mail/sieve/class_sieveManagement.inc:429
 #: personal/mail/sieve/class_My_Tree.inc:660
-#: personal/mail/class_mailAccount.inc:347
-#: personal/mail/class_mailAccount.inc:363
-#: personal/mail/class_mailAccount.inc:370
-#: personal/mail/class_mailAccount.inc:399
-#: personal/mail/class_mailAccount.inc:407
-#: personal/mail/class_mailAccount.inc:419
+#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:306
+#: personal/mail/class_mailAccount.inc:312
+#: personal/mail/class_mailAccount.inc:341
+#: personal/mail/class_mailAccount.inc:346
+#: personal/mail/class_mailAccount.inc:354
 #: addons/mailqueue/class_mailqueue.inc:110
 #: addons/mailqueue/class_mailqueue.inc:144
 #: addons/mailqueue/class_mailqueue.inc:150
@@ -346,12 +353,12 @@ msgstr "Pyzor verwenden"
 
 #: admin/systems/services/spam/goSpamServer.tpl:22
 msgid "Select required score to tag mail as spam"
-msgstr "Wählen Sie den gewünschten Wert, ab dem Mail als Spam gekennzeichnet wird."
+msgstr ""
+"Wählen Sie den gewünschten Wert, ab dem Mail als Spam gekennzeichnet wird."
 
 #: admin/systems/services/spam/goSpamServer.tpl:48
 #: admin/systems/services/mail/goMailServer.tpl:73
 #: admin/systems/services/mail/goMailServer.tpl:104
-#: admin/groups/mail/class_groupMail.inc:654
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -594,113 +601,98 @@ msgstr "Einschränkungen"
 msgid "Restriction filter"
 msgstr "Einschränkungsmuster"
 
-#: admin/groups/mail/mail.tpl:14 personal/mail/generic.tpl:11
-msgid "Multiple edit"
-msgstr "Mehrfaches Bearbeiten"
-
-#: admin/groups/mail/mail.tpl:17 admin/groups/mail/paste_mail.tpl:12
-msgid "Primary mail address for this shared folder"
-msgstr "Primäre Mail-Adresse dieses geteilten Ordners"
-
-#: admin/groups/mail/mail.tpl:23 personal/mail/generic.tpl:20
+#: admin/groups/mail/mail.tpl:35 personal/mail/generic.tpl:30
 #: addons/mailqueue/contents.tpl:73
 msgid "Server"
 msgstr "Server"
 
-#: admin/groups/mail/mail.tpl:26
-msgid "Select mail server to place user on"
-msgstr "Wählen Sie den Mail-Server, auf dem der Benutzer angelegt werden soll"
+#: admin/groups/mail/mail.tpl:39 personal/mail/generic.tpl:37
+msgid "Specify the mail server where the user will be hosted on"
+msgstr "Wählen Sie den Mail-Server, auf dem dieses Konto angelegt werden soll"
 
-#: admin/groups/mail/mail.tpl:36 personal/mail/generic.tpl:34
+#: admin/groups/mail/mail.tpl:52 personal/mail/generic.tpl:53
 msgid "Quota usage"
 msgstr "Kontingent-Nutzung"
 
-#: admin/groups/mail/mail.tpl:43 personal/mail/generic.tpl:41
-msgid "not defined"
-msgstr "nicht definiert"
-
-#: admin/groups/mail/mail.tpl:48 admin/groups/mail/class_groupMail.inc:1099
-#: admin/groups/mail/class_groupMail.inc:1296 personal/mail/generic.tpl:47
-#: personal/mail/class_mailAccount.inc:957
-#: personal/mail/class_mailAccount.inc:1182
-#: personal/mail/class_mailAccount.inc:1352
+#: admin/groups/mail/mail.tpl:56 admin/groups/mail/class_groupMail.inc:793
+#: admin/groups/mail/class_groupMail.inc:918 personal/mail/generic.tpl:57
+#: personal/mail/class_mailAccount.inc:1087
+#: personal/mail/class_mailAccount.inc:1246
+#: personal/mail/class_mailAccount.inc:1398
 msgid "Quota size"
 msgstr "Kontingent-Größe"
 
-#: admin/groups/mail/mail.tpl:53 personal/mail/generic.tpl:234
-msgid "MB"
-msgstr "MB"
-
-#: admin/groups/mail/mail.tpl:59 admin/groups/mail/class_groupMail.inc:1298
+#: admin/groups/mail/mail.tpl:69 admin/groups/mail/class_groupMail.inc:920
 msgid "Folder type"
 msgstr "Ordner-Typ"
 
-#: admin/groups/mail/mail.tpl:85
+#: admin/groups/mail/mail.tpl:87
 msgid "Reload"
 msgstr "Aktualisieren"
 
-#: admin/groups/mail/mail.tpl:102 admin/groups/mail/paste_mail.tpl:23
-#: personal/mail/copypaste.tpl:25 personal/mail/generic.tpl:64
+#: admin/groups/mail/mail.tpl:98 admin/groups/mail/paste_mail.tpl:23
+#: personal/mail/copypaste.tpl:25 personal/mail/generic.tpl:73
 msgid "Alternative addresses"
 msgstr "Alternative Adressen"
 
-#: admin/groups/mail/mail.tpl:105 admin/groups/mail/paste_mail.tpl:24
-#: personal/mail/copypaste.tpl:55 personal/mail/generic.tpl:67
+#: admin/groups/mail/mail.tpl:103 admin/groups/mail/paste_mail.tpl:24
+#: personal/mail/copypaste.tpl:55 personal/mail/generic.tpl:76
 msgid "List of alternative mail addresses"
 msgstr "Liste alternativer Mail-Adressen"
 
-#: admin/groups/mail/mail.tpl:135
+#: admin/groups/mail/mail.tpl:132
 msgid "IMAP shared folders"
 msgstr "Geteilter Ordner"
 
 #: admin/groups/mail/mail.tpl:139
-msgid "Set shared folder permissions"
-msgstr "Setze Berechtigungen für verteilten Ordner"
-
-#: admin/groups/mail/mail.tpl:148
 msgid "Default permission"
 msgstr "Standard-Berechtigungen"
 
-#: admin/groups/mail/mail.tpl:159
+#: admin/groups/mail/mail.tpl:141
 msgid "Member permission"
 msgstr "Mitglieder-Berechtigungen"
 
-#: admin/groups/mail/mail.tpl:176 personal/mail/generic.tpl:295
+#: admin/groups/mail/mail.tpl:169 personal/mail/generic.tpl:303
 msgid "Advanced mail options"
 msgstr "Erweiterte Mail-Einstellungen"
 
-#: admin/groups/mail/mail.tpl:182 personal/mail/generic.tpl:301
+#: admin/groups/mail/mail.tpl:175 personal/mail/generic.tpl:309
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 "Wählen Sie dies, wenn der Benutzer Mails nur innerhalb seiner Domäne senden "
 "und empfangen darf"
 
-#: admin/groups/mail/mail.tpl:184 personal/mail/generic.tpl:303
+#: admin/groups/mail/mail.tpl:177 personal/mail/generic.tpl:311
 msgid "User is only allowed to send and receive local mails"
 msgstr "Der Benutzer darf nur lokale Mails senden und empfangen"
 
-#: admin/groups/mail/mail.tpl:193 admin/groups/mail/paste_mail.tpl:34
+#: admin/groups/mail/mail.tpl:186 admin/groups/mail/paste_mail.tpl:34
 msgid "Forward messages to non group members"
 msgstr "Weiterleiten der Nachrichten an nicht-Gruppenmitglieder"
 
-#: admin/groups/mail/mail.tpl:202
+#: admin/groups/mail/mail.tpl:195
 msgid "Used in all groups"
 msgstr "Verwendet in allen Gruppen"
 
-#: admin/groups/mail/mail.tpl:205
+#: admin/groups/mail/mail.tpl:198
 msgid "Not used in all groups"
 msgstr "Nicht verwendet in allen Gruppen"
 
-#: admin/groups/mail/mail.tpl:223 admin/groups/mail/paste_mail.tpl:42
-#: personal/mail/copypaste.tpl:44 personal/mail/generic.tpl:285
+#: admin/groups/mail/mail.tpl:216 admin/groups/mail/paste_mail.tpl:42
+#: personal/mail/copypaste.tpl:44 personal/mail/generic.tpl:290
+#: personal/mail/generic.tpl:293
 msgid "Add local"
 msgstr "Lokale hinzufügen"
 
 #: admin/groups/mail/paste_mail.tpl:1 personal/mail/copypaste.tpl:1
-#: personal/mail/class_mailAccount.inc:1171
+#: personal/mail/class_mailAccount.inc:1387
 msgid "Mail settings"
 msgstr "Mail-Einstellungen"
 
+#: admin/groups/mail/paste_mail.tpl:12
+msgid "Primary mail address for this shared folder"
+msgstr "Primäre Mail-Adresse dieses geteilten Ordners"
+
 #: admin/groups/mail/mail_locals.tpl:6 personal/mail/mail_locals.tpl:7
 msgid "Select addresses to add"
 msgstr "Wählen Sie die hinzuzufügenden Adressen"
@@ -746,51 +738,70 @@ msgid "Choose"
 msgstr "Wählen"
 
 #: admin/groups/mail/class_groupMail.inc:92
-#: personal/mail/class_mailAccount.inc:94
-#: personal/mail/class_mailAccount.inc:208
-msgid "Configuration error"
-msgstr "Konfigurationsfehler"
+#: admin/groups/mail/class_groupMail.inc:99
+#: admin/groups/mail/class_groupMail.inc:106
+#: admin/groups/mail/class_groupMail.inc:113
+#: admin/groups/mail/class_groupMail.inc:118
+#: admin/groups/mail/class_groupMail.inc:121
+#: admin/groups/mail/class_groupMail.inc:513
+#: admin/groups/mail/class_groupMail.inc:517
+#: admin/groups/mail/class_groupMail.inc:521
+#: admin/groups/mail/class_groupMail.inc:729
+#: admin/groups/mail/class_groupMail.inc:733
+#: admin/groups/mail/class_groupMail.inc:737
+#: admin/groups/mail/class_groupMail.inc:746
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:145
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:902
+#: personal/mail/class_mailAccount.inc:970
+#: personal/mail/class_mailAccount.inc:974
+#: personal/mail/class_mailAccount.inc:978
+#: personal/mail/class_mailAccount.inc:992
+msgid "Mail error"
+msgstr "Mail-Fehler"
 
 #: admin/groups/mail/class_groupMail.inc:92
+#: personal/mail/class_mailAccount.inc:130
 #, php-format
-msgid "Cannot locate mail method '%s'!"
-msgstr "Kann Mail-Methode '%s' nicht finden!"
-
-#: admin/groups/mail/class_groupMail.inc:325
-msgid "read"
-msgstr "lesen"
+msgid "Cannot read quota settings: %s"
+msgstr "Kontingent-Einstellungen können nicht gelesen werden: %s"
 
-#: admin/groups/mail/class_groupMail.inc:326
-msgid "post"
-msgstr "posten"
-
-#: admin/groups/mail/class_groupMail.inc:327
-msgid "external post"
-msgstr "extern posten"
-
-#: admin/groups/mail/class_groupMail.inc:328
-msgid "append"
-msgstr "anhängen"
-
-#: admin/groups/mail/class_groupMail.inc:329
-msgid "write"
-msgstr "schreiben"
+#: admin/groups/mail/class_groupMail.inc:99
+#: personal/mail/class_mailAccount.inc:137
+#, php-format
+msgid "Cannot get list of mailboxes: %s"
+msgstr "Postfach-Liste kann nicht bezogen werden: %s"
 
-#: admin/groups/mail/class_groupMail.inc:330
-msgid "admin"
-msgstr "Administrator"
+#: admin/groups/mail/class_groupMail.inc:106
+#, php-format
+msgid "Cannot receive folder types: %s"
+msgstr "Kann Ordner-Typen nicht ermitteln: %s"
 
-#: admin/groups/mail/class_groupMail.inc:331
-msgid "none"
-msgstr "keine"
+#: admin/groups/mail/class_groupMail.inc:113
+#, php-format
+msgid "Cannot receive folder permissions: %s"
+msgstr "Kann Ordner-Berechtigungen nicht ermitteln: %s"
+
+#: admin/groups/mail/class_groupMail.inc:118
+#: admin/groups/mail/class_groupMail.inc:513
+#: admin/groups/mail/class_groupMail.inc:729
+#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:970
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr "Mail-Methode kann nicht verbinden: %s"
 
-#: admin/groups/mail/class_groupMail.inc:382
-#: admin/groups/mail/class_groupMail.inc:391
-#: admin/groups/mail/class_groupMail.inc:394
-msgid "mail"
-msgstr "Mail"
+#: admin/groups/mail/class_groupMail.inc:121
+#: personal/mail/class_mailAccount.inc:145
+#, php-format
+msgid "Mailbox '%s' doesn't exists on mail server: %s"
+msgstr "Postfach '%s' existiert auf dem Mail-Server nicht: %s"
 
-#: admin/groups/mail/class_groupMail.inc:404
+#: admin/groups/mail/class_groupMail.inc:278
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
@@ -798,143 +809,113 @@ msgstr ""
 "Entferne Shared Folder aus der Datenbank des Mail-Servers, wenn der Eintrag "
 "aus dem LDAP entfernt wird."
 
-#: admin/groups/mail/class_groupMail.inc:405
+#: admin/groups/mail/class_groupMail.inc:279
 msgid "Remove the shared folder and all its contents after saving this account"
-msgstr "Entferne nach dem Speichern dieses Kontos den Shared Folder mitsamt Inhalt."
-
-#: admin/groups/mail/class_groupMail.inc:464
-msgid "forward address"
-msgstr "Weiterleitungs-Adresse"
-
-#: admin/groups/mail/class_groupMail.inc:468
-msgid "Cannot forward to users own mail address!"
-msgstr "Kann nicht an eine Mail-Adresse des gleichen Benutzers weiterleiten!"
-
-#: admin/groups/mail/class_groupMail.inc:494
-msgid "Alternate address"
-msgstr "Weitere Adressen"
-
-#: admin/groups/mail/class_groupMail.inc:648
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: admin/groups/mail/class_groupMail.inc:700
-#: admin/groups/mail/class_groupMail.inc:706
-msgid "Unspecified"
-msgstr "nicht definiert"
-
-#: admin/groups/mail/class_groupMail.inc:700
-msgid "Mails"
-msgstr "Mails"
-
-#: admin/groups/mail/class_groupMail.inc:701
-msgid "Tasks"
-msgstr "Aufgaben"
+msgstr ""
+"Entferne nach dem Speichern dieses Kontos den Shared Folder mitsamt Inhalt."
 
-#: admin/groups/mail/class_groupMail.inc:701
-msgid "Journals"
-msgstr "Journals"
+#: admin/groups/mail/class_groupMail.inc:312
+#: personal/mail/class_mailAccount.inc:294
+msgid "Please select an entry!"
+msgstr "Bitte wählen Sie einen Eintrag!"
 
-#: admin/groups/mail/class_groupMail.inc:702
-msgid "Calendar"
-msgstr "Kalender"
+#: admin/groups/mail/class_groupMail.inc:331
+#: personal/mail/class_mailAccount.inc:312
+msgid "Cannot add primary address to the list of forwarders!"
+msgstr ""
+"Kann die primäre Adresse nicht in die Liste der Weiterleitungen aufnehmen!"
 
-#: admin/groups/mail/class_groupMail.inc:702
-msgid "Contacts"
-msgstr "Kontakte"
+#: admin/groups/mail/class_groupMail.inc:376
+#: personal/mail/class_mailAccount.inc:355
+#, php-format
+msgid "Address is already in use by user '%s'."
+msgstr "Die Adresse wird bereits von Benutzer '%s' verwendet."
 
-#: admin/groups/mail/class_groupMail.inc:703
-msgid "Notes"
-msgstr "Notizen"
+#: admin/groups/mail/class_groupMail.inc:402
+#: personal/mail/class_mailAccount.inc:384
+msgid "Unknown"
+msgstr "Unbekannt"
 
-#: admin/groups/mail/class_groupMail.inc:706
-msgid "Inbox"
-msgstr "Posteingang"
+#: admin/groups/mail/class_groupMail.inc:517
+#: personal/mail/class_mailAccount.inc:902
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr "Kann das Postfach nicht entfernen: %s"
 
-#: admin/groups/mail/class_groupMail.inc:707
-msgid "Drafts"
-msgstr "Entwürfe"
+#: admin/groups/mail/class_groupMail.inc:521
+#: admin/groups/mail/class_groupMail.inc:746
+#, php-format
+msgid "Cannot update shared folder permissions: %s"
+msgstr "Berechtigungen für Gruppen-Ordner können nicht aktualisiert werden: %s"
 
-#: admin/groups/mail/class_groupMail.inc:707
-msgid "Sent items"
-msgstr "Gesendete Objekte"
+#: admin/groups/mail/class_groupMail.inc:611
+msgid "New"
+msgstr "Neu"
 
-#: admin/groups/mail/class_groupMail.inc:708
-msgid "Junk mail"
-msgstr "Unerwünschte Werbung"
+#: admin/groups/mail/class_groupMail.inc:733
+#: personal/mail/class_mailAccount.inc:974
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr "Kann das Postfach nicht aktualisieren: '%s'"
 
-#: admin/groups/mail/class_groupMail.inc:710
-#: personal/mail/sieve/class_sieveElement_If.inc:27
-#: personal/mail/sieve/class_sieveElement_If.inc:33
-msgid "Default"
-msgstr "Standard"
+#: admin/groups/mail/class_groupMail.inc:737
+#: personal/mail/class_mailAccount.inc:978
+#, php-format
+msgid "Cannot write quota settings: %s"
+msgstr "Kann Kontingent-Einstellungen nicht sichern: %s"
 
-#: admin/groups/mail/class_groupMail.inc:1108
-#: personal/mail/class_mailAccount.inc:1194
+#: admin/groups/mail/class_groupMail.inc:802
+#: personal/mail/class_mailAccount.inc:1410
 msgid "Mail max size"
 msgstr "Maximale Mailgröße"
 
-#: admin/groups/mail/class_groupMail.inc:1116
+#: admin/groups/mail/class_groupMail.inc:810
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "Sie müssen die maximale Mail-Größe angeben, um Mails abzuweisen."
 
-#: admin/groups/mail/class_groupMail.inc:1120
-msgid "Please choose valid permission settings. Default permission can't be emtpy."
-msgstr ""
-"Bitte wählen sie gültige Zugriffsrechte. Standard-Zugriffsrechte dürfen "
-"nicht leer sein."
-
-#: admin/groups/mail/class_groupMail.inc:1124
-#: admin/groups/mail/class_groupMail.inc:1297
-#: personal/mail/class_mailAccount.inc:1181
+#: admin/groups/mail/class_groupMail.inc:814
+#: admin/groups/mail/class_groupMail.inc:919
+#: personal/mail/class_mailAccount.inc:1397
 msgid "Mail server"
 msgstr "Mail-Server"
 
-#: admin/groups/mail/class_groupMail.inc:1288
+#: admin/groups/mail/class_groupMail.inc:910
 msgid "Group mail"
 msgstr "Gruppenmail"
 
-#: admin/groups/mail/class_groupMail.inc:1298
+#: admin/groups/mail/class_groupMail.inc:920
 msgid "Kolab"
 msgstr "Kolab"
 
-#: admin/groups/mail/class_groupMail.inc:1299
+#: admin/groups/mail/class_groupMail.inc:921
 msgid "Alternate addresses"
 msgstr "Weitere Adressen"
 
-#: admin/groups/mail/class_groupMail.inc:1300
+#: admin/groups/mail/class_groupMail.inc:922
 msgid "Forwarding addresses"
 msgstr "Weiterleitungs-Adressen"
 
-#: admin/groups/mail/class_groupMail.inc:1301
+#: admin/groups/mail/class_groupMail.inc:923
 msgid "Only local"
 msgstr "Nur lokal"
 
-#: admin/groups/mail/class_groupMail.inc:1302
+#: admin/groups/mail/class_groupMail.inc:924
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: personal/mail/copypaste.tpl:13 personal/mail/generic.tpl:262
+#: personal/mail/copypaste.tpl:13 personal/mail/generic.tpl:267
 msgid "Forward messages to"
 msgstr "Nachrichten weiterleiten an"
 
-#: personal/mail/generic.tpl:23
-msgid "Specify the mail server where the user will be hosted on"
-msgstr "Wählen Sie den Mail-Server, auf dem dieses Konto angelegt werden soll"
-
-#: personal/mail/generic.tpl:92
-msgid "Mail options"
-msgstr "Mail-Einstellungen"
-
-#: personal/mail/generic.tpl:124 personal/mail/class_mailAccount.inc:1202
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1418
 msgid "Use custom sieve script"
 msgstr "Eigenes Sieve-Skript verwenden"
 
-#: personal/mail/generic.tpl:124
+#: personal/mail/generic.tpl:115
 msgid "disables all Mail options!"
 msgstr "schaltet alle übrigen Mail-Einstellungen aus!"
 
-#: personal/mail/generic.tpl:131
+#: personal/mail/generic.tpl:123
 msgid "Sieve Management"
 msgstr "Sieve Verwaltung"
 
@@ -948,54 +929,60 @@ msgstr ""
 msgid "No delivery to own mailbox"
 msgstr "Keine Zustellung in eigenes Postfach"
 
-#: personal/mail/generic.tpl:150
-msgid "Select to automatically response with the vacation message defined below"
+#: personal/mail/generic.tpl:151
+msgid ""
+"Select to automatically response with the vacation message defined below"
 msgstr ""
 "Wählen Sie dies, um automatisch eine Urlaubsmeldung mit dem unten angebenen "
 "Text zu versenden."
 
-#: personal/mail/generic.tpl:152
+#: personal/mail/generic.tpl:153
 msgid "Activate vacation message"
 msgstr "Urlaubsbenachrichtigung aktivieren"
 
-#: personal/mail/generic.tpl:160
+#: personal/mail/generic.tpl:161
 msgid "from"
 msgstr "von"
 
-#: personal/mail/generic.tpl:183
+#: personal/mail/generic.tpl:185
 msgid "till"
 msgstr "bis"
 
-#: personal/mail/generic.tpl:212
+#: personal/mail/generic.tpl:214
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr "Wählen Sie dies, um Mails von Spamassassin filtern zu lassen"
 
-#: personal/mail/generic.tpl:214
+#: personal/mail/generic.tpl:216
 msgid "Move mails tagged with spam level greater than"
 msgstr "Verschiebe Mails mit einem SPAM-Level größer als"
 
-#: personal/mail/generic.tpl:217
+#: personal/mail/generic.tpl:219
 msgid "Choose spam level - smaller values are more sensitive"
-msgstr "Wählen sie den 'SPAM'-Level - kleinere Werte reagieren empfindlicher auf SPAM"
+msgstr ""
+"Wählen sie den 'SPAM'-Level - kleinere Werte reagieren empfindlicher auf SPAM"
 
-#: personal/mail/generic.tpl:221
+#: personal/mail/generic.tpl:223
 msgid "to folder"
 msgstr "in den Ordner"
 
-#: personal/mail/generic.tpl:232
+#: personal/mail/generic.tpl:235
 msgid "Reject mails bigger than"
 msgstr "Mails abweisen, die größer sind als"
 
-#: personal/mail/generic.tpl:241
+#: personal/mail/generic.tpl:238
+msgid "MB"
+msgstr "MB"
+
+#: personal/mail/generic.tpl:245
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/templates/object_container.tpl:31
-#: personal/mail/class_mailAccount.inc:1185
+#: personal/mail/class_mailAccount.inc:1401
 msgid "Vacation message"
 msgstr "Urlaubsbenachrichtigung"
 
-#: personal/mail/generic.tpl:256
+#: personal/mail/generic.tpl:261
 #: personal/mail/sieve/templates/import_script.tpl:12
 #: personal/mail/sieve/templates/edit_frame_base.tpl:7
 msgid "Import"
@@ -1021,7 +1008,8 @@ msgstr "Einlesen erfolgreich"
 
 #: personal/mail/sieve/class_sieveManagement.inc:156
 #, php-format
-msgid "The specified mail server '%s' does not exist within the GOsa configuration."
+msgid ""
+"The specified mail server '%s' does not exist within the GOsa configuration."
 msgstr ""
 "Der angegebene Mail-Server '%s' wurde nicht in Ihrer GOsa-Konfiguration "
 "gefunden."
@@ -1032,11 +1020,13 @@ msgstr "Kein Skriptname angegeben!"
 
 #: personal/mail/sieve/class_sieveManagement.inc:206
 msgid "Please use only lowercase script names!"
-msgstr "Bitte verwenden Sie ausschliesslich Kleinbuchstaben für den Skriptnamen!"
+msgstr ""
+"Bitte verwenden Sie ausschliesslich Kleinbuchstaben für den Skriptnamen!"
 
 #: personal/mail/sieve/class_sieveManagement.inc:212
 msgid "Please use only alphabetical characters in script names!"
-msgstr "Bitte verwenden Sie ausschliesslich Kleinbuchstaben für den Skriptnamen!"
+msgstr ""
+"Bitte verwenden Sie ausschliesslich Kleinbuchstaben für den Skriptnamen!"
 
 #: personal/mail/sieve/class_sieveManagement.inc:218
 msgid "Script name already in use!"
@@ -1053,23 +1043,18 @@ msgstr "Der angegebene Skriptname wird bereits verwendet!"
 #: personal/mail/sieve/class_sieveManagement.inc:770
 #: personal/mail/sieve/class_sieveManagement.inc:1030
 #: personal/mail/sieve/class_sieveManagement.inc:1043
-#: personal/mail/class_mail-methods-cyrus.inc:291
-#: personal/mail/class_mail-methods-cyrus.inc:303
-#: personal/mail/class_mail-methods-cyrus.inc:374
-#: personal/mail/class_mail-methods-cyrus.inc:378
 msgid "SIEVE error"
 msgstr "Sieve-Fehler"
 
 #: personal/mail/sieve/class_sieveManagement.inc:302
 #: personal/mail/sieve/class_sieveManagement.inc:345
 #: personal/mail/sieve/class_sieveManagement.inc:1030
-#: personal/mail/class_mail-methods-cyrus.inc:291
 #, php-format
 msgid "Cannot log into SIEVE server: %s"
 msgstr "Die Anmeldung am Sieve-Server ist fehlgeschlagen: '%s'"
 
 #: personal/mail/sieve/class_sieveManagement.inc:309
-#: personal/mail/class_mail-methods-cyrus.inc:303
+#: personal/mail/class_mail-methods-cyrus.inc:443
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Kann Sieve-Skript nicht beziehen: %s"
@@ -1088,8 +1073,6 @@ msgid "Uploaded script is empty!"
 msgstr "Das hochgeladene Skript ist leer!"
 
 #: personal/mail/sieve/class_sieveManagement.inc:431
-#: personal/mail/class_mail-methods-cyrus.inc:223
-#: personal/mail/class_mail-methods-cyrus.inc:241
 msgid "Internal error"
 msgstr "Interner Fehler"
 
@@ -1257,14 +1240,15 @@ msgstr "Skript bearbeiten"
 #: personal/mail/sieve/class_sieveManagement.inc:672
 #, php-format
 msgid "Can't log into SIEVE server. Server says '%s'."
-msgstr "Die Anmeldung am SIEVE-Server ist fehlgeschlagen. Die Meldung war '%s'."
+msgstr ""
+"Die Anmeldung am SIEVE-Server ist fehlgeschlagen. Die Meldung war '%s'."
 
 #: personal/mail/sieve/class_sieveManagement.inc:770
 msgid "Cannot insert element at the requested position!"
 msgstr "Kann Element nicht in die gewünschte Position einfügen!"
 
 #: personal/mail/sieve/class_sieveManagement.inc:1043
-#: personal/mail/class_mail-methods-cyrus.inc:374
+#: personal/mail/class_mail-methods-cyrus.inc:531
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "Kann Sieve-Skript nicht speichern: %s"
@@ -1559,7 +1543,6 @@ msgstr "aktualisieren"
 
 #: personal/mail/sieve/templates/remove_script.tpl:2
 #: personal/mail/sieve/class_My_Tree.inc:245
-#: personal/mail/class_mail-methods-cyrus.inc:62
 msgid "Warning"
 msgstr "Warnung"
 
@@ -1678,7 +1661,8 @@ msgstr ""
 "Authentifizierungsattribut ist leer."
 
 #: personal/mail/sieve/templates/management.tpl:6
-msgid "Please verify that the attributes uid and mail are not empty and try again."
+msgid ""
+"Please verify that the attributes uid and mail are not empty and try again."
 msgstr ""
 "Bitte überprüfen Sie, dass die Attribute uid und mail nicht leer sind und "
 "versuchen Sie es erneut."
@@ -1721,6 +1705,11 @@ msgstr "Ihr Ablehnungstext"
 msgid "Complete address"
 msgstr "Vollständige Adresse"
 
+#: personal/mail/sieve/class_sieveElement_If.inc:27
+#: personal/mail/sieve/class_sieveElement_If.inc:33
+msgid "Default"
+msgstr "Standard"
+
 #: personal/mail/sieve/class_sieveElement_If.inc:28
 msgid "Domain part"
 msgstr "Domänen-Teil"
@@ -1824,13 +1813,15 @@ msgid "Please specify a valid operator."
 msgstr "Bitte wählen Sie einen gültigen Operator."
 
 #: personal/mail/sieve/class_sieveElement_If.inc:654
-msgid "Invalid character found in address attribute. Quotes are not allowed here."
+msgid ""
+"Invalid character found in address attribute. Quotes are not allowed here."
 msgstr ""
 "Ungültiges Zeichen im Adressattribut gefunden. Anführungszeichen sind nicht "
 "erlaubt."
 
 #: personal/mail/sieve/class_sieveElement_If.inc:669
-msgid "Invalid character found in value attribute. Quotes are not allowed here."
+msgid ""
+"Invalid character found in value attribute. Quotes are not allowed here."
 msgstr ""
 "Ungültiges Zeichen im Wertattribut gefunden. Anführungszeichen sind nicht "
 "erlaubt."
@@ -1857,7 +1848,8 @@ msgstr "Bytes"
 
 #: personal/mail/sieve/class_sieveElement_If.inc:745
 msgid "Please select a valid match type in the list box below."
-msgstr "Bitte wählen Sie eine gültige Art der Übereinstimmung in der Liste unterhalb."
+msgstr ""
+"Bitte wählen Sie eine gültige Art der Übereinstimmung in der Liste unterhalb."
 
 #: personal/mail/sieve/class_sieveElement_If.inc:759
 msgid "Only numeric values are allowed here."
@@ -1888,124 +1880,94 @@ msgstr "Kann letztes Element nicht entfernen!"
 msgid "Require must be the first command in the script."
 msgstr "Require muss das erste Kommando im Skript sein."
 
-#: personal/mail/class_mailAccount.inc:16
+#: personal/mail/class_mailAccount.inc:51
 #: addons/mailqueue/class_mailqueue.inc:7
 msgid "This does something"
 msgstr "Dies tut etwas"
 
-#: personal/mail/class_mailAccount.inc:94
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr "Mail-Methode '%s' ist unbekannt!"
+#: personal/mail/class_mailAccount.inc:620
+#: personal/mail/class_mail-methods.inc:111
+#: personal/mail/class_mail-methods.inc:373
+msgid "Configuration error"
+msgstr "Konfigurationsfehler"
 
-#: personal/mail/class_mailAccount.inc:208
+#: personal/mail/class_mailAccount.inc:620
 #, php-format
 msgid "No DESC tag in vacation template '%s'!"
 msgstr "Kein DESC-Tag in der Abwesenheits-Vorlage '%s'!"
 
-#: personal/mail/class_mailAccount.inc:299
-msgid "Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-"Die Maileinstellungen können nicht entfernt werden, wenn noch Delegationen "
-"konfiguriert sind!"
-
-#: personal/mail/class_mailAccount.inc:347
-msgid "Please select an entry!"
-msgstr "Bitte wählen Sie einen Eintrag!"
-
-#: personal/mail/class_mailAccount.inc:370
-msgid "Cannot add primary address to the list of forwarders!"
-msgstr "Kann die primäre Adresse nicht in die Liste der Weiterleitungen aufnehmen!"
+#: personal/mail/class_mailAccount.inc:649
+#: personal/mail/class_mailAccount.inc:662
+#: personal/mail/class_mailAccount.inc:693
+#: personal/mail/class_mailAccount.inc:706
+msgid "Permission error"
+msgstr "Berechtigungsfehler"
 
-#: personal/mail/class_mailAccount.inc:420
-#, php-format
-msgid "Address is already in use by user '%s'."
-msgstr "Die Adresse wird bereits von Benutzer '%s' verwendet."
+#: personal/mail/class_mailAccount.inc:649
+#: personal/mail/class_mailAccount.inc:662
+#: personal/mail/class_mailAccount.inc:693
+#: personal/mail/class_mailAccount.inc:706
+msgid "You have no permission to modify these addresses!"
+msgstr "Sie haben keine Berechtigung, diese Adressen zu verändern!"
 
-#: personal/mail/class_mailAccount.inc:966
-#: personal/mail/class_mailAccount.inc:974
-#: personal/mail/class_mailAccount.inc:1361
+#: personal/mail/class_mailAccount.inc:1096
+#: personal/mail/class_mailAccount.inc:1104
+#: personal/mail/class_mailAccount.inc:1255
 msgid "Mail reject size"
 msgstr "Maximale Mailgröße"
 
-#: personal/mail/class_mailAccount.inc:978
-#: personal/mail/class_mailAccount.inc:1368
+#: personal/mail/class_mailAccount.inc:1108
+#: personal/mail/class_mailAccount.inc:1262
 msgid "Spam folder"
 msgstr "Ordner für Spam"
 
-#: personal/mail/class_mailAccount.inc:982
-#: personal/mail/class_mailAccount.inc:1373
+#: personal/mail/class_mailAccount.inc:1114
+#: personal/mail/class_mailAccount.inc:1267
 msgid "Vacation interval"
 msgstr "Urlaubsbenachrichtigungs-Intervall"
 
-#: personal/mail/class_mailAccount.inc:1027
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1072
-#: personal/mail/class_mailAccount.inc:1083
-msgid "Permission error"
-msgstr "Berechtigungsfehler"
-
-#: personal/mail/class_mailAccount.inc:1027
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1072
-#: personal/mail/class_mailAccount.inc:1083
-msgid "You have no permission to modify these addresses!"
-msgstr "Sie haben keine Berechtigung, diese Adressen zu verändern!"
-
-#: personal/mail/class_mailAccount.inc:1148
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "Warte auf Entfernung der Mail-Einstellungen durch Kolab..."
-
-#: personal/mail/class_mailAccount.inc:1150
-msgid ""
-"Please remove the mail settings first to allow kolab to call its remove "
-"methods!"
-msgstr ""
-"Bitte entfernen Sie zunächst das Mail-Konto, damit Kolab Gelegenheit hat, "
-"die Löschroutinen aufzurufen!"
-
-#: personal/mail/class_mailAccount.inc:1175
+#: personal/mail/class_mailAccount.inc:1391
 msgid "My account"
 msgstr "Mein Konto"
 
-#: personal/mail/class_mailAccount.inc:1184
+#: personal/mail/class_mailAccount.inc:1400
 msgid "Add vacation information"
 msgstr "Urlaubsinformationen hinzufügen"
 
-#: personal/mail/class_mailAccount.inc:1187
+#: personal/mail/class_mailAccount.inc:1403
 msgid "Use spam filter"
 msgstr "Verwende Spam-Filter"
 
-#: personal/mail/class_mailAccount.inc:1188
+#: personal/mail/class_mailAccount.inc:1404
 msgid "Spam level"
 msgstr "Spam-Level"
 
-#: personal/mail/class_mailAccount.inc:1189
+#: personal/mail/class_mailAccount.inc:1405
 msgid "Spam mail box"
 msgstr "Spam-Postfach"
 
-#: personal/mail/class_mailAccount.inc:1191
+#: personal/mail/class_mailAccount.inc:1407
 msgid "Sieve management"
 msgstr "Sieve Verwaltung"
 
-#: personal/mail/class_mailAccount.inc:1193
+#: personal/mail/class_mailAccount.inc:1409
 msgid "Reject due to mailsize"
 msgstr "Aufgrund der Mail-Größe abweisen"
 
-#: personal/mail/class_mailAccount.inc:1196
-#: personal/mail/class_mailAccount.inc:1201
+#: personal/mail/class_mailAccount.inc:1412
+#: personal/mail/class_mailAccount.inc:1417
 msgid "Forwarding address"
 msgstr "Weiterleitungs-Adresse"
 
-#: personal/mail/class_mailAccount.inc:1197
+#: personal/mail/class_mailAccount.inc:1413
 msgid "Local delivery"
 msgstr "Lokale Zustellung"
 
-#: personal/mail/class_mailAccount.inc:1198
+#: personal/mail/class_mailAccount.inc:1414
 msgid "No delivery to own mailbox "
 msgstr "Keine Zustellung in eigenes Postfach"
 
-#: personal/mail/class_mailAccount.inc:1199
+#: personal/mail/class_mailAccount.inc:1415
 msgid "Mail alternative addresses"
 msgstr "Weitere Adressen"
 
@@ -2013,45 +1975,40 @@ msgstr "Weitere Adressen"
 msgid "User mail settings"
 msgstr "Benutzer Mail-Einstellungen"
 
-#: personal/mail/class_mail-methods-cyrus.inc:62
+#: personal/mail/class_mail-methods.inc:112
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr "Das eingestellte Mail-Attribut '%s' wird nicht unterstützt!"
+
+#: personal/mail/class_mail-methods.inc:374
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr "Mail-Methode '%s' ist unbekannt!"
+
+#: personal/mail/class_mail-methods.inc:600
+#: personal/mail/class_mail-methods.inc:601
+msgid "None"
+msgstr "Keine"
+
+#: personal/mail/class_mail-methods-cyrus.inc:37
 msgid "Mail server for this account is invalid!"
 msgstr "Der Mail-Server für dieses Konto ist ungültig!"
 
-#: personal/mail/class_mail-methods-cyrus.inc:80
-#: personal/mail/class_mail-methods-cyrus.inc:178
-#: personal/mail/class_mail-methods-cyrus.inc:197
-#: personal/mail/class_mail-methods-cyrus.inc:263
+#: personal/mail/class_mail-methods-cyrus.inc:199
 msgid "IMAP error"
 msgstr "IMAP-Fehler"
 
-#: personal/mail/class_mail-methods-cyrus.inc:80
-msgid "Cannot store mail settings on IMAP server!"
-msgstr "Kann Mail-Einstellungen nicht auf dem IMAP-Server speichern!"
-
-#: personal/mail/class_mail-methods-cyrus.inc:178
-#, php-format
-msgid "Cannot create IMAP mailbox: %s"
-msgstr "Kann das IMAP-Postfach nicht anlegen: '%s'"
-
-#: personal/mail/class_mail-methods-cyrus.inc:197
+#: personal/mail/class_mail-methods-cyrus.inc:199
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr "Kann das IMAP-Postfach nicht verändern: '%s'"
 
-#: personal/mail/class_mail-methods-cyrus.inc:223
-msgid "Cannot remove IMAP ACL: imap_getacl not implemented!"
-msgstr "Kann die IMAP-ACL nicht entfernen: imap_getacl nicht implementiert!"
-
-#: personal/mail/class_mail-methods-cyrus.inc:241
-msgid "Cannot retrieve IMAP ACL: imap_getacl not implemented!"
-msgstr "Kann die IMAP-ACLs nicht beziehen: imap_getacl nicht implementiert!"
+#: personal/mail/class_mail-methods-cyrus.inc:328
+#: personal/mail/class_mail-methods-cyrus.inc:365
+msgid "The module imap_getacl is not implemented!"
+msgstr "Die Funktion imap_getacl ist nicht implementiert!"
 
-#: personal/mail/class_mail-methods-cyrus.inc:263
-#, php-format
-msgid "Cannot remove IMAP mailbox: %s"
-msgstr "Kann das IMAP-Postfach nicht entfernen: '%s'"
-
-#: personal/mail/class_mail-methods-cyrus.inc:378
+#: personal/mail/class_mail-methods-cyrus.inc:538
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr "Kann das Sieve-Skript nicht aktivieren: %s"
@@ -2189,7 +2146,8 @@ msgstr "Alle Nachrichten in der Warteschlange des gewählten Servers freigeben"
 
 #: addons/mailqueue/contents.tpl:49
 msgid "Requeue all messages in selected servers queue"
-msgstr "Alle Nachrichten in der Warteschlange des gewählten Servers wieder einreihen"
+msgstr ""
+"Alle Nachrichten in der Warteschlange des gewählten Servers wieder einreihen"
 
 #: addons/mailqueue/contents.tpl:63
 msgid "Search returned no results"
@@ -2250,4 +2208,3 @@ msgstr "Kopfzeilen"
 #: addons/mailqueue/contents.tpl:134
 msgid "Display header of this message"
 msgstr "Zeige Kopfzeilen dieser Nachricht"
-

diff --git a/gosa-plugins/mail/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/es/LC_MESSAGES/messages.po
index ee3ecfb4c093ec90a76e63152df60cf8272c6a99..a760b103de590a3d2899f59661126d7b51e33652 100644 (file)
--- a/gosa-plugins/mail/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/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: 2008-12-03 15:05+0100\n"
+"POT-Creation-Date: 2008-12-10 10:53+0100\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
@@ -21,9 +21,10 @@ msgstr ""
 msgid "Mail distribution list"
 msgstr ""
 
-#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/mail.tpl:10
-#: admin/groups/mail/paste_mail.tpl:8 personal/mail/copypaste.tpl:7
-#: personal/mail/generic.tpl:8 personal/mail/class_mailAccount.inc:931
+#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/mail.tpl:7
+#: admin/groups/mail/paste_mail.tpl:8
+#: admin/groups/mail/class_groupMail.inc:784 personal/mail/copypaste.tpl:7
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1060
 msgid "Primary address"
 msgstr ""
 
@@ -32,7 +33,6 @@ msgid "Primary mail address for this distribution list"
 msgstr ""
 
 #: admin/ogroups/mail/class_mailogroup.inc:50
-#: admin/groups/mail/class_groupMail.inc:390
 msgid "Remove mail account"
 msgstr "Eliminar cuenta de correo"
 
@@ -42,31 +42,30 @@ msgid "mail group"
 msgstr ""
 
 #: admin/ogroups/mail/class_mailogroup.inc:53
-#: admin/groups/mail/class_groupMail.inc:393
 msgid "Create mail account"
 msgstr "Crear cuenta de correo"
 
 #: admin/ogroups/mail/class_mailogroup.inc:86
 #: admin/ogroups/mail/class_mailogroup.inc:93
 #: admin/ogroups/mail/class_mailogroup.inc:194
-#: admin/groups/mail/class_groupMail.inc:499
-#: admin/groups/mail/class_groupMail.inc:1084
-#: admin/groups/mail/class_groupMail.inc:1087
-#: admin/groups/mail/class_groupMail.inc:1093
-#: admin/groups/mail/class_groupMail.inc:1295
-#: personal/mail/class_mailAccount.inc:364
-#: personal/mail/class_mailAccount.inc:400
-#: personal/mail/class_mailAccount.inc:408
-#: personal/mail/class_mailAccount.inc:419
-#: personal/mail/class_mailAccount.inc:935
-#: personal/mail/class_mailAccount.inc:939
-#: personal/mail/class_mailAccount.inc:950
-#: personal/mail/class_mailAccount.inc:1180
+#: admin/groups/mail/class_groupMail.inc:325
+#: admin/groups/mail/class_groupMail.inc:360
+#: admin/groups/mail/class_groupMail.inc:366
+#: admin/groups/mail/class_groupMail.inc:375
+#: admin/groups/mail/class_groupMail.inc:786
+#: admin/groups/mail/class_groupMail.inc:917
+#: personal/mail/class_mailAccount.inc:306
+#: personal/mail/class_mailAccount.inc:341
+#: personal/mail/class_mailAccount.inc:346
+#: personal/mail/class_mailAccount.inc:354
+#: personal/mail/class_mailAccount.inc:1064
+#: personal/mail/class_mailAccount.inc:1068
+#: personal/mail/class_mailAccount.inc:1079
+#: personal/mail/class_mailAccount.inc:1396
 msgid "Mail address"
 msgstr "Dirección correo electrónico"
 
 #: admin/ogroups/mail/class_mailogroup.inc:86
-#: admin/groups/mail/class_groupMail.inc:1087
 msgid "your-name@your-domain.com"
 msgstr ""
 
@@ -76,27 +75,33 @@ msgstr ""
 #: admin/systems/services/spam/class_goSpamServer.inc:277
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/mail/class_goMailServer.inc:582
-#: admin/groups/mail/class_groupMail.inc:794
-#: admin/groups/mail/class_groupMail.inc:1048
-#: personal/mail/class_mailAccount.inc:694
-#: personal/mail/class_mailAccount.inc:862
+#: admin/groups/mail/class_groupMail.inc:501
+#: admin/groups/mail/class_groupMail.inc:716
+#: personal/mail/class_mailAccount.inc:889
+#: personal/mail/class_mailAccount.inc:956
 #, fuzzy
 msgid "LDAP error"
 msgstr "Servicio IMAP"
 
 #: admin/ogroups/mail/class_mailogroup.inc:186
 #: admin/ogroups/mail/paste_mail.tpl:4
-#: admin/groups/mail/class_groupMail.inc:1287
-#: personal/mail/class_mailAccount.inc:15
-#: personal/mail/class_mailAccount.inc:288
-#: personal/mail/class_mailAccount.inc:298
-#: personal/mail/class_mailAccount.inc:301
-#: personal/mail/class_mailAccount.inc:302
-#: personal/mail/class_mailAccount.inc:305
-#: personal/mail/class_mailAccount.inc:306
-#: personal/mail/class_mailAccount.inc:926
-#: personal/mail/class_mailAccount.inc:1170
-#: personal/mail/class_mailAccount.inc:1346
+#: admin/groups/mail/class_groupMail.inc:257
+#: admin/groups/mail/class_groupMail.inc:259
+#: admin/groups/mail/class_groupMail.inc:260
+#: admin/groups/mail/class_groupMail.inc:265
+#: admin/groups/mail/class_groupMail.inc:267
+#: admin/groups/mail/class_groupMail.inc:268
+#: admin/groups/mail/class_groupMail.inc:774
+#: admin/groups/mail/class_groupMail.inc:909
+#: personal/mail/class_mailAccount.inc:50
+#: personal/mail/class_mailAccount.inc:222
+#: personal/mail/class_mailAccount.inc:230
+#: personal/mail/class_mailAccount.inc:232
+#: personal/mail/class_mailAccount.inc:237
+#: personal/mail/class_mailAccount.inc:239
+#: personal/mail/class_mailAccount.inc:1048
+#: personal/mail/class_mailAccount.inc:1240
+#: personal/mail/class_mailAccount.inc:1386
 msgid "Mail"
 msgstr "Correo Electrónico"
 
@@ -214,7 +219,7 @@ msgid "Start POP3 SSL service"
 msgstr "Iniciar servicio POP3/SSL"
 
 #: admin/systems/services/imap/goImapServer.tpl:1
-#: admin/systems/services/mail/goMailServer.tpl:1 admin/groups/mail/mail.tpl:7
+#: admin/systems/services/mail/goMailServer.tpl:1 admin/groups/mail/mail.tpl:4
 #: personal/mail/generic.tpl:5
 msgid "Generic"
 msgstr "Genérico"
@@ -261,27 +266,29 @@ msgstr "Spamassassin"
 
 #: admin/systems/services/spam/class_goSpamServer.inc:143
 #: admin/systems/services/spam/class_goSpamServer.inc:216
-#: admin/groups/mail/class_groupMail.inc:464
-#: admin/groups/mail/class_groupMail.inc:468
-#: admin/groups/mail/class_groupMail.inc:494
-#: admin/groups/mail/class_groupMail.inc:499
+#: admin/groups/mail/class_groupMail.inc:312
+#: admin/groups/mail/class_groupMail.inc:325
+#: admin/groups/mail/class_groupMail.inc:331
+#: admin/groups/mail/class_groupMail.inc:360
+#: admin/groups/mail/class_groupMail.inc:366
+#: admin/groups/mail/class_groupMail.inc:375
 #: personal/mail/sieve/class_sieveManagement.inc:201
 #: personal/mail/sieve/class_sieveManagement.inc:206
 #: personal/mail/sieve/class_sieveManagement.inc:212
 #: personal/mail/sieve/class_sieveManagement.inc:218
 #: personal/mail/sieve/class_sieveManagement.inc:429
 #: personal/mail/sieve/class_My_Tree.inc:660
-#: personal/mail/class_mailAccount.inc:347
-#: personal/mail/class_mailAccount.inc:363
-#: personal/mail/class_mailAccount.inc:370
-#: personal/mail/class_mailAccount.inc:399
-#: personal/mail/class_mailAccount.inc:407
-#: personal/mail/class_mailAccount.inc:419
+#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:306
+#: personal/mail/class_mailAccount.inc:312
+#: personal/mail/class_mailAccount.inc:341
+#: personal/mail/class_mailAccount.inc:346
+#: personal/mail/class_mailAccount.inc:354
 #: addons/mailqueue/class_mailqueue.inc:110
 #: addons/mailqueue/class_mailqueue.inc:144
 #: addons/mailqueue/class_mailqueue.inc:150
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #: admin/systems/services/spam/class_goSpamServer.inc:216
 #, fuzzy
@@ -346,7 +353,6 @@ msgstr ""
 #: admin/systems/services/spam/goSpamServer.tpl:48
 #: admin/systems/services/mail/goMailServer.tpl:73
 #: admin/systems/services/mail/goMailServer.tpl:104
-#: admin/groups/mail/class_groupMail.inc:654
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -591,121 +597,106 @@ msgstr ""
 msgid "Restriction filter"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:14 personal/mail/generic.tpl:11
-msgid "Multiple edit"
-msgstr ""
-
-#: admin/groups/mail/mail.tpl:17 admin/groups/mail/paste_mail.tpl:12
-msgid "Primary mail address for this shared folder"
-msgstr ""
-
-#: admin/groups/mail/mail.tpl:23 personal/mail/generic.tpl:20
+#: admin/groups/mail/mail.tpl:35 personal/mail/generic.tpl:30
 #: addons/mailqueue/contents.tpl:73
 msgid "Server"
 msgstr "Servidor"
 
-#: admin/groups/mail/mail.tpl:26
-msgid "Select mail server to place user on"
+#: admin/groups/mail/mail.tpl:39 personal/mail/generic.tpl:37
+msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:36 personal/mail/generic.tpl:34
+#: admin/groups/mail/mail.tpl:52 personal/mail/generic.tpl:53
 msgid "Quota usage"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:43 personal/mail/generic.tpl:41
-msgid "not defined"
-msgstr "sin definirse"
-
-#: admin/groups/mail/mail.tpl:48 admin/groups/mail/class_groupMail.inc:1099
-#: admin/groups/mail/class_groupMail.inc:1296 personal/mail/generic.tpl:47
-#: personal/mail/class_mailAccount.inc:957
-#: personal/mail/class_mailAccount.inc:1182
-#: personal/mail/class_mailAccount.inc:1352
+#: admin/groups/mail/mail.tpl:56 admin/groups/mail/class_groupMail.inc:793
+#: admin/groups/mail/class_groupMail.inc:918 personal/mail/generic.tpl:57
+#: personal/mail/class_mailAccount.inc:1087
+#: personal/mail/class_mailAccount.inc:1246
+#: personal/mail/class_mailAccount.inc:1398
 msgid "Quota size"
 msgstr "Tamaño de cuota"
 
-#: admin/groups/mail/mail.tpl:53 personal/mail/generic.tpl:234
-msgid "MB"
-msgstr "Mb"
-
-#: admin/groups/mail/mail.tpl:59 admin/groups/mail/class_groupMail.inc:1298
+#: admin/groups/mail/mail.tpl:69 admin/groups/mail/class_groupMail.inc:920
 #, fuzzy
 msgid "Folder type"
 msgstr "Tipo de ratón"
 
-#: admin/groups/mail/mail.tpl:85
+#: admin/groups/mail/mail.tpl:87
 msgid "Reload"
-msgstr ""
+msgstr "Recargar"
 
-#: admin/groups/mail/mail.tpl:102 admin/groups/mail/paste_mail.tpl:23
-#: personal/mail/copypaste.tpl:25 personal/mail/generic.tpl:64
+#: admin/groups/mail/mail.tpl:98 admin/groups/mail/paste_mail.tpl:23
+#: personal/mail/copypaste.tpl:25 personal/mail/generic.tpl:73
 msgid "Alternative addresses"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:105 admin/groups/mail/paste_mail.tpl:24
-#: personal/mail/copypaste.tpl:55 personal/mail/generic.tpl:67
+#: admin/groups/mail/mail.tpl:103 admin/groups/mail/paste_mail.tpl:24
+#: personal/mail/copypaste.tpl:55 personal/mail/generic.tpl:76
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:135
+#: admin/groups/mail/mail.tpl:132
 msgid "IMAP shared folders"
 msgstr ""
 
 #: admin/groups/mail/mail.tpl:139
-msgid "Set shared folder permissions"
-msgstr ""
-
-#: admin/groups/mail/mail.tpl:148
 msgid "Default permission"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:159
+#: admin/groups/mail/mail.tpl:141
 msgid "Member permission"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:176 personal/mail/generic.tpl:295
+#: admin/groups/mail/mail.tpl:169 personal/mail/generic.tpl:303
 msgid "Advanced mail options"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:182 personal/mail/generic.tpl:301
+#: admin/groups/mail/mail.tpl:175 personal/mail/generic.tpl:309
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:184 personal/mail/generic.tpl:303
+#: admin/groups/mail/mail.tpl:177 personal/mail/generic.tpl:311
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:193 admin/groups/mail/paste_mail.tpl:34
+#: admin/groups/mail/mail.tpl:186 admin/groups/mail/paste_mail.tpl:34
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:202
+#: admin/groups/mail/mail.tpl:195
 #, fuzzy
 msgid "Used in all groups"
 msgstr "Mostrar grupos funcionales"
 
-#: admin/groups/mail/mail.tpl:205
+#: admin/groups/mail/mail.tpl:198
 #, fuzzy
 msgid "Not used in all groups"
 msgstr "Mostrar grupos funcionales"
 
-#: admin/groups/mail/mail.tpl:223 admin/groups/mail/paste_mail.tpl:42
-#: personal/mail/copypaste.tpl:44 personal/mail/generic.tpl:285
+#: admin/groups/mail/mail.tpl:216 admin/groups/mail/paste_mail.tpl:42
+#: personal/mail/copypaste.tpl:44 personal/mail/generic.tpl:290
+#: personal/mail/generic.tpl:293
 msgid "Add local"
 msgstr ""
 
 #: admin/groups/mail/paste_mail.tpl:1 personal/mail/copypaste.tpl:1
-#: personal/mail/class_mailAccount.inc:1171
+#: personal/mail/class_mailAccount.inc:1387
 msgid "Mail settings"
 msgstr "Parámetros de correo"
 
+#: admin/groups/mail/paste_mail.tpl:12
+msgid "Primary mail address for this shared folder"
+msgstr ""
+
 #: admin/groups/mail/mail_locals.tpl:6 personal/mail/mail_locals.tpl:7
 msgid "Select addresses to add"
 msgstr ""
 
 #: admin/groups/mail/mail_locals.tpl:22 personal/mail/mail_locals.tpl:25
 msgid "Filters"
-msgstr ""
+msgstr "Filtros"
 
 #: admin/groups/mail/mail_locals.tpl:32
 msgid "Display addresses of department"
@@ -713,7 +704,7 @@ msgstr ""
 
 #: admin/groups/mail/mail_locals.tpl:33 personal/mail/mail_locals.tpl:38
 msgid "Choose the department the search will be based on"
-msgstr ""
+msgstr "Escoja el departamento base de la búsqueda"
 
 #: admin/groups/mail/mail_locals.tpl:42
 msgid "Display addresses matching"
@@ -721,7 +712,7 @@ msgstr ""
 
 #: admin/groups/mail/mail_locals.tpl:45 personal/mail/mail_locals.tpl:52
 msgid "Regular expression for matching addresses"
-msgstr ""
+msgstr "Expresiones regulares para buscar direcciones"
 
 #: admin/groups/mail/mail_locals.tpl:52 personal/mail/mail_locals.tpl:60
 msgid "Display addresses of user"
@@ -744,53 +735,71 @@ msgid "Choose"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:92
-#: personal/mail/class_mailAccount.inc:94
-#: personal/mail/class_mailAccount.inc:208
+#: admin/groups/mail/class_groupMail.inc:99
+#: admin/groups/mail/class_groupMail.inc:106
+#: admin/groups/mail/class_groupMail.inc:113
+#: admin/groups/mail/class_groupMail.inc:118
+#: admin/groups/mail/class_groupMail.inc:121
+#: admin/groups/mail/class_groupMail.inc:513
+#: admin/groups/mail/class_groupMail.inc:517
+#: admin/groups/mail/class_groupMail.inc:521
+#: admin/groups/mail/class_groupMail.inc:729
+#: admin/groups/mail/class_groupMail.inc:733
+#: admin/groups/mail/class_groupMail.inc:737
+#: admin/groups/mail/class_groupMail.inc:746
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:145
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:902
+#: personal/mail/class_mailAccount.inc:970
+#: personal/mail/class_mailAccount.inc:974
+#: personal/mail/class_mailAccount.inc:978
+#: personal/mail/class_mailAccount.inc:992
 #, fuzzy
-msgid "Configuration error"
-msgstr "Se puede escribir en la configuración"
+msgid "Mail error"
+msgstr "Servidor de correo"
 
 #: admin/groups/mail/class_groupMail.inc:92
+#: personal/mail/class_mailAccount.inc:130
 #, fuzzy, php-format
-msgid "Cannot locate mail method '%s'!"
-msgstr "No puedo crear el fichero '%s'."
-
-#: admin/groups/mail/class_groupMail.inc:325
-msgid "read"
-msgstr "leer"
-
-#: admin/groups/mail/class_groupMail.inc:326
-msgid "post"
-msgstr "enviar"
-
-#: admin/groups/mail/class_groupMail.inc:327
-msgid "external post"
-msgstr "envío externo"
-
-#: admin/groups/mail/class_groupMail.inc:328
-msgid "append"
-msgstr "añadir"
+msgid "Cannot read quota settings: %s"
+msgstr "¡No se puede escribir en el archivo de revisión!"
 
-#: admin/groups/mail/class_groupMail.inc:329
-msgid "write"
-msgstr "escribir"
+#: admin/groups/mail/class_groupMail.inc:99
+#: personal/mail/class_mailAccount.inc:137
+#, fuzzy, php-format
+msgid "Cannot get list of mailboxes: %s"
+msgstr "No puedo crear el fichero '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:330
-msgid "admin"
-msgstr "Administrador"
+#: admin/groups/mail/class_groupMail.inc:106
+#, fuzzy, php-format
+msgid "Cannot receive folder types: %s"
+msgstr "No se pueden modificar los permisos para '%s'"
 
-#: admin/groups/mail/class_groupMail.inc:331
-msgid "none"
-msgstr "ninguno"
+#: admin/groups/mail/class_groupMail.inc:113
+#, fuzzy, php-format
+msgid "Cannot receive folder permissions: %s"
+msgstr "No se pueden modificar los permisos para '%s'"
+
+#: admin/groups/mail/class_groupMail.inc:118
+#: admin/groups/mail/class_groupMail.inc:513
+#: admin/groups/mail/class_groupMail.inc:729
+#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:970
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:382
-#: admin/groups/mail/class_groupMail.inc:391
-#: admin/groups/mail/class_groupMail.inc:394
-#, fuzzy
-msgid "mail"
-msgstr "Correo Electrónico"
+#: admin/groups/mail/class_groupMail.inc:121
+#: personal/mail/class_mailAccount.inc:145
+#, php-format
+msgid "Mailbox '%s' doesn't exists on mail server: %s"
+msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:404
+#: admin/groups/mail/class_groupMail.inc:278
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
@@ -798,155 +807,122 @@ msgstr ""
 "Cuando la entrada sea eliminada de LDAP se eliminara la carpeta compartida "
 "del servidor de correo."
 
-#: admin/groups/mail/class_groupMail.inc:405
+#: admin/groups/mail/class_groupMail.inc:279
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 "Despues de grabar esta cuenta se eliminara la carpeta compartida y todo su "
 "contenido"
 
-#: admin/groups/mail/class_groupMail.inc:464
-#, fuzzy
-msgid "forward address"
-msgstr "Direcciones de reenvío"
-
-#: admin/groups/mail/class_groupMail.inc:468
-#, fuzzy
-msgid "Cannot forward to users own mail address!"
-msgstr "Esta intentando añadir una dirección de correo no valida"
-
-#: admin/groups/mail/class_groupMail.inc:494
+#: admin/groups/mail/class_groupMail.inc:312
+#: personal/mail/class_mailAccount.inc:294
 #, fuzzy
-msgid "Alternate address"
-msgstr "Direcciones alternativas"
-
-#: admin/groups/mail/class_groupMail.inc:648
-msgid "Add"
-msgstr "Añadir"
-
-#: admin/groups/mail/class_groupMail.inc:700
-#: admin/groups/mail/class_groupMail.inc:706
-msgid "Unspecified"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:700
-#, fuzzy
-msgid "Mails"
-msgstr "Correo Electrónico"
+msgid "Please select an entry!"
+msgstr "Por favor seleccione un servidor de correo valido."
 
-#: admin/groups/mail/class_groupMail.inc:701
+#: admin/groups/mail/class_groupMail.inc:331
+#: personal/mail/class_mailAccount.inc:312
 #, fuzzy
-msgid "Tasks"
-msgstr "Días para tareas OX"
-
-#: admin/groups/mail/class_groupMail.inc:701
-msgid "Journals"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:702
-msgid "Calendar"
+msgid "Cannot add primary address to the list of forwarders!"
 msgstr ""
+"Esta intentando añadir una dirección de correo no valida a la lista de "
+"reenvío."
 
-#: admin/groups/mail/class_groupMail.inc:702
-msgid "Contacts"
+#: admin/groups/mail/class_groupMail.inc:376
+#: personal/mail/class_mailAccount.inc:355
+#, fuzzy, php-format
+msgid "Address is already in use by user '%s'."
 msgstr ""
+"La dirección de correo que esta intentando añadir, ya esta usada por otro "
+"usuario"
 
-#: admin/groups/mail/class_groupMail.inc:703
-#, fuzzy
-msgid "Notes"
-msgstr "Ninguno"
-
-#: admin/groups/mail/class_groupMail.inc:706
-msgid "Inbox"
-msgstr ""
+#: admin/groups/mail/class_groupMail.inc:402
+#: personal/mail/class_mailAccount.inc:384
+msgid "Unknown"
+msgstr "Desconocido"
 
-#: admin/groups/mail/class_groupMail.inc:707
-msgid "Drafts"
-msgstr ""
+#: admin/groups/mail/class_groupMail.inc:517
+#: personal/mail/class_mailAccount.inc:902
+#, fuzzy, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr "No puedo crear el fichero '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:707
-msgid "Sent items"
-msgstr ""
+#: admin/groups/mail/class_groupMail.inc:521
+#: admin/groups/mail/class_groupMail.inc:746
+#, fuzzy, php-format
+msgid "Cannot update shared folder permissions: %s"
+msgstr "No se pueden modificar los permisos para '%s'"
 
-#: admin/groups/mail/class_groupMail.inc:708
+#: admin/groups/mail/class_groupMail.inc:611
 #, fuzzy
-msgid "Junk mail"
-msgstr "Grupo de correo"
+msgid "New"
+msgstr "Nueva ACL"
 
-#: admin/groups/mail/class_groupMail.inc:710
-#: personal/mail/sieve/class_sieveElement_If.inc:27
-#: personal/mail/sieve/class_sieveElement_If.inc:33
-msgid "Default"
-msgstr ""
+#: admin/groups/mail/class_groupMail.inc:733
+#: personal/mail/class_mailAccount.inc:974
+#, fuzzy, php-format
+msgid "Cannot update mailbox: %s"
+msgstr "No puedo crear el fichero '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:1108
-#: personal/mail/class_mailAccount.inc:1194
+#: admin/groups/mail/class_groupMail.inc:737
+#: personal/mail/class_mailAccount.inc:978
+#, fuzzy, php-format
+msgid "Cannot write quota settings: %s"
+msgstr "¡No se puede escribir en el archivo de revisión!"
+
+#: admin/groups/mail/class_groupMail.inc:802
+#: personal/mail/class_mailAccount.inc:1410
 msgid "Mail max size"
 msgstr "Tamaño máximo del mensaje"
 
-#: admin/groups/mail/class_groupMail.inc:1116
+#: admin/groups/mail/class_groupMail.inc:810
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 "Necesita introducir un valor máximo de tamaño de mensajes para poder "
 "rechazar mensajes."
 
-#: admin/groups/mail/class_groupMail.inc:1120
-msgid ""
-"Please choose valid permission settings. Default permission can't be emtpy."
-msgstr ""
-"Por favor seleccione una configuración valida de permisos. No se puede dejar "
-"en blanco los permisos por defecto."
-
-#: admin/groups/mail/class_groupMail.inc:1124
-#: admin/groups/mail/class_groupMail.inc:1297
-#: personal/mail/class_mailAccount.inc:1181
+#: admin/groups/mail/class_groupMail.inc:814
+#: admin/groups/mail/class_groupMail.inc:919
+#: personal/mail/class_mailAccount.inc:1397
 msgid "Mail server"
 msgstr "Servidor de correo"
 
-#: admin/groups/mail/class_groupMail.inc:1288
+#: admin/groups/mail/class_groupMail.inc:910
 msgid "Group mail"
 msgstr "Grupo de correo"
 
-#: admin/groups/mail/class_groupMail.inc:1298
+#: admin/groups/mail/class_groupMail.inc:920
 msgid "Kolab"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1299
+#: admin/groups/mail/class_groupMail.inc:921
 msgid "Alternate addresses"
 msgstr "Direcciones alternativas"
 
-#: admin/groups/mail/class_groupMail.inc:1300
+#: admin/groups/mail/class_groupMail.inc:922
 msgid "Forwarding addresses"
 msgstr "Direcciones de reenvío"
 
-#: admin/groups/mail/class_groupMail.inc:1301
+#: admin/groups/mail/class_groupMail.inc:923
 msgid "Only local"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1302
+#: admin/groups/mail/class_groupMail.inc:924
 msgid "Permissions"
 msgstr "Permisos"
 
-#: personal/mail/copypaste.tpl:13 personal/mail/generic.tpl:262
+#: personal/mail/copypaste.tpl:13 personal/mail/generic.tpl:267
 msgid "Forward messages to"
 msgstr ""
 
-#: personal/mail/generic.tpl:23
-msgid "Specify the mail server where the user will be hosted on"
-msgstr ""
-
-#: personal/mail/generic.tpl:92
-msgid "Mail options"
-msgstr ""
-
-#: personal/mail/generic.tpl:124 personal/mail/class_mailAccount.inc:1202
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1418
 msgid "Use custom sieve script"
 msgstr "Usar 'script Sieve' propios"
 
-#: personal/mail/generic.tpl:124
+#: personal/mail/generic.tpl:115
 msgid "disables all Mail options!"
 msgstr ""
 
-#: personal/mail/generic.tpl:131
+#: personal/mail/generic.tpl:123
 msgid "Sieve Management"
 msgstr ""
 
@@ -958,53 +934,57 @@ msgstr ""
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: personal/mail/generic.tpl:150
+#: personal/mail/generic.tpl:151
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: personal/mail/generic.tpl:152
+#: personal/mail/generic.tpl:153
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/generic.tpl:160
+#: personal/mail/generic.tpl:161
 msgid "from"
-msgstr ""
+msgstr "desde"
 
-#: personal/mail/generic.tpl:183
+#: personal/mail/generic.tpl:185
 msgid "till"
 msgstr ""
 
-#: personal/mail/generic.tpl:212
+#: personal/mail/generic.tpl:214
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr ""
 
-#: personal/mail/generic.tpl:214
+#: personal/mail/generic.tpl:216
 msgid "Move mails tagged with spam level greater than"
 msgstr ""
 
-#: personal/mail/generic.tpl:217
+#: personal/mail/generic.tpl:219
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 
-#: personal/mail/generic.tpl:221
+#: personal/mail/generic.tpl:223
 msgid "to folder"
 msgstr ""
 
-#: personal/mail/generic.tpl:232
+#: personal/mail/generic.tpl:235
 msgid "Reject mails bigger than"
 msgstr ""
 
-#: personal/mail/generic.tpl:241
+#: personal/mail/generic.tpl:238
+msgid "MB"
+msgstr "Mb"
+
+#: personal/mail/generic.tpl:245
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/templates/object_container.tpl:31
-#: personal/mail/class_mailAccount.inc:1185
+#: personal/mail/class_mailAccount.inc:1401
 msgid "Vacation message"
 msgstr "Mensaje de ausencia"
 
-#: personal/mail/generic.tpl:256
+#: personal/mail/generic.tpl:261
 #: personal/mail/sieve/templates/import_script.tpl:12
 #: personal/mail/sieve/templates/edit_frame_base.tpl:7
 msgid "Import"
@@ -1063,23 +1043,18 @@ msgstr "El nombre introducido ya esta siendo usado"
 #: personal/mail/sieve/class_sieveManagement.inc:770
 #: personal/mail/sieve/class_sieveManagement.inc:1030
 #: personal/mail/sieve/class_sieveManagement.inc:1043
-#: personal/mail/class_mail-methods-cyrus.inc:291
-#: personal/mail/class_mail-methods-cyrus.inc:303
-#: personal/mail/class_mail-methods-cyrus.inc:374
-#: personal/mail/class_mail-methods-cyrus.inc:378
 msgid "SIEVE error"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:302
 #: personal/mail/sieve/class_sieveManagement.inc:345
 #: personal/mail/sieve/class_sieveManagement.inc:1030
-#: personal/mail/class_mail-methods-cyrus.inc:291
 #, php-format
 msgid "Cannot log into SIEVE server: %s"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:309
-#: personal/mail/class_mail-methods-cyrus.inc:303
+#: personal/mail/class_mail-methods-cyrus.inc:443
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
@@ -1098,8 +1073,6 @@ msgid "Uploaded script is empty!"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:431
-#: personal/mail/class_mail-methods-cyrus.inc:223
-#: personal/mail/class_mail-methods-cyrus.inc:241
 #, fuzzy
 msgid "Internal error"
 msgstr "Insertar separador"
@@ -1275,7 +1248,7 @@ msgid "Cannot insert element at the requested position!"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:1043
-#: personal/mail/class_mail-methods-cyrus.inc:374
+#: personal/mail/class_mail-methods-cyrus.inc:531
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
@@ -1311,7 +1284,7 @@ msgstr "Continuar"
 
 #: personal/mail/sieve/templates/add_element.tpl:13
 msgid "Abort"
-msgstr ""
+msgstr "Cancelar"
 
 #: personal/mail/sieve/templates/element_discard.tpl:9
 msgid "Discard message"
@@ -1566,7 +1539,6 @@ msgstr ""
 
 #: personal/mail/sieve/templates/remove_script.tpl:2
 #: personal/mail/sieve/class_My_Tree.inc:245
-#: personal/mail/class_mail-methods-cyrus.inc:62
 msgid "Warning"
 msgstr "Aviso"
 
@@ -1716,6 +1688,11 @@ msgstr ""
 msgid "Complete address"
 msgstr ""
 
+#: personal/mail/sieve/class_sieveElement_If.inc:27
+#: personal/mail/sieve/class_sieveElement_If.inc:33
+msgid "Default"
+msgstr ""
+
 #: personal/mail/sieve/class_sieveElement_If.inc:28
 msgid "Domain part"
 msgstr ""
@@ -1881,138 +1858,100 @@ msgstr ""
 msgid "Require must be the first command in the script."
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:16
+#: personal/mail/class_mailAccount.inc:51
 #: addons/mailqueue/class_mailqueue.inc:7
 msgid "This does something"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:94
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
+#: personal/mail/class_mailAccount.inc:620
+#: personal/mail/class_mail-methods.inc:111
+#: personal/mail/class_mail-methods.inc:373
+#, fuzzy
+msgid "Configuration error"
+msgstr "Se puede escribir en la configuración"
 
-#: personal/mail/class_mailAccount.inc:208
+#: personal/mail/class_mailAccount.inc:620
 #, fuzzy, php-format
 msgid "No DESC tag in vacation template '%s'!"
 msgstr "En el archivo de ausencia no existe la etiqueta 'DESC':"
 
-#: personal/mail/class_mailAccount.inc:299
+#: personal/mail/class_mailAccount.inc:649
+#: personal/mail/class_mailAccount.inc:662
+#: personal/mail/class_mailAccount.inc:693
+#: personal/mail/class_mailAccount.inc:706
 #, fuzzy
-msgid "Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-"Esta cuenta no puede ser eliminada mientras haya delegaciones configuradas. "
-"Elimine primero las delegaciones."
-
-#: personal/mail/class_mailAccount.inc:347
-#, fuzzy
-msgid "Please select an entry!"
-msgstr "Por favor seleccione un servidor de correo valido."
+msgid "Permission error"
+msgstr "Permisos"
 
-#: personal/mail/class_mailAccount.inc:370
+#: personal/mail/class_mailAccount.inc:649
+#: personal/mail/class_mailAccount.inc:662
+#: personal/mail/class_mailAccount.inc:693
+#: personal/mail/class_mailAccount.inc:706
 #, fuzzy
-msgid "Cannot add primary address to the list of forwarders!"
-msgstr ""
-"Esta intentando añadir una dirección de correo no valida a la lista de "
-"reenvío."
-
-#: personal/mail/class_mailAccount.inc:420
-#, fuzzy, php-format
-msgid "Address is already in use by user '%s'."
-msgstr ""
-"La dirección de correo que esta intentando añadir, ya esta usada por otro "
-"usuario"
+msgid "You have no permission to modify these addresses!"
+msgstr "No tiene permisos para eliminar este departamento."
 
-#: personal/mail/class_mailAccount.inc:966
-#: personal/mail/class_mailAccount.inc:974
-#: personal/mail/class_mailAccount.inc:1361
+#: personal/mail/class_mailAccount.inc:1096
+#: personal/mail/class_mailAccount.inc:1104
+#: personal/mail/class_mailAccount.inc:1255
 #, fuzzy
 msgid "Mail reject size"
 msgstr "Tamaño máximo del mensaje"
 
-#: personal/mail/class_mailAccount.inc:978
-#: personal/mail/class_mailAccount.inc:1368
+#: personal/mail/class_mailAccount.inc:1108
+#: personal/mail/class_mailAccount.inc:1262
 #, fuzzy
 msgid "Spam folder"
 msgstr "Nivel de spam"
 
-#: personal/mail/class_mailAccount.inc:982
-#: personal/mail/class_mailAccount.inc:1373
+#: personal/mail/class_mailAccount.inc:1114
+#: personal/mail/class_mailAccount.inc:1267
 #, fuzzy
 msgid "Vacation interval"
 msgstr "Mensaje de ausencia"
 
-#: personal/mail/class_mailAccount.inc:1027
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1072
-#: personal/mail/class_mailAccount.inc:1083
-#, fuzzy
-msgid "Permission error"
-msgstr "Permisos"
-
-#: personal/mail/class_mailAccount.inc:1027
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1072
-#: personal/mail/class_mailAccount.inc:1083
-#, fuzzy
-msgid "You have no permission to modify these addresses!"
-msgstr "No tiene permisos para eliminar este departamento."
-
-#: personal/mail/class_mailAccount.inc:1148
-#, fuzzy
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "Esperando que Kolab elimine las características de correo."
-
-#: personal/mail/class_mailAccount.inc:1150
-#, fuzzy
-msgid ""
-"Please remove the mail settings first to allow kolab to call its remove "
-"methods!"
-msgstr ""
-"Por favor elimine la cuenta de correo primero, para permitir que Kolab "
-"active su sistema de eliminación."
-
-#: personal/mail/class_mailAccount.inc:1175
+#: personal/mail/class_mailAccount.inc:1391
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: personal/mail/class_mailAccount.inc:1184
+#: personal/mail/class_mailAccount.inc:1400
 msgid "Add vacation information"
 msgstr "Añadir información de ausencia"
 
-#: personal/mail/class_mailAccount.inc:1187
+#: personal/mail/class_mailAccount.inc:1403
 msgid "Use spam filter"
 msgstr "Usar filtro antispam"
 
-#: personal/mail/class_mailAccount.inc:1188
+#: personal/mail/class_mailAccount.inc:1404
 msgid "Spam level"
 msgstr "Nivel de spam"
 
-#: personal/mail/class_mailAccount.inc:1189
+#: personal/mail/class_mailAccount.inc:1405
 msgid "Spam mail box"
 msgstr "Tamaño de la carpeta de spam"
 
-#: personal/mail/class_mailAccount.inc:1191
+#: personal/mail/class_mailAccount.inc:1407
 msgid "Sieve management"
 msgstr "Administración Sieve"
 
-#: personal/mail/class_mailAccount.inc:1193
+#: personal/mail/class_mailAccount.inc:1409
 msgid "Reject due to mailsize"
 msgstr "rechazar correos mayores que"
 
-#: personal/mail/class_mailAccount.inc:1196
-#: personal/mail/class_mailAccount.inc:1201
+#: personal/mail/class_mailAccount.inc:1412
+#: personal/mail/class_mailAccount.inc:1417
 msgid "Forwarding address"
 msgstr "Direcciones de reenvío"
 
-#: personal/mail/class_mailAccount.inc:1197
+#: personal/mail/class_mailAccount.inc:1413
 msgid "Local delivery"
 msgstr "Entrega local"
 
-#: personal/mail/class_mailAccount.inc:1198
+#: personal/mail/class_mailAccount.inc:1414
 msgid "No delivery to own mailbox "
 msgstr "No recibir en su propia cuenta"
 
-#: personal/mail/class_mailAccount.inc:1199
+#: personal/mail/class_mailAccount.inc:1415
 msgid "Mail alternative addresses"
 msgstr "Direcciones alternativas"
 
@@ -2020,46 +1959,42 @@ msgstr "Direcciones alternativas"
 msgid "User mail settings"
 msgstr "Parametros del correo del usuario"
 
-#: personal/mail/class_mail-methods-cyrus.inc:62
-msgid "Mail server for this account is invalid!"
+#: personal/mail/class_mail-methods.inc:112
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:374
+#, php-format
+msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:80
-#: personal/mail/class_mail-methods-cyrus.inc:178
-#: personal/mail/class_mail-methods-cyrus.inc:197
-#: personal/mail/class_mail-methods-cyrus.inc:263
+#: personal/mail/class_mail-methods.inc:600
+#: personal/mail/class_mail-methods.inc:601
 #, fuzzy
-msgid "IMAP error"
-msgstr "Servicio IMAP"
+msgid "None"
+msgstr "ninguno"
 
-#: personal/mail/class_mail-methods-cyrus.inc:80
-msgid "Cannot store mail settings on IMAP server!"
+#: personal/mail/class_mail-methods-cyrus.inc:37
+msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:178
-#, fuzzy, php-format
-msgid "Cannot create IMAP mailbox: %s"
-msgstr "No puedo crear el fichero '%s'."
+#: personal/mail/class_mail-methods-cyrus.inc:199
+#, fuzzy
+msgid "IMAP error"
+msgstr "Servicio IMAP"
 
-#: personal/mail/class_mail-methods-cyrus.inc:197
+#: personal/mail/class_mail-methods-cyrus.inc:199
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:223
-msgid "Cannot remove IMAP ACL: imap_getacl not implemented!"
-msgstr ""
-
-#: personal/mail/class_mail-methods-cyrus.inc:241
-msgid "Cannot retrieve IMAP ACL: imap_getacl not implemented!"
-msgstr ""
-
-#: personal/mail/class_mail-methods-cyrus.inc:263
-#, php-format
-msgid "Cannot remove IMAP mailbox: %s"
+#: personal/mail/class_mail-methods-cyrus.inc:328
+#: personal/mail/class_mail-methods-cyrus.inc:365
+msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:378
+#: personal/mail/class_mail-methods-cyrus.inc:538
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
@@ -2153,7 +2088,7 @@ msgstr ""
 
 #: addons/mailqueue/contents.tpl:10 addons/mailqueue/contents.tpl:28
 msgid "Search"
-msgstr ""
+msgstr "Buscar"
 
 #: addons/mailqueue/contents.tpl:11
 msgid "Search for"
@@ -2259,6 +2194,120 @@ msgstr ""
 msgid "Display header of this message"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Cannot connect mail method: %s"
+#~ msgstr "No puedo crear el fichero '%s'."
+
+#, fuzzy
+#~ msgid "Cannot remove mailbox: %s."
+#~ msgstr "No puedo crear el fichero '%s'."
+
+#, fuzzy
+#~ msgid "Cannot update mailbox: %s."
+#~ msgstr "No puedo crear el fichero '%s'."
+
+#, fuzzy
+#~ msgid "Cannot write quota settings: %s."
+#~ msgstr "¡No se puede escribir en el archivo de revisión!"
+
+#, fuzzy
+#~ msgid "Cannot connect mail method! Error was: %s."
+#~ msgstr "No puedo crear el fichero '%s'."
+
+#, fuzzy
+#~ msgid "Cannot remove mailbox! Error was: %s."
+#~ msgstr "No puedo crear el fichero '%s'."
+
+#, fuzzy
+#~ msgid "Cannot update mailbox! Error was: %s."
+#~ msgstr "No puedo crear el fichero '%s'."
+
+#, fuzzy
+#~ msgid "Specify the mail server where the user will  be hosted on"
+#~ msgstr "Escoja el departamento base de la búsqueda"
+
+#~ msgid "not defined"
+#~ msgstr "sin definirse"
+
+#~ msgid "read"
+#~ msgstr "leer"
+
+#~ msgid "post"
+#~ msgstr "enviar"
+
+#~ msgid "external post"
+#~ msgstr "envío externo"
+
+#~ msgid "append"
+#~ msgstr "añadir"
+
+#~ msgid "write"
+#~ msgstr "escribir"
+
+#~ msgid "admin"
+#~ msgstr "Administrador"
+
+#, fuzzy
+#~ msgid "mail"
+#~ msgstr "Correo Electrónico"
+
+#, fuzzy
+#~ msgid "forward address"
+#~ msgstr "Direcciones de reenvío"
+
+#, fuzzy
+#~ msgid "Cannot forward to users own mail address!"
+#~ msgstr "Esta intentando añadir una dirección de correo no valida"
+
+#, fuzzy
+#~ msgid "Alternate address"
+#~ msgstr "Direcciones alternativas"
+
+#~ msgid "Add"
+#~ msgstr "Añadir"
+
+#, fuzzy
+#~ msgid "Mails"
+#~ msgstr "Correo Electrónico"
+
+#, fuzzy
+#~ msgid "Tasks"
+#~ msgstr "Días para tareas OX"
+
+#, fuzzy
+#~ msgid "Notes"
+#~ msgstr "Ninguno"
+
+#, fuzzy
+#~ msgid "Junk mail"
+#~ msgstr "Grupo de correo"
+
+#~ msgid ""
+#~ "Please choose valid permission settings. Default permission can't be "
+#~ "emtpy."
+#~ msgstr ""
+#~ "Por favor seleccione una configuración valida de permisos. No se puede "
+#~ "dejar en blanco los permisos por defecto."
+
+#, fuzzy
+#~ msgid ""
+#~ "Mail settings cannot be removed while there are delegations configured!"
+#~ msgstr ""
+#~ "Esta cuenta no puede ser eliminada mientras haya delegaciones "
+#~ "configuradas. Elimine primero las delegaciones."
+
+#, fuzzy
+#~ msgid "Waiting for kolab to remove mail properties..."
+#~ msgstr "Esperando que Kolab elimine las características de correo."
+
+#, fuzzy
+#~ msgid ""
+#~ "Please remove the mail settings first to allow kolab to call its remove "
+#~ "methods!"
+#~ msgstr ""
+#~ "Por favor elimine la cuenta de correo primero, para permitir que Kolab "
+#~ "active su sistema de eliminación."
+
 #, fuzzy
 #~ msgid "You have no permission to submit a '%s' command!"
 #~ msgstr "No tiene permisos para cambiar su contraseña."

diff --git a/gosa-plugins/mail/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/fr/LC_MESSAGES/messages.po
index 3ec4ab3b5728e2165c87ed7f28263ad7027cb080..28af80544847eff466921f834020a671461cc790 100644 (file)
--- a/gosa-plugins/mail/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/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: 2008-12-03 15:05+0100\n"
+"POT-Creation-Date: 2008-12-10 10:53+0100\n"
 "PO-Revision-Date: 2008-12-03 23:10+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: french <fr@li.org>\n"
@@ -18,9 +18,10 @@ msgstr ""
 msgid "Mail distribution list"
 msgstr "Liste de distribution"
 
-#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/mail.tpl:10
-#: admin/groups/mail/paste_mail.tpl:8 personal/mail/copypaste.tpl:7
-#: personal/mail/generic.tpl:8 personal/mail/class_mailAccount.inc:931
+#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/mail.tpl:7
+#: admin/groups/mail/paste_mail.tpl:8
+#: admin/groups/mail/class_groupMail.inc:784 personal/mail/copypaste.tpl:7
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1060
 msgid "Primary address"
 msgstr "Adresse principale"
 
@@ -29,7 +30,6 @@ msgid "Primary mail address for this distribution list"
 msgstr "Adresse de messagerie principale pour cette liste de distribution"
 
 #: admin/ogroups/mail/class_mailogroup.inc:50
-#: admin/groups/mail/class_groupMail.inc:390
 msgid "Remove mail account"
 msgstr "Supprimer le compte de messagerie"
 
@@ -39,31 +39,30 @@ msgid "mail group"
 msgstr "messagerie de groupe"
 
 #: admin/ogroups/mail/class_mailogroup.inc:53
-#: admin/groups/mail/class_groupMail.inc:393
 msgid "Create mail account"
 msgstr "Créer un compte de messagerie"
 
 #: admin/ogroups/mail/class_mailogroup.inc:86
 #: admin/ogroups/mail/class_mailogroup.inc:93
 #: admin/ogroups/mail/class_mailogroup.inc:194
-#: admin/groups/mail/class_groupMail.inc:499
-#: admin/groups/mail/class_groupMail.inc:1084
-#: admin/groups/mail/class_groupMail.inc:1087
-#: admin/groups/mail/class_groupMail.inc:1093
-#: admin/groups/mail/class_groupMail.inc:1295
-#: personal/mail/class_mailAccount.inc:364
-#: personal/mail/class_mailAccount.inc:400
-#: personal/mail/class_mailAccount.inc:408
-#: personal/mail/class_mailAccount.inc:419
-#: personal/mail/class_mailAccount.inc:935
-#: personal/mail/class_mailAccount.inc:939
-#: personal/mail/class_mailAccount.inc:950
-#: personal/mail/class_mailAccount.inc:1180
+#: admin/groups/mail/class_groupMail.inc:325
+#: admin/groups/mail/class_groupMail.inc:360
+#: admin/groups/mail/class_groupMail.inc:366
+#: admin/groups/mail/class_groupMail.inc:375
+#: admin/groups/mail/class_groupMail.inc:786
+#: admin/groups/mail/class_groupMail.inc:917
+#: personal/mail/class_mailAccount.inc:306
+#: personal/mail/class_mailAccount.inc:341
+#: personal/mail/class_mailAccount.inc:346
+#: personal/mail/class_mailAccount.inc:354
+#: personal/mail/class_mailAccount.inc:1064
+#: personal/mail/class_mailAccount.inc:1068
+#: personal/mail/class_mailAccount.inc:1079
+#: personal/mail/class_mailAccount.inc:1396
 msgid "Mail address"
 msgstr "Adresse de messagerie"
 
 #: admin/ogroups/mail/class_mailogroup.inc:86
-#: admin/groups/mail/class_groupMail.inc:1087
 msgid "your-name@your-domain.com"
 msgstr "votre-nom@votre-domaine.com"
 
@@ -73,26 +72,32 @@ msgstr "votre-nom@votre-domaine.com"
 #: admin/systems/services/spam/class_goSpamServer.inc:277
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/mail/class_goMailServer.inc:582
-#: admin/groups/mail/class_groupMail.inc:794
-#: admin/groups/mail/class_groupMail.inc:1048
-#: personal/mail/class_mailAccount.inc:694
-#: personal/mail/class_mailAccount.inc:862
+#: admin/groups/mail/class_groupMail.inc:501
+#: admin/groups/mail/class_groupMail.inc:716
+#: personal/mail/class_mailAccount.inc:889
+#: personal/mail/class_mailAccount.inc:956
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
 #: admin/ogroups/mail/class_mailogroup.inc:186
 #: admin/ogroups/mail/paste_mail.tpl:4
-#: admin/groups/mail/class_groupMail.inc:1287
-#: personal/mail/class_mailAccount.inc:15
-#: personal/mail/class_mailAccount.inc:288
-#: personal/mail/class_mailAccount.inc:298
-#: personal/mail/class_mailAccount.inc:301
-#: personal/mail/class_mailAccount.inc:302
-#: personal/mail/class_mailAccount.inc:305
-#: personal/mail/class_mailAccount.inc:306
-#: personal/mail/class_mailAccount.inc:926
-#: personal/mail/class_mailAccount.inc:1170
-#: personal/mail/class_mailAccount.inc:1346
+#: admin/groups/mail/class_groupMail.inc:257
+#: admin/groups/mail/class_groupMail.inc:259
+#: admin/groups/mail/class_groupMail.inc:260
+#: admin/groups/mail/class_groupMail.inc:265
+#: admin/groups/mail/class_groupMail.inc:267
+#: admin/groups/mail/class_groupMail.inc:268
+#: admin/groups/mail/class_groupMail.inc:774
+#: admin/groups/mail/class_groupMail.inc:909
+#: personal/mail/class_mailAccount.inc:50
+#: personal/mail/class_mailAccount.inc:222
+#: personal/mail/class_mailAccount.inc:230
+#: personal/mail/class_mailAccount.inc:232
+#: personal/mail/class_mailAccount.inc:237
+#: personal/mail/class_mailAccount.inc:239
+#: personal/mail/class_mailAccount.inc:1048
+#: personal/mail/class_mailAccount.inc:1240
+#: personal/mail/class_mailAccount.inc:1386
 msgid "Mail"
 msgstr "Messagerie"
 
@@ -209,7 +214,7 @@ msgid "Start POP3 SSL service"
 msgstr "Démarrer le service POP3/SSL"
 
 #: admin/systems/services/imap/goImapServer.tpl:1
-#: admin/systems/services/mail/goMailServer.tpl:1 admin/groups/mail/mail.tpl:7
+#: admin/systems/services/mail/goMailServer.tpl:1 admin/groups/mail/mail.tpl:4
 #: personal/mail/generic.tpl:5
 msgid "Generic"
 msgstr "Informations"
@@ -260,22 +265,24 @@ msgstr ""
 
 #: admin/systems/services/spam/class_goSpamServer.inc:143
 #: admin/systems/services/spam/class_goSpamServer.inc:216
-#: admin/groups/mail/class_groupMail.inc:464
-#: admin/groups/mail/class_groupMail.inc:468
-#: admin/groups/mail/class_groupMail.inc:494
-#: admin/groups/mail/class_groupMail.inc:499
+#: admin/groups/mail/class_groupMail.inc:312
+#: admin/groups/mail/class_groupMail.inc:325
+#: admin/groups/mail/class_groupMail.inc:331
+#: admin/groups/mail/class_groupMail.inc:360
+#: admin/groups/mail/class_groupMail.inc:366
+#: admin/groups/mail/class_groupMail.inc:375
 #: personal/mail/sieve/class_sieveManagement.inc:201
 #: personal/mail/sieve/class_sieveManagement.inc:206
 #: personal/mail/sieve/class_sieveManagement.inc:212
 #: personal/mail/sieve/class_sieveManagement.inc:218
 #: personal/mail/sieve/class_sieveManagement.inc:429
 #: personal/mail/sieve/class_My_Tree.inc:660
-#: personal/mail/class_mailAccount.inc:347
-#: personal/mail/class_mailAccount.inc:363
-#: personal/mail/class_mailAccount.inc:370
-#: personal/mail/class_mailAccount.inc:399
-#: personal/mail/class_mailAccount.inc:407
-#: personal/mail/class_mailAccount.inc:419
+#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:306
+#: personal/mail/class_mailAccount.inc:312
+#: personal/mail/class_mailAccount.inc:341
+#: personal/mail/class_mailAccount.inc:346
+#: personal/mail/class_mailAccount.inc:354
 #: addons/mailqueue/class_mailqueue.inc:110
 #: addons/mailqueue/class_mailqueue.inc:144
 #: addons/mailqueue/class_mailqueue.inc:150
@@ -339,12 +346,12 @@ msgstr "Activer l'utilisation de Pyzor"
 
 #: admin/systems/services/spam/goSpamServer.tpl:22
 msgid "Select required score to tag mail as spam"
-msgstr "Sélectionner le score requis pour marquer ce message comme étant un spam"
+msgstr ""
+"Sélectionner le score requis pour marquer ce message comme étant un spam"
 
 #: admin/systems/services/spam/goSpamServer.tpl:48
 #: admin/systems/services/mail/goMailServer.tpl:73
 #: admin/systems/services/mail/goMailServer.tpl:104
-#: admin/groups/mail/class_groupMail.inc:654
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -587,115 +594,100 @@ msgstr ""
 msgid "Restriction filter"
 msgstr "Filtre de restriction"
 
-#: admin/groups/mail/mail.tpl:14 personal/mail/generic.tpl:11
-msgid "Multiple edit"
-msgstr "Edition multiple"
-
-#: admin/groups/mail/mail.tpl:17 admin/groups/mail/paste_mail.tpl:12
-msgid "Primary mail address for this shared folder"
-msgstr "Adresse de messagerie principale pour ce répertoire partagé"
-
-#: admin/groups/mail/mail.tpl:23 personal/mail/generic.tpl:20
+#: admin/groups/mail/mail.tpl:35 personal/mail/generic.tpl:30
 #: addons/mailqueue/contents.tpl:73
 msgid "Server"
 msgstr "Serveur"
 
-#: admin/groups/mail/mail.tpl:26
-msgid "Select mail server to place user on"
-msgstr "Sélectionner le serveur de messagerie sur lequel sera créé l'utilisateur"
+#: admin/groups/mail/mail.tpl:39 personal/mail/generic.tpl:37
+msgid "Specify the mail server where the user will be hosted on"
+msgstr "Indiquez le serveur de messagerie de l'utilisateur"
 
-#: admin/groups/mail/mail.tpl:36 personal/mail/generic.tpl:34
+#: admin/groups/mail/mail.tpl:52 personal/mail/generic.tpl:53
 msgid "Quota usage"
 msgstr "Utilisation des Quota"
 
-#: admin/groups/mail/mail.tpl:43 personal/mail/generic.tpl:41
-msgid "not defined"
-msgstr "non défini"
-
-#: admin/groups/mail/mail.tpl:48 admin/groups/mail/class_groupMail.inc:1099
-#: admin/groups/mail/class_groupMail.inc:1296 personal/mail/generic.tpl:47
-#: personal/mail/class_mailAccount.inc:957
-#: personal/mail/class_mailAccount.inc:1182
-#: personal/mail/class_mailAccount.inc:1352
+#: admin/groups/mail/mail.tpl:56 admin/groups/mail/class_groupMail.inc:793
+#: admin/groups/mail/class_groupMail.inc:918 personal/mail/generic.tpl:57
+#: personal/mail/class_mailAccount.inc:1087
+#: personal/mail/class_mailAccount.inc:1246
+#: personal/mail/class_mailAccount.inc:1398
 msgid "Quota size"
 msgstr "Taille du Quota"
 
-#: admin/groups/mail/mail.tpl:53 personal/mail/generic.tpl:234
-msgid "MB"
-msgstr "MB"
-
-#: admin/groups/mail/mail.tpl:59 admin/groups/mail/class_groupMail.inc:1298
+#: admin/groups/mail/mail.tpl:69 admin/groups/mail/class_groupMail.inc:920
 msgid "Folder type"
 msgstr "Type de dossier"
 
-#: admin/groups/mail/mail.tpl:85
+#: admin/groups/mail/mail.tpl:87
 msgid "Reload"
 msgstr "Recharger"
 
-#: admin/groups/mail/mail.tpl:102 admin/groups/mail/paste_mail.tpl:23
-#: personal/mail/copypaste.tpl:25 personal/mail/generic.tpl:64
+#: admin/groups/mail/mail.tpl:98 admin/groups/mail/paste_mail.tpl:23
+#: personal/mail/copypaste.tpl:25 personal/mail/generic.tpl:73
 msgid "Alternative addresses"
 msgstr "Adresses alternatives"
 
-#: admin/groups/mail/mail.tpl:105 admin/groups/mail/paste_mail.tpl:24
-#: personal/mail/copypaste.tpl:55 personal/mail/generic.tpl:67
+#: admin/groups/mail/mail.tpl:103 admin/groups/mail/paste_mail.tpl:24
+#: personal/mail/copypaste.tpl:55 personal/mail/generic.tpl:76
 msgid "List of alternative mail addresses"
 msgstr "Liste des adresses de messagerie alternatives"
 
-#: admin/groups/mail/mail.tpl:135
+#: admin/groups/mail/mail.tpl:132
 msgid "IMAP shared folders"
 msgstr "Dossier partagé IMAP"
 
 #: admin/groups/mail/mail.tpl:139
-msgid "Set shared folder permissions"
-msgstr "Activer les permissions du dossier partagé IMAP"
-
-#: admin/groups/mail/mail.tpl:148
 msgid "Default permission"
 msgstr "Permission par défaut"
 
-#: admin/groups/mail/mail.tpl:159
+#: admin/groups/mail/mail.tpl:141
 msgid "Member permission"
 msgstr "Permission des membres"
 
-#: admin/groups/mail/mail.tpl:176 personal/mail/generic.tpl:295
+#: admin/groups/mail/mail.tpl:169 personal/mail/generic.tpl:303
 msgid "Advanced mail options"
 msgstr "Options de messagerie avancées"
 
-#: admin/groups/mail/mail.tpl:182 personal/mail/generic.tpl:301
+#: admin/groups/mail/mail.tpl:175 personal/mail/generic.tpl:309
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 "Sélectionnez si vous voulez que les utilisateurs puissent envoyer et "
 "recevoir des messages uniquement dans son propre domaine"
 
-#: admin/groups/mail/mail.tpl:184 personal/mail/generic.tpl:303
+#: admin/groups/mail/mail.tpl:177 personal/mail/generic.tpl:311
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 "Les utilisateurs ne sont autorisés qu'à envoyer et recevoir des messages "
 "locaux"
 
-#: admin/groups/mail/mail.tpl:193 admin/groups/mail/paste_mail.tpl:34
+#: admin/groups/mail/mail.tpl:186 admin/groups/mail/paste_mail.tpl:34
 msgid "Forward messages to non group members"
 msgstr "Transférer les messages vers un membre n'appartenant pas au groupe"
 
-#: admin/groups/mail/mail.tpl:202
+#: admin/groups/mail/mail.tpl:195
 msgid "Used in all groups"
 msgstr "Utiliser dans tout les groupes."
 
-#: admin/groups/mail/mail.tpl:205
+#: admin/groups/mail/mail.tpl:198
 msgid "Not used in all groups"
 msgstr "Pas utilisé dans tout les groupes"
 
-#: admin/groups/mail/mail.tpl:223 admin/groups/mail/paste_mail.tpl:42
-#: personal/mail/copypaste.tpl:44 personal/mail/generic.tpl:285
+#: admin/groups/mail/mail.tpl:216 admin/groups/mail/paste_mail.tpl:42
+#: personal/mail/copypaste.tpl:44 personal/mail/generic.tpl:290
+#: personal/mail/generic.tpl:293
 msgid "Add local"
 msgstr "Ajouter en local"
 
 #: admin/groups/mail/paste_mail.tpl:1 personal/mail/copypaste.tpl:1
-#: personal/mail/class_mailAccount.inc:1171
+#: personal/mail/class_mailAccount.inc:1387
 msgid "Mail settings"
 msgstr "Paramètres de messagerie"
 
+#: admin/groups/mail/paste_mail.tpl:12
+msgid "Primary mail address for this shared folder"
+msgstr "Adresse de messagerie principale pour ce répertoire partagé"
+
 #: admin/groups/mail/mail_locals.tpl:6 personal/mail/mail_locals.tpl:7
 msgid "Select addresses to add"
 msgstr "Sélectionner les adresses à ajouter"
@@ -741,51 +733,73 @@ msgid "Choose"
 msgstr "Choisir"
 
 #: admin/groups/mail/class_groupMail.inc:92
-#: personal/mail/class_mailAccount.inc:94
-#: personal/mail/class_mailAccount.inc:208
-msgid "Configuration error"
-msgstr "Erreur de configuration"
+#: admin/groups/mail/class_groupMail.inc:99
+#: admin/groups/mail/class_groupMail.inc:106
+#: admin/groups/mail/class_groupMail.inc:113
+#: admin/groups/mail/class_groupMail.inc:118
+#: admin/groups/mail/class_groupMail.inc:121
+#: admin/groups/mail/class_groupMail.inc:513
+#: admin/groups/mail/class_groupMail.inc:517
+#: admin/groups/mail/class_groupMail.inc:521
+#: admin/groups/mail/class_groupMail.inc:729
+#: admin/groups/mail/class_groupMail.inc:733
+#: admin/groups/mail/class_groupMail.inc:737
+#: admin/groups/mail/class_groupMail.inc:746
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:145
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:902
+#: personal/mail/class_mailAccount.inc:970
+#: personal/mail/class_mailAccount.inc:974
+#: personal/mail/class_mailAccount.inc:978
+#: personal/mail/class_mailAccount.inc:992
+#, fuzzy
+msgid "Mail error"
+msgstr "Serveur de messagerie"
 
 #: admin/groups/mail/class_groupMail.inc:92
-#, php-format
-msgid "Cannot locate mail method '%s'!"
-msgstr "Impossible de trouver la méthode de messagerie '%s' !"
-
-#: admin/groups/mail/class_groupMail.inc:325
-msgid "read"
-msgstr "lecture"
-
-#: admin/groups/mail/class_groupMail.inc:326
-msgid "post"
-msgstr "envoyer"
-
-#: admin/groups/mail/class_groupMail.inc:327
-msgid "external post"
-msgstr "envoi externe"
+#: personal/mail/class_mailAccount.inc:130
+#, fuzzy, php-format
+msgid "Cannot read quota settings: %s"
+msgstr "Impossible de stocker les paramètres sur le serveur IMAP !"
 
-#: admin/groups/mail/class_groupMail.inc:328
-msgid "append"
-msgstr "ajouter"
+#: admin/groups/mail/class_groupMail.inc:99
+#: personal/mail/class_mailAccount.inc:137
+#, fuzzy, php-format
+msgid "Cannot get list of mailboxes: %s"
+msgstr ""
+"Impossible de modifier le quota de la boite de messagerie IMAP. Le serveur "
+"répond %s."
 
-#: admin/groups/mail/class_groupMail.inc:329
-msgid "write"
-msgstr "écrire"
+#: admin/groups/mail/class_groupMail.inc:106
+#, fuzzy, php-format
+msgid "Cannot receive folder types: %s"
+msgstr "Activer les permissions du dossier partagé IMAP"
 
-#: admin/groups/mail/class_groupMail.inc:330
-msgid "admin"
-msgstr "administrateur"
+#: admin/groups/mail/class_groupMail.inc:113
+#, fuzzy, php-format
+msgid "Cannot receive folder permissions: %s"
+msgstr "Activer les permissions du dossier partagé IMAP"
 
-#: admin/groups/mail/class_groupMail.inc:331
-msgid "none"
-msgstr "aucun"
+#: admin/groups/mail/class_groupMail.inc:118
+#: admin/groups/mail/class_groupMail.inc:513
+#: admin/groups/mail/class_groupMail.inc:729
+#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:970
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:382
-#: admin/groups/mail/class_groupMail.inc:391
-#: admin/groups/mail/class_groupMail.inc:394
-msgid "mail"
-msgstr "messagerie"
+#: admin/groups/mail/class_groupMail.inc:121
+#: personal/mail/class_mailAccount.inc:145
+#, php-format
+msgid "Mailbox '%s' doesn't exists on mail server: %s"
+msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:404
+#: admin/groups/mail/class_groupMail.inc:278
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
@@ -793,147 +807,120 @@ msgstr ""
 "Enlever le dossier partagé du serveur de messagerie quand l'entrée est "
 "enlevée de l'annuaire LDAP"
 
-#: admin/groups/mail/class_groupMail.inc:405
+#: admin/groups/mail/class_groupMail.inc:279
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 "Effacer le dossier partagé et tout son contenu après avoir sauvegardé ce "
 "compte"
 
-#: admin/groups/mail/class_groupMail.inc:464
-msgid "forward address"
-msgstr "adresse de transfert"
-
-#: admin/groups/mail/class_groupMail.inc:468
-msgid "Cannot forward to users own mail address!"
-msgstr "Impossible de transférér des messages vers soi même !"
-
-#: admin/groups/mail/class_groupMail.inc:494
-msgid "Alternate address"
-msgstr "Adresses alternatives"
-
-#: admin/groups/mail/class_groupMail.inc:648
-msgid "Add"
-msgstr "Ajouter"
-
-#: admin/groups/mail/class_groupMail.inc:700
-#: admin/groups/mail/class_groupMail.inc:706
-msgid "Unspecified"
-msgstr "Non défini"
-
-#: admin/groups/mail/class_groupMail.inc:700
-msgid "Mails"
-msgstr "Messagerie"
-
-#: admin/groups/mail/class_groupMail.inc:701
-msgid "Tasks"
-msgstr "Tâche"
-
-#: admin/groups/mail/class_groupMail.inc:701
-msgid "Journals"
-msgstr "Journaux"
+#: admin/groups/mail/class_groupMail.inc:312
+#: personal/mail/class_mailAccount.inc:294
+msgid "Please select an entry!"
+msgstr "Veuillez sélectionner une entrée !"
 
-#: admin/groups/mail/class_groupMail.inc:702
-msgid "Calendar"
-msgstr "Calendrier"
+#: admin/groups/mail/class_groupMail.inc:331
+#: personal/mail/class_mailAccount.inc:312
+msgid "Cannot add primary address to the list of forwarders!"
+msgstr ""
+"Impossible d'ajouter l'adresse de messagerie principale à la liste des "
+"transfert!"
 
-#: admin/groups/mail/class_groupMail.inc:702
-msgid "Contacts"
-msgstr "Contacts"
+#: admin/groups/mail/class_groupMail.inc:376
+#: personal/mail/class_mailAccount.inc:355
+#, php-format
+msgid "Address is already in use by user '%s'."
+msgstr "L'adresse entrée est déjà utilisée par l'utilisateur '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:703
-msgid "Notes"
-msgstr "Notes"
+#: admin/groups/mail/class_groupMail.inc:402
+#: personal/mail/class_mailAccount.inc:384
+msgid "Unknown"
+msgstr "Inconnu"
 
-#: admin/groups/mail/class_groupMail.inc:706
-msgid "Inbox"
-msgstr "Boîte de réception"
+#: admin/groups/mail/class_groupMail.inc:517
+#: personal/mail/class_mailAccount.inc:902
+#, fuzzy, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+"Impossible de supprimer la boite de messagerie IMAP. Le serveur répond %s"
 
-#: admin/groups/mail/class_groupMail.inc:707
-msgid "Drafts"
-msgstr "Brouillons"
+#: admin/groups/mail/class_groupMail.inc:521
+#: admin/groups/mail/class_groupMail.inc:746
+#, fuzzy, php-format
+msgid "Cannot update shared folder permissions: %s"
+msgstr "Activer les permissions du dossier partagé IMAP"
 
-#: admin/groups/mail/class_groupMail.inc:707
-msgid "Sent items"
-msgstr "Messages envoyés"
+#: admin/groups/mail/class_groupMail.inc:611
+#, fuzzy
+msgid "New"
+msgstr "Ajouter un nouveau"
 
-#: admin/groups/mail/class_groupMail.inc:708
-msgid "Junk mail"
-msgstr "Messages indésirables"
+#: admin/groups/mail/class_groupMail.inc:733
+#: personal/mail/class_mailAccount.inc:974
+#, fuzzy, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+"Impossible de créer la boite de messagerie IMAP. Le serveur indique %s."
 
-#: admin/groups/mail/class_groupMail.inc:710
-#: personal/mail/sieve/class_sieveElement_If.inc:27
-#: personal/mail/sieve/class_sieveElement_If.inc:33
-msgid "Default"
-msgstr "Défaut"
+#: admin/groups/mail/class_groupMail.inc:737
+#: personal/mail/class_mailAccount.inc:978
+#, fuzzy, php-format
+msgid "Cannot write quota settings: %s"
+msgstr "Impossible d'écrire le fichier de revision !"
 
-#: admin/groups/mail/class_groupMail.inc:1108
-#: personal/mail/class_mailAccount.inc:1194
+#: admin/groups/mail/class_groupMail.inc:802
+#: personal/mail/class_mailAccount.inc:1410
 msgid "Mail max size"
 msgstr "Taille maximale du message"
 
-#: admin/groups/mail/class_groupMail.inc:1116
+#: admin/groups/mail/class_groupMail.inc:810
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 "Il est nécessaire d'indiquer une taille maximale des messages afin de "
 "pouvoir en rejeter certains."
 
-#: admin/groups/mail/class_groupMail.inc:1120
-msgid "Please choose valid permission settings. Default permission can't be emtpy."
-msgstr ""
-"Veuillez choisir des permissions valables. Les permissions par défaut ne "
-"peuvent pas être vides."
-
-#: admin/groups/mail/class_groupMail.inc:1124
-#: admin/groups/mail/class_groupMail.inc:1297
-#: personal/mail/class_mailAccount.inc:1181
+#: admin/groups/mail/class_groupMail.inc:814
+#: admin/groups/mail/class_groupMail.inc:919
+#: personal/mail/class_mailAccount.inc:1397
 msgid "Mail server"
 msgstr "Serveur de messagerie"
 
-#: admin/groups/mail/class_groupMail.inc:1288
+#: admin/groups/mail/class_groupMail.inc:910
 msgid "Group mail"
 msgstr "Messagerie de groupe"
 
-#: admin/groups/mail/class_groupMail.inc:1298
+#: admin/groups/mail/class_groupMail.inc:920
 msgid "Kolab"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1299
+#: admin/groups/mail/class_groupMail.inc:921
 msgid "Alternate addresses"
 msgstr "Adresses alternatives"
 
-#: admin/groups/mail/class_groupMail.inc:1300
+#: admin/groups/mail/class_groupMail.inc:922
 msgid "Forwarding addresses"
 msgstr "Transférer les messages vers"
 
-#: admin/groups/mail/class_groupMail.inc:1301
+#: admin/groups/mail/class_groupMail.inc:923
 msgid "Only local"
 msgstr "Seulement en local"
 
-#: admin/groups/mail/class_groupMail.inc:1302
+#: admin/groups/mail/class_groupMail.inc:924
 msgid "Permissions"
 msgstr "Permissions"
 
-#: personal/mail/copypaste.tpl:13 personal/mail/generic.tpl:262
+#: personal/mail/copypaste.tpl:13 personal/mail/generic.tpl:267
 msgid "Forward messages to"
 msgstr "Transférer les messages vers"
 
-#: personal/mail/generic.tpl:23
-msgid "Specify the mail server where the user will be hosted on"
-msgstr "Indiquez le serveur de messagerie de l'utilisateur"
-
-#: personal/mail/generic.tpl:92
-msgid "Mail options"
-msgstr "Options de messagerie"
-
-#: personal/mail/generic.tpl:124 personal/mail/class_mailAccount.inc:1202
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1418
 msgid "Use custom sieve script"
 msgstr "Utiliser des scripts sieve personnalisés"
 
-#: personal/mail/generic.tpl:124
+#: personal/mail/generic.tpl:115
 msgid "disables all Mail options!"
 msgstr "désactive toutes les options de messagerie !"
 
-#: personal/mail/generic.tpl:131
+#: personal/mail/generic.tpl:123
 msgid "Sieve Management"
 msgstr "Gestion de Sieve"
 
@@ -947,56 +934,62 @@ msgstr ""
 msgid "No delivery to own mailbox"
 msgstr "Aucune distribution des messages dans la boite de l'utilisateur"
 
-#: personal/mail/generic.tpl:150
-msgid "Select to automatically response with the vacation message defined below"
+#: personal/mail/generic.tpl:151
+msgid ""
+"Select to automatically response with the vacation message defined below"
 msgstr ""
 "Indiquez la réponse automatique en remplissant le message d'absence ci-"
 "dessous"
 
-#: personal/mail/generic.tpl:152
+#: personal/mail/generic.tpl:153
 msgid "Activate vacation message"
 msgstr "Activer la notification d'absence"
 
-#: personal/mail/generic.tpl:160
+#: personal/mail/generic.tpl:161
 msgid "from"
 msgstr "de"
 
-#: personal/mail/generic.tpl:183
+#: personal/mail/generic.tpl:185
 msgid "till"
 msgstr "jusqu'au"
 
-#: personal/mail/generic.tpl:212
+#: personal/mail/generic.tpl:214
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr "Sélectionner ceci si vous voulez que spamassassin filtre les mails"
 
-#: personal/mail/generic.tpl:214
+#: personal/mail/generic.tpl:216
 msgid "Move mails tagged with spam level greater than"
 msgstr "Déplacer les messages ayant un niveau de spam supérieur à"
 
-#: personal/mail/generic.tpl:217
+#: personal/mail/generic.tpl:219
+#, fuzzy
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 "Sélectionnez le niveau de spam - une valeur basse implique une plus grande "
 "sélectivité"
 
-#: personal/mail/generic.tpl:221
+#: personal/mail/generic.tpl:223
 msgid "to folder"
 msgstr "vers le dossier"
 
-#: personal/mail/generic.tpl:232
+#: personal/mail/generic.tpl:235
 msgid "Reject mails bigger than"
 msgstr "Rejeter les messages plus gros que"
 
-#: personal/mail/generic.tpl:241
+#: personal/mail/generic.tpl:238
+msgid "MB"
+msgstr "MB"
+
+#: personal/mail/generic.tpl:245
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/templates/object_container.tpl:31
-#: personal/mail/class_mailAccount.inc:1185
+#: personal/mail/class_mailAccount.inc:1401
 msgid "Vacation message"
 msgstr "Message d'absence"
 
-#: personal/mail/generic.tpl:256
+#: personal/mail/generic.tpl:261
 #: personal/mail/sieve/templates/import_script.tpl:12
 #: personal/mail/sieve/templates/edit_frame_base.tpl:7
 msgid "Import"
@@ -1022,7 +1015,8 @@ msgstr "L'analyse à réussi"
 
 #: personal/mail/sieve/class_sieveManagement.inc:156
 #, php-format
-msgid "The specified mail server '%s' does not exist within the GOsa configuration."
+msgid ""
+"The specified mail server '%s' does not exist within the GOsa configuration."
 msgstr ""
 "Le serveur de messagerie spécifié '%s' n'existe pas dans la configuration de "
 "GOsa."
@@ -1037,7 +1031,8 @@ msgstr "Veuillez seulement utiliser des nom de script en miniscules !"
 
 #: personal/mail/sieve/class_sieveManagement.inc:212
 msgid "Please use only alphabetical characters in script names!"
-msgstr "Seul des caractères alphabétiques sont permis dans le nom des scripts !"
+msgstr ""
+"Seul des caractères alphabétiques sont permis dans le nom des scripts !"
 
 #: personal/mail/sieve/class_sieveManagement.inc:218
 msgid "Script name already in use!"
@@ -1054,23 +1049,18 @@ msgstr "Le nom du script est déjà utilisé !"
 #: personal/mail/sieve/class_sieveManagement.inc:770
 #: personal/mail/sieve/class_sieveManagement.inc:1030
 #: personal/mail/sieve/class_sieveManagement.inc:1043
-#: personal/mail/class_mail-methods-cyrus.inc:291
-#: personal/mail/class_mail-methods-cyrus.inc:303
-#: personal/mail/class_mail-methods-cyrus.inc:374
-#: personal/mail/class_mail-methods-cyrus.inc:378
 msgid "SIEVE error"
 msgstr "Erreur Sieve"
 
 #: personal/mail/sieve/class_sieveManagement.inc:302
 #: personal/mail/sieve/class_sieveManagement.inc:345
 #: personal/mail/sieve/class_sieveManagement.inc:1030
-#: personal/mail/class_mail-methods-cyrus.inc:291
 #, php-format
 msgid "Cannot log into SIEVE server: %s"
 msgstr "Impossible de se connecter au serveur SIEVE. Le serveur répond '%s'."
 
 #: personal/mail/sieve/class_sieveManagement.inc:309
-#: personal/mail/class_mail-methods-cyrus.inc:303
+#: personal/mail/class_mail-methods-cyrus.inc:443
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Impossible de récupérer le script SIEVE : %s"
@@ -1089,8 +1079,6 @@ msgid "Uploaded script is empty!"
 msgstr "Le script téléchargé est vide !"
 
 #: personal/mail/sieve/class_sieveManagement.inc:431
-#: personal/mail/class_mail-methods-cyrus.inc:223
-#: personal/mail/class_mail-methods-cyrus.inc:241
 msgid "Internal error"
 msgstr "Erreur interne"
 
@@ -1265,7 +1253,7 @@ msgid "Cannot insert element at the requested position!"
 msgstr "Impossible d'ajouter l'élément spécifié à la position choisie !"
 
 #: personal/mail/sieve/class_sieveManagement.inc:1043
-#: personal/mail/class_mail-methods-cyrus.inc:374
+#: personal/mail/class_mail-methods-cyrus.inc:531
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "Impossible de stocker le script SIEVE : %s"
@@ -1561,7 +1549,6 @@ msgstr "mise à Jour"
 
 #: personal/mail/sieve/templates/remove_script.tpl:2
 #: personal/mail/sieve/class_My_Tree.inc:245
-#: personal/mail/class_mail-methods-cyrus.inc:62
 msgid "Warning"
 msgstr "Avertissement"
 
@@ -1681,7 +1668,8 @@ msgstr ""
 "d'authentification est vide."
 
 #: personal/mail/sieve/templates/management.tpl:6
-msgid "Please verify that the attributes uid and mail are not empty and try again."
+msgid ""
+"Please verify that the attributes uid and mail are not empty and try again."
 msgstr ""
 "Veuillez vérifier que les attributs uid et mail ne sont pas vide et "
 "réessayer."
@@ -1724,6 +1712,11 @@ msgstr "Votre texte de rejet ici"
 msgid "Complete address"
 msgstr "Adresse complète"
 
+#: personal/mail/sieve/class_sieveElement_If.inc:27
+#: personal/mail/sieve/class_sieveElement_If.inc:33
+msgid "Default"
+msgstr "Défaut"
+
 #: personal/mail/sieve/class_sieveElement_If.inc:28
 msgid "Domain part"
 msgstr "Domaine internet"
@@ -1827,11 +1820,14 @@ msgid "Please specify a valid operator."
 msgstr "Veuillez spécifier un opérateur valide."
 
 #: personal/mail/sieve/class_sieveElement_If.inc:654
-msgid "Invalid character found in address attribute. Quotes are not allowed here."
-msgstr "Caractère non valide dans l'adresse. Les guillemets sont interdits ici."
+msgid ""
+"Invalid character found in address attribute. Quotes are not allowed here."
+msgstr ""
+"Caractère non valide dans l'adresse. Les guillemets sont interdits ici."
 
 #: personal/mail/sieve/class_sieveElement_If.inc:669
-msgid "Invalid character found in value attribute. Quotes are not allowed here."
+msgid ""
+"Invalid character found in value attribute. Quotes are not allowed here."
 msgstr ""
 "Caractère non valide trouvé dans l'attribut. Les guillemets ne sont pas "
 "permis ici."
@@ -1891,126 +1887,94 @@ msgstr "Impossible d'enlever le dernier élément !"
 msgid "Require must be the first command in the script."
 msgstr "Require doit être la première commande de ce script."
 
-#: personal/mail/class_mailAccount.inc:16
+#: personal/mail/class_mailAccount.inc:51
 #: addons/mailqueue/class_mailqueue.inc:7
 msgid "This does something"
 msgstr "Ceci fait quelque chose"
 
-#: personal/mail/class_mailAccount.inc:94
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr "Le méthode de messagerie '%s' est inconnue !"
+#: personal/mail/class_mailAccount.inc:620
+#: personal/mail/class_mail-methods.inc:111
+#: personal/mail/class_mail-methods.inc:373
+msgid "Configuration error"
+msgstr "Erreur de configuration"
 
-#: personal/mail/class_mailAccount.inc:208
+#: personal/mail/class_mailAccount.inc:620
 #, php-format
 msgid "No DESC tag in vacation template '%s'!"
 msgstr "Pas de drapeau DESC dans le message d'absence '%s' !"
 
-#: personal/mail/class_mailAccount.inc:299
-msgid "Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-"Les paramètres de messagerie ne peut pas être effacé tant qu'il y à des "
-"délégations actives !"
-
-#: personal/mail/class_mailAccount.inc:347
-msgid "Please select an entry!"
-msgstr "Veuillez sélectionner une entrée !"
-
-#: personal/mail/class_mailAccount.inc:370
-msgid "Cannot add primary address to the list of forwarders!"
-msgstr ""
-"Impossible d'ajouter l'adresse de messagerie principale à la liste des "
-"transfert!"
+#: personal/mail/class_mailAccount.inc:649
+#: personal/mail/class_mailAccount.inc:662
+#: personal/mail/class_mailAccount.inc:693
+#: personal/mail/class_mailAccount.inc:706
+msgid "Permission error"
+msgstr "Erreur de permissions"
 
-#: personal/mail/class_mailAccount.inc:420
-#, php-format
-msgid "Address is already in use by user '%s'."
-msgstr "L'adresse entrée est déjà utilisée par l'utilisateur '%s'."
+#: personal/mail/class_mailAccount.inc:649
+#: personal/mail/class_mailAccount.inc:662
+#: personal/mail/class_mailAccount.inc:693
+#: personal/mail/class_mailAccount.inc:706
+msgid "You have no permission to modify these addresses!"
+msgstr "Vous n'avez pas les droits nécessaires pour modifier ces adresses !"
 
-#: personal/mail/class_mailAccount.inc:966
-#: personal/mail/class_mailAccount.inc:974
-#: personal/mail/class_mailAccount.inc:1361
+#: personal/mail/class_mailAccount.inc:1096
+#: personal/mail/class_mailAccount.inc:1104
+#: personal/mail/class_mailAccount.inc:1255
 msgid "Mail reject size"
 msgstr "Taille maximale autorisée du message"
 
-#: personal/mail/class_mailAccount.inc:978
-#: personal/mail/class_mailAccount.inc:1368
+#: personal/mail/class_mailAccount.inc:1108
+#: personal/mail/class_mailAccount.inc:1262
 msgid "Spam folder"
 msgstr "Dossier spam"
 
-#: personal/mail/class_mailAccount.inc:982
-#: personal/mail/class_mailAccount.inc:1373
+#: personal/mail/class_mailAccount.inc:1114
+#: personal/mail/class_mailAccount.inc:1267
 msgid "Vacation interval"
 msgstr "Intervalle du message d'absence"
 
-#: personal/mail/class_mailAccount.inc:1027
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1072
-#: personal/mail/class_mailAccount.inc:1083
-msgid "Permission error"
-msgstr "Erreur de permissions"
-
-#: personal/mail/class_mailAccount.inc:1027
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1072
-#: personal/mail/class_mailAccount.inc:1083
-msgid "You have no permission to modify these addresses!"
-msgstr "Vous n'avez pas les droits nécessaires pour modifier ces adresses !"
-
-#: personal/mail/class_mailAccount.inc:1148
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "En attente de l'effacement des propriétés de messagerie par kolab."
-
-#: personal/mail/class_mailAccount.inc:1150
-msgid ""
-"Please remove the mail settings first to allow kolab to call its remove "
-"methods!"
-msgstr ""
-"Veuillez effacer en premier lieu le compte de messagerie pour permettre a "
-"kolab d'appeler sa procédure d'effacement !"
-
-#: personal/mail/class_mailAccount.inc:1175
+#: personal/mail/class_mailAccount.inc:1391
 msgid "My account"
 msgstr "Mon Compte"
 
-#: personal/mail/class_mailAccount.inc:1184
+#: personal/mail/class_mailAccount.inc:1400
 msgid "Add vacation information"
 msgstr "Ajouter un message d'absence"
 
-#: personal/mail/class_mailAccount.inc:1187
+#: personal/mail/class_mailAccount.inc:1403
 msgid "Use spam filter"
 msgstr "Utiliser le filtre antispam"
 
-#: personal/mail/class_mailAccount.inc:1188
+#: personal/mail/class_mailAccount.inc:1404
 msgid "Spam level"
 msgstr "Niveau de spam"
 
-#: personal/mail/class_mailAccount.inc:1189
+#: personal/mail/class_mailAccount.inc:1405
 msgid "Spam mail box"
 msgstr "Boite spam de votre messagerie"
 
-#: personal/mail/class_mailAccount.inc:1191
+#: personal/mail/class_mailAccount.inc:1407
 msgid "Sieve management"
 msgstr "Gestion de Sieve"
 
-#: personal/mail/class_mailAccount.inc:1193
+#: personal/mail/class_mailAccount.inc:1409
 msgid "Reject due to mailsize"
 msgstr "Rejeter a cause de la taille"
 
-#: personal/mail/class_mailAccount.inc:1196
-#: personal/mail/class_mailAccount.inc:1201
+#: personal/mail/class_mailAccount.inc:1412
+#: personal/mail/class_mailAccount.inc:1417
 msgid "Forwarding address"
 msgstr "Adresse de renvoi"
 
-#: personal/mail/class_mailAccount.inc:1197
+#: personal/mail/class_mailAccount.inc:1413
 msgid "Local delivery"
 msgstr "Distribution locale"
 
-#: personal/mail/class_mailAccount.inc:1198
+#: personal/mail/class_mailAccount.inc:1414
 msgid "No delivery to own mailbox "
 msgstr "Aucune distribution des messages dans la boite de l'utilisateur"
 
-#: personal/mail/class_mailAccount.inc:1199
+#: personal/mail/class_mailAccount.inc:1415
 msgid "Mail alternative addresses"
 msgstr "Adresses alternatives"
 
@@ -2018,47 +1982,44 @@ msgstr "Adresses alternatives"
 msgid "User mail settings"
 msgstr "Configuration du compte de messagerie de l'utilisateur"
 
-#: personal/mail/class_mail-methods-cyrus.inc:62
+#: personal/mail/class_mail-methods.inc:112
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:374
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr "Le méthode de messagerie '%s' est inconnue !"
+
+#: personal/mail/class_mail-methods.inc:600
+#: personal/mail/class_mail-methods.inc:601
+#, fuzzy
+msgid "None"
+msgstr "aucun"
+
+#: personal/mail/class_mail-methods-cyrus.inc:37
 msgid "Mail server for this account is invalid!"
 msgstr "Le serveur de messagerie pour ce compte est non valide !"
 
-#: personal/mail/class_mail-methods-cyrus.inc:80
-#: personal/mail/class_mail-methods-cyrus.inc:178
-#: personal/mail/class_mail-methods-cyrus.inc:197
-#: personal/mail/class_mail-methods-cyrus.inc:263
+#: personal/mail/class_mail-methods-cyrus.inc:199
 msgid "IMAP error"
 msgstr "Erreur IMAP :"
 
-#: personal/mail/class_mail-methods-cyrus.inc:80
-msgid "Cannot store mail settings on IMAP server!"
-msgstr "Impossible de stocker les paramètres sur le serveur IMAP !"
-
-#: personal/mail/class_mail-methods-cyrus.inc:178
-#, php-format
-msgid "Cannot create IMAP mailbox: %s"
-msgstr "Impossible de créer la boite de messagerie IMAP. Le serveur indique %s."
-
-#: personal/mail/class_mail-methods-cyrus.inc:197
+#: personal/mail/class_mail-methods-cyrus.inc:199
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 "Impossible de modifier le quota de la boite de messagerie IMAP. Le serveur "
 "répond %s."
 
-#: personal/mail/class_mail-methods-cyrus.inc:223
-msgid "Cannot remove IMAP ACL: imap_getacl not implemented!"
+#: personal/mail/class_mail-methods-cyrus.inc:328
+#: personal/mail/class_mail-methods-cyrus.inc:365
+#, fuzzy
+msgid "The module imap_getacl is not implemented!"
 msgstr "Impossible d'enlever les ACL IMAP:  imap_getacl n'est pas implementé !"
 
-#: personal/mail/class_mail-methods-cyrus.inc:241
-msgid "Cannot retrieve IMAP ACL: imap_getacl not implemented!"
-msgstr "Impossible d'obtenir les ACL IMAP:  imap_getacl n'est pas implementé !"
-
-#: personal/mail/class_mail-methods-cyrus.inc:263
-#, php-format
-msgid "Cannot remove IMAP mailbox: %s"
-msgstr "Impossible de supprimer la boite de messagerie IMAP. Le serveur répond %s"
-
-#: personal/mail/class_mail-methods-cyrus.inc:378
+#: personal/mail/class_mail-methods-cyrus.inc:538
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr "Impossible d'activer le script SIEVE : %s"
@@ -2258,3 +2219,150 @@ msgstr "entête"
 msgid "Display header of this message"
 msgstr "Afficher l'entête de ce message"
 
+#, fuzzy
+#~ msgid "Cannot connect mail method: %s"
+#~ msgstr "Impossible de trouver la méthode de messagerie '%s' !"
+
+#, fuzzy
+#~ msgid "Cannot remove mailbox: %s."
+#~ msgstr ""
+#~ "Impossible de supprimer la boite de messagerie IMAP. Le serveur répond %s"
+
+#, fuzzy
+#~ msgid "Cannot update mailbox: %s."
+#~ msgstr ""
+#~ "Impossible de créer la boite de messagerie IMAP. Le serveur indique %s."
+
+#, fuzzy
+#~ msgid "Cannot write quota settings: %s."
+#~ msgstr "Impossible d'écrire le fichier de revision !"
+
+#, fuzzy
+#~ msgid "Cannot get list of mailboxes! Error was: %s."
+#~ msgstr ""
+#~ "Impossible de modifier le quota de la boite de messagerie IMAP. Le "
+#~ "serveur répond %s."
+
+#, fuzzy
+#~ msgid "Cannot connect mail method! Error was: %s."
+#~ msgstr "Impossible de trouver la méthode de messagerie '%s' !"
+
+#, fuzzy
+#~ msgid "Cannot remove mailbox! Error was: %s."
+#~ msgstr ""
+#~ "Impossible de supprimer la boite de messagerie IMAP. Le serveur répond %s"
+
+#, fuzzy
+#~ msgid "Cannot update mailbox! Error was: %s."
+#~ msgstr ""
+#~ "Impossible de créer la boite de messagerie IMAP. Le serveur indique %s."
+
+#, fuzzy
+#~ msgid "Specify the mail server where the user will  be hosted on"
+#~ msgstr "Indiquez le serveur de messagerie de l'utilisateur"
+
+#~ msgid "Multiple edit"
+#~ msgstr "Edition multiple"
+
+#~ msgid "Select mail server to place user on"
+#~ msgstr ""
+#~ "Sélectionner le serveur de messagerie sur lequel sera créé l'utilisateur"
+
+#~ msgid "not defined"
+#~ msgstr "non défini"
+
+#~ msgid "read"
+#~ msgstr "lecture"
+
+#~ msgid "post"
+#~ msgstr "envoyer"
+
+#~ msgid "external post"
+#~ msgstr "envoi externe"
+
+#~ msgid "append"
+#~ msgstr "ajouter"
+
+#~ msgid "write"
+#~ msgstr "écrire"
+
+#~ msgid "admin"
+#~ msgstr "administrateur"
+
+#~ msgid "mail"
+#~ msgstr "messagerie"
+
+#~ msgid "forward address"
+#~ msgstr "adresse de transfert"
+
+#~ msgid "Cannot forward to users own mail address!"
+#~ msgstr "Impossible de transférér des messages vers soi même !"
+
+#~ msgid "Alternate address"
+#~ msgstr "Adresses alternatives"
+
+#~ msgid "Add"
+#~ msgstr "Ajouter"
+
+#~ msgid "Unspecified"
+#~ msgstr "Non défini"
+
+#~ msgid "Mails"
+#~ msgstr "Messagerie"
+
+#~ msgid "Tasks"
+#~ msgstr "Tâche"
+
+#~ msgid "Journals"
+#~ msgstr "Journaux"
+
+#~ msgid "Calendar"
+#~ msgstr "Calendrier"
+
+#~ msgid "Contacts"
+#~ msgstr "Contacts"
+
+#~ msgid "Notes"
+#~ msgstr "Notes"
+
+#~ msgid "Inbox"
+#~ msgstr "Boîte de réception"
+
+#~ msgid "Drafts"
+#~ msgstr "Brouillons"
+
+#~ msgid "Sent items"
+#~ msgstr "Messages envoyés"
+
+#~ msgid "Junk mail"
+#~ msgstr "Messages indésirables"
+
+#~ msgid ""
+#~ "Please choose valid permission settings. Default permission can't be "
+#~ "emtpy."
+#~ msgstr ""
+#~ "Veuillez choisir des permissions valables. Les permissions par défaut ne "
+#~ "peuvent pas être vides."
+
+#~ msgid "Mail options"
+#~ msgstr "Options de messagerie"
+
+#~ msgid ""
+#~ "Mail settings cannot be removed while there are delegations configured!"
+#~ msgstr ""
+#~ "Les paramètres de messagerie ne peut pas être effacé tant qu'il y à des "
+#~ "délégations actives !"
+
+#~ msgid "Waiting for kolab to remove mail properties..."
+#~ msgstr "En attente de l'effacement des propriétés de messagerie par kolab."
+
+#~ msgid ""
+#~ "Please remove the mail settings first to allow kolab to call its remove "
+#~ "methods!"
+#~ msgstr ""
+#~ "Veuillez effacer en premier lieu le compte de messagerie pour permettre a "
+#~ "kolab d'appeler sa procédure d'effacement !"
+
+#~ msgid "Cannot retrieve IMAP ACL: imap_getacl not implemented!"
+#~ msgstr ""
+#~ "Impossible d'obtenir les ACL IMAP:  imap_getacl n'est pas implementé !"

diff --git a/gosa-plugins/mail/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/it/LC_MESSAGES/messages.po
index 3a6c39e97ac7f696503334e75935081c8b444562..d8677a30249849c7514a856d2fe57e7692fe56b0 100644 (file)
--- a/gosa-plugins/mail/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/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: 2008-12-03 15:05+0100\n"
+"POT-Creation-Date: 2008-12-10 10:53+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -19,9 +19,10 @@ msgstr ""
 msgid "Mail distribution list"
 msgstr ""
 
-#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/mail.tpl:10
-#: admin/groups/mail/paste_mail.tpl:8 personal/mail/copypaste.tpl:7
-#: personal/mail/generic.tpl:8 personal/mail/class_mailAccount.inc:931
+#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/mail.tpl:7
+#: admin/groups/mail/paste_mail.tpl:8
+#: admin/groups/mail/class_groupMail.inc:784 personal/mail/copypaste.tpl:7
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1060
 msgid "Primary address"
 msgstr "Indirizzo principale"
 
@@ -30,7 +31,6 @@ msgid "Primary mail address for this distribution list"
 msgstr ""
 
 #: admin/ogroups/mail/class_mailogroup.inc:50
-#: admin/groups/mail/class_groupMail.inc:390
 msgid "Remove mail account"
 msgstr "Rimuovi le estensioni di posta"
 
@@ -41,31 +41,30 @@ msgid "mail group"
 msgstr "Gruppo primario"
 
 #: admin/ogroups/mail/class_mailogroup.inc:53
-#: admin/groups/mail/class_groupMail.inc:393
 msgid "Create mail account"
 msgstr "Crea estensioni di posta"
 
 #: admin/ogroups/mail/class_mailogroup.inc:86
 #: admin/ogroups/mail/class_mailogroup.inc:93
 #: admin/ogroups/mail/class_mailogroup.inc:194
-#: admin/groups/mail/class_groupMail.inc:499
-#: admin/groups/mail/class_groupMail.inc:1084
-#: admin/groups/mail/class_groupMail.inc:1087
-#: admin/groups/mail/class_groupMail.inc:1093
-#: admin/groups/mail/class_groupMail.inc:1295
-#: personal/mail/class_mailAccount.inc:364
-#: personal/mail/class_mailAccount.inc:400
-#: personal/mail/class_mailAccount.inc:408
-#: personal/mail/class_mailAccount.inc:419
-#: personal/mail/class_mailAccount.inc:935
-#: personal/mail/class_mailAccount.inc:939
-#: personal/mail/class_mailAccount.inc:950
-#: personal/mail/class_mailAccount.inc:1180
+#: admin/groups/mail/class_groupMail.inc:325
+#: admin/groups/mail/class_groupMail.inc:360
+#: admin/groups/mail/class_groupMail.inc:366
+#: admin/groups/mail/class_groupMail.inc:375
+#: admin/groups/mail/class_groupMail.inc:786
+#: admin/groups/mail/class_groupMail.inc:917
+#: personal/mail/class_mailAccount.inc:306
+#: personal/mail/class_mailAccount.inc:341
+#: personal/mail/class_mailAccount.inc:346
+#: personal/mail/class_mailAccount.inc:354
+#: personal/mail/class_mailAccount.inc:1064
+#: personal/mail/class_mailAccount.inc:1068
+#: personal/mail/class_mailAccount.inc:1079
+#: personal/mail/class_mailAccount.inc:1396
 msgid "Mail address"
 msgstr "Indirizzo principale"
 
 #: admin/ogroups/mail/class_mailogroup.inc:86
-#: admin/groups/mail/class_groupMail.inc:1087
 msgid "your-name@your-domain.com"
 msgstr ""
 
@@ -75,27 +74,33 @@ msgstr ""
 #: admin/systems/services/spam/class_goSpamServer.inc:277
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/mail/class_goMailServer.inc:582
-#: admin/groups/mail/class_groupMail.inc:794
-#: admin/groups/mail/class_groupMail.inc:1048
-#: personal/mail/class_mailAccount.inc:694
-#: personal/mail/class_mailAccount.inc:862
+#: admin/groups/mail/class_groupMail.inc:501
+#: admin/groups/mail/class_groupMail.inc:716
+#: personal/mail/class_mailAccount.inc:889
+#: personal/mail/class_mailAccount.inc:956
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
 #: admin/ogroups/mail/class_mailogroup.inc:186
 #: admin/ogroups/mail/paste_mail.tpl:4
-#: admin/groups/mail/class_groupMail.inc:1287
-#: personal/mail/class_mailAccount.inc:15
-#: personal/mail/class_mailAccount.inc:288
-#: personal/mail/class_mailAccount.inc:298
-#: personal/mail/class_mailAccount.inc:301
-#: personal/mail/class_mailAccount.inc:302
-#: personal/mail/class_mailAccount.inc:305
-#: personal/mail/class_mailAccount.inc:306
-#: personal/mail/class_mailAccount.inc:926
-#: personal/mail/class_mailAccount.inc:1170
-#: personal/mail/class_mailAccount.inc:1346
+#: admin/groups/mail/class_groupMail.inc:257
+#: admin/groups/mail/class_groupMail.inc:259
+#: admin/groups/mail/class_groupMail.inc:260
+#: admin/groups/mail/class_groupMail.inc:265
+#: admin/groups/mail/class_groupMail.inc:267
+#: admin/groups/mail/class_groupMail.inc:268
+#: admin/groups/mail/class_groupMail.inc:774
+#: admin/groups/mail/class_groupMail.inc:909
+#: personal/mail/class_mailAccount.inc:50
+#: personal/mail/class_mailAccount.inc:222
+#: personal/mail/class_mailAccount.inc:230
+#: personal/mail/class_mailAccount.inc:232
+#: personal/mail/class_mailAccount.inc:237
+#: personal/mail/class_mailAccount.inc:239
+#: personal/mail/class_mailAccount.inc:1048
+#: personal/mail/class_mailAccount.inc:1240
+#: personal/mail/class_mailAccount.inc:1386
 msgid "Mail"
 msgstr "Posta"
 
@@ -219,7 +224,7 @@ msgid "Start POP3 SSL service"
 msgstr ""
 
 #: admin/systems/services/imap/goImapServer.tpl:1
-#: admin/systems/services/mail/goMailServer.tpl:1 admin/groups/mail/mail.tpl:7
+#: admin/systems/services/mail/goMailServer.tpl:1 admin/groups/mail/mail.tpl:4
 #: personal/mail/generic.tpl:5
 msgid "Generic"
 msgstr "Generale"
@@ -269,22 +274,24 @@ msgstr ""
 
 #: admin/systems/services/spam/class_goSpamServer.inc:143
 #: admin/systems/services/spam/class_goSpamServer.inc:216
-#: admin/groups/mail/class_groupMail.inc:464
-#: admin/groups/mail/class_groupMail.inc:468
-#: admin/groups/mail/class_groupMail.inc:494
-#: admin/groups/mail/class_groupMail.inc:499
+#: admin/groups/mail/class_groupMail.inc:312
+#: admin/groups/mail/class_groupMail.inc:325
+#: admin/groups/mail/class_groupMail.inc:331
+#: admin/groups/mail/class_groupMail.inc:360
+#: admin/groups/mail/class_groupMail.inc:366
+#: admin/groups/mail/class_groupMail.inc:375
 #: personal/mail/sieve/class_sieveManagement.inc:201
 #: personal/mail/sieve/class_sieveManagement.inc:206
 #: personal/mail/sieve/class_sieveManagement.inc:212
 #: personal/mail/sieve/class_sieveManagement.inc:218
 #: personal/mail/sieve/class_sieveManagement.inc:429
 #: personal/mail/sieve/class_My_Tree.inc:660
-#: personal/mail/class_mailAccount.inc:347
-#: personal/mail/class_mailAccount.inc:363
-#: personal/mail/class_mailAccount.inc:370
-#: personal/mail/class_mailAccount.inc:399
-#: personal/mail/class_mailAccount.inc:407
-#: personal/mail/class_mailAccount.inc:419
+#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:306
+#: personal/mail/class_mailAccount.inc:312
+#: personal/mail/class_mailAccount.inc:341
+#: personal/mail/class_mailAccount.inc:346
+#: personal/mail/class_mailAccount.inc:354
 #: addons/mailqueue/class_mailqueue.inc:110
 #: addons/mailqueue/class_mailqueue.inc:144
 #: addons/mailqueue/class_mailqueue.inc:150
@@ -357,7 +364,6 @@ msgstr ""
 #: admin/systems/services/spam/goSpamServer.tpl:48
 #: admin/systems/services/mail/goMailServer.tpl:73
 #: admin/systems/services/mail/goMailServer.tpl:104
-#: admin/groups/mail/class_groupMail.inc:654
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -616,119 +622,103 @@ msgstr "Azione"
 msgid "Restriction filter"
 msgstr "Cerca"
 
-#: admin/groups/mail/mail.tpl:14 personal/mail/generic.tpl:11
-msgid "Multiple edit"
-msgstr ""
-
-#: admin/groups/mail/mail.tpl:17 admin/groups/mail/paste_mail.tpl:12
-msgid "Primary mail address for this shared folder"
-msgstr ""
-
-#: admin/groups/mail/mail.tpl:23 personal/mail/generic.tpl:20
+#: admin/groups/mail/mail.tpl:35 personal/mail/generic.tpl:30
 #: addons/mailqueue/contents.tpl:73
 msgid "Server"
 msgstr "Server"
 
-#: admin/groups/mail/mail.tpl:26
-msgid "Select mail server to place user on"
-msgstr ""
+#: admin/groups/mail/mail.tpl:39 personal/mail/generic.tpl:37
+msgid "Specify the mail server where the user will be hosted on"
+msgstr "Specifica il server di posta per l'utente"
 
-#: admin/groups/mail/mail.tpl:36 personal/mail/generic.tpl:34
+#: admin/groups/mail/mail.tpl:52 personal/mail/generic.tpl:53
 msgid "Quota usage"
 msgstr "Utilizzo quota"
 
-#: admin/groups/mail/mail.tpl:43 personal/mail/generic.tpl:41
-msgid "not defined"
-msgstr "non definito"
-
-#: admin/groups/mail/mail.tpl:48 admin/groups/mail/class_groupMail.inc:1099
-#: admin/groups/mail/class_groupMail.inc:1296 personal/mail/generic.tpl:47
-#: personal/mail/class_mailAccount.inc:957
-#: personal/mail/class_mailAccount.inc:1182
-#: personal/mail/class_mailAccount.inc:1352
+#: admin/groups/mail/mail.tpl:56 admin/groups/mail/class_groupMail.inc:793
+#: admin/groups/mail/class_groupMail.inc:918 personal/mail/generic.tpl:57
+#: personal/mail/class_mailAccount.inc:1087
+#: personal/mail/class_mailAccount.inc:1246
+#: personal/mail/class_mailAccount.inc:1398
 msgid "Quota size"
 msgstr "Dimensione quota"
 
-#: admin/groups/mail/mail.tpl:53 personal/mail/generic.tpl:234
-msgid "MB"
-msgstr "Mb"
-
-#: admin/groups/mail/mail.tpl:59 admin/groups/mail/class_groupMail.inc:1298
+#: admin/groups/mail/mail.tpl:69 admin/groups/mail/class_groupMail.inc:920
 #, fuzzy
 msgid "Folder type"
 msgstr "Filtro"
 
-#: admin/groups/mail/mail.tpl:85
+#: admin/groups/mail/mail.tpl:87
 #, fuzzy
 msgid "Reload"
 msgstr "leggere"
 
-#: admin/groups/mail/mail.tpl:102 admin/groups/mail/paste_mail.tpl:23
-#: personal/mail/copypaste.tpl:25 personal/mail/generic.tpl:64
+#: admin/groups/mail/mail.tpl:98 admin/groups/mail/paste_mail.tpl:23
+#: personal/mail/copypaste.tpl:25 personal/mail/generic.tpl:73
 msgid "Alternative addresses"
 msgstr "Indirizzi alternativi"
 
-#: admin/groups/mail/mail.tpl:105 admin/groups/mail/paste_mail.tpl:24
-#: personal/mail/copypaste.tpl:55 personal/mail/generic.tpl:67
+#: admin/groups/mail/mail.tpl:103 admin/groups/mail/paste_mail.tpl:24
+#: personal/mail/copypaste.tpl:55 personal/mail/generic.tpl:76
 msgid "List of alternative mail addresses"
 msgstr "Lista degli indirizzi alternativi"
 
-#: admin/groups/mail/mail.tpl:135
+#: admin/groups/mail/mail.tpl:132
 msgid "IMAP shared folders"
 msgstr "Cartelle condivise IMAP"
 
 #: admin/groups/mail/mail.tpl:139
-#, fuzzy
-msgid "Set shared folder permissions"
-msgstr "Cartelle condivise IMAP"
-
-#: admin/groups/mail/mail.tpl:148
 msgid "Default permission"
 msgstr "Permessi predefiniti"
 
-#: admin/groups/mail/mail.tpl:159
+#: admin/groups/mail/mail.tpl:141
 msgid "Member permission"
 msgstr "Permessi dei membri"
 
-#: admin/groups/mail/mail.tpl:176 personal/mail/generic.tpl:295
+#: admin/groups/mail/mail.tpl:169 personal/mail/generic.tpl:303
 msgid "Advanced mail options"
 msgstr "Opzioni di posta avanzate"
 
-#: admin/groups/mail/mail.tpl:182 personal/mail/generic.tpl:301
+#: admin/groups/mail/mail.tpl:175 personal/mail/generic.tpl:309
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 "Seleziona se l'utente può mandare e ricevere mail solo all'interno del "
 "proprio dominio"
 
-#: admin/groups/mail/mail.tpl:184 personal/mail/generic.tpl:303
+#: admin/groups/mail/mail.tpl:177 personal/mail/generic.tpl:311
 msgid "User is only allowed to send and receive local mails"
 msgstr "L'utente è abilitato a mandare e ricevere solo mail locali"
 
-#: admin/groups/mail/mail.tpl:193 admin/groups/mail/paste_mail.tpl:34
+#: admin/groups/mail/mail.tpl:186 admin/groups/mail/paste_mail.tpl:34
 msgid "Forward messages to non group members"
 msgstr "Inoltra i messaggi ai membri esterni al gruppo"
 
-#: admin/groups/mail/mail.tpl:202
+#: admin/groups/mail/mail.tpl:195
 #, fuzzy
 msgid "Used in all groups"
 msgstr "Inserisci la URI del server LDAP"
 
-#: admin/groups/mail/mail.tpl:205
+#: admin/groups/mail/mail.tpl:198
 #, fuzzy
 msgid "Not used in all groups"
 msgstr "Mostra gruppi funzionali"
 
-#: admin/groups/mail/mail.tpl:223 admin/groups/mail/paste_mail.tpl:42
-#: personal/mail/copypaste.tpl:44 personal/mail/generic.tpl:285
+#: admin/groups/mail/mail.tpl:216 admin/groups/mail/paste_mail.tpl:42
+#: personal/mail/copypaste.tpl:44 personal/mail/generic.tpl:290
+#: personal/mail/generic.tpl:293
 msgid "Add local"
 msgstr "Aggiungi localmente"
 
 #: admin/groups/mail/paste_mail.tpl:1 personal/mail/copypaste.tpl:1
-#: personal/mail/class_mailAccount.inc:1171
+#: personal/mail/class_mailAccount.inc:1387
 #, fuzzy
 msgid "Mail settings"
 msgstr "Opzioni di posta dell'identità"
 
+#: admin/groups/mail/paste_mail.tpl:12
+msgid "Primary mail address for this shared folder"
+msgstr ""
+
 #: admin/groups/mail/mail_locals.tpl:6 personal/mail/mail_locals.tpl:7
 msgid "Select addresses to add"
 msgstr "Seleziona gli indirizzi da aggiungere"
@@ -774,214 +764,192 @@ msgid "Choose"
 msgstr "Scegli"
 
 #: admin/groups/mail/class_groupMail.inc:92
-#: personal/mail/class_mailAccount.inc:94
-#: personal/mail/class_mailAccount.inc:208
+#: admin/groups/mail/class_groupMail.inc:99
+#: admin/groups/mail/class_groupMail.inc:106
+#: admin/groups/mail/class_groupMail.inc:113
+#: admin/groups/mail/class_groupMail.inc:118
+#: admin/groups/mail/class_groupMail.inc:121
+#: admin/groups/mail/class_groupMail.inc:513
+#: admin/groups/mail/class_groupMail.inc:517
+#: admin/groups/mail/class_groupMail.inc:521
+#: admin/groups/mail/class_groupMail.inc:729
+#: admin/groups/mail/class_groupMail.inc:733
+#: admin/groups/mail/class_groupMail.inc:737
+#: admin/groups/mail/class_groupMail.inc:746
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:145
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:902
+#: personal/mail/class_mailAccount.inc:970
+#: personal/mail/class_mailAccount.inc:974
+#: personal/mail/class_mailAccount.inc:978
+#: personal/mail/class_mailAccount.inc:992
 #, fuzzy
-msgid "Configuration error"
-msgstr "File di configurazione"
+msgid "Mail error"
+msgstr "Server"
 
 #: admin/groups/mail/class_groupMail.inc:92
+#: personal/mail/class_mailAccount.inc:130
 #, fuzzy, php-format
-msgid "Cannot locate mail method '%s'!"
+msgid "Cannot read quota settings: %s"
 msgstr "Rimuovi"
 
-#: admin/groups/mail/class_groupMail.inc:325
-msgid "read"
-msgstr "leggere"
-
-#: admin/groups/mail/class_groupMail.inc:326
-msgid "post"
-msgstr "spedire"
-
-#: admin/groups/mail/class_groupMail.inc:327
-msgid "external post"
-msgstr "spedire esterno"
-
-#: admin/groups/mail/class_groupMail.inc:328
-msgid "append"
-msgstr "appendere"
+#: admin/groups/mail/class_groupMail.inc:99
+#: personal/mail/class_mailAccount.inc:137
+#, fuzzy, php-format
+msgid "Cannot get list of mailboxes: %s"
+msgstr "Rimuovi"
 
-#: admin/groups/mail/class_groupMail.inc:329
-msgid "write"
-msgstr "scrivere"
+#: admin/groups/mail/class_groupMail.inc:106
+#, fuzzy, php-format
+msgid "Cannot receive folder types: %s"
+msgstr "Cartelle condivise IMAP"
 
-#: admin/groups/mail/class_groupMail.inc:330
-#, fuzzy
-msgid "admin"
-msgstr "DN dell'amministratore"
+#: admin/groups/mail/class_groupMail.inc:113
+#, fuzzy, php-format
+msgid "Cannot receive folder permissions: %s"
+msgstr "Cartelle condivise IMAP"
 
-#: admin/groups/mail/class_groupMail.inc:331
-msgid "none"
-msgstr "nessuno"
+#: admin/groups/mail/class_groupMail.inc:118
+#: admin/groups/mail/class_groupMail.inc:513
+#: admin/groups/mail/class_groupMail.inc:729
+#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:970
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:382
-#: admin/groups/mail/class_groupMail.inc:391
-#: admin/groups/mail/class_groupMail.inc:394
-#, fuzzy
-msgid "mail"
-msgstr "Posta"
+#: admin/groups/mail/class_groupMail.inc:121
+#: personal/mail/class_mailAccount.inc:145
+#, php-format
+msgid "Mailbox '%s' doesn't exists on mail server: %s"
+msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:404
+#: admin/groups/mail/class_groupMail.inc:278
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:405
+#: admin/groups/mail/class_groupMail.inc:279
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:464
-#, fuzzy
-msgid "forward address"
-msgstr "Indirizzo principale"
-
-#: admin/groups/mail/class_groupMail.inc:468
-#, fuzzy
-msgid "Cannot forward to users own mail address!"
-msgstr "Stai cercando di aggungere un indirizzo di posta non valido"
-
-#: admin/groups/mail/class_groupMail.inc:494
-#, fuzzy
-msgid "Alternate address"
-msgstr "Indirizzi alternativi"
-
-#: admin/groups/mail/class_groupMail.inc:648
-msgid "Add"
-msgstr "Aggiungi"
-
-#: admin/groups/mail/class_groupMail.inc:700
-#: admin/groups/mail/class_groupMail.inc:706
-#, fuzzy
-msgid "Unspecified"
-msgstr "non definito"
-
-#: admin/groups/mail/class_groupMail.inc:700
-#, fuzzy
-msgid "Mails"
-msgstr "Posta"
-
-#: admin/groups/mail/class_groupMail.inc:701
+#: admin/groups/mail/class_groupMail.inc:312
+#: personal/mail/class_mailAccount.inc:294
 #, fuzzy
-msgid "Tasks"
-msgstr "classe"
+msgid "Please select an entry!"
+msgstr "Prego inserire un numero di telefono valido!"
 
-#: admin/groups/mail/class_groupMail.inc:701
+#: admin/groups/mail/class_groupMail.inc:331
+#: personal/mail/class_mailAccount.inc:312
 #, fuzzy
-msgid "Journals"
-msgstr "ora"
-
-#: admin/groups/mail/class_groupMail.inc:702
-msgid "Calendar"
+msgid "Cannot add primary address to the list of forwarders!"
 msgstr ""
+"Stai tentandi di aggiungere un indirizzo di posta non valido alla lista "
+"degli inoltri"
 
-#: admin/groups/mail/class_groupMail.inc:702
-#, fuzzy
-msgid "Contacts"
-msgstr "Contatto"
-
-#: admin/groups/mail/class_groupMail.inc:703
-#, fuzzy
-msgid "Notes"
-msgstr "nessuno"
+#: admin/groups/mail/class_groupMail.inc:376
+#: personal/mail/class_mailAccount.inc:355
+#, fuzzy, php-format
+msgid "Address is already in use by user '%s'."
+msgstr "L'indirizzo che stai cercando di aggiungere  gi in uso"
 
-#: admin/groups/mail/class_groupMail.inc:706
-msgid "Inbox"
+#: admin/groups/mail/class_groupMail.inc:402
+#: personal/mail/class_mailAccount.inc:384
+msgid "Unknown"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:707
-#, fuzzy
-msgid "Drafts"
-msgstr "Data"
+#: admin/groups/mail/class_groupMail.inc:517
+#: personal/mail/class_mailAccount.inc:902
+#, fuzzy, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr "Rimuovi"
 
-#: admin/groups/mail/class_groupMail.inc:707
-#, fuzzy
-msgid "Sent items"
-msgstr "Stato"
+#: admin/groups/mail/class_groupMail.inc:521
+#: admin/groups/mail/class_groupMail.inc:746
+#, fuzzy, php-format
+msgid "Cannot update shared folder permissions: %s"
+msgstr "Cartelle condivise IMAP"
 
-#: admin/groups/mail/class_groupMail.inc:708
+#: admin/groups/mail/class_groupMail.inc:611
 #, fuzzy
-msgid "Junk mail"
-msgstr "Nome gruppo"
+msgid "New"
+msgstr "Modifica contatto"
 
-#: admin/groups/mail/class_groupMail.inc:710
-#: personal/mail/sieve/class_sieveElement_If.inc:27
-#: personal/mail/sieve/class_sieveElement_If.inc:33
-#, fuzzy
-msgid "Default"
-msgstr "Stampante predefinita"
+#: admin/groups/mail/class_groupMail.inc:733
+#: personal/mail/class_mailAccount.inc:974
+#, fuzzy, php-format
+msgid "Cannot update mailbox: %s"
+msgstr "Rimuovi"
 
-#: admin/groups/mail/class_groupMail.inc:1108
-#: personal/mail/class_mailAccount.inc:1194
+#: admin/groups/mail/class_groupMail.inc:737
+#: personal/mail/class_mailAccount.inc:978
+#, fuzzy, php-format
+msgid "Cannot write quota settings: %s"
+msgstr "Rimuovi"
+
+#: admin/groups/mail/class_groupMail.inc:802
+#: personal/mail/class_mailAccount.inc:1410
 #, fuzzy
 msgid "Mail max size"
 msgstr "Inoltra i messaggi a"
 
-#: admin/groups/mail/class_groupMail.inc:1116
+#: admin/groups/mail/class_groupMail.inc:810
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "Devi specificare la dimensione massima delle mail da rigettare."
 
-#: admin/groups/mail/class_groupMail.inc:1120
-msgid ""
-"Please choose valid permission settings. Default permission can't be emtpy."
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:1124
-#: admin/groups/mail/class_groupMail.inc:1297
-#: personal/mail/class_mailAccount.inc:1181
+#: admin/groups/mail/class_groupMail.inc:814
+#: admin/groups/mail/class_groupMail.inc:919
+#: personal/mail/class_mailAccount.inc:1397
 #, fuzzy
 msgid "Mail server"
 msgstr "Server"
 
-#: admin/groups/mail/class_groupMail.inc:1288
+#: admin/groups/mail/class_groupMail.inc:910
 #, fuzzy
 msgid "Group mail"
 msgstr "Nome gruppo"
 
-#: admin/groups/mail/class_groupMail.inc:1298
+#: admin/groups/mail/class_groupMail.inc:920
 msgid "Kolab"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1299
+#: admin/groups/mail/class_groupMail.inc:921
 #, fuzzy
 msgid "Alternate addresses"
 msgstr "Indirizzi alternativi"
 
-#: admin/groups/mail/class_groupMail.inc:1300
+#: admin/groups/mail/class_groupMail.inc:922
 #, fuzzy
 msgid "Forwarding addresses"
 msgstr "Indirizzo principale"
 
-#: admin/groups/mail/class_groupMail.inc:1301
+#: admin/groups/mail/class_groupMail.inc:923
 #, fuzzy
 msgid "Only local"
 msgstr "Aggiungi localmente"
 
-#: admin/groups/mail/class_groupMail.inc:1302
+#: admin/groups/mail/class_groupMail.inc:924
 msgid "Permissions"
 msgstr "Permessi"
 
-#: personal/mail/copypaste.tpl:13 personal/mail/generic.tpl:262
+#: personal/mail/copypaste.tpl:13 personal/mail/generic.tpl:267
 msgid "Forward messages to"
 msgstr "Inoltra i messaggi a"
 
-#: personal/mail/generic.tpl:23
-msgid "Specify the mail server where the user will be hosted on"
-msgstr "Specifica il server di posta per l'utente"
-
-#: personal/mail/generic.tpl:92
-msgid "Mail options"
-msgstr "Opzioni di posta"
-
-#: personal/mail/generic.tpl:124 personal/mail/class_mailAccount.inc:1202
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1418
 msgid "Use custom sieve script"
 msgstr "Usa uno script di sieve personalizzato"
 
-#: personal/mail/generic.tpl:124
+#: personal/mail/generic.tpl:115
 msgid "disables all Mail options!"
 msgstr "disabilita tutte le opzioni di posta!"
 
-#: personal/mail/generic.tpl:131
+#: personal/mail/generic.tpl:123
 #, fuzzy
 msgid "Sieve Management"
 msgstr "Dirigenza"
@@ -995,55 +963,60 @@ msgstr ""
 msgid "No delivery to own mailbox"
 msgstr "Non recapitare nella propria mailbox"
 
-#: personal/mail/generic.tpl:150
+#: personal/mail/generic.tpl:151
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr "Seleziona per rispondere automaticamente con il messaggio seguente"
 
-#: personal/mail/generic.tpl:152
+#: personal/mail/generic.tpl:153
 msgid "Activate vacation message"
 msgstr "Attiva la risposta automatica"
 
-#: personal/mail/generic.tpl:160
+#: personal/mail/generic.tpl:161
 #, fuzzy
 msgid "from"
 msgstr "e"
 
-#: personal/mail/generic.tpl:183
+#: personal/mail/generic.tpl:185
 msgid "till"
 msgstr ""
 
-#: personal/mail/generic.tpl:212
+#: personal/mail/generic.tpl:214
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr "Seleziona se intendi filtrare le tue mail con Spamassassin"
 
-#: personal/mail/generic.tpl:214
+#: personal/mail/generic.tpl:216
 msgid "Move mails tagged with spam level greater than"
 msgstr "Muovi mail marcate con un livello di Spam superiore a"
 
-#: personal/mail/generic.tpl:217
+#: personal/mail/generic.tpl:219
+#, fuzzy
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 "Scegli il livello si Spam - valori più bassi indicano maggiore sensibilità"
 
-#: personal/mail/generic.tpl:221
+#: personal/mail/generic.tpl:223
 msgid "to folder"
 msgstr "nella cartella"
 
-#: personal/mail/generic.tpl:232
+#: personal/mail/generic.tpl:235
 msgid "Reject mails bigger than"
 msgstr "Rifiuta mail più grandi di"
 
-#: personal/mail/generic.tpl:241
+#: personal/mail/generic.tpl:238
+msgid "MB"
+msgstr "Mb"
+
+#: personal/mail/generic.tpl:245
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/templates/object_container.tpl:31
-#: personal/mail/class_mailAccount.inc:1185
+#: personal/mail/class_mailAccount.inc:1401
 msgid "Vacation message"
 msgstr "Messaggio di di risposta automatica"
 
-#: personal/mail/generic.tpl:256
+#: personal/mail/generic.tpl:261
 #: personal/mail/sieve/templates/import_script.tpl:12
 #: personal/mail/sieve/templates/edit_frame_base.tpl:7
 msgid "Import"
@@ -1107,10 +1080,6 @@ msgstr "L'indirizzo principale inserito è già in uso."
 #: personal/mail/sieve/class_sieveManagement.inc:770
 #: personal/mail/sieve/class_sieveManagement.inc:1030
 #: personal/mail/sieve/class_sieveManagement.inc:1043
-#: personal/mail/class_mail-methods-cyrus.inc:291
-#: personal/mail/class_mail-methods-cyrus.inc:303
-#: personal/mail/class_mail-methods-cyrus.inc:374
-#: personal/mail/class_mail-methods-cyrus.inc:378
 #, fuzzy
 msgid "SIEVE error"
 msgstr "Errore PHP"
@@ -1118,13 +1087,12 @@ msgstr "Errore PHP"
 #: personal/mail/sieve/class_sieveManagement.inc:302
 #: personal/mail/sieve/class_sieveManagement.inc:345
 #: personal/mail/sieve/class_sieveManagement.inc:1030
-#: personal/mail/class_mail-methods-cyrus.inc:291
 #, fuzzy, php-format
 msgid "Cannot log into SIEVE server: %s"
 msgstr "Accesso al server LDAP fallito. La ragione è: %s."
 
 #: personal/mail/sieve/class_sieveManagement.inc:309
-#: personal/mail/class_mail-methods-cyrus.inc:303
+#: personal/mail/class_mail-methods-cyrus.inc:443
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
@@ -1144,8 +1112,6 @@ msgid "Uploaded script is empty!"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:431
-#: personal/mail/class_mail-methods-cyrus.inc:223
-#: personal/mail/class_mail-methods-cyrus.inc:241
 #, fuzzy
 msgid "Internal error"
 msgstr "Terminal Server"
@@ -1338,7 +1304,7 @@ msgid "Cannot insert element at the requested position!"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:1043
-#: personal/mail/class_mail-methods-cyrus.inc:374
+#: personal/mail/class_mail-methods-cyrus.inc:531
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
@@ -1664,7 +1630,6 @@ msgstr "Aggiorna"
 
 #: personal/mail/sieve/templates/remove_script.tpl:2
 #: personal/mail/sieve/class_My_Tree.inc:245
-#: personal/mail/class_mail-methods-cyrus.inc:62
 msgid "Warning"
 msgstr "Attenzione"
 
@@ -1829,6 +1794,12 @@ msgstr ""
 msgid "Complete address"
 msgstr "incompleto"
 
+#: personal/mail/sieve/class_sieveElement_If.inc:27
+#: personal/mail/sieve/class_sieveElement_If.inc:33
+#, fuzzy
+msgid "Default"
+msgstr "Stampante predefinita"
+
 #: personal/mail/sieve/class_sieveElement_If.inc:28
 #, fuzzy
 msgid "Domain part"
@@ -2014,135 +1985,106 @@ msgstr "Elimina contatto"
 msgid "Require must be the first command in the script."
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:16
+#: personal/mail/class_mailAccount.inc:51
 #: addons/mailqueue/class_mailqueue.inc:7
 msgid "This does something"
 msgstr "Questo fa qualcosa"
 
-#: personal/mail/class_mailAccount.inc:94
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
+#: personal/mail/class_mailAccount.inc:620
+#: personal/mail/class_mail-methods.inc:111
+#: personal/mail/class_mail-methods.inc:373
+#, fuzzy
+msgid "Configuration error"
+msgstr "File di configurazione"
 
-#: personal/mail/class_mailAccount.inc:208
+#: personal/mail/class_mailAccount.inc:620
 #, fuzzy, php-format
 msgid "No DESC tag in vacation template '%s'!"
 msgstr "Manca il DESC tag nel messaggio di risposta automatica:"
 
-#: personal/mail/class_mailAccount.inc:299
-msgid "Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:347
+#: personal/mail/class_mailAccount.inc:649
+#: personal/mail/class_mailAccount.inc:662
+#: personal/mail/class_mailAccount.inc:693
+#: personal/mail/class_mailAccount.inc:706
 #, fuzzy
-msgid "Please select an entry!"
-msgstr "Prego inserire un numero di telefono valido!"
+msgid "Permission error"
+msgstr "Permessi"
 
-#: personal/mail/class_mailAccount.inc:370
+#: personal/mail/class_mailAccount.inc:649
+#: personal/mail/class_mailAccount.inc:662
+#: personal/mail/class_mailAccount.inc:693
+#: personal/mail/class_mailAccount.inc:706
 #, fuzzy
-msgid "Cannot add primary address to the list of forwarders!"
-msgstr ""
-"Stai tentandi di aggiungere un indirizzo di posta non valido alla lista "
-"degli inoltri"
-
-#: personal/mail/class_mailAccount.inc:420
-#, fuzzy, php-format
-msgid "Address is already in use by user '%s'."
-msgstr "L'indirizzo che stai cercando di aggiungere  gi in uso"
+msgid "You have no permission to modify these addresses!"
+msgstr "Non hai il permesso di cambiare la tua password."
 
-#: personal/mail/class_mailAccount.inc:966
-#: personal/mail/class_mailAccount.inc:974
-#: personal/mail/class_mailAccount.inc:1361
+#: personal/mail/class_mailAccount.inc:1096
+#: personal/mail/class_mailAccount.inc:1104
+#: personal/mail/class_mailAccount.inc:1255
 #, fuzzy
 msgid "Mail reject size"
 msgstr "Inoltra i messaggi a"
 
-#: personal/mail/class_mailAccount.inc:978
-#: personal/mail/class_mailAccount.inc:1368
+#: personal/mail/class_mailAccount.inc:1108
+#: personal/mail/class_mailAccount.inc:1262
 #, fuzzy
 msgid "Spam folder"
 msgstr "nella cartella"
 
-#: personal/mail/class_mailAccount.inc:982
-#: personal/mail/class_mailAccount.inc:1373
+#: personal/mail/class_mailAccount.inc:1114
+#: personal/mail/class_mailAccount.inc:1267
 #, fuzzy
 msgid "Vacation interval"
 msgstr "Messaggio di di risposta automatica"
 
-#: personal/mail/class_mailAccount.inc:1027
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1072
-#: personal/mail/class_mailAccount.inc:1083
-#, fuzzy
-msgid "Permission error"
-msgstr "Permessi"
-
-#: personal/mail/class_mailAccount.inc:1027
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1072
-#: personal/mail/class_mailAccount.inc:1083
-#, fuzzy
-msgid "You have no permission to modify these addresses!"
-msgstr "Non hai il permesso di cambiare la tua password."
-
-#: personal/mail/class_mailAccount.inc:1148
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:1150
-msgid ""
-"Please remove the mail settings first to allow kolab to call its remove "
-"methods!"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:1175
+#: personal/mail/class_mailAccount.inc:1391
 msgid "My account"
 msgstr "Identità"
 
-#: personal/mail/class_mailAccount.inc:1184
+#: personal/mail/class_mailAccount.inc:1400
 #, fuzzy
 msgid "Add vacation information"
 msgstr "Informazioni organizzazione"
 
-#: personal/mail/class_mailAccount.inc:1187
+#: personal/mail/class_mailAccount.inc:1403
 msgid "Use spam filter"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1188
+#: personal/mail/class_mailAccount.inc:1404
 msgid "Spam level"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1189
+#: personal/mail/class_mailAccount.inc:1405
 msgid "Spam mail box"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1191
+#: personal/mail/class_mailAccount.inc:1407
 #, fuzzy
 msgid "Sieve management"
 msgstr "Dirigenza"
 
-#: personal/mail/class_mailAccount.inc:1193
+#: personal/mail/class_mailAccount.inc:1409
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "Rifiuta mail più grandi di"
 
-#: personal/mail/class_mailAccount.inc:1196
-#: personal/mail/class_mailAccount.inc:1201
+#: personal/mail/class_mailAccount.inc:1412
+#: personal/mail/class_mailAccount.inc:1417
 #, fuzzy
 msgid "Forwarding address"
 msgstr "Indirizzo principale"
 
-#: personal/mail/class_mailAccount.inc:1197
+#: personal/mail/class_mailAccount.inc:1413
 #, fuzzy
 msgid "Local delivery"
 msgstr "Ultimo recapito"
 
-#: personal/mail/class_mailAccount.inc:1198
+#: personal/mail/class_mailAccount.inc:1414
 #, fuzzy
 msgid "No delivery to own mailbox "
 msgstr "Non recapitare nella propria mailbox"
 
-#: personal/mail/class_mailAccount.inc:1199
+#: personal/mail/class_mailAccount.inc:1415
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "Indirizzi alternativi"
@@ -2151,46 +2093,42 @@ msgstr "Indirizzi alternativi"
 msgid "User mail settings"
 msgstr "Opzioni di posta dell'identità"
 
-#: personal/mail/class_mail-methods-cyrus.inc:62
-msgid "Mail server for this account is invalid!"
+#: personal/mail/class_mail-methods.inc:112
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:80
-#: personal/mail/class_mail-methods-cyrus.inc:178
-#: personal/mail/class_mail-methods-cyrus.inc:197
-#: personal/mail/class_mail-methods-cyrus.inc:263
+#: personal/mail/class_mail-methods.inc:374
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:600
+#: personal/mail/class_mail-methods.inc:601
 #, fuzzy
-msgid "IMAP error"
-msgstr "Errore LDAP"
+msgid "None"
+msgstr "nessuno"
 
-#: personal/mail/class_mail-methods-cyrus.inc:80
-msgid "Cannot store mail settings on IMAP server!"
+#: personal/mail/class_mail-methods-cyrus.inc:37
+msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:178
-#, fuzzy, php-format
-msgid "Cannot create IMAP mailbox: %s"
-msgstr "Rimuovi"
+#: personal/mail/class_mail-methods-cyrus.inc:199
+#, fuzzy
+msgid "IMAP error"
+msgstr "Errore LDAP"
 
-#: personal/mail/class_mail-methods-cyrus.inc:197
+#: personal/mail/class_mail-methods-cyrus.inc:199
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:223
-msgid "Cannot remove IMAP ACL: imap_getacl not implemented!"
-msgstr ""
-
-#: personal/mail/class_mail-methods-cyrus.inc:241
-msgid "Cannot retrieve IMAP ACL: imap_getacl not implemented!"
+#: personal/mail/class_mail-methods-cyrus.inc:328
+#: personal/mail/class_mail-methods-cyrus.inc:365
+msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:263
-#, php-format
-msgid "Cannot remove IMAP mailbox: %s"
-msgstr ""
-
-#: personal/mail/class_mail-methods-cyrus.inc:378
+#: personal/mail/class_mail-methods-cyrus.inc:538
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
@@ -2412,6 +2350,118 @@ msgstr "leggere"
 msgid "Display header of this message"
 msgstr "Mostra utenti che corrispondono a"
 
+#, fuzzy
+#~ msgid "Cannot connect mail method: %s"
+#~ msgstr "Rimuovi"
+
+#, fuzzy
+#~ msgid "Cannot remove mailbox: %s."
+#~ msgstr "Rimuovi"
+
+#, fuzzy
+#~ msgid "Cannot update mailbox: %s."
+#~ msgstr "Rimuovi"
+
+#, fuzzy
+#~ msgid "Cannot write quota settings: %s."
+#~ msgstr "Rimuovi"
+
+#, fuzzy
+#~ msgid "Cannot connect mail method! Error was: %s."
+#~ msgstr "Rimuovi"
+
+#, fuzzy
+#~ msgid "Cannot remove mailbox! Error was: %s."
+#~ msgstr "Rimuovi"
+
+#, fuzzy
+#~ msgid "Cannot update mailbox! Error was: %s."
+#~ msgstr "Rimuovi"
+
+#, fuzzy
+#~ msgid "Specify the mail server where the user will  be hosted on"
+#~ msgstr "Specifica il server di posta per l'utente"
+
+#~ msgid "not defined"
+#~ msgstr "non definito"
+
+#~ msgid "read"
+#~ msgstr "leggere"
+
+#~ msgid "post"
+#~ msgstr "spedire"
+
+#~ msgid "external post"
+#~ msgstr "spedire esterno"
+
+#~ msgid "append"
+#~ msgstr "appendere"
+
+#~ msgid "write"
+#~ msgstr "scrivere"
+
+#, fuzzy
+#~ msgid "admin"
+#~ msgstr "DN dell'amministratore"
+
+#, fuzzy
+#~ msgid "mail"
+#~ msgstr "Posta"
+
+#, fuzzy
+#~ msgid "forward address"
+#~ msgstr "Indirizzo principale"
+
+#, fuzzy
+#~ msgid "Cannot forward to users own mail address!"
+#~ msgstr "Stai cercando di aggungere un indirizzo di posta non valido"
+
+#, fuzzy
+#~ msgid "Alternate address"
+#~ msgstr "Indirizzi alternativi"
+
+#~ msgid "Add"
+#~ msgstr "Aggiungi"
+
+#, fuzzy
+#~ msgid "Unspecified"
+#~ msgstr "non definito"
+
+#, fuzzy
+#~ msgid "Mails"
+#~ msgstr "Posta"
+
+#, fuzzy
+#~ msgid "Tasks"
+#~ msgstr "classe"
+
+#, fuzzy
+#~ msgid "Journals"
+#~ msgstr "ora"
+
+#, fuzzy
+#~ msgid "Contacts"
+#~ msgstr "Contatto"
+
+#, fuzzy
+#~ msgid "Notes"
+#~ msgstr "nessuno"
+
+#, fuzzy
+#~ msgid "Drafts"
+#~ msgstr "Data"
+
+#, fuzzy
+#~ msgid "Sent items"
+#~ msgstr "Stato"
+
+#, fuzzy
+#~ msgid "Junk mail"
+#~ msgstr "Nome gruppo"
+
+#~ msgid "Mail options"
+#~ msgstr "Opzioni di posta"
+
 #, fuzzy
 #~ msgid "You have no permission to submit a '%s' command!"
 #~ msgstr "Non hai il permesso di cambiare la tua password."

diff --git a/gosa-plugins/mail/locale/messages.po b/gosa-plugins/mail/locale/messages.po
index 29fc80120e68f5e9b3577eeace14351a79313349..8b5692a847c6c855dd4400720cbfeb64ee8e237d 100644 (file)
--- a/gosa-plugins/mail/locale/messages.po
+++ b/gosa-plugins/mail/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-03 15:05+0100\n"
+"POT-Creation-Date: 2008-12-10 10:53+0100\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"
@@ -20,9 +20,10 @@ msgstr ""
 msgid "Mail distribution list"
 msgstr ""
 
-#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/mail.tpl:10
-#: admin/groups/mail/paste_mail.tpl:8 personal/mail/copypaste.tpl:7
-#: personal/mail/generic.tpl:8 personal/mail/class_mailAccount.inc:931
+#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/mail.tpl:7
+#: admin/groups/mail/paste_mail.tpl:8
+#: admin/groups/mail/class_groupMail.inc:784 personal/mail/copypaste.tpl:7
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1060
 msgid "Primary address"
 msgstr ""
 
@@ -31,7 +32,6 @@ msgid "Primary mail address for this distribution list"
 msgstr ""
 
 #: admin/ogroups/mail/class_mailogroup.inc:50
-#: admin/groups/mail/class_groupMail.inc:390
 msgid "Remove mail account"
 msgstr ""
 
@@ -41,31 +41,30 @@ msgid "mail group"
 msgstr ""
 
 #: admin/ogroups/mail/class_mailogroup.inc:53
-#: admin/groups/mail/class_groupMail.inc:393
 msgid "Create mail account"
 msgstr ""
 
 #: admin/ogroups/mail/class_mailogroup.inc:86
 #: admin/ogroups/mail/class_mailogroup.inc:93
 #: admin/ogroups/mail/class_mailogroup.inc:194
-#: admin/groups/mail/class_groupMail.inc:499
-#: admin/groups/mail/class_groupMail.inc:1084
-#: admin/groups/mail/class_groupMail.inc:1087
-#: admin/groups/mail/class_groupMail.inc:1093
-#: admin/groups/mail/class_groupMail.inc:1295
-#: personal/mail/class_mailAccount.inc:364
-#: personal/mail/class_mailAccount.inc:400
-#: personal/mail/class_mailAccount.inc:408
-#: personal/mail/class_mailAccount.inc:419
-#: personal/mail/class_mailAccount.inc:935
-#: personal/mail/class_mailAccount.inc:939
-#: personal/mail/class_mailAccount.inc:950
-#: personal/mail/class_mailAccount.inc:1180
+#: admin/groups/mail/class_groupMail.inc:325
+#: admin/groups/mail/class_groupMail.inc:360
+#: admin/groups/mail/class_groupMail.inc:366
+#: admin/groups/mail/class_groupMail.inc:375
+#: admin/groups/mail/class_groupMail.inc:786
+#: admin/groups/mail/class_groupMail.inc:917
+#: personal/mail/class_mailAccount.inc:306
+#: personal/mail/class_mailAccount.inc:341
+#: personal/mail/class_mailAccount.inc:346
+#: personal/mail/class_mailAccount.inc:354
+#: personal/mail/class_mailAccount.inc:1064
+#: personal/mail/class_mailAccount.inc:1068
+#: personal/mail/class_mailAccount.inc:1079
+#: personal/mail/class_mailAccount.inc:1396
 msgid "Mail address"
 msgstr ""
 
 #: admin/ogroups/mail/class_mailogroup.inc:86
-#: admin/groups/mail/class_groupMail.inc:1087
 msgid "your-name@your-domain.com"
 msgstr ""
 
@@ -75,26 +74,32 @@ msgstr ""
 #: admin/systems/services/spam/class_goSpamServer.inc:277
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/mail/class_goMailServer.inc:582
-#: admin/groups/mail/class_groupMail.inc:794
-#: admin/groups/mail/class_groupMail.inc:1048
-#: personal/mail/class_mailAccount.inc:694
-#: personal/mail/class_mailAccount.inc:862
+#: admin/groups/mail/class_groupMail.inc:501
+#: admin/groups/mail/class_groupMail.inc:716
+#: personal/mail/class_mailAccount.inc:889
+#: personal/mail/class_mailAccount.inc:956
 msgid "LDAP error"
 msgstr ""
 
 #: admin/ogroups/mail/class_mailogroup.inc:186
 #: admin/ogroups/mail/paste_mail.tpl:4
-#: admin/groups/mail/class_groupMail.inc:1287
-#: personal/mail/class_mailAccount.inc:15
-#: personal/mail/class_mailAccount.inc:288
-#: personal/mail/class_mailAccount.inc:298
-#: personal/mail/class_mailAccount.inc:301
-#: personal/mail/class_mailAccount.inc:302
-#: personal/mail/class_mailAccount.inc:305
-#: personal/mail/class_mailAccount.inc:306
-#: personal/mail/class_mailAccount.inc:926
-#: personal/mail/class_mailAccount.inc:1170
-#: personal/mail/class_mailAccount.inc:1346
+#: admin/groups/mail/class_groupMail.inc:257
+#: admin/groups/mail/class_groupMail.inc:259
+#: admin/groups/mail/class_groupMail.inc:260
+#: admin/groups/mail/class_groupMail.inc:265
+#: admin/groups/mail/class_groupMail.inc:267
+#: admin/groups/mail/class_groupMail.inc:268
+#: admin/groups/mail/class_groupMail.inc:774
+#: admin/groups/mail/class_groupMail.inc:909
+#: personal/mail/class_mailAccount.inc:50
+#: personal/mail/class_mailAccount.inc:222
+#: personal/mail/class_mailAccount.inc:230
+#: personal/mail/class_mailAccount.inc:232
+#: personal/mail/class_mailAccount.inc:237
+#: personal/mail/class_mailAccount.inc:239
+#: personal/mail/class_mailAccount.inc:1048
+#: personal/mail/class_mailAccount.inc:1240
+#: personal/mail/class_mailAccount.inc:1386
 msgid "Mail"
 msgstr ""
 
@@ -211,7 +216,7 @@ msgid "Start POP3 SSL service"
 msgstr ""
 
 #: admin/systems/services/imap/goImapServer.tpl:1
-#: admin/systems/services/mail/goMailServer.tpl:1 admin/groups/mail/mail.tpl:7
+#: admin/systems/services/mail/goMailServer.tpl:1 admin/groups/mail/mail.tpl:4
 #: personal/mail/generic.tpl:5
 msgid "Generic"
 msgstr ""
@@ -258,22 +263,24 @@ msgstr ""
 
 #: admin/systems/services/spam/class_goSpamServer.inc:143
 #: admin/systems/services/spam/class_goSpamServer.inc:216
-#: admin/groups/mail/class_groupMail.inc:464
-#: admin/groups/mail/class_groupMail.inc:468
-#: admin/groups/mail/class_groupMail.inc:494
-#: admin/groups/mail/class_groupMail.inc:499
+#: admin/groups/mail/class_groupMail.inc:312
+#: admin/groups/mail/class_groupMail.inc:325
+#: admin/groups/mail/class_groupMail.inc:331
+#: admin/groups/mail/class_groupMail.inc:360
+#: admin/groups/mail/class_groupMail.inc:366
+#: admin/groups/mail/class_groupMail.inc:375
 #: personal/mail/sieve/class_sieveManagement.inc:201
 #: personal/mail/sieve/class_sieveManagement.inc:206
 #: personal/mail/sieve/class_sieveManagement.inc:212
 #: personal/mail/sieve/class_sieveManagement.inc:218
 #: personal/mail/sieve/class_sieveManagement.inc:429
 #: personal/mail/sieve/class_My_Tree.inc:660
-#: personal/mail/class_mailAccount.inc:347
-#: personal/mail/class_mailAccount.inc:363
-#: personal/mail/class_mailAccount.inc:370
-#: personal/mail/class_mailAccount.inc:399
-#: personal/mail/class_mailAccount.inc:407
-#: personal/mail/class_mailAccount.inc:419
+#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:306
+#: personal/mail/class_mailAccount.inc:312
+#: personal/mail/class_mailAccount.inc:341
+#: personal/mail/class_mailAccount.inc:346
+#: personal/mail/class_mailAccount.inc:354
 #: addons/mailqueue/class_mailqueue.inc:110
 #: addons/mailqueue/class_mailqueue.inc:144
 #: addons/mailqueue/class_mailqueue.inc:150
@@ -342,7 +349,6 @@ msgstr ""
 #: admin/systems/services/spam/goSpamServer.tpl:48
 #: admin/systems/services/mail/goMailServer.tpl:73
 #: admin/systems/services/mail/goMailServer.tpl:104
-#: admin/groups/mail/class_groupMail.inc:654
 msgid "Remove"
 msgstr ""
 
@@ -585,111 +591,96 @@ msgstr ""
 msgid "Restriction filter"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:14 personal/mail/generic.tpl:11
-msgid "Multiple edit"
-msgstr ""
-
-#: admin/groups/mail/mail.tpl:17 admin/groups/mail/paste_mail.tpl:12
-msgid "Primary mail address for this shared folder"
-msgstr ""
-
-#: admin/groups/mail/mail.tpl:23 personal/mail/generic.tpl:20
+#: admin/groups/mail/mail.tpl:35 personal/mail/generic.tpl:30
 #: addons/mailqueue/contents.tpl:73
 msgid "Server"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:26
-msgid "Select mail server to place user on"
+#: admin/groups/mail/mail.tpl:39 personal/mail/generic.tpl:37
+msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:36 personal/mail/generic.tpl:34
+#: admin/groups/mail/mail.tpl:52 personal/mail/generic.tpl:53
 msgid "Quota usage"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:43 personal/mail/generic.tpl:41
-msgid "not defined"
-msgstr ""
-
-#: admin/groups/mail/mail.tpl:48 admin/groups/mail/class_groupMail.inc:1099
-#: admin/groups/mail/class_groupMail.inc:1296 personal/mail/generic.tpl:47
-#: personal/mail/class_mailAccount.inc:957
-#: personal/mail/class_mailAccount.inc:1182
-#: personal/mail/class_mailAccount.inc:1352
+#: admin/groups/mail/mail.tpl:56 admin/groups/mail/class_groupMail.inc:793
+#: admin/groups/mail/class_groupMail.inc:918 personal/mail/generic.tpl:57
+#: personal/mail/class_mailAccount.inc:1087
+#: personal/mail/class_mailAccount.inc:1246
+#: personal/mail/class_mailAccount.inc:1398
 msgid "Quota size"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:53 personal/mail/generic.tpl:234
-msgid "MB"
-msgstr ""
-
-#: admin/groups/mail/mail.tpl:59 admin/groups/mail/class_groupMail.inc:1298
+#: admin/groups/mail/mail.tpl:69 admin/groups/mail/class_groupMail.inc:920
 msgid "Folder type"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:85
+#: admin/groups/mail/mail.tpl:87
 msgid "Reload"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:102 admin/groups/mail/paste_mail.tpl:23
-#: personal/mail/copypaste.tpl:25 personal/mail/generic.tpl:64
+#: admin/groups/mail/mail.tpl:98 admin/groups/mail/paste_mail.tpl:23
+#: personal/mail/copypaste.tpl:25 personal/mail/generic.tpl:73
 msgid "Alternative addresses"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:105 admin/groups/mail/paste_mail.tpl:24
-#: personal/mail/copypaste.tpl:55 personal/mail/generic.tpl:67
+#: admin/groups/mail/mail.tpl:103 admin/groups/mail/paste_mail.tpl:24
+#: personal/mail/copypaste.tpl:55 personal/mail/generic.tpl:76
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:135
+#: admin/groups/mail/mail.tpl:132
 msgid "IMAP shared folders"
 msgstr ""
 
 #: admin/groups/mail/mail.tpl:139
-msgid "Set shared folder permissions"
-msgstr ""
-
-#: admin/groups/mail/mail.tpl:148
 msgid "Default permission"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:159
+#: admin/groups/mail/mail.tpl:141
 msgid "Member permission"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:176 personal/mail/generic.tpl:295
+#: admin/groups/mail/mail.tpl:169 personal/mail/generic.tpl:303
 msgid "Advanced mail options"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:182 personal/mail/generic.tpl:301
+#: admin/groups/mail/mail.tpl:175 personal/mail/generic.tpl:309
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:184 personal/mail/generic.tpl:303
+#: admin/groups/mail/mail.tpl:177 personal/mail/generic.tpl:311
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:193 admin/groups/mail/paste_mail.tpl:34
+#: admin/groups/mail/mail.tpl:186 admin/groups/mail/paste_mail.tpl:34
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:202
+#: admin/groups/mail/mail.tpl:195
 msgid "Used in all groups"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:205
+#: admin/groups/mail/mail.tpl:198
 msgid "Not used in all groups"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:223 admin/groups/mail/paste_mail.tpl:42
-#: personal/mail/copypaste.tpl:44 personal/mail/generic.tpl:285
+#: admin/groups/mail/mail.tpl:216 admin/groups/mail/paste_mail.tpl:42
+#: personal/mail/copypaste.tpl:44 personal/mail/generic.tpl:290
+#: personal/mail/generic.tpl:293
 msgid "Add local"
 msgstr ""
 
 #: admin/groups/mail/paste_mail.tpl:1 personal/mail/copypaste.tpl:1
-#: personal/mail/class_mailAccount.inc:1171
+#: personal/mail/class_mailAccount.inc:1387
 msgid "Mail settings"
 msgstr ""
 
+#: admin/groups/mail/paste_mail.tpl:12
+msgid "Primary mail address for this shared folder"
+msgstr ""
+
 #: admin/groups/mail/mail_locals.tpl:6 personal/mail/mail_locals.tpl:7
 msgid "Select addresses to add"
 msgstr ""
@@ -735,192 +726,180 @@ msgid "Choose"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:92
-#: personal/mail/class_mailAccount.inc:94
-#: personal/mail/class_mailAccount.inc:208
-msgid "Configuration error"
+#: admin/groups/mail/class_groupMail.inc:99
+#: admin/groups/mail/class_groupMail.inc:106
+#: admin/groups/mail/class_groupMail.inc:113
+#: admin/groups/mail/class_groupMail.inc:118
+#: admin/groups/mail/class_groupMail.inc:121
+#: admin/groups/mail/class_groupMail.inc:513
+#: admin/groups/mail/class_groupMail.inc:517
+#: admin/groups/mail/class_groupMail.inc:521
+#: admin/groups/mail/class_groupMail.inc:729
+#: admin/groups/mail/class_groupMail.inc:733
+#: admin/groups/mail/class_groupMail.inc:737
+#: admin/groups/mail/class_groupMail.inc:746
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:145
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:902
+#: personal/mail/class_mailAccount.inc:970
+#: personal/mail/class_mailAccount.inc:974
+#: personal/mail/class_mailAccount.inc:978
+#: personal/mail/class_mailAccount.inc:992
+msgid "Mail error"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:92
+#: personal/mail/class_mailAccount.inc:130
 #, php-format
-msgid "Cannot locate mail method '%s'!"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:325
-msgid "read"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:326
-msgid "post"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:327
-msgid "external post"
+msgid "Cannot read quota settings: %s"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:328
-msgid "append"
+#: admin/groups/mail/class_groupMail.inc:99
+#: personal/mail/class_mailAccount.inc:137
+#, php-format
+msgid "Cannot get list of mailboxes: %s"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:329
-msgid "write"
+#: admin/groups/mail/class_groupMail.inc:106
+#, php-format
+msgid "Cannot receive folder types: %s"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:330
-msgid "admin"
+#: admin/groups/mail/class_groupMail.inc:113
+#, php-format
+msgid "Cannot receive folder permissions: %s"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:331
-msgid "none"
+#: admin/groups/mail/class_groupMail.inc:118
+#: admin/groups/mail/class_groupMail.inc:513
+#: admin/groups/mail/class_groupMail.inc:729
+#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:970
+#, php-format
+msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:382
-#: admin/groups/mail/class_groupMail.inc:391
-#: admin/groups/mail/class_groupMail.inc:394
-msgid "mail"
+#: admin/groups/mail/class_groupMail.inc:121
+#: personal/mail/class_mailAccount.inc:145
+#, php-format
+msgid "Mailbox '%s' doesn't exists on mail server: %s"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:404
+#: admin/groups/mail/class_groupMail.inc:278
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:405
+#: admin/groups/mail/class_groupMail.inc:279
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:464
-msgid "forward address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:468
-msgid "Cannot forward to users own mail address!"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:494
-msgid "Alternate address"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:648
-msgid "Add"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:700
-#: admin/groups/mail/class_groupMail.inc:706
-msgid "Unspecified"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:700
-msgid "Mails"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:701
-msgid "Tasks"
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:701
-msgid "Journals"
+#: admin/groups/mail/class_groupMail.inc:312
+#: personal/mail/class_mailAccount.inc:294
+msgid "Please select an entry!"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:702
-msgid "Calendar"
+#: admin/groups/mail/class_groupMail.inc:331
+#: personal/mail/class_mailAccount.inc:312
+msgid "Cannot add primary address to the list of forwarders!"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:702
-msgid "Contacts"
+#: admin/groups/mail/class_groupMail.inc:376
+#: personal/mail/class_mailAccount.inc:355
+#, php-format
+msgid "Address is already in use by user '%s'."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:703
-msgid "Notes"
+#: admin/groups/mail/class_groupMail.inc:402
+#: personal/mail/class_mailAccount.inc:384
+msgid "Unknown"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:706
-msgid "Inbox"
+#: admin/groups/mail/class_groupMail.inc:517
+#: personal/mail/class_mailAccount.inc:902
+#, php-format
+msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:707
-msgid "Drafts"
+#: admin/groups/mail/class_groupMail.inc:521
+#: admin/groups/mail/class_groupMail.inc:746
+#, php-format
+msgid "Cannot update shared folder permissions: %s"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:707
-msgid "Sent items"
+#: admin/groups/mail/class_groupMail.inc:611
+msgid "New"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:708
-msgid "Junk mail"
+#: admin/groups/mail/class_groupMail.inc:733
+#: personal/mail/class_mailAccount.inc:974
+#, php-format
+msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:710
-#: personal/mail/sieve/class_sieveElement_If.inc:27
-#: personal/mail/sieve/class_sieveElement_If.inc:33
-msgid "Default"
+#: admin/groups/mail/class_groupMail.inc:737
+#: personal/mail/class_mailAccount.inc:978
+#, php-format
+msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1108
-#: personal/mail/class_mailAccount.inc:1194
+#: admin/groups/mail/class_groupMail.inc:802
+#: personal/mail/class_mailAccount.inc:1410
 msgid "Mail max size"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1116
+#: admin/groups/mail/class_groupMail.inc:810
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1120
-msgid ""
-"Please choose valid permission settings. Default permission can't be emtpy."
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:1124
-#: admin/groups/mail/class_groupMail.inc:1297
-#: personal/mail/class_mailAccount.inc:1181
+#: admin/groups/mail/class_groupMail.inc:814
+#: admin/groups/mail/class_groupMail.inc:919
+#: personal/mail/class_mailAccount.inc:1397
 msgid "Mail server"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1288
+#: admin/groups/mail/class_groupMail.inc:910
 msgid "Group mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1298
+#: admin/groups/mail/class_groupMail.inc:920
 msgid "Kolab"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1299
+#: admin/groups/mail/class_groupMail.inc:921
 msgid "Alternate addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1300
+#: admin/groups/mail/class_groupMail.inc:922
 msgid "Forwarding addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1301
+#: admin/groups/mail/class_groupMail.inc:923
 msgid "Only local"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1302
+#: admin/groups/mail/class_groupMail.inc:924
 msgid "Permissions"
 msgstr ""
 
-#: personal/mail/copypaste.tpl:13 personal/mail/generic.tpl:262
+#: personal/mail/copypaste.tpl:13 personal/mail/generic.tpl:267
 msgid "Forward messages to"
 msgstr ""
 
-#: personal/mail/generic.tpl:23
-msgid "Specify the mail server where the user will be hosted on"
-msgstr ""
-
-#: personal/mail/generic.tpl:92
-msgid "Mail options"
-msgstr ""
-
-#: personal/mail/generic.tpl:124 personal/mail/class_mailAccount.inc:1202
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1418
 msgid "Use custom sieve script"
 msgstr ""
 
-#: personal/mail/generic.tpl:124
+#: personal/mail/generic.tpl:115
 msgid "disables all Mail options!"
 msgstr ""
 
-#: personal/mail/generic.tpl:131
+#: personal/mail/generic.tpl:123
 msgid "Sieve Management"
 msgstr ""
 
@@ -932,53 +911,57 @@ msgstr ""
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: personal/mail/generic.tpl:150
+#: personal/mail/generic.tpl:151
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: personal/mail/generic.tpl:152
+#: personal/mail/generic.tpl:153
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/generic.tpl:160
+#: personal/mail/generic.tpl:161
 msgid "from"
 msgstr ""
 
-#: personal/mail/generic.tpl:183
+#: personal/mail/generic.tpl:185
 msgid "till"
 msgstr ""
 
-#: personal/mail/generic.tpl:212
+#: personal/mail/generic.tpl:214
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr ""
 
-#: personal/mail/generic.tpl:214
+#: personal/mail/generic.tpl:216
 msgid "Move mails tagged with spam level greater than"
 msgstr ""
 
-#: personal/mail/generic.tpl:217
+#: personal/mail/generic.tpl:219
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 
-#: personal/mail/generic.tpl:221
+#: personal/mail/generic.tpl:223
 msgid "to folder"
 msgstr ""
 
-#: personal/mail/generic.tpl:232
+#: personal/mail/generic.tpl:235
 msgid "Reject mails bigger than"
 msgstr ""
 
-#: personal/mail/generic.tpl:241
+#: personal/mail/generic.tpl:238
+msgid "MB"
+msgstr ""
+
+#: personal/mail/generic.tpl:245
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/templates/object_container.tpl:31
-#: personal/mail/class_mailAccount.inc:1185
+#: personal/mail/class_mailAccount.inc:1401
 msgid "Vacation message"
 msgstr ""
 
-#: personal/mail/generic.tpl:256
+#: personal/mail/generic.tpl:261
 #: personal/mail/sieve/templates/import_script.tpl:12
 #: personal/mail/sieve/templates/edit_frame_base.tpl:7
 msgid "Import"
@@ -1035,23 +1018,18 @@ msgstr ""
 #: personal/mail/sieve/class_sieveManagement.inc:770
 #: personal/mail/sieve/class_sieveManagement.inc:1030
 #: personal/mail/sieve/class_sieveManagement.inc:1043
-#: personal/mail/class_mail-methods-cyrus.inc:291
-#: personal/mail/class_mail-methods-cyrus.inc:303
-#: personal/mail/class_mail-methods-cyrus.inc:374
-#: personal/mail/class_mail-methods-cyrus.inc:378
 msgid "SIEVE error"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:302
 #: personal/mail/sieve/class_sieveManagement.inc:345
 #: personal/mail/sieve/class_sieveManagement.inc:1030
-#: personal/mail/class_mail-methods-cyrus.inc:291
 #, php-format
 msgid "Cannot log into SIEVE server: %s"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:309
-#: personal/mail/class_mail-methods-cyrus.inc:303
+#: personal/mail/class_mail-methods-cyrus.inc:443
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
@@ -1070,8 +1048,6 @@ msgid "Uploaded script is empty!"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:431
-#: personal/mail/class_mail-methods-cyrus.inc:223
-#: personal/mail/class_mail-methods-cyrus.inc:241
 msgid "Internal error"
 msgstr ""
 
@@ -1246,7 +1222,7 @@ msgid "Cannot insert element at the requested position!"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:1043
-#: personal/mail/class_mail-methods-cyrus.inc:374
+#: personal/mail/class_mail-methods-cyrus.inc:531
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
@@ -1537,7 +1513,6 @@ msgstr ""
 
 #: personal/mail/sieve/templates/remove_script.tpl:2
 #: personal/mail/sieve/class_My_Tree.inc:245
-#: personal/mail/class_mail-methods-cyrus.inc:62
 msgid "Warning"
 msgstr ""
 
@@ -1687,6 +1662,11 @@ msgstr ""
 msgid "Complete address"
 msgstr ""
 
+#: personal/mail/sieve/class_sieveElement_If.inc:27
+#: personal/mail/sieve/class_sieveElement_If.inc:33
+msgid "Default"
+msgstr ""
+
 #: personal/mail/sieve/class_sieveElement_If.inc:28
 msgid "Domain part"
 msgstr ""
@@ -1852,120 +1832,94 @@ msgstr ""
 msgid "Require must be the first command in the script."
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:16
+#: personal/mail/class_mailAccount.inc:51
 #: addons/mailqueue/class_mailqueue.inc:7
 msgid "This does something"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:94
-#, php-format
-msgid "Mail method '%s' is unknown!"
+#: personal/mail/class_mailAccount.inc:620
+#: personal/mail/class_mail-methods.inc:111
+#: personal/mail/class_mail-methods.inc:373
+msgid "Configuration error"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:208
+#: personal/mail/class_mailAccount.inc:620
 #, php-format
 msgid "No DESC tag in vacation template '%s'!"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:299
-msgid "Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:347
-msgid "Please select an entry!"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:370
-msgid "Cannot add primary address to the list of forwarders!"
+#: personal/mail/class_mailAccount.inc:649
+#: personal/mail/class_mailAccount.inc:662
+#: personal/mail/class_mailAccount.inc:693
+#: personal/mail/class_mailAccount.inc:706
+msgid "Permission error"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:420
-#, php-format
-msgid "Address is already in use by user '%s'."
+#: personal/mail/class_mailAccount.inc:649
+#: personal/mail/class_mailAccount.inc:662
+#: personal/mail/class_mailAccount.inc:693
+#: personal/mail/class_mailAccount.inc:706
+msgid "You have no permission to modify these addresses!"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:966
-#: personal/mail/class_mailAccount.inc:974
-#: personal/mail/class_mailAccount.inc:1361
+#: personal/mail/class_mailAccount.inc:1096
+#: personal/mail/class_mailAccount.inc:1104
+#: personal/mail/class_mailAccount.inc:1255
 msgid "Mail reject size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:978
-#: personal/mail/class_mailAccount.inc:1368
+#: personal/mail/class_mailAccount.inc:1108
+#: personal/mail/class_mailAccount.inc:1262
 msgid "Spam folder"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:982
-#: personal/mail/class_mailAccount.inc:1373
+#: personal/mail/class_mailAccount.inc:1114
+#: personal/mail/class_mailAccount.inc:1267
 msgid "Vacation interval"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1027
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1072
-#: personal/mail/class_mailAccount.inc:1083
-msgid "Permission error"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:1027
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1072
-#: personal/mail/class_mailAccount.inc:1083
-msgid "You have no permission to modify these addresses!"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:1148
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:1150
-msgid ""
-"Please remove the mail settings first to allow kolab to call its remove "
-"methods!"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:1175
+#: personal/mail/class_mailAccount.inc:1391
 msgid "My account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1184
+#: personal/mail/class_mailAccount.inc:1400
 msgid "Add vacation information"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1187
+#: personal/mail/class_mailAccount.inc:1403
 msgid "Use spam filter"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1188
+#: personal/mail/class_mailAccount.inc:1404
 msgid "Spam level"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1189
+#: personal/mail/class_mailAccount.inc:1405
 msgid "Spam mail box"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1191
+#: personal/mail/class_mailAccount.inc:1407
 msgid "Sieve management"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1193
+#: personal/mail/class_mailAccount.inc:1409
 msgid "Reject due to mailsize"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1196
-#: personal/mail/class_mailAccount.inc:1201
+#: personal/mail/class_mailAccount.inc:1412
+#: personal/mail/class_mailAccount.inc:1417
 msgid "Forwarding address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1197
+#: personal/mail/class_mailAccount.inc:1413
 msgid "Local delivery"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1198
+#: personal/mail/class_mailAccount.inc:1414
 msgid "No delivery to own mailbox "
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1199
+#: personal/mail/class_mailAccount.inc:1415
 msgid "Mail alternative addresses"
 msgstr ""
 
@@ -1973,45 +1927,40 @@ msgstr ""
 msgid "User mail settings"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:62
-msgid "Mail server for this account is invalid!"
-msgstr ""
-
-#: personal/mail/class_mail-methods-cyrus.inc:80
-#: personal/mail/class_mail-methods-cyrus.inc:178
-#: personal/mail/class_mail-methods-cyrus.inc:197
-#: personal/mail/class_mail-methods-cyrus.inc:263
-msgid "IMAP error"
-msgstr ""
-
-#: personal/mail/class_mail-methods-cyrus.inc:80
-msgid "Cannot store mail settings on IMAP server!"
+#: personal/mail/class_mail-methods.inc:112
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:178
+#: personal/mail/class_mail-methods.inc:374
 #, php-format
-msgid "Cannot create IMAP mailbox: %s"
+msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:197
-#, php-format
-msgid "Cannot modify IMAP mailbox quota: %s"
+#: personal/mail/class_mail-methods.inc:600
+#: personal/mail/class_mail-methods.inc:601
+msgid "None"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:223
-msgid "Cannot remove IMAP ACL: imap_getacl not implemented!"
+#: personal/mail/class_mail-methods-cyrus.inc:37
+msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:241
-msgid "Cannot retrieve IMAP ACL: imap_getacl not implemented!"
+#: personal/mail/class_mail-methods-cyrus.inc:199
+msgid "IMAP error"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:263
+#: personal/mail/class_mail-methods-cyrus.inc:199
 #, php-format
-msgid "Cannot remove IMAP mailbox: %s"
+msgid "Cannot modify IMAP mailbox quota: %s"
+msgstr ""
+
+#: personal/mail/class_mail-methods-cyrus.inc:328
+#: personal/mail/class_mail-methods-cyrus.inc:365
+msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:378
+#: personal/mail/class_mail-methods-cyrus.inc:538
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""

diff --git a/gosa-plugins/mail/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/nl/LC_MESSAGES/messages.po
index e0ebbe21f00274d98f9a2e1641a4f34cb06ed454..36f6ae7808205abb4b38b65a1764abf4f0bbffc0 100644 (file)
--- a/gosa-plugins/mail/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/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: 2008-12-03 15:05+0100\n"
+"POT-Creation-Date: 2008-12-10 10:53+0100\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"
@@ -23,9 +23,10 @@ msgstr ""
 msgid "Mail distribution list"
 msgstr "Mail distributielijst"
 
-#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/mail.tpl:10
-#: admin/groups/mail/paste_mail.tpl:8 personal/mail/copypaste.tpl:7
-#: personal/mail/generic.tpl:8 personal/mail/class_mailAccount.inc:931
+#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/mail.tpl:7
+#: admin/groups/mail/paste_mail.tpl:8
+#: admin/groups/mail/class_groupMail.inc:784 personal/mail/copypaste.tpl:7
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1060
 msgid "Primary address"
 msgstr "Primair adres"
 
@@ -34,7 +35,6 @@ msgid "Primary mail address for this distribution list"
 msgstr "Primair E-mail adres voor deze distributielijst"
 
 #: admin/ogroups/mail/class_mailogroup.inc:50
-#: admin/groups/mail/class_groupMail.inc:390
 msgid "Remove mail account"
 msgstr "E-mail account verwijderen"
 
@@ -45,31 +45,30 @@ msgid "mail group"
 msgstr "Primaire groep"
 
 #: admin/ogroups/mail/class_mailogroup.inc:53
-#: admin/groups/mail/class_groupMail.inc:393
 msgid "Create mail account"
 msgstr "E-mail account aanmaken"
 
 #: admin/ogroups/mail/class_mailogroup.inc:86
 #: admin/ogroups/mail/class_mailogroup.inc:93
 #: admin/ogroups/mail/class_mailogroup.inc:194
-#: admin/groups/mail/class_groupMail.inc:499
-#: admin/groups/mail/class_groupMail.inc:1084
-#: admin/groups/mail/class_groupMail.inc:1087
-#: admin/groups/mail/class_groupMail.inc:1093
-#: admin/groups/mail/class_groupMail.inc:1295
-#: personal/mail/class_mailAccount.inc:364
-#: personal/mail/class_mailAccount.inc:400
-#: personal/mail/class_mailAccount.inc:408
-#: personal/mail/class_mailAccount.inc:419
-#: personal/mail/class_mailAccount.inc:935
-#: personal/mail/class_mailAccount.inc:939
-#: personal/mail/class_mailAccount.inc:950
-#: personal/mail/class_mailAccount.inc:1180
+#: admin/groups/mail/class_groupMail.inc:325
+#: admin/groups/mail/class_groupMail.inc:360
+#: admin/groups/mail/class_groupMail.inc:366
+#: admin/groups/mail/class_groupMail.inc:375
+#: admin/groups/mail/class_groupMail.inc:786
+#: admin/groups/mail/class_groupMail.inc:917
+#: personal/mail/class_mailAccount.inc:306
+#: personal/mail/class_mailAccount.inc:341
+#: personal/mail/class_mailAccount.inc:346
+#: personal/mail/class_mailAccount.inc:354
+#: personal/mail/class_mailAccount.inc:1064
+#: personal/mail/class_mailAccount.inc:1068
+#: personal/mail/class_mailAccount.inc:1079
+#: personal/mail/class_mailAccount.inc:1396
 msgid "Mail address"
 msgstr "E-mail adres"
 
 #: admin/ogroups/mail/class_mailogroup.inc:86
-#: admin/groups/mail/class_groupMail.inc:1087
 msgid "your-name@your-domain.com"
 msgstr ""
 
@@ -79,27 +78,33 @@ msgstr ""
 #: admin/systems/services/spam/class_goSpamServer.inc:277
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/mail/class_goMailServer.inc:582
-#: admin/groups/mail/class_groupMail.inc:794
-#: admin/groups/mail/class_groupMail.inc:1048
-#: personal/mail/class_mailAccount.inc:694
-#: personal/mail/class_mailAccount.inc:862
+#: admin/groups/mail/class_groupMail.inc:501
+#: admin/groups/mail/class_groupMail.inc:716
+#: personal/mail/class_mailAccount.inc:889
+#: personal/mail/class_mailAccount.inc:956
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
 
 #: admin/ogroups/mail/class_mailogroup.inc:186
 #: admin/ogroups/mail/paste_mail.tpl:4
-#: admin/groups/mail/class_groupMail.inc:1287
-#: personal/mail/class_mailAccount.inc:15
-#: personal/mail/class_mailAccount.inc:288
-#: personal/mail/class_mailAccount.inc:298
-#: personal/mail/class_mailAccount.inc:301
-#: personal/mail/class_mailAccount.inc:302
-#: personal/mail/class_mailAccount.inc:305
-#: personal/mail/class_mailAccount.inc:306
-#: personal/mail/class_mailAccount.inc:926
-#: personal/mail/class_mailAccount.inc:1170
-#: personal/mail/class_mailAccount.inc:1346
+#: admin/groups/mail/class_groupMail.inc:257
+#: admin/groups/mail/class_groupMail.inc:259
+#: admin/groups/mail/class_groupMail.inc:260
+#: admin/groups/mail/class_groupMail.inc:265
+#: admin/groups/mail/class_groupMail.inc:267
+#: admin/groups/mail/class_groupMail.inc:268
+#: admin/groups/mail/class_groupMail.inc:774
+#: admin/groups/mail/class_groupMail.inc:909
+#: personal/mail/class_mailAccount.inc:50
+#: personal/mail/class_mailAccount.inc:222
+#: personal/mail/class_mailAccount.inc:230
+#: personal/mail/class_mailAccount.inc:232
+#: personal/mail/class_mailAccount.inc:237
+#: personal/mail/class_mailAccount.inc:239
+#: personal/mail/class_mailAccount.inc:1048
+#: personal/mail/class_mailAccount.inc:1240
+#: personal/mail/class_mailAccount.inc:1386
 msgid "Mail"
 msgstr "E-mail"
 
@@ -229,7 +234,7 @@ msgid "Start POP3 SSL service"
 msgstr "POP3/SSL service"
 
 #: admin/systems/services/imap/goImapServer.tpl:1
-#: admin/systems/services/mail/goMailServer.tpl:1 admin/groups/mail/mail.tpl:7
+#: admin/systems/services/mail/goMailServer.tpl:1 admin/groups/mail/mail.tpl:4
 #: personal/mail/generic.tpl:5
 msgid "Generic"
 msgstr "Algemeen"
@@ -279,22 +284,24 @@ msgstr ""
 
 #: admin/systems/services/spam/class_goSpamServer.inc:143
 #: admin/systems/services/spam/class_goSpamServer.inc:216
-#: admin/groups/mail/class_groupMail.inc:464
-#: admin/groups/mail/class_groupMail.inc:468
-#: admin/groups/mail/class_groupMail.inc:494
-#: admin/groups/mail/class_groupMail.inc:499
+#: admin/groups/mail/class_groupMail.inc:312
+#: admin/groups/mail/class_groupMail.inc:325
+#: admin/groups/mail/class_groupMail.inc:331
+#: admin/groups/mail/class_groupMail.inc:360
+#: admin/groups/mail/class_groupMail.inc:366
+#: admin/groups/mail/class_groupMail.inc:375
 #: personal/mail/sieve/class_sieveManagement.inc:201
 #: personal/mail/sieve/class_sieveManagement.inc:206
 #: personal/mail/sieve/class_sieveManagement.inc:212
 #: personal/mail/sieve/class_sieveManagement.inc:218
 #: personal/mail/sieve/class_sieveManagement.inc:429
 #: personal/mail/sieve/class_My_Tree.inc:660
-#: personal/mail/class_mailAccount.inc:347
-#: personal/mail/class_mailAccount.inc:363
-#: personal/mail/class_mailAccount.inc:370
-#: personal/mail/class_mailAccount.inc:399
-#: personal/mail/class_mailAccount.inc:407
-#: personal/mail/class_mailAccount.inc:419
+#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:306
+#: personal/mail/class_mailAccount.inc:312
+#: personal/mail/class_mailAccount.inc:341
+#: personal/mail/class_mailAccount.inc:346
+#: personal/mail/class_mailAccount.inc:354
 #: addons/mailqueue/class_mailqueue.inc:110
 #: addons/mailqueue/class_mailqueue.inc:144
 #: addons/mailqueue/class_mailqueue.inc:150
@@ -367,7 +374,6 @@ msgstr ""
 #: admin/systems/services/spam/goSpamServer.tpl:48
 #: admin/systems/services/mail/goMailServer.tpl:73
 #: admin/systems/services/mail/goMailServer.tpl:104
-#: admin/groups/mail/class_groupMail.inc:654
 msgid "Remove"
 msgstr "Verwijderen"
 
@@ -631,118 +637,102 @@ msgstr "Secties"
 msgid "Restriction filter"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:14 personal/mail/generic.tpl:11
-msgid "Multiple edit"
-msgstr ""
-
-#: admin/groups/mail/mail.tpl:17 admin/groups/mail/paste_mail.tpl:12
-msgid "Primary mail address for this shared folder"
-msgstr "Primair E-mail adres voor deze gedeelde map"
-
-#: admin/groups/mail/mail.tpl:23 personal/mail/generic.tpl:20
+#: admin/groups/mail/mail.tpl:35 personal/mail/generic.tpl:30
 #: addons/mailqueue/contents.tpl:73
 msgid "Server"
 msgstr "Server"
 
-#: admin/groups/mail/mail.tpl:26
-msgid "Select mail server to place user on"
-msgstr "Selecteer de mail server waarop de gebruiker ondergebracht wordt"
+#: admin/groups/mail/mail.tpl:39 personal/mail/generic.tpl:37
+msgid "Specify the mail server where the user will be hosted on"
+msgstr "Specificeer de mailserver waarop het account opgeslagen wordt"
 
-#: admin/groups/mail/mail.tpl:36 personal/mail/generic.tpl:34
+#: admin/groups/mail/mail.tpl:52 personal/mail/generic.tpl:53
 msgid "Quota usage"
 msgstr "Quota gebruik"
 
-#: admin/groups/mail/mail.tpl:43 personal/mail/generic.tpl:41
-msgid "not defined"
-msgstr "niet gedefiniëerd"
-
-#: admin/groups/mail/mail.tpl:48 admin/groups/mail/class_groupMail.inc:1099
-#: admin/groups/mail/class_groupMail.inc:1296 personal/mail/generic.tpl:47
-#: personal/mail/class_mailAccount.inc:957
-#: personal/mail/class_mailAccount.inc:1182
-#: personal/mail/class_mailAccount.inc:1352
+#: admin/groups/mail/mail.tpl:56 admin/groups/mail/class_groupMail.inc:793
+#: admin/groups/mail/class_groupMail.inc:918 personal/mail/generic.tpl:57
+#: personal/mail/class_mailAccount.inc:1087
+#: personal/mail/class_mailAccount.inc:1246
+#: personal/mail/class_mailAccount.inc:1398
 msgid "Quota size"
 msgstr "Quota grootte"
 
-#: admin/groups/mail/mail.tpl:53 personal/mail/generic.tpl:234
-msgid "MB"
-msgstr "MB"
-
-#: admin/groups/mail/mail.tpl:59 admin/groups/mail/class_groupMail.inc:1298
+#: admin/groups/mail/mail.tpl:69 admin/groups/mail/class_groupMail.inc:920
 #, fuzzy
 msgid "Folder type"
 msgstr "Filter"
 
-#: admin/groups/mail/mail.tpl:85
+#: admin/groups/mail/mail.tpl:87
 #, fuzzy
 msgid "Reload"
 msgstr "Lezen"
 
-#: admin/groups/mail/mail.tpl:102 admin/groups/mail/paste_mail.tpl:23
-#: personal/mail/copypaste.tpl:25 personal/mail/generic.tpl:64
+#: admin/groups/mail/mail.tpl:98 admin/groups/mail/paste_mail.tpl:23
+#: personal/mail/copypaste.tpl:25 personal/mail/generic.tpl:73
 msgid "Alternative addresses"
 msgstr "Alternatieve adressen"
 
-#: admin/groups/mail/mail.tpl:105 admin/groups/mail/paste_mail.tpl:24
-#: personal/mail/copypaste.tpl:55 personal/mail/generic.tpl:67
+#: admin/groups/mail/mail.tpl:103 admin/groups/mail/paste_mail.tpl:24
+#: personal/mail/copypaste.tpl:55 personal/mail/generic.tpl:76
 msgid "List of alternative mail addresses"
 msgstr "Lijst met alternatieve E-mail adressen"
 
-#: admin/groups/mail/mail.tpl:135
+#: admin/groups/mail/mail.tpl:132
 msgid "IMAP shared folders"
 msgstr "IMAP gedeelde mappen"
 
 #: admin/groups/mail/mail.tpl:139
-#, fuzzy
-msgid "Set shared folder permissions"
-msgstr "IMAP gedeelde mappen"
-
-#: admin/groups/mail/mail.tpl:148
 msgid "Default permission"
 msgstr "Algemene rechten"
 
-#: admin/groups/mail/mail.tpl:159
+#: admin/groups/mail/mail.tpl:141
 msgid "Member permission"
 msgstr "Groepslid rechten"
 
-#: admin/groups/mail/mail.tpl:176 personal/mail/generic.tpl:295
+#: admin/groups/mail/mail.tpl:169 personal/mail/generic.tpl:303
 msgid "Advanced mail options"
 msgstr "Geavanceerde E-mail opties"
 
-#: admin/groups/mail/mail.tpl:182 personal/mail/generic.tpl:301
+#: admin/groups/mail/mail.tpl:175 personal/mail/generic.tpl:309
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 "Selecteer om alleen binnen het eigen domein E-mail te laten ontvangen en "
 "versturen"
 
-#: admin/groups/mail/mail.tpl:184 personal/mail/generic.tpl:303
+#: admin/groups/mail/mail.tpl:177 personal/mail/generic.tpl:311
 msgid "User is only allowed to send and receive local mails"
 msgstr "De gebruiker mag alleen lokale E-mails versturen en ontvangen"
 
-#: admin/groups/mail/mail.tpl:193 admin/groups/mail/paste_mail.tpl:34
+#: admin/groups/mail/mail.tpl:186 admin/groups/mail/paste_mail.tpl:34
 msgid "Forward messages to non group members"
 msgstr "Stuur berichten door naar niet groepsleden"
 
-#: admin/groups/mail/mail.tpl:202
+#: admin/groups/mail/mail.tpl:195
 #, fuzzy
 msgid "Used in all groups"
 msgstr "Geef a.u.b. een groep op."
 
-#: admin/groups/mail/mail.tpl:205
+#: admin/groups/mail/mail.tpl:198
 #, fuzzy
 msgid "Not used in all groups"
 msgstr "Toon functionele groepen"
 
-#: admin/groups/mail/mail.tpl:223 admin/groups/mail/paste_mail.tpl:42
-#: personal/mail/copypaste.tpl:44 personal/mail/generic.tpl:285
+#: admin/groups/mail/mail.tpl:216 admin/groups/mail/paste_mail.tpl:42
+#: personal/mail/copypaste.tpl:44 personal/mail/generic.tpl:290
+#: personal/mail/generic.tpl:293
 msgid "Add local"
 msgstr "Lokaal toevoegen"
 
 #: admin/groups/mail/paste_mail.tpl:1 personal/mail/copypaste.tpl:1
-#: personal/mail/class_mailAccount.inc:1171
+#: personal/mail/class_mailAccount.inc:1387
 msgid "Mail settings"
 msgstr "E-mail instellingen"
 
+#: admin/groups/mail/paste_mail.tpl:12
+msgid "Primary mail address for this shared folder"
+msgstr "Primair E-mail adres voor deze gedeelde map"
+
 #: admin/groups/mail/mail_locals.tpl:6 personal/mail/mail_locals.tpl:7
 msgid "Select addresses to add"
 msgstr "Selecteer de toe te voegen adressen"
@@ -788,218 +778,194 @@ msgid "Choose"
 msgstr "Kies"
 
 #: admin/groups/mail/class_groupMail.inc:92
-#: personal/mail/class_mailAccount.inc:94
-#: personal/mail/class_mailAccount.inc:208
+#: admin/groups/mail/class_groupMail.inc:99
+#: admin/groups/mail/class_groupMail.inc:106
+#: admin/groups/mail/class_groupMail.inc:113
+#: admin/groups/mail/class_groupMail.inc:118
+#: admin/groups/mail/class_groupMail.inc:121
+#: admin/groups/mail/class_groupMail.inc:513
+#: admin/groups/mail/class_groupMail.inc:517
+#: admin/groups/mail/class_groupMail.inc:521
+#: admin/groups/mail/class_groupMail.inc:729
+#: admin/groups/mail/class_groupMail.inc:733
+#: admin/groups/mail/class_groupMail.inc:737
+#: admin/groups/mail/class_groupMail.inc:746
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:145
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:902
+#: personal/mail/class_mailAccount.inc:970
+#: personal/mail/class_mailAccount.inc:974
+#: personal/mail/class_mailAccount.inc:978
+#: personal/mail/class_mailAccount.inc:992
 #, fuzzy
-msgid "Configuration error"
-msgstr "Configuratie bestand"
+msgid "Mail error"
+msgstr "Mail server"
 
 #: admin/groups/mail/class_groupMail.inc:92
+#: personal/mail/class_mailAccount.inc:130
 #, fuzzy, php-format
-msgid "Cannot locate mail method '%s'!"
-msgstr "Kan bestand '%s' niet openen."
-
-#: admin/groups/mail/class_groupMail.inc:325
-msgid "read"
-msgstr "alleen lezen"
-
-#: admin/groups/mail/class_groupMail.inc:326
-msgid "post"
-msgstr "afleveren & lezen"
-
-#: admin/groups/mail/class_groupMail.inc:327
-msgid "external post"
-msgstr "alleen afleveren"
+msgid "Cannot read quota settings: %s"
+msgstr "Kan bestand '%s' niet aanmaken."
 
-#: admin/groups/mail/class_groupMail.inc:328
-msgid "append"
-msgstr "afleveren, lezen & kopieren"
+#: admin/groups/mail/class_groupMail.inc:99
+#: personal/mail/class_mailAccount.inc:137
+#, fuzzy, php-format
+msgid "Cannot get list of mailboxes: %s"
+msgstr "Kan de IMAP mailbox niet verwijderen. De server meldt: '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:329
-msgid "write"
-msgstr "afleveren, lezen & schrijven"
+#: admin/groups/mail/class_groupMail.inc:106
+#, fuzzy, php-format
+msgid "Cannot receive folder types: %s"
+msgstr "IMAP gedeelde mappen"
 
-#: admin/groups/mail/class_groupMail.inc:330
-#, fuzzy
-msgid "admin"
-msgstr "Beheerders"
+#: admin/groups/mail/class_groupMail.inc:113
+#, fuzzy, php-format
+msgid "Cannot receive folder permissions: %s"
+msgstr "IMAP gedeelde mappen"
 
-#: admin/groups/mail/class_groupMail.inc:331
-msgid "none"
-msgstr "geen"
+#: admin/groups/mail/class_groupMail.inc:118
+#: admin/groups/mail/class_groupMail.inc:513
+#: admin/groups/mail/class_groupMail.inc:729
+#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:970
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:382
-#: admin/groups/mail/class_groupMail.inc:391
-#: admin/groups/mail/class_groupMail.inc:394
-#, fuzzy
-msgid "mail"
-msgstr "E-mail"
+#: admin/groups/mail/class_groupMail.inc:121
+#: personal/mail/class_mailAccount.inc:145
+#, php-format
+msgid "Mailbox '%s' doesn't exists on mail server: %s"
+msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:404
+#: admin/groups/mail/class_groupMail.inc:278
 #, fuzzy
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
 msgstr "Kan de gebruiker niet verwijderen uit de kerberos database."
 
-#: admin/groups/mail/class_groupMail.inc:405
+#: admin/groups/mail/class_groupMail.inc:279
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:464
-#, fuzzy
-msgid "forward address"
-msgstr "Primair adres"
-
-#: admin/groups/mail/class_groupMail.inc:468
-#, fuzzy
-msgid "Cannot forward to users own mail address!"
-msgstr "U probeert een ongeldig E-mail adres toe te voegen"
-
-#: admin/groups/mail/class_groupMail.inc:494
-#, fuzzy
-msgid "Alternate address"
-msgstr "Alternatieve adressen"
-
-#: admin/groups/mail/class_groupMail.inc:648
-msgid "Add"
-msgstr "Toevoegen"
-
-#: admin/groups/mail/class_groupMail.inc:700
-#: admin/groups/mail/class_groupMail.inc:706
-#, fuzzy
-msgid "Unspecified"
-msgstr "niet gedefiniëerd"
-
-#: admin/groups/mail/class_groupMail.inc:700
-#, fuzzy
-msgid "Mails"
-msgstr "E-mail"
-
-#: admin/groups/mail/class_groupMail.inc:701
+#: admin/groups/mail/class_groupMail.inc:312
+#: personal/mail/class_mailAccount.inc:294
 #, fuzzy
-msgid "Tasks"
-msgstr "Taak"
+msgid "Please select an entry!"
+msgstr "Selecteer a.u.b. een geldig mailserver"
 
-#: admin/groups/mail/class_groupMail.inc:701
+#: admin/groups/mail/class_groupMail.inc:331
+#: personal/mail/class_mailAccount.inc:312
 #, fuzzy
-msgid "Journals"
-msgstr "uren"
-
-#: admin/groups/mail/class_groupMail.inc:702
-msgid "Calendar"
+msgid "Cannot add primary address to the list of forwarders!"
 msgstr ""
+"U probeert een ongeldig email adres toe te voegen aan de doorstuurlijst."
 
-#: admin/groups/mail/class_groupMail.inc:702
-msgid "Contacts"
-msgstr "Contacten"
+#: admin/groups/mail/class_groupMail.inc:376
+#: personal/mail/class_mailAccount.inc:355
+#, fuzzy, php-format
+msgid "Address is already in use by user '%s'."
+msgstr ""
+"Het adres dat u probeert toe te voegen wordt al gebruikt door gebruiker"
 
-#: admin/groups/mail/class_groupMail.inc:703
-#, fuzzy
-msgid "Notes"
-msgstr "Nee"
+#: admin/groups/mail/class_groupMail.inc:402
+#: personal/mail/class_mailAccount.inc:384
+msgid "Unknown"
+msgstr "Onbekend"
 
-#: admin/groups/mail/class_groupMail.inc:706
-#, fuzzy
-msgid "Inbox"
-msgstr "Index"
+#: admin/groups/mail/class_groupMail.inc:517
+#: personal/mail/class_mailAccount.inc:902
+#, fuzzy, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr "Kan de IMAP mailbox niet verwijderen. De server meldt: '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:707
-#, fuzzy
-msgid "Drafts"
-msgstr "Datum"
+#: admin/groups/mail/class_groupMail.inc:521
+#: admin/groups/mail/class_groupMail.inc:746
+#, fuzzy, php-format
+msgid "Cannot update shared folder permissions: %s"
+msgstr "IMAP gedeelde mappen"
 
-#: admin/groups/mail/class_groupMail.inc:707
+#: admin/groups/mail/class_groupMail.inc:611
 #, fuzzy
-msgid "Sent items"
-msgstr "Systeem status"
+msgid "New"
+msgstr "Gebruiker toevoegen"
 
-#: admin/groups/mail/class_groupMail.inc:708
-#, fuzzy
-msgid "Junk mail"
-msgstr "Groepnaam"
+#: admin/groups/mail/class_groupMail.inc:733
+#: personal/mail/class_mailAccount.inc:974
+#, fuzzy, php-format
+msgid "Cannot update mailbox: %s"
+msgstr "Kan de IMAP mailbox niet aanmaken. De IMAP server meldt: '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:710
-#: personal/mail/sieve/class_sieveElement_If.inc:27
-#: personal/mail/sieve/class_sieveElement_If.inc:33
-#, fuzzy
-msgid "Default"
-msgstr "standaard"
+#: admin/groups/mail/class_groupMail.inc:737
+#: personal/mail/class_mailAccount.inc:978
+#, fuzzy, php-format
+msgid "Cannot write quota settings: %s"
+msgstr "Kan bestand '%s' niet aanmaken."
 
-#: admin/groups/mail/class_groupMail.inc:1108
-#: personal/mail/class_mailAccount.inc:1194
+#: admin/groups/mail/class_groupMail.inc:802
+#: personal/mail/class_mailAccount.inc:1410
 #, fuzzy
 msgid "Mail max size"
 msgstr "E-mail grootte"
 
-#: admin/groups/mail/class_groupMail.inc:1116
+#: admin/groups/mail/class_groupMail.inc:810
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 "U moet de maximale E-mail grootte instellen om uberhaupt iets af te kunnen "
 "afwijzen."
 
-#: admin/groups/mail/class_groupMail.inc:1120
-msgid ""
-"Please choose valid permission settings. Default permission can't be emtpy."
-msgstr ""
-"Kies a.u.b. geldige permissie instellingen. Standaard permissies kunnen niet "
-"leeg zijn."
-
-#: admin/groups/mail/class_groupMail.inc:1124
-#: admin/groups/mail/class_groupMail.inc:1297
-#: personal/mail/class_mailAccount.inc:1181
+#: admin/groups/mail/class_groupMail.inc:814
+#: admin/groups/mail/class_groupMail.inc:919
+#: personal/mail/class_mailAccount.inc:1397
 msgid "Mail server"
 msgstr "Mail server"
 
-#: admin/groups/mail/class_groupMail.inc:1288
+#: admin/groups/mail/class_groupMail.inc:910
 #, fuzzy
 msgid "Group mail"
 msgstr "Groepnaam"
 
-#: admin/groups/mail/class_groupMail.inc:1298
+#: admin/groups/mail/class_groupMail.inc:920
 msgid "Kolab"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1299
+#: admin/groups/mail/class_groupMail.inc:921
 #, fuzzy
 msgid "Alternate addresses"
 msgstr "Alternatieve adressen"
 
-#: admin/groups/mail/class_groupMail.inc:1300
+#: admin/groups/mail/class_groupMail.inc:922
 #, fuzzy
 msgid "Forwarding addresses"
 msgstr "Primair adres"
 
-#: admin/groups/mail/class_groupMail.inc:1301
+#: admin/groups/mail/class_groupMail.inc:923
 #, fuzzy
 msgid "Only local"
 msgstr "Lokaal toevoegen"
 
-#: admin/groups/mail/class_groupMail.inc:1302
+#: admin/groups/mail/class_groupMail.inc:924
 msgid "Permissions"
 msgstr "Rechten"
 
-#: personal/mail/copypaste.tpl:13 personal/mail/generic.tpl:262
+#: personal/mail/copypaste.tpl:13 personal/mail/generic.tpl:267
 msgid "Forward messages to"
 msgstr "Stuur berichten door naar"
 
-#: personal/mail/generic.tpl:23
-msgid "Specify the mail server where the user will be hosted on"
-msgstr "Specificeer de mailserver waarop het account opgeslagen wordt"
-
-#: personal/mail/generic.tpl:92
-msgid "Mail options"
-msgstr "E-mail opties"
-
-#: personal/mail/generic.tpl:124 personal/mail/class_mailAccount.inc:1202
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1418
 msgid "Use custom sieve script"
 msgstr "Gebruik een eigen sieve script"
 
-#: personal/mail/generic.tpl:124
+#: personal/mail/generic.tpl:115
 msgid "disables all Mail options!"
 msgstr "schakelt alle E-mail opties uit!"
 
-#: personal/mail/generic.tpl:131
+#: personal/mail/generic.tpl:123
 #, fuzzy
 msgid "Sieve Management"
 msgstr "Beheer"
@@ -1013,55 +979,60 @@ msgstr ""
 msgid "No delivery to own mailbox"
 msgstr "Geen aflevering in eigen mailbox"
 
-#: personal/mail/generic.tpl:150
+#: personal/mail/generic.tpl:151
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 "Selecteer om automatisch te reageren met het onderstaande afwezigheidsbericht"
 
-#: personal/mail/generic.tpl:152
+#: personal/mail/generic.tpl:153
 msgid "Activate vacation message"
 msgstr "Activeer afwezigheidsbericht"
 
-#: personal/mail/generic.tpl:160
+#: personal/mail/generic.tpl:161
 #, fuzzy
 msgid "from"
 msgstr "willekeurig"
 
-#: personal/mail/generic.tpl:183
+#: personal/mail/generic.tpl:185
 msgid "till"
 msgstr ""
 
-#: personal/mail/generic.tpl:212
+#: personal/mail/generic.tpl:214
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr "Selecteer indien u E-mail berichten wilt filteren m.b.v. spamassassin"
 
-#: personal/mail/generic.tpl:214
+#: personal/mail/generic.tpl:216
 msgid "Move mails tagged with spam level greater than"
 msgstr "Verplaats E-mails met spam nivo groter dan"
 
-#: personal/mail/generic.tpl:217
+#: personal/mail/generic.tpl:219
+#, fuzzy
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr "Selecteer een spam nivo - kleinere waardes zijn gevoeliger"
 
-#: personal/mail/generic.tpl:221
+#: personal/mail/generic.tpl:223
 msgid "to folder"
 msgstr "naar map"
 
-#: personal/mail/generic.tpl:232
+#: personal/mail/generic.tpl:235
 msgid "Reject mails bigger than"
 msgstr "Wijs E-mail af indien groter dan"
 
-#: personal/mail/generic.tpl:241
+#: personal/mail/generic.tpl:238
+msgid "MB"
+msgstr "MB"
+
+#: personal/mail/generic.tpl:245
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/templates/object_container.tpl:31
-#: personal/mail/class_mailAccount.inc:1185
+#: personal/mail/class_mailAccount.inc:1401
 msgid "Vacation message"
 msgstr "Afwezigheidsbericht"
 
-#: personal/mail/generic.tpl:256
+#: personal/mail/generic.tpl:261
 #: personal/mail/sieve/templates/import_script.tpl:12
 #: personal/mail/sieve/templates/edit_frame_base.tpl:7
 msgid "Import"
@@ -1125,10 +1096,6 @@ msgstr "De opgegeven naam wordt al gebruikt."
 #: personal/mail/sieve/class_sieveManagement.inc:770
 #: personal/mail/sieve/class_sieveManagement.inc:1030
 #: personal/mail/sieve/class_sieveManagement.inc:1043
-#: personal/mail/class_mail-methods-cyrus.inc:291
-#: personal/mail/class_mail-methods-cyrus.inc:303
-#: personal/mail/class_mail-methods-cyrus.inc:374
-#: personal/mail/class_mail-methods-cyrus.inc:378
 #, fuzzy
 msgid "SIEVE error"
 msgstr "Fout"
@@ -1136,13 +1103,12 @@ msgstr "Fout"
 #: personal/mail/sieve/class_sieveManagement.inc:302
 #: personal/mail/sieve/class_sieveManagement.inc:345
 #: personal/mail/sieve/class_sieveManagement.inc:1030
-#: personal/mail/class_mail-methods-cyrus.inc:291
 #, fuzzy, php-format
 msgid "Cannot log into SIEVE server: %s"
 msgstr "Kan niet op de SIEVE server inloggen. De server meldt: '%s'."
 
 #: personal/mail/sieve/class_sieveManagement.inc:309
-#: personal/mail/class_mail-methods-cyrus.inc:303
+#: personal/mail/class_mail-methods-cyrus.inc:443
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
@@ -1162,8 +1128,6 @@ msgid "Uploaded script is empty!"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:431
-#: personal/mail/class_mail-methods-cyrus.inc:223
-#: personal/mail/class_mail-methods-cyrus.inc:241
 #, fuzzy
 msgid "Internal error"
 msgstr "Terminal server"
@@ -1353,7 +1317,7 @@ msgid "Cannot insert element at the requested position!"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:1043
-#: personal/mail/class_mail-methods-cyrus.inc:374
+#: personal/mail/class_mail-methods-cyrus.inc:531
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
@@ -1677,7 +1641,6 @@ msgstr "Bijwerken"
 
 #: personal/mail/sieve/templates/remove_script.tpl:2
 #: personal/mail/sieve/class_My_Tree.inc:245
-#: personal/mail/class_mail-methods-cyrus.inc:62
 msgid "Warning"
 msgstr "Waarschuwing"
 
@@ -1851,6 +1814,12 @@ msgstr ""
 msgid "Complete address"
 msgstr "Subonderdelen negeren"
 
+#: personal/mail/sieve/class_sieveElement_If.inc:27
+#: personal/mail/sieve/class_sieveElement_If.inc:33
+#, fuzzy
+msgid "Default"
+msgstr "standaard"
+
 #: personal/mail/sieve/class_sieveElement_If.inc:28
 #, fuzzy
 msgid "Domain part"
@@ -2037,142 +2006,108 @@ msgstr "Record verwijderen"
 msgid "Require must be the first command in the script."
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:16
+#: personal/mail/class_mailAccount.inc:51
 #: addons/mailqueue/class_mailqueue.inc:7
 msgid "This does something"
 msgstr "Dit doet iets"
 
-#: personal/mail/class_mailAccount.inc:94
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
+#: personal/mail/class_mailAccount.inc:620
+#: personal/mail/class_mail-methods.inc:111
+#: personal/mail/class_mail-methods.inc:373
+#, fuzzy
+msgid "Configuration error"
+msgstr "Configuratie bestand"
 
-#: personal/mail/class_mailAccount.inc:208
+#: personal/mail/class_mailAccount.inc:620
 #, fuzzy, php-format
 msgid "No DESC tag in vacation template '%s'!"
 msgstr "Er is geen DESC variabele aanwezig in het afwezigheidsbestand:"
 
-#: personal/mail/class_mailAccount.inc:299
-msgid "Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:347
+#: personal/mail/class_mailAccount.inc:649
+#: personal/mail/class_mailAccount.inc:662
+#: personal/mail/class_mailAccount.inc:693
+#: personal/mail/class_mailAccount.inc:706
 #, fuzzy
-msgid "Please select an entry!"
-msgstr "Selecteer a.u.b. een geldig mailserver"
+msgid "Permission error"
+msgstr "Rechten"
 
-#: personal/mail/class_mailAccount.inc:370
+#: personal/mail/class_mailAccount.inc:649
+#: personal/mail/class_mailAccount.inc:662
+#: personal/mail/class_mailAccount.inc:693
+#: personal/mail/class_mailAccount.inc:706
 #, fuzzy
-msgid "Cannot add primary address to the list of forwarders!"
-msgstr ""
-"U probeert een ongeldig email adres toe te voegen aan de doorstuurlijst."
-
-#: personal/mail/class_mailAccount.inc:420
-#, fuzzy, php-format
-msgid "Address is already in use by user '%s'."
-msgstr ""
-"Het adres dat u probeert toe te voegen wordt al gebruikt door gebruiker"
+msgid "You have no permission to modify these addresses!"
+msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
 
-#: personal/mail/class_mailAccount.inc:966
-#: personal/mail/class_mailAccount.inc:974
-#: personal/mail/class_mailAccount.inc:1361
+#: personal/mail/class_mailAccount.inc:1096
+#: personal/mail/class_mailAccount.inc:1104
+#: personal/mail/class_mailAccount.inc:1255
 #, fuzzy
 msgid "Mail reject size"
 msgstr "E-mail grootte"
 
-#: personal/mail/class_mailAccount.inc:978
-#: personal/mail/class_mailAccount.inc:1368
+#: personal/mail/class_mailAccount.inc:1108
+#: personal/mail/class_mailAccount.inc:1262
 #, fuzzy
 msgid "Spam folder"
 msgstr "naar map"
 
-#: personal/mail/class_mailAccount.inc:982
-#: personal/mail/class_mailAccount.inc:1373
+#: personal/mail/class_mailAccount.inc:1114
+#: personal/mail/class_mailAccount.inc:1267
 #, fuzzy
 msgid "Vacation interval"
 msgstr "Afwezigheidsbericht"
 
-#: personal/mail/class_mailAccount.inc:1027
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1072
-#: personal/mail/class_mailAccount.inc:1083
-#, fuzzy
-msgid "Permission error"
-msgstr "Rechten"
-
-#: personal/mail/class_mailAccount.inc:1027
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1072
-#: personal/mail/class_mailAccount.inc:1083
-#, fuzzy
-msgid "You have no permission to modify these addresses!"
-msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
-
-#: personal/mail/class_mailAccount.inc:1148
-#, fuzzy
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-"Bezig met wachten op het verwijderen van alle mail eigenschappen door Kolab"
-
-#: personal/mail/class_mailAccount.inc:1150
-#, fuzzy
-msgid ""
-"Please remove the mail settings first to allow kolab to call its remove "
-"methods!"
-msgstr ""
-"Verwijder a.u.b. eerst het mail account, zodat kolab haar verwijder "
-"procedure kan starten."
-
-#: personal/mail/class_mailAccount.inc:1175
+#: personal/mail/class_mailAccount.inc:1391
 msgid "My account"
 msgstr "Mijn account"
 
-#: personal/mail/class_mailAccount.inc:1184
+#: personal/mail/class_mailAccount.inc:1400
 #, fuzzy
 msgid "Add vacation information"
 msgstr "Organisatie informatie"
 
-#: personal/mail/class_mailAccount.inc:1187
+#: personal/mail/class_mailAccount.inc:1403
 msgid "Use spam filter"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1188
+#: personal/mail/class_mailAccount.inc:1404
 #, fuzzy
 msgid "Spam level"
 msgstr "Log prioriteit"
 
-#: personal/mail/class_mailAccount.inc:1189
+#: personal/mail/class_mailAccount.inc:1405
 #, fuzzy
 msgid "Spam mail box"
 msgstr "E-mail grootte"
 
-#: personal/mail/class_mailAccount.inc:1191
+#: personal/mail/class_mailAccount.inc:1407
 #, fuzzy
 msgid "Sieve management"
 msgstr "Beheer"
 
-#: personal/mail/class_mailAccount.inc:1193
+#: personal/mail/class_mailAccount.inc:1409
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "Wijs E-mail af indien groter dan"
 
-#: personal/mail/class_mailAccount.inc:1196
-#: personal/mail/class_mailAccount.inc:1201
+#: personal/mail/class_mailAccount.inc:1412
+#: personal/mail/class_mailAccount.inc:1417
 #, fuzzy
 msgid "Forwarding address"
 msgstr "Primair adres"
 
-#: personal/mail/class_mailAccount.inc:1197
+#: personal/mail/class_mailAccount.inc:1413
 #, fuzzy
 msgid "Local delivery"
 msgstr "Laatste levering"
 
-#: personal/mail/class_mailAccount.inc:1198
+#: personal/mail/class_mailAccount.inc:1414
 #, fuzzy
 msgid "No delivery to own mailbox "
 msgstr "Geen aflevering in eigen mailbox"
 
-#: personal/mail/class_mailAccount.inc:1199
+#: personal/mail/class_mailAccount.inc:1415
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "Alternatieve adressen"
@@ -2181,47 +2116,43 @@ msgstr "Alternatieve adressen"
 msgid "User mail settings"
 msgstr "Gebruikers E-mail instellingen"
 
-#: personal/mail/class_mail-methods-cyrus.inc:62
+#: personal/mail/class_mail-methods.inc:112
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:374
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:600
+#: personal/mail/class_mail-methods.inc:601
+#, fuzzy
+msgid "None"
+msgstr "geen"
+
+#: personal/mail/class_mail-methods-cyrus.inc:37
 #, fuzzy
 msgid "Mail server for this account is invalid!"
 msgstr "Geen E-mail grootte restrictie voor dit account"
 
-#: personal/mail/class_mail-methods-cyrus.inc:80
-#: personal/mail/class_mail-methods-cyrus.inc:178
-#: personal/mail/class_mail-methods-cyrus.inc:197
-#: personal/mail/class_mail-methods-cyrus.inc:263
+#: personal/mail/class_mail-methods-cyrus.inc:199
 #, fuzzy
 msgid "IMAP error"
 msgstr "LDAP fout:"
 
-#: personal/mail/class_mail-methods-cyrus.inc:80
-msgid "Cannot store mail settings on IMAP server!"
-msgstr ""
-
-#: personal/mail/class_mail-methods-cyrus.inc:178
-#, fuzzy, php-format
-msgid "Cannot create IMAP mailbox: %s"
-msgstr "Kan de IMAP mailbox niet aanmaken. De IMAP server meldt: '%s'."
-
-#: personal/mail/class_mail-methods-cyrus.inc:197
+#: personal/mail/class_mail-methods-cyrus.inc:199
 #, fuzzy, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr "Kan de IMAP mailbox niet verwijderen. De server meldt: '%s'."
 
-#: personal/mail/class_mail-methods-cyrus.inc:223
-msgid "Cannot remove IMAP ACL: imap_getacl not implemented!"
-msgstr ""
-
-#: personal/mail/class_mail-methods-cyrus.inc:241
-msgid "Cannot retrieve IMAP ACL: imap_getacl not implemented!"
+#: personal/mail/class_mail-methods-cyrus.inc:328
+#: personal/mail/class_mail-methods-cyrus.inc:365
+msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:263
-#, fuzzy, php-format
-msgid "Cannot remove IMAP mailbox: %s"
-msgstr "Kan de IMAP mailbox niet verwijderen. De server meldt: '%s'."
-
-#: personal/mail/class_mail-methods-cyrus.inc:378
+#: personal/mail/class_mail-methods-cyrus.inc:538
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
@@ -2430,6 +2361,149 @@ msgstr "header"
 msgid "Display header of this message"
 msgstr "Toon de header van dit bericht"
 
+#, fuzzy
+#~ msgid "Cannot connect mail method: %s"
+#~ msgstr "Kan bestand '%s' niet openen."
+
+#, fuzzy
+#~ msgid "Cannot remove mailbox: %s."
+#~ msgstr "Kan de IMAP mailbox niet verwijderen. De server meldt: '%s'."
+
+#, fuzzy
+#~ msgid "Cannot update mailbox: %s."
+#~ msgstr "Kan de IMAP mailbox niet aanmaken. De IMAP server meldt: '%s'."
+
+#, fuzzy
+#~ msgid "Cannot write quota settings: %s."
+#~ msgstr "Kan bestand '%s' niet aanmaken."
+
+#, fuzzy
+#~ msgid "Cannot get list of mailboxes! Error was: %s."
+#~ msgstr "Kan de IMAP mailbox niet verwijderen. De server meldt: '%s'."
+
+#, fuzzy
+#~ msgid "Cannot connect mail method! Error was: %s."
+#~ msgstr "Kan bestand '%s' niet openen."
+
+#, fuzzy
+#~ msgid "Cannot remove mailbox! Error was: %s."
+#~ msgstr "Kan de IMAP mailbox niet verwijderen. De server meldt: '%s'."
+
+#, fuzzy
+#~ msgid "Cannot update mailbox! Error was: %s."
+#~ msgstr "Kan de IMAP mailbox niet aanmaken. De IMAP server meldt: '%s'."
+
+#, fuzzy
+#~ msgid "Specify the mail server where the user will  be hosted on"
+#~ msgstr "Specificeer de mailserver waarop het account opgeslagen wordt"
+
+#~ msgid "Select mail server to place user on"
+#~ msgstr "Selecteer de mail server waarop de gebruiker ondergebracht wordt"
+
+#~ msgid "not defined"
+#~ msgstr "niet gedefiniëerd"
+
+#~ msgid "read"
+#~ msgstr "alleen lezen"
+
+#~ msgid "post"
+#~ msgstr "afleveren & lezen"
+
+#~ msgid "external post"
+#~ msgstr "alleen afleveren"
+
+#~ msgid "append"
+#~ msgstr "afleveren, lezen & kopieren"
+
+#~ msgid "write"
+#~ msgstr "afleveren, lezen & schrijven"
+
+#, fuzzy
+#~ msgid "admin"
+#~ msgstr "Beheerders"
+
+#, fuzzy
+#~ msgid "mail"
+#~ msgstr "E-mail"
+
+#, fuzzy
+#~ msgid "forward address"
+#~ msgstr "Primair adres"
+
+#, fuzzy
+#~ msgid "Cannot forward to users own mail address!"
+#~ msgstr "U probeert een ongeldig E-mail adres toe te voegen"
+
+#, fuzzy
+#~ msgid "Alternate address"
+#~ msgstr "Alternatieve adressen"
+
+#~ msgid "Add"
+#~ msgstr "Toevoegen"
+
+#, fuzzy
+#~ msgid "Unspecified"
+#~ msgstr "niet gedefiniëerd"
+
+#, fuzzy
+#~ msgid "Mails"
+#~ msgstr "E-mail"
+
+#, fuzzy
+#~ msgid "Tasks"
+#~ msgstr "Taak"
+
+#, fuzzy
+#~ msgid "Journals"
+#~ msgstr "uren"
+
+#~ msgid "Contacts"
+#~ msgstr "Contacten"
+
+#, fuzzy
+#~ msgid "Notes"
+#~ msgstr "Nee"
+
+#, fuzzy
+#~ msgid "Inbox"
+#~ msgstr "Index"
+
+#, fuzzy
+#~ msgid "Drafts"
+#~ msgstr "Datum"
+
+#, fuzzy
+#~ msgid "Sent items"
+#~ msgstr "Systeem status"
+
+#, fuzzy
+#~ msgid "Junk mail"
+#~ msgstr "Groepnaam"
+
+#~ msgid ""
+#~ "Please choose valid permission settings. Default permission can't be "
+#~ "emtpy."
+#~ msgstr ""
+#~ "Kies a.u.b. geldige permissie instellingen. Standaard permissies kunnen "
+#~ "niet leeg zijn."
+
+#~ msgid "Mail options"
+#~ msgstr "E-mail opties"
+
+#, fuzzy
+#~ msgid "Waiting for kolab to remove mail properties..."
+#~ msgstr ""
+#~ "Bezig met wachten op het verwijderen van alle mail eigenschappen door "
+#~ "Kolab"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please remove the mail settings first to allow kolab to call its remove "
+#~ "methods!"
+#~ msgstr ""
+#~ "Verwijder a.u.b. eerst het mail account, zodat kolab haar verwijder "
+#~ "procedure kan starten."
+
 #, fuzzy
 #~ msgid "You have no permission to submit a '%s' command!"
 #~ msgstr ""

diff --git a/gosa-plugins/mail/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/pl/LC_MESSAGES/messages.po
index b77d77923dbcd3e74381a11f94b1cdd34944766c..7bb7cd0ee8027336b9cb2e0deeb34d05e94d18d3 100644 (file)
--- a/gosa-plugins/mail/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/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: 2008-12-03 15:05+0100\n"
+"POT-Creation-Date: 2008-12-10 10:53+0100\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -18,9 +18,10 @@ msgstr ""
 msgid "Mail distribution list"
 msgstr "Pocztowa lista dystrybucyjna"
 
-#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/mail.tpl:10
-#: admin/groups/mail/paste_mail.tpl:8 personal/mail/copypaste.tpl:7
-#: personal/mail/generic.tpl:8 personal/mail/class_mailAccount.inc:931
+#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/mail.tpl:7
+#: admin/groups/mail/paste_mail.tpl:8
+#: admin/groups/mail/class_groupMail.inc:784 personal/mail/copypaste.tpl:7
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1060
 msgid "Primary address"
 msgstr "Adres podstawowy"
 
@@ -29,7 +30,6 @@ msgid "Primary mail address for this distribution list"
 msgstr "Adres podstawowy dla tej listy dystrybucyjnej"
 
 #: admin/ogroups/mail/class_mailogroup.inc:50
-#: admin/groups/mail/class_groupMail.inc:390
 msgid "Remove mail account"
 msgstr "Usuń konto pocztowe"
 
@@ -40,31 +40,30 @@ msgid "mail group"
 msgstr "Grupa pocztowa"
 
 #: admin/ogroups/mail/class_mailogroup.inc:53
-#: admin/groups/mail/class_groupMail.inc:393
 msgid "Create mail account"
 msgstr "Stwórz konto pocztowe"
 
 #: admin/ogroups/mail/class_mailogroup.inc:86
 #: admin/ogroups/mail/class_mailogroup.inc:93
 #: admin/ogroups/mail/class_mailogroup.inc:194
-#: admin/groups/mail/class_groupMail.inc:499
-#: admin/groups/mail/class_groupMail.inc:1084
-#: admin/groups/mail/class_groupMail.inc:1087
-#: admin/groups/mail/class_groupMail.inc:1093
-#: admin/groups/mail/class_groupMail.inc:1295
-#: personal/mail/class_mailAccount.inc:364
-#: personal/mail/class_mailAccount.inc:400
-#: personal/mail/class_mailAccount.inc:408
-#: personal/mail/class_mailAccount.inc:419
-#: personal/mail/class_mailAccount.inc:935
-#: personal/mail/class_mailAccount.inc:939
-#: personal/mail/class_mailAccount.inc:950
-#: personal/mail/class_mailAccount.inc:1180
+#: admin/groups/mail/class_groupMail.inc:325
+#: admin/groups/mail/class_groupMail.inc:360
+#: admin/groups/mail/class_groupMail.inc:366
+#: admin/groups/mail/class_groupMail.inc:375
+#: admin/groups/mail/class_groupMail.inc:786
+#: admin/groups/mail/class_groupMail.inc:917
+#: personal/mail/class_mailAccount.inc:306
+#: personal/mail/class_mailAccount.inc:341
+#: personal/mail/class_mailAccount.inc:346
+#: personal/mail/class_mailAccount.inc:354
+#: personal/mail/class_mailAccount.inc:1064
+#: personal/mail/class_mailAccount.inc:1068
+#: personal/mail/class_mailAccount.inc:1079
+#: personal/mail/class_mailAccount.inc:1396
 msgid "Mail address"
 msgstr "Adres email"
 
 #: admin/ogroups/mail/class_mailogroup.inc:86
-#: admin/groups/mail/class_groupMail.inc:1087
 msgid "your-name@your-domain.com"
 msgstr ""
 
@@ -74,27 +73,33 @@ msgstr ""
 #: admin/systems/services/spam/class_goSpamServer.inc:277
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/mail/class_goMailServer.inc:582
-#: admin/groups/mail/class_groupMail.inc:794
-#: admin/groups/mail/class_groupMail.inc:1048
-#: personal/mail/class_mailAccount.inc:694
-#: personal/mail/class_mailAccount.inc:862
+#: admin/groups/mail/class_groupMail.inc:501
+#: admin/groups/mail/class_groupMail.inc:716
+#: personal/mail/class_mailAccount.inc:889
+#: personal/mail/class_mailAccount.inc:956
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
 
 #: admin/ogroups/mail/class_mailogroup.inc:186
 #: admin/ogroups/mail/paste_mail.tpl:4
-#: admin/groups/mail/class_groupMail.inc:1287
-#: personal/mail/class_mailAccount.inc:15
-#: personal/mail/class_mailAccount.inc:288
-#: personal/mail/class_mailAccount.inc:298
-#: personal/mail/class_mailAccount.inc:301
-#: personal/mail/class_mailAccount.inc:302
-#: personal/mail/class_mailAccount.inc:305
-#: personal/mail/class_mailAccount.inc:306
-#: personal/mail/class_mailAccount.inc:926
-#: personal/mail/class_mailAccount.inc:1170
-#: personal/mail/class_mailAccount.inc:1346
+#: admin/groups/mail/class_groupMail.inc:257
+#: admin/groups/mail/class_groupMail.inc:259
+#: admin/groups/mail/class_groupMail.inc:260
+#: admin/groups/mail/class_groupMail.inc:265
+#: admin/groups/mail/class_groupMail.inc:267
+#: admin/groups/mail/class_groupMail.inc:268
+#: admin/groups/mail/class_groupMail.inc:774
+#: admin/groups/mail/class_groupMail.inc:909
+#: personal/mail/class_mailAccount.inc:50
+#: personal/mail/class_mailAccount.inc:222
+#: personal/mail/class_mailAccount.inc:230
+#: personal/mail/class_mailAccount.inc:232
+#: personal/mail/class_mailAccount.inc:237
+#: personal/mail/class_mailAccount.inc:239
+#: personal/mail/class_mailAccount.inc:1048
+#: personal/mail/class_mailAccount.inc:1240
+#: personal/mail/class_mailAccount.inc:1386
 msgid "Mail"
 msgstr "Poczta"
 
@@ -215,7 +220,7 @@ msgid "Start POP3 SSL service"
 msgstr "Uruchom usługę POP3 SSL"
 
 #: admin/systems/services/imap/goImapServer.tpl:1
-#: admin/systems/services/mail/goMailServer.tpl:1 admin/groups/mail/mail.tpl:7
+#: admin/systems/services/mail/goMailServer.tpl:1 admin/groups/mail/mail.tpl:4
 #: personal/mail/generic.tpl:5
 msgid "Generic"
 msgstr "Ogólne"
@@ -263,22 +268,24 @@ msgstr ""
 
 #: admin/systems/services/spam/class_goSpamServer.inc:143
 #: admin/systems/services/spam/class_goSpamServer.inc:216
-#: admin/groups/mail/class_groupMail.inc:464
-#: admin/groups/mail/class_groupMail.inc:468
-#: admin/groups/mail/class_groupMail.inc:494
-#: admin/groups/mail/class_groupMail.inc:499
+#: admin/groups/mail/class_groupMail.inc:312
+#: admin/groups/mail/class_groupMail.inc:325
+#: admin/groups/mail/class_groupMail.inc:331
+#: admin/groups/mail/class_groupMail.inc:360
+#: admin/groups/mail/class_groupMail.inc:366
+#: admin/groups/mail/class_groupMail.inc:375
 #: personal/mail/sieve/class_sieveManagement.inc:201
 #: personal/mail/sieve/class_sieveManagement.inc:206
 #: personal/mail/sieve/class_sieveManagement.inc:212
 #: personal/mail/sieve/class_sieveManagement.inc:218
 #: personal/mail/sieve/class_sieveManagement.inc:429
 #: personal/mail/sieve/class_My_Tree.inc:660
-#: personal/mail/class_mailAccount.inc:347
-#: personal/mail/class_mailAccount.inc:363
-#: personal/mail/class_mailAccount.inc:370
-#: personal/mail/class_mailAccount.inc:399
-#: personal/mail/class_mailAccount.inc:407
-#: personal/mail/class_mailAccount.inc:419
+#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:306
+#: personal/mail/class_mailAccount.inc:312
+#: personal/mail/class_mailAccount.inc:341
+#: personal/mail/class_mailAccount.inc:346
+#: personal/mail/class_mailAccount.inc:354
 #: addons/mailqueue/class_mailqueue.inc:110
 #: addons/mailqueue/class_mailqueue.inc:144
 #: addons/mailqueue/class_mailqueue.inc:150
@@ -353,7 +360,6 @@ msgstr ""
 #: admin/systems/services/spam/goSpamServer.tpl:48
 #: admin/systems/services/mail/goMailServer.tpl:73
 #: admin/systems/services/mail/goMailServer.tpl:104
-#: admin/groups/mail/class_groupMail.inc:654
 msgid "Remove"
 msgstr "Usuń"
 
@@ -606,117 +612,101 @@ msgstr "Ograniczenia"
 msgid "Restriction filter"
 msgstr "Filtr ograniczeń"
 
-#: admin/groups/mail/mail.tpl:14 personal/mail/generic.tpl:11
-msgid "Multiple edit"
-msgstr ""
-
-#: admin/groups/mail/mail.tpl:17 admin/groups/mail/paste_mail.tpl:12
-msgid "Primary mail address for this shared folder"
-msgstr "Adres podstawowy dla tego współdzielonego folderu"
-
-#: admin/groups/mail/mail.tpl:23 personal/mail/generic.tpl:20
+#: admin/groups/mail/mail.tpl:35 personal/mail/generic.tpl:30
 #: addons/mailqueue/contents.tpl:73
 msgid "Server"
 msgstr "Serwer"
 
-#: admin/groups/mail/mail.tpl:26
-msgid "Select mail server to place user on"
-msgstr "Wybierz serwer pocztowy dla użytkownika"
+#: admin/groups/mail/mail.tpl:39 personal/mail/generic.tpl:37
+msgid "Specify the mail server where the user will be hosted on"
+msgstr "Wybierz serwer poczty który będzie przechowywał skrzynkę użytkownika"
 
-#: admin/groups/mail/mail.tpl:36 personal/mail/generic.tpl:34
+#: admin/groups/mail/mail.tpl:52 personal/mail/generic.tpl:53
 msgid "Quota usage"
 msgstr "Użycie Quoty"
 
-#: admin/groups/mail/mail.tpl:43 personal/mail/generic.tpl:41
-msgid "not defined"
-msgstr "nie zdefiniowane"
-
-#: admin/groups/mail/mail.tpl:48 admin/groups/mail/class_groupMail.inc:1099
-#: admin/groups/mail/class_groupMail.inc:1296 personal/mail/generic.tpl:47
-#: personal/mail/class_mailAccount.inc:957
-#: personal/mail/class_mailAccount.inc:1182
-#: personal/mail/class_mailAccount.inc:1352
+#: admin/groups/mail/mail.tpl:56 admin/groups/mail/class_groupMail.inc:793
+#: admin/groups/mail/class_groupMail.inc:918 personal/mail/generic.tpl:57
+#: personal/mail/class_mailAccount.inc:1087
+#: personal/mail/class_mailAccount.inc:1246
+#: personal/mail/class_mailAccount.inc:1398
 msgid "Quota size"
 msgstr "Rozmiar Quoty"
 
-#: admin/groups/mail/mail.tpl:53 personal/mail/generic.tpl:234
-msgid "MB"
-msgstr "MB"
-
-#: admin/groups/mail/mail.tpl:59 admin/groups/mail/class_groupMail.inc:1298
+#: admin/groups/mail/mail.tpl:69 admin/groups/mail/class_groupMail.inc:920
 #, fuzzy
 msgid "Folder type"
 msgstr "Filtr"
 
-#: admin/groups/mail/mail.tpl:85
+#: admin/groups/mail/mail.tpl:87
 #, fuzzy
 msgid "Reload"
 msgstr "Odczyt"
 
-#: admin/groups/mail/mail.tpl:102 admin/groups/mail/paste_mail.tpl:23
-#: personal/mail/copypaste.tpl:25 personal/mail/generic.tpl:64
+#: admin/groups/mail/mail.tpl:98 admin/groups/mail/paste_mail.tpl:23
+#: personal/mail/copypaste.tpl:25 personal/mail/generic.tpl:73
 msgid "Alternative addresses"
 msgstr "Adresy alternatywne"
 
-#: admin/groups/mail/mail.tpl:105 admin/groups/mail/paste_mail.tpl:24
-#: personal/mail/copypaste.tpl:55 personal/mail/generic.tpl:67
+#: admin/groups/mail/mail.tpl:103 admin/groups/mail/paste_mail.tpl:24
+#: personal/mail/copypaste.tpl:55 personal/mail/generic.tpl:76
 msgid "List of alternative mail addresses"
 msgstr "Lista alternatywnych adresów pocztowych"
 
-#: admin/groups/mail/mail.tpl:135
+#: admin/groups/mail/mail.tpl:132
 msgid "IMAP shared folders"
 msgstr "Współdzielone foldery IMAP"
 
 #: admin/groups/mail/mail.tpl:139
-#, fuzzy
-msgid "Set shared folder permissions"
-msgstr "Współdzielone foldery IMAP"
-
-#: admin/groups/mail/mail.tpl:148
 msgid "Default permission"
 msgstr "Domyślne uprawnienia"
 
-#: admin/groups/mail/mail.tpl:159
+#: admin/groups/mail/mail.tpl:141
 msgid "Member permission"
 msgstr "Uprawnienia członków"
 
-#: admin/groups/mail/mail.tpl:176 personal/mail/generic.tpl:295
+#: admin/groups/mail/mail.tpl:169 personal/mail/generic.tpl:303
 msgid "Advanced mail options"
 msgstr "Zaawansowane opcje poczty"
 
-#: admin/groups/mail/mail.tpl:182 personal/mail/generic.tpl:301
+#: admin/groups/mail/mail.tpl:175 personal/mail/generic.tpl:309
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 "Wybierz jeśli użytkownik może odbierać i wysyłać w obrębie własnej domeny"
 
-#: admin/groups/mail/mail.tpl:184 personal/mail/generic.tpl:303
+#: admin/groups/mail/mail.tpl:177 personal/mail/generic.tpl:311
 msgid "User is only allowed to send and receive local mails"
 msgstr "Użytkownik może tylko wysyłać i odbierać lokalną pocztę"
 
-#: admin/groups/mail/mail.tpl:193 admin/groups/mail/paste_mail.tpl:34
+#: admin/groups/mail/mail.tpl:186 admin/groups/mail/paste_mail.tpl:34
 msgid "Forward messages to non group members"
 msgstr "Przekaż wiadomości do członków bez grupy"
 
-#: admin/groups/mail/mail.tpl:202
+#: admin/groups/mail/mail.tpl:195
 #, fuzzy
 msgid "Used in all groups"
 msgstr "Proszę podać grupę"
 
-#: admin/groups/mail/mail.tpl:205
+#: admin/groups/mail/mail.tpl:198
 #, fuzzy
 msgid "Not used in all groups"
 msgstr "Pokaż grupy funkcjonalne"
 
-#: admin/groups/mail/mail.tpl:223 admin/groups/mail/paste_mail.tpl:42
-#: personal/mail/copypaste.tpl:44 personal/mail/generic.tpl:285
+#: admin/groups/mail/mail.tpl:216 admin/groups/mail/paste_mail.tpl:42
+#: personal/mail/copypaste.tpl:44 personal/mail/generic.tpl:290
+#: personal/mail/generic.tpl:293
 msgid "Add local"
 msgstr "Dodaj lokalne"
 
 #: admin/groups/mail/paste_mail.tpl:1 personal/mail/copypaste.tpl:1
-#: personal/mail/class_mailAccount.inc:1171
+#: personal/mail/class_mailAccount.inc:1387
 msgid "Mail settings"
 msgstr "Ustawienia pocztowe"
 
+#: admin/groups/mail/paste_mail.tpl:12
+msgid "Primary mail address for this shared folder"
+msgstr "Adres podstawowy dla tego współdzielonego folderu"
+
 #: admin/groups/mail/mail_locals.tpl:6 personal/mail/mail_locals.tpl:7
 msgid "Select addresses to add"
 msgstr "Wybierz adresy do dodania"
@@ -762,211 +752,186 @@ msgid "Choose"
 msgstr "Wybierz"
 
 #: admin/groups/mail/class_groupMail.inc:92
-#: personal/mail/class_mailAccount.inc:94
-#: personal/mail/class_mailAccount.inc:208
+#: admin/groups/mail/class_groupMail.inc:99
+#: admin/groups/mail/class_groupMail.inc:106
+#: admin/groups/mail/class_groupMail.inc:113
+#: admin/groups/mail/class_groupMail.inc:118
+#: admin/groups/mail/class_groupMail.inc:121
+#: admin/groups/mail/class_groupMail.inc:513
+#: admin/groups/mail/class_groupMail.inc:517
+#: admin/groups/mail/class_groupMail.inc:521
+#: admin/groups/mail/class_groupMail.inc:729
+#: admin/groups/mail/class_groupMail.inc:733
+#: admin/groups/mail/class_groupMail.inc:737
+#: admin/groups/mail/class_groupMail.inc:746
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:145
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:902
+#: personal/mail/class_mailAccount.inc:970
+#: personal/mail/class_mailAccount.inc:974
+#: personal/mail/class_mailAccount.inc:978
+#: personal/mail/class_mailAccount.inc:992
 #, fuzzy
-msgid "Configuration error"
-msgstr "Plik konfiguracyjny"
+msgid "Mail error"
+msgstr "Serwer pocztowy"
 
 #: admin/groups/mail/class_groupMail.inc:92
+#: personal/mail/class_mailAccount.inc:130
 #, fuzzy, php-format
-msgid "Cannot locate mail method '%s'!"
-msgstr "Nie można otworzyć pliku '%s'."
-
-#: admin/groups/mail/class_groupMail.inc:325
-msgid "read"
-msgstr "czytanie"
-
-#: admin/groups/mail/class_groupMail.inc:326
-msgid "post"
-msgstr "wysyłanie"
-
-#: admin/groups/mail/class_groupMail.inc:327
-msgid "external post"
-msgstr "wysyłanie zewnętrzne"
+msgid "Cannot read quota settings: %s"
+msgstr "Nie można stworzyć pliku '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:328
-msgid "append"
-msgstr "dołączanie"
+#: admin/groups/mail/class_groupMail.inc:99
+#: personal/mail/class_mailAccount.inc:137
+#, fuzzy, php-format
+msgid "Cannot get list of mailboxes: %s"
+msgstr "Nie można usunąć konta IMAP. Odpowiedź serwera '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:329
-msgid "write"
-msgstr "zapisywanie"
+#: admin/groups/mail/class_groupMail.inc:106
+#, fuzzy, php-format
+msgid "Cannot receive folder types: %s"
+msgstr "Współdzielone foldery IMAP"
 
-#: admin/groups/mail/class_groupMail.inc:330
-#, fuzzy
-msgid "admin"
-msgstr "Admin"
+#: admin/groups/mail/class_groupMail.inc:113
+#, fuzzy, php-format
+msgid "Cannot receive folder permissions: %s"
+msgstr "Współdzielone foldery IMAP"
 
-#: admin/groups/mail/class_groupMail.inc:331
-msgid "none"
-msgstr "żaden"
+#: admin/groups/mail/class_groupMail.inc:118
+#: admin/groups/mail/class_groupMail.inc:513
+#: admin/groups/mail/class_groupMail.inc:729
+#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:970
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:382
-#: admin/groups/mail/class_groupMail.inc:391
-#: admin/groups/mail/class_groupMail.inc:394
-#, fuzzy
-msgid "mail"
-msgstr "Poczta"
+#: admin/groups/mail/class_groupMail.inc:121
+#: personal/mail/class_mailAccount.inc:145
+#, php-format
+msgid "Mailbox '%s' doesn't exists on mail server: %s"
+msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:404
+#: admin/groups/mail/class_groupMail.inc:278
 #, fuzzy
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
 msgstr "Nie można usunąć użytkownika z bazy Kerberos."
 
-#: admin/groups/mail/class_groupMail.inc:405
+#: admin/groups/mail/class_groupMail.inc:279
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:464
-#, fuzzy
-msgid "forward address"
-msgstr "Adresy przekazywane"
-
-#: admin/groups/mail/class_groupMail.inc:468
-#, fuzzy
-msgid "Cannot forward to users own mail address!"
-msgstr "Próbujesz dodać nieprawidłowy adres email"
-
-#: admin/groups/mail/class_groupMail.inc:494
-#, fuzzy
-msgid "Alternate address"
-msgstr "Adresy alternatywne"
-
-#: admin/groups/mail/class_groupMail.inc:648
-msgid "Add"
-msgstr "Dodaj"
-
-#: admin/groups/mail/class_groupMail.inc:700
-#: admin/groups/mail/class_groupMail.inc:706
-#, fuzzy
-msgid "Unspecified"
-msgstr "niezdefiniowany"
-
-#: admin/groups/mail/class_groupMail.inc:700
+#: admin/groups/mail/class_groupMail.inc:312
+#: personal/mail/class_mailAccount.inc:294
 #, fuzzy
-msgid "Mails"
-msgstr "Poczta"
-
-#: admin/groups/mail/class_groupMail.inc:701
-#, fuzzy
-msgid "Tasks"
-msgstr "Zadanie"
+msgid "Please select an entry!"
+msgstr "Proszę wybrać prawidłowy serwer pocztowy."
 
-#: admin/groups/mail/class_groupMail.inc:701
+#: admin/groups/mail/class_groupMail.inc:331
+#: personal/mail/class_mailAccount.inc:312
 #, fuzzy
-msgid "Journals"
-msgstr "godzin"
-
-#: admin/groups/mail/class_groupMail.inc:702
-msgid "Calendar"
-msgstr ""
+msgid "Cannot add primary address to the list of forwarders!"
+msgstr "Próbujesz dodać błędny adres email do listy przekazywanych."
 
-#: admin/groups/mail/class_groupMail.inc:702
-msgid "Contacts"
-msgstr "Kontakty"
+#: admin/groups/mail/class_groupMail.inc:376
+#: personal/mail/class_mailAccount.inc:355
+#, fuzzy, php-format
+msgid "Address is already in use by user '%s'."
+msgstr "Adres który próbujesz dodać jest już używany"
 
-#: admin/groups/mail/class_groupMail.inc:703
-#, fuzzy
-msgid "Notes"
-msgstr "Nie"
+#: admin/groups/mail/class_groupMail.inc:402
+#: personal/mail/class_mailAccount.inc:384
+msgid "Unknown"
+msgstr "Nieznane"
 
-#: admin/groups/mail/class_groupMail.inc:706
-#, fuzzy
-msgid "Inbox"
-msgstr "Indeks"
+#: admin/groups/mail/class_groupMail.inc:517
+#: personal/mail/class_mailAccount.inc:902
+#, fuzzy, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr "Nie można usunąć konta IMAP. Odpowiedź serwera '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:707
-#, fuzzy
-msgid "Drafts"
-msgstr "Data"
+#: admin/groups/mail/class_groupMail.inc:521
+#: admin/groups/mail/class_groupMail.inc:746
+#, fuzzy, php-format
+msgid "Cannot update shared folder permissions: %s"
+msgstr "Współdzielone foldery IMAP"
 
-#: admin/groups/mail/class_groupMail.inc:707
+#: admin/groups/mail/class_groupMail.inc:611
 #, fuzzy
-msgid "Sent items"
-msgstr "Ustaw status"
+msgid "New"
+msgstr "Dodaj użytkownika"
 
-#: admin/groups/mail/class_groupMail.inc:708
-#, fuzzy
-msgid "Junk mail"
-msgstr "Grupa poczta"
+#: admin/groups/mail/class_groupMail.inc:733
+#: personal/mail/class_mailAccount.inc:974
+#, fuzzy, php-format
+msgid "Cannot update mailbox: %s"
+msgstr "Nie można utworzyć konta IMAP. Odpowiedź serwera '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:710
-#: personal/mail/sieve/class_sieveElement_If.inc:27
-#: personal/mail/sieve/class_sieveElement_If.inc:33
-#, fuzzy
-msgid "Default"
-msgstr "domyślny"
+#: admin/groups/mail/class_groupMail.inc:737
+#: personal/mail/class_mailAccount.inc:978
+#, fuzzy, php-format
+msgid "Cannot write quota settings: %s"
+msgstr "Nie można stworzyć pliku '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:1108
-#: personal/mail/class_mailAccount.inc:1194
+#: admin/groups/mail/class_groupMail.inc:802
+#: personal/mail/class_mailAccount.inc:1410
 msgid "Mail max size"
 msgstr "Max rozmiar poczty"
 
-#: admin/groups/mail/class_groupMail.inc:1116
+#: admin/groups/mail/class_groupMail.inc:810
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "Należy ustawić maksymalny rozmiar poczty aby odrzucać cokolwiek."
 
-#: admin/groups/mail/class_groupMail.inc:1120
-msgid ""
-"Please choose valid permission settings. Default permission can't be emtpy."
-msgstr ""
-"Proszę wybrać prawidłowe ustawienia. Domyślne ustawienia nie mogą być puste."
-
-#: admin/groups/mail/class_groupMail.inc:1124
-#: admin/groups/mail/class_groupMail.inc:1297
-#: personal/mail/class_mailAccount.inc:1181
+#: admin/groups/mail/class_groupMail.inc:814
+#: admin/groups/mail/class_groupMail.inc:919
+#: personal/mail/class_mailAccount.inc:1397
 msgid "Mail server"
 msgstr "Serwer pocztowy"
 
-#: admin/groups/mail/class_groupMail.inc:1288
+#: admin/groups/mail/class_groupMail.inc:910
 msgid "Group mail"
 msgstr "Grupa poczta"
 
-#: admin/groups/mail/class_groupMail.inc:1298
+#: admin/groups/mail/class_groupMail.inc:920
 msgid "Kolab"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1299
+#: admin/groups/mail/class_groupMail.inc:921
 msgid "Alternate addresses"
 msgstr "Adresy alternatywne"
 
-#: admin/groups/mail/class_groupMail.inc:1300
+#: admin/groups/mail/class_groupMail.inc:922
 msgid "Forwarding addresses"
 msgstr "Adresy przekazywane"
 
-#: admin/groups/mail/class_groupMail.inc:1301
+#: admin/groups/mail/class_groupMail.inc:923
 #, fuzzy
 msgid "Only local"
 msgstr "Dodaj lokalne"
 
-#: admin/groups/mail/class_groupMail.inc:1302
+#: admin/groups/mail/class_groupMail.inc:924
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: personal/mail/copypaste.tpl:13 personal/mail/generic.tpl:262
+#: personal/mail/copypaste.tpl:13 personal/mail/generic.tpl:267
 msgid "Forward messages to"
 msgstr "Przekaż wiadomości do"
 
-#: personal/mail/generic.tpl:23
-msgid "Specify the mail server where the user will be hosted on"
-msgstr "Wybierz serwer poczty który będzie przechowywał skrzynkę użytkownika"
-
-#: personal/mail/generic.tpl:92
-msgid "Mail options"
-msgstr "Opcje poczty"
-
-#: personal/mail/generic.tpl:124 personal/mail/class_mailAccount.inc:1202
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1418
 msgid "Use custom sieve script"
 msgstr "Użyj własnego skryptu SIEVE"
 
-#: personal/mail/generic.tpl:124
+#: personal/mail/generic.tpl:115
 msgid "disables all Mail options!"
 msgstr "Wyłącza wszystkie opcje poczty!"
 
-#: personal/mail/generic.tpl:131
+#: personal/mail/generic.tpl:123
 #, fuzzy
 msgid "Sieve Management"
 msgstr "Zarządzanie"
@@ -979,54 +944,59 @@ msgstr "Zaznacz jeśli chcesz przekazywać pocztę bez zachowania kopii"
 msgid "No delivery to own mailbox"
 msgstr "Nie dostarczaj do własnej skrzynki"
 
-#: personal/mail/generic.tpl:150
+#: personal/mail/generic.tpl:151
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr "Zaznacz aby automatycznie wysyłać autoodpowiedź zdefiniowaną poniżej"
 
-#: personal/mail/generic.tpl:152
+#: personal/mail/generic.tpl:153
 msgid "Activate vacation message"
 msgstr "Włącz autoresponder"
 
-#: personal/mail/generic.tpl:160
+#: personal/mail/generic.tpl:161
 #, fuzzy
 msgid "from"
 msgstr "losowy"
 
-#: personal/mail/generic.tpl:183
+#: personal/mail/generic.tpl:185
 msgid "till"
 msgstr ""
 
-#: personal/mail/generic.tpl:212
+#: personal/mail/generic.tpl:214
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr "Zaznacz jeśli chcesz filtrować wiadomości przez spamassasin"
 
-#: personal/mail/generic.tpl:214
+#: personal/mail/generic.tpl:216
 msgid "Move mails tagged with spam level greater than"
 msgstr "Przenieś pocztę oznakowaną poziomem spamu większym niż"
 
-#: personal/mail/generic.tpl:217
+#: personal/mail/generic.tpl:219
+#, fuzzy
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr "Wybierz poziom spamu - mniejsze wartości są bardziej czułe"
 
-#: personal/mail/generic.tpl:221
+#: personal/mail/generic.tpl:223
 msgid "to folder"
 msgstr "do folferu"
 
-#: personal/mail/generic.tpl:232
+#: personal/mail/generic.tpl:235
 msgid "Reject mails bigger than"
 msgstr "Odrzuć pocztę większą niż"
 
-#: personal/mail/generic.tpl:241
+#: personal/mail/generic.tpl:238
+msgid "MB"
+msgstr "MB"
+
+#: personal/mail/generic.tpl:245
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/templates/object_container.tpl:31
-#: personal/mail/class_mailAccount.inc:1185
+#: personal/mail/class_mailAccount.inc:1401
 msgid "Vacation message"
 msgstr "Treść autorespondera"
 
-#: personal/mail/generic.tpl:256
+#: personal/mail/generic.tpl:261
 #: personal/mail/sieve/templates/import_script.tpl:12
 #: personal/mail/sieve/templates/edit_frame_base.tpl:7
 msgid "Import"
@@ -1090,10 +1060,6 @@ msgstr "Ta nazwa jest już w użyciu."
 #: personal/mail/sieve/class_sieveManagement.inc:770
 #: personal/mail/sieve/class_sieveManagement.inc:1030
 #: personal/mail/sieve/class_sieveManagement.inc:1043
-#: personal/mail/class_mail-methods-cyrus.inc:291
-#: personal/mail/class_mail-methods-cyrus.inc:303
-#: personal/mail/class_mail-methods-cyrus.inc:374
-#: personal/mail/class_mail-methods-cyrus.inc:378
 #, fuzzy
 msgid "SIEVE error"
 msgstr "Błąd"
@@ -1101,13 +1067,12 @@ msgstr "Błąd"
 #: personal/mail/sieve/class_sieveManagement.inc:302
 #: personal/mail/sieve/class_sieveManagement.inc:345
 #: personal/mail/sieve/class_sieveManagement.inc:1030
-#: personal/mail/class_mail-methods-cyrus.inc:291
 #, fuzzy, php-format
 msgid "Cannot log into SIEVE server: %s"
 msgstr "Nie można zalogować się do serwera SIEVE. Odpowiedź serwera '%s'."
 
 #: personal/mail/sieve/class_sieveManagement.inc:309
-#: personal/mail/class_mail-methods-cyrus.inc:303
+#: personal/mail/class_mail-methods-cyrus.inc:443
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
@@ -1127,8 +1092,6 @@ msgid "Uploaded script is empty!"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:431
-#: personal/mail/class_mail-methods-cyrus.inc:223
-#: personal/mail/class_mail-methods-cyrus.inc:241
 #, fuzzy
 msgid "Internal error"
 msgstr "Terminal Server"
@@ -1318,7 +1281,7 @@ msgid "Cannot insert element at the requested position!"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:1043
-#: personal/mail/class_mail-methods-cyrus.inc:374
+#: personal/mail/class_mail-methods-cyrus.inc:531
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
@@ -1643,7 +1606,6 @@ msgstr "Aktualizuj"
 
 #: personal/mail/sieve/templates/remove_script.tpl:2
 #: personal/mail/sieve/class_My_Tree.inc:245
-#: personal/mail/class_mail-methods-cyrus.inc:62
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
@@ -1815,6 +1777,12 @@ msgstr ""
 msgid "Complete address"
 msgstr "Pełne poddrzewo"
 
+#: personal/mail/sieve/class_sieveElement_If.inc:27
+#: personal/mail/sieve/class_sieveElement_If.inc:33
+#, fuzzy
+msgid "Default"
+msgstr "domyślny"
+
 #: personal/mail/sieve/class_sieveElement_If.inc:28
 #, fuzzy
 msgid "Domain part"
@@ -2001,133 +1969,102 @@ msgstr "Usuń pozycję"
 msgid "Require must be the first command in the script."
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:16
+#: personal/mail/class_mailAccount.inc:51
 #: addons/mailqueue/class_mailqueue.inc:7
 msgid "This does something"
 msgstr "To robi coś"
 
-#: personal/mail/class_mailAccount.inc:94
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
+#: personal/mail/class_mailAccount.inc:620
+#: personal/mail/class_mail-methods.inc:111
+#: personal/mail/class_mail-methods.inc:373
+#, fuzzy
+msgid "Configuration error"
+msgstr "Plik konfiguracyjny"
 
-#: personal/mail/class_mailAccount.inc:208
+#: personal/mail/class_mailAccount.inc:620
 #, fuzzy, php-format
 msgid "No DESC tag in vacation template '%s'!"
 msgstr "Brak znacznika DESC w pliku autorespondera"
 
-#: personal/mail/class_mailAccount.inc:299
-msgid "Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:347
+#: personal/mail/class_mailAccount.inc:649
+#: personal/mail/class_mailAccount.inc:662
+#: personal/mail/class_mailAccount.inc:693
+#: personal/mail/class_mailAccount.inc:706
 #, fuzzy
-msgid "Please select an entry!"
-msgstr "Proszę wybrać prawidłowy serwer pocztowy."
+msgid "Permission error"
+msgstr "Uprawnienia"
 
-#: personal/mail/class_mailAccount.inc:370
+#: personal/mail/class_mailAccount.inc:649
+#: personal/mail/class_mailAccount.inc:662
+#: personal/mail/class_mailAccount.inc:693
+#: personal/mail/class_mailAccount.inc:706
 #, fuzzy
-msgid "Cannot add primary address to the list of forwarders!"
-msgstr "Próbujesz dodać błędny adres email do listy przekazywanych."
-
-#: personal/mail/class_mailAccount.inc:420
-#, fuzzy, php-format
-msgid "Address is already in use by user '%s'."
-msgstr "Adres który próbujesz dodać jest już używany"
+msgid "You have no permission to modify these addresses!"
+msgstr "Brak uprawnień do usunięcia tego departamentu."
 
-#: personal/mail/class_mailAccount.inc:966
-#: personal/mail/class_mailAccount.inc:974
-#: personal/mail/class_mailAccount.inc:1361
+#: personal/mail/class_mailAccount.inc:1096
+#: personal/mail/class_mailAccount.inc:1104
+#: personal/mail/class_mailAccount.inc:1255
 #, fuzzy
 msgid "Mail reject size"
 msgstr "Max rozmiar poczty"
 
-#: personal/mail/class_mailAccount.inc:978
-#: personal/mail/class_mailAccount.inc:1368
+#: personal/mail/class_mailAccount.inc:1108
+#: personal/mail/class_mailAccount.inc:1262
 #, fuzzy
 msgid "Spam folder"
 msgstr "do folferu"
 
-#: personal/mail/class_mailAccount.inc:982
-#: personal/mail/class_mailAccount.inc:1373
+#: personal/mail/class_mailAccount.inc:1114
+#: personal/mail/class_mailAccount.inc:1267
 #, fuzzy
 msgid "Vacation interval"
 msgstr "Treść autorespondera"
 
-#: personal/mail/class_mailAccount.inc:1027
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1072
-#: personal/mail/class_mailAccount.inc:1083
-#, fuzzy
-msgid "Permission error"
-msgstr "Uprawnienia"
-
-#: personal/mail/class_mailAccount.inc:1027
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1072
-#: personal/mail/class_mailAccount.inc:1083
-#, fuzzy
-msgid "You have no permission to modify these addresses!"
-msgstr "Brak uprawnień do usunięcia tego departamentu."
-
-#: personal/mail/class_mailAccount.inc:1148
-#, fuzzy
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "Oczekiwanie aż kolab usunie właściwości poczty."
-
-#: personal/mail/class_mailAccount.inc:1150
-#, fuzzy
-msgid ""
-"Please remove the mail settings first to allow kolab to call its remove "
-"methods!"
-msgstr ""
-"Proszę najpierw usunąć konto pocztowe, aby umożliwić kolab usuwanie swoimi "
-"metodami."
-
-#: personal/mail/class_mailAccount.inc:1175
+#: personal/mail/class_mailAccount.inc:1391
 msgid "My account"
 msgstr "Moje konto "
 
-#: personal/mail/class_mailAccount.inc:1184
+#: personal/mail/class_mailAccount.inc:1400
 msgid "Add vacation information"
 msgstr "Dodaj informacje autorespondera"
 
-#: personal/mail/class_mailAccount.inc:1187
+#: personal/mail/class_mailAccount.inc:1403
 msgid "Use spam filter"
 msgstr "Użyj filtra spamu"
 
-#: personal/mail/class_mailAccount.inc:1188
+#: personal/mail/class_mailAccount.inc:1404
 msgid "Spam level"
 msgstr "Poziom spamu"
 
-#: personal/mail/class_mailAccount.inc:1189
+#: personal/mail/class_mailAccount.inc:1405
 msgid "Spam mail box"
 msgstr "Skrzynpa spamowa"
 
-#: personal/mail/class_mailAccount.inc:1191
+#: personal/mail/class_mailAccount.inc:1407
 #, fuzzy
 msgid "Sieve management"
 msgstr "Zarządzanie"
 
-#: personal/mail/class_mailAccount.inc:1193
+#: personal/mail/class_mailAccount.inc:1409
 msgid "Reject due to mailsize"
 msgstr "Odrzuć z powodu rozmiaru wiadomości"
 
-#: personal/mail/class_mailAccount.inc:1196
-#: personal/mail/class_mailAccount.inc:1201
+#: personal/mail/class_mailAccount.inc:1412
+#: personal/mail/class_mailAccount.inc:1417
 msgid "Forwarding address"
 msgstr "Adresy przekazywane"
 
-#: personal/mail/class_mailAccount.inc:1197
+#: personal/mail/class_mailAccount.inc:1413
 msgid "Local delivery"
 msgstr "Lokalne dostarczanie"
 
-#: personal/mail/class_mailAccount.inc:1198
+#: personal/mail/class_mailAccount.inc:1414
 #, fuzzy
 msgid "No delivery to own mailbox "
 msgstr "Nie dostarczaj do własnej skrzynki"
 
-#: personal/mail/class_mailAccount.inc:1199
+#: personal/mail/class_mailAccount.inc:1415
 msgid "Mail alternative addresses"
 msgstr "Adresy alternatywne"
 
@@ -2135,47 +2072,43 @@ msgstr "Adresy alternatywne"
 msgid "User mail settings"
 msgstr "Ustawienia poczty użytkownika"
 
-#: personal/mail/class_mail-methods-cyrus.inc:62
+#: personal/mail/class_mail-methods.inc:112
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:374
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:600
+#: personal/mail/class_mail-methods.inc:601
+#, fuzzy
+msgid "None"
+msgstr "żaden"
+
+#: personal/mail/class_mail-methods-cyrus.inc:37
 #, fuzzy
 msgid "Mail server for this account is invalid!"
 msgstr "Brak ograniczeń co do wielkości poczty dla tego konta"
 
-#: personal/mail/class_mail-methods-cyrus.inc:80
-#: personal/mail/class_mail-methods-cyrus.inc:178
-#: personal/mail/class_mail-methods-cyrus.inc:197
-#: personal/mail/class_mail-methods-cyrus.inc:263
+#: personal/mail/class_mail-methods-cyrus.inc:199
 #, fuzzy
 msgid "IMAP error"
 msgstr "błąd LDAP:"
 
-#: personal/mail/class_mail-methods-cyrus.inc:80
-msgid "Cannot store mail settings on IMAP server!"
-msgstr ""
-
-#: personal/mail/class_mail-methods-cyrus.inc:178
-#, fuzzy, php-format
-msgid "Cannot create IMAP mailbox: %s"
-msgstr "Nie można utworzyć konta IMAP. Odpowiedź serwera '%s'."
-
-#: personal/mail/class_mail-methods-cyrus.inc:197
+#: personal/mail/class_mail-methods-cyrus.inc:199
 #, fuzzy, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr "Nie można usunąć konta IMAP. Odpowiedź serwera '%s'."
 
-#: personal/mail/class_mail-methods-cyrus.inc:223
-msgid "Cannot remove IMAP ACL: imap_getacl not implemented!"
-msgstr ""
-
-#: personal/mail/class_mail-methods-cyrus.inc:241
-msgid "Cannot retrieve IMAP ACL: imap_getacl not implemented!"
+#: personal/mail/class_mail-methods-cyrus.inc:328
+#: personal/mail/class_mail-methods-cyrus.inc:365
+msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:263
-#, fuzzy, php-format
-msgid "Cannot remove IMAP mailbox: %s"
-msgstr "Nie można usunąć konta IMAP. Odpowiedź serwera '%s'."
-
-#: personal/mail/class_mail-methods-cyrus.inc:378
+#: personal/mail/class_mail-methods-cyrus.inc:538
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
@@ -2383,6 +2316,148 @@ msgstr "nagłówek"
 msgid "Display header of this message"
 msgstr "Wyświetl nagłówek tej wiadomości"
 
+#, fuzzy
+#~ msgid "Cannot connect mail method: %s"
+#~ msgstr "Nie można otworzyć pliku '%s'."
+
+#, fuzzy
+#~ msgid "Cannot remove mailbox: %s."
+#~ msgstr "Nie można usunąć konta IMAP. Odpowiedź serwera '%s'."
+
+#, fuzzy
+#~ msgid "Cannot update mailbox: %s."
+#~ msgstr "Nie można utworzyć konta IMAP. Odpowiedź serwera '%s'."
+
+#, fuzzy
+#~ msgid "Cannot write quota settings: %s."
+#~ msgstr "Nie można stworzyć pliku '%s'."
+
+#, fuzzy
+#~ msgid "Cannot get list of mailboxes! Error was: %s."
+#~ msgstr "Nie można usunąć konta IMAP. Odpowiedź serwera '%s'."
+
+#, fuzzy
+#~ msgid "Cannot connect mail method! Error was: %s."
+#~ msgstr "Nie można otworzyć pliku '%s'."
+
+#, fuzzy
+#~ msgid "Cannot remove mailbox! Error was: %s."
+#~ msgstr "Nie można usunąć konta IMAP. Odpowiedź serwera '%s'."
+
+#, fuzzy
+#~ msgid "Cannot update mailbox! Error was: %s."
+#~ msgstr "Nie można utworzyć konta IMAP. Odpowiedź serwera '%s'."
+
+#, fuzzy
+#~ msgid "Specify the mail server where the user will  be hosted on"
+#~ msgstr ""
+#~ "Wybierz serwer poczty który będzie przechowywał skrzynkę użytkownika"
+
+#~ msgid "Select mail server to place user on"
+#~ msgstr "Wybierz serwer pocztowy dla użytkownika"
+
+#~ msgid "not defined"
+#~ msgstr "nie zdefiniowane"
+
+#~ msgid "read"
+#~ msgstr "czytanie"
+
+#~ msgid "post"
+#~ msgstr "wysyłanie"
+
+#~ msgid "external post"
+#~ msgstr "wysyłanie zewnętrzne"
+
+#~ msgid "append"
+#~ msgstr "dołączanie"
+
+#~ msgid "write"
+#~ msgstr "zapisywanie"
+
+#, fuzzy
+#~ msgid "admin"
+#~ msgstr "Admin"
+
+#, fuzzy
+#~ msgid "mail"
+#~ msgstr "Poczta"
+
+#, fuzzy
+#~ msgid "forward address"
+#~ msgstr "Adresy przekazywane"
+
+#, fuzzy
+#~ msgid "Cannot forward to users own mail address!"
+#~ msgstr "Próbujesz dodać nieprawidłowy adres email"
+
+#, fuzzy
+#~ msgid "Alternate address"
+#~ msgstr "Adresy alternatywne"
+
+#~ msgid "Add"
+#~ msgstr "Dodaj"
+
+#, fuzzy
+#~ msgid "Unspecified"
+#~ msgstr "niezdefiniowany"
+
+#, fuzzy
+#~ msgid "Mails"
+#~ msgstr "Poczta"
+
+#, fuzzy
+#~ msgid "Tasks"
+#~ msgstr "Zadanie"
+
+#, fuzzy
+#~ msgid "Journals"
+#~ msgstr "godzin"
+
+#~ msgid "Contacts"
+#~ msgstr "Kontakty"
+
+#, fuzzy
+#~ msgid "Notes"
+#~ msgstr "Nie"
+
+#, fuzzy
+#~ msgid "Inbox"
+#~ msgstr "Indeks"
+
+#, fuzzy
+#~ msgid "Drafts"
+#~ msgstr "Data"
+
+#, fuzzy
+#~ msgid "Sent items"
+#~ msgstr "Ustaw status"
+
+#, fuzzy
+#~ msgid "Junk mail"
+#~ msgstr "Grupa poczta"
+
+#~ msgid ""
+#~ "Please choose valid permission settings. Default permission can't be "
+#~ "emtpy."
+#~ msgstr ""
+#~ "Proszę wybrać prawidłowe ustawienia. Domyślne ustawienia nie mogą być "
+#~ "puste."
+
+#~ msgid "Mail options"
+#~ msgstr "Opcje poczty"
+
+#, fuzzy
+#~ msgid "Waiting for kolab to remove mail properties..."
+#~ msgstr "Oczekiwanie aż kolab usunie właściwości poczty."
+
+#, fuzzy
+#~ msgid ""
+#~ "Please remove the mail settings first to allow kolab to call its remove "
+#~ "methods!"
+#~ msgstr ""
+#~ "Proszę najpierw usunąć konto pocztowe, aby umożliwić kolab usuwanie "
+#~ "swoimi metodami."
+
 #, fuzzy
 #~ msgid "You have no permission to submit a '%s' command!"
 #~ msgstr "Brak uprawnień do wysyłania wiadomości!"

diff --git a/gosa-plugins/mail/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/ru/LC_MESSAGES/messages.po
index f12dd9e348edf80087f69f906b8b2c91eaaafddd..d69ce4f83bd50ffcac9a946cad8e756c6b496920 100644 (file)
--- a/gosa-plugins/mail/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/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: 2008-12-03 15:05+0100\n"
+"POT-Creation-Date: 2008-12-10 10:53+0100\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"
@@ -18,9 +18,10 @@ msgstr ""
 msgid "Mail distribution list"
 msgstr ""
 
-#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/mail.tpl:10
-#: admin/groups/mail/paste_mail.tpl:8 personal/mail/copypaste.tpl:7
-#: personal/mail/generic.tpl:8 personal/mail/class_mailAccount.inc:931
+#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/mail.tpl:7
+#: admin/groups/mail/paste_mail.tpl:8
+#: admin/groups/mail/class_groupMail.inc:784 personal/mail/copypaste.tpl:7
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1060
 msgid "Primary address"
 msgstr "Основной адрес"
 
@@ -30,7 +31,6 @@ msgid "Primary mail address for this distribution list"
 msgstr "Основной адрес эл. почты для этой общей папки"
 
 #: admin/ogroups/mail/class_mailogroup.inc:50
-#: admin/groups/mail/class_groupMail.inc:390
 msgid "Remove mail account"
 msgstr "Удалить настройки эл. почты"
 
@@ -41,32 +41,31 @@ msgid "mail group"
 msgstr "Основная группа"
 
 #: admin/ogroups/mail/class_mailogroup.inc:53
-#: admin/groups/mail/class_groupMail.inc:393
 msgid "Create mail account"
 msgstr "Создать настройки запись эл. почты"
 
 #: admin/ogroups/mail/class_mailogroup.inc:86
 #: admin/ogroups/mail/class_mailogroup.inc:93
 #: admin/ogroups/mail/class_mailogroup.inc:194
-#: admin/groups/mail/class_groupMail.inc:499
-#: admin/groups/mail/class_groupMail.inc:1084
-#: admin/groups/mail/class_groupMail.inc:1087
-#: admin/groups/mail/class_groupMail.inc:1093
-#: admin/groups/mail/class_groupMail.inc:1295
-#: personal/mail/class_mailAccount.inc:364
-#: personal/mail/class_mailAccount.inc:400
-#: personal/mail/class_mailAccount.inc:408
-#: personal/mail/class_mailAccount.inc:419
-#: personal/mail/class_mailAccount.inc:935
-#: personal/mail/class_mailAccount.inc:939
-#: personal/mail/class_mailAccount.inc:950
-#: personal/mail/class_mailAccount.inc:1180
+#: admin/groups/mail/class_groupMail.inc:325
+#: admin/groups/mail/class_groupMail.inc:360
+#: admin/groups/mail/class_groupMail.inc:366
+#: admin/groups/mail/class_groupMail.inc:375
+#: admin/groups/mail/class_groupMail.inc:786
+#: admin/groups/mail/class_groupMail.inc:917
+#: personal/mail/class_mailAccount.inc:306
+#: personal/mail/class_mailAccount.inc:341
+#: personal/mail/class_mailAccount.inc:346
+#: personal/mail/class_mailAccount.inc:354
+#: personal/mail/class_mailAccount.inc:1064
+#: personal/mail/class_mailAccount.inc:1068
+#: personal/mail/class_mailAccount.inc:1079
+#: personal/mail/class_mailAccount.inc:1396
 #, fuzzy
 msgid "Mail address"
 msgstr "MAC-адрес"
 
 #: admin/ogroups/mail/class_mailogroup.inc:86
-#: admin/groups/mail/class_groupMail.inc:1087
 msgid "your-name@your-domain.com"
 msgstr ""
 
@@ -76,27 +75,33 @@ msgstr ""
 #: admin/systems/services/spam/class_goSpamServer.inc:277
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/mail/class_goMailServer.inc:582
-#: admin/groups/mail/class_groupMail.inc:794
-#: admin/groups/mail/class_groupMail.inc:1048
-#: personal/mail/class_mailAccount.inc:694
-#: personal/mail/class_mailAccount.inc:862
+#: admin/groups/mail/class_groupMail.inc:501
+#: admin/groups/mail/class_groupMail.inc:716
+#: personal/mail/class_mailAccount.inc:889
+#: personal/mail/class_mailAccount.inc:956
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
 
 #: admin/ogroups/mail/class_mailogroup.inc:186
 #: admin/ogroups/mail/paste_mail.tpl:4
-#: admin/groups/mail/class_groupMail.inc:1287
-#: personal/mail/class_mailAccount.inc:15
-#: personal/mail/class_mailAccount.inc:288
-#: personal/mail/class_mailAccount.inc:298
-#: personal/mail/class_mailAccount.inc:301
-#: personal/mail/class_mailAccount.inc:302
-#: personal/mail/class_mailAccount.inc:305
-#: personal/mail/class_mailAccount.inc:306
-#: personal/mail/class_mailAccount.inc:926
-#: personal/mail/class_mailAccount.inc:1170
-#: personal/mail/class_mailAccount.inc:1346
+#: admin/groups/mail/class_groupMail.inc:257
+#: admin/groups/mail/class_groupMail.inc:259
+#: admin/groups/mail/class_groupMail.inc:260
+#: admin/groups/mail/class_groupMail.inc:265
+#: admin/groups/mail/class_groupMail.inc:267
+#: admin/groups/mail/class_groupMail.inc:268
+#: admin/groups/mail/class_groupMail.inc:774
+#: admin/groups/mail/class_groupMail.inc:909
+#: personal/mail/class_mailAccount.inc:50
+#: personal/mail/class_mailAccount.inc:222
+#: personal/mail/class_mailAccount.inc:230
+#: personal/mail/class_mailAccount.inc:232
+#: personal/mail/class_mailAccount.inc:237
+#: personal/mail/class_mailAccount.inc:239
+#: personal/mail/class_mailAccount.inc:1048
+#: personal/mail/class_mailAccount.inc:1240
+#: personal/mail/class_mailAccount.inc:1386
 msgid "Mail"
 msgstr "Почта"
 
@@ -229,7 +234,7 @@ msgid "Start POP3 SSL service"
 msgstr "Служба SSH"
 
 #: admin/systems/services/imap/goImapServer.tpl:1
-#: admin/systems/services/mail/goMailServer.tpl:1 admin/groups/mail/mail.tpl:7
+#: admin/systems/services/mail/goMailServer.tpl:1 admin/groups/mail/mail.tpl:4
 #: personal/mail/generic.tpl:5
 msgid "Generic"
 msgstr "Общее"
@@ -279,22 +284,24 @@ msgstr ""
 
 #: admin/systems/services/spam/class_goSpamServer.inc:143
 #: admin/systems/services/spam/class_goSpamServer.inc:216
-#: admin/groups/mail/class_groupMail.inc:464
-#: admin/groups/mail/class_groupMail.inc:468
-#: admin/groups/mail/class_groupMail.inc:494
-#: admin/groups/mail/class_groupMail.inc:499
+#: admin/groups/mail/class_groupMail.inc:312
+#: admin/groups/mail/class_groupMail.inc:325
+#: admin/groups/mail/class_groupMail.inc:331
+#: admin/groups/mail/class_groupMail.inc:360
+#: admin/groups/mail/class_groupMail.inc:366
+#: admin/groups/mail/class_groupMail.inc:375
 #: personal/mail/sieve/class_sieveManagement.inc:201
 #: personal/mail/sieve/class_sieveManagement.inc:206
 #: personal/mail/sieve/class_sieveManagement.inc:212
 #: personal/mail/sieve/class_sieveManagement.inc:218
 #: personal/mail/sieve/class_sieveManagement.inc:429
 #: personal/mail/sieve/class_My_Tree.inc:660
-#: personal/mail/class_mailAccount.inc:347
-#: personal/mail/class_mailAccount.inc:363
-#: personal/mail/class_mailAccount.inc:370
-#: personal/mail/class_mailAccount.inc:399
-#: personal/mail/class_mailAccount.inc:407
-#: personal/mail/class_mailAccount.inc:419
+#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:306
+#: personal/mail/class_mailAccount.inc:312
+#: personal/mail/class_mailAccount.inc:341
+#: personal/mail/class_mailAccount.inc:346
+#: personal/mail/class_mailAccount.inc:354
 #: addons/mailqueue/class_mailqueue.inc:110
 #: addons/mailqueue/class_mailqueue.inc:144
 #: addons/mailqueue/class_mailqueue.inc:150
@@ -367,7 +374,6 @@ msgstr ""
 #: admin/systems/services/spam/goSpamServer.tpl:48
 #: admin/systems/services/mail/goMailServer.tpl:73
 #: admin/systems/services/mail/goMailServer.tpl:104
-#: admin/groups/mail/class_groupMail.inc:654
 msgid "Remove"
 msgstr "Удалить"
 
@@ -632,120 +638,104 @@ msgstr "Действие"
 msgid "Restriction filter"
 msgstr "Поиск"
 
-#: admin/groups/mail/mail.tpl:14 personal/mail/generic.tpl:11
-msgid "Multiple edit"
-msgstr ""
-
-#: admin/groups/mail/mail.tpl:17 admin/groups/mail/paste_mail.tpl:12
-msgid "Primary mail address for this shared folder"
-msgstr "Основной адрес эл. почты для этой общей папки"
-
-#: admin/groups/mail/mail.tpl:23 personal/mail/generic.tpl:20
+#: admin/groups/mail/mail.tpl:35 personal/mail/generic.tpl:30
 #: addons/mailqueue/contents.tpl:73
 msgid "Server"
 msgstr "Сервер"
 
-#: admin/groups/mail/mail.tpl:26
-msgid "Select mail server to place user on"
-msgstr "Выберите почтовый сервер для пользователя"
+#: admin/groups/mail/mail.tpl:39 personal/mail/generic.tpl:37
+msgid "Specify the mail server where the user will be hosted on"
+msgstr "Выберите почтовый сервер для учетной записи пользователя"
 
-#: admin/groups/mail/mail.tpl:36 personal/mail/generic.tpl:34
+#: admin/groups/mail/mail.tpl:52 personal/mail/generic.tpl:53
 msgid "Quota usage"
 msgstr "Использование квоты"
 
-#: admin/groups/mail/mail.tpl:43 personal/mail/generic.tpl:41
-msgid "not defined"
-msgstr "не определена"
-
-#: admin/groups/mail/mail.tpl:48 admin/groups/mail/class_groupMail.inc:1099
-#: admin/groups/mail/class_groupMail.inc:1296 personal/mail/generic.tpl:47
-#: personal/mail/class_mailAccount.inc:957
-#: personal/mail/class_mailAccount.inc:1182
-#: personal/mail/class_mailAccount.inc:1352
+#: admin/groups/mail/mail.tpl:56 admin/groups/mail/class_groupMail.inc:793
+#: admin/groups/mail/class_groupMail.inc:918 personal/mail/generic.tpl:57
+#: personal/mail/class_mailAccount.inc:1087
+#: personal/mail/class_mailAccount.inc:1246
+#: personal/mail/class_mailAccount.inc:1398
 msgid "Quota size"
 msgstr "Размер квоты"
 
-#: admin/groups/mail/mail.tpl:53 personal/mail/generic.tpl:234
-msgid "MB"
-msgstr "Мб"
-
-#: admin/groups/mail/mail.tpl:59 admin/groups/mail/class_groupMail.inc:1298
+#: admin/groups/mail/mail.tpl:69 admin/groups/mail/class_groupMail.inc:920
 #, fuzzy
 msgid "Folder type"
 msgstr "Фильтр"
 
-#: admin/groups/mail/mail.tpl:85
+#: admin/groups/mail/mail.tpl:87
 #, fuzzy
 msgid "Reload"
 msgstr "чтение"
 
-#: admin/groups/mail/mail.tpl:102 admin/groups/mail/paste_mail.tpl:23
-#: personal/mail/copypaste.tpl:25 personal/mail/generic.tpl:64
+#: admin/groups/mail/mail.tpl:98 admin/groups/mail/paste_mail.tpl:23
+#: personal/mail/copypaste.tpl:25 personal/mail/generic.tpl:73
 #, fuzzy
 msgid "Alternative addresses"
 msgstr "Альтернативные адреса"
 
-#: admin/groups/mail/mail.tpl:105 admin/groups/mail/paste_mail.tpl:24
-#: personal/mail/copypaste.tpl:55 personal/mail/generic.tpl:67
+#: admin/groups/mail/mail.tpl:103 admin/groups/mail/paste_mail.tpl:24
+#: personal/mail/copypaste.tpl:55 personal/mail/generic.tpl:76
 msgid "List of alternative mail addresses"
 msgstr "Список альтернативных адресов эл. почты"
 
-#: admin/groups/mail/mail.tpl:135
+#: admin/groups/mail/mail.tpl:132
 msgid "IMAP shared folders"
 msgstr "Общие папки IMAP"
 
 #: admin/groups/mail/mail.tpl:139
-#, fuzzy
-msgid "Set shared folder permissions"
-msgstr "Общие папки IMAP"
-
-#: admin/groups/mail/mail.tpl:148
 msgid "Default permission"
 msgstr "Права по умолчанию"
 
-#: admin/groups/mail/mail.tpl:159
+#: admin/groups/mail/mail.tpl:141
 msgid "Member permission"
 msgstr "Права для членов группы"
 
-#: admin/groups/mail/mail.tpl:176 personal/mail/generic.tpl:295
+#: admin/groups/mail/mail.tpl:169 personal/mail/generic.tpl:303
 msgid "Advanced mail options"
 msgstr "Дополнительные почтовые настройки"
 
-#: admin/groups/mail/mail.tpl:182 personal/mail/generic.tpl:301
+#: admin/groups/mail/mail.tpl:175 personal/mail/generic.tpl:309
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 "Выберите, может ли пользователь отправлять и получать сообщения только "
 "внутри своего домена"
 
-#: admin/groups/mail/mail.tpl:184 personal/mail/generic.tpl:303
+#: admin/groups/mail/mail.tpl:177 personal/mail/generic.tpl:311
 msgid "User is only allowed to send and receive local mails"
 msgstr "Пользователь может отправлять и получать почту только локально"
 
-#: admin/groups/mail/mail.tpl:193 admin/groups/mail/paste_mail.tpl:34
+#: admin/groups/mail/mail.tpl:186 admin/groups/mail/paste_mail.tpl:34
 msgid "Forward messages to non group members"
 msgstr "Пересылать сообщения не членам группы"
 
-#: admin/groups/mail/mail.tpl:202
+#: admin/groups/mail/mail.tpl:195
 #, fuzzy
 msgid "Used in all groups"
 msgstr "Введите адрес сервера"
 
-#: admin/groups/mail/mail.tpl:205
+#: admin/groups/mail/mail.tpl:198
 #, fuzzy
 msgid "Not used in all groups"
 msgstr "Показать обычные группы"
 
-#: admin/groups/mail/mail.tpl:223 admin/groups/mail/paste_mail.tpl:42
-#: personal/mail/copypaste.tpl:44 personal/mail/generic.tpl:285
+#: admin/groups/mail/mail.tpl:216 admin/groups/mail/paste_mail.tpl:42
+#: personal/mail/copypaste.tpl:44 personal/mail/generic.tpl:290
+#: personal/mail/generic.tpl:293
 msgid "Add local"
 msgstr "Добавить локально"
 
 #: admin/groups/mail/paste_mail.tpl:1 personal/mail/copypaste.tpl:1
-#: personal/mail/class_mailAccount.inc:1171
+#: personal/mail/class_mailAccount.inc:1387
 #, fuzzy
 msgid "Mail settings"
 msgstr "Почтовые настройки пользователя"
 
+#: admin/groups/mail/paste_mail.tpl:12
+msgid "Primary mail address for this shared folder"
+msgstr "Основной адрес эл. почты для этой общей папки"
+
 #: admin/groups/mail/mail_locals.tpl:6 personal/mail/mail_locals.tpl:7
 msgid "Select addresses to add"
 msgstr "Выберите адреса для добавления"
@@ -791,216 +781,195 @@ msgid "Choose"
 msgstr "Выбрать"
 
 #: admin/groups/mail/class_groupMail.inc:92
-#: personal/mail/class_mailAccount.inc:94
-#: personal/mail/class_mailAccount.inc:208
+#: admin/groups/mail/class_groupMail.inc:99
+#: admin/groups/mail/class_groupMail.inc:106
+#: admin/groups/mail/class_groupMail.inc:113
+#: admin/groups/mail/class_groupMail.inc:118
+#: admin/groups/mail/class_groupMail.inc:121
+#: admin/groups/mail/class_groupMail.inc:513
+#: admin/groups/mail/class_groupMail.inc:517
+#: admin/groups/mail/class_groupMail.inc:521
+#: admin/groups/mail/class_groupMail.inc:729
+#: admin/groups/mail/class_groupMail.inc:733
+#: admin/groups/mail/class_groupMail.inc:737
+#: admin/groups/mail/class_groupMail.inc:746
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:145
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:902
+#: personal/mail/class_mailAccount.inc:970
+#: personal/mail/class_mailAccount.inc:974
+#: personal/mail/class_mailAccount.inc:978
+#: personal/mail/class_mailAccount.inc:992
 #, fuzzy
-msgid "Configuration error"
-msgstr "Ð\9dаÑ\81Ñ\82Ñ\80оиÑ\82Ñ\8c"
+msgid "Mail error"
+msgstr "СеÑ\80веÑ\80"
 
 #: admin/groups/mail/class_groupMail.inc:92
+#: personal/mail/class_mailAccount.inc:130
 #, fuzzy, php-format
-msgid "Cannot locate mail method '%s'!"
-msgstr "Удалить"
-
-#: admin/groups/mail/class_groupMail.inc:325
-msgid "read"
-msgstr "чтение"
-
-#: admin/groups/mail/class_groupMail.inc:326
-msgid "post"
-msgstr "отправка"
-
-#: admin/groups/mail/class_groupMail.inc:327
-msgid "external post"
-msgstr "отправка (внешн.)"
+msgid "Cannot read quota settings: %s"
+msgstr "Не могу открыть файл на сервере."
 
-#: admin/groups/mail/class_groupMail.inc:328
-msgid "append"
-msgstr "добавление"
+#: admin/groups/mail/class_groupMail.inc:99
+#: personal/mail/class_mailAccount.inc:137
+#, fuzzy, php-format
+msgid "Cannot get list of mailboxes: %s"
+msgstr "Не удается удалить почтовый ящик IMAP. Ответ сервера: '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:329
-msgid "write"
-msgstr "запись"
+#: admin/groups/mail/class_groupMail.inc:106
+#, fuzzy, php-format
+msgid "Cannot receive folder types: %s"
+msgstr "Общие папки IMAP"
 
-#: admin/groups/mail/class_groupMail.inc:330
-#, fuzzy
-msgid "admin"
-msgstr "DN администратора"
+#: admin/groups/mail/class_groupMail.inc:113
+#, fuzzy, php-format
+msgid "Cannot receive folder permissions: %s"
+msgstr "Общие папки IMAP"
 
-#: admin/groups/mail/class_groupMail.inc:331
-msgid "none"
-msgstr "нет"
+#: admin/groups/mail/class_groupMail.inc:118
+#: admin/groups/mail/class_groupMail.inc:513
+#: admin/groups/mail/class_groupMail.inc:729
+#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:970
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:382
-#: admin/groups/mail/class_groupMail.inc:391
-#: admin/groups/mail/class_groupMail.inc:394
-#, fuzzy
-msgid "mail"
-msgstr "Почта"
+#: admin/groups/mail/class_groupMail.inc:121
+#: personal/mail/class_mailAccount.inc:145
+#, php-format
+msgid "Mailbox '%s' doesn't exists on mail server: %s"
+msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:404
+#: admin/groups/mail/class_groupMail.inc:278
 #, fuzzy
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
 msgstr "Не удается удалить пользователя из базы данных Kerberos."
 
-#: admin/groups/mail/class_groupMail.inc:405
+#: admin/groups/mail/class_groupMail.inc:279
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:464
-#, fuzzy
-msgid "forward address"
-msgstr "Основной адрес"
-
-#: admin/groups/mail/class_groupMail.inc:468
-#, fuzzy
-msgid "Cannot forward to users own mail address!"
-msgstr "Вы пытаетесь добавить некорректный адрес электронной почты "
-
-#: admin/groups/mail/class_groupMail.inc:494
-#, fuzzy
-msgid "Alternate address"
-msgstr "Альтернативные адреса"
-
-#: admin/groups/mail/class_groupMail.inc:648
-msgid "Add"
-msgstr "Добавить"
-
-#: admin/groups/mail/class_groupMail.inc:700
-#: admin/groups/mail/class_groupMail.inc:706
+#: admin/groups/mail/class_groupMail.inc:312
+#: personal/mail/class_mailAccount.inc:294
 #, fuzzy
-msgid "Unspecified"
-msgstr "не определена"
-
-#: admin/groups/mail/class_groupMail.inc:700
-#, fuzzy
-msgid "Mails"
-msgstr "Почта"
-
-#: admin/groups/mail/class_groupMail.inc:701
-#, fuzzy
-msgid "Tasks"
-msgstr "Выберите тип мыши"
+msgid "Please select an entry!"
+msgstr "Введите корректный серийный номер"
 
-#: admin/groups/mail/class_groupMail.inc:701
+#: admin/groups/mail/class_groupMail.inc:331
+#: personal/mail/class_mailAccount.inc:312
 #, fuzzy
-msgid "Journals"
-msgstr "час"
-
-#: admin/groups/mail/class_groupMail.inc:702
-msgid "Calendar"
+msgid "Cannot add primary address to the list of forwarders!"
 msgstr ""
+"Вы пытаетесь добавить некорректный адрес электронной почты к списку тех, "
+"кому должны пересылаться сообщения."
 
-#: admin/groups/mail/class_groupMail.inc:702
-#, fuzzy
-msgid "Contacts"
-msgstr "Контакт"
+#: admin/groups/mail/class_groupMail.inc:376
+#: personal/mail/class_mailAccount.inc:355
+#, fuzzy, php-format
+msgid "Address is already in use by user '%s'."
+msgstr "Добавляемый вами адрес уже используется пользователем"
 
-#: admin/groups/mail/class_groupMail.inc:703
+#: admin/groups/mail/class_groupMail.inc:402
+#: personal/mail/class_mailAccount.inc:384
 #, fuzzy
-msgid "Notes"
-msgstr "нет"
+msgid "Unknown"
+msgstr "состояние неизвестно"
 
-#: admin/groups/mail/class_groupMail.inc:706
-msgid "Inbox"
-msgstr ""
+#: admin/groups/mail/class_groupMail.inc:517
+#: personal/mail/class_mailAccount.inc:902
+#, fuzzy, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr "Не удается удалить почтовый ящик IMAP. Ответ сервера: '%s'."
 
-#: admin/groups/mail/class_groupMail.inc:707
-#, fuzzy
-msgid "Drafts"
-msgstr "Дата"
+#: admin/groups/mail/class_groupMail.inc:521
+#: admin/groups/mail/class_groupMail.inc:746
+#, fuzzy, php-format
+msgid "Cannot update shared folder permissions: %s"
+msgstr "Общие папки IMAP"
 
-#: admin/groups/mail/class_groupMail.inc:707
+#: admin/groups/mail/class_groupMail.inc:611
 #, fuzzy
-msgid "Sent items"
-msgstr "СоÑ\81Ñ\82оÑ\8fние Ñ\81иÑ\81Ñ\82емÑ\8b"
+msgid "New"
+msgstr "Ð\9fолÑ\8cзоваÑ\82ели домена"
 
-#: admin/groups/mail/class_groupMail.inc:708
-#, fuzzy
-msgid "Junk mail"
-msgstr "Группа"
+#: admin/groups/mail/class_groupMail.inc:733
+#: personal/mail/class_mailAccount.inc:974
+#, fuzzy, php-format
+msgid "Cannot update mailbox: %s"
+msgstr "Не удается создать почтовый ящик IMAP. Ответ сервера: \"%s\"."
 
-#: admin/groups/mail/class_groupMail.inc:710
-#: personal/mail/sieve/class_sieveElement_If.inc:27
-#: personal/mail/sieve/class_sieveElement_If.inc:33
-#, fuzzy
-msgid "Default"
-msgstr "по умолчанию"
+#: admin/groups/mail/class_groupMail.inc:737
+#: personal/mail/class_mailAccount.inc:978
+#, fuzzy, php-format
+msgid "Cannot write quota settings: %s"
+msgstr "Удалить"
 
-#: admin/groups/mail/class_groupMail.inc:1108
-#: personal/mail/class_mailAccount.inc:1194
+#: admin/groups/mail/class_groupMail.inc:802
+#: personal/mail/class_mailAccount.inc:1410
 #, fuzzy
 msgid "Mail max size"
 msgstr "Размер квоты"
 
-#: admin/groups/mail/class_groupMail.inc:1116
+#: admin/groups/mail/class_groupMail.inc:810
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "Помните, что указывать нужно максимальный допустимый размер сообщений."
 
-#: admin/groups/mail/class_groupMail.inc:1120
-msgid ""
-"Please choose valid permission settings. Default permission can't be emtpy."
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:1124
-#: admin/groups/mail/class_groupMail.inc:1297
-#: personal/mail/class_mailAccount.inc:1181
+#: admin/groups/mail/class_groupMail.inc:814
+#: admin/groups/mail/class_groupMail.inc:919
+#: personal/mail/class_mailAccount.inc:1397
 #, fuzzy
 msgid "Mail server"
 msgstr "Сервер"
 
-#: admin/groups/mail/class_groupMail.inc:1288
+#: admin/groups/mail/class_groupMail.inc:910
 #, fuzzy
 msgid "Group mail"
 msgstr "Группа"
 
-#: admin/groups/mail/class_groupMail.inc:1298
+#: admin/groups/mail/class_groupMail.inc:920
 msgid "Kolab"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1299
+#: admin/groups/mail/class_groupMail.inc:921
 #, fuzzy
 msgid "Alternate addresses"
 msgstr "Альтернативные адреса"
 
-#: admin/groups/mail/class_groupMail.inc:1300
+#: admin/groups/mail/class_groupMail.inc:922
 #, fuzzy
 msgid "Forwarding addresses"
 msgstr "Основной адрес"
 
-#: admin/groups/mail/class_groupMail.inc:1301
+#: admin/groups/mail/class_groupMail.inc:923
 #, fuzzy
 msgid "Only local"
 msgstr "Добавить локально"
 
-#: admin/groups/mail/class_groupMail.inc:1302
+#: admin/groups/mail/class_groupMail.inc:924
 #, fuzzy
 msgid "Permissions"
 msgstr "Права для членов группы"
 
-#: personal/mail/copypaste.tpl:13 personal/mail/generic.tpl:262
+#: personal/mail/copypaste.tpl:13 personal/mail/generic.tpl:267
 msgid "Forward messages to"
 msgstr "Перенаправлять сообщения"
 
-#: personal/mail/generic.tpl:23
-msgid "Specify the mail server where the user will be hosted on"
-msgstr "Выберите почтовый сервер для учетной записи пользователя"
-
-#: personal/mail/generic.tpl:92
-msgid "Mail options"
-msgstr "Почтовые настройки"
-
-#: personal/mail/generic.tpl:124 personal/mail/class_mailAccount.inc:1202
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1418
 msgid "Use custom sieve script"
 msgstr "Использовать другой сценарий SIEVE"
 
-#: personal/mail/generic.tpl:124
+#: personal/mail/generic.tpl:115
 msgid "disables all Mail options!"
 msgstr "отключает все почтовые настройки!"
 
-#: personal/mail/generic.tpl:131
+#: personal/mail/generic.tpl:123
 #, fuzzy
 msgid "Sieve Management"
 msgstr "Название"
@@ -1013,56 +982,61 @@ msgstr "Выберите, нужно ли оставлять копии пере
 msgid "No delivery to own mailbox"
 msgstr "Не оставлять копии в своем почтовом ящике"
 
-#: personal/mail/generic.tpl:150
+#: personal/mail/generic.tpl:151
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr "Выберите, чтобы включить автоответчик с сообщением, указанным ниже"
 
-#: personal/mail/generic.tpl:152
+#: personal/mail/generic.tpl:153
 msgid "Activate vacation message"
 msgstr "Включить автоответчик"
 
-#: personal/mail/generic.tpl:160
+#: personal/mail/generic.tpl:161
 #, fuzzy
 msgid "from"
 msgstr "и"
 
-#: personal/mail/generic.tpl:183
+#: personal/mail/generic.tpl:185
 msgid "till"
 msgstr ""
 
-#: personal/mail/generic.tpl:212
+#: personal/mail/generic.tpl:214
 #, fuzzy
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr "Выберите, нужно ли фильтровать сообщения с помощью SpamAssassin"
 
-#: personal/mail/generic.tpl:214
+#: personal/mail/generic.tpl:216
 msgid "Move mails tagged with spam level greater than"
 msgstr "Перемещать сообщения с меткой рекламы больше"
 
-#: personal/mail/generic.tpl:217
+#: personal/mail/generic.tpl:219
+#, fuzzy
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 "Выберите метку рекламы - чем меньше значение, тем чувствительнее фильтр"
 
-#: personal/mail/generic.tpl:221
+#: personal/mail/generic.tpl:223
 msgid "to folder"
 msgstr "в папку"
 
-#: personal/mail/generic.tpl:232
+#: personal/mail/generic.tpl:235
 msgid "Reject mails bigger than"
 msgstr "Отклонять сообщения размером больше"
 
-#: personal/mail/generic.tpl:241
+#: personal/mail/generic.tpl:238
+msgid "MB"
+msgstr "Мб"
+
+#: personal/mail/generic.tpl:245
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/templates/object_container.tpl:31
-#: personal/mail/class_mailAccount.inc:1185
+#: personal/mail/class_mailAccount.inc:1401
 msgid "Vacation message"
 msgstr "Сообщение автоответчика"
 
-#: personal/mail/generic.tpl:256
+#: personal/mail/generic.tpl:261
 #: personal/mail/sieve/templates/import_script.tpl:12
 #: personal/mail/sieve/templates/edit_frame_base.tpl:7
 msgid "Import"
@@ -1126,10 +1100,6 @@ msgstr "Указанное имя уже используется."
 #: personal/mail/sieve/class_sieveManagement.inc:770
 #: personal/mail/sieve/class_sieveManagement.inc:1030
 #: personal/mail/sieve/class_sieveManagement.inc:1043
-#: personal/mail/class_mail-methods-cyrus.inc:291
-#: personal/mail/class_mail-methods-cyrus.inc:303
-#: personal/mail/class_mail-methods-cyrus.inc:374
-#: personal/mail/class_mail-methods-cyrus.inc:378
 #, fuzzy
 msgid "SIEVE error"
 msgstr "Ошибка LDAP:"
@@ -1137,13 +1107,12 @@ msgstr "Ошибка LDAP:"
 #: personal/mail/sieve/class_sieveManagement.inc:302
 #: personal/mail/sieve/class_sieveManagement.inc:345
 #: personal/mail/sieve/class_sieveManagement.inc:1030
-#: personal/mail/class_mail-methods-cyrus.inc:291
 #, fuzzy, php-format
 msgid "Cannot log into SIEVE server: %s"
 msgstr "Невозможно зарегистрироваться на сервере SIEVE. Ответ сервера: \"%s\"."
 
 #: personal/mail/sieve/class_sieveManagement.inc:309
-#: personal/mail/class_mail-methods-cyrus.inc:303
+#: personal/mail/class_mail-methods-cyrus.inc:443
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
@@ -1163,8 +1132,6 @@ msgid "Uploaded script is empty!"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:431
-#: personal/mail/class_mail-methods-cyrus.inc:223
-#: personal/mail/class_mail-methods-cyrus.inc:241
 #, fuzzy
 msgid "Internal error"
 msgstr "Терминал-сервер"
@@ -1358,7 +1325,7 @@ msgid "Cannot insert element at the requested position!"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:1043
-#: personal/mail/class_mail-methods-cyrus.inc:374
+#: personal/mail/class_mail-methods-cyrus.inc:531
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
@@ -1687,7 +1654,6 @@ msgstr "Обновить"
 
 #: personal/mail/sieve/templates/remove_script.tpl:2
 #: personal/mail/sieve/class_My_Tree.inc:245
-#: personal/mail/class_mail-methods-cyrus.inc:62
 msgid "Warning"
 msgstr "Предупреждение"
 
@@ -1858,6 +1824,12 @@ msgstr ""
 msgid "Complete address"
 msgstr "не полный"
 
+#: personal/mail/sieve/class_sieveElement_If.inc:27
+#: personal/mail/sieve/class_sieveElement_If.inc:33
+#, fuzzy
+msgid "Default"
+msgstr "по умолчанию"
+
 #: personal/mail/sieve/class_sieveElement_If.inc:28
 #, fuzzy
 msgid "Domain part"
@@ -2045,137 +2017,108 @@ msgstr "Удалить объект"
 msgid "Require must be the first command in the script."
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:16
+#: personal/mail/class_mailAccount.inc:51
 #: addons/mailqueue/class_mailqueue.inc:7
 msgid "This does something"
 msgstr "Что-то будет"
 
-#: personal/mail/class_mailAccount.inc:94
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
+#: personal/mail/class_mailAccount.inc:620
+#: personal/mail/class_mail-methods.inc:111
+#: personal/mail/class_mail-methods.inc:373
+#, fuzzy
+msgid "Configuration error"
+msgstr "Настроить"
 
-#: personal/mail/class_mailAccount.inc:208
+#: personal/mail/class_mailAccount.inc:620
 #, fuzzy, php-format
 msgid "No DESC tag in vacation template '%s'!"
 msgstr "В файле сообщения автоответчика отсутствует тег DESC:"
 
-#: personal/mail/class_mailAccount.inc:299
-msgid "Mail settings cannot be removed while there are delegations configured!"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:347
+#: personal/mail/class_mailAccount.inc:649
+#: personal/mail/class_mailAccount.inc:662
+#: personal/mail/class_mailAccount.inc:693
+#: personal/mail/class_mailAccount.inc:706
 #, fuzzy
-msgid "Please select an entry!"
-msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй Ñ\81еÑ\80ийнÑ\8bй номеÑ\80"
+msgid "Permission error"
+msgstr "Ð\9fÑ\80ава длÑ\8f Ñ\87ленов гÑ\80Ñ\83ппÑ\8b"
 
-#: personal/mail/class_mailAccount.inc:370
+#: personal/mail/class_mailAccount.inc:649
+#: personal/mail/class_mailAccount.inc:662
+#: personal/mail/class_mailAccount.inc:693
+#: personal/mail/class_mailAccount.inc:706
 #, fuzzy
-msgid "Cannot add primary address to the list of forwarders!"
-msgstr ""
-"Вы пытаетесь добавить некорректный адрес электронной почты к списку тех, "
-"кому должны пересылаться сообщения."
-
-#: personal/mail/class_mailAccount.inc:420
-#, fuzzy, php-format
-msgid "Address is already in use by user '%s'."
-msgstr "Добавляемый вами адрес уже используется пользователем"
+msgid "You have no permission to modify these addresses!"
+msgstr "У вас недостаточно прав для удаления этого подразделения."
 
-#: personal/mail/class_mailAccount.inc:966
-#: personal/mail/class_mailAccount.inc:974
-#: personal/mail/class_mailAccount.inc:1361
+#: personal/mail/class_mailAccount.inc:1096
+#: personal/mail/class_mailAccount.inc:1104
+#: personal/mail/class_mailAccount.inc:1255
 #, fuzzy
 msgid "Mail reject size"
 msgstr "Размер квоты"
 
-#: personal/mail/class_mailAccount.inc:978
-#: personal/mail/class_mailAccount.inc:1368
+#: personal/mail/class_mailAccount.inc:1108
+#: personal/mail/class_mailAccount.inc:1262
 #, fuzzy
 msgid "Spam folder"
 msgstr "в папку"
 
-#: personal/mail/class_mailAccount.inc:982
-#: personal/mail/class_mailAccount.inc:1373
+#: personal/mail/class_mailAccount.inc:1114
+#: personal/mail/class_mailAccount.inc:1267
 #, fuzzy
 msgid "Vacation interval"
 msgstr "Сообщение автоответчика"
 
-#: personal/mail/class_mailAccount.inc:1027
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1072
-#: personal/mail/class_mailAccount.inc:1083
-#, fuzzy
-msgid "Permission error"
-msgstr "Права для членов группы"
-
-#: personal/mail/class_mailAccount.inc:1027
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1072
-#: personal/mail/class_mailAccount.inc:1083
-#, fuzzy
-msgid "You have no permission to modify these addresses!"
-msgstr "У вас недостаточно прав для удаления этого подразделения."
-
-#: personal/mail/class_mailAccount.inc:1148
-msgid "Waiting for kolab to remove mail properties..."
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:1150
-msgid ""
-"Please remove the mail settings first to allow kolab to call its remove "
-"methods!"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:1175
+#: personal/mail/class_mailAccount.inc:1391
 msgid "My account"
 msgstr "Моя учетная запись"
 
-#: personal/mail/class_mailAccount.inc:1184
+#: personal/mail/class_mailAccount.inc:1400
 #, fuzzy
 msgid "Add vacation information"
 msgstr "Информация об организации"
 
-#: personal/mail/class_mailAccount.inc:1187
+#: personal/mail/class_mailAccount.inc:1403
 msgid "Use spam filter"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1188
+#: personal/mail/class_mailAccount.inc:1404
 #, fuzzy
 msgid "Spam level"
 msgstr "Уровень информативности"
 
-#: personal/mail/class_mailAccount.inc:1189
+#: personal/mail/class_mailAccount.inc:1405
 #, fuzzy
 msgid "Spam mail box"
 msgstr "Размер квоты"
 
-#: personal/mail/class_mailAccount.inc:1191
+#: personal/mail/class_mailAccount.inc:1407
 #, fuzzy
 msgid "Sieve management"
 msgstr "Название"
 
-#: personal/mail/class_mailAccount.inc:1193
+#: personal/mail/class_mailAccount.inc:1409
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "Отклонять сообщения размером больше"
 
-#: personal/mail/class_mailAccount.inc:1196
-#: personal/mail/class_mailAccount.inc:1201
+#: personal/mail/class_mailAccount.inc:1412
+#: personal/mail/class_mailAccount.inc:1417
 #, fuzzy
 msgid "Forwarding address"
 msgstr "Основной адрес"
 
-#: personal/mail/class_mailAccount.inc:1197
+#: personal/mail/class_mailAccount.inc:1413
 #, fuzzy
 msgid "Local delivery"
 msgstr "Последняя доставка"
 
-#: personal/mail/class_mailAccount.inc:1198
+#: personal/mail/class_mailAccount.inc:1414
 #, fuzzy
 msgid "No delivery to own mailbox "
 msgstr "Не оставлять копии в своем почтовом ящике"
 
-#: personal/mail/class_mailAccount.inc:1199
+#: personal/mail/class_mailAccount.inc:1415
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "Альтернативные адреса"
@@ -2184,47 +2127,42 @@ msgstr "Альтернативные адреса"
 msgid "User mail settings"
 msgstr "Почтовые настройки пользователя"
 
-#: personal/mail/class_mail-methods-cyrus.inc:62
+#: personal/mail/class_mail-methods.inc:112
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:374
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:600
+#: personal/mail/class_mail-methods.inc:601
+#, fuzzy
+msgid "None"
+msgstr "нет"
+
+#: personal/mail/class_mail-methods-cyrus.inc:37
 msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:80
-#: personal/mail/class_mail-methods-cyrus.inc:178
-#: personal/mail/class_mail-methods-cyrus.inc:197
-#: personal/mail/class_mail-methods-cyrus.inc:263
+#: personal/mail/class_mail-methods-cyrus.inc:199
 #, fuzzy
 msgid "IMAP error"
 msgstr "Ошибка LDAP:"
 
-#: personal/mail/class_mail-methods-cyrus.inc:80
-#, fuzzy
-msgid "Cannot store mail settings on IMAP server!"
-msgstr "Не могу открыть файл на сервере."
-
-#: personal/mail/class_mail-methods-cyrus.inc:178
-#, fuzzy, php-format
-msgid "Cannot create IMAP mailbox: %s"
-msgstr "Не удается создать почтовый ящик IMAP. Ответ сервера: \"%s\"."
-
-#: personal/mail/class_mail-methods-cyrus.inc:197
+#: personal/mail/class_mail-methods-cyrus.inc:199
 #, fuzzy, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr "Не удается удалить почтовый ящик IMAP. Ответ сервера: '%s'."
 
-#: personal/mail/class_mail-methods-cyrus.inc:223
-msgid "Cannot remove IMAP ACL: imap_getacl not implemented!"
-msgstr ""
-
-#: personal/mail/class_mail-methods-cyrus.inc:241
-msgid "Cannot retrieve IMAP ACL: imap_getacl not implemented!"
+#: personal/mail/class_mail-methods-cyrus.inc:328
+#: personal/mail/class_mail-methods-cyrus.inc:365
+msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:263
-#, fuzzy, php-format
-msgid "Cannot remove IMAP mailbox: %s"
-msgstr "Не удается удалить почтовый ящик IMAP. Ответ сервера: '%s'."
-
-#: personal/mail/class_mail-methods-cyrus.inc:378
+#: personal/mail/class_mail-methods-cyrus.inc:538
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
@@ -2450,6 +2388,125 @@ msgstr "Отправитель"
 msgid "Display header of this message"
 msgstr "Показать совпадения номеров"
 
+#, fuzzy
+#~ msgid "Cannot connect mail method: %s"
+#~ msgstr "Удалить"
+
+#, fuzzy
+#~ msgid "Cannot remove mailbox: %s."
+#~ msgstr "Не удается удалить почтовый ящик IMAP. Ответ сервера: '%s'."
+
+#, fuzzy
+#~ msgid "Cannot update mailbox: %s."
+#~ msgstr "Не удается создать почтовый ящик IMAP. Ответ сервера: \"%s\"."
+
+#, fuzzy
+#~ msgid "Cannot write quota settings: %s."
+#~ msgstr "Удалить"
+
+#, fuzzy
+#~ msgid "Cannot get list of mailboxes! Error was: %s."
+#~ msgstr "Не удается удалить почтовый ящик IMAP. Ответ сервера: '%s'."
+
+#, fuzzy
+#~ msgid "Cannot connect mail method! Error was: %s."
+#~ msgstr "Удалить"
+
+#, fuzzy
+#~ msgid "Cannot remove mailbox! Error was: %s."
+#~ msgstr "Не удается удалить почтовый ящик IMAP. Ответ сервера: '%s'."
+
+#, fuzzy
+#~ msgid "Cannot update mailbox! Error was: %s."
+#~ msgstr "Не удается создать почтовый ящик IMAP. Ответ сервера: \"%s\"."
+
+#, fuzzy
+#~ msgid "Specify the mail server where the user will  be hosted on"
+#~ msgstr "Выберите почтовый сервер для учетной записи пользователя"
+
+#~ msgid "Select mail server to place user on"
+#~ msgstr "Выберите почтовый сервер для пользователя"
+
+#~ msgid "not defined"
+#~ msgstr "не определена"
+
+#~ msgid "read"
+#~ msgstr "чтение"
+
+#~ msgid "post"
+#~ msgstr "отправка"
+
+#~ msgid "external post"
+#~ msgstr "отправка (внешн.)"
+
+#~ msgid "append"
+#~ msgstr "добавление"
+
+#~ msgid "write"
+#~ msgstr "запись"
+
+#, fuzzy
+#~ msgid "admin"
+#~ msgstr "DN администратора"
+
+#, fuzzy
+#~ msgid "mail"
+#~ msgstr "Почта"
+
+#, fuzzy
+#~ msgid "forward address"
+#~ msgstr "Основной адрес"
+
+#, fuzzy
+#~ msgid "Cannot forward to users own mail address!"
+#~ msgstr "Вы пытаетесь добавить некорректный адрес электронной почты "
+
+#, fuzzy
+#~ msgid "Alternate address"
+#~ msgstr "Альтернативные адреса"
+
+#~ msgid "Add"
+#~ msgstr "Добавить"
+
+#, fuzzy
+#~ msgid "Unspecified"
+#~ msgstr "не определена"
+
+#, fuzzy
+#~ msgid "Mails"
+#~ msgstr "Почта"
+
+#, fuzzy
+#~ msgid "Tasks"
+#~ msgstr "Выберите тип мыши"
+
+#, fuzzy
+#~ msgid "Journals"
+#~ msgstr "час"
+
+#, fuzzy
+#~ msgid "Contacts"
+#~ msgstr "Контакт"
+
+#, fuzzy
+#~ msgid "Notes"
+#~ msgstr "нет"
+
+#, fuzzy
+#~ msgid "Drafts"
+#~ msgstr "Дата"
+
+#, fuzzy
+#~ msgid "Sent items"
+#~ msgstr "Состояние системы"
+
+#, fuzzy
+#~ msgid "Junk mail"
+#~ msgstr "Группа"
+
+#~ msgid "Mail options"
+#~ msgstr "Почтовые настройки"
+
 #, fuzzy
 #~ msgid "You have no permission to submit a '%s' command!"
 #~ msgstr "У вас недостаточно прав для создания пользователя в этой ветке."

diff --git a/gosa-plugins/mail/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/zh/LC_MESSAGES/messages.po
index cc1d673e0750a9be77a8b56ccb1f8a23938afe17..d84c943ea26c1e78c7c70efe469f949c4227e3fc 100644 (file)
--- a/gosa-plugins/mail/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/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: 2008-12-03 15:05+0100\n"
+"POT-Creation-Date: 2008-12-10 10:53+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -20,9 +20,10 @@ msgstr ""
 msgid "Mail distribution list"
 msgstr "邮件传递列表"
 
-#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/mail.tpl:10
-#: admin/groups/mail/paste_mail.tpl:8 personal/mail/copypaste.tpl:7
-#: personal/mail/generic.tpl:8 personal/mail/class_mailAccount.inc:931
+#: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/mail.tpl:7
+#: admin/groups/mail/paste_mail.tpl:8
+#: admin/groups/mail/class_groupMail.inc:784 personal/mail/copypaste.tpl:7
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1060
 msgid "Primary address"
 msgstr "主要地址"
 
@@ -31,7 +32,6 @@ msgid "Primary mail address for this distribution list"
 msgstr "此分配列表的主要邮件地址"
 
 #: admin/ogroups/mail/class_mailogroup.inc:50
-#: admin/groups/mail/class_groupMail.inc:390
 msgid "Remove mail account"
 msgstr "删除邮件账号"
 
@@ -42,31 +42,30 @@ msgid "mail group"
 msgstr "显示邮件组"
 
 #: admin/ogroups/mail/class_mailogroup.inc:53
-#: admin/groups/mail/class_groupMail.inc:393
 msgid "Create mail account"
 msgstr "创建邮件账号"
 
 #: admin/ogroups/mail/class_mailogroup.inc:86
 #: admin/ogroups/mail/class_mailogroup.inc:93
 #: admin/ogroups/mail/class_mailogroup.inc:194
-#: admin/groups/mail/class_groupMail.inc:499
-#: admin/groups/mail/class_groupMail.inc:1084
-#: admin/groups/mail/class_groupMail.inc:1087
-#: admin/groups/mail/class_groupMail.inc:1093
-#: admin/groups/mail/class_groupMail.inc:1295
-#: personal/mail/class_mailAccount.inc:364
-#: personal/mail/class_mailAccount.inc:400
-#: personal/mail/class_mailAccount.inc:408
-#: personal/mail/class_mailAccount.inc:419
-#: personal/mail/class_mailAccount.inc:935
-#: personal/mail/class_mailAccount.inc:939
-#: personal/mail/class_mailAccount.inc:950
-#: personal/mail/class_mailAccount.inc:1180
+#: admin/groups/mail/class_groupMail.inc:325
+#: admin/groups/mail/class_groupMail.inc:360
+#: admin/groups/mail/class_groupMail.inc:366
+#: admin/groups/mail/class_groupMail.inc:375
+#: admin/groups/mail/class_groupMail.inc:786
+#: admin/groups/mail/class_groupMail.inc:917
+#: personal/mail/class_mailAccount.inc:306
+#: personal/mail/class_mailAccount.inc:341
+#: personal/mail/class_mailAccount.inc:346
+#: personal/mail/class_mailAccount.inc:354
+#: personal/mail/class_mailAccount.inc:1064
+#: personal/mail/class_mailAccount.inc:1068
+#: personal/mail/class_mailAccount.inc:1079
+#: personal/mail/class_mailAccount.inc:1396
 msgid "Mail address"
 msgstr "邮件地址"
 
 #: admin/ogroups/mail/class_mailogroup.inc:86
-#: admin/groups/mail/class_groupMail.inc:1087
 msgid "your-name@your-domain.com"
 msgstr ""
 
@@ -76,27 +75,33 @@ msgstr ""
 #: admin/systems/services/spam/class_goSpamServer.inc:277
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/mail/class_goMailServer.inc:582
-#: admin/groups/mail/class_groupMail.inc:794
-#: admin/groups/mail/class_groupMail.inc:1048
-#: personal/mail/class_mailAccount.inc:694
-#: personal/mail/class_mailAccount.inc:862
+#: admin/groups/mail/class_groupMail.inc:501
+#: admin/groups/mail/class_groupMail.inc:716
+#: personal/mail/class_mailAccount.inc:889
+#: personal/mail/class_mailAccount.inc:956
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
 
 #: admin/ogroups/mail/class_mailogroup.inc:186
 #: admin/ogroups/mail/paste_mail.tpl:4
-#: admin/groups/mail/class_groupMail.inc:1287
-#: personal/mail/class_mailAccount.inc:15
-#: personal/mail/class_mailAccount.inc:288
-#: personal/mail/class_mailAccount.inc:298
-#: personal/mail/class_mailAccount.inc:301
-#: personal/mail/class_mailAccount.inc:302
-#: personal/mail/class_mailAccount.inc:305
-#: personal/mail/class_mailAccount.inc:306
-#: personal/mail/class_mailAccount.inc:926
-#: personal/mail/class_mailAccount.inc:1170
-#: personal/mail/class_mailAccount.inc:1346
+#: admin/groups/mail/class_groupMail.inc:257
+#: admin/groups/mail/class_groupMail.inc:259
+#: admin/groups/mail/class_groupMail.inc:260
+#: admin/groups/mail/class_groupMail.inc:265
+#: admin/groups/mail/class_groupMail.inc:267
+#: admin/groups/mail/class_groupMail.inc:268
+#: admin/groups/mail/class_groupMail.inc:774
+#: admin/groups/mail/class_groupMail.inc:909
+#: personal/mail/class_mailAccount.inc:50
+#: personal/mail/class_mailAccount.inc:222
+#: personal/mail/class_mailAccount.inc:230
+#: personal/mail/class_mailAccount.inc:232
+#: personal/mail/class_mailAccount.inc:237
+#: personal/mail/class_mailAccount.inc:239
+#: personal/mail/class_mailAccount.inc:1048
+#: personal/mail/class_mailAccount.inc:1240
+#: personal/mail/class_mailAccount.inc:1386
 msgid "Mail"
 msgstr "邮件"
 
@@ -224,7 +229,7 @@ msgid "Start POP3 SSL service"
 msgstr "POP3/SSL 服务器"
 
 #: admin/systems/services/imap/goImapServer.tpl:1
-#: admin/systems/services/mail/goMailServer.tpl:1 admin/groups/mail/mail.tpl:7
+#: admin/systems/services/mail/goMailServer.tpl:1 admin/groups/mail/mail.tpl:4
 #: personal/mail/generic.tpl:5
 msgid "Generic"
 msgstr "通用配置"
@@ -273,22 +278,24 @@ msgstr "Spamassassin"
 
 #: admin/systems/services/spam/class_goSpamServer.inc:143
 #: admin/systems/services/spam/class_goSpamServer.inc:216
-#: admin/groups/mail/class_groupMail.inc:464
-#: admin/groups/mail/class_groupMail.inc:468
-#: admin/groups/mail/class_groupMail.inc:494
-#: admin/groups/mail/class_groupMail.inc:499
+#: admin/groups/mail/class_groupMail.inc:312
+#: admin/groups/mail/class_groupMail.inc:325
+#: admin/groups/mail/class_groupMail.inc:331
+#: admin/groups/mail/class_groupMail.inc:360
+#: admin/groups/mail/class_groupMail.inc:366
+#: admin/groups/mail/class_groupMail.inc:375
 #: personal/mail/sieve/class_sieveManagement.inc:201
 #: personal/mail/sieve/class_sieveManagement.inc:206
 #: personal/mail/sieve/class_sieveManagement.inc:212
 #: personal/mail/sieve/class_sieveManagement.inc:218
 #: personal/mail/sieve/class_sieveManagement.inc:429
 #: personal/mail/sieve/class_My_Tree.inc:660
-#: personal/mail/class_mailAccount.inc:347
-#: personal/mail/class_mailAccount.inc:363
-#: personal/mail/class_mailAccount.inc:370
-#: personal/mail/class_mailAccount.inc:399
-#: personal/mail/class_mailAccount.inc:407
-#: personal/mail/class_mailAccount.inc:419
+#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:306
+#: personal/mail/class_mailAccount.inc:312
+#: personal/mail/class_mailAccount.inc:341
+#: personal/mail/class_mailAccount.inc:346
+#: personal/mail/class_mailAccount.inc:354
 #: addons/mailqueue/class_mailqueue.inc:110
 #: addons/mailqueue/class_mailqueue.inc:144
 #: addons/mailqueue/class_mailqueue.inc:150
@@ -362,7 +369,6 @@ msgstr "选择将邮件标记为垃圾邮件需要的分值"
 #: admin/systems/services/spam/goSpamServer.tpl:48
 #: admin/systems/services/mail/goMailServer.tpl:73
 #: admin/systems/services/mail/goMailServer.tpl:104
-#: admin/groups/mail/class_groupMail.inc:654
 msgid "Remove"
 msgstr "删除"
 
@@ -618,116 +624,100 @@ msgstr "节"
 msgid "Restriction filter"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:14 personal/mail/generic.tpl:11
-msgid "Multiple edit"
-msgstr ""
-
-#: admin/groups/mail/mail.tpl:17 admin/groups/mail/paste_mail.tpl:12
-msgid "Primary mail address for this shared folder"
-msgstr "此共享目录的主要邮件地址"
-
-#: admin/groups/mail/mail.tpl:23 personal/mail/generic.tpl:20
+#: admin/groups/mail/mail.tpl:35 personal/mail/generic.tpl:30
 #: addons/mailqueue/contents.tpl:73
 msgid "Server"
 msgstr "服务器"
 
-#: admin/groups/mail/mail.tpl:26
-msgid "Select mail server to place user on"
-msgstr "选择放置用户的邮件服务器"
+#: admin/groups/mail/mail.tpl:39 personal/mail/generic.tpl:37
+msgid "Specify the mail server where the user will be hosted on"
+msgstr "描述该用户账号所要创建于的邮件服务器"
 
-#: admin/groups/mail/mail.tpl:36 personal/mail/generic.tpl:34
+#: admin/groups/mail/mail.tpl:52 personal/mail/generic.tpl:53
 msgid "Quota usage"
 msgstr "使用 Quota"
 
-#: admin/groups/mail/mail.tpl:43 personal/mail/generic.tpl:41
-msgid "not defined"
-msgstr "未定义"
-
-#: admin/groups/mail/mail.tpl:48 admin/groups/mail/class_groupMail.inc:1099
-#: admin/groups/mail/class_groupMail.inc:1296 personal/mail/generic.tpl:47
-#: personal/mail/class_mailAccount.inc:957
-#: personal/mail/class_mailAccount.inc:1182
-#: personal/mail/class_mailAccount.inc:1352
+#: admin/groups/mail/mail.tpl:56 admin/groups/mail/class_groupMail.inc:793
+#: admin/groups/mail/class_groupMail.inc:918 personal/mail/generic.tpl:57
+#: personal/mail/class_mailAccount.inc:1087
+#: personal/mail/class_mailAccount.inc:1246
+#: personal/mail/class_mailAccount.inc:1398
 msgid "Quota size"
 msgstr "Quota 大小"
 
-#: admin/groups/mail/mail.tpl:53 personal/mail/generic.tpl:234
-msgid "MB"
-msgstr "MB"
-
-#: admin/groups/mail/mail.tpl:59 admin/groups/mail/class_groupMail.inc:1298
+#: admin/groups/mail/mail.tpl:69 admin/groups/mail/class_groupMail.inc:920
 #, fuzzy
 msgid "Folder type"
 msgstr "过滤器"
 
-#: admin/groups/mail/mail.tpl:85
+#: admin/groups/mail/mail.tpl:87
 #, fuzzy
 msgid "Reload"
 msgstr "读"
 
-#: admin/groups/mail/mail.tpl:102 admin/groups/mail/paste_mail.tpl:23
-#: personal/mail/copypaste.tpl:25 personal/mail/generic.tpl:64
+#: admin/groups/mail/mail.tpl:98 admin/groups/mail/paste_mail.tpl:23
+#: personal/mail/copypaste.tpl:25 personal/mail/generic.tpl:73
 msgid "Alternative addresses"
 msgstr "替代地址"
 
-#: admin/groups/mail/mail.tpl:105 admin/groups/mail/paste_mail.tpl:24
-#: personal/mail/copypaste.tpl:55 personal/mail/generic.tpl:67
+#: admin/groups/mail/mail.tpl:103 admin/groups/mail/paste_mail.tpl:24
+#: personal/mail/copypaste.tpl:55 personal/mail/generic.tpl:76
 msgid "List of alternative mail addresses"
 msgstr "替代邮件地址列表"
 
-#: admin/groups/mail/mail.tpl:135
+#: admin/groups/mail/mail.tpl:132
 msgid "IMAP shared folders"
 msgstr "IMAP 共享目录"
 
 #: admin/groups/mail/mail.tpl:139
-#, fuzzy
-msgid "Set shared folder permissions"
-msgstr "IMAP 共享目录"
-
-#: admin/groups/mail/mail.tpl:148
 msgid "Default permission"
 msgstr "缺省权限"
 
-#: admin/groups/mail/mail.tpl:159
+#: admin/groups/mail/mail.tpl:141
 msgid "Member permission"
 msgstr "成员权限"
 
-#: admin/groups/mail/mail.tpl:176 personal/mail/generic.tpl:295
+#: admin/groups/mail/mail.tpl:169 personal/mail/generic.tpl:303
 msgid "Advanced mail options"
 msgstr "高级邮件选项"
 
-#: admin/groups/mail/mail.tpl:182 personal/mail/generic.tpl:301
+#: admin/groups/mail/mail.tpl:175 personal/mail/generic.tpl:309
 msgid "Select if user can only send and receive inside his own domain"
 msgstr "选择如果用户只能发送和接收本域内邮件"
 
-#: admin/groups/mail/mail.tpl:184 personal/mail/generic.tpl:303
+#: admin/groups/mail/mail.tpl:177 personal/mail/generic.tpl:311
 msgid "User is only allowed to send and receive local mails"
 msgstr "用户只能发送和接收本地邮件"
 
-#: admin/groups/mail/mail.tpl:193 admin/groups/mail/paste_mail.tpl:34
+#: admin/groups/mail/mail.tpl:186 admin/groups/mail/paste_mail.tpl:34
 msgid "Forward messages to non group members"
 msgstr "转发邮件到非组成员"
 
-#: admin/groups/mail/mail.tpl:202
+#: admin/groups/mail/mail.tpl:195
 #, fuzzy
 msgid "Used in all groups"
 msgstr "请输入一个组。"
 
-#: admin/groups/mail/mail.tpl:205
+#: admin/groups/mail/mail.tpl:198
 #, fuzzy
 msgid "Not used in all groups"
 msgstr "显示实用组"
 
-#: admin/groups/mail/mail.tpl:223 admin/groups/mail/paste_mail.tpl:42
-#: personal/mail/copypaste.tpl:44 personal/mail/generic.tpl:285
+#: admin/groups/mail/mail.tpl:216 admin/groups/mail/paste_mail.tpl:42
+#: personal/mail/copypaste.tpl:44 personal/mail/generic.tpl:290
+#: personal/mail/generic.tpl:293
 msgid "Add local"
 msgstr "添加本地"
 
 #: admin/groups/mail/paste_mail.tpl:1 personal/mail/copypaste.tpl:1
-#: personal/mail/class_mailAccount.inc:1171
+#: personal/mail/class_mailAccount.inc:1387
 msgid "Mail settings"
 msgstr "邮件选项"
 
+#: admin/groups/mail/paste_mail.tpl:12
+msgid "Primary mail address for this shared folder"
+msgstr "此共享目录的主要邮件地址"
+
 #: admin/groups/mail/mail_locals.tpl:6 personal/mail/mail_locals.tpl:7
 msgid "Select addresses to add"
 msgstr "选择地址添加"
@@ -773,213 +763,189 @@ msgid "Choose"
 msgstr "选择"
 
 #: admin/groups/mail/class_groupMail.inc:92
-#: personal/mail/class_mailAccount.inc:94
-#: personal/mail/class_mailAccount.inc:208
+#: admin/groups/mail/class_groupMail.inc:99
+#: admin/groups/mail/class_groupMail.inc:106
+#: admin/groups/mail/class_groupMail.inc:113
+#: admin/groups/mail/class_groupMail.inc:118
+#: admin/groups/mail/class_groupMail.inc:121
+#: admin/groups/mail/class_groupMail.inc:513
+#: admin/groups/mail/class_groupMail.inc:517
+#: admin/groups/mail/class_groupMail.inc:521
+#: admin/groups/mail/class_groupMail.inc:729
+#: admin/groups/mail/class_groupMail.inc:733
+#: admin/groups/mail/class_groupMail.inc:737
+#: admin/groups/mail/class_groupMail.inc:746
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:145
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:902
+#: personal/mail/class_mailAccount.inc:970
+#: personal/mail/class_mailAccount.inc:974
+#: personal/mail/class_mailAccount.inc:978
+#: personal/mail/class_mailAccount.inc:992
 #, fuzzy
-msgid "Configuration error"
-msgstr "é\85\8dç½®æ\96\87件"
+msgid "Mail error"
+msgstr "é\82®ä»¶æ\9c\8då\8a¡å\99¨"
 
 #: admin/groups/mail/class_groupMail.inc:92
+#: personal/mail/class_mailAccount.inc:130
 #, fuzzy, php-format
-msgid "Cannot locate mail method '%s'!"
-msgstr "无法打开文件 '%s'。"
-
-#: admin/groups/mail/class_groupMail.inc:325
-msgid "read"
-msgstr "读"
-
-#: admin/groups/mail/class_groupMail.inc:326
-msgid "post"
-msgstr "贴"
-
-#: admin/groups/mail/class_groupMail.inc:327
-msgid "external post"
-msgstr "外部粘贴"
+msgid "Cannot read quota settings: %s"
+msgstr "无法创建文件 '%s'。"
 
-#: admin/groups/mail/class_groupMail.inc:328
-msgid "append"
-msgstr "附加"
+#: admin/groups/mail/class_groupMail.inc:99
+#: personal/mail/class_mailAccount.inc:137
+#, fuzzy, php-format
+msgid "Cannot get list of mailboxes: %s"
+msgstr "无法删除 IMAP 邮箱。服务器返回 '%s'。"
 
-#: admin/groups/mail/class_groupMail.inc:329
-msgid "write"
-msgstr "写"
+#: admin/groups/mail/class_groupMail.inc:106
+#, fuzzy, php-format
+msgid "Cannot receive folder types: %s"
+msgstr "IMAP 共享目录"
 
-#: admin/groups/mail/class_groupMail.inc:330
-#, fuzzy
-msgid "admin"
-msgstr "管理员"
+#: admin/groups/mail/class_groupMail.inc:113
+#, fuzzy, php-format
+msgid "Cannot receive folder permissions: %s"
+msgstr "IMAP 共享目录"
 
-#: admin/groups/mail/class_groupMail.inc:331
-msgid "none"
-msgstr "无"
+#: admin/groups/mail/class_groupMail.inc:118
+#: admin/groups/mail/class_groupMail.inc:513
+#: admin/groups/mail/class_groupMail.inc:729
+#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:898
+#: personal/mail/class_mailAccount.inc:970
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:382
-#: admin/groups/mail/class_groupMail.inc:391
-#: admin/groups/mail/class_groupMail.inc:394
-#, fuzzy
-msgid "mail"
-msgstr "邮件"
+#: admin/groups/mail/class_groupMail.inc:121
+#: personal/mail/class_mailAccount.inc:145
+#, php-format
+msgid "Mailbox '%s' doesn't exists on mail server: %s"
+msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:404
+#: admin/groups/mail/class_groupMail.inc:278
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
 msgstr "当条目从 LDAP 中删除后，从邮件服务器数据库中删除共享目录"
 
-#: admin/groups/mail/class_groupMail.inc:405
+#: admin/groups/mail/class_groupMail.inc:279
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr "在保存完毕该账号后，删除共享目录和其中所有内容"
 
-#: admin/groups/mail/class_groupMail.inc:464
-#, fuzzy
-msgid "forward address"
-msgstr "主要地址"
-
-#: admin/groups/mail/class_groupMail.inc:468
-#, fuzzy
-msgid "Cannot forward to users own mail address!"
-msgstr "您正在添加一个无效邮件地址"
-
-#: admin/groups/mail/class_groupMail.inc:494
-#, fuzzy
-msgid "Alternate address"
-msgstr "替代地址"
-
-#: admin/groups/mail/class_groupMail.inc:648
-msgid "Add"
-msgstr "添加"
-
-#: admin/groups/mail/class_groupMail.inc:700
-#: admin/groups/mail/class_groupMail.inc:706
+#: admin/groups/mail/class_groupMail.inc:312
+#: personal/mail/class_mailAccount.inc:294
 #, fuzzy
-msgid "Unspecified"
-msgstr "未定义"
-
-#: admin/groups/mail/class_groupMail.inc:700
-#, fuzzy
-msgid "Mails"
-msgstr "邮件"
-
-#: admin/groups/mail/class_groupMail.inc:701
-#, fuzzy
-msgid "Tasks"
-msgstr "任务"
+msgid "Please select an entry!"
+msgstr "请选择一个有效的邮件服务器。"
 
-#: admin/groups/mail/class_groupMail.inc:701
+#: admin/groups/mail/class_groupMail.inc:331
+#: personal/mail/class_mailAccount.inc:312
 #, fuzzy
-msgid "Journals"
-msgstr "小时"
-
-#: admin/groups/mail/class_groupMail.inc:702
-msgid "Calendar"
-msgstr ""
+msgid "Cannot add primary address to the list of forwarders!"
+msgstr "您正在尝试向转发列表添加一条无效邮件地址。"
 
-#: admin/groups/mail/class_groupMail.inc:702
-msgid "Contacts"
-msgstr "联系"
+#: admin/groups/mail/class_groupMail.inc:376
+#: personal/mail/class_mailAccount.inc:355
+#, fuzzy, php-format
+msgid "Address is already in use by user '%s'."
+msgstr "您正在添加的地址已经被用户使用"
 
-#: admin/groups/mail/class_groupMail.inc:703
-#, fuzzy
-msgid "Notes"
-msgstr "否"
+#: admin/groups/mail/class_groupMail.inc:402
+#: personal/mail/class_mailAccount.inc:384
+msgid "Unknown"
+msgstr "未知"
 
-#: admin/groups/mail/class_groupMail.inc:706
-#, fuzzy
-msgid "Inbox"
-msgstr "索引"
+#: admin/groups/mail/class_groupMail.inc:517
+#: personal/mail/class_mailAccount.inc:902
+#, fuzzy, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr "无法删除 IMAP 邮箱。服务器返回 '%s'。"
 
-#: admin/groups/mail/class_groupMail.inc:707
-#, fuzzy
-msgid "Drafts"
-msgstr "日期"
+#: admin/groups/mail/class_groupMail.inc:521
+#: admin/groups/mail/class_groupMail.inc:746
+#, fuzzy, php-format
+msgid "Cannot update shared folder permissions: %s"
+msgstr "IMAP 共享目录"
 
-#: admin/groups/mail/class_groupMail.inc:707
+#: admin/groups/mail/class_groupMail.inc:611
 #, fuzzy
-msgid "Sent items"
-msgstr "系统状态"
+msgid "New"
+msgstr "添加用户"
 
-#: admin/groups/mail/class_groupMail.inc:708
-#, fuzzy
-msgid "Junk mail"
-msgstr "组名"
+#: admin/groups/mail/class_groupMail.inc:733
+#: personal/mail/class_mailAccount.inc:974
+#, fuzzy, php-format
+msgid "Cannot update mailbox: %s"
+msgstr "无法创建 IMAP 邮箱。服务器返回 '%s'。"
 
-#: admin/groups/mail/class_groupMail.inc:710
-#: personal/mail/sieve/class_sieveElement_If.inc:27
-#: personal/mail/sieve/class_sieveElement_If.inc:33
-#, fuzzy
-msgid "Default"
-msgstr "缺省"
+#: admin/groups/mail/class_groupMail.inc:737
+#: personal/mail/class_mailAccount.inc:978
+#, fuzzy, php-format
+msgid "Cannot write quota settings: %s"
+msgstr "无法创建文件 '%s'。"
 
-#: admin/groups/mail/class_groupMail.inc:1108
-#: personal/mail/class_mailAccount.inc:1194
+#: admin/groups/mail/class_groupMail.inc:802
+#: personal/mail/class_mailAccount.inc:1410
 #, fuzzy
 msgid "Mail max size"
 msgstr "邮件大小"
 
-#: admin/groups/mail/class_groupMail.inc:1116
+#: admin/groups/mail/class_groupMail.inc:810
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "为了退信，您需要设定最大的邮件大小。"
 
-#: admin/groups/mail/class_groupMail.inc:1120
-msgid ""
-"Please choose valid permission settings. Default permission can't be emtpy."
-msgstr "请选择一个有效的权限设置。缺省权限不能为空。"
-
-#: admin/groups/mail/class_groupMail.inc:1124
-#: admin/groups/mail/class_groupMail.inc:1297
-#: personal/mail/class_mailAccount.inc:1181
+#: admin/groups/mail/class_groupMail.inc:814
+#: admin/groups/mail/class_groupMail.inc:919
+#: personal/mail/class_mailAccount.inc:1397
 msgid "Mail server"
 msgstr "邮件服务器"
 
-#: admin/groups/mail/class_groupMail.inc:1288
+#: admin/groups/mail/class_groupMail.inc:910
 #, fuzzy
 msgid "Group mail"
 msgstr "组名"
 
-#: admin/groups/mail/class_groupMail.inc:1298
+#: admin/groups/mail/class_groupMail.inc:920
 msgid "Kolab"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1299
+#: admin/groups/mail/class_groupMail.inc:921
 #, fuzzy
 msgid "Alternate addresses"
 msgstr "替代地址"
 
-#: admin/groups/mail/class_groupMail.inc:1300
+#: admin/groups/mail/class_groupMail.inc:922
 #, fuzzy
 msgid "Forwarding addresses"
 msgstr "转发邮件到"
 
-#: admin/groups/mail/class_groupMail.inc:1301
+#: admin/groups/mail/class_groupMail.inc:923
 #, fuzzy
 msgid "Only local"
 msgstr "添加本地"
 
-#: admin/groups/mail/class_groupMail.inc:1302
+#: admin/groups/mail/class_groupMail.inc:924
 msgid "Permissions"
 msgstr "允许"
 
-#: personal/mail/copypaste.tpl:13 personal/mail/generic.tpl:262
+#: personal/mail/copypaste.tpl:13 personal/mail/generic.tpl:267
 msgid "Forward messages to"
 msgstr "转发邮件到"
 
-#: personal/mail/generic.tpl:23
-msgid "Specify the mail server where the user will be hosted on"
-msgstr "描述该用户账号所要创建于的邮件服务器"
-
-#: personal/mail/generic.tpl:92
-msgid "Mail options"
-msgstr "邮件选项"
-
-#: personal/mail/generic.tpl:124 personal/mail/class_mailAccount.inc:1202
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1418
 msgid "Use custom sieve script"
 msgstr "定制过滤脚本"
 
-#: personal/mail/generic.tpl:124
+#: personal/mail/generic.tpl:115
 msgid "disables all Mail options!"
 msgstr "禁用所有邮件选项！"
 
-#: personal/mail/generic.tpl:131
+#: personal/mail/generic.tpl:123
 #, fuzzy
 msgid "Sieve Management"
 msgstr "管理"
@@ -992,53 +958,58 @@ msgstr "如果您想转发邮件而且不想保留拷贝的话，请选择"
 msgid "No delivery to own mailbox"
 msgstr "不要发送到本人邮箱"
 
-#: personal/mail/generic.tpl:150
+#: personal/mail/generic.tpl:151
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr "选择用下面定义的假期信息作为自动回复"
 
-#: personal/mail/generic.tpl:152
+#: personal/mail/generic.tpl:153
 msgid "Activate vacation message"
 msgstr "启用假期信息"
 
-#: personal/mail/generic.tpl:160
+#: personal/mail/generic.tpl:161
 msgid "from"
 msgstr "从"
 
-#: personal/mail/generic.tpl:183
+#: personal/mail/generic.tpl:185
 msgid "till"
 msgstr "至"
 
-#: personal/mail/generic.tpl:212
+#: personal/mail/generic.tpl:214
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr "选择用 spamassassin 过滤邮件"
 
-#: personal/mail/generic.tpl:214
+#: personal/mail/generic.tpl:216
 msgid "Move mails tagged with spam level greater than"
 msgstr "过滤邮件当 spam 级别超过"
 
-#: personal/mail/generic.tpl:217
+#: personal/mail/generic.tpl:219
+#, fuzzy
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr "选择 spam 级别 ─ 越小越敏感"
 
-#: personal/mail/generic.tpl:221
+#: personal/mail/generic.tpl:223
 msgid "to folder"
 msgstr "到目录"
 
-#: personal/mail/generic.tpl:232
+#: personal/mail/generic.tpl:235
 msgid "Reject mails bigger than"
 msgstr "拒绝邮件大小超过"
 
-#: personal/mail/generic.tpl:241
+#: personal/mail/generic.tpl:238
+msgid "MB"
+msgstr "MB"
+
+#: personal/mail/generic.tpl:245
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/templates/object_container.tpl:31
-#: personal/mail/class_mailAccount.inc:1185
+#: personal/mail/class_mailAccount.inc:1401
 msgid "Vacation message"
 msgstr "假期信息"
 
-#: personal/mail/generic.tpl:256
+#: personal/mail/generic.tpl:261
 #: personal/mail/sieve/templates/import_script.tpl:12
 #: personal/mail/sieve/templates/edit_frame_base.tpl:7
 msgid "Import"
@@ -1100,10 +1071,6 @@ msgstr "该名称已经被使用。"
 #: personal/mail/sieve/class_sieveManagement.inc:770
 #: personal/mail/sieve/class_sieveManagement.inc:1030
 #: personal/mail/sieve/class_sieveManagement.inc:1043
-#: personal/mail/class_mail-methods-cyrus.inc:291
-#: personal/mail/class_mail-methods-cyrus.inc:303
-#: personal/mail/class_mail-methods-cyrus.inc:374
-#: personal/mail/class_mail-methods-cyrus.inc:378
 #, fuzzy
 msgid "SIEVE error"
 msgstr "错误"
@@ -1111,13 +1078,12 @@ msgstr "错误"
 #: personal/mail/sieve/class_sieveManagement.inc:302
 #: personal/mail/sieve/class_sieveManagement.inc:345
 #: personal/mail/sieve/class_sieveManagement.inc:1030
-#: personal/mail/class_mail-methods-cyrus.inc:291
 #, fuzzy, php-format
 msgid "Cannot log into SIEVE server: %s"
 msgstr "无法登录到 SIEVE 服务器。服务器返回 '%s'。"
 
 #: personal/mail/sieve/class_sieveManagement.inc:309
-#: personal/mail/class_mail-methods-cyrus.inc:303
+#: personal/mail/class_mail-methods-cyrus.inc:443
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
@@ -1137,8 +1103,6 @@ msgid "Uploaded script is empty!"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:431
-#: personal/mail/class_mail-methods-cyrus.inc:223
-#: personal/mail/class_mail-methods-cyrus.inc:241
 #, fuzzy
 msgid "Internal error"
 msgstr "终端服务器"
@@ -1327,7 +1291,7 @@ msgid "Cannot insert element at the requested position!"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:1043
-#: personal/mail/class_mail-methods-cyrus.inc:374
+#: personal/mail/class_mail-methods-cyrus.inc:531
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
@@ -1645,7 +1609,6 @@ msgstr "更新"
 
 #: personal/mail/sieve/templates/remove_script.tpl:2
 #: personal/mail/sieve/class_My_Tree.inc:245
-#: personal/mail/class_mail-methods-cyrus.inc:62
 msgid "Warning"
 msgstr "警告"
 
@@ -1811,6 +1774,12 @@ msgstr ""
 msgid "Complete address"
 msgstr "邮件地址"
 
+#: personal/mail/sieve/class_sieveElement_If.inc:27
+#: personal/mail/sieve/class_sieveElement_If.inc:33
+#, fuzzy
+msgid "Default"
+msgstr "缺省"
+
 #: personal/mail/sieve/class_sieveElement_If.inc:28
 #, fuzzy
 msgid "Domain part"
@@ -1996,138 +1965,108 @@ msgstr "删除记录"
 msgid "Require must be the first command in the script."
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:16
+#: personal/mail/class_mailAccount.inc:51
 #: addons/mailqueue/class_mailqueue.inc:7
 #, fuzzy
 msgid "This does something"
 msgstr "******"
 
-#: personal/mail/class_mailAccount.inc:94
-#, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr ""
+#: personal/mail/class_mailAccount.inc:620
+#: personal/mail/class_mail-methods.inc:111
+#: personal/mail/class_mail-methods.inc:373
+#, fuzzy
+msgid "Configuration error"
+msgstr "配置文件"
 
-#: personal/mail/class_mailAccount.inc:208
+#: personal/mail/class_mailAccount.inc:620
 #, fuzzy, php-format
 msgid "No DESC tag in vacation template '%s'!"
 msgstr "假期文件没有 DESC 标签："
 
-#: personal/mail/class_mailAccount.inc:299
+#: personal/mail/class_mailAccount.inc:649
+#: personal/mail/class_mailAccount.inc:662
+#: personal/mail/class_mailAccount.inc:693
+#: personal/mail/class_mailAccount.inc:706
 #, fuzzy
-msgid "Mail settings cannot be removed while there are delegations configured!"
-msgstr "这个账号不能被删除因为还有代理人配置。先删除这些代理人。"
-
-#: personal/mail/class_mailAccount.inc:347
-#, fuzzy
-msgid "Please select an entry!"
-msgstr "请选择一个有效的邮件服务器。"
+msgid "Permission error"
+msgstr "允许"
 
-#: personal/mail/class_mailAccount.inc:370
+#: personal/mail/class_mailAccount.inc:649
+#: personal/mail/class_mailAccount.inc:662
+#: personal/mail/class_mailAccount.inc:693
+#: personal/mail/class_mailAccount.inc:706
 #, fuzzy
-msgid "Cannot add primary address to the list of forwarders!"
-msgstr "您正在尝试向转发列表添加一条无效邮件地址。"
-
-#: personal/mail/class_mailAccount.inc:420
-#, fuzzy, php-format
-msgid "Address is already in use by user '%s'."
-msgstr "您正在添加的地址已经被用户使用"
+msgid "You have no permission to modify these addresses!"
+msgstr "您无权删除这个部门。"
 
-#: personal/mail/class_mailAccount.inc:966
-#: personal/mail/class_mailAccount.inc:974
-#: personal/mail/class_mailAccount.inc:1361
+#: personal/mail/class_mailAccount.inc:1096
+#: personal/mail/class_mailAccount.inc:1104
+#: personal/mail/class_mailAccount.inc:1255
 #, fuzzy
 msgid "Mail reject size"
 msgstr "邮件大小"
 
-#: personal/mail/class_mailAccount.inc:978
-#: personal/mail/class_mailAccount.inc:1368
+#: personal/mail/class_mailAccount.inc:1108
+#: personal/mail/class_mailAccount.inc:1262
 #, fuzzy
 msgid "Spam folder"
 msgstr "到目录"
 
-#: personal/mail/class_mailAccount.inc:982
-#: personal/mail/class_mailAccount.inc:1373
+#: personal/mail/class_mailAccount.inc:1114
+#: personal/mail/class_mailAccount.inc:1267
 #, fuzzy
 msgid "Vacation interval"
 msgstr "假期信息"
 
-#: personal/mail/class_mailAccount.inc:1027
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1072
-#: personal/mail/class_mailAccount.inc:1083
-#, fuzzy
-msgid "Permission error"
-msgstr "允许"
-
-#: personal/mail/class_mailAccount.inc:1027
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1072
-#: personal/mail/class_mailAccount.inc:1083
-#, fuzzy
-msgid "You have no permission to modify these addresses!"
-msgstr "您无权删除这个部门。"
-
-#: personal/mail/class_mailAccount.inc:1148
-#, fuzzy
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "等待 kolab 来删除邮件属性。"
-
-#: personal/mail/class_mailAccount.inc:1150
-#, fuzzy
-msgid ""
-"Please remove the mail settings first to allow kolab to call its remove "
-"methods!"
-msgstr "请先删除邮件账号，以允许 kolab 调用自己的删除方法。"
-
-#: personal/mail/class_mailAccount.inc:1175
+#: personal/mail/class_mailAccount.inc:1391
 msgid "My account"
 msgstr "我的账号"
 
-#: personal/mail/class_mailAccount.inc:1184
+#: personal/mail/class_mailAccount.inc:1400
 #, fuzzy
 msgid "Add vacation information"
 msgstr "组织信息"
 
-#: personal/mail/class_mailAccount.inc:1187
+#: personal/mail/class_mailAccount.inc:1403
 msgid "Use spam filter"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1188
+#: personal/mail/class_mailAccount.inc:1404
 #, fuzzy
 msgid "Spam level"
 msgstr "日志级别"
 
-#: personal/mail/class_mailAccount.inc:1189
+#: personal/mail/class_mailAccount.inc:1405
 msgid "Spam mail box"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1191
+#: personal/mail/class_mailAccount.inc:1407
 #, fuzzy
 msgid "Sieve management"
 msgstr "系统管理"
 
-#: personal/mail/class_mailAccount.inc:1193
+#: personal/mail/class_mailAccount.inc:1409
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "拒绝邮件大小超过"
 
-#: personal/mail/class_mailAccount.inc:1196
-#: personal/mail/class_mailAccount.inc:1201
+#: personal/mail/class_mailAccount.inc:1412
+#: personal/mail/class_mailAccount.inc:1417
 #, fuzzy
 msgid "Forwarding address"
 msgstr "主要地址"
 
-#: personal/mail/class_mailAccount.inc:1197
+#: personal/mail/class_mailAccount.inc:1413
 #, fuzzy
 msgid "Local delivery"
 msgstr "最后传递"
 
-#: personal/mail/class_mailAccount.inc:1198
+#: personal/mail/class_mailAccount.inc:1414
 #, fuzzy
 msgid "No delivery to own mailbox "
 msgstr "不要发送到本人邮箱"
 
-#: personal/mail/class_mailAccount.inc:1199
+#: personal/mail/class_mailAccount.inc:1415
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "替代地址"
@@ -2136,47 +2075,43 @@ msgstr "替代地址"
 msgid "User mail settings"
 msgstr "用户邮件选项"
 
-#: personal/mail/class_mail-methods-cyrus.inc:62
+#: personal/mail/class_mail-methods.inc:112
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:374
+#, php-format
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:600
+#: personal/mail/class_mail-methods.inc:601
+#, fuzzy
+msgid "None"
+msgstr "无"
+
+#: personal/mail/class_mail-methods-cyrus.inc:37
 #, fuzzy
 msgid "Mail server for this account is invalid!"
 msgstr "该账号邮件大小不受限制"
 
-#: personal/mail/class_mail-methods-cyrus.inc:80
-#: personal/mail/class_mail-methods-cyrus.inc:178
-#: personal/mail/class_mail-methods-cyrus.inc:197
-#: personal/mail/class_mail-methods-cyrus.inc:263
+#: personal/mail/class_mail-methods-cyrus.inc:199
 #, fuzzy
 msgid "IMAP error"
 msgstr "LDAP 错误:"
 
-#: personal/mail/class_mail-methods-cyrus.inc:80
-msgid "Cannot store mail settings on IMAP server!"
-msgstr ""
-
-#: personal/mail/class_mail-methods-cyrus.inc:178
-#, fuzzy, php-format
-msgid "Cannot create IMAP mailbox: %s"
-msgstr "无法创建 IMAP 邮箱。服务器返回 '%s'。"
-
-#: personal/mail/class_mail-methods-cyrus.inc:197
+#: personal/mail/class_mail-methods-cyrus.inc:199
 #, fuzzy, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr "无法删除 IMAP 邮箱。服务器返回 '%s'。"
 
-#: personal/mail/class_mail-methods-cyrus.inc:223
-msgid "Cannot remove IMAP ACL: imap_getacl not implemented!"
-msgstr ""
-
-#: personal/mail/class_mail-methods-cyrus.inc:241
-msgid "Cannot retrieve IMAP ACL: imap_getacl not implemented!"
+#: personal/mail/class_mail-methods-cyrus.inc:328
+#: personal/mail/class_mail-methods-cyrus.inc:365
+msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/class_mail-methods-cyrus.inc:263
-#, fuzzy, php-format
-msgid "Cannot remove IMAP mailbox: %s"
-msgstr "无法删除 IMAP 邮箱。服务器返回 '%s'。"
-
-#: personal/mail/class_mail-methods-cyrus.inc:378
+#: personal/mail/class_mail-methods-cyrus.inc:538
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
@@ -2384,6 +2319,148 @@ msgstr "邮件头"
 msgid "Display header of this message"
 msgstr "显示此邮件邮件头"
 
+#, fuzzy
+#~ msgid "Cannot connect mail method: %s"
+#~ msgstr "无法打开文件 '%s'。"
+
+#, fuzzy
+#~ msgid "Cannot remove mailbox: %s."
+#~ msgstr "无法删除 IMAP 邮箱。服务器返回 '%s'。"
+
+#, fuzzy
+#~ msgid "Cannot update mailbox: %s."
+#~ msgstr "无法创建 IMAP 邮箱。服务器返回 '%s'。"
+
+#, fuzzy
+#~ msgid "Cannot write quota settings: %s."
+#~ msgstr "无法创建文件 '%s'。"
+
+#, fuzzy
+#~ msgid "Cannot get list of mailboxes! Error was: %s."
+#~ msgstr "无法删除 IMAP 邮箱。服务器返回 '%s'。"
+
+#, fuzzy
+#~ msgid "Cannot connect mail method! Error was: %s."
+#~ msgstr "无法打开文件 '%s'。"
+
+#, fuzzy
+#~ msgid "Cannot remove mailbox! Error was: %s."
+#~ msgstr "无法删除 IMAP 邮箱。服务器返回 '%s'。"
+
+#, fuzzy
+#~ msgid "Cannot update mailbox! Error was: %s."
+#~ msgstr "无法创建 IMAP 邮箱。服务器返回 '%s'。"
+
+#, fuzzy
+#~ msgid "Specify the mail server where the user will  be hosted on"
+#~ msgstr "描述该用户账号所要创建于的邮件服务器"
+
+#~ msgid "Select mail server to place user on"
+#~ msgstr "选择放置用户的邮件服务器"
+
+#~ msgid "not defined"
+#~ msgstr "未定义"
+
+#~ msgid "read"
+#~ msgstr "读"
+
+#~ msgid "post"
+#~ msgstr "贴"
+
+#~ msgid "external post"
+#~ msgstr "外部粘贴"
+
+#~ msgid "append"
+#~ msgstr "附加"
+
+#~ msgid "write"
+#~ msgstr "写"
+
+#, fuzzy
+#~ msgid "admin"
+#~ msgstr "管理员"
+
+#, fuzzy
+#~ msgid "mail"
+#~ msgstr "邮件"
+
+#, fuzzy
+#~ msgid "forward address"
+#~ msgstr "主要地址"
+
+#, fuzzy
+#~ msgid "Cannot forward to users own mail address!"
+#~ msgstr "您正在添加一个无效邮件地址"
+
+#, fuzzy
+#~ msgid "Alternate address"
+#~ msgstr "替代地址"
+
+#~ msgid "Add"
+#~ msgstr "添加"
+
+#, fuzzy
+#~ msgid "Unspecified"
+#~ msgstr "未定义"
+
+#, fuzzy
+#~ msgid "Mails"
+#~ msgstr "邮件"
+
+#, fuzzy
+#~ msgid "Tasks"
+#~ msgstr "任务"
+
+#, fuzzy
+#~ msgid "Journals"
+#~ msgstr "小时"
+
+#~ msgid "Contacts"
+#~ msgstr "联系"
+
+#, fuzzy
+#~ msgid "Notes"
+#~ msgstr "否"
+
+#, fuzzy
+#~ msgid "Inbox"
+#~ msgstr "索引"
+
+#, fuzzy
+#~ msgid "Drafts"
+#~ msgstr "日期"
+
+#, fuzzy
+#~ msgid "Sent items"
+#~ msgstr "系统状态"
+
+#, fuzzy
+#~ msgid "Junk mail"
+#~ msgstr "组名"
+
+#~ msgid ""
+#~ "Please choose valid permission settings. Default permission can't be "
+#~ "emtpy."
+#~ msgstr "请选择一个有效的权限设置。缺省权限不能为空。"
+
+#~ msgid "Mail options"
+#~ msgstr "邮件选项"
+
+#, fuzzy
+#~ msgid ""
+#~ "Mail settings cannot be removed while there are delegations configured!"
+#~ msgstr "这个账号不能被删除因为还有代理人配置。先删除这些代理人。"
+
+#, fuzzy
+#~ msgid "Waiting for kolab to remove mail properties..."
+#~ msgstr "等待 kolab 来删除邮件属性。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please remove the mail settings first to allow kolab to call its remove "
+#~ "methods!"
+#~ msgstr "请先删除邮件账号，以允许 kolab 调用自己的删除方法。"
+
 #, fuzzy
 #~ msgid "You have no permission to submit a '%s' command!"
 #~ msgstr "您无权查看和编辑 ACL。"

diff --git a/gosa-plugins/mail/personal/mail/class_mailAccount.inc b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
index e1828cd5f3ffe09c3d9039efb7ff78684b12b0ac..1516411ab1ab004604809cc837bba2d82cffc08b 100644 (file)
--- a/gosa-plugins/mail/personal/mail/class_mailAccount.inc
+++ b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
@@ -127,22 +127,22 @@ class mailAccount extends plugin
         /* Read quota */
         $this->gosaMailQuota = $this->mailMethod->getQuota($this->gosaMailQuota);
         if($this->mailMethod->is_error()){
-          msg_dialog::display(_("Mail error"), sprintf(_("Cannot read quota settings! Error was: %s."), 
+          msg_dialog::display(_("Mail error"), sprintf(_("Cannot read quota settings: %s"), 
                 $this->mailMethod->get_error()), ERROR_DIALOG);
         }
         
         /* Read mailboxes */
         $this->MailBoxes = $this->mailMethod->getMailboxList($this->MailBoxes);
         if($this->mailMethod->is_error()){
-          msg_dialog::display(_("Mail error"), sprintf(_("Cannot get list of mailboxes! Error was: %s."), 
+          msg_dialog::display(_("Mail error"), sprintf(_("Cannot get list of mailboxes: %s"), 
                 $this->mailMethod->get_error()), ERROR_DIALOG);
         }
           
       }elseif(!$this->mailMethod->is_connected()){
-        msg_dialog::display(_("Mail error"), sprintf(_("Cannot connect mail method! Error was: %s."), 
+        msg_dialog::display(_("Mail error"), sprintf(_("Mail method cannot connect: %s"), 
               $this->mailMethod->get_error()), ERROR_DIALOG);
       }elseif(!$this->mailMethod->account_exists()){
-        msg_dialog::display(_("Mail error"), sprintf(_("Mailbox '%s' doesn't exists on mail server: %s."), 
+        msg_dialog::display(_("Mail error"), sprintf(_("Mailbox '%s' doesn't exists on mail server: %s"), 
               $this->mailMethod->get_account_id(),$this->gosaMailServer), ERROR_DIALOG);
       }
 
@@ -895,11 +895,11 @@ class mailAccount extends plugin
     if (!$this->is_template){
 
       if(!$this->mailMethod->connect()){
-        msg_dialog::display(_("Mail error"), sprintf(_("Cannot connect mail method! Error was: %s."), 
+        msg_dialog::display(_("Mail error"), sprintf(_("Mail method cannot connect: %s"), 
               $this->mailMethod->get_error()), ERROR_DIALOG);
       }else{
         if(!$this->mailMethod->deleteMailbox()){
-          msg_dialog::display(_("Mail error"), sprintf(_("Cannot remove mailbox! Error was: %s."), 
+          msg_dialog::display(_("Mail error"), sprintf(_("Cannot remove mailbox: %s"), 
                 $this->mailMethod->get_error()), ERROR_DIALOG);
         }
       }
@@ -967,15 +967,15 @@ class mailAccount extends plugin
     if (!$this->is_template){
       $this->mailMethod->connect();
       if(!$this->mailMethod->is_connected()){
-        msg_dialog::display(_("Mail error"), sprintf(_("Cannot connect mail method! Error was: %s."), 
+        msg_dialog::display(_("Mail error"), sprintf(_("Mail method cannot connect: %s"), 
               $this->mailMethod->get_error()), ERROR_DIALOG);
       }else{
         if(!$this->mailMethod->updateMailbox()){
-          msg_dialog::display(_("Mail error"), sprintf(_("Cannot update mailbox! Error was: %s."), 
+          msg_dialog::display(_("Mail error"), sprintf(_("Cannot update mailbox: %s"), 
                 $this->mailMethod->get_error()), ERROR_DIALOG);
         }
         if(!$this->mailMethod->setQuota($this->gosaMailQuota)){
-          msg_dialog::display(_("Mail error"), sprintf(_("Cannot write quota settings! Error was: %s."), 
+          msg_dialog::display(_("Mail error"), sprintf(_("Cannot write quota settings: %s"), 
                 $this->mailMethod->get_error()), ERROR_DIALOG);
         }
 

diff --git a/gosa-plugins/mail/personal/mail/generic.tpl b/gosa-plugins/mail/personal/mail/generic.tpl
index 82fedc4d8862b5624a70f4742288142d01ffc344..3a1bb79b410641c89153805bbe513771d0335c58 100644 (file)
--- a/gosa-plugins/mail/personal/mail/generic.tpl
+++ b/gosa-plugins/mail/personal/mail/generic.tpl
@@ -216,7 +216,7 @@
     <label for="gosaSpamSortLevel">{t}Move mails tagged with spam level greater than{/t}</label>
 {render acl=$gosaSpamSortLevelACL checkbox=$multiple_support checked=$use_gosaSpamSortLevel}
     <select {if $own_script != ""} disabled {/if} id="gosaSpamSortLevel" size="1" name="gosaSpamSortLevel" 
-     title="{t}Choose spam level - smaller values are     more sensitive{/t}">
+     title="{t}Choose spam level - smaller values are more sensitive{/t}">
      {html_options values=$spamlevel output=$spamlevel selected=$gosaSpamSortLevel}
     </select>
 {/render}