From 9b6ea44ec7dbe40cc5d6896bab43d515af3acf4d Mon Sep 17 00:00:00 2001
From: Stephen Beaver <sbeaver@netgate.com>
Date: Mon, 4 Apr 2016 18:41:21 -0400
Subject: [PATCH] Merge pull request #2832 from NewEraCracker/lang-fixes

(cherry picked from commit c67308d9b8e36fc73cb3c4381861698aa73bee00)
---
 src/usr/local/www/diag_backup.php   | 4 ++--
 src/usr/local/www/diag_defaults.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php
index f446e6c6f3..1324fc23b1 100644
--- a/src/usr/local/www/diag_backup.php
+++ b/src/usr/local/www/diag_backup.php
@@ -226,7 +226,7 @@ if ($_POST) {
 		if ($mode == "download") {
 			if ($_POST['encrypt']) {
 				if (!$_POST['encrypt_password']) {
-					$input_errors[] = gettext("A password for decryption must be supplied and confirmed.");
+					$input_errors[] = gettext("A password for encryption must be supplied and confirmed.");
 				}
 			}
 
@@ -301,7 +301,7 @@ if ($_POST) {
 		if ($mode == "restore") {
 			if ($_POST['decrypt']) {
 				if (!$_POST['decrypt_password']) {
-					$input_errors[] = gettext("A password for encryption must be supplied and confirmed.");
+					$input_errors[] = gettext("A password for decryption must be supplied and confirmed.");
 				}
 			}
 
diff --git a/src/usr/local/www/diag_defaults.php b/src/usr/local/www/diag_defaults.php
index 130045dc49..f59f161709 100755
--- a/src/usr/local/www/diag_defaults.php
+++ b/src/usr/local/www/diag_defaults.php
@@ -90,7 +90,7 @@ include("head.inc");
 	<div class="panel-body">
 		<div class="content">
 			<form action="diag_defaults.php" method="post">
-				<p><strong><?=sprintf(gettext('Resetting the system to factory defaults will remove all user configuration and apply the following settings:'), "&quot;")?></strong></p>
+				<p><strong><?=gettext('Resetting the system to factory defaults will remove all user configuration and apply the following settings:')?></strong></p>
 				<ul>
 					<li><?=gettext("Reset to factory defaults")?></li>
 					<li><?=gettext("LAN IP address will be reset to 192.168.1.1")?></li>