diff options
| author | alecpl <alec@alec.pl> | 2011-12-07 07:50:00 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-12-07 07:50:00 +0000 |
| commit | 3c5099f22b009ada55a967c10c6860927e003113 (patch) | |
| tree | da759a80549cda1334ed9a3566fb13d3184c155e | |
| parent | 1112978a8253c6bd3e547f20ff259625d45630fb (diff) | |
- Applied fixes from trunk up to r5553
| -rw-r--r-- | plugins/managesieve/localization/pt_BR.inc | 2 | ||||
| -rw-r--r-- | program/js/app.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/managesieve/localization/pt_BR.inc b/plugins/managesieve/localization/pt_BR.inc index b48774e97..af3f05add 100644 --- a/plugins/managesieve/localization/pt_BR.inc +++ b/plugins/managesieve/localization/pt_BR.inc @@ -32,7 +32,7 @@ $labels['add'] = 'Adicionar'; $labels['del'] = 'Excluir'; $labels['sender'] = 'Remetente'; $labels['recipient'] = 'Destinatário'; -$labels['vacationaddresses'] = 'Lista adicional de e-mails de remetente (separado por vírgula):'; +$labels['vacationaddresses'] = 'Lista adicional de e-mails destinatários (separado por vírgula):'; $labels['vacationdays'] = 'Enviar mensagens com que frequência (em dias):'; $labels['vacationreason'] = 'Corpo da mensagem (motivo de férias):'; $labels['rulestop'] = 'Parar de avaliar regras'; diff --git a/program/js/app.js b/program/js/app.js index 35806fce3..76ea145fe 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -4065,7 +4065,7 @@ function rcube_webmail() this.delete_contacts = function() { var selection = this.contact_list.get_selection(), - undelete = this.env.address_sources[this.env.source].undelete; + undelete = this.env.source && this.env.address_sources[this.env.source].undelete; // exit if no mailbox specified or if selection is empty if (!(selection.length || this.env.cid) || (!undelete && !confirm(this.get_label('deletecontactconfirm')))) |