From 796d5bed63131e63e0a51cf358a2e5c64e5375a0 Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <c_schmitz@users.sourceforge.net>
Date: Tue, 2 Aug 2011 09:56:33 +0000
Subject: [PATCH] Dev Some minor fixes

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@10622 b72ed6b6-b9f8-46b5-92b4-906544132732
---
 docs/release_notes.txt | 12 ++++++------
 qanda.php              |  7 +++----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/docs/release_notes.txt b/docs/release_notes.txt
index 1b0197304c9..1777d7c1968 100644
--- a/docs/release_notes.txt
+++ b/docs/release_notes.txt
@@ -78,18 +78,18 @@ HOW TO UPGRADE from a LimeSurvey 1.70(+) version to the latest 1.9x
 Thank you to everyone who helped with this new release!
 
 Changes from 1.91+ (build 10563) to 1.91+ (build 10604)
-#Updated language: French (b00z00)
-#Updated language: Polish (elisa-ls)
+#Updated translation: French (b00z00)
+#Updated translation: Polish (elisa-ls)
 -Fixed issue #5358: Adding a question - position dropdown shows subquestions, too (c_schmitz)
--Fixed issue #05331: FCKEditor / Whitespace Indent mangeled for Email Templates. (mot3)
--Fixed issue #05356 : can not add html element in other_replace_text (shnoulle)
+-Fixed issue #5331: FCKEditor / Whitespace Indent mangeled for Email Templates. (mot3)
+-Fixed issue #5356 : can not add html element in other_replace_text (shnoulle)
 -Fixed issue #5300: Further optimization of bounce e-mail processing (idobraca)
 -Fixed issue #5328: {SURVEYID} or {SID} replacement field missing in email templates. (mot3)
 -Fixed issue #5352: Probable Regression in database update output logic (ref #5217) (mot3)
 -Fixed issue #5355: UTF-8 linebreak breaking conditions editor (c_schmitz)
 -Fixed issue #5359: quota - order of question in add new answer (c_schmitz)
 -Fixed issue #5360: quota - answer id for matrix 5er (c_schmitz)
--Fixed issue:  other_replace_text aren't filter if filterxsshtml are set (shnoulle)
+-Fixed issue: other_replace_text aren't filter if filterxsshtml are set (shnoulle)
 -Fixed issue: Bounce processing didn't work with remainders (idobraca)
 -Fixed issue: Typo in SQL command (idobraca)
 
@@ -108,7 +108,7 @@ Changes from 1.91+ (build 10494) to 1.91+ (build 10563)
 -Fixed issue: Security problems with file upload question type (c_schmitz)
 
 Changes from 1.91+ (build 10485) to 1.91+ (build 10494)                    
-#Updated language : French (b00z00)
+#Updated translation : French (b00z00)
 -Fixed issue #5325: SQL-Error on Exporting QueXML using MS SQL-Server (azammitdcarf)
 -Fixed issue: Error on importing a table with quotas (c_schmitz)
 -Fixed issue: Timings table issues (c_schmitz)
diff --git a/qanda.php b/qanda.php
index 7b2bc6614a9..6386bda9bfa 100644
--- a/qanda.php
+++ b/qanda.php
@@ -3766,14 +3766,13 @@ function do_file_upload($ia)
         $scriptloc = 'uploader.php';
     }
 
-    $uploadbutton = "<h2><a id='upload_".$ia[1]."' class='upload' href='$scriptloc?sid=$surveyid&fieldname=".$ia[1]."&qid=".$ia[0]."&preview="
-    .$questgrppreview."&show_title=".$qidattributes['show_title']."&show_comment="
-    .$qidattributes['show_comment']."&pos=".($pos?1:0)."'>" . $clang->gT('Upload files') . "</a></h2><br /><br />";
+    $uploadbutton = "<h2><a id='upload_".$ia[1]."' class='upload' href='{$scriptloc}?sid={$surveyid}&amp;fieldname={$ia[1]}&amp;qid={$ia[0]}&amp;preview="
+    ."{$questgrppreview}&amp;show_title={$qidattributes['show_title']}&amp;show_comment={$qidattributes['show_comment']}&amp;pos=".($pos?1:0)."'>" .$clang->gT('Upload files'). "</a></h2><br /><br />";
 
     $answer = "<script type='text/javascript'>
         var translt = {
              title: '" . $clang->gT('Upload your files') . "',
-             returnTxt: '" . $clang->gT('Return to Survey') . "'
+             returnTxt: '" . $clang->gT('Return to survey') . "'
             };
     </script>\n";
     if ($pos)