- Simplify undo message, add dots at the end of messages

6 files changed, 152 insertions, 154 deletions

diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 31608a3cc..0e23b0396 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -54,7 +54,7 @@ class rcube_config
         // load database config
         if (!$this->load_from_file(RCMAIL_CONFIG_DIR . '/db.inc.php'))
             $this->errors[] = 'db.inc.php was not found.';
-    
+
         // load host-specific configuration
         $this->load_host_config();
 
@@ -67,7 +67,7 @@ class rcube_config
         // fix paths
         $this->prop['log_dir'] = $this->prop['log_dir'] ? realpath(unslashify($this->prop['log_dir'])) : INSTALL_PATH . 'logs';
         $this->prop['temp_dir'] = $this->prop['temp_dir'] ? realpath(unslashify($this->prop['temp_dir'])) : INSTALL_PATH . 'temp';
-    
+
         // fix default imap folders encoding
         foreach (array('drafts_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox') as $folder)
             $this->prop[$folder] = rcube_charset_convert($this->prop[$folder], RCMAIL_CHARSET, 'UTF7-IMAP');
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index 96aeab09e..be673d238 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -124,7 +124,7 @@ $messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of reci
 $messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max';
 $messages['internalerror'] = 'An internal error occured. Please try again';
 $messages['contactdelerror'] = 'Could not delete contact(s)';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
 $messages['groupdeleted'] = 'Group deleted successfully';
 $messages['grouprenamed'] = 'Group renamed successfully';
 $messages['groupcreated'] = 'Group created successfully';
diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc
index e64b2298c..25796cc71 100644
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@@ -18,43 +18,43 @@
 */
 
 $messages = array();
-$messages['loginfailed']  = 'Login failed';
-$messages['cookiesdisabled'] = 'Your browser does not accept cookies';
-$messages['sessionerror'] = 'Your session is invalid or expired';
-$messages['imaperror'] = 'Connection to IMAP server failed';
+$messages['loginfailed']  = 'Login failed.';
+$messages['cookiesdisabled'] = 'Your browser does not accept cookies.';
+$messages['sessionerror'] = 'Your session is invalid or expired.';
+$messages['imaperror'] = 'Connection to IMAP server failed.';
 $messages['servererror'] = 'Server Error!';
 $messages['servererrormsg'] = 'Server Error: $msg';
 $messages['databaserror'] = 'Database Error!';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied';
+$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
+$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
-$messages['nomessagesfound'] = 'No messages found in this mailbox';
+$messages['nomessagesfound'] = 'No messages found in this mailbox.';
 $messages['loggedout'] = 'You have successfully terminated the session. Good bye!';
-$messages['mailboxempty'] = 'Mailbox is empty';
+$messages['mailboxempty'] = 'Mailbox is empty.';
 $messages['loading'] = 'Loading...';
 $messages['uploading'] = 'Uploading file...';
 $messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Loading data...';
 $messages['checkingmail'] = 'Checking for new messages...';
 $messages['sendingmessage'] = 'Sending message...';
-$messages['messagesent'] = 'Message sent successfully';
+$messages['messagesent'] = 'Message sent successfully.';
 $messages['savingmessage'] = 'Saving message...';
-$messages['messagesaved'] = 'Message saved to Drafts';
-$messages['successfullysaved'] = 'Successfully saved';
-$messages['addedsuccessfully'] = 'Contact added successfully to address book';
-$messages['contactexists'] = 'A contact with this e-mail address already exists';
+$messages['messagesaved'] = 'Message saved to Drafts.';
+$messages['successfullysaved'] = 'Successfully saved.';
+$messages['addedsuccessfully'] = 'Contact added successfully to address book.';
+$messages['contactexists'] = 'A contact with this e-mail address already exists.';
 $messages['blockedimages'] = 'To protect your privacy, remote images are blocked in this message.';
 $messages['encryptedmessage'] = 'This is an encrypted message and can not be displayed. Sorry!';
-$messages['nocontactsfound'] = 'No contacts found';
-$messages['contactnotfound'] = 'The requested contact was not found';
-$messages['sendingfailed'] = 'Failed to send message';
-$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message';
-$messages['errorsavingsent'] = 'An error occured while saving sent message';
-$messages['errorsaving'] = 'An error occured while saving';
-$messages['errormoving'] = 'Could not move the message(s)';
-$messages['errorcopying'] = 'Could not copy the message(s)';
-$messages['errordeleting'] = 'Could not delete the message(s)';
-$messages['errormarking'] = 'Could not mark the message(s)';
+$messages['nocontactsfound'] = 'No contacts found.';
+$messages['contactnotfound'] = 'The requested contact was not found.';
+$messages['sendingfailed'] = 'Failed to send message.';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
+$messages['errorsaving'] = 'An error occured while saving.';
+$messages['errormoving'] = 'Could not move the message(s).';
+$messages['errorcopying'] = 'Could not copy the message(s).';
+$messages['errordeleting'] = 'Could not delete the message(s).';
+$messages['errormarking'] = 'Could not mark the message(s).';
 $messages['deletecontactconfirm']  = 'Do you really want to delete the selected contact(s)?';
 $messages['deletemessagesconfirm'] = 'Do you really want to delete the selected message(s)?';
 $messages['deletefolderconfirm']  = 'Do you really want to delete this folder?';
@@ -63,87 +63,86 @@ $messages['folderdeleting'] = 'Deleting folder...';
 $messages['foldermoving'] = 'Moving folder...';
 $messages['foldersubscribing'] = 'Subscribing folder...';
 $messages['folderunsubscribing'] = 'Unsubscribing folder...';
-$messages['formincomplete'] = 'The form was not completely filled out';
-$messages['noemailwarning'] = 'Please enter a valid email address';
-$messages['nonamewarning']  = 'Please enter a name';
-$messages['nopagesizewarning'] = 'Please enter a page size';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address';
-$messages['norecipientwarning'] = 'Please enter at least one recipient';
+$messages['formincomplete'] = 'The form was not completely filled out.';
+$messages['noemailwarning'] = 'Please enter a valid email address.';
+$messages['nonamewarning']  = 'Please enter a name.';
+$messages['nopagesizewarning'] = 'Please enter a page size.';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
+$messages['norecipientwarning'] = 'Please enter at least one recipient.';
 $messages['nosubjectwarning']  = 'The "Subject" field is empty. Would you like to enter one now?';
 $messages['nobodywarning'] = 'Send this message without text?';
 $messages['notsentwarning'] = 'Message has not been sent. Do you want to discard your message?';
-$messages['noldapserver'] = 'Please select an ldap server to search';
-$messages['nocontactsreturned'] = 'No contacts were found';
-$messages['nosearchname'] = 'Please enter a contact name or email address';
+$messages['noldapserver'] = 'Please select an ldap server to search.';
+$messages['nocontactsreturned'] = 'No contacts were found.';
+$messages['nosearchname'] = 'Please enter a contact name or email address.';
 $messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
-$messages['searchsuccessful'] = '$nr messages found';
-$messages['searchnomatch'] = 'Search returned no matches';
+$messages['searchsuccessful'] = '$nr messages found.';
+$messages['searchnomatch'] = 'Search returned no matches.';
 $messages['searching'] = 'Searching...';
 $messages['checking'] = 'Checking...';
-$messages['nospellerrors'] = 'No spelling errors found';
-$messages['folderdeleted'] = 'Folder successfully deleted';
-$messages['foldersubscribed'] = 'Folder successfully subscribed';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed';
-$messages['folderpurged'] = 'Folder has successfully been emptied';
-$messages['folderexpunged'] = 'Folder has successfully been compacted';
-$messages['deletedsuccessfully'] = 'Successfully deleted';
+$messages['nospellerrors'] = 'No spelling errors found.';
+$messages['folderdeleted'] = 'Folder successfully deleted.';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
+$messages['deletedsuccessfully'] = 'Successfully deleted.';
 $messages['converting'] = 'Removing formatting...';
-$messages['messageopenerror'] = 'Could not load message from server';
-$messages['fileuploaderror'] = 'File upload failed';
-$messages['filesizeerror'] = 'The uploaded file exceeds the maximum size of $size';
-$messages['copysuccess'] = 'Successfully copied $nr addresses';
-$messages['copyerror'] = 'Could not copy any addresses';
-$messages['sourceisreadonly'] = 'This address source is read only';
-$messages['errorsavingcontact'] = 'Could not save the contact address';
+$messages['messageopenerror'] = 'Could not load message from server.';
+$messages['fileuploaderror'] = 'File upload failed.';
+$messages['filesizeerror'] = 'The uploaded file exceeds the maximum size of $size.';
+$messages['copysuccess'] = 'Successfully copied $nr addresses.';
+$messages['copyerror'] = 'Could not copy any addresses.';
+$messages['sourceisreadonly'] = 'This address source is read only.';
+$messages['errorsavingcontact'] = 'Could not save the contact address.';
 $messages['movingmessage'] = 'Moving message(s)...';
 $messages['copyingmessage'] = 'Copying message(s)...';
 $messages['deletingmessage'] = 'Deleting message(s)...';
 $messages['markingmessage'] = 'Marking message(s)...';
-$messages['receiptsent'] = 'Successfully sent a read receipt';
-$messages['errorsendingreceipt'] = 'Could not send the receipt';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
+$messages['errorsendingreceipt'] = 'Could not send the receipt.';
 $messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
-$messages['forbiddencharacter'] = 'Folder name contains a forbidden character';
-$messages['selectimportfile'] = 'Please select a file to upload';
-$messages['addresswriterror'] = 'The selected address book is not writeable';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
 $messages['importwait'] = 'Importing, please wait...';
 $messages['importerror'] = 'Import failed! The uploaded file is not a valid vCard file.';
-$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts.</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries.</b>';
 $messages['opnotpermitted'] = 'Operation not permitted!';
-$messages['nofromaddress'] = 'Missing e-mail address in selected identity';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
 $messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
 $messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg)';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg)';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list';
-$messages['smtpdsnerror'] = 'SMTP Error: No support for Delivery Status Notifications';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtpdsnerror'] = 'SMTP Error: No support for Delivery Status Notifications.';
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'Invalid e-mail address: $email';
 $messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max';
-$messages['internalerror'] = 'An internal error occured. Please try again';
-$messages['contactdelerror'] = 'Could not delete contact(s)';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s)';
-$messages['contactrestored'] = 'Contact(s) restored successfully';
-$messages['groupdeleted'] = 'Group deleted successfully';
-$messages['grouprenamed'] = 'Group renamed successfully';
-$messages['groupcreated'] = 'Group created successfully';
-$messages['messagedeleted'] = 'Message(s) deleted successfully';
-$messages['messagemoved'] = 'Message(s) moved successfully';
-$messages['messagecopied'] = 'Message(s) copied successfully';
-$messages['messagemarked'] = 'Message(s) marked successfully';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion';
-$messages['namecannotbeempty'] = 'Name cannot be empty';
-$messages['nametoolong'] = 'Name is too long';
-$messages['folderupdated'] = 'Folder updated successfully';
-$messages['foldercreated'] = 'Folder created successfully';
-$messages['invalidimageformat'] = 'Not a valid image format';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message';
-$messages['itemsdeleted'] = '$num item(s) has been deleted.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$messages['invalidimageformat'] = 'Not a valid image format.';
+$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
 
 ?>
diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc
index 6a0524417..0f8e609a8 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -48,7 +48,7 @@ $messages['contactexists'] = 'Kontakt o podanym adresie e-mail już istnieje!';
 $messages['blockedimages'] = 'Ze względów bezpieczeństwa zewnętrzne obrazki zostały zablokowane.';
 $messages['encryptedmessage'] = 'Przepraszamy, nie można wyświetlić zaszyfrowanej wiadomości!';
 $messages['nocontactsfound'] = 'Nie znaleziono kontaktu!';
-$messages['contactnotfound'] = 'Szukany kontakt nie został odnaleziony';
+$messages['contactnotfound'] = 'Szukany kontakt nie został odnaleziony.';
 $messages['sendingfailed'] = 'Nie udało się wysłać wiadomości!';
 $messages['senttooquickly'] = 'Musisz poczekać $sec sek. aby móc wysłać tą wiadomość!';
 $messages['errorsavingsent'] = 'Wystąpił błąd podczas zapisu wysłanej wiadomości!';
@@ -76,78 +76,77 @@ $messages['noldapserver'] = 'Wybierz serwer LDAP!';
 $messages['nocontactsreturned'] = 'Nie znaleziono kontaktów!';
 $messages['nosearchname'] = 'Podaj nazwę kontaktu lub jego adres e-mail.';
 $messages['notuploadedwarning'] = 'Nie wszystkie załączniki zostały pobrane. Poczekaj lub anuluj pobieranie.';
-$messages['searchsuccessful'] = 'Liczba znalezionych wiadomości: $nr';
+$messages['searchsuccessful'] = 'Liczba znalezionych wiadomości: $nr.';
 $messages['searchnomatch'] = 'Nic nie znaleziono.';
 $messages['searching'] = 'Wyszukiwanie...';
 $messages['checking'] = 'Sprawdzanie...';
 $messages['nospellerrors'] = 'Nie znaleziono błędów w pisowni.';
 $messages['folderdeleted'] = 'Folder został pomyślnie usunięty.';
-$messages['deletedsuccessfully'] = 'Usunięto';
+$messages['deletedsuccessfully'] = 'Usunięto.';
 $messages['converting'] = 'Konwertowanie tekstu...';
-$messages['messageopenerror'] = 'Nie można załadować wiadomości z serwera';
-$messages['fileuploaderror'] = 'Załączanie pliku nie powiodło się';
-$messages['filesizeerror'] = 'Plik przekracza maksymalną wielkość $size';
-$messages['copysuccess'] = 'Pomyślnie skopiowano następującą liczbę adresów: $nr';
-$messages['copyerror'] = 'Nie można skopiować żadnego adresu';
-$messages['sourceisreadonly'] = 'Źródło adresu jest tylko do odczytu';
-$messages['errorsavingcontact'] = 'Nie można było zapisać adresu kontaktu';
+$messages['messageopenerror'] = 'Nie można załadować wiadomości z serwera.';
+$messages['fileuploaderror'] = 'Załączanie pliku nie powiodło się.';
+$messages['filesizeerror'] = 'Plik przekracza maksymalną wielkość $size.';
+$messages['copysuccess'] = 'Pomyślnie skopiowano następującą liczbę adresów: $nr.';
+$messages['copyerror'] = 'Nie można skopiować żadnego adresu.';
+$messages['sourceisreadonly'] = 'Źródło adresu jest tylko do odczytu.';
+$messages['errorsavingcontact'] = 'Nie można było zapisać adresu kontaktu.';
 $messages['movingmessage'] = 'Przenoszenie wiadomości...';
 $messages['copyingmessage'] = 'Kopiowanie wiadomości...';
 $messages['deletingmessage'] = 'Usuwanie wiadomości...';
 $messages['markingmessage'] = 'Oznaczanie wiadomości...';
-$messages['receiptsent'] = 'Pomyślnie wysłano potwierdzenie dostarczenia';
-$messages['errorsendingreceipt'] = 'Nie można wysłać potwierdzenia';
+$messages['receiptsent'] = 'Pomyślnie wysłano potwierdzenie dostarczenia.';
+$messages['errorsendingreceipt'] = 'Nie można wysłać potwierdzenia.';
 $messages['nodeletelastidentity'] = 'Nie można skasować tej tożsamości, ponieważ jest ostatnią.';
-$messages['forbiddencharacter'] = 'Nazwa folderu zawiera niedozwolony znak';
-$messages['selectimportfile'] = 'Proszę wybrać plik do wysłania';
-$messages['addresswriterror'] = 'Wybrana książka adresowa jest tylko-do-odczytu';
-$messages['contactaddedtogroup'] = 'Kontakty zostały pomyślnie dodane do grupy';
-$messages['contactremovedfromgroup'] = 'Kontakty zostały pomyślnie usunięte z grupy';
+$messages['forbiddencharacter'] = 'Nazwa folderu zawiera niedozwolony znak.';
+$messages['selectimportfile'] = 'Proszę wybrać plik do wysłania.';
+$messages['addresswriterror'] = 'Wybrana książka adresowa jest tylko-do-odczytu.';
+$messages['contactaddedtogroup'] = 'Kontakty zostały pomyślnie dodane do grupy.';
+$messages['contactremovedfromgroup'] = 'Kontakty zostały pomyślnie usunięte z grupy.';
 $messages['importwait'] = 'Importowanie, proszę czekać...';
 $messages['importerror'] = 'Błąd! Pobrany plik nie jest poprawnym plikiem vCard.';
-$messages['importconfirm'] = '<b>Pomyślnie dodano $inserted kontaktów, pominięto $skipped istniejących wpisów</b>:<p><em>$names</em></p>';
+$messages['importconfirm'] = '<b>Pomyślnie dodano $inserted kontaktów, pominięto $skipped istniejących wpisów</b>:<p><em>$names</em></p>.';
 $messages['opnotpermitted'] = 'Niedozwolona operacja!';
-$messages['nofromaddress'] = 'Brak adresu e-mail w wybranej tożsamości';
+$messages['nofromaddress'] = 'Brak adresu e-mail w wybranej tożsamości.';
 $messages['editorwarning'] = 'Zmiana edytora spowoduje utratę formatowania tekstu. Czy jesteś pewien, że chcesz to zrobić?';
 $messages['httpreceivedencrypterror'] = 'Wystąpił błąd krytyczny. Skontaktuj się z administratorem. <b>Nie można wysłać wiadomości.</b>';
-$messages['smtpconnerror'] = 'Błąd SMTP ($code): Nie można nawiązać połączenia z serwerem';
-$messages['smtpautherror'] = 'Błąd SMTP ($code): Uwierzytelnianie nie powiodło się';
-$messages['smtpfromerror'] = 'Błąd SMTP ($code): Nie można ustawić nadawcy "$from" ($msg)';
-$messages['smtptoerror'] = 'Błąd SMTP ($code): Nie można dodać odbiorcy "$to" ($msg)';
-$messages['smtprecipientserror'] = 'Błąd SMTP: Parsowanie listy odbiorców nie powiodło się';
-$messages['smtpdsnerror'] = 'Błąd SMTP: Statusy dostarczenia (DSN) nie są obsługiwane przez serwer';
+$messages['smtpconnerror'] = 'Błąd SMTP ($code): Nie można nawiązać połączenia z serwerem.';
+$messages['smtpautherror'] = 'Błąd SMTP ($code): Uwierzytelnianie nie powiodło się.';
+$messages['smtpfromerror'] = 'Błąd SMTP ($code): Nie można ustawić nadawcy "$from" ($msg).';
+$messages['smtptoerror'] = 'Błąd SMTP ($code): Nie można dodać odbiorcy "$to" ($msg).';
+$messages['smtprecipientserror'] = 'Błąd SMTP: Parsowanie listy odbiorców nie powiodło się.';
+$messages['smtpdsnerror'] = 'Błąd SMTP: Statusy dostarczenia (DSN) nie są obsługiwane przez serwer.';
 $messages['smtperror'] = 'Błąd SMTP: $msg';
 $messages['emailformaterror'] = 'Błędny adres e-mail: $email';
 $messages['toomanyrecipients'] = 'Zbyt wielu odbiorców. Zmniejsz ich liczbę do $max.';
-$messages['maxgroupmembersreached'] = 'Liczba członków grupy nie może być większa niż $max';
-$messages['internalerror'] = 'Wystąpił wewnętrzny błąd systemu. Spróbuj jeszcze raz';
-$messages['contactdelerror'] = 'Usuwanie kontaktów nie powiodło się';
-$messages['contactdeleted'] = 'Kontakt(y) został(y) usunięte';
-$messages['groupdeleted'] = 'Grupa została usunięta';
-$messages['grouprenamed'] = 'Nazwa grupy została zmieniona';
-$messages['groupcreated'] = 'Grupa została utworzona';
-$messages['messagedeleted'] = 'Wiadomości zostały usunięte';
-$messages['messagemoved'] = 'Wiadomości zostały przeniesione';
-$messages['messagecopied'] = 'Wiadomości zostały skopiowane';
-$messages['messagemarked'] = 'Wiadomości zostały oznaczone';
-$messages['autocompletechars'] = 'Wprowadź co najmniej $min znak(ów) aby skorzystać z autouzupełniania';
+$messages['maxgroupmembersreached'] = 'Liczba członków grupy nie może być większa niż $max.';
+$messages['internalerror'] = 'Wystąpił wewnętrzny błąd systemu. Spróbuj jeszcze raz.';
+$messages['contactdelerror'] = 'Usuwanie kontaktów nie powiodło się.';
+$messages['contactdeleted'] = 'Kontakt(y) został(y) usunięte.';
+$messages['groupdeleted'] = 'Grupa została usunięta.';
+$messages['grouprenamed'] = 'Nazwa grupy została zmieniona.';
+$messages['groupcreated'] = 'Grupa została utworzona.';
+$messages['messagedeleted'] = 'Wiadomości zostały usunięte.';
+$messages['messagemoved'] = 'Wiadomości zostały przeniesione.';
+$messages['messagecopied'] = 'Wiadomości zostały skopiowane.';
+$messages['messagemarked'] = 'Wiadomości zostały oznaczone.';
+$messages['autocompletechars'] = 'Wprowadź co najmniej $min znak(ów) aby skorzystać z autouzupełniania.';
 $messages['foldersubscribing'] = 'Subskrybowanie folderu...';
 $messages['folderunsubscribing'] = 'Odsubskrybowanie folderu...';
-$messages['foldersubscribed'] = 'Folder został pomyślnie zasubskrybowany';
-$messages['folderunsubscribed'] = 'Folder został pomyślnie odsubskrybowany';
-$messages['folderpurged'] = 'Folder został pomyślnie opróżniony';
-$messages['folderexpunged'] = 'Folder został pomyślnie uporządkowany';
-$messages['namecannotbeempty'] = 'Nazwa nie może być pusta';
-$messages['nametoolong'] = 'Nazwa jest zbyt długa';
-$messages['folderupdated'] = 'Folder został pomyślnie zaktualizowany';
-$messages['foldercreated'] = 'Folder został pomyślnie utworzony';
-$messages['errorreadonly'] = 'Nie można wykonać operacji. Folder tylko do odczytu';
-$messages['errornoperm'] = 'Nie można wykonać operacji. Brak uprawnień';
-$messages['importconfirmskipped'] = '<b>Pominięto $skipped istniejących wpisów</b>';
-$messages['invalidimageformat'] = 'Niepoprawny format obrazka';
-$messages['mispellingsfound'] = 'Wykryto błędy pisowni w tej wiadomości';
-$messages['itemsdeleted'] = '$num elemenów zostało usuniętych.';
-$messages['contactrestoreerror'] = 'Przywracanie kontaktów nie powiodło się';
-$messages['contactrestored'] = 'Kontakt(y) zostały przywrócone';
+$messages['foldersubscribed'] = 'Folder został pomyślnie zasubskrybowany.';
+$messages['folderunsubscribed'] = 'Folder został pomyślnie odsubskrybowany.';
+$messages['folderpurged'] = 'Folder został pomyślnie opróżniony.';
+$messages['folderexpunged'] = 'Folder został pomyślnie uporządkowany.';
+$messages['namecannotbeempty'] = 'Nazwa nie może być pusta.';
+$messages['nametoolong'] = 'Nazwa jest zbyt długa.';
+$messages['folderupdated'] = 'Folder został pomyślnie zaktualizowany.';
+$messages['foldercreated'] = 'Folder został pomyślnie utworzony.';
+$messages['errorreadonly'] = 'Nie można wykonać operacji. Folder tylko do odczytu.';
+$messages['errornoperm'] = 'Nie można wykonać operacji. Brak uprawnień.';
+$messages['importconfirmskipped'] = '<b>Pominięto $skipped istniejących wpisów.</b>';
+$messages['invalidimageformat'] = 'Niepoprawny format obrazka.';
+$messages['mispellingsfound'] = 'Wykryto błędy pisowni w tej wiadomości.';
+$messages['contactrestoreerror'] = 'Przywracanie kontaktów nie powiodło się.';
+$messages['contactrestored'] = 'Kontakt(y) zostały przywrócone.';
 
 ?>
diff --git a/program/steps/addressbook/delete.inc b/program/steps/addressbook/delete.inc
index b0b255e27..222535cf3 100644
--- a/program/steps/addressbook/delete.inc
+++ b/program/steps/addressbook/delete.inc
@@ -145,7 +145,7 @@ $OUTPUT->command('set_rowcount', rcmail_get_rowcount_text($result));
 
 if (!empty($_SESSION['contact_undo'])) {
     $_SESSION['contact_undo']['ts'] = time();
-    $msg = html::span(null, rcube_label(array('name' => 'itemsdeleted', 'vars' => array('num' => $deleted))))
+    $msg = html::span(null, rcube_label('contactdeleted'))
         . ' ' . html::a(array('onclick' => JS_OBJECT_NAME.".command('undo', '', this)"), rcube_label('undo'));
 
     $OUTPUT->show_message($msg, 'confirmation', null, true, $undo_time);
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 458441fda..899702730 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -636,26 +636,26 @@ function rcmail_prepare_message_body()
         $body);
     }
   }
-  
+
   $HTML_MODE = $isHtml;
-  
+
   return $body;
 }
 
 function rcmail_compose_body($attrib)
 {
   global $RCMAIL, $CONFIG, $OUTPUT, $MESSAGE, $compose_mode, $LINE_LENGTH, $HTML_MODE, $MESSAGE_BODY;
-  
+
   list($form_start, $form_end) = get_form_tags($attrib);
   unset($attrib['form']);
-  
+
   if (empty($attrib['id']))
     $attrib['id'] = 'rcmComposeBody';
 
   $attrib['name'] = '_message';
 
   $isHtml = $HTML_MODE;
-  
+
   $out = $form_start ? "$form_start\n" : '';
 
   $saveid = new html_hiddenfield(array('name' => '_draft_saveid', 'value' => $compose_mode==RCUBE_COMPOSE_DRAFT ? str_replace(array('<','>'), "", $MESSAGE->headers->messageID) : ''));
@@ -688,7 +688,7 @@ function rcmail_compose_body($attrib)
 
   // include HTML editor
   rcube_html_editor();
-  
+
   // include GoogieSpell
   if (!empty($CONFIG['enable_spellcheck'])) {
 
@@ -749,7 +749,7 @@ function rcmail_compose_body($attrib)
     $OUTPUT->add_label('checking');
     $OUTPUT->set_env('spellcheck_langs', join(',', $editor_lang_set));
   }
- 
+
   $out .= "\n".'<iframe name="savetarget" src="program/blank.gif" style="width:0;height:0;border:none;visibility:hidden;"></iframe>';
 
   return $out;
@@ -858,7 +858,7 @@ function rcmail_create_forward_body($body, $bodyIsHtml)
 
     $prefix .= "</tbody></table><br>";
   }
-    
+
   return $prefix.$body;
 }
 
@@ -866,7 +866,7 @@ function rcmail_create_forward_body($body, $bodyIsHtml)
 function rcmail_create_draft_body($body, $bodyIsHtml)
 {
   global $MESSAGE, $OUTPUT;
-  
+
   /**
    * add attachments
    * sizeof($MESSAGE->mime_parts can be 1 - e.g. attachment, but no text!
@@ -881,7 +881,7 @@ function rcmail_create_draft_body($body, $bodyIsHtml)
     if ($cid_map)
       $body = str_replace(array_keys($cid_map), array_values($cid_map), $body);
   }
-  
+
   return $body;
 }
 
@@ -1061,7 +1061,7 @@ function rcmail_save_attachment(&$message, $pid)
   } else if ($path) {
     @unlink($path);
   }
-  
+
   return false;
 }
 
@@ -1084,7 +1084,7 @@ function rcmail_save_image($path, $mimetype='')
     unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
     return $attachment;
   }
-  
+
   return false;
 }