diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-10-20 20:16:30 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-10-20 20:16:30 -0500 |
| commit | 1eac7c1e3c96315c957d38a0ae1d8c2c58f99090 (patch) | |
| tree | 40ea02f35c4209c4be161f03d1b499a6280b6bcd /usr | |
| parent | cce44072c4d65af040d9edb78664a1678e36e94a (diff) | |
| parent | 92abb65b927ea11308cfb5f8d6821e7056288bb8 (diff) | |
| download | pfsense-1eac7c1e3c96315c957d38a0ae1d8c2c58f99090.zip pfsense-1eac7c1e3c96315c957d38a0ae1d8c2c58f99090.tar.gz | |
Merge pull request #1971 from doktornotor/patch-5
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/local/share/locale/en/LC_MESSAGES/pfSense.pot | 8 | ||||
| -rwxr-xr-x | usr/local/www/fbegin.inc | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot b/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot index eaecb8a..8c06471 100644 --- a/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot +++ b/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot @@ -9911,6 +9911,14 @@ msgid "" "changes in the GUI until this is complete." msgstr "" +#: usr/local/www/fbegin.inc:442 +msgid "" +"<p>If the above message is still displayed after a couple of hours, use " +"the 'Clear Package Lock' button on the " +"<a href='diag_backup.php' title='Backup/Restore'>Backup/Restore page</a> " +"and reinstall packages manually." +msgstr "" + #: usr/local/www/firewall_aliases.php:109 #, php-format msgid "Cannot delete alias. Currently in use by %s" diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc index 6416394..afb27c0 100755 --- a/usr/local/www/fbegin.inc +++ b/usr/local/www/fbegin.inc @@ -439,6 +439,7 @@ if (is_subsystem_dirty('packagelock') || (file_exists('/conf/needs_package_sync' } else { $pgtitle = array(gettext("System"),gettext("Package Manager")); $info_text = gettext("Packages are currently being reinstalled in the background.<p>Do not make changes in the GUI until this is complete."); + $info_text .= gettext("<p>If the above message is still displayed after a couple of hours, use the 'Clear Package Lock' button on the <a href='diag_backup.php' title='Backup/Restore'>Backup/Restore page</a> and reinstall packages manually."); } print_info_box($info_text . "<p><img src='/themes/{$g['theme']}/images/icons/icon_fw-update.gif' alt='firmware update' />"); } |
