Skip to content

Add a note to explain the meaning of taglevels and kill level. #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ispconfig3_spam/ispconfig3_spam.php
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ function gen_table($attrib)
}

$out .= "<div id=\"spam-cont\">" . $spam_table->show() . "</div>\n";
$out .= '<br /><span>' . $this->gettext('policy_note') . "</span>\n";
$out .= "</fieldset>\n";
$out .= '</form>';

Expand Down
3 changes: 2 additions & 1 deletion ispconfig3_spam/localization/bg_BG.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ $labels['policy_entries'] = 'Създадени филтри';
$labels['policy_tag'] = 'Tag ниво';
$labels['policy_tag2'] = 'Tag2 ниво';
$labels['policy_kill'] = 'Kill ниво';
$labels['spamnopolicies'] = 'Все още няма налични правила';
$labels['spamnopolicies'] = 'Все още няма налични правила';
$labels['policy_note'] = "Note: Tag level: Score to start adding spam info headers to the email, Tag2 level: The system will add 'spam detected' headers at that score often moving it to a Junk folder, Kill level: The system will trigger spam evasive actions (e.g. blocks mail) at that level.";
3 changes: 2 additions & 1 deletion ispconfig3_spam/localization/cs_CZ.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ $labels['policy_entries'] = 'Dostupné politiky';
$labels['policy_tag'] = 'Tag úroveň';
$labels['policy_tag2'] = 'Tag2 úroveň';
$labels['policy_kill'] = 'Kill úroveň';
$labels['spamnopolicies'] = 'Žádné dostupné politiky';
$labels['spamnopolicies'] = 'Žádné dostupné politiky';
$labels['policy_note'] = "Note: Tag level: Score to start adding spam info headers to the email, Tag2 level: The system will add 'spam detected' headers at that score often moving it to a Junk folder, Kill level: The system will trigger spam evasive actions (e.g. blocks mail) at that level.";
3 changes: 2 additions & 1 deletion ispconfig3_spam/localization/da_DK.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ $labels['policy_entries'] = 'Tilgængelige politikker';
$labels['policy_tag'] = 'Tag niveau';
$labels['policy_tag2'] = 'Tag2 niveau';
$labels['policy_kill'] = 'Kill niveau';
$labels['spamnopolicies'] = 'Ingen tilgængelige politikker';
$labels['spamnopolicies'] = 'Ingen tilgængelige politikker';
$labels['policy_note'] = "Note: Tag level: Score to start adding spam info headers to the email, Tag2 level: The system will add 'spam detected' headers at that score often moving it to a Junk folder, Kill level: The system will trigger spam evasive actions (e.g. blocks mail) at that level.";
3 changes: 2 additions & 1 deletion ispconfig3_spam/localization/de_DE.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ $labels['policy_entries'] = 'Vorhandene Richtlinien';
$labels['policy_tag'] = 'Tag Level';
$labels['policy_tag2'] = 'Tag2 Level';
$labels['policy_kill'] = 'Kill Level';
$labels['spamnopolicies'] = 'Keine Richtlinien vorhanden';
$labels['spamnopolicies'] = 'Keine Richtlinien vorhanden';
$labels['policy_note'] = "Note: Tag level: Score to start adding spam info headers to the email, Tag2 level: The system will add 'spam detected' headers at that score often moving it to a Junk folder, Kill level: The system will trigger spam evasive actions (e.g. blocks mail) at that level.";
3 changes: 2 additions & 1 deletion ispconfig3_spam/localization/en_US.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ $labels['policy_entries'] = 'Available policies';
$labels['policy_tag'] = 'Tag level';
$labels['policy_tag2'] = 'Tag2 level';
$labels['policy_kill'] = 'Kill level';
$labels['spamnopolicies'] = 'No policies available';
$labels['spamnopolicies'] = 'No policies available';
$labels['policy_note'] = "Note: Tag level: Score to start adding spam info headers to the email, Tag2 level: The system will add 'spam detected' headers at that score often moving it to a Junk folder, Kill level: The system will trigger spam evasive actions (e.g. blocks mail) at that level.";
3 changes: 2 additions & 1 deletion ispconfig3_spam/localization/es_ES.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ $labels['policy_entries'] = 'Directivas disponibles';
$labels['policy_tag'] = 'Nivel tag';
$labels['policy_tag2'] = 'Nivel tag2';
$labels['policy_kill'] = 'Nivel kill';
$labels['spamnopolicies'] = 'No hay directivas disponibles';
$labels['spamnopolicies'] = 'No hay directivas disponibles';
$labels['policy_note'] = "Note: Tag level: Score to start adding spam info headers to the email, Tag2 level: The system will add 'spam detected' headers at that score often moving it to a Junk folder, Kill level: The system will trigger spam evasive actions (e.g. blocks mail) at that level.";
1 change: 1 addition & 0 deletions ispconfig3_spam/localization/fi_FI.inc
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ $labels['policy_tag'] = 'Tagayksen taso';
$labels['policy_tag2'] = 'Tagayksen taso 2';
$labels['policy_kill'] = 'Poiston taso';
$labels['spamnopolicies'] = 'Ei sääntöjä saatavilla';
$labels['policy_note'] = "Note: Tag level: Score to start adding spam info headers to the email, Tag2 level: The system will add 'spam detected' headers at that score often moving it to a Junk folder, Kill level: The system will trigger spam evasive actions (e.g. blocks mail) at that level.";
3 changes: 2 additions & 1 deletion ispconfig3_spam/localization/fr_FR.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ $labels['policy_entries'] = 'Directives disponibles';
$labels['policy_tag'] = 'Niveau de tag';
$labels['policy_tag2'] = 'Niveau de tag2';
$labels['policy_kill'] = 'Niveau de kill';
$labels['spamnopolicies'] = 'Pas de directives disponible';
$labels['spamnopolicies'] = 'Pas de directives disponible';
$labels['policy_note'] = "Note: Tag level: Score to start adding spam info headers to the email, Tag2 level: The system will add 'spam detected' headers at that score often moving it to a Junk folder, Kill level: The system will trigger spam evasive actions (e.g. blocks mail) at that level.";
3 changes: 2 additions & 1 deletion ispconfig3_spam/localization/gl_ES.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ $labels['policy_entries'] = 'Reglas disponibles';
$labels['policy_tag'] = 'Puntuación tag';
$labels['policy_tag2'] = 'Puntuación tag2';
$labels['policy_kill'] = 'Puntuación kill';
$labels['spamnopolicies'] = 'Non se definiron reglas';
$labels['spamnopolicies'] = 'Non se definiron reglas';
$labels['policy_note'] = "Note: Tag level: Score to start adding spam info headers to the email, Tag2 level: The system will add 'spam detected' headers at that score often moving it to a Junk folder, Kill level: The system will trigger spam evasive actions (e.g. blocks mail) at that level.";
3 changes: 2 additions & 1 deletion ispconfig3_spam/localization/hu_HU.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ $labels['policy_entries'] = 'Létező Szabályok';
$labels['policy_tag'] = 'Jelölési szint';
$labels['policy_tag2'] = 'Jelölési 2 szint';
$labels['policy_kill'] = 'Kidobási szint';
$labels['spamnopolicies'] = 'Nincsenek szabályok felvéve';
$labels['spamnopolicies'] = 'Nincsenek szabályok felvéve';
$labels['policy_note'] = "Note: Tag level: Score to start adding spam info headers to the email, Tag2 level: The system will add 'spam detected' headers at that score often moving it to a Junk folder, Kill level: The system will trigger spam evasive actions (e.g. blocks mail) at that level.";
3 changes: 2 additions & 1 deletion ispconfig3_spam/localization/it_IT.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ $labels['policy_entries'] = 'Modalità disponibili';
$labels['policy_tag'] = 'Tag Level';
$labels['policy_tag2'] = 'Tag2 Level';
$labels['policy_kill'] = 'Kill Level';
$labels['spamnopolicies'] = 'Nessuna modalità di gestione definita';
$labels['spamnopolicies'] = 'Nessuna modalità di gestione definita';
$labels['policy_note'] = "Note: Tag level: Score to start adding spam info headers to the email, Tag2 level: The system will add 'spam detected' headers at that score often moving it to a Junk folder, Kill level: The system will trigger spam evasive actions (e.g. blocks mail) at that level.";
3 changes: 2 additions & 1 deletion ispconfig3_spam/localization/lb_LU.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ $labels['policy_entries'] = 'Existéierend Strategien';
$labels['policy_tag'] = 'Tag Level';
$labels['policy_tag2'] = 'Tag2 Level';
$labels['policy_kill'] = 'Kill Level';
$labels['spamnopolicies'] = 'Et existéiere keng Strategien';
$labels['spamnopolicies'] = 'Et existéiere keng Strategien';
$labels['policy_note'] = "Note: Tag level: Score to start adding spam info headers to the email, Tag2 level: The system will add 'spam detected' headers at that score often moving it to a Junk folder, Kill level: The system will trigger spam evasive actions (e.g. blocks mail) at that level.";
1 change: 1 addition & 0 deletions ispconfig3_spam/localization/nl_NL.inc
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ $labels['policy_tag'] = 'Tag level';
$labels['policy_tag2'] = 'Tag2 level';
$labels['policy_kill'] = 'Kill level';
$labels['spamnopolicies'] = 'Geen policies beschikbaar';
$labels['policy_note'] = "Opmerking: Tag level: Score waarbij informatieve headers worden toegevoegd aan de email, Tag2 level: Score waarboven 'spam detected' headers worden toegevoegd, meestal gaat de het bericht dan naar een Junk map, Kill level: Score waarboven het systeem het bericht volledig blokkeerd.";
3 changes: 2 additions & 1 deletion ispconfig3_spam/localization/pl_PL.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ $labels['policy_entries'] = 'Dostępne polityki';
$labels['policy_tag'] = 'Poziom zaznaczenia';
$labels['policy_tag2'] = 'Poziom zaznaczenia2';
$labels['policy_kill'] = 'Poziom usunięcia';
$labels['spamnopolicies'] = 'Brak dostępnych polityk';
$labels['spamnopolicies'] = 'Brak dostępnych polityk';
$labels['policy_note'] = "Note: Tag level: Score to start adding spam info headers to the email, Tag2 level: The system will add 'spam detected' headers at that score often moving it to a Junk folder, Kill level: The system will trigger spam evasive actions (e.g. blocks mail) at that level.";
3 changes: 2 additions & 1 deletion ispconfig3_spam/localization/pt_BR.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ $labels['policy_entries'] = 'Regras de Spam Disponíveis';
$labels['policy_tag'] = 'Nível de Spam Tag';
$labels['policy_tag2'] = 'Nível de Spam Tag2';
$labels['policy_kill'] = 'Level Kill';
$labels['spamnopolicies'] = 'Não existem regras definidas';
$labels['spamnopolicies'] = 'Não existem regras definidas';
$labels['policy_note'] = "Note: Tag level: Score to start adding spam info headers to the email, Tag2 level: The system will add 'spam detected' headers at that score often moving it to a Junk folder, Kill level: The system will trigger spam evasive actions (e.g. blocks mail) at that level.";
3 changes: 2 additions & 1 deletion ispconfig3_spam/localization/ru_RU.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ $labels['policy_entries'] = 'Доступные политики';
$labels['policy_tag'] = 'Tag уровень';
$labels['policy_tag2'] = 'Tag2 уровень';
$labels['policy_kill'] = 'Kill уровень';
$labels['spamnopolicies'] = 'Политики не найдены';
$labels['spamnopolicies'] = 'Политики не найдены';
$labels['policy_note'] = "Note: Tag level: Score to start adding spam info headers to the email, Tag2 level: The system will add 'spam detected' headers at that score often moving it to a Junk folder, Kill level: The system will trigger spam evasive actions (e.g. blocks mail) at that level.";
3 changes: 2 additions & 1 deletion ispconfig3_spam/localization/sl_SI.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ $labels['policy_entries'] = 'Razpoložljivi pristopi';
$labels['policy_tag'] = 'Nivo oznake';
$labels['policy_tag2'] = 'Nivo oznake2';
$labels['policy_kill'] = 'Nivo Uniči';
$labels['spamnopolicies'] = 'Pravila niso določena';
$labels['spamnopolicies'] = 'Pravila niso določena';
$labels['policy_note'] = "Note: Tag level: Score to start adding spam info headers to the email, Tag2 level: The system will add 'spam detected' headers at that score often moving it to a Junk folder, Kill level: The system will trigger spam evasive actions (e.g. blocks mail) at that level.";
3 changes: 2 additions & 1 deletion ispconfig3_spam/localization/sv_SE.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ $labels['policy_entries'] = 'Tillgängliga regler';
$labels['policy_tag'] = 'Tagg-nivå';
$labels['policy_tag2'] = 'Tagg2-nivå';
$labels['policy_kill'] = 'Raderings-nivå';
$labels['spamnopolicies'] = 'Inga regler tillgängliga';
$labels['spamnopolicies'] = 'Inga regler tillgängliga';
$labels['policy_note'] = "Note: Tag level: Score to start adding spam info headers to the email, Tag2 level: The system will add 'spam detected' headers at that score often moving it to a Junk folder, Kill level: The system will trigger spam evasive actions (e.g. blocks mail) at that level.";
3 changes: 2 additions & 1 deletion ispconfig3_spam/localization/uk_UA.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ $labels['policy_entries'] = 'Доступні правила';
$labels['policy_tag'] = 'Рівень Tag';
$labels['policy_tag2'] = 'Рівень Tag2';
$labels['policy_kill'] = 'Рівень Kill';
$labels['spamnopolicies'] = 'Немає правил';
$labels['spamnopolicies'] = 'Немає правил';
$labels['policy_note'] = "Note: Tag level: Score to start adding spam info headers to the email, Tag2 level: The system will add 'spam detected' headers at that score often moving it to a Junk folder, Kill level: The system will trigger spam evasive actions (e.g. blocks mail) at that level.";