From 1d76d52baf92822d99b1ef36b176f7b87c77c036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Wed, 29 Jan 2014 15:20:29 +0100
Subject: [PATCH 1/2] Missing punctuation at the end of sentences

---
 libraries/File.class.php                              | 2 +-
 libraries/Header.class.php                            | 2 +-
 libraries/plugins/auth/AuthenticationCookie.class.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/File.class.php b/libraries/File.class.php
index 12c86bbf98..22da2229c7 100644
--- a/libraries/File.class.php
+++ b/libraries/File.class.php
@@ -473,7 +473,7 @@ class PMA_File
             || ! is_writable($GLOBALS['cfg']['TempDir'])
         ) {
             // cannot create directory or access, point user to FAQ 1.11
-            $this->_error_message = __('Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc]');
+            $this->_error_message = __('Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc].');
             return false;
         }
 
diff --git a/libraries/Header.class.php b/libraries/Header.class.php
index 22607f10fd..454a3f8734 100644
--- a/libraries/Header.class.php
+++ b/libraries/Header.class.php
@@ -658,7 +658,7 @@ class PMA_Header
         if ($this->_warningsEnabled) {
             $retval .= "<noscript>";
             $retval .= PMA_message::error(
-                __("Javascript must be enabled past this point")
+                __("Javascript must be enabled past this point!")
             )->getDisplay();
             $retval .= "</noscript>";
         }
diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php
index 4cb51ca4c3..62eb27ac3e 100644
--- a/libraries/plugins/auth/AuthenticationCookie.class.php
+++ b/libraries/plugins/auth/AuthenticationCookie.class.php
@@ -175,7 +175,7 @@ class AuthenticationCookie extends AuthenticationPlugin
 
         echo "<noscript>\n";
         PMA_message::error(
-            __("Javascript must be enabled past this point")
+            __("Javascript must be enabled past this point!")
         )->display();
         echo "</noscript>\n";
 

From e227e70af6f6435f1d1e9d2cae0394aaacc2b58c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Wed, 29 Jan 2014 15:22:28 +0100
Subject: [PATCH 2/2] Do not talk explicitely about server type

The connection can be as well to MariaDB, Drizzle or MySQL, so lets make
the message generic.
---
 libraries/config/Validator.class.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/config/Validator.class.php b/libraries/config/Validator.class.php
index 6a66d7f2fc..93c3388c04 100644
--- a/libraries/config/Validator.class.php
+++ b/libraries/config/Validator.class.php
@@ -235,7 +235,7 @@ class PMA_Validator
             while (1) {
                 $drizzle = @drizzle_create();
                 if (! $drizzle) {
-                    $error = __('Could not initialize Drizzle connection library');
+                    $error = __('Could not initialize Drizzle connection library!');
                     break;
                 }
                 $conn = $socket
@@ -244,7 +244,7 @@ class PMA_Validator
                         $drizzle, $host, $port, $user, $pass, null, 0
                     );
                 if (! $conn) {
-                    $error = __('Could not connect to Drizzle server');
+                    $error = __('Could not connect to the database server!');
                     drizzle_free($drizzle);
                     break;
                 }
@@ -252,7 +252,7 @@ class PMA_Validator
                 // to actually connect
                 $res = @drizzle_query($conn, 'SELECT 1');
                 if (! $res) {
-                    $error = __('Could not connect to Drizzle server');
+                    $error = __('Could not connect to the database server!');
                 } else {
                     drizzle_result_free($res);
                 }
@@ -263,14 +263,14 @@ class PMA_Validator
         } else if ($extension == 'mysql') {
             $conn = @mysql_connect($host . $socket . $port, $user, $pass);
             if (! $conn) {
-                $error = __('Could not connect to MySQL server');
+                $error = __('Could not connect to the database server!');
             } else {
                 mysql_close($conn);
             }
         } else {
             $conn = @mysqli_connect($host, $user, $pass, null, $port, $socket);
             if (! $conn) {
-                $error = __('Could not connect to MySQL server');
+                $error = __('Could not connect to the database server!');
             } else {
                 mysqli_close($conn);
             }
@@ -303,7 +303,7 @@ class PMA_Validator
             && empty($values['Servers/1/user'])
         ) {
             $result['Servers/1/user']
-                = __('Empty username while using config authentication method');
+                = __('Empty username while using config authentication method!');
             $error = true;
         }
         if ($values['Servers/1/auth_type'] == 'signon'
@@ -311,7 +311,7 @@ class PMA_Validator
         ) {
             $result['Servers/1/SignonSession'] = __(
                 'Empty signon session name '
-                . 'while using signon authentication method'
+                . 'while using signon authentication method!'
             );
             $error = true;
         }
@@ -319,7 +319,7 @@ class PMA_Validator
             && empty($values['Servers/1/SignonURL'])
         ) {
             $result['Servers/1/SignonURL']
-                = __('Empty signon URL while using signon authentication method');
+                = __('Empty signon URL while using signon authentication method!');
             $error = true;
         }