From 4af44652aced7c601cdfeff93dc03e6672e8b2c3 Mon Sep 17 00:00:00 2001
From: Graham Eames <grahamje@users.sourceforge.net>
Date: Sun, 6 Aug 2006 14:18:05 +0000
Subject: [PATCH] Fix a couple of hard-coded strings in the templates

git-svn-id: file:///svn/phpbb/trunk@6240 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/install.php                              | 2 +-
 phpBB/styles/subSilver/template/posting_body.html          | 2 +-
 phpBB/styles/subSilver/template/ucp_pm_message_footer.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 0383fa6ef7..35192e48c4 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -120,7 +120,7 @@ $lang = array_merge($lang, array(
 	'FORUM_ADDRESS'				=> 'Forum address',
 	'FORUM_ADDRESS_EXPLAIN'		=> 'This is the http address of your former forum',
 	'FORUM_PATH'				=> 'Forum path',
-	'FORUM_PATH_EXPLAIN'		=> 'This is the relative <strong>to phpBB main directory</strong> server path to your former forum',
+	'FORUM_PATH_EXPLAIN'		=> 'This is the <strong>relative</strong> path on disk to your former forum from the <strong>root of your phpBB install</strong>',
 	'FOUND'						=> 'Found',
 	'FTP_CONFIG'				=> 'Transfer config by FTP',
 	'FTP_CONFIG_EXPLAIN'		=> 'phpBB has detected the presence of the FTP module on this server. You may attempt to install your config.php via this if you wish. You will need to supply the information listed below. Remember your username and password are those to your server! (ask your hosting provider for details if you are unsure what these are)',
diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html
index 91b73b3b98..f24171e5ad 100644
--- a/phpBB/styles/subSilver/template/posting_body.html
+++ b/phpBB/styles/subSilver/template/posting_body.html
@@ -194,7 +194,7 @@ function checkForm()
 		<td class="row2">
 		<!-- BEGIN to_recipient -->
 			<span class="genmed">
-			<a href="{to_recipient.U_VIEW}"><!-- IF to_recipient.COLOUR --><b style="color:#{to_recipient.COLOUR}"><!-- ELSE --><b<!-- IF to_recipient.IS_GROUP --> class="blue"<!-- ENDIF -->><!-- ENDIF -->{to_recipient.NAME}</b></a>&nbsp;</span><!-- IF not S_EDIT_POST --><input class="post" type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="Remove" />&nbsp;<!-- ENDIF -->
+			<a href="{to_recipient.U_VIEW}"><!-- IF to_recipient.COLOUR --><b style="color:#{to_recipient.COLOUR}"><!-- ELSE --><b<!-- IF to_recipient.IS_GROUP --> class="blue"<!-- ENDIF -->><!-- ENDIF -->{to_recipient.NAME}</b></a>&nbsp;</span><!-- IF not S_EDIT_POST --><input class="post" type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="{L_REMOVE}" />&nbsp;<!-- ENDIF -->
 		<!-- BEGINELSE -->
 			<span class="genmed">{L_NONE}</span>
 		<!-- END to_recipient -->
diff --git a/phpBB/styles/subSilver/template/ucp_pm_message_footer.html b/phpBB/styles/subSilver/template/ucp_pm_message_footer.html
index fa983d4ce5..f0b6307789 100644
--- a/phpBB/styles/subSilver/template/ucp_pm_message_footer.html
+++ b/phpBB/styles/subSilver/template/ucp_pm_message_footer.html
@@ -21,7 +21,7 @@
 						<input type="hidden" name="marked_msg_id[]" value="{MSG_ID}" />
 						<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
 						<input type="hidden" name="p" value="{MSG_ID}" />
-						<select name="dest_folder">{S_TO_FOLDER_OPTIONS}</select>&nbsp;<input class="btnlite" type="submit" name="move_pm" value="<!-- IF S_VIEW_MESSAGE -->Place Message into Folder<!-- ELSE -->Place Marked into Folder<!-- ENDIF -->" />
+						<select name="dest_folder">{S_TO_FOLDER_OPTIONS}</select>&nbsp;<input class="btnlite" type="submit" name="move_pm" value="{L_MOVE_TO_FOLDER}" />
 					</form>
 				<!-- ELSE -->
 					<form name="sortmsg" method="post" action="{S_PM_ACTION}" style="margin:0px">