diff --git a/languages/bg.lang b/languages/bg.lang index 642e66ff..281df25f 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -92,6 +92,10 @@ $PALANG['pOverview_alias_address'] = 'От'; $PALANG['active'] = 'Активен'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'Е-мейл'; diff --git a/languages/ca.lang b/languages/ca.lang index 923b630f..ba0c2bc2 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -90,6 +90,10 @@ $PALANG['pOverview_alias_address'] = 'De'; $PALANG['active'] = 'Actiu'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'E-mail'; # XXX diff --git a/languages/cn.lang b/languages/cn.lang index c075cb2a..4d4f9b1c 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -91,6 +91,10 @@ $PALANG['pOverview_alias_address'] = '前往'; $PALANG['active'] = '活动'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = '邮件地址'; diff --git a/languages/cs.lang b/languages/cs.lang index 32b4a898..d7020934 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -99,6 +99,10 @@ $PALANG['pOverview_alias_address'] = 'Od'; $PALANG['active'] = 'Aktivní'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[a %s dalších...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/da.lang b/languages/da.lang index 7c01a664..cb9a7d75 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -95,6 +95,10 @@ $PALANG['pOverview_alias_address'] = 'Alias'; $PALANG['active'] = 'Aktiv'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[og %s til...]'; $PALANG['pOverview_mailbox_username'] = 'Emailadresse'; diff --git a/languages/de.lang b/languages/de.lang index 99455398..2d8579a0 100644 --- a/languages/de.lang +++ b/languages/de.lang @@ -93,6 +93,10 @@ $PALANG['pOverview_alias_address'] = 'Von'; $PALANG['active'] = 'Aktiv'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[und %s weitere...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/en.lang b/languages/en.lang index afaf8982..302681f8 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -99,6 +99,10 @@ $PALANG['pOverview_alias_address'] = 'From'; $PALANG['active'] = 'Active'; $PALANG['inactive'] = 'Inactive'; $PALANG['alias_active_filter'] = 'Forward status:'; +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/es.lang b/languages/es.lang index 508a09e2..727e4e66 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -91,6 +91,10 @@ $PALANG['pOverview_alias_address'] = 'De'; $PALANG['active'] = 'Activo'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'SMTP'; $PALANG['and_x_more'] = '[y %s más...]'; $PALANG['pOverview_mailbox_username'] = 'E-mail'; diff --git a/languages/et.lang b/languages/et.lang index 97ea7279..f0b129bb 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -91,6 +91,10 @@ $PALANG['pOverview_alias_address'] = 'Kellelt'; $PALANG['active'] = 'Aktiivne'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'E-posti aadress'; diff --git a/languages/eu.lang b/languages/eu.lang index aa27940b..4818eb28 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -90,6 +90,10 @@ $PALANG['pOverview_alias_address'] = 'Igorlea'; $PALANG['active'] = 'Aktibatua'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'E-mail'; diff --git a/languages/fi.lang b/languages/fi.lang index 0e49b03f..de8fd57c 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -92,6 +92,10 @@ $PALANG['pOverview_alias_address'] = 'Keneltä'; $PALANG['active'] = 'Aktiivinen'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[ja %s lisää...]'; $PALANG['pOverview_mailbox_username'] = 'Sähköposti'; diff --git a/languages/fo.lang b/languages/fo.lang index bd414f09..7bbf0197 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -91,6 +91,10 @@ $PALANG['pOverview_alias_address'] = 'Frá'; $PALANG['active'] = 'Virkin'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'E-post'; diff --git a/languages/fr.lang b/languages/fr.lang index 9550b594..e9657e44 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -95,6 +95,10 @@ $PALANG['pOverview_alias_address'] = 'De'; $PALANG['active'] = 'Actif'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[et %s en plus...]'; $PALANG['pOverview_mailbox_username'] = 'courriel'; diff --git a/languages/gl.lang b/languages/gl.lang index d24d7557..add43850 100644 --- a/languages/gl.lang +++ b/languages/gl.lang @@ -89,6 +89,10 @@ $PALANG['pOverview_alias_address'] = 'De'; $PALANG['active'] = 'Activo'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[e %s máis...]'; $PALANG['pOverview_mailbox_username'] = 'E-mail'; diff --git a/languages/hr.lang b/languages/hr.lang index 4582a7e6..df82579c 100644 --- a/languages/hr.lang +++ b/languages/hr.lang @@ -90,6 +90,10 @@ $PALANG['pOverview_alias_address'] = 'Od'; $PALANG['active'] = 'Aktivan'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'E-pošta'; diff --git a/languages/hu.lang b/languages/hu.lang index 6fe660c3..1726e426 100644 --- a/languages/hu.lang +++ b/languages/hu.lang @@ -92,6 +92,10 @@ $PALANG['pOverview_alias_address'] = 'Honnan'; $PALANG['active'] = 'Aktív'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/is.lang b/languages/is.lang index cbb2da51..5edad985 100644 --- a/languages/is.lang +++ b/languages/is.lang @@ -91,6 +91,10 @@ $PALANG['pOverview_alias_address'] = 'Póstur fyrir'; $PALANG['active'] = 'Virkt'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'Póstfang'; diff --git a/languages/it.lang b/languages/it.lang index 2f42ec1b..c22c1c74 100644 --- a/languages/it.lang +++ b/languages/it.lang @@ -93,6 +93,10 @@ $PALANG['pOverview_alias_address'] = 'Da'; $PALANG['active'] = 'Attivo'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[più %s altri...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/ja.lang b/languages/ja.lang index 028092e0..5deb3283 100644 --- a/languages/ja.lang +++ b/languages/ja.lang @@ -93,6 +93,10 @@ $PALANG['pOverview_alias_address'] = '転送元'; $PALANG['active'] = 'アクティブ'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[その他 %s 個]'; $PALANG['pOverview_mailbox_username'] = 'メールアドレス'; diff --git a/languages/lt.lang b/languages/lt.lang index 8d04ca19..5015aa48 100644 --- a/languages/lt.lang +++ b/languages/lt.lang @@ -91,6 +91,10 @@ $PALANG['pOverview_alias_address'] = 'Iš'; $PALANG['active'] = 'Įjungtas'; # XXX check text - should be 'Active' $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[ir %s daugiau...]'; $PALANG['pOverview_mailbox_username'] = 'El.paštas'; diff --git a/languages/mk.lang b/languages/mk.lang index f43bd014..af128287 100644 --- a/languages/mk.lang +++ b/languages/mk.lang @@ -91,6 +91,10 @@ $PALANG['pOverview_alias_address'] = 'Од'; $PALANG['active'] = 'Активен'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'Адреса'; diff --git a/languages/nb.lang b/languages/nb.lang index d616ff85..cac7b0ae 100644 --- a/languages/nb.lang +++ b/languages/nb.lang @@ -93,6 +93,10 @@ $PALANG['pOverview_alias_address'] = 'Fra'; $PALANG['active'] = 'Aktiv'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[og %s flere...]'; $PALANG['pOverview_mailbox_username'] = 'E-post'; diff --git a/languages/nl.lang b/languages/nl.lang index fa13f7a3..4000595a 100644 --- a/languages/nl.lang +++ b/languages/nl.lang @@ -93,6 +93,10 @@ $PALANG['pOverview_alias_address'] = 'Van'; $PALANG['active'] = 'Actief'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[en %s meer...]'; $PALANG['pOverview_mailbox_username'] = 'e-mail'; diff --git a/languages/nn.lang b/languages/nn.lang index d078fb56..ec5756b6 100644 --- a/languages/nn.lang +++ b/languages/nn.lang @@ -91,6 +91,10 @@ $PALANG['pOverview_alias_address'] = 'Fra'; $PALANG['active'] = 'Aktiv'; # XXX check text - should be 'Active' $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'E-post'; diff --git a/languages/pl.lang b/languages/pl.lang index 03fdaa45..99b56b71 100644 --- a/languages/pl.lang +++ b/languages/pl.lang @@ -94,6 +94,10 @@ $PALANG['pOverview_alias_address'] = 'Od'; $PALANG['active'] = 'Aktywny'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[i %s wiecej...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/pt-br.lang b/languages/pt-br.lang index 85ec56be..beebc332 100644 --- a/languages/pt-br.lang +++ b/languages/pt-br.lang @@ -93,6 +93,10 @@ $PALANG['pOverview_alias_address'] = 'De'; $PALANG['active'] = 'Habilitado'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[e %s mais...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/pt-pt.lang b/languages/pt-pt.lang index 8feae5f4..c1b51ae6 100644 --- a/languages/pt-pt.lang +++ b/languages/pt-pt.lang @@ -93,6 +93,10 @@ $PALANG['pOverview_alias_address'] = 'De'; $PALANG['active'] = 'Activado'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[e %s mais...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/ro.lang b/languages/ro.lang index 6731537d..0525daa4 100644 --- a/languages/ro.lang +++ b/languages/ro.lang @@ -92,6 +92,10 @@ $PALANG['pOverview_alias_address'] = 'De la'; $PALANG['active'] = 'Activ'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[inca %s ...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/ru.lang b/languages/ru.lang index 22d9906f..8ae114ef 100644 --- a/languages/ru.lang +++ b/languages/ru.lang @@ -95,6 +95,10 @@ $PALANG['pOverview_alias_address'] = 'От'; $PALANG['active'] = 'Активен'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[и еще %s...]'; $PALANG['pOverview_mailbox_username'] = 'Ящик'; diff --git a/languages/sk.lang b/languages/sk.lang index 07e7f0eb..b1d6087c 100644 --- a/languages/sk.lang +++ b/languages/sk.lang @@ -92,6 +92,10 @@ $PALANG['pOverview_alias_address'] = 'Od'; $PALANG['active'] = 'Aktívny'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[a %s ďalších...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/sl.lang b/languages/sl.lang index 171a729a..dad80f2d 100644 --- a/languages/sl.lang +++ b/languages/sl.lang @@ -91,6 +91,10 @@ $PALANG['pOverview_alias_address'] = 'Od'; $PALANG['active'] = 'Aktiven'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'E-pošta'; diff --git a/languages/sv.lang b/languages/sv.lang index b679f372..8e1e9c95 100644 --- a/languages/sv.lang +++ b/languages/sv.lang @@ -94,6 +94,10 @@ $PALANG['pOverview_alias_address'] = 'Från'; $PALANG['active'] = 'Aktiv'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[och %s mer...]'; $PALANG['pOverview_mailbox_username'] = 'E-post'; diff --git a/languages/tr.lang b/languages/tr.lang index 487dc8fd..05e0c5e7 100644 --- a/languages/tr.lang +++ b/languages/tr.lang @@ -91,6 +91,10 @@ $PALANG['pOverview_alias_address'] = 'Kimden'; $PALANG['active'] = 'Aktif'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[ve %s daha fazla...]'; $PALANG['pOverview_mailbox_username'] = 'E-posta'; diff --git a/languages/tw.lang b/languages/tw.lang index 4f4d2e72..b2af57b3 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -92,6 +92,10 @@ $PALANG['pOverview_alias_address'] = '前往'; $PALANG['active'] = '生效'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = '郵件地址'; diff --git a/languages/ua.lang b/languages/ua.lang index 5b1ca2e1..d8d7f463 100644 --- a/languages/ua.lang +++ b/languages/ua.lang @@ -93,6 +93,10 @@ $PALANG['pOverview_alias_address'] = 'Від кого'; $PALANG['active'] = 'Активний'; $PALANG['inactive'] = 'Inactive'; # XXX $PALANG['alias_active_filter'] = 'Forward status:'; # XXX +$PALANG['delete_inactive_button'] = 'Delete all inactive forwards'; # XXX +$PALANG['delete_inactive_confirm'] = 'Delete ALL inactive forwards in this domain? This cannot be undone.'; # XXX +$PALANG['pDelete_inactive_success'] = 'Deleted %s inactive forward(s).'; # XXX +$PALANG['pDelete_inactive_skipped'] = 'Skipped %s forward(s) that could not be deleted (protected or mailbox aliases).'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[та ще %s...]'; $PALANG['pOverview_mailbox_username'] = 'Поштова адреса (Email)'; diff --git a/public/delete-inactive.php b/public/delete-inactive.php new file mode 100644 index 00000000..be6e2257 --- /dev/null +++ b/public/delete-inactive.php @@ -0,0 +1,70 @@ +getList(array('domain' => $domain, 'active' => 0)); +$inactive = $handler->result(); + +$deleted = 0; +$skipped = 0; + +foreach (array_keys($inactive) as $address) { + # delete each alias through its handler so per-alias checks (ownership, + # protected/default aliases, mailbox aliases) are all honoured. + $one = new AliasHandler(0, $username, $is_admin); + if ($one->init($address) && $one->delete()) { + $deleted++; + } else { + $skipped++; + } +} + +flash_info(Config::Lang_f('pDelete_inactive_success', $deleted)); +if ($skipped > 0) { + flash_error(Config::Lang_f('pDelete_inactive_skipped', $skipped)); +} + +header('Location: list-virtual.php?domain=' . urlencode($domain)); +exit; diff --git a/public/list-virtual.php b/public/list-virtual.php index 8b22fdeb..58de0e99 100644 --- a/public/list-virtual.php +++ b/public/list-virtual.php @@ -57,6 +57,8 @@ if (isset($_POST['search']) && is_array($_POST['search'])) { // Active-status filter for the alias list (all|active|inactive). Persisted in // $_SESSION like the 'tab' selector below, so it survives pagination (whose // links only carry &limit=...). + + $fAliasActive = safeget('alias_active', safesession('list-virtual:alias_active', 'all')); if (!in_array($fAliasActive, ['all', 'active', 'inactive'], true)) { $fAliasActive = 'all'; diff --git a/templates/list-virtual.tpl b/templates/list-virtual.tpl index 538b583c..6d9f5323 100644 --- a/templates/list-virtual.tpl +++ b/templates/list-virtual.tpl @@ -66,15 +66,26 @@ {if $tab=='alias' || $tab=='all'}
{$PALANG.alias_active_filter} {if $alias_active=='all'}{$PALANG.all} - {else}{$PALANG.all}{/if} + {else}{$PALANG.all}{/if} {if $alias_active=='active'}{$PALANG.active} - {else}{$PALANG.active}{/if} + {else}{$PALANG.active}{/if} {if $alias_active=='inactive'}{$PALANG.inactive} - {else}{$PALANG.inactive}{/if} + {else}{$PALANG.inactive}{/if}
{$nav_bar_alias.top} {include file="list-virtual_alias.tpl"} {$nav_bar_alias.bottom} + {if $alias_active=='inactive' && $tAlias} +
+
+ + {CSRF_Token} + +
+
+ {/if} {/if} {if $tab=='all'}
diff --git a/tests/AliasHandlerTest.php b/tests/AliasHandlerTest.php index d013b838..dcc8efe6 100644 --- a/tests/AliasHandlerTest.php +++ b/tests/AliasHandlerTest.php @@ -432,4 +432,52 @@ class AliasHandlerTest extends \PHPUnit\Framework\TestCase $this->assertEquals(['inact@example.com'], array_keys($inactiveList)); $this->assertEquals(0, $inactiveList['inact@example.com']['active']); } + + + /** + * delete-inactive.php enumerates the inactive aliases and deletes each one + * through its handler. Verify that removes only the inactive aliases and + * leaves active ones untouched. + * @see https://github.com/postfixadmin/postfixadmin/issues/1057 + */ + public function testDeletingInactiveAliasesLeavesActiveOnes() + { + $this->addDomain('example.com', 'admin'); + + foreach (['keep@example.com' => 1, 'drop1@example.com' => 0, 'drop2@example.com' => 0] as $addr => $active) { + $x = new AliasHandler(1, 'admin', true); + $this->assertTrue($x->init($addr)); + $x->set([ + 'localpart' => explode('@', $addr)[0], + 'domain' => 'example.com', + 'active' => $active, + 'address' => $addr, + 'goto' => ['dest@example.com'], + ]); + $this->assertTrue($x->save(), json_encode($x->errormsg)); + } + + // Enumerate + delete the inactive ones, exactly as delete-inactive.php does. + $handler = new AliasHandler(0, 'admin', true); + $this->assertTrue($handler->getList(['domain' => 'example.com', 'active' => 0])); + $inactive = array_keys($handler->result()); + sort($inactive); + $this->assertEquals(['drop1@example.com', 'drop2@example.com'], $inactive); + + foreach ($inactive as $addr) { + $one = new AliasHandler(0, 'admin', true); + $this->assertTrue($one->init($addr)); + $this->assertTrue($one->delete(), json_encode($one->errormsg)); + } + + // No inactive aliases remain. + $handler = new AliasHandler(0, 'admin', true); + $this->assertTrue($handler->getList(['domain' => 'example.com', 'active' => 0])); + $this->assertEmpty($handler->result()); + + // The active alias (and the active default aliases) are still there. + $handler = new AliasHandler(0, 'admin', true); + $this->assertTrue($handler->getList(['domain' => 'example.com', 'active' => 1])); + $this->assertArrayHasKey('keep@example.com', $handler->result()); + } }