diff --git a/init/edit_systemd.cgi b/init/edit_systemd.cgi
index 8d3f3a43a..f04526460 100755
--- a/init/edit_systemd.cgi
+++ b/init/edit_systemd.cgi
@@ -80,7 +80,8 @@ else {
[ 'start', $text{'edit_startnow'} ],
[ 'restart', $text{'edit_restartnow'} ],
[ 'stop', $text{'edit_stopnow'} ],
- [ 'delete', $text{'delete'} ] ]);
+ $in{'name'} eq 'webmin.service' ?
+ undef : [ 'delete', $text{'delete'} ] ]);
}
&ui_print_footer("", $text{'index_return'});
diff --git a/init/index.cgi b/init/index.cgi
index 2276772ec..b93bb75a3 100755
--- a/init/index.cgi
+++ b/init/index.cgi
@@ -122,7 +122,7 @@ elsif ($init_mode eq "init" && $access{'bootup'}) {
foreach $s (@{$actsb[$i]}) {
if ($s->[2]) {
$boot = 1;
- push(@levels, &ui_text_color($s->[0], 'danger'));
+ push(@levels, &ui_text_color($s->[0], 'warn'));
}
else {
push(@levels, $s->[0]);
@@ -139,7 +139,7 @@ elsif ($init_mode eq "init" && $access{'bootup'}) {
}
else {
push(@cols,$boot ? &ui_text_color("$text{'yes'}", 'success') :
- &ui_text_color("$text{'no'}", 'danger'));
+ &ui_text_color("$text{'no'}", 'warn'));
}
if ($config{'order'}) {
push(@cols, $order);
@@ -148,7 +148,7 @@ elsif ($init_mode eq "init" && $access{'bootup'}) {
if ($actsl[$i] =~ /^0/ && $has{'status'}) {
local $r = &action_running($actsf[$i]);
if ($r == 0) {
- push(@cols, &ui_text_color("$text{'no'}", 'danger'));
+ push(@cols, &ui_text_color("$text{'no'}", 'warn'));
}
elsif ($r == 1) {
push(@cols, &ui_text_color("$text{'yes'}", 'success'));
@@ -266,7 +266,7 @@ elsif ($init_mode eq "rc" && $access{'bootup'}) {
$rc->{'desc'},
$rc->{'enabled'} == 1 ? &ui_text_color("$text{'yes'}", 'success') :
$rc->{'enabled'} == 2 ? "$text{'index_unknown'}":
- &ui_text_color("$text{'no'}", 'danger'),
+ &ui_text_color("$text{'no'}", 'warn'),
]);
}
print &ui_columns_end();
@@ -305,11 +305,11 @@ elsif ($init_mode eq "upstart" && $access{'bootup'}) {
$u->{'desc'},
$u->{'boot'} eq 'start' ? &ui_text_color("$text{'yes'}", 'success') :
$u->{'boot'} eq 'stop' ?
- &ui_text_color("$text{'no'}", 'danger') :
+ &ui_text_color("$text{'no'}", 'warn') :
"$text{'index_unknown'}",
$u->{'status'} eq 'running' ? &ui_text_color("$text{'yes'}", 'success') :
$u->{'status'} eq 'waiting' ?
- &ui_text_color("$text{'no'}", 'danger') :
+ &ui_text_color("$text{'no'}", 'warn') :
"$text{'index_unknown'}",
]);
}
@@ -348,15 +348,20 @@ elsif ($init_mode eq "systemd" && $access{'bootup'}) {
}
print &ui_columns_row([
&ui_checkbox("d", $u->{'name'}, undef),
- &ui_link($l, $u->{'name'}),
+ $u->{'boot'} == -1 ?
+ &html_escape($u->{'name'}) : &ui_link($l, $u->{'name'}),
$u->{'desc'},
$u->{'fullstatus'} || "$text{'index_unknown'}",
- $u->{'boot'} == 1 ? &ui_text_color("$text{'yes'}", 'success') :
- $u->{'boot'} == 2 ? $text{'index_always'} :
- &ui_text_color("$text{'no'}", 'danger'),
+ $u->{'boot'} == 1 ?
+ &ui_text_color("$text{'yes'}", 'success') :
+ $u->{'boot'} == 2 ?
+ &ui_text_color("$text{'index_sboot6'}", 'success') :
+ $u->{'boot'} == -1 ?
+ &ui_text_color("$text{'index_sboot5'}", 'warn') :
+ &ui_text_color("$text{'no'}", 'warn'),
$u->{'status'} == 1 ? &ui_text_color("$text{'yes'}", 'success') :
$u->{'status'} == 0 ?
- &ui_text_color("$text{'no'}", 'danger') :
+ &ui_text_color("$text{'no'}", 'warn') :
"$text{'index_unknown'}",
]);
}
@@ -390,9 +395,9 @@ elsif ($init_mode eq "launchd" && $access{'bootup'}) {
&ui_checkbox("d", $u->{'name'}, undef),
&ui_link($l, $u->{'name'}),
$u->{'boot'} ? &ui_text_color("$text{'yes'}", 'success') :
- &ui_text_color("$text{'no'}", 'danger'),
+ &ui_text_color("$text{'no'}", 'warn'),
$u->{'status'} ? &ui_text_color("$text{'yes'}", 'success') :
- &ui_text_color("$text{'no'}", 'danger'),
+ &ui_text_color("$text{'no'}", 'warn'),
]);
}
print &ui_columns_end();
diff --git a/init/init-lib.pl b/init/init-lib.pl
index e082dbcc4..ff7a36c87 100755
--- a/init/init-lib.pl
+++ b/init/init-lib.pl
@@ -2215,7 +2215,8 @@ foreach my $name (keys %info) {
'desc' => $i->{'Description'},
'legacy' => 0,
'boot' => $i->{'UnitFileState'} eq 'enabled' ? 1 :
- $i->{'UnitFileState'} eq 'static' ? 2 : 0,
+ $i->{'UnitFileState'} eq 'static' ? 2 :
+ $i->{'UnitFileState'} eq 'masked' ? -1 : 0,
'status' => $i->{'ActiveState'} eq 'active' ? 1 : 0,
'substatus' => $i->{'SubState'},
'fullstatus' => $i->{'SubState'} ?
diff --git a/init/lang/af.auto b/init/lang/af.auto
index 6aadc46bd..ff5657d7d 100644
--- a/init/lang/af.auto
+++ b/init/lang/af.auto
@@ -38,6 +38,8 @@ index_sstate1=gestop
index_sboot2=Ja
index_sboot3=Geen
index_sboot4=gestremde
+index_sboot5=Nee (gemaskerde)
+index_sboot6=Ja altyd)
index_rname=Aksie naam
index_rdesc=beskrywing
index_rboot=Begin met die boot?
@@ -50,7 +52,6 @@ index_uboot=Begin met die boot?
index_ustatus=Nou hardloop?
index_uadd=Skep 'n nuwe suksesvolle diens.
index_sadd=Skep 'n nuwe stelsel-diens.
-index_always=altyd
index_ladd=Skep 'n nuwe agent wat bekendgestel is.
index_lname=Agent se naam
@@ -169,8 +170,8 @@ mass_enable=Aktiveer aksie $1 tydens opstart.
mass_disable=Deaktiveer aksie $1 tydens opstart.
mass_starting=Begin aksie $1 ..
mass_stopping=Stop aksie $1 ..
-mass_failed=.. misluk!
-mass_ok=.. klaar.
+mass_failed=.. misluk
+mass_ok=.. klaar
mass_ustart=Begin dienste
mass_urestart=Herbegin-dienste
mass_ustop=Stop dienste
diff --git a/init/lang/ar.auto b/init/lang/ar.auto
index 1f8d6d415..a94df2eb7 100644
--- a/init/lang/ar.auto
+++ b/init/lang/ar.auto
@@ -36,6 +36,8 @@ index_sstate1=توقفت
index_sboot2=نعم
index_sboot3=لا
index_sboot4=معاق
+index_sboot5=لا (مقنع)
+index_sboot6=نعم دائما)
index_rname=اسم العمل
index_rdesc=وصف
index_rboot=هل تريد البدء في التمهيد؟
@@ -48,7 +50,6 @@ index_uboot=هل تريد البدء في التمهيد؟
index_ustatus=تعمل الآن؟
index_uadd=إنشاء خدمة مبتدئة جديدة.
index_sadd=إنشاء خدمة systemd جديدة.
-index_always=دائما
index_ladd=إنشاء وكيل انطلاق جديد.
index_lname=اسم العميل
@@ -167,8 +168,8 @@ mass_enable=تمكين الإجراء$1 في وقت التمهيد.
mass_disable=تعطيل الإجراء$1 في وقت التمهيد.
mass_starting=جاري بدء الإجراء$1 ..
mass_stopping=جاري إيقاف الإجراء$1 ..
-mass_failed=.. فشل!
-mass_ok=.. فعله.
+mass_failed=.. باءت بالفشل
+mass_ok=.. فعله
mass_ustart=بدء الخدمات
mass_urestart=إعادة تشغيل الخدمات
mass_ustop=إيقاف الخدمات
diff --git a/init/lang/be.auto b/init/lang/be.auto
index 90f352d7b..22e606e00 100644
--- a/init/lang/be.auto
+++ b/init/lang/be.auto
@@ -38,6 +38,8 @@ index_sstate1=Спыніўся
index_sboot2=Так
index_sboot3=Не
index_sboot4=Інвалід
+index_sboot5=Не (у масцы)
+index_sboot6=Так (заўсёды)
index_rname=Назва дзеяння
index_rdesc=Апісанне
index_rboot=Пачаць з загрузкі?
@@ -50,7 +52,6 @@ index_uboot=Пачаць з загрузкі?
index_ustatus=Цяпер працуе?
index_uadd=Стварыце новую паслугу для запуску.
index_sadd=Стварыце новую сістэмную службу.
-index_always=Заўсёды
index_ladd=Стварыце новы запуск агента.
index_lname=Імя агента
@@ -169,8 +170,8 @@ mass_enable=Уключэнне дзеяння $1 падчас загрузкі.
mass_disable=Адключэнне дзеяння $1 падчас загрузкі.
mass_starting=Пачатак дзеяння $1.
mass_stopping=Спыненне дзеяння $1.
-mass_failed=.. няўдала!
-mass_ok=.. малайчына.
+mass_failed=.. не атрымалася
+mass_ok=.. зроблена
mass_ustart=Пачатак паслуг
mass_urestart=Паслугі перазагрузкі
mass_ustop=Спыненне паслуг
diff --git a/init/lang/bg.auto b/init/lang/bg.auto
index 66f1ec0a1..b20c25fcf 100644
--- a/init/lang/bg.auto
+++ b/init/lang/bg.auto
@@ -38,6 +38,8 @@ index_sstate1=Спряна
index_sboot2=да
index_sboot3=Не
index_sboot4=хора с увреждания
+index_sboot5=Не (маскиран)
+index_sboot6=Да винаги)
index_rname=Име на действието
index_rdesc=описание
index_rboot=Започнете от зареждане?
@@ -50,7 +52,6 @@ index_uboot=Започнете от зареждане?
index_ustatus=Сега тече?
index_uadd=Създайте нова услуга за стартиране.
index_sadd=Създайте нова системна услуга.
-index_always=Винаги
index_ladd=Създайте нов агент за стартиране.
index_lname=Име на агент
@@ -169,8 +170,8 @@ mass_enable=Активиране на действие $1 по време на
mass_disable=Деактивиране на действие $1 по време на зареждане.
mass_starting=Стартиращо действие $1 ..
mass_stopping=Спиране на действието $1 ..
-mass_failed=.. се провали!
-mass_ok=.. Свършен.
+mass_failed=.. се провали
+mass_ok=.. Свършен
mass_ustart=Стартиране на услуги
mass_urestart=Рестартиране на услуги
mass_ustop=Спиране на услуги
diff --git a/init/lang/ca b/init/lang/ca
index cd08790d6..173bed428 100644
--- a/init/lang/ca
+++ b/init/lang/ca
@@ -49,7 +49,6 @@ index_uboot=Inicia'l en engegar
index_ustatus=En execució
index_uadd=Crea un nou servei d'inici.
index_sadd=Crea un nou servei systemd.
-index_always=Sempre
index_ladd=Crea un nou agent launchd.
index_lname=Nom de l'agent
@@ -168,8 +167,6 @@ mass_enable=Activació de l'acció $1 en engegar.
mass_disable=Desactivació de l'acció $1 en engegar.
mass_starting=S'està iniciant l'acció $1...
mass_stopping=S'està aturant l'acció $1...
-mass_failed=...ha fallat!
-mass_ok=...fet.
mass_ustart=Inici de Serveis
mass_urestart=Reinici de Serveis
mass_ustop=Aturada de Serveis
diff --git a/init/lang/ca.auto b/init/lang/ca.auto
index 526aa870f..bb4fcbf7f 100644
--- a/init/lang/ca.auto
+++ b/init/lang/ca.auto
@@ -1,5 +1,10 @@
+index_sboot5=No (emmascarat)
+index_sboot6=Sí, sempre)
index_ucstatus=Estat del servei
+mass_failed=.. fracassat
+mass_ok=.. fet
+
systemd_file=Fitxer de configuració
syslog_journalctl=Registres SystemD
diff --git a/init/lang/cs b/init/lang/cs
index ccca0eae7..f5cf0460c 100644
--- a/init/lang/cs
+++ b/init/lang/cs
@@ -157,8 +157,6 @@ mass_enable=Zapnutí akce $1 při startu.
mass_disable=Vypnutí akce $1 při startu.
mass_starting=Spouštění akce $1 ..
mass_stopping=Ukončování akce $1 ..
-mass_failed=.. selhalo!
-mass_ok=.. hotovo.
change_err=Nemáte oprávnění přepínat úrovně běhu
change_title=Přepnutí úrovně běhu
diff --git a/init/lang/cs.auto b/init/lang/cs.auto
index 2c1645e29..788aaec91 100644
--- a/init/lang/cs.auto
+++ b/init/lang/cs.auto
@@ -1,4 +1,6 @@
index_mode=Zaváděcí systém : $1
+index_sboot5=Ne (maskováno)
+index_sboot6=Ano vždy)
index_uname=Název služby
index_udesc=Popis služby
index_ucstatus=Stav služby
@@ -6,12 +8,13 @@ index_uboot=Začít při spuštění?
index_ustatus=Běží nyní?
index_uadd=Vytvořte novou službu upstart.
index_sadd=Vytvořte novou službu systemd.
-index_always=Vždy
index_ladd=Vytvořte nového agenta launchd.
index_lname=Jméno agenta
edit_reloadnow2=Znovu načtěte konfigurační soubor
+mass_failed=.. selhal
+mass_ok=.. Hotovo
mass_ustart=Spouštění služeb
mass_urestart=Restartování služeb
mass_ustop=Zastavení služeb
diff --git a/init/lang/da.auto b/init/lang/da.auto
index 892648b96..24e402e49 100644
--- a/init/lang/da.auto
+++ b/init/lang/da.auto
@@ -38,6 +38,8 @@ index_sstate1=Holdt op
index_sboot2=Ja
index_sboot3=Ingen
index_sboot4=handicappet
+index_sboot5=Nej (maskeret)
+index_sboot6=Ja altid)
index_rname=Handlingsnavn
index_rdesc=Beskrivelse
index_rboot=Start ved opstart?
@@ -50,7 +52,6 @@ index_uboot=Start ved opstart?
index_ustatus=Kører nu?
index_uadd=Opret en ny upstart-tjeneste.
index_sadd=Opret en ny systemd-tjeneste.
-index_always=Altid
index_ladd=Opret en ny lanceret agent.
index_lname=Agent navn
@@ -169,8 +170,8 @@ mass_enable=Aktivering af handling $1 ved starttidspunktet.
mass_disable=Deaktiverer handling $1 ved starttidspunktet.
mass_starting=Starter handling $1 ..
mass_stopping=Stop handling $1 ..
-mass_failed=.. mislykkedes!
-mass_ok=.. Færdig.
+mass_failed=.. mislykkedes
+mass_ok=.. Færdig
mass_ustart=Starttjenester
mass_urestart=Genstartstjenester
mass_ustop=Stop af tjenester
diff --git a/init/lang/de b/init/lang/de
index 579c0d627..a91b9f181 100644
--- a/init/lang/de
+++ b/init/lang/de
@@ -49,7 +49,6 @@ index_uboot=Starte beim Booten?
index_ustatus=Läuft jetzt?
index_uadd=Erstellt einen neuen upstart Dienst.
index_sadd=Erstelle einen neuen systemd Dienst.
-index_always=Immer
index_ladd=Erstelle einen neuen launchd Agenten.
index_lname=Agentname
@@ -168,8 +167,6 @@ mass_enable=Aktiviere Aktion $1 zur Bootzeit.
mass_disable=Deaktiviere Aktion $1 zur Bootzeit.
mass_starting=Starte Aktion $1 ..
mass_stopping=Stoppe Aktion $1 ..
-mass_failed=.. gescheitert!
-mass_ok=.. erledigt.
mass_ustart=Starte Dienste
mass_urestart=Starte Dienste neu
mass_ustop=Stoppe Dienste
diff --git a/init/lang/de.auto b/init/lang/de.auto
index f96e6a289..86a44d2b9 100644
--- a/init/lang/de.auto
+++ b/init/lang/de.auto
@@ -1,5 +1,10 @@
+index_sboot5=Nein (maskiert)
+index_sboot6=Ja immer)
index_ucstatus=Service Status
+mass_failed=.. gescheitert
+mass_ok=.. erledigt
+
systemd_file=Konfigurationsdatei
syslog_journalctl=SystemD-Protokolle
diff --git a/init/lang/el.auto b/init/lang/el.auto
index bb739e59c..673116a56 100644
--- a/init/lang/el.auto
+++ b/init/lang/el.auto
@@ -38,6 +38,8 @@ index_sstate1=Σταμάτησε
index_sboot2=Ναί
index_sboot3=Οχι
index_sboot4=άτομα με ειδικές ανάγκες
+index_sboot5=Όχι (με μάσκα)
+index_sboot6=Ναι πάντα)
index_rname=Όνομα δράσης
index_rdesc=Περιγραφή
index_rboot=Ξεκινήστε από την εκκίνηση;
@@ -50,7 +52,6 @@ index_uboot=Ξεκινήστε από την εκκίνηση;
index_ustatus=Τρέχοντας τώρα;
index_uadd=Δημιουργήστε μια νέα υπηρεσία εκκίνησης.
index_sadd=Δημιουργήστε μια νέα συστημένη υπηρεσία.
-index_always=Πάντα
index_ladd=Δημιουργήστε ένα νέο πρακτορείο εκτόξευσης.
index_lname=Ονομα πράκτορα
@@ -169,8 +170,8 @@ mass_enable=Ενεργοποίηση ενέργειας $1 κατά την εκ
mass_disable=Απενεργοποίηση ενέργειας $1 κατά την εκκίνηση.
mass_starting=Εκκίνηση ενέργειας $1 ..
mass_stopping=Διακοπή ενέργειας $1 ..
-mass_failed=.. απέτυχε!
-mass_ok=.. Ολοκληρώθηκε.
+mass_failed=.. απέτυχε
+mass_ok=.. Ολοκληρώθηκε
mass_ustart=Υπηρεσίες εκκίνησης
mass_urestart=Επανεκκίνηση Υπηρεσιών
mass_ustop=Παύση Υπηρεσιών
diff --git a/init/lang/en b/init/lang/en
index 5202ac7a7..baedf6f53 100644
--- a/init/lang/en
+++ b/init/lang/en
@@ -38,6 +38,8 @@ index_sstate1=Stopped
index_sboot2=Yes
index_sboot3=No
index_sboot4=Disabled
+index_sboot5=No (masked)
+index_sboot6=Yes (always)
index_rname=Action name
index_rdesc=Description
index_rboot=Start at boot?
@@ -50,7 +52,6 @@ index_uboot=Start at boot?
index_ustatus=Running now?
index_uadd=Create a new upstart service.
index_sadd=Create a new systemd service.
-index_always=Always
index_ladd=Create a new launchd agent.
index_lname=Agent name
@@ -161,6 +162,7 @@ edit_hostconfig_title=Edit Hostconfig
mass_enone=No actions selected
mass_enone2=No services selected
+mass_enoallow=cannot stop $1
mass_start=Starting Actions
mass_restart=Restarting Actions
mass_stop=Stopping Actions
@@ -169,8 +171,9 @@ mass_enable=Enabling action $1 at boot time.
mass_disable=Disabling action $1 at boot time.
mass_starting=Starting action $1 ..
mass_stopping=Stopping action $1 ..
-mass_failed=.. failed!
-mass_ok=.. done.
+mass_failed=.. failed
+mass_skipped=.. skipped
+mass_ok=.. done
mass_ustart=Starting Services
mass_urestart=Restarting Services
mass_ustop=Stopping Services
diff --git a/init/lang/es.auto b/init/lang/es.auto
index f2aac8f8e..b5e6e991c 100644
--- a/init/lang/es.auto
+++ b/init/lang/es.auto
@@ -10,6 +10,8 @@ index_sstate1=Detenido
index_sboot2=si
index_sboot3=No
index_sboot4=Discapacitado
+index_sboot5=no (enmascarado)
+index_sboot6=si (siempre)
index_rname=Nombre de acción
index_rdesc=Descripción
index_rboot=Comience en el arranque?
@@ -22,7 +24,6 @@ index_uboot=Comience en el arranque?
index_ustatus=Corriendo ahora?
index_uadd=Crea un nuevo servicio advenedizo.
index_sadd=Cree un nuevo servicio systemd.
-index_always=Siempre
index_ladd=Crea un nuevo agente de launchd.
index_lname=Nombre del agente
@@ -51,8 +52,8 @@ mass_enone2=No hay servicios seleccionados
mass_restart=Reiniciar acciones
mass_starting=Iniciando acción $1 ..
mass_stopping=Deteniendo la acción $1 ..
-mass_failed=.. ¡ha fallado!
-mass_ok=.. hecho.
+mass_failed=.. ha fallado
+mass_ok=.. hecho
mass_ustart=Servicios de inicio
mass_urestart=Reiniciar servicios
mass_ustop=Detener servicios
diff --git a/init/lang/eu b/init/lang/eu
index 67d69742b..b430cbbcf 100644
--- a/init/lang/eu
+++ b/init/lang/eu
@@ -156,8 +156,6 @@ mass_enable=$1 ekintza karga denboran gaitzen.
mass_disable=$1 ekintza karga denboran desgaitzen.
mass_starting=$1 ekintza martxan jartzen ..
mass_stopping=$1 ekintza gelditzen ..
-mass_failed=.. Akatsa!
-mass_ok=.. Egina.
change_err=Ez zaude exekuzio-mailak aldatzera baimendua
change_title=Aldatu exekuzio-maila
diff --git a/init/lang/eu.auto b/init/lang/eu.auto
index 57a0ab8d9..bc7f811df 100644
--- a/init/lang/eu.auto
+++ b/init/lang/eu.auto
@@ -1,5 +1,7 @@
index_title=Abiarazi eta itzali
index_mode=Abiapuntu sistema : $1
+index_sboot5=Ez (mozorrotuta)
+index_sboot6=Bai (beti)
index_uname=Zerbitzuaren izena
index_udesc=Zerbitzuaren deskribapena
index_ucstatus=Zerbitzuaren egoera
@@ -7,12 +9,13 @@ index_uboot=Hasi abiarazi?
index_ustatus=Orain exekutatzen ari zara?
index_uadd=Sortu martxan dagoen zerbitzu berria.
index_sadd=Sortu sistema berriko zerbitzua.
-index_always=beti
index_ladd=Sortu abiarazteko agente berria.
index_lname=Agente izena
edit_reloadnow2=Berriro irakurri Konfigurazio fitxategia
+mass_failed=.. huts egin zuen
+mass_ok=.. eginda
mass_ustart=Zerbitzuak abiaraztea
mass_urestart=Zerbitzuak berrabiarazten dira
mass_ustop=Zerbitzuak gelditzea
diff --git a/init/lang/fa.auto b/init/lang/fa.auto
index 2aeebe150..50e2a6fbf 100644
--- a/init/lang/fa.auto
+++ b/init/lang/fa.auto
@@ -10,6 +10,8 @@ index_sstate1=متوقف شد
index_sboot2=آره
index_sboot3=نه
index_sboot4=معلول
+index_sboot5=خیر (نقابدار)
+index_sboot6=بله همیشه)
index_rname=نام عمل
index_rdesc=شرح
index_rboot=شروع کنید؟
@@ -22,7 +24,6 @@ index_uboot=شروع کنید؟
index_ustatus=الان دویدن؟
index_uadd=یک سرویس upstart جدید ایجاد کنید.
index_sadd=یک سرویس سیستمی جدید ایجاد کنید.
-index_always=همیشه
index_ladd=یک عامل راه اندازی شده جدید ایجاد کنید.
index_lname=نام عامل
@@ -52,8 +53,8 @@ mass_enone2=هیچ خدمتی انتخاب نشده است
mass_restart=شروع مجدد اقدامات
mass_starting=شروع کار$1 ..
mass_stopping=متوقف کردن عمل$1 ..
-mass_failed=.. ناموفق!
-mass_ok=.. انجام شده.
+mass_failed=.. ناموفق
+mass_ok=.. انجام شده
mass_ustart=خدمات شروع
mass_urestart=شروع مجدد خدمات
mass_ustop=متوقف کردن خدمات
diff --git a/init/lang/fi.auto b/init/lang/fi.auto
index 26abf47f4..b4bd41978 100644
--- a/init/lang/fi.auto
+++ b/init/lang/fi.auto
@@ -38,6 +38,8 @@ index_sstate1=pysäytetty
index_sboot2=Joo
index_sboot3=Ei
index_sboot4=Liikuntarajoitteinen
+index_sboot5=Ei (naamioitu)
+index_sboot6=Kyllä aina)
index_rname=Toiminnan nimi
index_rdesc=Kuvaus
index_rboot=Aloita käynnistyessä?
@@ -50,7 +52,6 @@ index_uboot=Aloita käynnistyessä?
index_ustatus=Juoksutko nyt?
index_uadd=Luo uusi käynnistyspalvelu.
index_sadd=Luo uusi järjestelmäpalvelu.
-index_always=Aina
index_ladd=Luo uusi käynnistetty agentti.
index_lname=Agentin nimi
@@ -169,8 +170,8 @@ mass_enable=Aktivoi toiminto $1 käynnistyksen aikana.
mass_disable=Toiminnan $1 poistaminen käytöstä käynnistyksen aikana.
mass_starting=Aloitetaan toiminto $1 ..
mass_stopping=Toiminnan $1 lopettaminen ..
-mass_failed=.. epäonnistui!
-mass_ok=.. valmis.
+mass_failed=.. epäonnistui
+mass_ok=.. tehty
mass_ustart=Palvelujen aloittaminen
mass_urestart=Palveluiden uudelleenkäynnistäminen
mass_ustop=Palvelujen lopettaminen
diff --git a/init/lang/fr b/init/lang/fr
index dc0d4f5e5..6e7947bf5 100644
--- a/init/lang/fr
+++ b/init/lang/fr
@@ -113,4 +113,3 @@ edit_hostconfig_scriptname=Nom du script
mass_start=Démarrage des actions
mass_stop=Arrêt des actions
mass_disable=Désactiver l'action $1 au moment du Boot.
-mass_ok=.. effectué.
diff --git a/init/lang/fr.auto b/init/lang/fr.auto
index a8b411857..07530036c 100644
--- a/init/lang/fr.auto
+++ b/init/lang/fr.auto
@@ -4,6 +4,8 @@ index_sname=Nom de l'action
index_sstate=État actuel
index_sboot=Commencez au démarrage?
index_sstate4=Fonctionnement
+index_sboot5=Non (masqué)
+index_sboot6=Oui toujours)
index_rname=Nom de l'action
index_rboot=Commencez au démarrage?
index_radd=Créez une nouvelle action.
@@ -15,7 +17,6 @@ index_uboot=Commencez au démarrage?
index_ustatus=Vous courez maintenant?
index_uadd=Créez un nouveau service parvenu.
index_sadd=Créez un nouveau service systemd.
-index_always=Toujours
index_ladd=Créez un nouvel agent launchd.
index_lname=Nom d'agent
@@ -61,7 +62,8 @@ mass_ebroken=L'action interrompue $1 ne peut pas être activée ou désactivée
mass_enable=Activation de l'action $1 au démarrage.
mass_starting=Démarrage de l'action $1 ..
mass_stopping=Arrêt de l'action $1 ..
-mass_failed=.. échoué!
+mass_failed=.. manqué
+mass_ok=.. Fini
mass_ustart=Démarrage des services
mass_urestart=Redémarrer les services
mass_ustop=Arrêt des services
diff --git a/init/lang/he.auto b/init/lang/he.auto
index f615bdd14..9e7498e71 100644
--- a/init/lang/he.auto
+++ b/init/lang/he.auto
@@ -38,6 +38,8 @@ index_sstate1=עצר
index_sboot2=כן
index_sboot3=לא
index_sboot4=נכים
+index_sboot5=לא (רעולי פנים)
+index_sboot6=כן תמיד)
index_rname=שם הפעולה
index_rdesc=תיאור
index_rboot=מתחילים באתחול?
@@ -50,7 +52,6 @@ index_uboot=מתחילים באתחול?
index_ustatus=רץ עכשיו?
index_uadd=צור שירות עליון חדש.
index_sadd=צור שירות מערכת חדש.
-index_always=תמיד
index_ladd=צור סוכן חדש שיושק.
index_lname=שם סוכן
@@ -169,8 +170,8 @@ mass_enable=הפעלת פעולה $1 בזמן האתחול.
mass_disable=השבתת פעולה $1 בזמן האתחול.
mass_starting=מתחיל בפעולה $1 ..
mass_stopping=הפסקת פעולה $1 ..
-mass_failed=.. נכשל!
-mass_ok=.. בוצע.
+mass_failed=.. נכשל
+mass_ok=.. בוצע
mass_ustart=שירותי התחלה
mass_urestart=שירותי הפעלה מחדש
mass_ustop=הפסקת שירותים
diff --git a/init/lang/hr.auto b/init/lang/hr.auto
index a57b6156c..d05d09a56 100644
--- a/init/lang/hr.auto
+++ b/init/lang/hr.auto
@@ -38,6 +38,8 @@ index_sstate1=zaustavljen
index_sboot2=Da
index_sboot3=Ne
index_sboot4=Onemogućeno
+index_sboot5=Ne (maskiran)
+index_sboot6=Da uvijek)
index_rname=Naziv radnje
index_rdesc=Opis
index_rboot=Započeti pri pokretanju?
@@ -50,7 +52,6 @@ index_uboot=Započeti pri pokretanju?
index_ustatus=Sada trčite?
index_uadd=Stvorite novu uslugu upstart.
index_sadd=Stvorite novu sustavsku uslugu.
-index_always=Stalno
index_ladd=Stvorite novi agent za pokretanje.
index_lname=Ime agenta
@@ -169,8 +170,8 @@ mass_enable=Omogućavanje radnje $1 u vrijeme pokretanja.
mass_disable=Onemogućavanje radnje $1 u vrijeme pokretanja.
mass_starting=Početna akcija $1.
mass_stopping=Zaustavljanje akcije $1 ..
-mass_failed=.. neuspjeh!
-mass_ok=.. gotovo.
+mass_failed=.. neuspjeh
+mass_ok=.. gotovo
mass_ustart=Pokretanje usluga
mass_urestart=Usluge ponovnog pokretanja
mass_ustop=Zaustavljanje usluga
diff --git a/init/lang/hu b/init/lang/hu
index 82e6dc3c9..dc64a74af 100644
--- a/init/lang/hu
+++ b/init/lang/hu
@@ -163,8 +163,6 @@ mass_enable=Enabling action $1 at boot time.
mass_disable=Disabling action $1 at boot time.
mass_starting=Starting action $1 ..
mass_stopping=Stopping action $1 ..
-mass_failed=.. failed!
-mass_ok=.. done.
mass_ustart=Starting Services
mass_urestart=Restarting Services
mass_ustop=Stopping Services
diff --git a/init/lang/hu.auto b/init/lang/hu.auto
index 597d1d1ed..d4d3a0c79 100644
--- a/init/lang/hu.auto
+++ b/init/lang/hu.auto
@@ -1,11 +1,15 @@
+index_sboot5=Nem (maszkos)
+index_sboot6=Igen mindig)
index_ucstatus=Szolgáltatás állapota
index_sadd=Hozzon létre egy új rendszeres szolgáltatást.
-index_always=Mindig
index_ladd=Hozzon létre egy új indított ügynököt.
index_lname=Ügynök neve
edit_reloadnow2=Olvassa újra a konfigurációs fájlt
+mass_failed=.. nem sikerült
+mass_ok=.. Kész
+
mode_systemd=systemd
mode_launchd=LaunchD
diff --git a/init/lang/it.auto b/init/lang/it.auto
index 50ed002e4..e450b28c8 100644
--- a/init/lang/it.auto
+++ b/init/lang/it.auto
@@ -30,6 +30,8 @@ index_sstate1=Fermato
index_sboot2=sì
index_sboot3=No
index_sboot4=Disabilitato
+index_sboot5=No (mascherato)
+index_sboot6=Si Sempre)
index_rname=Nome dell'azione
index_rdesc=Descrizione
index_rboot=Inizia all'avvio?
@@ -42,7 +44,6 @@ index_uboot=Inizia all'avvio?
index_ustatus=In esecuzione adesso?
index_uadd=Crea un nuovo servizio di avvio.
index_sadd=Crea un nuovo servizio systemd.
-index_always=Sempre
index_ladd=Crea un nuovo agente di avvio.
index_lname=Nome dell'agente
@@ -116,8 +117,8 @@ mass_enable=Abilitazione dell'azione $1 all'avvio.
mass_disable=Disabilitazione dell'azione $1 all'avvio.
mass_starting=Avvio dell'azione $1 ..
mass_stopping=Azione di arresto $1 ..
-mass_failed=.. fallito!
-mass_ok=.. fatto.
+mass_failed=.. fallito
+mass_ok=.. fatto
mass_ustart=Avvio dei servizi
mass_urestart=Riavvio dei servizi
mass_ustop=Servizi di arresto
diff --git a/init/lang/ja b/init/lang/ja
index 7275bbeeb..7257dd4f7 100644
--- a/init/lang/ja
+++ b/init/lang/ja
@@ -46,7 +46,6 @@ index_uname=サービス名
index_udesc=サービス詳細
index_uboot=起動時に実行?
index_ustatus=実行中?
-index_always=常に
edit_title=アクションの編集
create_title=アクションの作成
@@ -158,8 +157,6 @@ mass_enable=Enabling action $1 at boot time.
mass_disable=Disabling action $1 at boot time.
mass_starting=Starting action $1 ..
mass_stopping=Stopping action $1 ..
-mass_failed=.. failed!
-mass_ok=.. done.
change_err=ランレベルの変更は許可されていません
change_title=ランレベルの変更
diff --git a/init/lang/ja.auto b/init/lang/ja.auto
index 0591628c2..6b46d77e8 100644
--- a/init/lang/ja.auto
+++ b/init/lang/ja.auto
@@ -1,4 +1,6 @@
index_mode=ブートシステム： $1
+index_sboot5=いいえ (マスク)
+index_sboot6=はい、いつも）
index_ucstatus=サービスステータス
index_uadd=新しいupstartサービスを作成します。
index_sadd=新しいsystemdサービスを作成します。
@@ -12,6 +14,8 @@ log_condrestart=条件付きで再開されたアクション $1
log_reload=アクション $1をリロードしました
log_status=アクション $1のステータスを取得しました
+mass_failed=.. 失敗した
+mass_ok=.. 終わり
mass_ustart=サービスを開始する
mass_urestart=サービスの再起動
mass_ustop=サービスの停止
diff --git a/init/lang/ko b/init/lang/ko
index bcdfcf8b9..5c3f280c8 100644
--- a/init/lang/ko
+++ b/init/lang/ko
@@ -153,8 +153,6 @@ mass_enable=부팅 시 $1 동작 활성화
mass_disable=부팅 시 $1 동작 비 활성화
mass_starting=$1 동작 실행 ..
mass_stopping=$1 동작 정지 ..
-mass_failed=.. 실패!
-mass_ok=.. 완료
change_err=실행 레벨 변경 권한이 없습니다.
change_title=실행 레벨 변경
diff --git a/init/lang/ko.auto b/init/lang/ko.auto
index ae6b2c881..73fa45ccc 100644
--- a/init/lang/ko.auto
+++ b/init/lang/ko.auto
@@ -1,4 +1,6 @@
index_mode=부팅 시스템 : $1
+index_sboot5=아니요(마스크됨)
+index_sboot6=예(항상)
index_uname=서비스 이름
index_udesc=서비스 설명
index_ucstatus=서비스 상태
@@ -6,7 +8,6 @@ index_uboot=부팅 할 때 시작 하시겠습니까?
index_ustatus=지금 달려?
index_uadd=새로운 시작 서비스를 작성하십시오.
index_sadd=새로운 시스템 서비스를 작성하십시오.
-index_always=항상
index_ladd=새로 시작한 에이전트를 작성하십시오.
index_lname=에이전트 이름
@@ -17,6 +18,8 @@ log_condrestart=조건부로 재시작 된 작업 $1
log_reload=재로드 된 작업 $1
log_status=작업 $1 의 페치 상태
+mass_failed=.. 실패
+mass_ok=.. 완료
mass_ustart=서비스 시작
mass_urestart=서비스 재시작
mass_ustop=서비스 중지
diff --git a/init/lang/lt.auto b/init/lang/lt.auto
index 29d2c0864..df3721eca 100644
--- a/init/lang/lt.auto
+++ b/init/lang/lt.auto
@@ -38,6 +38,8 @@ index_sstate1=Sustojo
index_sboot2=Taip
index_sboot3=Ne
index_sboot4=Neįgalus
+index_sboot5=Ne (užmaskuotas)
+index_sboot6=Taip visada)
index_rname=Veiksmo pavadinimas
index_rdesc=apibūdinimas
index_rboot=Pradėti nuo įkrovos?
@@ -50,7 +52,6 @@ index_uboot=Pradėti nuo įkrovos?
index_ustatus=Veikia dabar?
index_uadd=Sukurkite naują įdiegtą paslaugą.
index_sadd=Sukurkite naują sisteminę paslaugą.
-index_always=Visada
index_ladd=Sukurkite naują paleistą agentą.
index_lname=Agento vardas
@@ -169,8 +170,8 @@ mass_enable=Įgalinamas veiksmas $1 įkrovos metu.
mass_disable=Išjungus veiksmą $1 įkrovos metu.
mass_starting=Pradedamas veiksmas $1 ..
mass_stopping=Sustabdyti veiksmą $1 ..
-mass_failed=.. nepavyko!
-mass_ok=.. padaryta.
+mass_failed=.. nepavyko
+mass_ok=.. padaryta
mass_ustart=Paslaugų pradžia
mass_urestart=Paslaugų paleidimas iš naujo
mass_ustop=Sustabdymo paslaugos
diff --git a/init/lang/lv.auto b/init/lang/lv.auto
index 43a4849e1..b913988f6 100644
--- a/init/lang/lv.auto
+++ b/init/lang/lv.auto
@@ -38,6 +38,8 @@ index_sstate1=Apstājās
index_sboot2=Jā
index_sboot3=Nē
index_sboot4=Invalīds
+index_sboot5=Nē (maskēts)
+index_sboot6=Jā, vienmēr)
index_rname=Darbības nosaukums
index_rdesc=Apraksts
index_rboot=Sākt no sāknēšanas?
@@ -50,7 +52,6 @@ index_uboot=Sākt no sāknēšanas?
index_ustatus=Darbojas tagad?
index_uadd=Izveidojiet jaunu sākotnējo pakalpojumu.
index_sadd=Izveidojiet jaunu systemd pakalpojumu.
-index_always=Vienmēr
index_ladd=Izveidojiet jaunu palaisto aģentu.
index_lname=Aģenta vārds
@@ -169,8 +170,8 @@ mass_enable=Iespējojot darbību $1 sāknēšanas laikā.
mass_disable=Darbības $1 atspējošana sāknēšanas laikā.
mass_starting=Sākot darbību $1 ..
mass_stopping=Darbības apturēšana $1 ..
-mass_failed=.. neizdevās!
-mass_ok=.. darīts.
+mass_failed=.. neizdevās
+mass_ok=.. darīts
mass_ustart=Pakalpojumu sākšana
mass_urestart=Pakalpojumu restartēšana
mass_ustop=Apstāšanās pakalpojumi
diff --git a/init/lang/ms.auto b/init/lang/ms.auto
index f0ab1ddb9..5912ddb5e 100644
--- a/init/lang/ms.auto
+++ b/init/lang/ms.auto
@@ -38,6 +38,8 @@ index_sstate1=Berhenti
index_sboot2=Ya
index_sboot3=Tidak
index_sboot4=Dinyahdayakan
+index_sboot5=Tidak (bertopeng)
+index_sboot6=Ya selalu)
index_rname=Nama tindakan
index_rdesc=Penerangan
index_rboot=Mula boot?
@@ -50,7 +52,6 @@ index_uboot=Mula boot?
index_ustatus=Berlari sekarang?
index_uadd=Buat perkhidmatan upstart baru.
index_sadd=Buat perkhidmatan sistem baru.
-index_always=Sentiasa
index_ladd=Buat agen pelancaran baru.
index_lname=Nama ejen
@@ -169,8 +170,8 @@ mass_enable=Mendayakan tindakan $1 pada masa boot.
mass_disable=Melumpuhkan tindakan $1 pada masa boot.
mass_starting=Bermula tindakan $1 ..
mass_stopping=Menghentikan tindakan $1 ..
-mass_failed=.. gagal!
-mass_ok=.. selesai.
+mass_failed=.. gagal
+mass_ok=.. selesai
mass_ustart=Memulakan Perkhidmatan
mass_urestart=Mulakan semula Perkhidmatan
mass_ustop=Menghentikan Perkhidmatan
diff --git a/init/lang/mt.auto b/init/lang/mt.auto
index f7795dd18..3962bfb74 100644
--- a/init/lang/mt.auto
+++ b/init/lang/mt.auto
@@ -38,6 +38,8 @@ index_sstate1=Waqaf
index_sboot2=Iva
index_sboot3=Le
index_sboot4=B'diżabilità
+index_sboot5=Le (maskra)
+index_sboot6=Iva (dejjem)
index_rname=Isem ta 'azzjoni
index_rdesc=Deskrizzjoni
index_rboot=Ibda mill-ibbutjar?
@@ -50,7 +52,6 @@ index_uboot=Ibda mill-ibbutjar?
index_ustatus=Tiġri issa?
index_uadd=Oħloq servizz upstart ġdid.
index_sadd=Oħloq servizz ta 'sistema ġdid.
-index_always=Dejjem
index_ladd=Oħloq aġent ta 'tnedija ġdid.
index_lname=Isem tal-aġent
@@ -169,8 +170,8 @@ mass_enable=Jippermetti l-azzjoni $1 fil-mument tal-bidu.
mass_disable=Iddiżattiva l-azzjoni $1 fil-mument tal-bidu.
mass_starting=Azzjoni li tibda $1 ..
mass_stopping=Azzjoni ta ’waqfien $1 ..
-mass_failed=.. naqas!
-mass_ok=.. ghamel.
+mass_failed=.. fallew
+mass_ok=.. magħmul
mass_ustart=Servizzi tal-Bidu
mass_urestart=Irristartja Servizzi
mass_ustop=Servizzi ta 'waqfien
diff --git a/init/lang/nl b/init/lang/nl
index cc7aa0612..27fe7f6bb 100644
--- a/init/lang/nl
+++ b/init/lang/nl
@@ -49,7 +49,6 @@ index_uboot=Starten tijdens booten?
index_ustatus=Nu uitvoeren?
index_uadd=Een nieuwe opstart service aanmaken.
index_sadd=Een nieuw systemd service aanmaken.
-index_always=Altijd
edit_title=Bewerk Actie
create_title=Creeer een Actie
@@ -165,8 +164,6 @@ mass_enable=Aanzetten actie $1 tijdens boot.
mass_disable=Uitzetten actie $1 tijdens boot
mass_starting=Starten van actie $1
mass_stopping=Stoppen van actie $1 ..
-mass_failed=.. mislukt!
-mass_ok=.. klaar.
mass_ustart=Starten van Services
mass_urestart=Services Herstarten
mass_ustop=Services Stoppen
diff --git a/init/lang/nl.auto b/init/lang/nl.auto
index 4bd95e7c6..246d15612 100644
--- a/init/lang/nl.auto
+++ b/init/lang/nl.auto
@@ -1,9 +1,14 @@
+index_sboot5=Nee (gemaskeerd)
+index_sboot6=Ja altijd)
index_ucstatus=Service status
index_ladd=Maak een nieuwe launchd-agent.
index_lname=Naam agent
edit_reloadnow2=Lees het configuratiebestand opnieuw
+mass_failed=.. mislukt
+mass_ok=.. gedaan
+
mode_launchd=LaunchD
systemd_file=Configuratiebestand
diff --git a/init/lang/no b/init/lang/no
index 79e6ef048..b11116b12 100644
--- a/init/lang/no
+++ b/init/lang/no
@@ -49,7 +49,6 @@ index_uboot=Start ved oppstart?
index_ustatus=Kjører nå?
index_uadd=Opprett ny oppstartstjeneste.
index_sadd=Opprett ny systsemd tjeneste.
-index_always=Alltid
index_ladd=Opprett ny launchd agent.
index_lname=Agent-navn
@@ -168,8 +167,6 @@ mass_enable=Slår på handling $1 ved oppstart.
mass_disable=Slår av handling $1 ved oppstart.
mass_starting=Starter handling $1 ..
mass_stopping=Stopper handling $1 ..
-mass_failed=.. feilet!
-mass_ok=.. ferdig.
mass_ustart=Starter tjenester
mass_urestart=Omstarter tjenester
mass_ustop=Stopper tjenester
diff --git a/init/lang/no.auto b/init/lang/no.auto
index 182e3225b..ff8b7af1e 100644
--- a/init/lang/no.auto
+++ b/init/lang/no.auto
@@ -1,3 +1,8 @@
+index_sboot5=Nei (maskert)
+index_sboot6=Ja alltid)
index_ucstatus=Tjenestestatus
+mass_failed=.. mislyktes
+mass_ok=.. ferdig
+
systemd_file=Konfigurasjonsfil
diff --git a/init/lang/pl b/init/lang/pl
index c4c806d93..1e9fd3d3e 100644
--- a/init/lang/pl
+++ b/init/lang/pl
@@ -46,7 +46,6 @@ index_uboot=Uruchamianie przy starcie?
index_ustatus=Działa?
index_uadd=Utwórz nową usługę upstart
index_sadd=Utwórz nową usługę systemd
-index_always=Zawsze
index_ladd=Tworzenie nowego agenta launchd.
index_lname=Nazwa agenta
@@ -164,8 +163,6 @@ mass_enable=Włączanie akcji $1 przy uruchamianiu.
mass_disable=Wyłączanie akcji $1 przy uruchamianiu.
mass_starting=Uruchamianie akcji $1 ..
mass_stopping=Zatrzymywanie akcji $1 ..
-mass_failed=.. niepowodzenie!
-mass_ok=.. gotowe.
mass_ustart=Uruchamianie usług
mass_urestart=Restartowanie usług
mass_ustop=Zatrzymywanie usług
diff --git a/init/lang/pl.auto b/init/lang/pl.auto
index 0a36087d7..b31cbf6d2 100644
--- a/init/lang/pl.auto
+++ b/init/lang/pl.auto
@@ -1,10 +1,15 @@
index_mode=System rozruchowy : $1
index_downscript=Podobnie skrypt $1 wymieniony poniżej zostanie uruchomiony w momencie zamknięcia. Możesz dodać własne polecenia, aby demony lub serwery zostały zatrzymane w sposób czysty po zamknięciu systemu.
index_rlchangedesc=Kliknij ten przycisk, aby przełączyć system z bieżącego poziomu uruchamiania na wybrany. Spowoduje to zatrzymanie wszystkich działań na bieżącym poziomie, a następnie uruchomienie wszystkich akcji na nowym poziomie uruchamiania.
+index_sboot5=Nie (zamaskowany)
+index_sboot6=Tak zawsze)
index_ucstatus=Status usługi
log_condrestart=Warunkowo wznowione działanie $1
+mass_failed=.. przegrany
+mass_ok=.. Gotowe
+
upstart_fork=Serwer rozwidla się w tle?
systemd_file=Plik konfiguracyjny
diff --git a/init/lang/pt.auto b/init/lang/pt.auto
index 8307c69ed..c212eb68e 100644
--- a/init/lang/pt.auto
+++ b/init/lang/pt.auto
@@ -30,6 +30,8 @@ index_sstate1=Parado
index_sboot2=sim
index_sboot3=Não
index_sboot4=Desativado
+index_sboot5=Não (mascarado)
+index_sboot6=Sim, sempre)
index_rname=Nome da ação
index_rdesc=Descrição
index_rboot=Iniciar na inicialização?
@@ -42,7 +44,6 @@ index_uboot=Iniciar na inicialização?
index_ustatus=Correndo agora?
index_uadd=Crie um novo serviço inicial.
index_sadd=Crie um novo serviço systemd.
-index_always=Sempre
index_ladd=Crie um novo agente launchd.
index_lname=Nome do agente
@@ -116,8 +117,8 @@ mass_enable=Ativando a ação $1 no momento da inicialização.
mass_disable=Desativando a ação $1 no momento da inicialização.
mass_starting=Iniciando a ação $1 ..
mass_stopping=Parando a ação $1 ..
-mass_failed=.. falhou!
-mass_ok=.. feito.
+mass_failed=.. fracassado
+mass_ok=.. feito
mass_ustart=Iniciando Serviços
mass_urestart=Reiniciando serviços
mass_ustop=Interrompendo Serviços
diff --git a/init/lang/pt_BR.auto b/init/lang/pt_BR.auto
index 71d39ac7a..2346e90e6 100644
--- a/init/lang/pt_BR.auto
+++ b/init/lang/pt_BR.auto
@@ -38,6 +38,8 @@ index_sstate1=Parado
index_sboot2=sim
index_sboot3=Não
index_sboot4=Desativado
+index_sboot5=Não (mascarado)
+index_sboot6=Sim, sempre)
index_rname=Nome da ação
index_rdesc=Descrição
index_rboot=Iniciar na inicialização?
@@ -50,7 +52,6 @@ index_uboot=Iniciar na inicialização?
index_ustatus=Correndo agora?
index_uadd=Crie um novo serviço inicial.
index_sadd=Crie um novo serviço systemd.
-index_always=Sempre
index_ladd=Crie um novo agente launchd.
index_lname=Nome do agente
@@ -169,8 +170,8 @@ mass_enable=Ativando a ação $1 no momento da inicialização.
mass_disable=Desativando a ação $1 no momento da inicialização.
mass_starting=Iniciando a ação $1 ..
mass_stopping=Parando a ação $1 ..
-mass_failed=.. falhou!
-mass_ok=.. feito.
+mass_failed=.. fracassado
+mass_ok=.. feito
mass_ustart=Iniciando Serviços
mass_urestart=Reiniciando serviços
mass_ustop=Interrompendo Serviços
diff --git a/init/lang/ro.auto b/init/lang/ro.auto
index 2ff32408b..4bf5611b7 100644
--- a/init/lang/ro.auto
+++ b/init/lang/ro.auto
@@ -38,6 +38,8 @@ index_sstate1=Oprit
index_sboot2=da
index_sboot3=Nu
index_sboot4=Dezactivat
+index_sboot5=Nu (mascat)
+index_sboot6=Da întotdeauna)
index_rname=Numele acțiunii
index_rdesc=Descriere
index_rboot=Începeți la pornire?
@@ -50,7 +52,6 @@ index_uboot=Începeți la pornire?
index_ustatus=Alerga acum?
index_uadd=Creați un nou serviciu de actualizare.
index_sadd=Creați un nou serviciu de sistem.
-index_always=Mereu
index_ladd=Creați un nou agent de lansare.
index_lname=Numele agentului
@@ -169,8 +170,8 @@ mass_enable=Activarea acțiunii $1 la momentul de pornire.
mass_disable=Dezactivarea acțiunii $1 la momentul de pornire.
mass_starting=Acțiunea de pornire $1 ..
mass_stopping=Acțiunea de oprire $1 ..
-mass_failed=.. a eșuat!
-mass_ok=.. Terminat.
+mass_failed=.. a eșuat
+mass_ok=.. Terminat
mass_ustart=Servicii de pornire
mass_urestart=Repornirea serviciilor
mass_ustop=Servicii de oprire
diff --git a/init/lang/ru b/init/lang/ru
index 0eb956556..63533caf0 100644
--- a/init/lang/ru
+++ b/init/lang/ru
@@ -156,8 +156,6 @@ mass_enable=Включение сценария $1 при загрузке си
mass_disable=Сценарий $1 выключен при загрузке системы.
mass_starting=Запуск сценария $1 ..
mass_stopping=Остановка сценария $1 ..
-mass_failed=.. не удалось!
-mass_ok=.. выполнено.
change_err=У вас недостаточно прав для изменения режима работы
change_title=Изменить режим работы
diff --git a/init/lang/ru.auto b/init/lang/ru.auto
index a18dc0ffa..2dcb47631 100644
--- a/init/lang/ru.auto
+++ b/init/lang/ru.auto
@@ -1,4 +1,6 @@
index_mode=Загрузочная система : $1
+index_sboot5=Нет (в маске)
+index_sboot6=Да всегда)
index_uname=Наименование услуги
index_udesc=Описание услуг
index_ucstatus=Статус услуги
@@ -6,7 +8,6 @@ index_uboot=Начать при загрузке?
index_ustatus=Бегом сейчас?
index_uadd=Создать новый сервис выскочки.
index_sadd=Создайте новый сервис systemd.
-index_always=Всегда
index_ladd=Создайте новый агент запуска.
index_lname=Имя агента
@@ -14,6 +15,8 @@ edit_reloadnow2=Перечитайте файл конфигурации
log_condrestart=Условно перезапущенное действие $1
+mass_failed=.. не удалось
+mass_ok=.. Выполнено
mass_ustart=Запуск Сервисов
mass_urestart=Перезапуск Сервисов
mass_ustop=Остановка услуг
diff --git a/init/lang/sk.auto b/init/lang/sk.auto
index 6c52048e1..e868d57d4 100644
--- a/init/lang/sk.auto
+++ b/init/lang/sk.auto
@@ -38,6 +38,8 @@ index_sstate1=zastavený
index_sboot2=Áno
index_sboot3=žiadny
index_sboot4=invalidný
+index_sboot5=Nie (maskované)
+index_sboot6=Áno vždy)
index_rname=Názov akcie
index_rdesc=popis
index_rboot=Začať pri štarte?
@@ -50,7 +52,6 @@ index_uboot=Začať pri štarte?
index_ustatus=Bežíte teraz?
index_uadd=Vytvorte novú službu upstart.
index_sadd=Vytvorte novú službu systemd.
-index_always=vždy
index_ladd=Vytvorte nového agenta spustenia.
index_lname=Meno agenta
@@ -169,8 +170,8 @@ mass_enable=Aktivuje sa akcia $1 pri spustení systému.
mass_disable=Zakazuje sa akcia $1 pri spustení systému.
mass_starting=Začína sa akcia $1 ..
mass_stopping=Zastavenie akcie $1 ..
-mass_failed=.. zlyhalo!
-mass_ok=.. hotový.
+mass_failed=.. nepodarilo sa
+mass_ok=.. hotový
mass_ustart=Spúšťanie služieb
mass_urestart=Reštartovacie služby
mass_ustop=Zastavenie služieb
diff --git a/init/lang/sl.auto b/init/lang/sl.auto
index feaf4f477..a3c4b9adf 100644
--- a/init/lang/sl.auto
+++ b/init/lang/sl.auto
@@ -38,6 +38,8 @@ index_sstate1=Ustavljeno
index_sboot2=Da
index_sboot3=Ne
index_sboot4=Onemogočeno
+index_sboot5=Ne (zamaskiran)
+index_sboot6=da (vedno)
index_rname=Ime akcije
index_rdesc=Opis
index_rboot=Začeti ob zagonu?
@@ -50,7 +52,6 @@ index_uboot=Začeti ob zagonu?
index_ustatus=Teče zdaj?
index_uadd=Ustvari novo storitev za zagon.
index_sadd=Ustvari novo sistemsko storitev.
-index_always=Nenehno
index_ladd=Ustvarite nov agent za zagon.
index_lname=Ime agenta
@@ -169,8 +170,8 @@ mass_enable=Omogočanje dejanja $1 ob zagonu.
mass_disable=Onemogočanje dejanja $1 ob zagonu.
mass_starting=Začetek akcije $1.
mass_stopping=Ustavitev dejanja $1.
-mass_failed=.. ni uspelo!
-mass_ok=.. Končano.
+mass_failed=.. ni uspelo
+mass_ok=.. Končano
mass_ustart=Zagon storitev
mass_urestart=Ponovni zagon storitev
mass_ustop=Ustavljanje storitev
diff --git a/init/lang/sv.auto b/init/lang/sv.auto
index 1057d9ff1..708a4c727 100644
--- a/init/lang/sv.auto
+++ b/init/lang/sv.auto
@@ -26,6 +26,8 @@ index_sstate1=stoppad
index_sboot2=Ja
index_sboot3=Nej
index_sboot4=Inaktiverad
+index_sboot5=Nej (maskerad)
+index_sboot6=Ja alltid)
index_rname=Åtgärdens namn
index_rdesc=Beskrivning
index_rboot=Börja vid start?
@@ -38,7 +40,6 @@ index_uboot=Börja vid start?
index_ustatus=Kör nu?
index_uadd=Skapa en ny upstart-tjänst.
index_sadd=Skapa en ny systemdjänst.
-index_always=Alltid
index_ladd=Skapa en ny lanserad agent.
index_lname=Agent namn
@@ -92,8 +93,8 @@ mass_enable=Aktiverar åtgärd $1 vid starttid.
mass_disable=Inaktiverar åtgärd $1 vid starttid.
mass_starting=Starta åtgärd $1 ..
mass_stopping=Stoppar åtgärd $1 ..
-mass_failed=.. misslyckades!
-mass_ok=.. Gjort.
+mass_failed=.. misslyckades
+mass_ok=.. Gjort
mass_ustart=Starta tjänster
mass_urestart=Starta om tjänster
mass_ustop=Stoppningstjänster
diff --git a/init/lang/th.auto b/init/lang/th.auto
index 56df38786..0204a006d 100644
--- a/init/lang/th.auto
+++ b/init/lang/th.auto
@@ -38,6 +38,8 @@ index_sstate1=หยุด
index_sboot2=ใช่
index_sboot3=ไม่
index_sboot4=พิการ
+index_sboot5=ไม่ (สวมหน้ากาก)
+index_sboot6=ใช่เสมอ)
index_rname=ชื่อการกระทำ
index_rdesc=ลักษณะ
index_rboot=เริ่มตอนบูทเหรอ?
@@ -50,7 +52,6 @@ index_uboot=เริ่มตอนบูทเหรอ?
index_ustatus=วิ่งตอนนี้เหรอ?
index_uadd=สร้างบริการพุ่งพรวดใหม่
index_sadd=สร้างบริการ systemd ใหม่
-index_always=เสมอ
index_ladd=สร้างเอเจนต์ launchd ใหม่
index_lname=ชื่อตัวแทน
@@ -169,7 +170,7 @@ mass_enable=เปิดใช้งานแอ็คชัน $1 ในเว
mass_disable=ปิดใช้งานการกระทำ $1 ในเวลาบูต
mass_starting=เริ่มการกระทำ $1 ..
mass_stopping=หยุดการกระทำ $1 ..
-mass_failed=.. ล้มเหลว!
+mass_failed=.. ล้มเหลว
mass_ok=.. เสร็จแล้ว
mass_ustart=เริ่มบริการ
mass_urestart=เริ่มบริการใหม่
diff --git a/init/lang/tr.auto b/init/lang/tr.auto
index dd5ba7efe..20b254b1d 100644
--- a/init/lang/tr.auto
+++ b/init/lang/tr.auto
@@ -27,6 +27,8 @@ index_sstate1=Durduruldu
index_sboot2=Evet
index_sboot3=Hayır
index_sboot4=engelli
+index_sboot5=Hayır (maskeli)
+index_sboot6=Evet herzaman)
index_rname=İşlem adı
index_rdesc=Açıklama
index_rboot=Önyüklemeden başla?
@@ -39,7 +41,6 @@ index_uboot=Önyüklemeden başla?
index_ustatus=Şimdi mi koşuyorsunuz?
index_uadd=Yeni bir başlangıç hizmeti oluşturun.
index_sadd=Yeni bir systemd hizmeti oluşturun.
-index_always=Her zaman
index_ladd=Yeni bir launchd aracısı oluşturun.
index_lname=Ajan adı
@@ -103,8 +104,8 @@ mass_enable=$1 eylemi önyükleme zamanında etkinleştiriliyor.
mass_disable=$1 eylemini önyükleme zamanında devre dışı bırakma.
mass_starting=İşlem başlatılıyor $1 ..
mass_stopping=İşlem durduruluyor $1 ..
-mass_failed=.. başarısız oldu!
-mass_ok=.. bitti.
+mass_failed=.. arızalı
+mass_ok=.. tamamlamak
mass_ustart=Başlangıç Hizmetleri
mass_urestart=Hizmetleri Yeniden Başlatma
mass_ustop=Durdurma Hizmetleri
diff --git a/init/lang/uk.auto b/init/lang/uk.auto
index 0c180c7c1..a119b5bab 100644
--- a/init/lang/uk.auto
+++ b/init/lang/uk.auto
@@ -15,6 +15,8 @@ index_sstate1=Зупинився
index_sboot2=Так
index_sboot3=Ні
index_sboot4=Інваліди
+index_sboot5=Ні (в масці)
+index_sboot6=Так, завжди)
index_rname=Назва дії
index_rdesc=Опис
index_rboot=Почати з завантаження?
@@ -27,7 +29,6 @@ index_uboot=Почати з завантаження?
index_ustatus=Працює зараз?
index_uadd=Створіть нову послугу для запуску.
index_sadd=Створіть нову системну службу.
-index_always=Завжди
index_ladd=Створіть новий запуск агент.
index_lname=Ім'я агента
@@ -69,8 +70,8 @@ mass_enable=Увімкнення дії $1 під час завантаженн
mass_disable=Вимкнення дії $1 під час завантаження.
mass_starting=Початкова дія $1.
mass_stopping=Припинення дії $1.
-mass_failed=.. не вдалося!
-mass_ok=.. зроблено.
+mass_failed=.. не вдалося
+mass_ok=.. зроблено
mass_ustart=Запуск послуг
mass_urestart=Перезапуск послуг
mass_ustop=Припинення послуг
diff --git a/init/lang/ur.auto b/init/lang/ur.auto
index 8225e98ef..fba79ed57 100644
--- a/init/lang/ur.auto
+++ b/init/lang/ur.auto
@@ -38,6 +38,8 @@ index_sstate1=رک گیا
index_sboot2=جی ہاں
index_sboot3=نہیں
index_sboot4=غیر فعال
+index_sboot5=نہیں (نقاب پوش)
+index_sboot6=ہاں ہمیشہ)
index_rname=ایکشن کا نام
index_rdesc=تفصیل
index_rboot=بوٹ پر شروع کریں؟
@@ -50,7 +52,6 @@ index_uboot=بوٹ پر شروع کریں؟
index_ustatus=ابھی چل رہا ہے؟
index_uadd=ایک نئی اسٹارسٹ سروس بنائیں۔
index_sadd=ایک نیا نظام خدمات انجام دیں۔
-index_always=ہمیشہ
index_ladd=ایک نیا لانچ شدہ ایجنٹ بنائیں۔
index_lname=ایجنٹ کا نام
@@ -169,8 +170,8 @@ mass_enable=بوٹ کے وقت کارروائی $1 کو چالو کرنا۔
mass_disable=بوٹ وقت ایکشن$1 کو غیر فعال کرنا۔
mass_starting=کارروائی شروع کر رہا ہے$1 ..
mass_stopping=کارروائی روکنا$1 ..
-mass_failed=.. ناکام!
-mass_ok=.. ہو گیا۔
+mass_failed=.. ناکام
+mass_ok=.. ہو گیا
mass_ustart=سروسز شروع کرنا
mass_urestart=خدمات کو دوبارہ شروع کرنا
mass_ustop=خدمات روکنا
diff --git a/init/lang/vi.auto b/init/lang/vi.auto
index 08f827db3..46157a832 100644
--- a/init/lang/vi.auto
+++ b/init/lang/vi.auto
@@ -38,6 +38,8 @@ index_sstate1=Ngừng
index_sboot2=Đúng
index_sboot3=Không
index_sboot4=Tàn tật
+index_sboot5=Không (mặt nạ)
+index_sboot6=Có (luôn luôn)
index_rname=Tên hành động
index_rdesc=Sự miêu tả
index_rboot=Bắt đầu lúc khởi động?
@@ -50,7 +52,6 @@ index_uboot=Bắt đầu lúc khởi động?
index_ustatus=Chạy ngay bây giờ?
index_uadd=Tạo một dịch vụ mới bắt đầu.
index_sadd=Tạo một dịch vụ systemd mới.
-index_always=Luôn luôn
index_ladd=Tạo một tác nhân launchd mới.
index_lname=Tên đại lý
@@ -169,8 +170,8 @@ mass_enable=Kích hoạt hành động $1 khi khởi động.
mass_disable=Vô hiệu hóa hành động $1 khi khởi động.
mass_starting=Bắt đầu hành động $1 ..
mass_stopping=Dừng hành động $1 ..
-mass_failed=.. thất bại!
-mass_ok=.. làm xong.
+mass_failed=.. thất bại
+mass_ok=.. xong
mass_ustart=Dịch vụ bắt đầu
mass_urestart=Dịch vụ khởi động lại
mass_ustop=Dịch vụ dừng
diff --git a/init/lang/zh.auto b/init/lang/zh.auto
index 54d8149f3..7e4e36f29 100644
--- a/init/lang/zh.auto
+++ b/init/lang/zh.auto
@@ -16,6 +16,8 @@ index_sstate1=已停止
index_sboot2=是
index_sboot3=没有
index_sboot4=残障人士
+index_sboot5=否（蒙面）
+index_sboot6=是的，总是）
index_rname=动作名称
index_rdesc=描述
index_rboot=从启动开始？
@@ -28,7 +30,6 @@ index_uboot=从启动开始？
index_ustatus=现在跑步？
index_uadd=创建一个新的新贵服务。
index_sadd=创建一个新的systemd服务。
-index_always=总是
index_ladd=创建一个新启动的代理。
index_lname=代理名称
@@ -67,8 +68,8 @@ mass_enable=在启动时启用操作 $1。
mass_disable=在引导时禁用操作 $1。
mass_starting=开始动作 $1 ..
mass_stopping=停止动作 $1 ..
-mass_failed=..失败了！
-mass_ok=..完成。
+mass_failed=.. 失败的
+mass_ok=.. 完毕
mass_ustart=启动服务
mass_urestart=重新启动服务
mass_ustop=停止服务
diff --git a/init/lang/zh_TW.auto b/init/lang/zh_TW.auto
index 5fb3dee16..c4deec516 100644
--- a/init/lang/zh_TW.auto
+++ b/init/lang/zh_TW.auto
@@ -16,6 +16,8 @@ index_sstate1=已停止
index_sboot2=是
index_sboot3=沒有
index_sboot4=殘障人士
+index_sboot5=否（蒙面）
+index_sboot6=是的，總是）
index_rname=動作名稱
index_rdesc=描述
index_rboot=從啟動開始？
@@ -28,7 +30,6 @@ index_uboot=從啟動開始？
index_ustatus=現在跑步？
index_uadd=創建一個新的新貴服務。
index_sadd=創建一個新的systemd服務。
-index_always=總是
index_ladd=創建一個新啟動的代理。
index_lname=代理名稱
@@ -69,8 +70,8 @@ mass_enable=在啟動時啟用操作 $1。
mass_disable=在引導時禁用操作 $1。
mass_starting=開始動作 $1 ..
mass_stopping=停止動作 $1 ..
-mass_failed=..失敗了！
-mass_ok=..完成。
+mass_failed=.. 失敗的
+mass_ok=.. 完畢
mass_ustart=啟動服務
mass_urestart=重新啟動服務
mass_ustop=停止服務
diff --git a/init/mass_systemd.cgi b/init/mass_systemd.cgi
index be5d665bb..139da70f6 100755
--- a/init/mass_systemd.cgi
+++ b/init/mass_systemd.cgi
@@ -15,52 +15,86 @@ $disable = 1 if ($in{'delboot'} || $in{'delboot_stop'});
&ui_print_unbuffered_header(undef, $start || $enable ? $text{'mass_ustart'}
: $text{'mass_ustop'}, "");
-if ($start || $stop || $restart) {
+# Try to stop and restart first
+if ($stop || $restart) {
# Starting or stopping a bunch of services
- $SIG{'TERM'} = 'ignore'; # Restarting webmin may kill this script
$access{'bootup'} || &error($text{'ss_ecannot'});
+ $SIG{'TERM'} = 'ignore'; # Restarting webmin may kill this script
foreach $s (@sel) {
- if ($start) {
- print &text('mass_ustarting', "$s"),"\n";
- ($ok, $out) = &start_action($s);
- }
- elsif ($stop) {
- print &text('mass_ustopping', "$s"),"
\n";
- ($ok, $out) = &stop_action($s);
+ my ($ok, $out);
+ my $is_webmin = $s eq 'webmin.service';
+ if ($stop) {
+ print &text('mass_ustopping', "$s"),"
\n";
+ ($ok, $out) = &stop_action($s)
+ if (!$is_webmin);
}
elsif ($restart) {
- print &text('mass_urestarting', "$s"),"
\n";
- ($ok, $out) = &restart_action($s);
+ print &text('mass_urestarting', "$s"),"
\n";
+ if (!$is_webmin) {
+ ($ok, $out) = &restart_action($s);
+ }
+ else {
+ &restart_miniserv();
+ }
}
- print "
$out
";
- if (!$ok) {
- print $text{'mass_failed'},"\n";
+ print "
$out
" if ($out);
+ if ($is_webmin) {
+ print "$text{'mass_skipped'} : ". &text('mass_enoallow', $s),"\n"
+ if ($stop);
+ print $text{'mass_ok'},"\n"
+ if ($restart);
+ }
+ elsif (!$ok) {
+ print $text{'mass_failed'},"\n";
}
else {
- print $text{'mass_ok'},"\n";
+ print $text{'mass_ok'},"
\n";
}
}
- &webmin_log($start ? 'massstart' : $stop ? 'massstop' : 'massrestart',
+ &webmin_log($stop ? 'massstop' : 'massrestart',
'systemd', join(" ", @sel));
}
+# Enable or disable
if ($enable || $disable) {
# Enable or disable at boot
$access{'bootup'} == 1 || &error($text{'edit_ecannot'});
foreach $b (@sel) {
if ($enable) {
- print &text('mass_uenable', "$b"),"\n";
+ print &text('mass_uenable', "$b"),"
\n";
&enable_at_boot($b);
}
else {
- print &text('mass_udisable', "$b"),"
\n";
+ print &text('mass_udisable', "$b"),"
\n";
&disable_at_boot($b);
}
+ print $text{'mass_ok'},"
\n";
+
}
&webmin_log($enable ? 'massenable' : 'massdisable', 'systemd',
join(" ", @sel));
}
+# Try to start at last
+if ($start) {
+ # Starting a bunch of services
+ $access{'bootup'} || &error($text{'ss_ecannot'});
+ foreach $s (@sel) {
+ if ($start) {
+ print &text('mass_ustarting', "$s"),"
\n";
+ ($ok, $out) = &start_action($s);
+ }
+ print "$out
" if ($out);;
+ if (!$ok) {
+ print $text{'mass_failed'},"\n";
+ }
+ else {
+ print $text{'mass_ok'},"\n";
+ }
+ }
+ &webmin_log('massstart', 'systemd', join(" ", @sel));
+ }
+
if ($in{'return'}) {
&ui_print_footer("edit_systemd.cgi?name=".&urlize($in{'return'}),
$text{'systemd_return'});
diff --git a/postfix/lang/pl b/postfix/lang/pl
index fdfbb0cbc..a364a8446 100644
--- a/postfix/lang/pl
+++ b/postfix/lang/pl
@@ -78,7 +78,7 @@ what_is_it=Co to jest?
opts_default=Domyślnie
opts_none=Brak
opts_relayhost=Wysyłać pocztę wychodzącą poprzez host
-opts_direct=Deręczać bezpośrednio
+opts_direct=Doręczać bezpośrednio
opts_myorigin=Własna domena w poczcie wychodzącej
opts_myorigin_as_myhostname=Używać nazwy hosta
opts_myorigin_as_mydomain=Używać nazwy domeny