From 0246e7a2dbddc57ad791e286fa602b1984180a2a Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Tue, 20 Oct 2015 12:31:45 +0200
Subject: Point people to 'Clear Package Lock' if the reinstall of packages got
 stuck (RELENG_2_2)

---
 usr/local/www/fbegin.inc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'usr')

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' />");
 }
-- 
cgit v1.1


From 92abb65b927ea11308cfb5f8d6821e7056288bb8 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Tue, 20 Oct 2015 13:12:52 +0200
Subject: Point people to 'Clear Package Lock' if the reinstall of packages got
 stuck (RELENG_2_2)

---
 usr/local/share/locale/en/LC_MESSAGES/pfSense.pot | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'usr')

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"
-- 
cgit v1.1