Dev Minor text corrections

LimeSurvey · Sep 22, 2017 · f2b0555 · f2b0555 · Shnoulle · Sep 22, 2017
1 parent 01a1b9d
commit f2b0555
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/application/controllers/admin/authentication.php b/application/controllers/admin/authentication.php
@@ -241,7 +241,7 @@ public function forgotpassword()
 
             if (count($aFields) < 1 || ($aFields[0]['uid'] != 1 && !Permission::model()->hasGlobalPermission('auth_db','read',$aFields[0]['uid']))) {
                 // Wrong or unknown username and/or email. For security reasons, we don't show a fail message
-                $aData['message'] = '<br>'.gT('If username and email are valid and you are allowed to use internal database authentication a new password has been sent to you').'<br>';
+                $aData['message'] = '<br>'.gT('If the username and email address is valid and you are allowed to use the internal database authentication a new password has been sent to you').'<br>';
             } else {
                 $aData['message'] = '<br>'.$this->_sendPasswordEmail($sEmailAddr, $aFields).'</br>';
             }
@@ -277,7 +277,7 @@ private function _sendPasswordEmail($sEmailAddr, $aFields)
         {
             User::model()->updatePassword($aFields[0]['uid'], $sNewPass);
             // For security reasons, we don't show a successful message
-            $sMessage = gT('If username and email are valid and you are allowed to use internal database authentication a new password has been sent to you');
+            $sMessage = gT('If the username and email address is valid and you are allowed to use the internal database authentication a new password has been sent to you');
         }
         else
         {

diff --git a/docs/release_notes.txt b/docs/release_notes.txt
@@ -39,13 +39,13 @@ Changes from 2.67.3 (build 170728) to 2.70.0 (build 170728) Sept 28, 2017
 -New feature: Add mass action to delete uploaded files for multiple responses at once (Olle Haerstedt)
 -New feature: New button to remove uploaded files while keeping the response it self (Olle Haerstedt)
 -New feature: Storage data overview in global settings (Olle Haerstedt)
--New feature: Added editing of participants/tokens to mass actions(LouisGac & markusfluer)
+-New feature: Added editing of participants/tokens to mass actions (LouisGac & markusfluer)
 -Fixed issue #12279: Unable to upload image when send invitation (Denis Chenu)
 -Fixed issue #12585: In quotas some answer options using non-ASCII characters are not shown in overview (Carsten Schmitz)
--Fixed issue #12641: On registering any lang can be set and accepted. (Denis Chenu)
--Fixed issue #12652: AuditLog plugin reset langage to default when register (#803) (Denis Chenu)
--Fixed issue #12655: Unable to update lang in Personnal settings (Denis Chenu)
--Fixed issue #12678: Save ranking question type can broke survey database (Denis Chenu)
+-Fixed issue #12641: On registering any lang can be set and accepted (Denis Chenu)
+-Fixed issue #12652: AuditLog plugin resets language to default on registration (Denis Chenu)
+-Fixed issue #12655: Unable to update language in personal settings (Denis Chenu)
+-Fixed issue #12678: Save ranking question type can break survey database (Denis Chenu)
 -Fixed issue: Can't add new participant in CPDB when audit log is active (Olle Haerstedt)
 -Fixed issue: CPDB attribute language name didn't save (Olle Haerstedt)
 -Fixed issue: Don't bind multiple click events on yes/no modal (Olle Haerstedt)