diff options
Diffstat (limited to 'program')
24 files changed, 32 insertions, 22 deletions
diff --git a/program/localization/ar_SA/messages.inc b/program/localization/ar_SA/messages.inc index ba7d7fbc4..95e33d7a3 100644 --- a/program/localization/ar_SA/messages.inc +++ b/program/localization/ar_SA/messages.inc @@ -24,7 +24,7 @@ $messages['sessionerror'] = 'انتهت صلاحية الجلسة الحالية $messages['imaperror'] = 'فشل الاتصال بخادم IMAP'; $messages['servererror'] = 'خطأ في الخادم!'; $messages['servererrormsg'] = 'خطأ خادم: $msg'; -$messages['databaserror'] = 'خطأ في قاعدة البيانات!'; +$messages['dberror'] = 'خطأ في قاعدة البيانات!'; $messages['errorreadonly'] = 'تعذر تنفيذ العملية. المجلد للقراءة فقط.'; $messages['errornoperm'] = 'تعذر تنفيذ العملية. ليست لديك الصلاحية.'; $messages['invalidrequest'] = 'طلب غير صالح! لم تحفظ أية بيانات.'; diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc index e72777ad8..e7277e3c0 100644 --- a/program/localization/de_CH/messages.inc +++ b/program/localization/de_CH/messages.inc @@ -24,7 +24,7 @@ $messages['sessionerror'] = 'Ihre Session ist ungültig oder abgelaufen'; $messages['imaperror'] = 'Keine Verbindung zum IMAP Server'; $messages['servererror'] = 'Serverfehler!'; $messages['servererrormsg'] = 'Serverfehler: $msg'; -$messages['databaserror'] = 'Datenbankfehler!'; +$messages['dberror'] = 'Datenbankfehler!'; $messages['errorreadonly'] = 'Die Aktion kann nicht ausgeführt werden. Der Ordner ist schreibgeschützt.'; $messages['errornoperm'] = 'Die Aktion kann nicht ausgeführt werden. Zugriff verweigert.'; $messages['invalidrequest'] = 'Ungültige Anfrage! Es wurden keine Daten gespeichert.'; diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc index d80927637..59bf360aa 100644 --- a/program/localization/de_DE/messages.inc +++ b/program/localization/de_DE/messages.inc @@ -25,7 +25,7 @@ $messages['sessionerror'] = 'Ihre Session ist ungültig oder abgelaufen'; $messages['imaperror'] = 'Keine Verbindung zum IMAP Server'; $messages['servererror'] = 'Serverfehler!'; $messages['servererrormsg'] = 'Serverfehler: $msg'; -$messages['databaserror'] = 'Datenbankfehler!'; +$messages['dberror'] = 'Datenbankfehler!'; $messages['errorreadonly'] = 'Die Aktion kann nicht ausgeführt werden. Der Ordner ist schreibgeschützt.'; $messages['errornoperm'] = 'Die Aktion kann nicht ausgeführt werden. Zugriff verweigert.'; $messages['invalidrequest'] = 'Ungültige Anfrage! Es wurden keine Daten gespeichert.'; diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index efbc9a673..266976730 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -203,6 +203,7 @@ $labels['editortype'] = 'Editor type'; $labels['returnreceipt'] = 'Return receipt'; $labels['dsn'] = 'Delivery status notification'; $labels['mailreplyintro'] = 'On $date, $sender wrote:'; +$labels['originalmessage'] = 'Original Message'; $labels['editidents'] = 'Edit identities'; $labels['checkspelling'] = 'Check spelling'; diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc index 3f7db87a0..c871ca53e 100644 --- a/program/localization/en_US/messages.inc +++ b/program/localization/en_US/messages.inc @@ -24,7 +24,7 @@ $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['dberror'] = 'Database Error!'; $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.'; diff --git a/program/localization/et_EE/messages.inc b/program/localization/et_EE/messages.inc index 98564604d..51632c461 100644 --- a/program/localization/et_EE/messages.inc +++ b/program/localization/et_EE/messages.inc @@ -26,7 +26,7 @@ $messages['sessionerror'] = 'Sinu seanss on aegunud või vigane'; $messages['imaperror'] = 'Ei õnnestunud IMAP serveriga ühendust luua'; $messages['servererror'] = 'Serveri tõrge!'; $messages['servererrormsg'] = 'Serveri tõrge: $msg'; -$messages['databaserror'] = 'Andmebaasi tõrge!'; +$messages['dberror'] = 'Andmebaasi tõrge!'; $messages['errorreadonly'] = 'Operatsioon nurjus. Kaustale on vaid lugemisõigus'; $messages['errornoperm'] = 'Operatsioon nurjus. Ligipääsu õigused puuduvad'; $messages['invalidrequest'] = 'Lubamatu päring! Andmeid ei salvestatud.'; diff --git a/program/localization/fr_FR/messages.inc b/program/localization/fr_FR/messages.inc index db61218f1..efad660a2 100644 --- a/program/localization/fr_FR/messages.inc +++ b/program/localization/fr_FR/messages.inc @@ -26,7 +26,7 @@ $messages['sessionerror'] = 'Votre session est invalide ou a expiré'; $messages['imaperror'] = 'Erreur de connexion au serveur IMAP'; $messages['servererror'] = 'Erreur Serveur !'; $messages['servererrormsg'] = 'Erreur du serveur: $msg'; -$messages['databaserror'] = 'Erreur avec la base de donnée!'; +$messages['dberror'] = 'Erreur avec la base de donnée!'; $messages['errorreadonly'] = 'Impossible d\'effectuer cette opération. Le dossier est en lecture seule'; $messages['errornoperm'] = 'Impossible d\'effectuer cette opération. Permission refusée'; $messages['invalidrequest'] = 'Requête invalide ! Aucune donnée n\'a été sauvegardée.'; diff --git a/program/localization/he_IL/messages.inc b/program/localization/he_IL/messages.inc index 30b9fb84a..affa0d996 100644 --- a/program/localization/he_IL/messages.inc +++ b/program/localization/he_IL/messages.inc @@ -23,7 +23,7 @@ $messages['sessionerror'] = 'כניסתך למערכת אינה חוקית או $messages['imaperror'] = 'הקשר לשרת הדואר נכשל'; $messages['servererror'] = '! שגיאת שרת'; $messages['servererrormsg'] = '$msg שגיאת שרת'; -$messages['databaserror'] = '! שגיאה במסד הנתונים'; +$messages['dberror'] = '! שגיאה במסד הנתונים'; $messages['errorreadonly'] = 'לא ניתן לבצע הפעולה כי התיק ניתן לקריאה בלבד'; $messages['errornoperm'] = 'לא ניתן לבצע הפעולה כי אין הרשאה לבצעה'; $messages['invalidrequest'] = 'בקשה לא חוקית. המידע לא נשמר'; diff --git a/program/localization/hr_HR/messages.inc b/program/localization/hr_HR/messages.inc index d49546f4f..67f332a2c 100644 --- a/program/localization/hr_HR/messages.inc +++ b/program/localization/hr_HR/messages.inc @@ -25,7 +25,7 @@ $messages['sessionerror'] = 'Morate se ponovno ulogirati'; $messages['imaperror'] = 'Neuspješna veza na IMAP server'; $messages['servererror'] = 'Greška poslužitelja'; $messages['servererrormsg'] = 'Greška na serveru: $msg'; -$messages['databaserror'] = 'Greška baze podataka!'; +$messages['dberror'] = 'Greška baze podataka!'; $messages['errorreadonly'] = 'Nemoguća izvedba operacije. Mapa je samo za čitanje.'; $messages['errornoperm'] = 'Nemoguća izvedba operacije. Dozvola odbijena.'; $messages['invalidrequest'] = 'Nepravilan zahtijev! Podaci nisu spremljeni.'; diff --git a/program/localization/hu_HU/messages.inc b/program/localization/hu_HU/messages.inc index 5d30cc2f6..fce8c6104 100644 --- a/program/localization/hu_HU/messages.inc +++ b/program/localization/hu_HU/messages.inc @@ -26,7 +26,7 @@ $messages['sessionerror'] = 'Érvénytelen vagy lejárt munkamenet'; $messages['imaperror'] = 'Nem sikerült a kapcsolódás az IMAP szerverhez'; $messages['servererror'] = 'Szerverhiba!'; $messages['servererrormsg'] = 'Szerverhiba: $msg'; -$messages['databaserror'] = 'Adatbázishiba!'; +$messages['dberror'] = 'Adatbázishiba!'; $messages['errorreadonly'] = 'A műveletet nem sikerült végrehajtani. A mappa írásvédett'; $messages['errornoperm'] = 'A műveletet nem sikerült végrehajtani. Hozzáférés megtagadva'; $messages['invalidrequest'] = 'Érvénytelen kérés! Az adatok nem lettek elmentve.'; diff --git a/program/localization/id_ID/messages.inc b/program/localization/id_ID/messages.inc index a539f6051..b406f5acb 100644 --- a/program/localization/id_ID/messages.inc +++ b/program/localization/id_ID/messages.inc @@ -24,7 +24,7 @@ $messages['sessionerror'] = 'Session Anda invalid atau kadaluwarsa'; $messages['imaperror'] = 'Koneksi ke IMAP server gagal'; $messages['servererror'] = 'Server Error!'; $messages['servererrormsg'] = 'Server Error: $msg'; -$messages['databaserror'] = 'Basis data Error!'; +$messages['dberror'] = 'Basis data Error!'; $messages['errorreadonly'] = 'Tidak bisa melakukan operasi. Folder hanya bisa dibaca'; $messages['errornoperm'] = 'Tidak bisa melakukan operasi. Ijin ditolak'; $messages['invalidrequest'] = 'Permintaan tidak valid! Tidak ada data yang tersimpan.'; diff --git a/program/localization/it_IT/messages.inc b/program/localization/it_IT/messages.inc index 60011e681..2018abe24 100644 --- a/program/localization/it_IT/messages.inc +++ b/program/localization/it_IT/messages.inc @@ -25,7 +25,7 @@ $messages['sessionerror'] = 'Sessione non valida o scaduta'; $messages['imaperror'] = 'Impossibile connettersi al server IMAP'; $messages['servererror'] = 'Errore del server!'; $messages['servererrormsg'] = 'Errore del server: $msg'; -$messages['databaserror'] = 'Errore del database!'; +$messages['dberror'] = 'Errore del database!'; $messages['errorreadonly'] = 'Impossibile eseguire l\'operazione. Cartella in sola lettura'; $messages['errornoperm'] = 'Impossibile eseguire l\'operazione. Permesso negato'; $messages['invalidrequest'] = 'Richiesta non valida! Nessun dato salvato.'; diff --git a/program/localization/lt_LT/messages.inc b/program/localization/lt_LT/messages.inc index 696ca701c..135c133ed 100644 --- a/program/localization/lt_LT/messages.inc +++ b/program/localization/lt_LT/messages.inc @@ -25,7 +25,7 @@ $messages['sessionerror'] = 'Jūsų sesija negaliojanti'; $messages['imaperror'] = 'Nepavyko prisijungti prie IMAP serverio'; $messages['servererror'] = 'Serverio klaida!'; $messages['servererrormsg'] = 'Serverio klaida: $msg'; -$messages['databaserror'] = 'Duomenų bazės klaida!'; +$messages['dberror'] = 'Duomenų bazės klaida!'; $messages['errorreadonly'] = 'Nepavyko atlikti veiksmo – aplankas prieinamas tik skaitymui'; $messages['errornoperm'] = 'Nepavyko atlikti veiksmo – nepakanka teisių'; $messages['invalidrequest'] = 'Netinkama užklausa! Duomenys neišsaugoti.'; diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc index d5cf8df79..1cd0a2e1c 100644 --- a/program/localization/nl_NL/messages.inc +++ b/program/localization/nl_NL/messages.inc @@ -27,7 +27,7 @@ $messages['sessionerror'] = 'Uw sessie is verlopen of ongeldig'; $messages['imaperror'] = 'Connectie met IMAP server mislukt'; $messages['servererror'] = 'Server Fout!'; $messages['servererrormsg'] = 'Server Fout: $msg'; -$messages['databaserror'] = 'Database Fout!'; +$messages['dberror'] = 'Database Fout!'; $messages['errorreadonly'] = 'Niet in staat om de bewerking uit te voeren. Map is alleen-lezen'; $messages['errornoperm'] = 'Niet in staat om de bewerking uit te voeren. Toestemming geweigerd'; $messages['invalidrequest'] = 'Ongeldige aanvraag! Er zijn geen gegevens opgeslagen.'; diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc index aa7127d04..58ce75ea9 100644 --- a/program/localization/pl_PL/labels.inc +++ b/program/localization/pl_PL/labels.inc @@ -417,5 +417,8 @@ $labels['importtarget'] = 'Dodaj nowe kontakty do książki adresowej:'; $labels['grouprename'] = 'Zmień nazwę grupy'; $labels['groupdelete'] = 'Usuń grupę'; $labels['undo'] = 'Cofnij'; +$labels['mailreplyintro'] = 'W dniu $date, $sender napisał(a):'; +$labels['uploadprogress'] = '$percent ($current z $total)'; +$labels['originalmessage'] = 'Wiadomość oryginalna'; ?> diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc index 61ad15ff4..b85a41451 100644 --- a/program/localization/pl_PL/messages.inc +++ b/program/localization/pl_PL/messages.inc @@ -150,5 +150,11 @@ $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.'; +$messages['dberror'] = 'Błąd bazy danych!'; +$messages['contactnameexists'] = 'Kontakt z podaną nazwą już istnieje!'; +$messages['copyingcontact'] = 'Kopiowanie kontaktów...'; +$messages['addingmember'] = 'Dodawanie kontaktów do grupy...'; +$messages['removingmember'] = 'Usuwanie kontaktów z grupy...'; +$messages['parentnotwritable'] = 'Nie można utworzyć/przenieść folderu w wybrane miejsce. Brak upranień.'; ?> diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc index e1c97e982..56727393d 100644 --- a/program/localization/pt_BR/messages.inc +++ b/program/localization/pt_BR/messages.inc @@ -29,7 +29,7 @@ $messages['sessionerror'] = 'A sessão do seu navegador é inválida ou expirou' $messages['imaperror'] = 'Falha na conexão com o servidor IMAP'; $messages['servererror'] = 'Erro no Servidor!'; $messages['servererrormsg'] = 'Erro no Servidor: $msg'; -$messages['databaserror'] = 'Erro no banco de dados!'; +$messages['dberror'] = 'Erro no banco de dados!'; $messages['errorreadonly'] = 'Não foi possível realizar a operação. Pasta somente leitura'; $messages['errornoperm'] = 'Não foi possível realizar a operação. Acesso negado'; $messages['invalidrequest'] = 'Requisição inválida! Nenhum dado foi salvo.'; diff --git a/program/localization/pt_PT/messages.inc b/program/localization/pt_PT/messages.inc index 53474a3c3..783f41fe0 100644 --- a/program/localization/pt_PT/messages.inc +++ b/program/localization/pt_PT/messages.inc @@ -27,7 +27,7 @@ $messages['sessionerror'] = 'A sua sessão é inválida ou expirou'; $messages['imaperror'] = 'A ligação ao servidor IMAP falhou'; $messages['servererror'] = 'Erro do Servidor!'; $messages['servererrormsg'] = 'Erro do Servidor: $msg'; -$messages['databaserror'] = 'Erro de base de dados!'; +$messages['dberror'] = 'Erro de base de dados!'; $messages['errorreadonly'] = 'Não foi possível efectuar a operação. A pasta é só de leitura.'; $messages['errornoperm'] = 'Não tem permissões para efectuar esta operação.'; $messages['invalidrequest'] = 'Pedido inválido! Não foi guardada nenhuma informação.'; diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc index dc405f8a3..84d63d20b 100644 --- a/program/localization/ru_RU/messages.inc +++ b/program/localization/ru_RU/messages.inc @@ -25,7 +25,7 @@ $messages['sessionerror'] = 'Ваша сессия устарела'; $messages['imaperror'] = 'Неудачное соединение с IMAP сервером'; $messages['servererror'] = 'Ошибка сервера!'; $messages['servererrormsg'] = 'Ошибка сервера: $msg'; -$messages['databaserror'] = 'Ошибка базы данных!'; +$messages['dberror'] = 'Ошибка базы данных!'; $messages['errorreadonly'] = 'Невозможно выполнить операцию. Папка доступна только для чтения'; $messages['errornoperm'] = 'Невозможно выполнить операцию. Доступ запрещён'; $messages['invalidrequest'] = 'Неверный запрос! Информация не сохранена.'; diff --git a/program/localization/sk_SK/messages.inc b/program/localization/sk_SK/messages.inc index 7b6e63f10..460f4ea83 100644 --- a/program/localization/sk_SK/messages.inc +++ b/program/localization/sk_SK/messages.inc @@ -28,7 +28,7 @@ $messages['sessionerror'] = 'Vaše prihlásenie je neplatné alebo vypršala jeh $messages['imaperror'] = 'Nepodarilo sa spojiť s IMAP serverom'; $messages['servererror'] = 'Chyba servera!'; $messages['servererrormsg'] = 'Chyba servera: $msg'; -$messages['databaserror'] = 'Databázová chyba!'; +$messages['dberror'] = 'Databázová chyba!'; $messages['errorreadonly'] = 'Nemožno vykonať operáciu. Adresár je len na čítanie'; $messages['errornoperm'] = 'Nemožno vykonať operáciu. Prístup odmietnutý'; $messages['invalidrequest'] = 'Chybný požiadavek. Žiadne údaje neboli uložené.'; diff --git a/program/localization/sl_SI/messages.inc b/program/localization/sl_SI/messages.inc index 996a0fd40..d81449166 100644 --- a/program/localization/sl_SI/messages.inc +++ b/program/localization/sl_SI/messages.inc @@ -21,7 +21,7 @@ $messages['sessionerror'] = 'Seja je neveljavna ali je potekla.'; $messages['imaperror'] = 'Povezava z IMAP strežnikom je spodletela.'; $messages['servererror'] = 'Napaka strežnika!'; $messages['servererrormsg'] = 'Napaka strežnikaČ $msg'; -$messages['databaserror'] = 'Napaka v bazi'; +$messages['dberror'] = 'Napaka v bazi'; $messages['errorreadonly'] = 'Operacije ni bilo mogoče izvršiti. Mapa je na voljo samo za branje.'; $messages['errornoperm'] = 'Operacije ni bilo mogoče izvršiti. Dostop zavrnjen.'; $messages['invalidrequest'] = 'Neveljavna zahteva. Podatki niso bili shranjeni.'; diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc index ea4d6be02..3ac368bd1 100644 --- a/program/localization/sv_SE/messages.inc +++ b/program/localization/sv_SE/messages.inc @@ -26,7 +26,7 @@ $messages['sessionerror'] = 'Din inloggning är felaktig eller har gått ut'; $messages['imaperror'] = 'Anslutning till IMAP-servern misslyckades'; $messages['servererror'] = 'Serverfel!'; $messages['servererrormsg'] = 'Serverfel: $msg'; -$messages['databaserror'] = 'Databasfel!'; +$messages['dberror'] = 'Databasfel!'; $messages['errorreadonly'] = 'Åtgärden kunde inte utföras. Katalogen är skrivskyddad'; $messages['errornoperm'] = 'Åtgärden kunde inte utföras. Otillräcklig befogenhet'; $messages['invalidrequest'] = 'Ogiltig begäran! Informationen sparades inte.'; diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 4449ea0b2..38749675e 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -827,7 +827,7 @@ function rcmail_create_forward_body($body, $bodyIsHtml) if (!$bodyIsHtml) { - $prefix = "\n\n\n-------- Original Message --------\n"; + $prefix = "\n\n\n-------- " . rcube_label('originalmessage') . " --------\n"; $prefix .= 'Subject: ' . $MESSAGE->subject . "\n"; $prefix .= 'Date: ' . $MESSAGE->headers->date . "\n"; $prefix .= 'From: ' . $MESSAGE->get_header('from') . "\n"; @@ -848,7 +848,7 @@ function rcmail_create_forward_body($body, $bodyIsHtml) $body = rcmail_wash_html($body, array('safe' => $MESSAGE->is_safe), $cid_map); $prefix = sprintf( - "<br /><p>-------- Original Message --------</p>" . + "<br /><p>-------- " . rcube_label('originalmessage') . " --------</p>" . "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tbody>" . "<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Subject: </th><td>%s</td></tr>" . "<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Date: </th><td>%s</td></tr>" . diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc index 426c18ed0..a42e8d091 100644 --- a/program/steps/settings/edit_identity.inc +++ b/program/steps/settings/edit_identity.inc @@ -28,7 +28,7 @@ if (($_GET['_iid'] || $_POST['_iid']) && $RCMAIL->action=='edit-identity') { if (is_array($IDENTITY_RECORD)) $OUTPUT->set_env('iid', $IDENTITY_RECORD['identity_id']); else { - $OUTPUT->show_message('databaserror', 'error'); + $OUTPUT->show_message('dberror', 'error'); // go to identities page rcmail_overwrite_action('identities'); return; |