summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2015-10-20 20:17:51 -0500
committerChris Buechler <cmb@pfsense.org>2015-10-20 20:17:51 -0500
commitebbd3e5cde525cdd06d5ae4a032cddcf570e9caa (patch)
tree701ca0eafbe63e8eadfb94243cb76742b0371bed
parentebd73e240425613542b9c65b3d82d38657456484 (diff)
parent0acc93d8fb1e41ff19012e12063123293ab40a3f (diff)
downloadpfsense-ebbd3e5cde525cdd06d5ae4a032cddcf570e9caa.zip
pfsense-ebbd3e5cde525cdd06d5ae4a032cddcf570e9caa.tar.gz
Merge pull request #1970 from doktornotor/patch-2
-rw-r--r--src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot8
-rwxr-xr-xsrc/usr/local/www/head.inc1
2 files changed, 9 insertions, 0 deletions
diff --git a/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot b/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot
index efc71b6..4864b7b 100644
--- a/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot
+++ b/src/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/head.inc:476
+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/src/usr/local/www/head.inc b/src/usr/local/www/head.inc
index a6b1d9d..f628bd7 100755
--- a/src/usr/local/www/head.inc
+++ b/src/usr/local/www/head.inc
@@ -473,6 +473,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' />");
}
OpenPOWER on IntegriCloud