Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x

[people/pmueller/ipfire-2.x.git] / langs / en / cgi-bin / en.pl

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index c16d989dafdb1ad8fe2b187d79adc3a0442f7277..f787f6d94fb68981be4ed38d4470633e8f8594fa 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -338,6 +338,7 @@
 'alt vpn' => 'VPNs',
 'and' => 'And',
 'ansi t1.483' => 'TO BE REMOVED',
+'apcupsd' => 'APCUPSD',
 'apply' => 'Apply now',
 'april' => 'April',
 'archive not exist' => 'Configuration archive does not exist',
@@ -1313,7 +1314,7 @@
 'pakfire accept all' => 'Do you want to install all packages?',
 'pakfire available addons' => 'Available Addons:',
 'pakfire configuration' => 'Pakfire Configuration',
-'pakfire core update auto' => 'Install Core Update automaticly?',
+'pakfire core update auto' => 'Install core and addon updates automatically:',
 'pakfire core update level' => 'Core-Update-Level',
 'pakfire install description' => 'Please choose one or more items from the list below and click the plus to install.',
 'pakfire install package' => 'You want to install the following packages: ',
@@ -1323,11 +1324,11 @@
 'pakfire last serverlist update' => 'Last server list update made',
 'pakfire last update' => 'Last Update made',
 'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.',
-'pakfire register' => 'Register at master server:',
+'pakfire register' => 'Register at pakfire-server:',
 'pakfire system state' => 'System Status',
 'pakfire uninstall description' => 'Please choose one or more items from the list below and click the minus to uninstall.',
 'pakfire uninstall package' => 'You want to uninstall the following packages: ',
-'pakfire update daily' => 'Run automatic Update daily:',
+'pakfire update daily' => 'Search for updates daily:',
 'pakfire updates' => 'Available Update:',
 'pakfire working' => 'Pakfire ist working ... Please wait until everything is done successfull.',
 'pap or chap' => 'PAP or CHAP',
@@ -1405,6 +1406,9 @@
 'read list' => 'list with readonly hosts',
 'real address' => 'Real Address',
 'reboot' => 'Reboot',
+'reboot ask' => 'Reboot?',
+'reboot sure' => 'Are you sure that you want to reboot?',
+'reboot question' => 'Extra query for restart and shutdown',
 'reboot schedule' => 'Schedule IPFire reboots',
 'rebooting' => 'Rebooting',
 'rebooting ipfire' => 'Rebooting IPFire',
@@ -1518,6 +1522,8 @@
 'show root certificate' => 'Show Root Certificate',
 'show share options' => 'show shares options',
 'shutdown' => 'Shutdown',
+'shutdown ask' => 'Shutdown?',
+'shutdown sure' => 'Are you sure that you want to shutdown?',
 'shutdown control' => 'Shutdown control',
 'shutdown2' => 'Shutdown:',
 'shutting down' => 'Shutting down',