diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index 0e0765ee2..ef522f967 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -245,7 +245,7 @@ class PMA_Table
      *
      * @param   string   the database name
      * @param   string   the table name
-     * @return  boolean  true if it is a merge table 
+     * @return  boolean  true if it is a merge table
      * @access  public
      */
     static public function isMerge($db = null, $table = null)
@@ -480,7 +480,7 @@ class PMA_Table
                     } else {
                         // Counting all rows of a VIEW could be too long, so use
                         // a LIMIT clause.
-                        // Use try_query because it can fail (when a VIEW is 
+                        // Use try_query because it can fail (when a VIEW is
                         // based on a table that no longer exists)
                         $result = PMA_DBI_try_query(
                             'SELECT 1 FROM ' . PMA_backquote($db) . '.'
@@ -667,7 +667,7 @@ class PMA_Table
             }
             unset($analyzed_sql);
             $server_sql_mode = PMA_DBI_fetch_value("SHOW VARIABLES LIKE 'sql_mode'", 0, 1);
-            // ANSI_QUOTES might be a subset of sql_mode, for example 
+            // ANSI_QUOTES might be a subset of sql_mode, for example
             // REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI
             if (false !== strpos($server_sql_mode, 'ANSI_QUOTES')) {
                 $table_delimiter = 'quote_double';
@@ -1008,7 +1008,7 @@ class PMA_Table
      *
      * @param   string  new table name
      * @param   string  new database name
-     * @param   boolean is this for a VIEW rename? 
+     * @param   boolean is this for a VIEW rename?
      * @return  boolean success
      */
     function rename($new_name, $new_db = null, $is_view = false)
@@ -1045,7 +1045,7 @@ class PMA_Table
         }
         // I don't think a specific error message for views is necessary
         if (! PMA_DBI_query($GLOBALS['sql_query'])) {
-            $this->errors[] = sprintf(__('Error renaming table %1 to %2'), $this->getFullName(), $new_table->getFullName());
+            $this->errors[] = sprintf(__('Error renaming table %1$s to %2$s'), $this->getFullName(), $new_table->getFullName());
             return false;
         }
 
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index dbe46276a..16287488a 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -591,7 +591,7 @@ if ($GLOBALS['PMA_Config']->error_config_file) {
     trigger_error($error, E_USER_ERROR);
 }
 if ($GLOBALS['PMA_Config']->error_config_default_file) {
-    $error = sprintf(__('Could not load default configuration from: %1'),
+    $error = sprintf(__('Could not load default configuration from: %1$s'),
         $GLOBALS['PMA_Config']->default_source);
     trigger_error($error, E_USER_ERROR);
 }
@@ -633,7 +633,7 @@ if (!isset($cfg['Servers']) || count($cfg['Servers']) == 0) {
 
         // Don't use servers with no hostname
         if ($each_server['connect_type'] == 'tcp' && empty($each_server['host'])) {
-            trigger_error(sprintf(__('Invalid hostname for server %1. Please review your configuration.'), $server_index), E_USER_ERROR);
+            trigger_error(sprintf(__('Invalid hostname for server %1$s. Please review your configuration.'), $server_index), E_USER_ERROR);
         }
 
         // Final solution to bug #582890