From 632211d06557ceb56131a059e5eb116f65fcbedd Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 9 May 2010 16:24:32 -0400
Subject: [PATCH] gettext conversion

---
 db_create.php                     |   2 +-
 db_operations.php                 |   8 +-
 import.php                        |  26 +-
 libraries/Index.class.php         |   4 +-
 libraries/auth/http.auth.lib.php  |   2 +-
 libraries/dbg/setup.php           |   4 +-
 libraries/display_export.lib.php  |  10 +-
 libraries/display_import.lib.php  |   6 +-
 libraries/display_tbl.lib.php     |   8 +-
 libraries/header.inc.php          |   2 +-
 libraries/import.lib.php          |   2 +-
 libraries/mult_submits.inc.php    |   2 +-
 libraries/replication_gui.lib.php |   2 +-
 libraries/sql_query_form.lib.php  |   2 +-
 po/af.po                          | 370 ++++++++++++++-------------
 po/ar.po                          | 366 +++++++++++++-------------
 po/az.po                          | 370 ++++++++++++++-------------
 po/be.po                          | 404 +++++++++++++++--------------
 po/be@latin.po                    | 404 +++++++++++++++--------------
 po/bg.po                          | 378 ++++++++++++++-------------
 po/bn.po                          | 390 ++++++++++++++--------------
 po/bs.po                          | 370 ++++++++++++++-------------
 po/ca.po                          | 398 +++++++++++++++--------------
 po/cs.po                          | 398 +++++++++++++++--------------
 po/da.po                          | 394 ++++++++++++++--------------
 po/de.po                          | 402 +++++++++++++++--------------
 po/el.po                          | 400 +++++++++++++++--------------
 po/en_GB.po                       | 394 ++++++++++++++--------------
 po/es.po                          | 410 +++++++++++++++---------------
 po/et.po                          | 390 ++++++++++++++--------------
 po/eu.po                          | 370 ++++++++++++++-------------
 po/fa.po                          | 372 ++++++++++++++-------------
 po/fi.po                          | 394 ++++++++++++++--------------
 po/fr.po                          | 402 +++++++++++++++--------------
 po/gl.po                          | 396 +++++++++++++++--------------
 po/he.po                          | 366 +++++++++++++-------------
 po/hi.po                          | 362 +++++++++++++-------------
 po/hr.po                          | 394 ++++++++++++++--------------
 po/hu.po                          | 402 +++++++++++++++--------------
 po/id.po                          | 378 ++++++++++++++-------------
 po/it.po                          | 404 +++++++++++++++--------------
 po/ja.po                          | 404 +++++++++++++++--------------
 po/ka.po                          | 394 ++++++++++++++--------------
 po/ko.po                          | 370 ++++++++++++++-------------
 po/lt.po                          | 372 ++++++++++++++-------------
 po/lv.po                          | 368 ++++++++++++++-------------
 po/mk.po                          | 368 ++++++++++++++-------------
 po/mn.po                          | 372 ++++++++++++++-------------
 po/ms.po                          | 370 ++++++++++++++-------------
 po/nb.po                          | 396 +++++++++++++++--------------
 po/nl.po                          | 408 +++++++++++++++--------------
 po/phpmyadmin.pot                 | 362 +++++++++++++-------------
 po/pl.po                          | 394 ++++++++++++++--------------
 po/pt.po                          | 372 ++++++++++++++-------------
 po/pt_BR.po                       | 398 +++++++++++++++--------------
 po/ro.po                          | 400 +++++++++++++++--------------
 po/ru.po                          | 402 +++++++++++++++--------------
 po/si.po                          | 390 ++++++++++++++--------------
 po/sk.po                          | 394 ++++++++++++++--------------
 po/sl.po                          | 398 +++++++++++++++--------------
 po/sq.po                          | 368 ++++++++++++++-------------
 po/sr.po                          | 392 ++++++++++++++--------------
 po/sr@latin.po                    | 392 ++++++++++++++--------------
 po/sv.po                          | 394 ++++++++++++++--------------
 po/ta.po                          | 362 +++++++++++++-------------
 po/te.po                          | 364 +++++++++++++-------------
 po/th.po                          | 368 ++++++++++++++-------------
 po/tr.po                          | 398 +++++++++++++++--------------
 po/tt.po                          | 368 ++++++++++++++-------------
 po/uk.po                          | 366 +++++++++++++-------------
 po/ur.po                          | 362 +++++++++++++-------------
 po/uz.po                          | 404 +++++++++++++++--------------
 po/uz@latin.po                    | 404 +++++++++++++++--------------
 po/zh_CN.po                       | 372 ++++++++++++++-------------
 po/zh_TW.po                       | 364 +++++++++++++-------------
 server_databases.php              |   6 +-
 server_privileges.php             |  30 +--
 server_processlist.php            |   4 +-
 sql.php                           |  12 +-
 tbl_alter.php                     |   2 +-
 tbl_create.php                    |   2 +-
 tbl_indexes.php                   |  10 +-
 tbl_relation.php                  |   2 +-
 user_password.php                 |   6 +-
 84 files changed, 12248 insertions(+), 11394 deletions(-)

diff --git a/db_create.php b/db_create.php
index a2695cb4c..b55e04fad 100644
--- a/db_create.php
+++ b/db_create.php
@@ -43,7 +43,7 @@ if (! $result) {
     require_once './libraries/header.inc.php';
     require_once './main.php';
 } else {
-    $message = PMA_Message::success('strDatabaseHasBeenCreated');
+    $message = PMA_Message::success(__('Database %1$s has been created.'));
     $message->addParam($new_db);
     $GLOBALS['db'] = $new_db;
 
diff --git a/db_operations.php b/db_operations.php
index 25e7977f9..fad0d009c 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -35,7 +35,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
     }
 
     if (!isset($newname) || !strlen($newname)) {
-        $message = PMA_Message::error('strDatabaseEmpty');
+        $message = PMA_Message::error(__('The database name is empty!'));
     } else {
         $sql_query = ''; // in case target db exists
         $_error = false;
@@ -233,11 +233,11 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
             $sql_query .= "\n" . $local_query;
             PMA_DBI_query($local_query);
 
-            $message = PMA_Message::success('strRenameDatabaseOK');
+            $message = PMA_Message::success(__('Database %s has been renamed to %s'));
             $message->addParam($db);
             $message->addParam($newname);
         } elseif (! $_error)  {
-            $message = PMA_Message::success('strCopyDatabaseOK');
+            $message = PMA_Message::success(__('Database %s has been copied to %s'));
             $message->addParam($db);
             $message->addParam($newname);
         }
@@ -606,7 +606,7 @@ if (!$is_information_schema) {
 
     if ($num_tables > 0
       && !$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
-        $message = PMA_Message::notice('strRelationNotWorking');
+        $message = PMA_Message::notice(__('The additional features for working with linked tables have been deactivated. To find out why click %shere%s.'));
         $message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">', false);
         $message->addParam('</a>', false);
         /* Show error if user has configured something, notice elsewhere */
diff --git a/import.php b/import.php
index 0dab66681..88ffc477d 100644
--- a/import.php
+++ b/import.php
@@ -57,7 +57,7 @@ if (!empty($sql_query)) {
 ;
 if ($_POST == array() && $_GET == array()) {
     require_once './libraries/header.inc.php';
-    $message = PMA_Message::error('strUploadLimit');
+    $message = PMA_Message::error(__('You probably tried to upload too large file. Please refer to %sdocumentation%s for ways to workaround this limit.'));
     $message->addParam('[a@./Documentation.html#faq1_16@_blank]');
     $message->addParam('[/a]');
 
@@ -276,7 +276,7 @@ if ($import_file != 'none' && !$error) {
      */
     $compression = PMA_detectCompression($import_file);
     if ($compression === FALSE) {
-        $message = PMA_Message::error('strFileCouldNotBeRead');
+        $message = PMA_Message::error(__('File could not be read'));
         $error = TRUE;
     } else {
         switch ($compression) {
@@ -284,7 +284,7 @@ if ($import_file != 'none' && !$error) {
                 if ($cfg['BZipDump'] && @function_exists('bzopen')) {
                     $import_handle = @bzopen($import_file, 'r');
                 } else {
-                    $message = PMA_Message::error('strUnsupportedCompressionDetected');
+                    $message = PMA_Message::error(__('You attempted to load file with unsupported compression (%s). Either support for it is not implemented or disabled by your configuration.'));
                     $message->addParam($compression);
                     $error = TRUE;
                 }
@@ -293,7 +293,7 @@ if ($import_file != 'none' && !$error) {
                 if ($cfg['GZipDump'] && @function_exists('gzopen')) {
                     $import_handle = @gzopen($import_file, 'r');
                 } else {
-                    $message = PMA_Message::error('strUnsupportedCompressionDetected');
+                    $message = PMA_Message::error(__('You attempted to load file with unsupported compression (%s). Either support for it is not implemented or disabled by your configuration.'));
                     $message->addParam($compression);
                     $error = TRUE;
                 }
@@ -312,7 +312,7 @@ if ($import_file != 'none' && !$error) {
                         $import_text = $result['data'];
                     }
                 } else {
-                    $message = PMA_Message::error('strUnsupportedCompressionDetected');
+                    $message = PMA_Message::error(__('You attempted to load file with unsupported compression (%s). Either support for it is not implemented or disabled by your configuration.'));
                     $message->addParam($compression);
                     $error = TRUE;
                 }
@@ -321,7 +321,7 @@ if ($import_file != 'none' && !$error) {
                 $import_handle = @fopen($import_file, 'r');
                 break;
             default:
-                $message = PMA_Message::error('strUnsupportedCompressionDetected');
+                $message = PMA_Message::error(__('You attempted to load file with unsupported compression (%s). Either support for it is not implemented or disabled by your configuration.'));
                 $message->addParam($compression);
                 $error = TRUE;
                 break;
@@ -329,12 +329,12 @@ if ($import_file != 'none' && !$error) {
     }
     // use isset() because zip compression type does not use a handle
     if (!$error && isset($import_handle) && $import_handle === FALSE) {
-        $message = PMA_Message::error('strFileCouldNotBeRead');
+        $message = PMA_Message::error(__('File could not be read'));
         $error = TRUE;
     }
 } elseif (!$error) {
     if (!isset($import_text) || empty($import_text)) {
-        $message = PMA_Message::error('strNoDataReceived');
+        $message = PMA_Message::error(__('No data was received to import. Either no file name was submitted, or the file size exceeded the maximum size permitted by your PHP configuration. See [a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a].'));
         $error = TRUE;
     }
 }
@@ -369,7 +369,7 @@ if (!$error) {
     // Check for file existance
     if (!file_exists('./libraries/import/' . $format . '.php')) {
         $error = TRUE;
-        $message = PMA_Message::error('strCanNotLoadImportPlugins');
+        $message = PMA_Message::error(__('Could not load import plugins, please check your installation!'));
     } else {
         // Do the real import
         $plugin_param = $import_type;
@@ -394,11 +394,11 @@ if ($reset_charset) {
 
 // Show correct message
 if (!empty($id_bookmark) && $action_bookmark == 2) {
-    $message = PMA_Message::success('strBookmarkDeleted');
+    $message = PMA_Message::success(__('The bookmark has been deleted.'));
     $display_query = $import_text;
     $error = FALSE; // unset error marker, it was used just to skip processing
 } elseif (!empty($id_bookmark) && $action_bookmark == 1) {
-    $message = PMA_Message::notice('strShowingBookmark');
+    $message = PMA_Message::notice(__('Showing bookmark'));
 } elseif ($bookmark_created) {
     $special_message = '[br]' . sprintf(__('Bookmark %s created'), htmlspecialchars($bkm_label));
 } elseif ($finished && !$error) {
@@ -412,7 +412,7 @@ if (!empty($id_bookmark) && $action_bookmark == 2) {
             $message->addString($import_notice);
             $message->addString('(' . $_FILES['import_file']['name'] . ')');
         } else {
-            $message = PMA_Message::success('strImportSuccessfullyFinished');
+            $message = PMA_Message::success(__('Import has been successfully finished, %d queries executed.'));
             $message->addParam($executed_queries);
             $message->addString('(' . $_FILES['import_file']['name'] . ')');
         }
@@ -421,7 +421,7 @@ if (!empty($id_bookmark) && $action_bookmark == 2) {
 
 // Did we hit timeout? Tell it user.
 if ($timeout_passed) {
-    $message = PMA_Message::error('strTimeoutPassed');
+    $message = PMA_Message::error(__('Script timeout passed, if you want to finish import, please resubmit same file and import will resume.'));
     if ($offset == 0 || (isset($original_skip) && $original_skip == $offset)) {
         $message->addString('strTimeoutNothingParsed');
     }
diff --git a/libraries/Index.class.php b/libraries/Index.class.php
index a1a63d809..23306423b 100644
--- a/libraries/Index.class.php
+++ b/libraries/Index.class.php
@@ -425,7 +425,7 @@ class PMA_Index
         $indexes = PMA_Index::getFromTable($table, $schema);
 
         if (count($indexes) < 1) {
-            return PMA_Message::warning('strNoIndex')->getDisplay();
+            return PMA_Message::warning(__('No index defined!'))->getDisplay();
         }
 
         $r = '';
@@ -573,7 +573,7 @@ class PMA_Index
                 // did not find any difference
                 // so it makes no sense to have this two equal indexes
 
-                $message = PMA_Message::warning('strIndexesSeemEqual');
+                $message = PMA_Message::warning(__('The indexes %1$s and %2$s seem to be equal and one of them could possibly be removed.'));
                 $message->addParam($each_index->getName());
                 $message->addParam($while_index->getName());
                 $output .= $message->getDisplay();
diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php
index ef4dcf925..7ccea39e3 100644
--- a/libraries/auth/http.auth.lib.php
+++ b/libraries/auth/http.auth.lib.php
@@ -67,7 +67,7 @@ function PMA_auth()
 <br />
 
     <?php
-    PMA_Message::error('strWrongUser')->display();
+    PMA_Message::error(__('Wrong username/password. Access denied.'))->display();
 
     if (file_exists(CUSTOM_FOOTER_FILE)) {
         require CUSTOM_FOOTER_FILE;
diff --git a/libraries/dbg/setup.php b/libraries/dbg/setup.php
index 5e0683ac0..07732dfd6 100644
--- a/libraries/dbg/setup.php
+++ b/libraries/dbg/setup.php
@@ -19,10 +19,10 @@ if ($GLOBALS['cfg']['DBG']['php']) {
      * Loads the DBG extension if needed
      */
     if (! @extension_loaded('dbg') ) {
-        $message = PMA_Message::error('strCantLoad');
+        $message = PMA_Message::error(__('Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] extension. Please check your PHP configuration.'));
         $message->addParam('DBG');
         $message->addMessage('<a href="./Documentation.html#faqdbg" target="documentation">', false);
-        $message->addString('strDocu');
+        $message->addString(__('Documentation'));
         $message->addMessage('</a>', false);
         $message->display();
     } else {
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 4117cc544..160e7bfbd 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -39,7 +39,7 @@ $export_list = PMA_getPlugins('./libraries/export/', array('export_type' => $exp
 
 /* Fail if we didn't find any plugin */
 if (empty($export_list)) {
-    PMA_Message::error('strCanNotLoadExportPlugins')->display();
+    PMA_Message::error( __('Could not load export plugins, please check your installation!'))->display();
     require './libraries/footer.inc.php';
 }
 ?>
@@ -149,17 +149,17 @@ echo PMA_pluginGetJavascript($export_list);
 
         $trans = new PMA_Message;
         $trans->addMessage('__SERVER__/');
-        $trans->addString('strFileNameTemplateDescriptionServer');
+        $trans->addString(__('server name'));
         if ($export_type == 'database' || $export_type == 'table') {
             $trans->addMessage('__DB__/');
-            $trans->addString('strFileNameTemplateDescriptionDatabase');
+            $trans->addString(__('database name'));
             if ($export_type == 'table') {
                 $trans->addMessage('__TABLE__/');
-                $trans->addString('strFileNameTemplateDescriptionTable');
+                $trans->addString(__('table name'));
             }
         }
 
-        $message = new PMA_Message('strFileNameTemplateDescription');
+        $message = new PMA_Message(__('This value is interpreted using %1$sstrftime%2$s, so you can use time formatting strings. Additionally the following transformations will happen: %3$s. Other text will be kept as is.'));
         $message->addParam('<a href="http://php.net/strftime" target="documentation" title="'
             . __('Documentation') . '">', false);
         $message->addParam('</a>', false);
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 0e803c404..d30619db3 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -21,7 +21,7 @@ $import_list = PMA_getPlugins('./libraries/import/', $import_type);
 
 /* Fail if we didn't find any plugin */
 if (empty($import_list)) {
-    PMA_Message::error('strCanNotLoadImportPlugins')->display();
+    PMA_Message::error(__('Could not load import plugins, please check your installation!'))->display();
     require './libraries/footer.inc.php';
 }
 ?>
@@ -145,7 +145,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
         </div>
             <?php
         } else {
-            PMA_Message::warning('strUploadsNotAllowed')->display();
+            PMA_Message::warning(__('File uploads are not allowed on this server.'))->display();
         }
         if (!empty($cfg['UploadDir'])) {
             $extensions = '';
@@ -160,7 +160,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
             $files = PMA_getFileSelectOptions(PMA_userDir($cfg['UploadDir']), $matcher, (isset($timeout_passed) && $timeout_passed && isset($local_import_file)) ? $local_import_file : '');
             echo '<div class="formelementrow">' . "\n";
             if ($files === FALSE) {
-                PMA_Message::error('strWebServerUploadDirectoryError')->display();
+                PMA_Message::error(__('The directory you set for upload work cannot be reached'))->display();
             } elseif (!empty($files)) {
                 echo "\n";
                 echo '    <i>' . __('Or') . '</i><br/><label for="select_local_import_file">' . __('web server upload directory') . '</label>&nbsp;: ' . "\n";
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 08d2e282c..468959fa8 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1936,7 +1936,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
 
         if (PMA_Table::isView($db, $table)
          && $total == $GLOBALS['cfg']['MaxExactCountViews']) {
-            $message = PMA_Message::notice('strViewHasAtLeast');
+            $message = PMA_Message::notice(__('This view has at least this number of rows. Please refer to %sdocumentation%s.'));
             $message->addParam('[a@./Documentation.html#cfg_MaxExactCount@_blank]');
             $message->addParam('[/a]');
             $message_view_warning = PMA_showHint($message);
@@ -1944,7 +1944,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
             $message_view_warning = false;
         }
 
-        $message = PMA_Message::success('strShowingRecords');
+        $message = PMA_Message::success(__('Showing rows'));
         $message->addMessage($_SESSION['tmp_user_values']['pos']);
         if ($message_view_warning) {
             $message->addMessage('...', ' - ');
@@ -1954,7 +1954,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
             $message->addMessage($last_shown_rec, ' - ');
             $message->addMessage(' (');
             $message->addMessage($pre_count  . PMA_formatNumber($total, 0));
-            $message->addString('strTotal');
+            $message->addString(__('total'));
             if (!empty($after_count)) {
                 $message->addMessage($after_count);
             }
@@ -1962,7 +1962,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
             $message->addMessage(', ', '');
         }
 
-        $messagge_qt = PMA_Message::notice('strQueryTime');
+        $messagge_qt = PMA_Message::notice(__('Query took %01.4f sec'));
         $messagge_qt->addParam($GLOBALS['querytime']);
 
         $message->addMessage($messagge_qt, '');
diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index 916cfd256..8273d5022 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -56,7 +56,7 @@ if (empty($GLOBALS['is_header_sent'])) {
     // note: here, the decoration won't work because without cookies,
     // our standard CSS is not operational
     if (empty($_COOKIE)) {
-        PMA_Message::notice('strCookiesRequired')->display();
+        PMA_Message::notice(__('Cookies must be enabled past this point.'))->display();
     }
 
     if (!defined('PMA_DISPLAY_HEADING')) {
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index 656937154..85c4cac27 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -100,7 +100,7 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false)
                 if (!$cfg['AllowUserDropDatabase']
                  && !$is_superuser
                  && preg_match('@^[[:space:]]*DROP[[:space:]]+(IF EXISTS[[:space:]]+)?DATABASE @i', $import_run_buffer['sql'])) {
-                    $GLOBALS['message'] = PMA_Message::error('strNoDropDatabases');
+                    $GLOBALS['message'] = PMA_Message::error(__('"DROP DATABASE" statements are disabled.'));
                     $error = TRUE;
                 } else {
                     $executed_queries++;
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 81db844f3..c50894188 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -432,6 +432,6 @@ elseif ($mult_btn == __('Yes')) {
         $GLOBALS['pma']->databases->build();
     }
 } else {
-    $message = PMA_Message::success('strNoModification');
+    $message = PMA_Message::success(__('No change'));
 }
 ?>
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index 428549e2a..4e85e3270 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -185,7 +185,7 @@ function PMA_replication_print_slaves_table($hidden = false) {
     echo '    </tbody>';
     echo '    </table>';
     echo '    <br />';
-    PMA_Message::notice('strReplicationShowConnectedSlavesNote')->display();
+    PMA_Message::notice(__('Only slaves started with the --report-host=host_name option are visible in this list.'))->display();
     echo '    <br />';
     echo '  </div>';
 }
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 6127c3fad..eeee6713a 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -530,7 +530,7 @@ function PMA_sqlQueryFormUpload(){
     echo '</div>';
 
     if ($files === FALSE) {
-        $errors[] = PMA_Message::error('strWebServerUploadDirectoryError');
+        $errors[] = PMA_Message::error( __('The directory you set for upload work cannot be reached'));
     } elseif (!empty($files)) {
         echo '<div class="formelement">';
         echo '<strong>' . __('web server upload directory') .':</strong>' . "\n";
diff --git a/po/af.po b/po/af.po
index 6b0a146df..838b4e7c0 100644
--- a/po/af.po
+++ b/po/af.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-30 23:04+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: afrikaans <af@li.org>\n"
@@ -89,6 +89,11 @@ msgstr "geen Beskrywing"
 msgid "Use this value"
 msgstr ""
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "Databasis %s is verwyder."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 #, fuzzy
 msgid "Database comment: "
@@ -206,6 +211,21 @@ msgstr "Kies Alles"
 msgid "Unselect All"
 msgstr "Selekteer Niks"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+#, fuzzy
+msgid "The database name is empty!"
+msgstr "Die tabel naam is leeg!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, fuzzy, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Tabel %s is vernoem na %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, fuzzy, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Tabel %s is gekopieer na %s."
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 #, fuzzy
 msgid "Rename database to"
@@ -320,6 +340,15 @@ msgstr "Beskikbaar"
 msgid "Collation"
 msgstr ""
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Die addisionele funksies om met geskakelde tabelle te werk is ge deaktiveer. "
+"Om uit te vind hoekom kliek %shier%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Vertoon PDF skema"
@@ -648,7 +677,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -821,16 +851,64 @@ msgstr "Kontroleer tabel"
 msgid "Database Log"
 msgstr "Databasis"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr ""
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Die boekmerk is verwyder."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin verkies 'n <b>frames-kapabele</b> blaaier."
@@ -847,7 +925,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" stellings word nie toegelaat nie."
 
@@ -887,10 +966,12 @@ msgid "The user name is empty!"
 msgstr "Die gebruiker naam ontbreek!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Die wagwoord is leeg!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Die wagwoorde is verskillend!"
 
@@ -1308,7 +1389,8 @@ msgstr "Wagwoord:"
 msgid "Server Choice"
 msgstr "Bediener Keuse"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "HTTP Koekies moet van nou af geaktifeer wees."
 
@@ -1330,6 +1412,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr ""
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Verkeerde gebruikernaam/wagwoord. Toegang geweier."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1456,11 +1542,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentasie"
 
@@ -1524,7 +1611,7 @@ msgid "Skip Validate SQL"
 msgstr "Ignoreer SQL Validasie"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Valideer SQL"
 
@@ -1577,7 +1664,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1738,6 +1826,7 @@ msgid "Create"
 msgstr "Skep"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Geen Regte"
 
@@ -1754,6 +1843,10 @@ msgstr "Skep 'n nuwe tabel op databasis %s"
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1782,6 +1875,27 @@ msgstr ""
 msgid "File name template"
 msgstr ""
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+#, fuzzy
+msgid "server name"
+msgstr "Gebruiker naam"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr ""
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr ""
@@ -1853,6 +1967,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr "Soek die teksleer"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr ""
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1998,6 +2121,20 @@ msgstr "Vermoor"
 msgid "in query"
 msgstr "in navraag"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Vertoon rye"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "totaal"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr ""
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2441,26 +2578,12 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr ""
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2487,7 +2610,7 @@ msgstr "Voortgebring deur"
 msgid "Rows"
 msgstr "Rye"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL het niks teruggegee nie (dus nul rye)."
@@ -2533,6 +2656,11 @@ msgstr "Struktuur"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Geen indeks gedefinieer!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2570,6 +2698,13 @@ msgstr "Die primere sleutel is verwyder"
 msgid "Index %s has been dropped"
 msgstr "Indeks %s is verwyder"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2700,7 +2835,7 @@ msgstr "Voeg by indeks &nbsp;%s&nbsp;kolom(me)"
 msgid "Add a new User"
 msgstr "Voeg 'n nuwe gebruiker by"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Jy het 'n nuwe gebruiker bygevoeg."
 
@@ -2895,10 +3030,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr ""
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Die boekmerk is verwyder."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Etiket"
@@ -2941,15 +3072,7 @@ msgstr "\"ge-bzip\""
 msgid "Calendar"
 msgstr ""
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Kannie die indeks hernoem na PRIMARY!"
 
@@ -3067,11 +3190,6 @@ msgstr "Stel asb. die koordinate op van tabel %s"
 msgid "Connections"
 msgstr ""
 
-#: libraries/messages.inc.php:186
-#, fuzzy, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Tabel %s is gekopieer na %s."
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Kopieer tabel na (databasis<b>.</b>tabel):"
@@ -3093,7 +3211,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3192,27 +3310,17 @@ msgstr ""
 msgid "Danish"
 msgstr ""
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-#, fuzzy
-msgid "The database name is empty!"
-msgstr "Die tabel naam is leeg!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr ""
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "Databasis %s is verwyder."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr ""
@@ -3239,7 +3347,7 @@ msgstr "Databasis statistieke"
 msgid "Enable Statistics"
 msgstr "Databasis statistieke"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3283,7 +3391,7 @@ msgstr ""
 msgid "Use delayed inserts"
 msgstr ""
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3491,33 +3599,12 @@ msgid ""
 "File %s already exists on server, change filename or check overwrite option."
 msgstr ""
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr ""
-
-#: libraries/messages.inc.php:335
-#, fuzzy
-msgid "server name"
-msgstr "Gebruiker naam"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "Velde"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3538,7 +3625,7 @@ msgstr "Spoel die tabel (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3723,13 +3810,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3762,7 +3842,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Voeg by as 'n nuwe ry"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4078,17 +4158,10 @@ msgstr "Wys prosesse"
 msgid "No databases"
 msgstr "Geen databasisse"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr ""
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "geen Beskrywing"
@@ -4102,15 +4175,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Geen indeks gedefinieer!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Geen indeks dele gedefinieer!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Geen verandering"
 
@@ -4129,7 +4198,7 @@ msgstr ""
 msgid "The web server does not have permission to save the file %s."
 msgstr ""
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Jy het nie genoeg regte om nou hier te wees nie!"
 
@@ -4164,7 +4233,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> tabel nie gevind nie of nie gesetel in %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Geen gebruiker(s) gevind nie."
 
@@ -4214,7 +4284,7 @@ msgstr "Tabel instandhouding"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr ""
@@ -4317,11 +4387,11 @@ msgstr ""
 msgid "Port"
 msgstr "Sorteer"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Die naam van die primere sleutel moet PRIMARY wees!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4520,7 +4590,7 @@ msgstr ""
 msgid "No privileges."
 msgstr "Geen Regte"
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
@@ -4563,11 +4633,6 @@ msgstr ""
 "<b>Query statistics</b>: Since its startup, %s queries have been sent to the "
 "server."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr ""
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr ""
@@ -4596,15 +4661,6 @@ msgstr "Toets referential integrity:"
 msgid "Relational schema"
 msgstr ""
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Die addisionele funksies om met geskakelde tabelle te werk is ge deaktiveer. "
-"Om uit te vind hoekom kliek %shier%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 #, fuzzy
 msgid "Relations"
@@ -4644,11 +4700,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr ""
 
-#: libraries/messages.inc.php:761
-#, fuzzy, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Tabel %s is vernoem na %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4755,7 +4806,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4891,7 +4942,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Jy het die regte herroep vir %s"
@@ -5051,19 +5102,11 @@ msgstr ""
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Vertoon rye"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5830,7 +5873,7 @@ msgstr ""
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr ""
@@ -5849,7 +5892,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Die tabel naam is leeg!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "Tabel %s is verwyder"
@@ -5972,7 +6015,7 @@ msgstr ""
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr ""
@@ -5983,12 +6026,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6005,10 +6042,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "totaal"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6283,7 +6316,7 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Jy het die regte opgedateer vir %s."
@@ -6302,17 +6335,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr ""
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Gebruik"
@@ -6326,7 +6348,7 @@ msgstr "Omring tabel en veldname met backquotes"
 msgid "Use Host Table"
 msgstr ""
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
@@ -6339,7 +6361,7 @@ msgstr ""
 msgid "User name"
 msgstr "Gebruiker naam"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
@@ -6347,7 +6369,7 @@ msgstr ""
 msgid "User overview"
 msgstr ""
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr ""
 
@@ -6407,10 +6429,6 @@ msgstr "Sien die storting (skema) van die tabel"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr ""
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6428,10 +6446,6 @@ msgstr ""
 msgid "wildcard"
 msgstr ""
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Verkeerde gebruikernaam/wagwoord. Toegang geweier."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/ar.po b/po/ar.po
index af9e3192c..6180b90b4 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:11+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: arabic <ar@li.org>\n"
@@ -88,6 +88,11 @@ msgstr "الوصف"
 msgid "Use this value"
 msgstr "استخدم هذه القيمة"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr ""
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "ملاحظة قاعدة البيانات: "
@@ -204,6 +209,20 @@ msgstr "تحديد الكل"
 msgid "Unselect All"
 msgstr "إلغاء تحديد الكل"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr ""
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr ""
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr ""
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr ""
@@ -314,6 +333,15 @@ msgstr "فعل"
 msgid "Collation"
 msgstr "Collation"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط %sهنا%"
+"s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "إظهار بناء ملف PDF"
@@ -641,7 +669,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -809,16 +838,64 @@ msgstr ""
 msgid "Database Log"
 msgstr ""
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "لم يمكن قراءة الملف"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "لقد حذفت العلامة المرجعية."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin أكثر تفهما مع مستعرض <b>الإطارات</b>."
@@ -835,7 +912,8 @@ msgstr "اضغط للاختيار"
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "معطل \"حذف قاعدة بيانات\"الأمر "
 
@@ -875,10 +953,12 @@ msgid "The user name is empty!"
 msgstr "اسم المستخدم فارغ!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "كلمة السر فارغة !"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "كلمتا السر غير متشابهتان !"
 
@@ -1300,7 +1380,8 @@ msgstr "كلمة السر:"
 msgid "Server Choice"
 msgstr "اختيار الخادم"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "يجب تفعيل دعم الكوكيز في هذه المرحلة."
 
@@ -1322,6 +1403,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "لا يمكن الدخول إلى خادم MySQL"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "خطأ اسم المستخدم/كلمة السر. الدخول ممنوع."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1447,11 +1532,12 @@ msgstr ""
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "مستندات وثائقية"
 
@@ -1515,7 +1601,7 @@ msgid "Skip Validate SQL"
 msgstr "تخطي التأكد من SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "التحقق من استعلام SQL"
 
@@ -1570,7 +1656,8 @@ msgstr ""
 msgid "Font size"
 msgstr "حجم الخط"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1729,6 +1816,7 @@ msgid "Create"
 msgstr "تكوين"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "امتياز غير موجود"
 
@@ -1745,6 +1833,10 @@ msgstr "تكوين جدول جديد في قاعدة البيانات %s"
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1773,6 +1865,26 @@ msgstr "خزن على الملفات الموجودة أصلا"
 msgid "File name template"
 msgstr "قالب اسم الملف"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "اسم الخادم"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "اسم قاعدة البيانات"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "اسم الجدول"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "تذكر القالب"
@@ -1844,6 +1956,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr "مكان ملف نصي"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "الدليل الذي حددته لتحميل عملك لا يمكن الوصول إليه."
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1987,6 +2108,20 @@ msgstr "إبطال"
 msgid "in query"
 msgstr "في الاستعلام"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "مشاهدة السجلات "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "المجموع"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "استغرق الاستعلام %01.4f ثانية"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2424,26 +2559,12 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "لم يمكن قراءة الملف"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2469,7 +2590,7 @@ msgstr "أنشئ بواسطة"
 msgid "Rows"
 msgstr "صفوف"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL قام بإرجاع نتيجة إعداد فارغه (مثلا صف صفري)."
@@ -2513,6 +2634,11 @@ msgstr ""
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "فهرس غير معرف!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2549,6 +2675,13 @@ msgstr "لقد تم حذف المفتاح الأساسي"
 msgid "Index %s has been dropped"
 msgstr "فهرسة محذوفة %s"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2678,7 +2811,7 @@ msgstr "إضافه كفهرس &nbsp;%s&nbsp;صف(ـوف)"
 msgid "Add a new User"
 msgstr "أضف مستخدم جديد"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "لقد أضفت مستخدم جديد."
 
@@ -2867,10 +3000,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "اسمح لكل المستخدمين الوصول إلى هذه العلامة المرجعية"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "لقد حذفت العلامة المرجعية."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "علامة"
@@ -2913,15 +3042,7 @@ msgstr "\"bzipped\""
 msgid "Calendar"
 msgstr "نتيجة"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "لايمكن تغيير اسم الفهرس إلى الأساسي!"
 
@@ -3038,11 +3159,6 @@ msgstr "رجاء إعداد الموقع للجدول %s"
 msgid "Connections"
 msgstr "اتصالات"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr ""
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "نسخ الجدول إلى"
@@ -3064,7 +3180,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3160,26 +3276,17 @@ msgstr ""
 msgid "Danish"
 msgstr "الدنمركية"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr ""
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "خيارات تصدير قاعدة بيانات"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr ""
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "تم حذف قواعد البيانات %s بنجاح."
@@ -3203,7 +3310,7 @@ msgstr "أوقف الإحصائيات"
 msgid "Enable Statistics"
 msgstr "مكن الإحصائيات"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3250,7 +3357,7 @@ msgstr ""
 msgid "Use delayed inserts"
 msgstr "استخدم الإضافات المتأخرة"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3461,31 +3568,11 @@ msgstr ""
 "المف %s موجود أصلا على الخادم. غير الاسم أو حدد خيار التسجيل على الملف "
 "الموجود."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "اسم قاعدة البيانات"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "اسم الخادم"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "اسم الجدول"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "الملفات"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3510,7 +3597,7 @@ msgstr "إعادة تحميل الجدول (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3692,13 +3779,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3735,7 +3815,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "إدخال كتسجيل جديد"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4048,17 +4128,10 @@ msgstr "عرض العمليات"
 msgid "No databases"
 msgstr "لايوجد قواعد بيانات"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "لا قواعد بيانات محددة"
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "بدون وصف"
@@ -4072,15 +4145,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "فهرس غير معرف!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "أجزاء الفهرسة غير معرفة!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "لا تغييرات"
 
@@ -4098,7 +4167,7 @@ msgstr "هذا التنسيق ليس له أي خيارات"
 msgid "The web server does not have permission to save the file %s."
 msgstr "خادم الويب ليس لديه صلاحية لحفظ الملف %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "ليس لديك الحقوق الكافية بأن تكون هنا الآن!"
 
@@ -4133,7 +4202,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "الجدول <b>%s</b> غير موجود أو محدد في %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "المستخدم(ون) لم يتم إيجادهم."
 
@@ -4180,7 +4250,7 @@ msgstr ""
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "تم تغيير كلمة المرور لـ %s بنجاح."
@@ -4280,11 +4350,11 @@ msgstr "البولندية"
 msgid "Port"
 msgstr ""
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "اسم المفتاح الأساسي يجب أن يكون أساسيا... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4482,7 +4552,7 @@ msgstr "يسمح بتعديل البيانات."
 msgid "No privileges."
 msgstr "لا صلاحيات."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "تم إعادة قراءة الصلاحيات بنجاح."
 
@@ -4523,11 +4593,6 @@ msgid ""
 "server."
 msgstr "<b>إحصائيات الاستعلام</b>: %s استعلام أرسل إلى الخادم منذ تشغيله."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "استغرق الاستعلام %01.4f ثانية"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "نوع الاستعلام"
@@ -4556,15 +4621,6 @@ msgstr "تحديد التكامل المرجعي:"
 msgid "Relational schema"
 msgstr "بناء الارتباطات"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط %sهنا%"
-"s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "الروابط"
@@ -4603,11 +4659,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "احذف المستخدمين المحددين"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr ""
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4711,7 +4762,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4847,7 +4898,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "استرجع كل الصلاحيات الفعالة من المستخدمين ثم احذفهم بعد ذلك."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "لقد أبطلت الامتيازات لـ %s"
@@ -5006,19 +5057,11 @@ msgstr "اعرض الاستعلامات كاملة"
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "مشاهدة السجلات "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5777,7 +5820,7 @@ msgstr ""
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr ""
@@ -5796,7 +5839,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "اسم الجدول فارغ!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr ""
@@ -5917,7 +5960,7 @@ msgstr "هذا المضيف"
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "تم إيقاف العمليّة %s بنجاح."
@@ -5928,12 +5971,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -5950,10 +5987,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "المجموع"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6243,7 +6276,7 @@ msgstr "يونيكود"
 msgid "unknown"
 msgstr "غير معروفة"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "لقد جددت وحدثت الإمتيازات لـ %s."
@@ -6262,17 +6295,6 @@ msgstr "رجاء راجع التوثيق لكيفية تحديث جدول Column
 msgid "You should upgrade to %s %s or later."
 msgstr "عليك التحديث إلى %s %s أو لاحقا."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "المساحة"
@@ -6286,7 +6308,7 @@ msgstr "حماية أسماء الجداول و الحقول ب \"`\" "
 msgid "Use Host Table"
 msgstr "استخدم الجدول المضيف"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "اسم المستخدم %s موجود مسبقاً!"
@@ -6299,7 +6321,7 @@ msgstr "اسم المستخدم %s موجود مسبقاً!"
 msgid "User name"
 msgstr "اسم المستخدم"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "المستخدم المحدد غير موجود في جدول الصلاحيات."
 
@@ -6307,7 +6329,7 @@ msgstr "المستخدم المحدد غير موجود في جدول الصلا
 msgid "User overview"
 msgstr "معلومات المستخدم"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "تم حذف المستخدمين المحددين بنجاح."
 
@@ -6368,10 +6390,6 @@ msgstr "عرض بنية الجدول "
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "الدليل الذي حددته لتحميل عملك لا يمكن الوصول إليه."
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "خادم الويب"
@@ -6389,10 +6407,6 @@ msgstr "ويكي"
 msgid "wildcard"
 msgstr "حرف شامل"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "خطأ اسم المستخدم/كلمة السر. الدخول ممنوع."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/az.po b/po/az.po
index fbea5de35..84204817f 100644
--- a/po/az.po
+++ b/po/az.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:11+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: azerbaijani <az@li.org>\n"
@@ -86,6 +86,11 @@ msgstr "Haqqında"
 msgid "Use this value"
 msgstr ""
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "%s bazası leğv edildi."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Baza qısa izahatı: "
@@ -202,6 +207,21 @@ msgstr "Hamısını Seç"
 msgid "Unselect All"
 msgstr "Heç birini seçme"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+#, fuzzy
+msgid "The database name is empty!"
+msgstr "Cedveli adı boşdur!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, fuzzy, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "%s cedveli %s olaraq yeniden adlandırılmışdır"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, fuzzy, php-format
+msgid "Database %s has been copied to %s"
+msgstr "%s cedveli %s - e kopyalandı."
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 #, fuzzy
 msgid "Rename database to"
@@ -317,6 +337,15 @@ msgstr "Enabled"
 msgid "Collation"
 msgstr "Quruluş"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Elaqelendirilmiş cedveller üçün nezerde tutulmuş be'zi xüsusiyyetler "
+"passivleşdirilmişdir. Sebebini aydınlaşdırmaq üçün %sbax%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "PDF sxemini göster"
@@ -644,7 +673,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -818,16 +848,64 @@ msgstr "Cedveli yoxla"
 msgid "Database Log"
 msgstr "Me'lumat Bazası"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Fayl oxuna bilmir"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Bookmark silindi."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -846,7 +924,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" ifadeleri söndürülmüşdür (disabled)."
 
@@ -886,10 +965,12 @@ msgid "The user name is empty!"
 msgstr "İstifadeçi adı boş qaldı!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Parol boşdur!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Girdiyiniz parollar eyni deyil!"
 
@@ -1309,7 +1390,8 @@ msgstr "Parol:"
 msgid "Server Choice"
 msgstr "Quraşdırılmış Serverler"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Sisteme girebilmeniz üçün çerez faylları (cookie-ler) aktiv olmalıdır."
 
@@ -1331,6 +1413,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "MySQL server-e gire bilmirem"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Yanlış istifadeçi adı ve ya parol. Giriş tesdiq edilmedi."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1459,11 +1545,12 @@ msgstr "Gönderildi"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentasiya"
 
@@ -1527,7 +1614,7 @@ msgid "Skip Validate SQL"
 msgstr "SQL İfadesini Yoxlama"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "SQL Tesdiqle"
 
@@ -1582,7 +1669,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1745,6 +1833,7 @@ msgid "Create"
 msgstr "Qur"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Selahiyyet çatışmazlığı"
 
@@ -1761,6 +1850,10 @@ msgstr "%s bazasında yeni cedvel qur"
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1789,6 +1882,27 @@ msgstr "Mövcud fayl(lar)ın üzerine yaz"
 msgid "File name template"
 msgstr "Fayl adı nomenklaturası"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+#, fuzzy
+msgid "server name"
+msgstr "İstifadeçi adı"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr ""
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "nomenklaturanı unutma"
@@ -1860,6 +1974,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr "tekst faylından yükleyerek"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Upload işleri üçün te'yin etdiyiniz direktoriya tapılmadı"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2005,6 +2128,20 @@ msgstr "Söndür"
 msgid "in query"
 msgstr "in query"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Gösterilen setirler"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "cemi"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "sorğu %01.4f saniyede icra edildi"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2449,26 +2586,12 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Fayl oxuna bilmir"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2495,7 +2618,7 @@ msgstr "Qurucu"
 msgid "Rows"
 msgstr "Sıra sayı"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL boş netice çoxluğu gönderdi (ye'ni sıfır setir)."
@@ -2541,6 +2664,11 @@ msgstr "Quruluş"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "İndeks te'yin edilmedi!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2578,6 +2706,13 @@ msgstr "Birinci dereceli açar leğv edildi"
 msgid "Index %s has been dropped"
 msgstr "%s indeksi leğv edildi"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2708,7 +2843,7 @@ msgstr "İndekse &nbsp;%s&nbsp;sütun elave et"
 msgid "Add a new User"
 msgstr "Yeni İstifadeçi elave Et"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Yeni istifadeçi elave etdiniz."
 
@@ -2905,10 +3040,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr ""
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Bookmark silindi."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Etiket"
@@ -2951,15 +3082,7 @@ msgstr "\"bzip\"lenmiş"
 msgid "Calendar"
 msgstr ""
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "İndeksi Birinci Dereceli (PRIMARY) olaraq yeniden adlandıra bilmirem!"
 
@@ -3079,11 +3202,6 @@ msgstr "Xahiş edirem, %s cedveli üçün koordinatları yeniden müeyyen et."
 msgid "Connections"
 msgstr "Elaqeler"
 
-#: libraries/messages.inc.php:186
-#, fuzzy, php-format
-msgid "Database %s has been copied to %s"
-msgstr "%s cedveli %s - e kopyalandı."
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Cedveli kopyala (me'lumat bazası<b>.</b>cedvel):"
@@ -3105,7 +3223,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3206,27 +3324,17 @@ msgstr "Çex-Slovak"
 msgid "Danish"
 msgstr ""
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-#, fuzzy
-msgid "The database name is empty!"
-msgstr "Cedveli adı boşdur!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Me'lumat bazası eksport variantları"
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "%s bazası leğv edildi."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s bazası müveffeqiyyetle leğv edildi."
@@ -3251,7 +3359,7 @@ msgstr "Statistikaları Söndür"
 msgid "Enable Statistics"
 msgstr "Statistikaları Aktivleşdir"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3299,7 +3407,7 @@ msgstr ""
 msgid "Use delayed inserts"
 msgstr ""
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3513,33 +3621,12 @@ msgstr ""
 "%s faylı serverda onsuz da mövcuddur, ya faylın adını deyişdir ya da üzerine "
 "yazma variantlarını."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr ""
-
-#: libraries/messages.inc.php:335
-#, fuzzy
-msgid "server name"
-msgstr "İstifadeçi adı"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "Sahe sayı"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, fuzzy, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3564,7 +3651,7 @@ msgstr "Cedveli flush-la (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3749,13 +3836,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3791,7 +3871,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Yeni setir olaraq elave et"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4108,17 +4188,10 @@ msgstr "Prosesleri göster"
 msgid "No databases"
 msgstr "Baza seçilmemişdir ve ya mövcud deyildir."
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Heç bir baza seçilmemişdir."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "Haqqında me'lumat (description) mövcud deyildir"
@@ -4132,15 +4205,11 @@ msgstr "Bu depolama motoru haqqında etrafli status me'lumatı mövcud deyildir.
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "İndeks te'yin edilmedi!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "İndeks qisimleri te'yin edilmedi!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Deyişiklik Yoxdur"
 
@@ -4159,7 +4228,7 @@ msgstr "Bu formatın variantları yoxdur"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Webserver-in %s faylını saxlama izni yoxdur."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Burada olma haqqınız yoxdur!"
 
@@ -4195,7 +4264,8 @@ msgid "<b>%s</b> table not found or not set in %s"
 msgstr ""
 "<b>%s</b> cedveli %s içerisinde ya <b>tapılmadı</b> ya da qurulmamışdır"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "İstifadeçi(ler) tapılmadı."
 
@@ -4244,7 +4314,7 @@ msgstr "Cedvel temizliyi"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "%s üçün parol müveffeqiyyetle deyişdirilmişdir."
@@ -4348,11 +4418,11 @@ msgstr ""
 msgid "Port"
 msgstr "Sırala"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Birinci dereceli açarın adı... BİRİNCİ DERECELİ (PRIMARY) olmalıdır!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(\"PRIMARY\" sadece birinci dereceli açarın adı <b>olmalıdır</b>!)"
@@ -4556,7 +4626,7 @@ msgstr "Allows changing data."
 msgid "No privileges."
 msgstr "Selahiyyet te'yin edilmedi."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "The privileges were reloaded successfully."
 
@@ -4600,11 +4670,6 @@ msgstr ""
 "<b>Sorğu Statistikası</b>: Açıldıqdan bu yana, bu servere %s sorğu "
 "gönderilmişdir."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "sorğu %01.4f saniyede icra edildi"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Sorğu tipi"
@@ -4633,15 +4698,6 @@ msgstr "Check referential integrity:"
 msgid "Relational schema"
 msgstr "Relational schema"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Elaqelendirilmiş cedveller üçün nezerde tutulmuş be'zi xüsusiyyetler "
-"passivleşdirilmişdir. Sebebini aydınlaşdırmaq üçün %sbax%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relations"
@@ -4680,11 +4736,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "Remove selected users"
 
-#: libraries/messages.inc.php:761
-#, fuzzy, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "%s cedveli %s olaraq yeniden adlandırılmışdır"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4791,7 +4842,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4928,7 +4979,7 @@ msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 "Revoke all active privileges from the users and delete them afterwards."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "You have revoked the privileges for %s"
@@ -5090,19 +5141,11 @@ msgstr "Emrleri Tam Olaraq Göster"
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Gösterilen setirler"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5866,7 +5909,7 @@ msgstr "%s istifadeçisi mövcuddur!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, fuzzy, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "The selected users have been deleted successfully."
@@ -5885,7 +5928,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Cedveli adı boşdur!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "%s cedveli leğv edildi"
@@ -6008,7 +6051,7 @@ msgstr "Bu Host"
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Thread %s uğurla söndürüldü (killed)."
@@ -6019,12 +6062,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6041,10 +6078,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "cemi"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6342,7 +6375,7 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "You have updated the privileges for %s."
@@ -6361,17 +6394,6 @@ msgstr "Please see Documentation on how to update your Column_comments Table"
 msgid "You should upgrade to %s %s or later."
 msgstr ""
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Miqdar"
@@ -6385,7 +6407,7 @@ msgstr "Cedvel ve sahe adlarını tek dırnaq arasına al"
 msgid "Use Host Table"
 msgstr "Use Host Table"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "%s istifadeçisi mövcuddur!"
@@ -6398,7 +6420,7 @@ msgstr "%s istifadeçisi mövcuddur!"
 msgid "User name"
 msgstr "İstifadeçi adı"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "The selected user was not found in the privilege table."
 
@@ -6406,7 +6428,7 @@ msgstr "The selected user was not found in the privilege table."
 msgid "User overview"
 msgstr "User overview"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "The selected users have been deleted successfully."
 
@@ -6467,10 +6489,6 @@ msgstr "Cedvelin sxemini göster"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Upload işleri üçün te'yin etdiyiniz direktoriya tapılmadı"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6488,10 +6506,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "xüsusi işare"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Yanlış istifadeçi adı ve ya parol. Giriş tesdiq edilmedi."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/be.po b/po/be.po
index aad94ba23..6a5012978 100644
--- a/po/be.po
+++ b/po/be.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:12+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: belarusian_cyrillic <be@li.org>\n"
@@ -89,6 +89,11 @@ msgstr "Апісаньне"
 msgid "Use this value"
 msgstr "Выкарыстоўваць гэта значэньне"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "База дадзеных %1$s створаная."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Камэнтар да базы дадзеных: "
@@ -205,6 +210,20 @@ msgstr "Выбраць усё"
 msgid "Unselect All"
 msgstr "Зьняць усе адзнакі"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Імя базы дадзеных не пазначанае!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "База дадзеных %s была перайменаваная ў %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "База дадзеных %s была скапіяваная ў %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Перайменаваць базу дадзеных у"
@@ -317,6 +336,15 @@ msgstr "Уключана"
 msgid "Collation"
 msgstr "Супастаўленьне"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Дадатковыя магчымасьці работы з зьвязанымі табліцамі былі адключаныя. Каб "
+"высьветліць чаму, націсьніце %sтут%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Паказаць PDF-схему"
@@ -644,7 +672,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -824,16 +853,76 @@ msgstr "Праверыць табліцу"
 msgid "Database Log"
 msgstr "База дадзеных"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Вы, мусіць, паспрабавалі загрузіць вельмі вялікі файл. Калі ласка, "
+"зьвярніцеся да %sдакумэнтацыі%s для высьвятленьня спосабаў абыйсьці гэтае "
+"абмежаваньне."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Немагчыма прачытаць файл"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Вы паспрабавалі загрузіць файл з мэтадам сьціску, які непадтрымліваецца (%"
+"s). Ягоная падтрымка або не рэалізаваная, або адключаная ў вашай "
+"канфігурацыі."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Дадзеныя для імпартаваньня не атрыманыя. Альбо ніводны файл ня быў "
+"загружаны, альбо памер файла перавысіў максымальны памер, вызначаны "
+"канфігурацыяй PHP. Гл. FAQ 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"Немагчыма загрузіць плагіны імпартаваньня, калі ласка, праверце ўсталёўку!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Закладка была выдаленая."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Паказваючы закладку"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Закладка %s створаная"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Імпартраваньне пасьпяхова завершанае, выканана %d запытаў."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Выйшаў дазволены час выкананьня скрыпта. Калі вы хочаце завершыць "
+"імпартаваньне, калі ласка, загрузіце файл зноў і імпартаваньне ўзнавіцца."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "Для работы phpMyAdmin патрэбны браўзэр з падтрымкай <b>фрэймаў</b>."
@@ -850,7 +939,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "Каманды \"DROP DATABASE\" адключаныя."
 
@@ -890,10 +980,12 @@ msgid "The user name is empty!"
 msgstr "Пустое імя карыстальніка!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Пусты пароль!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Паролі не супадаюць!"
 
@@ -1317,7 +1409,8 @@ msgstr "Пароль:"
 msgid "Server Choice"
 msgstr "Выбар сэрвэра"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies мусяць быць уключанымі пасьля гэтага месца."
 
@@ -1341,6 +1434,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Немагчыма залагавацца на сэрвэр MySQL"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Няправільны лагін/пароль. У доступе адмоўлена."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1473,11 +1570,12 @@ msgstr "Адпраўлена"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Дакумэнтацыя"
 
@@ -1541,7 +1639,7 @@ msgid "Skip Validate SQL"
 msgstr "Не правяраць SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Праверыць SQL"
 
@@ -1597,7 +1695,8 @@ msgstr ""
 msgid "Font size"
 msgstr "Памер шрыфта"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1761,6 +1860,7 @@ msgid "Create"
 msgstr "Стварыць"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Без прывілеяў"
 
@@ -1777,6 +1877,12 @@ msgstr "Стварыць новую табліцу ў БД %s"
 msgid "Number of fields"
 msgstr "Колькасьць палёў"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"Немагчыма загрузіць плагіны экспартаваньня, калі ласка, праверце ўсталяваныя "
+"файлы!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1805,6 +1911,29 @@ msgstr "Перазапісваць існуючы(я) файл(ы)"
 msgid "File name template"
 msgstr "Шаблён назвы файла"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "імя сэрвэра"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "імя базы дадзеных"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "імя табліцы"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Гэтае значэньне інтэрпрэтуецца з выкарыстаньнем %1$sstrftime%2$s, таму можна "
+"выкарыстоўваць радкі фарматаваньня часу. Апроч гэтага, будуць праведзеныя "
+"наступныя зьмены: %3$s. Астатні тэкст застанецца як ёсьць."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "запомніць шаблён"
@@ -1876,6 +2005,15 @@ msgstr "Імпартаваць файл"
 msgid "Location of the text file"
 msgstr "Месцазнаходжаньне тэкставага файла"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Загрузкі файлаў не дазволеныя на гэтым сэрвэры."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Немагчыма адкрыць пазначаную вамі тэчку для загрузкі файлаў"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2024,6 +2162,20 @@ msgstr "Спыніць"
 msgid "in query"
 msgstr "па запыту"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Паказаныя запісы"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "усяго"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Запыт выконваўся %01.4f сэк"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2513,29 +2665,12 @@ msgstr "Памылка запісу на дыск."
 msgid "File upload stopped by extension."
 msgstr "Загрузка файла спыненая пашырэньнем."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Немагчыма прачытаць файл"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Памылка перамяшчэньня загружанага файла. Глядзіце разьдзел 1.11 у FAQ"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Вы паспрабавалі загрузіць файл з мэтадам сьціску, які непадтрымліваецца (%"
-"s). Ягоная падтрымка або не рэалізаваная, або адключаная ў вашай "
-"канфігурацыі."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2562,7 +2697,7 @@ msgstr "Створаны"
 msgid "Rows"
 msgstr "Радкі"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL вярнула пусты вынік (то бок нуль радкоў)."
@@ -2609,6 +2744,11 @@ msgstr "Структура"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Індэкс ня вызначаны!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2645,6 +2785,15 @@ msgstr "Першасны ключ быў выдалены"
 msgid "Index %s has been dropped"
 msgstr "Індэкс %s быў выдалены"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"Падобна, што індэксы %1$s і %2$s зьяўляюцца аднолькавымі, а таму адзін зь "
+"іх, магчыма, можна выдаліць."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2777,7 +2926,7 @@ msgstr "Дадаць да індэкса &nbsp;%s&nbsp;калёнку(і)"
 msgid "Add a new User"
 msgstr "Дадаць новага карыстальніка"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Быў дададзены новы карыстальнік."
 
@@ -2970,10 +3119,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "Даць кожнаму карыстальніку доступ да гэтай закладкі"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Закладка была выдаленая."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Метка"
@@ -3016,18 +3161,7 @@ msgstr "сьціскаць у bzip"
 msgid "Calendar"
 msgstr "Каляндар"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"Немагчыма загрузіць плагіны экспартаваньня, калі ласка, праверце ўсталяваныя "
-"файлы!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"Немагчыма загрузіць плагіны імпартаваньня, калі ласка, праверце ўсталёўку!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Немагчыма перайменаваць індэкс у PRIMARY!"
 
@@ -3146,11 +3280,6 @@ msgstr "Калі ласка, сканфігуруйце каардынаты д
 msgid "Connections"
 msgstr "Падлучэньні"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "База дадзеных %s была скапіяваная ў %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Скапіяваць табліцу ў (база дадзеных<b>.</b>табліца):"
@@ -3172,7 +3301,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3271,26 +3400,17 @@ msgstr "Чэхаславацкая"
 msgid "Danish"
 msgstr "Дацкая"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Імя базы дадзеных не пазначанае!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Налады экспарту базы дадзеных"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "База дадзеных %1$s створаная."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s базаў дадзеных былі пасьпяхова выдаленыя."
@@ -3315,7 +3435,7 @@ msgstr "Адключыць статыстыку"
 msgid "Enable Statistics"
 msgstr "Уключыць статыстыку"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3364,7 +3484,7 @@ msgstr "Дэфрагмэнтаваць табліцу"
 msgid "Use delayed inserts"
 msgstr "Выкарыстоўваць адкладзеныя ўстаўкі"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "На выбраныя карыстальнікі для выдаленьня!"
 
@@ -3579,34 +3699,11 @@ msgstr ""
 "Файл %s ужо існуе на сэрвэры, зьмяніце імя файла або праверце опцыю "
 "перазапісу."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "імя базы дадзеных"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "імя сэрвэра"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "імя табліцы"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Гэтае значэньне інтэрпрэтуецца з выкарыстаньнем %1$sstrftime%2$s, таму можна "
-"выкарыстоўваць радкі фарматаваньня часу. Апроч гэтага, будуць праведзеныя "
-"наступныя зьмены: %3$s. Астатні тэкст застанецца як ёсьць."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Файлы"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3631,7 +3728,7 @@ msgstr "Скінуць кэш табліцы (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Скінуць (закрыць) усе табліцы"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr "Памылка стварэньня зьнешняга ключа на %1$s (праверце тыпы калёнак)"
@@ -3815,15 +3912,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"Падобна, што індэксы %1$s і %2$s зьяўляюцца аднолькавымі, а таму адзін зь "
-"іх, магчыма, можна выдаліць."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3861,7 +3949,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Уставіць як новы радок"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "ID устаўленага радку: %1$d"
@@ -4186,20 +4274,10 @@ msgstr "Паказаць працэсы"
 msgid "No databases"
 msgstr "Базы дадзеных адсутнічаюць"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Ня выбраная база дадзеных."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Дадзеныя для імпартаваньня не атрыманыя. Альбо ніводны файл ня быў "
-"загружаны, альбо памер файла перавысіў максымальны памер, вызначаны "
-"канфігурацыяй PHP. Гл. FAQ 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "няма апісаньня"
@@ -4214,15 +4292,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "Файлы ў ZIP-архіве ня знойдзеныя!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Індэкс ня вызначаны!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Часткі індэксу ня вызначаныя!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Няма зьменаў"
 
@@ -4241,7 +4315,7 @@ msgstr "Гэты фармат ня мае опцыяў"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Вэб-сэрвэр ня мае дазволу для захаваньня ў файл %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Вы ня маеце дастатковых прывілеяў быць у гэтым месцы ў гэты час!"
 
@@ -4278,7 +4352,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "Табліца <b>%s</b> ня знойдзеная або ня вызначаная ў %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Не знойдзены карыстальнік."
 
@@ -4325,7 +4400,7 @@ msgstr "Падтрымка падзелаў"
 msgid "Partition %s"
 msgstr "Падзел %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Пароль для %s пасьпяхова зьменены."
@@ -4427,11 +4502,11 @@ msgstr "Польская"
 msgid "Port"
 msgstr "Парадак"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Імя першаснага ключа мусіць быць PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4639,7 +4714,7 @@ msgstr "Дазваляе зьмяняць дадзеныя."
 msgid "No privileges."
 msgstr "Без прывілеяў."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Прывілеі былі пасьпяхова перазагружаныя."
 
@@ -4682,11 +4757,6 @@ msgstr ""
 "<b>Статыстыка запытаў</b>: З моманту запуску %s запытаў было адпраўлена на "
 "сэрвэр."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Запыт выконваўся %01.4f сэк"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Тып запыту"
@@ -4715,15 +4785,6 @@ msgstr "Праверыць цэласнасьць дадзеных:"
 msgid "Relational schema"
 msgstr "Рэляцыйная схема"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Дадатковыя магчымасьці работы з зьвязанымі табліцамі былі адключаныя. Каб "
-"высьветліць чаму, націсьніце %sтут%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Сувязі"
@@ -4763,11 +4824,6 @@ msgstr "Скасаваць падзел на часткі"
 msgid "Remove selected users"
 msgstr "Выдаліць выбраных карыстальнікаў"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "База дадзеных %s была перайменаваная ў %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4873,7 +4929,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -5013,7 +5069,7 @@ msgstr "Пачаць устаўку зноў з %s-га радку"
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Ануляваць усе актыўныя прывілеі карыстальнікаў і пасьля выдаліць іх."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Вы анулявалі прывілеі для %s"
@@ -5176,19 +5232,11 @@ msgstr "Паказаць поўныя запыты"
 msgid "Show/Hide left menu"
 msgstr "Паказаць/схаваць мэню зьлева"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Паказваючы закладку"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "У выглядзе PHP-коду"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Паказаныя запісы"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "У выглядзе SQL-запыту"
 
@@ -6088,7 +6136,7 @@ msgstr "Табліца %s ужо існуе!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Табліца %1$s была пасьпяхова зьмененая"
@@ -6107,7 +6155,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Пустая назва табліцы!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "Табліца %1$s створаная."
@@ -6228,7 +6276,7 @@ msgstr "Гэты хост"
 msgid "Threads"
 msgstr "Патокі"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Паток %s быў пасьпяхова спынены."
@@ -6242,14 +6290,6 @@ msgstr ""
 "звычайна значыць, што phpMyAdmin ня зможа скончыць гэтае імпартаваньня, калі "
 "вы не павялічыце ліміты выкананьня php-скрыптоў."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Выйшаў дазволены час выкананьня скрыпта. Калі вы хочаце завершыць "
-"імпартаваньне, калі ласка, загрузіце файл зноў і імпартаваньне ўзнавіцца."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "старонка"
@@ -6267,10 +6307,6 @@ msgid "To select relation, click :"
 msgstr ""
 "Каб выбраць сувязь, націсьніце на кропцы злучэньня, як паказана на выяве:"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "усяго"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6585,7 +6621,7 @@ msgstr "Юнікод"
 msgid "unknown"
 msgstr "невядома"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Вы зьмянілі прывілеі для  %s."
@@ -6606,20 +6642,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Вам трэба абнавіць %s да вэрсіі %s ці пазьнейшай."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Вы, мусіць, паспрабавалі загрузіць вельмі вялікі файл. Калі ласка, "
-"зьвярніцеся да %sдакумэнтацыі%s для высьвятленьня спосабаў абыйсьці гэтае "
-"абмежаваньне."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Загрузкі файлаў не дазволеныя на гэтым сэрвэры."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Выкарыстаньне"
@@ -6633,7 +6655,7 @@ msgstr "Зваротнае двукосьсе ў імёнах табліц і п
 msgid "Use Host Table"
 msgstr "Выкарыстоўваць табліцу хостаў"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Карыстальнік %s ужо існуе!"
@@ -6646,7 +6668,7 @@ msgstr "Карыстальнік %s ужо існуе!"
 msgid "User name"
 msgstr "Імя карыстальніка"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Вылучаны карыстальнік ня знойдзены ў табліцы прывілеяў."
 
@@ -6654,7 +6676,7 @@ msgstr "Вылучаны карыстальнік ня знойдзены ў т
 msgid "User overview"
 msgstr "Карыстальнікі"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Выбраныя карыстальнікі былі пасьпяхова выдаленыя."
 
@@ -6718,10 +6740,6 @@ msgstr "Праглядзець дамп (схему) табліцы"
 msgid "VIEW name"
 msgstr "Назва прагляду"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Немагчыма адкрыць пазначаную вамі тэчку для загрузкі файлаў"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Вэб-сэрвэр"
@@ -6739,10 +6757,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "шаблён"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Няправільны лагін/пароль. У доступе адмоўлена."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/be@latin.po b/po/be@latin.po
index 7ef9829d1..5abef1bfa 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-30 23:09+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: belarusian_latin <be@latin@li.org>\n"
@@ -92,6 +92,11 @@ msgstr "Apisańnie"
 msgid "Use this value"
 msgstr "Vykarystoŭvać heta značeńnie"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Baza dadzienych %1$s stvoranaja."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Kamentar da bazy dadzienych: "
@@ -208,6 +213,20 @@ msgstr "Vybrać usio"
 msgid "Unselect All"
 msgstr "Źniać usie adznaki"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Imia bazy dadzienych nie paznačanaje!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Baza dadzienych %s była pierajmienavanaja ŭ %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Baza dadzienych %s była skapijavanaja ŭ %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Pierajmienavać bazu dadzienych u"
@@ -318,6 +337,15 @@ msgstr ""
 msgid "Collation"
 msgstr "Supastaŭleńnie"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Dadatkovyja mahčymaści raboty z źviazanymi tablicami byli adklučanyja. Kab "
+"vyśvietlić čamu, naciśnicie %stut%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Pakazać PDF-schiemu"
@@ -645,7 +673,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -817,16 +846,76 @@ msgstr ""
 msgid "Database Log"
 msgstr ""
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Vy, musić, pasprabavali zahruzić vielmi vialiki fajł. Kali łaska, "
+"źviarniciesia da %sdakumentacyi%s dla vyśviatleńnia sposabaŭ abyjści hetaje "
+"abmiežavańnie."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Niemahčyma pračytać fajł"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Vy pasprabavali zahruzić fajł z metadam ścisku, jaki niepadtrymlivajecca (%"
+"s). Jahonaja padtrymka abo nie realizavanaja, abo adklučanaja ŭ vašaj "
+"kanfihuracyi."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Dadzienyja dla impartavańnia nie atrymanyja. Albo nivodny fajł nia byŭ "
+"zahružany, albo pamier fajła pieravysiŭ maksymalny pamier, vyznačany "
+"kanfihuracyjaj PHP. Hł. FAQ 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"Niemahčyma zahruzić płahiny impartavańnia, kali łaska, praviercie ŭstaloŭku!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Zakładka była vydalenaja."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Pakazvajučy zakładku"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Zakładka %s stvoranaja"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Impartravańnie paśpiachova zavieršanaje, vykanana %d zapytaŭ."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Vyjšaŭ dazvoleny čas vykanańnia skrypta. Kali vy chočacie zavieršyć "
+"impartavańnie, kali łaska, zahruzicie fajł znoŭ i impartavańnie ŭznavicca."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "Dla raboty phpMyAdmin patrebny braŭzer z padtrymkaj frejmaŭ."
@@ -843,7 +932,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "Kamandy \"DROP DATABASE\" adklučanyja."
 
@@ -883,10 +973,12 @@ msgid "The user name is empty!"
 msgstr "Pustoje imia karystalnika!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Pusty parol!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Paroli nie supadajuć!"
 
@@ -1311,7 +1403,8 @@ msgstr "Parol:"
 msgid "Server Choice"
 msgstr "Vybar servera"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies musiać być uklučanymi paśla hetaha miesca."
 
@@ -1335,6 +1428,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Niemahčyma załahavacca na server MySQL"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Niapravilny łahin/parol. U dostupie admoŭlena."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1466,11 +1563,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dakumentacyja"
 
@@ -1534,7 +1632,7 @@ msgid "Skip Validate SQL"
 msgstr "Nie praviarać SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Pravieryć SQL"
 
@@ -1591,7 +1689,8 @@ msgstr ""
 msgid "Font size"
 msgstr "Pamier šryfta"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1755,6 +1854,7 @@ msgid "Create"
 msgstr "Stvaryć"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Biez pryvilejaŭ"
 
@@ -1771,6 +1871,12 @@ msgstr "Stvaryć novuju tablicu ŭ BD %s"
 msgid "Number of fields"
 msgstr "Kolkaść paloŭ"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"Niemahčyma zahruzić płahiny ekspartavańnia, kali łaska, praviercie "
+"ŭstalavanyja fajły!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1799,6 +1905,29 @@ msgstr "Pierazapisvać isnujučy(ja) fajł(y)"
 msgid "File name template"
 msgstr "Šablon nazvy fajła"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "imia servera"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "imia bazy dadzienych"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "imia tablicy"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Hetaje značeńnie interpretujecca z vykarystańniem %1$sstrftime%2$s, tamu "
+"možna vykarystoŭvać radki farmatavańnia času. Aproč hetaha, buduć "
+"praviedzienyja nastupnyja źmieny: %3$s. Astatni tekst zastaniecca jak jość."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "zapomnić šablon"
@@ -1870,6 +1999,15 @@ msgstr "Impartavać fajł"
 msgid "Location of the text file"
 msgstr "Miescaznachodžańnie tekstavaha fajła"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Zahruzki fajłaŭ nie dazvolenyja na hetym servery."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Niemahčyma adkryć paznačanuju vami tečku dla zahruzki fajłaŭ"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2018,6 +2156,20 @@ msgstr "Spynić"
 msgid "in query"
 msgstr "pa zapytu"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Pakazanyja zapisy"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "usiaho"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Zapyt vykonvaŭsia %01.4f sek"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2511,11 +2663,6 @@ msgstr "Pamyłka zapisu na dysk."
 msgid "File upload stopped by extension."
 msgstr "Zahruzka fajła spynienaja pašyreńniem."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Niemahčyma pračytać fajł"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
@@ -2523,18 +2670,6 @@ msgid ""
 msgstr ""
 "Pamyłka pieramiaščeńnia zahružanaha fajła. Hladzicie raździeł 1.11 u FAQ"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Vy pasprabavali zahruzić fajł z metadam ścisku, jaki niepadtrymlivajecca (%"
-"s). Jahonaja padtrymka abo nie realizavanaja, abo adklučanaja ŭ vašaj "
-"kanfihuracyi."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2560,7 +2695,7 @@ msgstr "Stvorany"
 msgid "Rows"
 msgstr "Radki"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL viarnuła pusty vynik (to bok nul radkoŭ)."
@@ -2604,6 +2739,11 @@ msgstr ""
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Indeks nia vyznačany!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2640,6 +2780,15 @@ msgstr "Pieršasny kluč byŭ vydaleny"
 msgid "Index %s has been dropped"
 msgstr "Indeks %s byŭ vydaleny"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"Padobna, što indeksy %1$s i %2$s źjaŭlajucca adnolkavymi, a tamu adzin ź "
+"ich, mahčyma, možna vydalić."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2772,7 +2921,7 @@ msgstr "Dadać da indeksa %s kalonku(i)"
 msgid "Add a new User"
 msgstr "Dadać novaha karystalnika"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Byŭ dadadzieny novy karystalnik."
 
@@ -2961,10 +3110,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "Dać kožnamu karystalniku dostup da hetaj zakładki"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Zakładka była vydalenaja."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Mietka"
@@ -3007,18 +3152,7 @@ msgstr "ściskać u bzip"
 msgid "Calendar"
 msgstr "Kalandar"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"Niemahčyma zahruzić płahiny ekspartavańnia, kali łaska, praviercie "
-"ŭstalavanyja fajły!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"Niemahčyma zahruzić płahiny impartavańnia, kali łaska, praviercie ŭstaloŭku!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Niemahčyma pierajmienavać indeks u PRIMARY!"
 
@@ -3136,11 +3270,6 @@ msgstr "Kali łaska, skanfihurujcie kaardynaty dla tablicy %s"
 msgid "Connections"
 msgstr "Padłučeńni"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Baza dadzienych %s była skapijavanaja ŭ %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Skapijavać tablicu ŭ (baza dadzienych.tablica):"
@@ -3162,7 +3291,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3261,26 +3390,17 @@ msgstr "Čechasłavackaja"
 msgid "Danish"
 msgstr "Dackaja"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Imia bazy dadzienych nie paznačanaje!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Nałady ekspartu bazy dadzienych"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Baza dadzienych %1$s stvoranaja."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s bazaŭ dadzienych byli paśpiachova vydalenyja."
@@ -3304,7 +3424,7 @@ msgstr "Adklučyć statystyku"
 msgid "Enable Statistics"
 msgstr "Uklučyć statystyku"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3351,7 +3471,7 @@ msgstr "Defrahmentavać tablicu"
 msgid "Use delayed inserts"
 msgstr "Vykarystoŭvać adkładzienyja ŭstaŭki"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Na vybranyja karystalniki dla vydaleńnia!"
 
@@ -3567,34 +3687,11 @@ msgstr ""
 "Fajł %s užo isnuje na servery, źmianicie imia fajła abo praviercie opcyju "
 "pierazapisu."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "imia bazy dadzienych"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "imia servera"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "imia tablicy"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Hetaje značeńnie interpretujecca z vykarystańniem %1$sstrftime%2$s, tamu "
-"možna vykarystoŭvać radki farmatavańnia času. Aproč hetaha, buduć "
-"praviedzienyja nastupnyja źmieny: %3$s. Astatni tekst zastaniecca jak jość."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Fajły"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3619,7 +3716,7 @@ msgstr "Skinuć keš tablicy (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Skinuć (zakryć) usie tablicy"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr "Pamyłka stvareńnia źniešniaha kluča na %1$s (praviercie typy kalonak)"
@@ -3801,15 +3898,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"Padobna, što indeksy %1$s i %2$s źjaŭlajucca adnolkavymi, a tamu adzin ź "
-"ich, mahčyma, možna vydalić."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3847,7 +3935,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Ustavić jak novy radok"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "ID ustaŭlenaha radku: %1$d"
@@ -4173,20 +4261,10 @@ msgstr "Pakazać pracesy"
 msgid "No databases"
 msgstr "Bazy dadzienych adsutničajuć"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Nia vybranaja baza dadzienych."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Dadzienyja dla impartavańnia nie atrymanyja. Albo nivodny fajł nia byŭ "
-"zahružany, albo pamier fajła pieravysiŭ maksymalny pamier, vyznačany "
-"kanfihuracyjaj PHP. Hł. FAQ 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "niama apisańnia"
@@ -4201,15 +4279,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "Fajły ŭ ZIP-archivie nia znojdzienyja!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Indeks nia vyznačany!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Častki indeksu nia vyznačanyja!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Niama źmienaŭ"
 
@@ -4227,7 +4301,7 @@ msgstr "Hety farmat nia maje opcyjaŭ"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Web-server nia maje dazvołu dla zachavańnia ŭ fajł %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Vy nia majecie dastatkovych pryvilejaŭ być u hetym miescy ŭ hety čas!"
 
@@ -4264,7 +4338,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "Tablica %s nia znojdzienaja abo nia vyznačanaja ŭ %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Nie znojdzieny karystalnik."
 
@@ -4311,7 +4386,7 @@ msgstr "Padtrymka padziełaŭ"
 msgid "Partition %s"
 msgstr "Padzieł %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Parol dla %s paśpiachova źmienieny."
@@ -4411,11 +4486,11 @@ msgstr "Polskaja"
 msgid "Port"
 msgstr ""
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Imia pieršasnaha kluča musić być PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(\"PRIMARY\" musić być imiem pieršasnaha kluča i tolki jaho!)"
@@ -4622,7 +4697,7 @@ msgstr "Dazvalaje źmianiać dadzienyja."
 msgid "No privileges."
 msgstr "Biez pryvilejaŭ."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Pryvilei byli paśpiachova pierazahružanyja."
 
@@ -4664,11 +4739,6 @@ msgid ""
 msgstr ""
 "Statystyka zapytaŭ: Z momantu zapusku %s zapytaŭ było adpraŭlena na server."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Zapyt vykonvaŭsia %01.4f sek"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Typ zapytu"
@@ -4697,15 +4767,6 @@ msgstr "Pravieryć cełasnaść dadzienych:"
 msgid "Relational schema"
 msgstr "Relacyjnaja schiema"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Dadatkovyja mahčymaści raboty z źviazanymi tablicami byli adklučanyja. Kab "
-"vyśvietlić čamu, naciśnicie %stut%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Suviazi"
@@ -4744,11 +4805,6 @@ msgstr "Skasavać padzieł na častki"
 msgid "Remove selected users"
 msgstr "Vydalić vybranych karystalnikaŭ"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Baza dadzienych %s była pierajmienavanaja ŭ %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4852,7 +4908,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4989,7 +5045,7 @@ msgstr "Pačać ustaŭku znoŭ z %s-ha radku"
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Anulavać usie aktyŭnyja pryvilei karystalnikaŭ i paśla vydalić ich."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Vy anulavali pryvilei dla %s"
@@ -5152,19 +5208,11 @@ msgstr "Pakazać poŭnyja zapyty"
 msgid "Show/Hide left menu"
 msgstr "Pakazać/schavać meniu źleva"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Pakazvajučy zakładku"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "U vyhladzie PHP-kodu"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Pakazanyja zapisy"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "U vyhladzie SQL-zapytu"
 
@@ -6064,7 +6112,7 @@ msgstr "Tablica %s užo isnuje!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Tablica %1$s była paśpiachova źmienienaja"
@@ -6083,7 +6131,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Pustaja nazva tablicy!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "Tablica %1$s stvoranaja."
@@ -6204,7 +6252,7 @@ msgstr "Hety chost"
 msgid "Threads"
 msgstr "Patoki"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Patok %s byŭ paśpiachova spynieny."
@@ -6218,14 +6266,6 @@ msgstr ""
 "Heta zvyčajna značyć, što phpMyAdmin nia zmoža skončyć hetaje impartavańnia, "
 "kali vy nie pavialičycie limity vykanańnia php-skryptoŭ."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Vyjšaŭ dazvoleny čas vykanańnia skrypta. Kali vy chočacie zavieršyć "
-"impartavańnie, kali łaska, zahruzicie fajł znoŭ i impartavańnie ŭznavicca."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "staronka"
@@ -6243,10 +6283,6 @@ msgid "To select relation, click :"
 msgstr ""
 "Kab vybrać suviaź, naciśnicie na kropcy złučeńnia, jak pakazana na vyjavie:"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "usiaho"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6560,7 +6596,7 @@ msgstr "Junikod"
 msgid "unknown"
 msgstr "nieviadoma"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Vy źmianili pryvilei dla %s."
@@ -6581,20 +6617,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Vam treba abnavić %s da versii %s ci paźniejšaj."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Vy, musić, pasprabavali zahruzić vielmi vialiki fajł. Kali łaska, "
-"źviarniciesia da %sdakumentacyi%s dla vyśviatleńnia sposabaŭ abyjści hetaje "
-"abmiežavańnie."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Zahruzki fajłaŭ nie dazvolenyja na hetym servery."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Vykarystańnie"
@@ -6608,7 +6630,7 @@ msgstr "Zvarotnaje dvukośsie ŭ imionach tablic i paloŭ"
 msgid "Use Host Table"
 msgstr "Vykarystoŭvać tablicu chostaŭ"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Karystalnik %s užo isnuje!"
@@ -6621,7 +6643,7 @@ msgstr "Karystalnik %s užo isnuje!"
 msgid "User name"
 msgstr "Imia karystalnika"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Vyłučany karystalnik nia znojdzieny ŭ tablicy pryvilejaŭ."
 
@@ -6629,7 +6651,7 @@ msgstr "Vyłučany karystalnik nia znojdzieny ŭ tablicy pryvilejaŭ."
 msgid "User overview"
 msgstr "Karystalniki"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Vybranyja karystalniki byli paśpiachova vydalenyja."
 
@@ -6693,10 +6715,6 @@ msgstr "Prahladzieć damp (schiemu) tablicy"
 msgid "VIEW name"
 msgstr "Nazva prahladu"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Niemahčyma adkryć paznačanuju vami tečku dla zahruzki fajłaŭ"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Web-server"
@@ -6714,10 +6732,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "šablon"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Niapravilny łahin/parol. U dostupie admoŭlena."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/bg.po b/po/bg.po
index e02a6f7ac..9dfeca2e1 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:12+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: bulgarian <bg@li.org>\n"
@@ -89,6 +89,11 @@ msgstr "Описание"
 msgid "Use this value"
 msgstr "Използвахте тази стойност"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "Базата данни %s беше изтрита."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Коментар към базата от данни: "
@@ -205,6 +210,20 @@ msgstr "Селектиране на всичко"
 msgid "Unselect All"
 msgstr "Деселектиране на всичко"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Името на базата от данни е празно!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Базата данни %s беше преименувана на %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "База от данни %s беше копирана като %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Преименуване на базата от данни на"
@@ -316,6 +335,15 @@ msgstr "Позволено"
 msgid "Collation"
 msgstr "Колация"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Допълнителните възможности за работа със свързани (linked) таблици са "
+"деактивирани. За да разберете защо кликнете %sтук%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Покажи PDF схема"
@@ -643,7 +671,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -816,16 +845,68 @@ msgstr "Проверка на таблицата"
 msgid "Database Log"
 msgstr "БД"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Вероятно сте направили опит да качите твърде голям файл. Моля, обърнете се "
+"към %sdдокументацията%s за да намерите начин да избегнете това ограничение."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Файлът не може да бъде прочетен"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"Plugin-ите за импортиране не могат да бъдат заредени, моля проверете "
+"инсталацията на phpMyAdmin!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Показалецът беше изтрит."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Показалец %s беше създаден успешно"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Импортирането приключи успещно. Бяха изпълнени %d заявки."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -844,7 +925,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" заявката е забранена."
 
@@ -884,10 +966,12 @@ msgid "The user name is empty!"
 msgstr "Потребителското име е празно!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Паролата е празна!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Паролата не е същата!"
 
@@ -1310,7 +1394,8 @@ msgstr "Парола:"
 msgid "Server Choice"
 msgstr "Избор на сървър"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Оттук нататък са необходими \"Cookies\"."
 
@@ -1332,6 +1417,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Не мога да се логна към MySQL сървъра"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Грешно име/парола. Достъп отказан."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1463,11 +1552,12 @@ msgstr "Изпратени"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Документация"
 
@@ -1531,7 +1621,7 @@ msgid "Skip Validate SQL"
 msgstr "Пропусни Validate SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Валидирай SQL-а"
 
@@ -1586,7 +1676,8 @@ msgstr ""
 msgid "Font size"
 msgstr "Размер на шрифта"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1748,6 +1839,7 @@ msgid "Create"
 msgstr "Създай"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Няма привилегии"
 
@@ -1764,6 +1856,12 @@ msgstr "Създаване на нова таблица в БД %s"
 msgid "Number of fields"
 msgstr "Брой полета"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"Приставките за експортиране не могат да бъдат заредени, моля проверете "
+"инсталацията!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1792,6 +1890,26 @@ msgstr "Препокриване на съществуващите файлов
 msgid "File name template"
 msgstr "Шаблон на файловото име"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "име на сървъра"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "име на базата от данни"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "име на таблицата"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "запомняне на шаблона"
@@ -1863,6 +1981,15 @@ msgstr "Файл за импортиране"
 msgid "Location of the text file"
 msgstr "Местоположение на текстовия файл"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "На този сървър не е позволени качване на файлове."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Директорията която сте указали за upload не може да бъде достигната"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2008,6 +2135,20 @@ msgstr "СТОП"
 msgid "in query"
 msgstr "в запитването"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Показване на записи "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "Общо"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Заявката отне %01.4f секунди"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2450,11 +2591,6 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Файлът не може да бъде прочетен"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 #, fuzzy
 msgid ""
@@ -2462,15 +2598,6 @@ msgid ""
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Може да има приблизителна стойност. Виж FAQ 3.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2497,7 +2624,7 @@ msgstr "Генерирано от"
 msgid "Rows"
 msgstr "Редове"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL върна празен резултат (т.е. нула редове)."
@@ -2543,6 +2670,11 @@ msgstr "Структура"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Не е дефиниран индекс!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2580,6 +2712,13 @@ msgstr " Главния ключ беше изтрит."
 msgid "Index %s has been dropped"
 msgstr "Индекса %s беше изтрит"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2712,7 +2851,7 @@ msgstr " &nbsp;%s&nbsp;колона(и) беше(яха)добавени към
 msgid "Add a new User"
 msgstr "Добавяне на нов потребител."
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Вие добавихте нов потребител."
 
@@ -2907,10 +3046,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "Нека всеки потребител има достъп до този показалец"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Показалецът беше изтрит."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Етикет"
@@ -2954,19 +3089,7 @@ msgstr "\"bzip-нато\""
 msgid "Calendar"
 msgstr "Календар"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"Приставките за експортиране не могат да бъдат заредени, моля проверете "
-"инсталацията!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"Plugin-ите за импортиране не могат да бъдат заредени, моля проверете "
-"инсталацията на phpMyAdmin!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Не мога да преименувам индекса на PRIMARY!"
 
@@ -3087,11 +3210,6 @@ msgstr "Моля конфигурирайте координатите за та
 msgid "Connections"
 msgstr "Конекции"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "База от данни %s беше копирана като %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Копиране на таблица (база от данни<b>.</b>таблица):"
@@ -3113,7 +3231,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3212,26 +3330,17 @@ msgstr "Чехословашки"
 msgid "Danish"
 msgstr "Датски"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Името на базата от данни е празно!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Опции за експортиране на база от данни"
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "Базата данни %s беше изтрита."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s бази от данни бяха изтрити успешно."
@@ -3256,7 +3365,7 @@ msgstr "Забрани статистика"
 msgid "Enable Statistics"
 msgstr "Разрешаване на статистика"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3304,7 +3413,7 @@ msgstr "Дефрагментиране на таблица"
 msgid "Use delayed inserts"
 msgstr "Използване на отложени вмъквания"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Не за избрани потребители за изтриване!"
 
@@ -3519,32 +3628,12 @@ msgstr ""
 "Файлът %s вече съществува на сървъра, сменете името на файла или включете "
 "опцията за препокриване."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "име на базата от данни"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "име на сървъра"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "име на таблицата"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "Полета"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3570,7 +3659,7 @@ msgstr "Изчистване на кеша на таблицата (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3754,13 +3843,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3797,7 +3879,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Вмъкване като нов ред"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4117,17 +4199,10 @@ msgstr "MySQL процеси"
 msgid "No databases"
 msgstr "Няма бази от данни"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Няма избрани бази от данни."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "няма Описание"
@@ -4141,15 +4216,11 @@ msgstr "Няма детайлна информация за състояниет
 msgid "No files found inside ZIP archive!"
 msgstr "Не са открити файлове в ZIP архива!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Не е дефиниран индекс!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Не са дефинирани части на индекс!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Няма промяна"
 
@@ -4168,7 +4239,7 @@ msgstr "Този формат няма опции"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Уеб сървъра няма права за запис на файла %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "В момента не разполагате с достатъчно права за да се намирате тук!"
 
@@ -4203,7 +4274,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "таблица  <b>%s</b> не е намерена или не е установена в %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Няма потребител(и)."
 
@@ -4252,7 +4324,7 @@ msgstr "Поддръжка на таблицата"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Паролата на %s беше променена успешно."
@@ -4355,11 +4427,11 @@ msgstr "Полски"
 msgid "Port"
 msgstr "Сортиране"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Името на главния ключ трябва да е... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4571,7 +4643,7 @@ msgstr "Позволява промяна на данни."
 msgid "No privileges."
 msgstr "Няма привилегии."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Привилегиите бяха презаредени успешно."
 
@@ -4614,11 +4686,6 @@ msgstr ""
 "<b>Статистика на заявките</b>: От както е стартиран %s заявки са изпратени "
 "към сървъра."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Заявката отне %01.4f секунди"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Тип на заявката"
@@ -4647,15 +4714,6 @@ msgstr "Проверка на интегритета на връзките"
 msgid "Relational schema"
 msgstr "Релационна схема"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Допълнителните възможности за работа със свързани (linked) таблици са "
-"деактивирани. За да разберете защо кликнете %sтук%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Релации"
@@ -4694,11 +4752,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "Отстраняване на избраните потребители"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Базата данни %s беше преименувана на %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4805,7 +4858,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4943,7 +4996,7 @@ msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 "Отмяна на всички активни привилегии от потребителите и след това изтриване."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Вие отменихте привилегиите за %s"
@@ -5103,19 +5156,11 @@ msgstr "Показване на пълните заявки"
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Показване на записи "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5890,7 +5935,7 @@ msgstr "Таблица %s вече съществува!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, fuzzy, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Избраните потребители бяха изтрити успешно."
@@ -5909,7 +5954,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Името на таблицата е празно!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "Таблицата %s беше изтрита"
@@ -6031,7 +6076,7 @@ msgstr "Този Хост"
 msgid "Threads"
 msgstr "Нишки"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Нишка %s беше успешно отстранена."
@@ -6042,12 +6087,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6064,10 +6103,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "Общо"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6368,7 +6403,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "непознат"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Вие променихте привилегиите за %s."
@@ -6389,19 +6424,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Трябва да ъпгрейднете към %s %s или по-късно."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Вероятно сте направили опит да качите твърде голям файл. Моля, обърнете се "
-"към %sdдокументацията%s за да намерите начин да избегнете това ограничение."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "На този сървър не е позволени качване на файлове."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Използвани"
@@ -6415,7 +6437,7 @@ msgstr "Използване на обратни кавички около им
 msgid "Use Host Table"
 msgstr "Използвай таблица Host"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Потребител %s вече съществува!"
@@ -6428,7 +6450,7 @@ msgstr "Потребител %s вече съществува!"
 msgid "User name"
 msgstr "Потребителско име"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Избрания потребител не беше открит в таблицата с привилегиите."
 
@@ -6436,7 +6458,7 @@ msgstr "Избрания потребител не беше открит в та
 msgid "User overview"
 msgstr "Преглед на потребителите"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Избраните потребители бяха изтрити успешно."
 
@@ -6500,10 +6522,6 @@ msgstr "Схема на таблицата"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Директорията която сте указали за upload не може да бъде достигната"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6521,10 +6539,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "знак за заместване"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Грешно име/парола. Достъп отказан."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/bn.po b/po/bn.po
index 6f4140773..be379dd9a 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:11+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: bangla <bn@li.org>\n"
@@ -89,6 +89,11 @@ msgstr "বর্ণনা"
 msgid "Use this value"
 msgstr "Use this value"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "%s ডাটাবেজ মুছে ফেলা হয়েছে"
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "ডাটাবেজ মন্তব্যসমূহঃ"
@@ -205,6 +210,20 @@ msgstr "সব সিলেক্ট করুন"
 msgid "Unselect All"
 msgstr "Unselect All"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "ডাটাবেজ এর নাম দেওয়া হয়নি"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Database %s has been renamed to %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "%s ডাটাবেজ়  %s তে কপি করা হয়েছে"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "ডাটাবেজ রিনেম কর"
@@ -316,6 +335,15 @@ msgstr "Enabled"
 msgid "Collation"
 msgstr "Collation"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Display PDF schema"
@@ -643,7 +671,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -819,16 +848,73 @@ msgstr "টেবিল পরীক্ষা কর"
 msgid "Database Log"
 msgstr "ডাটাবেজ"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "ফাইল পড়া যায়নি"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"FAQ 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "ইমপোর্ট প্লাগ ইন লোড করা যায়নি, আপনার ইন্সষ্টলেশন পরীক্ষা করুন"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "বুকমার্কটি মুছে ফেলা হয়েছে"
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "বুকমার্ক দেখান"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "বুকমার্ক %s তৈরী করা হয়েছে"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "ইম্পোর্ট সফলভাবে সম্পন্ন হয়েছে। %d সংখ্যক query সম্পাদন করা হয়েছে"
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
@@ -845,7 +931,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" statements are disabled."
 
@@ -885,10 +972,12 @@ msgid "The user name is empty!"
 msgstr "The user name is empty!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "পাসওয়ার্ড দেওয়া হয়নি"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "The passwords aren't the same!"
 
@@ -1312,7 +1401,8 @@ msgstr "পাসওয়ার্ড"
 msgid "Server Choice"
 msgstr "Server Choice"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies must be enabled past this point."
 
@@ -1334,6 +1424,10 @@ msgstr "No activity within %s seconds; please log in again"
 msgid "Cannot log in to the MySQL server"
 msgstr "MySQL সার্ভার এ লগ ইন করা যায়নি"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Wrong username/password. Access denied."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1463,11 +1557,12 @@ msgstr "bn"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "বর্ণনা"
 
@@ -1531,7 +1626,7 @@ msgid "Skip Validate SQL"
 msgstr "Skip Validate SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Validate SQL"
 
@@ -1586,7 +1681,8 @@ msgstr ""
 msgid "Font size"
 msgstr "ফন্ট এর আকার"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1752,6 +1848,7 @@ msgid "Create"
 msgstr "তৈরী করুন"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "কোন সুবিধা নাই"
 
@@ -1768,6 +1865,10 @@ msgstr "%s ডাটাবেজ় এ নতুন টেবিল তৈর
 msgid "Number of fields"
 msgstr "Number of fields"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr "এক্সপোর্ট প্লাগ ইন লোড করা যায়নি, আপনার ইন্সষ্টলেশন পরীক্ষা করুন"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1796,6 +1897,29 @@ msgstr "Overwrite existing file(s)"
 msgid "File name template"
 msgstr "ফাইল নাম এর টেমপ্লেট"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "সার্ভার এর নাম"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "ডাটাবেজ এর নাম"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "টেবিল এর নাম"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "টেমপ্লেট মনে রাখ"
@@ -1867,6 +1991,15 @@ msgstr "ইম্পোর্ট করার জন্য ফাইল"
 msgid "Location of the text file"
 msgstr "Location of the text file"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "File uploads are not allowed on this server."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "The directory you set for upload work cannot be reached"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2016,6 +2149,20 @@ msgstr "Kill"
 msgid "in query"
 msgstr "in query"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Showing rows"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "মোট"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Query took %01.4f sec"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2475,11 +2622,6 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "ফাইল পড়া যায়নি"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 #, fuzzy
 msgid ""
@@ -2487,17 +2629,6 @@ msgid ""
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "হয়ত আনুমানিক। FAQ ৩.১১ দেখ। "
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2524,7 +2655,7 @@ msgstr "Generated by"
 msgid "Rows"
 msgstr "Rows"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL returned an empty result set (i.e. zero rows)."
@@ -2571,6 +2702,11 @@ msgstr "Structure"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "No index defined!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2608,6 +2744,13 @@ msgstr "The primary key has been dropped"
 msgid "Index %s has been dropped"
 msgstr "%s ইন্ডেস্ক মুছে ফেলা হয়েছে"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2740,7 +2883,7 @@ msgstr "Index এ যোগ কর  &nbsp;%s&nbsp;column(s)"
 msgid "Add a new User"
 msgstr "একটি নতুন ইউজার যোগ করুন"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "আপনি একটি নতুন ইউজার যোগ করেছেন"
 
@@ -2933,10 +3076,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "সব ব্যাক্তিকে এই বুকমার্কটি দেখার সুযোগ দিন"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "বুকমার্কটি মুছে ফেলা হয়েছে"
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "লেবেল"
@@ -2979,15 +3118,7 @@ msgstr "\"bzipped\""
 msgid "Calendar"
 msgstr "ক্যালেন্ডার"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr "এক্সপোর্ট প্লাগ ইন লোড করা যায়নি, আপনার ইন্সষ্টলেশন পরীক্ষা করুন"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "ইমপোর্ট প্লাগ ইন লোড করা যায়নি, আপনার ইন্সষ্টলেশন পরীক্ষা করুন"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Can't rename index to PRIMARY!"
 
@@ -3110,11 +3241,6 @@ msgstr "দয়া করে %s টেবিল এর অবস্থান ক
 msgid "Connections"
 msgstr "সংযোগসমূহ"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "%s ডাটাবেজ়  %s তে কপি করা হয়েছে"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Copy table to (database<b>.</b>table):"
@@ -3136,7 +3262,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3238,26 +3364,17 @@ msgstr "চেক-স্লোভাক"
 msgid "Danish"
 msgstr "ড্যানিশ"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "ডাটাবেজ এর নাম দেওয়া হয়নি"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "ডাটাবেজ এক্সপোটঁ করার সুবিধাসমূহ"
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "%s ডাটাবেজ মুছে ফেলা হয়েছে"
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s ডাটাবেজসমূহ সফলভাবে মুছে ফেলা হয়েছে "
@@ -3282,7 +3399,7 @@ msgstr "পরিসংখ্যান বন্ধ কর"
 msgid "Enable Statistics"
 msgstr "পরিসংখ্যান চালু কর"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3330,7 +3447,7 @@ msgstr "Defragment table"
 msgid "Use delayed inserts"
 msgstr "Use delayed inserts"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "মুছে ফেলার জন্য কোন ব্যাবহারকারী চিহ্নিত করা হয়নি"
 
@@ -3545,35 +3662,12 @@ msgid ""
 msgstr ""
 "File %s already exists on server, change filename or check overwrite option."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "ডাটাবেজ এর নাম"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "সার্ভার এর নাম"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "টেবিল এর নাম"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "ক্ষেত্রসমূহ"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3598,7 +3692,7 @@ msgstr "Flush the table (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Flush (close) all tables"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3783,13 +3877,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3826,7 +3913,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Insert as new row"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4149,20 +4236,10 @@ msgstr "প্রসেসসমূহ দেখান"
 msgid "No databases"
 msgstr "কোন ডাটাবেজ নাই"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "No databases selected."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"FAQ 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "কোন বর্ণনা নাই"
@@ -4177,15 +4254,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "No files found inside ZIP archive!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "No index defined!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "No index parts defined!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "No change"
 
@@ -4204,7 +4277,7 @@ msgstr "This format has no options"
 msgid "The web server does not have permission to save the file %s."
 msgstr "The web server does not have permission to save the file %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "You don't have sufficient privileges to be here right now!"
 
@@ -4241,7 +4314,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> table not found or not set in %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "No user(s) found."
 
@@ -4290,7 +4364,7 @@ msgstr "Table maintenance"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "The password for %s was changed successfully."
@@ -4393,11 +4467,11 @@ msgstr "পোলিশ"
 msgid "Port"
 msgstr "সাজাঁন"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "The name of the primary key must be \"PRIMARY\"!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4598,7 +4672,7 @@ msgstr "Allows changing data."
 msgid "No privileges."
 msgstr "No privileges."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "The privileges were reloaded successfully."
 
@@ -4641,11 +4715,6 @@ msgstr ""
 "<b>Query statistics</b>: Since its startup, %s queries have been sent to the "
 "server."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Query took %01.4f sec"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Query type"
@@ -4674,15 +4743,6 @@ msgstr "Check referential integrity:"
 msgid "Relational schema"
 msgstr "Relational schema"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relations"
@@ -4721,11 +4781,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "Remove selected users"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Database %s has been renamed to %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4832,7 +4887,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4973,7 +5028,7 @@ msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 "Revoke all active privileges from the users and delete them afterwards."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "You have revoked the privileges for %s"
@@ -5133,19 +5188,11 @@ msgstr "Show Full Queries"
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "বুকমার্ক দেখান"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Showing rows"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 #, fuzzy
 msgid "Showing SQL query"
 msgstr "Show Full Queries"
@@ -6018,7 +6065,7 @@ msgstr "Table %s already exists!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, fuzzy, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "The selected users have been deleted successfully."
@@ -6037,7 +6084,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "টেবিল এর নাম পূরন করা হয়নি"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "Table %s has been dropped"
@@ -6159,7 +6206,7 @@ msgstr "This Host"
 msgid "Threads"
 msgstr "Threads"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Thread %s was successfully killed."
@@ -6172,14 +6219,6 @@ msgstr ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
 "won't be able to finish this import unless you increase php time limits."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6196,10 +6235,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "মোট"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6509,7 +6544,7 @@ msgstr "ইউনিকোড"
 msgid "unknown"
 msgstr "অজানা"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "You have updated the privileges for %s."
@@ -6529,19 +6564,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "You should upgrade to %s %s or later."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "File uploads are not allowed on this server."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "ব্যাবহার"
@@ -6555,7 +6577,7 @@ msgstr "Enclose table and field names with backquotes"
 msgid "Use Host Table"
 msgstr "Use Host Table"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "The user %s already exists!"
@@ -6568,7 +6590,7 @@ msgstr "The user %s already exists!"
 msgid "User name"
 msgstr "ব্যাভারকারীর নাম"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "The selected user was not found in the privilege table."
 
@@ -6576,7 +6598,7 @@ msgstr "The selected user was not found in the privilege table."
 msgid "User overview"
 msgstr "User overview"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "The selected users have been deleted successfully."
 
@@ -6638,10 +6660,6 @@ msgstr "View dump (schema) of table"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "The directory you set for upload work cannot be reached"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6659,10 +6677,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "wildcard"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Wrong username/password. Access denied."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/bs.po b/po/bs.po
index cc6501bc2..79d851466 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:12+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: bosnian <bs@li.org>\n"
@@ -89,6 +89,11 @@ msgstr "Opis"
 msgid "Use this value"
 msgstr "Koristi ovu vrijednost"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "Baza %s je odbačena."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Komentar baze:"
@@ -205,6 +210,21 @@ msgstr "Izaberi sve"
 msgid "Unselect All"
 msgstr "ništa"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+#, fuzzy
+msgid "The database name is empty!"
+msgstr "Ima tabele je prazno!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, fuzzy, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Tabeli %s promjenjeno ime u %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, fuzzy, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Tabela %s je kopirana u %s."
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 #, fuzzy
 msgid "Rename database to"
@@ -319,6 +339,15 @@ msgstr "Omogućeno"
 msgid "Collation"
 msgstr "Sortiranje"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Dodatne mogućnosti za rad sa povezanim tabelama su isključene. Da biste "
+"saznali zašto, kliknite %sovde%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Prikaži PDF shemu"
@@ -646,7 +675,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -820,16 +850,64 @@ msgstr "Provjeri tabelu"
 msgid "Database Log"
 msgstr "Baza podataka"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Datoteku nije moguće pročitati"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Obilježivač je upravo obrisan."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin preferira čitače koji podržavaju okvire."
@@ -846,7 +924,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" komanda je onemogućena."
 
@@ -886,10 +965,12 @@ msgid "The user name is empty!"
 msgstr "Ime korisnika nije unijeto!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Lozinka je prazna!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Lozinke nisu identične!"
 
@@ -1313,7 +1394,8 @@ msgstr "Lozinka:"
 msgid "Server Choice"
 msgstr "Izbor servera"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Kolačići (Cookies) moraju u ovom slučaju biti aktivirani."
 
@@ -1335,6 +1417,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Ne mogu da se prijavim na MySQL server"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Pogrešno korisničko ime/lozinka. Ulaz nije dozvoljen."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1462,11 +1548,12 @@ msgstr "Poslato"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentacija"
 
@@ -1530,7 +1617,7 @@ msgid "Skip Validate SQL"
 msgstr "Preskoči provjeru SQL-a"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Provjeri SQL"
 
@@ -1583,7 +1670,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1745,6 +1833,7 @@ msgid "Create"
 msgstr "Napravi"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Nema privilegija"
 
@@ -1761,6 +1850,10 @@ msgstr "Napravi novu tabelu u bazi %s"
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1789,6 +1882,27 @@ msgstr "Prepiši postojeće fajlove"
 msgid "File name template"
 msgstr "Šablon imena datoteke"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+#, fuzzy
+msgid "server name"
+msgstr "Ime korisnika"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr ""
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "zapamti šablon"
@@ -1860,6 +1974,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr "Lokacija tekstualne datoteke"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Direkcija koju ste izabrali za slanje nije dostupna"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2005,6 +2128,20 @@ msgstr "Obustavi"
 msgid "in query"
 msgstr "u upitu"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Prikaz zapisa"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "ukupno"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Upit je trajao %01.4f sekundi"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2448,26 +2585,12 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Datoteku nije moguće pročitati"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2494,7 +2617,7 @@ msgstr "Generirao"
 msgid "Rows"
 msgstr "Redova"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL je vratio prazan rezultat (nula redova)."
@@ -2540,6 +2663,11 @@ msgstr "Struktura"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Ključ nije definisan!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2577,6 +2705,13 @@ msgstr "Primarni ključ je obrisan"
 msgid "Index %s has been dropped"
 msgstr "Ključ %s je obrisan"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2707,7 +2842,7 @@ msgstr "Dodaj u ključ &nbsp;%s&nbsp;kolona(e)"
 msgid "Add a new User"
 msgstr "Dodaj novog korisnika"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Dodali ste novog korisnika."
 
@@ -2905,10 +3040,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr ""
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Obilježivač je upravo obrisan."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Naziv"
@@ -2952,15 +3083,7 @@ msgstr "\"bzip-ovano\""
 msgid "Calendar"
 msgstr ""
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Ne mogu da promenim ključ u PRIMARY (primarni) !"
 
@@ -3079,11 +3202,6 @@ msgstr "Podesite koordinate za tabelu %s"
 msgid "Connections"
 msgstr "Konekcije"
 
-#: libraries/messages.inc.php:186
-#, fuzzy, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Tabela %s je kopirana u %s."
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Kopiraj tabelu u (baza<b>.</b>tabela):"
@@ -3105,7 +3223,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3205,27 +3323,17 @@ msgstr ""
 msgid "Danish"
 msgstr "Danski"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-#, fuzzy
-msgid "The database name is empty!"
-msgstr "Ima tabele je prazno!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Opcije za izvoz baze"
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "Baza %s je odbačena."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s baza je uspješno odbačena."
@@ -3250,7 +3358,7 @@ msgstr "Isključi statistike"
 msgid "Enable Statistics"
 msgstr "Uključi statistike"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3298,7 +3406,7 @@ msgstr ""
 msgid "Use delayed inserts"
 msgstr ""
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3511,33 +3619,12 @@ msgstr ""
 "Datoteka %s već postoji na serveru, promijenite ime datoteke ili uključite "
 "opciju prepisivanja."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr ""
-
-#: libraries/messages.inc.php:335
-#, fuzzy
-msgid "server name"
-msgstr "Ime korisnika"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "Polja"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3562,7 +3649,7 @@ msgstr "Osvježi tabelu (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3747,13 +3834,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3790,7 +3870,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Unesi kao novi red"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4107,17 +4187,10 @@ msgstr "Prikaži listu procesa"
 msgid "No databases"
 msgstr "Baza ne postoji"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Nije izabrana ni jedna baza."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "nema opisa"
@@ -4131,15 +4204,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Ključ nije definisan!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Dijelovi ključa nisu definisani!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Nema izmjena"
 
@@ -4158,7 +4227,7 @@ msgstr "Ne postoje opcije za ovaj format"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Veb serveru nije dozvoljeno da sačuva datoteku %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Nije Vam dozvoljeno da budete ovdje!"
 
@@ -4193,7 +4262,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> tabela nije pronađena ili nije postavljena u %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Korisnik nije nađen."
 
@@ -4242,7 +4312,7 @@ msgstr "Radnje na tabeli"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Lozinka za %s je uspješno promjenjena."
@@ -4345,11 +4415,11 @@ msgstr ""
 msgid "Port"
 msgstr "Sortiranje"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Ime primarnog ključa mora da bude... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(\"PRIMARY\" <b>mora</b> biti ime <b>samo</b> primarnog ključa!)"
@@ -4555,7 +4625,7 @@ msgstr "Dozvoljava izmenu podataka."
 msgid "No privileges."
 msgstr "Nema privilegija."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Privilegije su uspešno ponovo učitane."
 
@@ -4599,11 +4669,6 @@ msgstr ""
 "<b>Statistike upita</b>: %s upita je postavljeno serveru od njegovog "
 "pokretanja."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Upit je trajao %01.4f sekundi"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Vrsta upita"
@@ -4632,15 +4697,6 @@ msgstr "Proveri referencijalni integritet:"
 msgid "Relational schema"
 msgstr "Relaciona shema"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Dodatne mogućnosti za rad sa povezanim tabelama su isključene. Da biste "
-"saznali zašto, kliknite %sovde%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relacije"
@@ -4679,11 +4735,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "Ukloni izabrane korisnike"
 
-#: libraries/messages.inc.php:761
-#, fuzzy, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Tabeli %s promjenjeno ime u %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4790,7 +4841,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4926,7 +4977,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Obustavi sve aktivne privilegije korisnika i zatim ih obriši."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Zabranili ste privilegije za %s"
@@ -5088,19 +5139,11 @@ msgstr "Prikaži kompletne upite"
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Prikaz zapisa"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5865,7 +5908,7 @@ msgstr "Korisnik %s već postoji!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, fuzzy, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Izabrani korisnici su uspješno obrisani."
@@ -5884,7 +5927,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Ima tabele je prazno!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "Tabela %s je odbačena"
@@ -6005,7 +6048,7 @@ msgstr "Ovaj server"
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Proces %s je uspješno prekinut."
@@ -6016,12 +6059,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6038,10 +6075,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "ukupno"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6338,7 +6371,7 @@ msgstr "Unikod"
 msgid "unknown"
 msgstr "nepoznat"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Ažurirali ste privilegije za %s."
@@ -6358,17 +6391,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr ""
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Zauzeće"
@@ -6382,7 +6404,7 @@ msgstr "Koristi ' za ograničavanje imena polja"
 msgid "Use Host Table"
 msgstr "Koristi tabelu hosta"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Korisnik %s već postoji!"
@@ -6395,7 +6417,7 @@ msgstr "Korisnik %s već postoji!"
 msgid "User name"
 msgstr "Ime korisnika"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Izabrani korisnik nije pronađen u tabeli privilegija."
 
@@ -6403,7 +6425,7 @@ msgstr "Izabrani korisnik nije pronađen u tabeli privilegija."
 msgid "User overview"
 msgstr "Pregled korisnika"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Izabrani korisnici su uspješno obrisani."
 
@@ -6464,10 +6486,6 @@ msgstr "Prikaži sadržaj (shemu) tabele"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Direkcija koju ste izabrali za slanje nije dostupna"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6485,10 +6503,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "Džoker"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Pogrešno korisničko ime/lozinka. Ulaz nije dozvoljen."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/ca.po b/po/ca.po
index 600d27fab..cd6fb6797 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:13+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: catalan <ca@li.org>\n"
@@ -89,6 +89,11 @@ msgstr "Descripció"
 msgid "Use this value"
 msgstr "Fes servir aquest valor"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "S'ha creat la base de dades %1$s."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Comentaris de la Base de Dades: "
@@ -205,6 +210,20 @@ msgstr "Tria Tot"
 msgid "Unselect All"
 msgstr "Desmarca tot"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "El nom de la base de dades és buit!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Base de dades %s reanomenada a %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "La Base de dades %s s'ha copiat a %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Reanomena base de dades a"
@@ -315,6 +334,15 @@ msgstr "Activa"
 msgid "Collation"
 msgstr "Ordenació"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Les característiques addicionals per treballar amb taules enllaçades s'han "
+"desactivat. Per saber perquè prem a %saquí%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Mostra l'esquema PDF"
@@ -642,7 +670,8 @@ msgstr "El seguiment està actiu."
 msgid "Tracking is not active."
 msgstr "El seguiment no està actiu."
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -811,16 +840,74 @@ msgstr "Segueix taula"
 msgid "Database Log"
 msgstr "Registre de la base de dades"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Probablement has triat d'enviar un arxiu massa gran. Consulta la %"
+"sdocumentació%s per trobar formes de modificar aquest límit."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "No es pot llegir l'arxiu"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"S'intenta carregar un arxiu amb una compresió no suportada (%s). O bé aquest "
+"suport no s'ha implementat encara o bé el teniu desactivat a la configuració."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"No s'han rebut dades per importar. O bé no s'ha especificat un nom d'arxiu, "
+"o el tamany de l'arxiu es més gran que el permés per la configuració del "
+"vostre PHP. Veieu PFC(FAQ) 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"No es poden carregar les extensions d'importació, comprova l'instal.lació!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "S'ha esborrat la consulta desada."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Mostrant consultes desades"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "%s creat com a consulta desada"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Importació finalitzada correctament, %d consultes executades."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Temps exaurit de l'arxiu d'ordres, si voleu finalitzar l'importació, torneu "
+"a enviar el mateix arxiu a importar i el procés continuarà."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -838,7 +925,8 @@ msgstr "Clica per seleccionar"
 msgid "Click to unselect"
 msgstr "Clica per deseleccionar"
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "Instrucció \"DROP DATABASE\" desactivada."
 
@@ -880,10 +968,12 @@ msgid "The user name is empty!"
 msgstr "El nom d'usuari és buit!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "La contrasenya és buida!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Les contrasenyes no coincideixen!"
 
@@ -1308,7 +1398,8 @@ msgstr "Contrasenya:"
 msgid "Server Choice"
 msgstr "Elecció de Servidor"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr ""
 "A partir d'aquest punt és necessari tenir les galetes (cookies) activades."
@@ -1333,6 +1424,10 @@ msgstr "Sense activitat des de fa %s segons o més, entra de nou"
 msgid "Cannot log in to the MySQL server"
 msgstr "No podem connectar amb el servidor MySQL"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Usuari i/o clau erronis. Accés denegat."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1464,11 +1559,12 @@ msgstr "Enviat"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Documentació"
 
@@ -1532,7 +1628,7 @@ msgid "Skip Validate SQL"
 msgstr "Salta la Validació de l'SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Valida l'SQL"
 
@@ -1587,7 +1683,8 @@ msgstr "La funcionalitat %s es veu afectada per un error conegut, veieu %s"
 msgid "Font size"
 msgstr "Tamany de lletra"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1750,6 +1847,7 @@ msgid "Create"
 msgstr "Crea"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Sense permisos"
 
@@ -1766,6 +1864,11 @@ msgstr "Crear una taula nova a la base de dades %s"
 msgid "Number of fields"
 msgstr "Nombre de camps"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"No es poden carregar les extensions d'exportació, comprova l'instal.lació!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1794,6 +1897,29 @@ msgstr "Sobreescriu arxiu(s) existent(s)"
 msgid "File name template"
 msgstr "Nom d'arxiu de plantilla"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "nom de servidor"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "nom de base de dades"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "nom de taula"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Aquest valor s'interpreta usant %1$sstrftime%2$s, pel que podeu usar les "
+"cadenes de formateig de temps. A més, es faràn aquestes transformacions: %3"
+"$s. Altre text es deixarà sense variació."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "Recordar plantilla"
@@ -1870,6 +1996,15 @@ msgstr "Arxiu a importar"
 msgid "Location of the text file"
 msgstr "Ubicació de l'arxiu de text"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "No es permet pujar arxius en aquest servidor."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "No està disponible el directori indicat per pujar arxius"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2019,6 +2154,20 @@ msgstr "Finalitzar"
 msgid "in query"
 msgstr "en consulta"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Mostrant registres: "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "total"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "La consulta tarda %01.4f seg"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2508,28 +2657,12 @@ msgstr "Error en gravar l'arxiu al disc."
 msgid "File upload stopped by extension."
 msgstr "Pujada de l'arxiu aturada per l'extensió."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "No es pot llegir l'arxiu"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Error movent l'arxiu pujat, consulta la FAQ 1.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"S'intenta carregar un arxiu amb una compresió no suportada (%s). O bé aquest "
-"suport no s'ha implementat encara o bé el teniu desactivat a la configuració."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2556,7 +2689,7 @@ msgstr "Generat per"
 msgid "Rows"
 msgstr "Fila"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL ha retornat un conjunt buit (p.e. cap fila)."
@@ -2602,6 +2735,11 @@ msgstr "estructura"
 msgid "Go to view"
 msgstr "Vés a la vista"
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "No s'ha definit l'índex!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2638,6 +2776,15 @@ msgstr "S'ha esborrat la clau principal"
 msgid "Index %s has been dropped"
 msgstr "S'ha esborrat l'índex %s"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"Els indexs %1$s i %2$s semblen iguals i un d'ells possiblement es podria "
+"esborrar."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2770,7 +2917,7 @@ msgstr "Afegeix a l'índex %s columna(es) &nbsp;"
 msgid "Add a new User"
 msgstr "Afegeix un usuari nou"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Has afegit un usuari nou."
 
@@ -2962,10 +3109,6 @@ msgstr "Puja al repositori BLOB"
 msgid "Let every user access this bookmark"
 msgstr "Deixa accedir a cada usuari a aquesta consulta desada"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "S'ha esborrat la consulta desada."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Etiqueta"
@@ -3008,17 +3151,7 @@ msgstr "\"comprimit amb bzip\""
 msgid "Calendar"
 msgstr "Calendari"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"No es poden carregar les extensions d'exportació, comprova l'instal.lació!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"No es poden carregar les extensions d'importació, comprova l'instal.lació!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "No pots canviar el nom d'un índex a \"PRIMARY\"!"
 
@@ -3140,11 +3273,6 @@ msgstr "Configura les coordinades per la taula %s"
 msgid "Connections"
 msgstr "Connexions"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "La Base de dades %s s'ha copiat a %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Còpia taula a (base-de-dades<b>.</b>taula):"
@@ -3166,7 +3294,7 @@ msgstr "No s'ha pogut connectar a l'origen"
 msgid "Could not connect to the target"
 msgstr "No s'ha pogut connectar a la destinació"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3264,26 +3392,17 @@ msgstr "Txec-Eslovac"
 msgid "Danish"
 msgstr "Danès"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "El nom de la base de dades és buit!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Opcions d'exportació de Bases de Dades"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "S'ha creat la base de dades %1$s."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr "La base de dades '%s' no existeix."
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s Bases de dades s'han esborrat correctament."
@@ -3307,7 +3426,7 @@ msgstr "Desactiva Estadístiques"
 msgid "Enable Statistics"
 msgstr "Activa Estadístiques"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3354,7 +3473,7 @@ msgstr "Desfragmenta la taula"
 msgid "Use delayed inserts"
 msgstr "Usa insercions diferides"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "No s\\han triat usuaris per esborrar!"
 
@@ -3570,34 +3689,11 @@ msgstr ""
 "L'arxiu %s ja existeix al servidor, canvia el nom o marca l'opció de "
 "sobreescriure."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "nom de base de dades"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "nom de servidor"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "nom de taula"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Aquest valor s'interpreta usant %1$sstrftime%2$s, pel que podeu usar les "
-"cadenes de formateig de temps. A més, es faràn aquestes transformacions: %3"
-"$s. Altre text es deixarà sense variació."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Arxius"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3622,7 +3718,7 @@ msgstr "Buida la memòria cau de la taula (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Sincronitza (tanca) totes les taules"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3809,15 +3905,6 @@ msgstr "Llibre d'Excel 97-2003 XLS"
 msgid "Excel 2007 XLSX Workbook"
 msgstr "Llibre d'Excel 2007 XLSX"
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"Els indexs %1$s i %2$s semblen iguals i un d'ells possiblement es podria "
-"esborrar."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3855,7 +3942,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Insereix com a nova fila"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Id de la fila inserida: %1$d"
@@ -4181,20 +4268,10 @@ msgstr "Mostra els processos"
 msgid "No databases"
 msgstr "No hi ha Bases de Dades"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "No s'han triat Bases de dades."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"No s'han rebut dades per importar. O bé no s'ha especificat un nom d'arxiu, "
-"o el tamany de l'arxiu es més gran que el permés per la configuració del "
-"vostre PHP. Veieu PFC(FAQ) 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "Sense Descripció"
@@ -4210,15 +4287,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "No s'han trobat arxius dins de l'arxiu ZIP!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "No s'ha definit l'índex!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "No s'han definit parts de l'índex!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Sense canvis"
 
@@ -4236,7 +4309,7 @@ msgstr "Aquest format no té opcions"
 msgid "The web server does not have permission to save the file %s."
 msgstr "El servidor web no té permisos per a desar l'arxiu %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "No tens prou permisos per visualitzar aquesta informació!"
 
@@ -4273,7 +4346,8 @@ msgstr "no present"
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "Taula <b>%s</b> no trobada o no definida a %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "No s'han trobat usuaris."
 
@@ -4320,7 +4394,7 @@ msgstr "Manteniment de particions"
 msgid "Partition %s"
 msgstr "Partició %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "La contrasenya per %s s'ha canviat correctament."
@@ -4421,11 +4495,11 @@ msgstr "Polac"
 msgid "Port"
 msgstr "Port"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "El nom de la clau principal ha de ser ... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4631,7 +4705,7 @@ msgstr "Permet canviar dades."
 msgid "No privileges."
 msgstr "Sense permisos."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Els permisos s'han recarregat correctament."
 
@@ -4674,11 +4748,6 @@ msgstr ""
 "<b>Estadístiques de Consultes</b>: Des de l'últim inici, s'han enviat %s "
 "consultes al servidor."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "La consulta tarda %01.4f seg"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Tipus de consulta"
@@ -4707,15 +4776,6 @@ msgstr "Comprova la integritat referencial:"
 msgid "Relational schema"
 msgstr "Esquema Relacional"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Les característiques addicionals per treballar amb taules enllaçades s'han "
-"desactivat. Per saber perquè prem a %saquí%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relacions"
@@ -4755,11 +4815,6 @@ msgstr "Elimina particionament"
 msgid "Remove selected users"
 msgstr "Treu els usuaris triats"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Base de dades %s reanomenada a %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4879,7 +4934,7 @@ msgstr ""
 "Aquest servidor no està configurat com a mestre en un procés de replicació. "
 "Vols <a href=\"%s\">configurar-lo</a>?"
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -5024,7 +5079,7 @@ msgstr "Reinicia l'inserció amb %s files"
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Treu tots els permisos actius dels usuaris i els esborra després."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Has tret els permisos per %s"
@@ -5192,19 +5247,11 @@ msgstr "Mostra Consultes completes"
 msgid "Show/Hide left menu"
 msgstr "Menú esquerre Mostra/Amaga"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Mostrant consultes desades"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Mostrant com a codi PHP"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Mostrant registres: "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Mostrant consulta SQL"
 
@@ -6094,7 +6141,7 @@ msgstr "La taula %s ja existeix!"
 msgid "Alter column(s)"
 msgstr "Canvia columna(es)"
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "S'ha modificat la taula %1$s correctament"
@@ -6113,7 +6160,7 @@ msgstr "Vols eliminar totes les files anteriors de les taules de destinació?"
 msgid "The table name is empty!"
 msgstr "El nom de la taula és buit!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "S'ha creat la taula %1$s."
@@ -6235,7 +6282,7 @@ msgstr "Aquest Host"
 msgid "Threads"
 msgstr "Fils"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Fil %s cancel.lat correctament."
@@ -6249,14 +6296,6 @@ msgstr ""
 "indica que phpMyAdmin no ha pogut finalitzar aquesta importació a menys que "
 "incrementeu els límits de temps de php."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Temps exaurit de l'arxiu d'ordres, si voleu finalitzar l'importació, torneu "
-"a enviar el mateix arxiu a importar i el procés continuarà."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "plana a/de"
@@ -6273,10 +6312,6 @@ msgstr "Canviar petit/gran"
 msgid "To select relation, click :"
 msgstr "Per triar una relació, clica :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "total"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6585,7 +6620,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "Desconegut"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Heu actualitzat els permisos de %s."
@@ -6606,19 +6641,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Es necessari actualitzar a %s %s o posterior."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Probablement has triat d'enviar un arxiu massa gran. Consulta la %"
-"sdocumentació%s per trobar formes de modificar aquest límit."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "No es permet pujar arxius en aquest servidor."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Ús"
@@ -6632,7 +6654,7 @@ msgstr "Usa &quot;backquotes&quot; amb taules i noms de camps"
 msgid "Use Host Table"
 msgstr "Utilitza la Taula de Hosts"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "L'usuari %s ja existeix!"
@@ -6645,7 +6667,7 @@ msgstr "L'usuari %s ja existeix!"
 msgid "User name"
 msgstr "Nom d'usuari"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "No s'ha trobat l'usuari triat a la taula de permisos."
 
@@ -6653,7 +6675,7 @@ msgstr "No s'ha trobat l'usuari triat a la taula de permisos."
 msgid "User overview"
 msgstr "Informació general de l'usuari"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "S'han esborrat correctament els usuaris triats."
 
@@ -6717,10 +6739,6 @@ msgstr "Veure un esquema de la taula"
 msgid "VIEW name"
 msgstr "Nom de VISTA"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "No està disponible el directori indicat per pujar arxius"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Servidor Web"
@@ -6738,10 +6756,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "comodins"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Usuari i/o clau erronis. Accés denegat."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/cs.po b/po/cs.po
index 7734ecd53..69651c279 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-05-06 07:14+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: czech <cs@li.org>\n"
@@ -92,6 +92,11 @@ msgstr "Popis"
 msgid "Use this value"
 msgstr "Použít tuto hodnotu"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Byla vytvořena databáze %1$s."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Komentář k databázi: "
@@ -208,6 +213,20 @@ msgstr "Vybrat vše"
 msgid "Unselect All"
 msgstr "Odznačit vše"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Jméno databáze je prázdné!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Databáze %s byla přejmenována na %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Databáze %s byla zkopírována na %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Přejmenovat databázi na"
@@ -312,6 +331,15 @@ msgstr "Zapnout"
 msgid "Collation"
 msgstr "Porovnávání"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Některé z rozšířených funkcí phpMyAdmina nelze používat. %sZde%s zjistíte "
+"proč."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Zobrazit jako schéma v PDF"
@@ -639,7 +667,8 @@ msgstr "Sledování je zapnuté."
 msgid "Tracking is not active."
 msgstr "Sledování není zapnuté."
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -808,16 +837,74 @@ msgstr "Sledovat tabulku"
 msgid "Database Log"
 msgstr "Historie databáze"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Pravděpodobně jste se pokusili nahrát příliš velký soubor. Přečtěte si "
+"prosím %sdokumentaci%s, jak toto omezení obejít."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Soubor nelze přečíst"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Pokusili jste se importovat soubor s nepodporovanou kompresí (%s). Buďto "
+"podpora není implementována nebo je vypnuta ve vaší konfiguraci."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Nepodařilo se načíst žádná data k importu. Buďto nebyl odeslán žádný soubor, "
+"nebo jeho velikost překročila velikost povolenou v nastavení PHP. Viz [a@./"
+"Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"Nepodařilo se nahrát pluginy pro import, zkontrolujte prosím vaší instalaci!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Položka byla smazána z oblíbených."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Zobrazuji oblíbený dotaz"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Vytvořen oblíbený dotaz %s"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Import byl úspěšně dokončen, bylo provedeno %d dotazů."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Limit pro běh importu vypršel, prosím odešlete formulář znovu se stejným "
+"souborem a import bude pokračovat."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin se lépe používá v prohlížeči <b>podporujícím rámce</b>."
@@ -834,7 +921,8 @@ msgstr "Klikněte pro vybrání"
 msgid "Click to unselect"
 msgstr "Klikněte pro zrušení výběru"
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "Příkaz „DROP DATABASE“ je vypnutý."
 
@@ -874,10 +962,12 @@ msgid "The user name is empty!"
 msgstr "Jméno uživatele je prázdné!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Heslo je prázdné!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Hesla nejsou stejná!"
 
@@ -1252,7 +1342,8 @@ msgstr "Heslo:"
 msgid "Server Choice"
 msgstr "Server"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Přihlášení vyžaduje povolené cookies."
 
@@ -1276,6 +1367,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Nepodařilo se přihlášení k MySQL serveru"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Špatné uživatelské jméno nebo heslo. Přístup odepřen."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1402,11 +1497,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentace"
 
@@ -1470,7 +1566,7 @@ msgid "Skip Validate SQL"
 msgstr "Bez kontroly SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Zkontrolovat SQL"
 
@@ -1523,7 +1619,8 @@ msgstr "Funkčnost %s je omezena známou chybou, viz %s"
 msgid "Font size"
 msgstr "Velikost písma"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1687,6 +1784,7 @@ msgid "Create"
 msgstr "Vytvořit"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Nemáte oprávnění"
 
@@ -1703,6 +1801,11 @@ msgstr "Vytvořit novou tabulku v databázi %s"
 msgid "Number of fields"
 msgstr "Počet sloupců"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"Nepodařilo se nahrát pluginy pro export, zkontrolujte prosím vaší instalaci!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1731,6 +1834,29 @@ msgstr "Přepsat existující soubory"
 msgid "File name template"
 msgstr "Vzor pro jméno souboru"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "jméno serveru"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "jméno databáze"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "jméno tabulky"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Tato hodnota je interpretována pomocí %1$sstrftime%2$s, takže můžete použít "
+"libovolné řetězce pro formátování data a času. Dále budou provedena "
+"následující nahrazení: %3$s. Jakýkoliv jiný text zůstane zachován beze změny."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "zapamatovat si hodnotu"
@@ -1801,6 +1927,15 @@ msgstr "Soubor pro importování"
 msgid "Location of the text file"
 msgstr "textový soubor"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Upload souborů není na tomto serveru povolen."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Adresář určený pro upload souborů nemohl být otevřen"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1951,6 +2086,20 @@ msgstr "Ukončit"
 msgid "in query"
 msgstr "v dotazu"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Zobrazeny záznamy"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "celkem"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "dotaz trval %01.4f sekund"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2432,11 +2581,6 @@ msgstr "Chyba při zapisování souboru na disk."
 msgid "File upload stopped by extension."
 msgstr "Nahrávání souboru zastaveno rozšířením."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Soubor nelze přečíst"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
@@ -2445,17 +2589,6 @@ msgstr ""
 "Chyba při přejmenování nahraného soubory, viz [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Pokusili jste se importovat soubor s nepodporovanou kompresí (%s). Buďto "
-"podpora není implementována nebo je vypnuta ve vaší konfiguraci."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2481,7 +2614,7 @@ msgstr "Vygeneroval"
 msgid "Rows"
 msgstr "Řádků"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL vrátil prázdný výsledek (tj. nulový počet řádků)."
@@ -2525,6 +2658,11 @@ msgstr "struktura"
 msgid "Go to view"
 msgstr "Přejít na podhled"
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Není definován žádný index!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2561,6 +2699,15 @@ msgstr "Primární klíč byl odstraněn"
 msgid "Index %s has been dropped"
 msgstr "Index %s byl odstraněn"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"Indexy %1$s a %2$s vypadají stejné a jeden z nich by pravděpodobně mohl být "
+"odstraněn."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2693,7 +2840,7 @@ msgstr "Přidat %s sloupců do indexu"
 msgid "Add a new User"
 msgstr "Přidat nového uživatele"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Uživatel byl přidán."
 
@@ -2882,10 +3029,6 @@ msgstr "Nahrát do skladiště BLOBů"
 msgid "Let every user access this bookmark"
 msgstr "Umožnit všem uživatelům používat tuto položku"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Položka byla smazána z oblíbených."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Název"
@@ -2928,17 +3071,7 @@ msgstr "„zabzipováno“"
 msgid "Calendar"
 msgstr "Kalendář"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"Nepodařilo se nahrát pluginy pro export, zkontrolujte prosím vaší instalaci!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"Nepodařilo se nahrát pluginy pro import, zkontrolujte prosím vaší instalaci!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Index nemůžete přejmenovat na „PRIMARY“!"
 
@@ -3058,11 +3191,6 @@ msgstr "Prosím, nastavte souřadnice pro tabulku %s"
 msgid "Connections"
 msgstr "Připojení"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Databáze %s byla zkopírována na %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Kopírovat tabulku do (databáze<b>.</b>tabulka):"
@@ -3084,7 +3212,7 @@ msgstr "Nepodařilo se připojit ke zdrojové databázi"
 msgid "Could not connect to the target"
 msgstr "Nepodařilo se připojit k cílové databázi"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3182,26 +3310,17 @@ msgstr "Čeština/Slovenština"
 msgid "Danish"
 msgstr "Dánština"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Jméno databáze je prázdné!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Nastavení exportu databází"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Byla vytvořena databáze %1$s."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr "Databáze '%s' neexistuje."
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s databáze byla úspěšně zrušena."
@@ -3225,7 +3344,7 @@ msgstr "Skrýt podrobnosti"
 msgid "Enable Statistics"
 msgstr "Zobrazit podrobnosti"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3272,7 +3391,7 @@ msgstr "Defragmentovat tabulku"
 msgid "Use delayed inserts"
 msgstr "Používat zpožděné inserty"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Musíte vybrat uživatele, které chcete odstranit!"
 
@@ -3486,34 +3605,11 @@ msgstr ""
 "Soubor %s již na serveru existuje, změňte jméno souboru, nebo zvolte "
 "přepsání souboru."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "jméno databáze"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "jméno serveru"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "jméno tabulky"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Tato hodnota je interpretována pomocí %1$sstrftime%2$s, takže můžete použít "
-"libovolné řetězce pro formátování data a času. Dále budou provedena "
-"následující nahrazení: %3$s. Jakýkoliv jiný text zůstane zachován beze změny."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Soubory"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3538,7 +3634,7 @@ msgstr "Vyprázdnit vyrovnávací paměť pro tabulku („FLUSH“)"
 msgid "Flush (close) all tables"
 msgstr "Zavřít všechny tabulky"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr "Chyba při vytváření cizího klíče na %1$s (zkotrolujte typ sloupce)"
@@ -3722,15 +3818,6 @@ msgstr "Excel 97-2003 XLS"
 msgid "Excel 2007 XLSX Workbook"
 msgstr "Excel 2007 XLSX"
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"Indexy %1$s a %2$s vypadají stejné a jeden z nich by pravděpodobně mohl být "
-"odstraněn."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3765,7 +3852,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Vložit jako nový řádek"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "ID vloženého řádku: %1$d"
@@ -4092,20 +4179,10 @@ msgstr "Zobrazit procesy"
 msgid "No databases"
 msgstr "Žádné databáze"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Nebyla vybrána žádná databáze."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Nepodařilo se načíst žádná data k importu. Buďto nebyl odeslán žádný soubor, "
-"nebo jeho velikost překročila velikost povolenou v nastavení PHP. Viz [a@./"
-"Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "žádný popisek"
@@ -4119,15 +4196,11 @@ msgstr "Nejsou dostupné podrobnější informace o tomto úložišti."
 msgid "No files found inside ZIP archive!"
 msgstr "V ZIP archívu nebyly nalezeny žádné soubory!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Není definován žádný index!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Nebyla zadána žádná část indexu!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Žádná změna"
 
@@ -4145,7 +4218,7 @@ msgstr "Tento formát nemá žádná nastavení"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Web server nemá oprávnění uložit výpis do souboru %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Nemáte dostatečná práva na provedení této akce!"
 
@@ -4181,7 +4254,8 @@ msgstr "zde není"
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> tabulka nenalezena nebo není nastavena v %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Žádný uživatel nenalezen."
 
@@ -4228,7 +4302,7 @@ msgstr "Údržba oddílů"
 msgid "Partition %s"
 msgstr "Oddíl %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Heslo pro %s bylo úspěšně změněno."
@@ -4333,11 +4407,11 @@ msgstr "Polština"
 msgid "Port"
 msgstr "Port"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Jméno primárního klíče musí být „PRIMARY“!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(„PRIMARY“ <b>musí</b> být jméno <b>pouze</b> primárního klíče!)"
@@ -4540,7 +4614,7 @@ msgstr "Umožňuje měnit data."
 msgid "No privileges."
 msgstr "Žádná oprávnění."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Oprávnění byla načtena úspěšně."
 
@@ -4581,11 +4655,6 @@ msgid ""
 "server."
 msgstr "<b>Statistika dotazů</b>: Od spuštění bylo serveru posláno %s dotazů."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "dotaz trval %01.4f sekund"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Typ dotazu"
@@ -4614,15 +4683,6 @@ msgstr "Zkontrolovat integritu odkazů:"
 msgid "Relational schema"
 msgstr "Relační schéma"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Některé z rozšířených funkcí phpMyAdmina nelze používat. %sZde%s zjistíte "
-"proč."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relace"
@@ -4661,11 +4721,6 @@ msgstr "Zrušit oddíly"
 msgid "Remove selected users"
 msgstr "Odstranit vybrané uživatele"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Databáze %s byla přejmenována na %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4781,7 +4836,7 @@ msgstr ""
 "Tento server není nastaven jako nadřízený v replikačním procesu. Přejete si "
 "ho <a href=\"%s\">nastavit</a>?"
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4926,7 +4981,7 @@ msgstr "Začít znovu vkládání s %s řádky"
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Odebrat uživatelům veškerá oprávnění a poté je odstranit z tabulek."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Byla zrušena práva pro %s"
@@ -5093,19 +5148,11 @@ msgstr "Zobrazit celé dotazy"
 msgid "Show/Hide left menu"
 msgstr "Zobrazit/Skrýt levé menu"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Zobrazuji oblíbený dotaz"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Zobrazuji jako PHP kód"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Zobrazeny záznamy"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Zobrazuji SQL dotaz"
 
@@ -5968,7 +6015,7 @@ msgstr "Tabulka %s již existuje!"
 msgid "Alter column(s)"
 msgstr "Změnit sloupce"
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Tabulka %1$s byla úspěšně změněna"
@@ -5987,7 +6034,7 @@ msgstr "Chcete odstranit všechny stávající řídky z cílových tabulek?"
 msgid "The table name is empty!"
 msgstr "Jméno tabulky je prázdné!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "Byla vytvořena tabulka %1$s."
@@ -6108,7 +6155,7 @@ msgstr "Tento počítač"
 msgid "Threads"
 msgstr "Počet vláken"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Vlákno %s bylo úspěšně zabito."
@@ -6122,14 +6169,6 @@ msgstr ""
 "znamená, že phpMyAdmin nebude schopen načíst tento soubor, pokud nezvýšíte "
 "časové limity v PHP."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Limit pro běh importu vypršel, prosím odešlete formulář znovu se stejným "
-"souborem a import bude pokračovat."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "do/ze stránky"
@@ -6146,10 +6185,6 @@ msgstr "Přepnout malé/velké"
 msgid "To select relation, click :"
 msgstr "Pro výběr relace klikněte :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "celkem"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6458,7 +6493,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "neznámý"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Byla aktualizována oprávnění pro %s."
@@ -6479,19 +6514,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Měli byste aktualizovat %s na verzi %s nebo vyšší."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Pravděpodobně jste se pokusili nahrát příliš velký soubor. Přečtěte si "
-"prosím %sdokumentaci%s, jak toto omezení obejít."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Upload souborů není na tomto serveru povolen."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Používá"
@@ -6505,7 +6527,7 @@ msgstr "Použít zpětné uvozovky u jmen tabulek a sloupců"
 msgid "Use Host Table"
 msgstr "Použít tabulku Host"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Uživatel %s již existuje!"
@@ -6518,7 +6540,7 @@ msgstr "Uživatel %s již existuje!"
 msgid "User name"
 msgstr "Jméno uživatele"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Zvolený uživatel nebyl nalezen v tabulce oprávnění."
 
@@ -6526,7 +6548,7 @@ msgstr "Zvolený uživatel nebyl nalezen v tabulce oprávnění."
 msgid "User overview"
 msgstr "Přehled uživatelů"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Vybraní uživatelé byli úspěšně odstraněni."
 
@@ -6589,10 +6611,6 @@ msgstr "Export tabulky"
 msgid "VIEW name"
 msgstr "Jméno pohledu"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Adresář určený pro upload souborů nemohl být otevřen"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Webserver"
@@ -6610,10 +6628,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "maska"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Špatné uživatelské jméno nebo heslo. Přístup odepřen."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/da.po b/po/da.po
index 76e015e7d..70e44a9cd 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:13+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: danish <da@li.org>\n"
@@ -89,6 +89,11 @@ msgstr "Beskrivelse"
 msgid "Use this value"
 msgstr "Brug denne værdi"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr ""
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Databasekommentar: "
@@ -205,6 +210,20 @@ msgstr "Vælg alle"
 msgid "Unselect All"
 msgstr "Fravælg alle"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Databasenavnet er tomt!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Database %s er blevet omdøbt til %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Database %s er blevet kopieret til %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Omdøb database til"
@@ -315,6 +334,15 @@ msgstr ""
 msgid "Collation"
 msgstr "Kollation (Collation)"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"De ekstra features for at arbejde med linkede tabeller er deaktiveret. For "
+"at se hvorfor, klik %sher%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Vis PDF-skematik"
@@ -642,7 +670,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -810,16 +839,75 @@ msgstr ""
 msgid "Database Log"
 msgstr ""
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Du har sandsynligvis forsøgt at uploade en for stor fil. Se venligst %"
+"sdokumentationen%s for måder hvorpå du kan arbejde dig uden om denne "
+"begrænsning."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Filen kunne ikke læses"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Du forsøgte at indlæse en fil med u-understøttet komprimering (%s). "
+"Understøttelse af denne funktion er ikke implementeret eller ikke slået til "
+"for din konfiguration."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Der blev ikke modtaget nogen data til import. Enten blev der ikke indsendt "
+"et filnavn, eller filstørrelsen kan have overskredet maksimalstørrelsen "
+"tilladt af din PHP-konfiguration. Se FAQ 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "Kunne ikke indlæse importplugins, check venligst din installation!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Bogmærket er fjernet."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Viser bogmærke"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Bogmærke %s oprettet"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Importen er korrekt gennemført, %d forespørgsler udført."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Script timeout nået, hvis du vil afslutte importen, indsend venligst samme "
+"fil igen og importen vil fortsætte hvor den slap."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -837,7 +925,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" erklæringer kan ikke bruges."
 
@@ -877,10 +966,12 @@ msgid "The user name is empty!"
 msgstr "Intet brugernavn!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Der er ikke angivet noget kodeord!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "De to kodeord er ikke ens!"
 
@@ -1303,7 +1394,8 @@ msgstr "Kodeord:"
 msgid "Server Choice"
 msgstr "Server valg"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Herefter skal cookies være slået til."
 
@@ -1326,6 +1418,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Kan ikke logge ind på MySQL-serveren"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Forkert brugernavn/kodeord. Adgang nægtet."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1454,11 +1550,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentation"
 
@@ -1522,7 +1619,7 @@ msgid "Skip Validate SQL"
 msgstr "Spring over Validér SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Validér SQL"
 
@@ -1577,7 +1674,8 @@ msgstr "Funktionaliteten af %s er påvirket af en kendt fejl, se %s"
 msgid "Font size"
 msgstr "Skriftstørrelse"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1741,6 +1839,7 @@ msgid "Create"
 msgstr "Opret"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Ingen privilegier"
 
@@ -1757,6 +1856,10 @@ msgstr "Opret ny tabel i database %s"
 msgid "Number of fields"
 msgstr "Antal felter"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr "Kunne ikke indlæse eksportplugins, check venligst din installation!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1785,6 +1888,29 @@ msgstr "Overskriv eksisterende fil(er)"
 msgid "File name template"
 msgstr "Skabelon for filnavn"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "servernavn"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "databasenavn"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "tabelnavn"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Denne værdi fortolkes via %1$sstrftime%2$s, så du kan bruge tidsformatterede "
+"strenge. Ydermere vil følgende transformationer foregå: %3$s. Anden tekst "
+"vil blive bevaret som det er."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "husk skabelonen"
@@ -1856,6 +1982,15 @@ msgstr "Fil til import"
 msgid "Location of the text file"
 msgstr "Tekstfilens placering"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Fil-uploads er ikke tilladte på denne server."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Mappen du har sat til upload-arbejde kan ikke findes"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2004,6 +2139,20 @@ msgstr "Dræb (Kill)"
 msgid "in query"
 msgstr "i forespørgsel"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Viser poster "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "total"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Forepørgsel tog %01.4f sek"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2461,29 +2610,12 @@ msgstr "Kunne ikke skrive fil til disk."
 msgid "File upload stopped by extension."
 msgstr "Filupload stoppet af udvidelse."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Filen kunne ikke læses"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Fejl ved flytning af den uploadede fil, se FAQ 1.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Du forsøgte at indlæse en fil med u-understøttet komprimering (%s). "
-"Understøttelse af denne funktion er ikke implementeret eller ikke slået til "
-"for din konfiguration."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2509,7 +2641,7 @@ msgstr "Genereret af"
 msgid "Rows"
 msgstr "Rækker"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL returnerede ingen data (fx ingen rækker)."
@@ -2553,6 +2685,11 @@ msgstr ""
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Intet indeks defineret!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2589,6 +2726,13 @@ msgstr "Primærnøglen er slettet"
 msgid "Index %s has been dropped"
 msgstr "Indeks %s er blevet slettet"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2720,7 +2864,7 @@ msgstr "Føj til indeks &nbsp;%s&nbsp;kolonne(r)"
 msgid "Add a new User"
 msgstr "Tilføj en ny bruger"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Du har tilføjet en ny bruger."
 
@@ -2909,10 +3053,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "Lad alle brugere bruge dette bogmærke"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Bogmærket er fjernet."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Mærke"
@@ -2955,15 +3095,7 @@ msgstr "\"bzipped\""
 msgid "Calendar"
 msgstr "Kalender"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr "Kunne ikke indlæse eksportplugins, check venligst din installation!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "Kunne ikke indlæse importplugins, check venligst din installation!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Kan ikke omdøbe indeks til PRIMARY!"
 
@@ -3084,11 +3216,6 @@ msgstr "Konfigurér venligst koordinaterne for tabel %s"
 msgid "Connections"
 msgstr "Forbindelser"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Database %s er blevet kopieret til %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Kopier tabel til (database<b>.</b>tabel):"
@@ -3110,7 +3237,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3207,26 +3334,17 @@ msgstr "Tjekkisk-Slovakisk"
 msgid "Danish"
 msgstr "Dansk"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Databasenavnet er tomt!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Database eksportindstillinger"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr ""
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s databaser er blevet droppet korrekt."
@@ -3250,7 +3368,7 @@ msgstr "Slå Statistikker fra"
 msgid "Enable Statistics"
 msgstr "Slå Statistikker til"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3297,7 +3415,7 @@ msgstr "Defragmentér tabel"
 msgid "Use delayed inserts"
 msgstr "Brug forsinkede indsættelser"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Ingen brugere valgt til sletning!"
 
@@ -3512,34 +3630,11 @@ msgstr ""
 "Filen %s findes allerede på serveren, lav filnavnet om eller tillad at der "
 "overskrives."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "databasenavn"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "servernavn"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "tabelnavn"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Denne værdi fortolkes via %1$sstrftime%2$s, så du kan bruge tidsformatterede "
-"strenge. Ydermere vil følgende transformationer foregå: %3$s. Anden tekst "
-"vil blive bevaret som det er."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Filer"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3565,7 +3660,7 @@ msgstr "Flush tabellen (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Flush (luk) alle tabeller"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3747,13 +3842,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3790,7 +3878,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Indsæt som ny række"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4115,20 +4203,10 @@ msgstr "Vis tråde"
 msgid "No databases"
 msgstr "Ingen databaser"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Ingen databaser valgt."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Der blev ikke modtaget nogen data til import. Enten blev der ikke indsendt "
-"et filnavn, eller filstørrelsen kan have overskredet maksimalstørrelsen "
-"tilladt af din PHP-konfiguration. Se FAQ 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "ingen beskrivelse"
@@ -4144,15 +4222,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "Ingen filer fundet i ZIP arkivet!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Intet indeks defineret!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Ingen dele af indeks er defineret!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Ingen ændring"
 
@@ -4170,7 +4244,7 @@ msgstr "Dette format har ingen indstillinger"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Webserveren har ikke tilladelse til at gemme filen %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Du har ikke tilstrækkelige rettigheder til at være her!"
 
@@ -4207,7 +4281,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "Tabel <b>%s</b> findes ikke eller er ikke sat i %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Ingen bruger(e) fundet."
 
@@ -4254,7 +4329,7 @@ msgstr ""
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Kodeordet for %s blev korrekt udskiftet."
@@ -4354,11 +4429,11 @@ msgstr "Polsk"
 msgid "Port"
 msgstr ""
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Navnet på primærnøglen skal være... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4560,7 +4635,7 @@ msgstr "Tillader ændring af data."
 msgid "No privileges."
 msgstr "Ingen privilegier."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Privilegierne blev korrekt genindlæst."
 
@@ -4603,11 +4678,6 @@ msgstr ""
 "<b>Forespørgselsstatistikker</b>: Siden opstarten er der blevet sendt %s "
 "forespørgsler til serveren."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Forepørgsel tog %01.4f sek"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Forespørgselstype"
@@ -4636,15 +4706,6 @@ msgstr "Check reference-integriteten"
 msgid "Relational schema"
 msgstr "Relationel skematik"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"De ekstra features for at arbejde med linkede tabeller er deaktiveret. For "
-"at se hvorfor, klik %sher%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relationer"
@@ -4683,11 +4744,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "Fjern valgte brugere"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Database %s er blevet omdøbt til %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4791,7 +4847,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4928,7 +4984,7 @@ msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 "Tilbagekald alle aktive privilegier fra brugerne og slet dem efterfølgende."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Du har tilbagekaldt privilegierne for %s"
@@ -5091,19 +5147,11 @@ msgstr "Vis fuldstændige forespørgsler"
 msgid "Show/Hide left menu"
 msgstr "Vis/skjul venstre menu"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Viser bogmærke"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Viser som PHP-kode"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Viser poster "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Viser SQL-forespørgsel"
 
@@ -5983,7 +6031,7 @@ msgstr "Table %s already exists!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr ""
@@ -6002,7 +6050,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Intet tabelnavn!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr ""
@@ -6123,7 +6171,7 @@ msgstr "Denne Host"
 msgid "Threads"
 msgstr "Tråde"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Tråd %s blev stoppet."
@@ -6137,14 +6185,6 @@ msgstr ""
 "normalt at phpMyAdmin ikke vil være i stand til at gennemføre importen med "
 "mindre du forøger PHP-tidsbegrænsningerne."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Script timeout nået, hvis du vil afslutte importen, indsend venligst samme "
-"fil igen og importen vil fortsætte hvor den slap."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "til/fra side"
@@ -6161,10 +6201,6 @@ msgstr "Skift mellem små/store"
 msgid "To select relation, click :"
 msgstr "For at vælge relation, klik :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "total"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6472,7 +6508,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "ukendt"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Du har opdateret privilegierne for %s."
@@ -6493,20 +6529,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Du burde opdatere til %s %s eller senere."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Du har sandsynligvis forsøgt at uploade en for stor fil. Se venligst %"
-"sdokumentationen%s for måder hvorpå du kan arbejde dig uden om denne "
-"begrænsning."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Fil-uploads er ikke tilladte på denne server."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Benyttelse"
@@ -6520,7 +6542,7 @@ msgstr "Brug \"backquotes\" omkring tabeller og felters navne"
 msgid "Use Host Table"
 msgstr "Brug Host Tabel"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Brugeren %s findes i forvejen!"
@@ -6533,7 +6555,7 @@ msgstr "Brugeren %s findes i forvejen!"
 msgid "User name"
 msgstr "Brugernavn"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Den valgte bruger blev ikke fundet i privilegietabellen."
 
@@ -6541,7 +6563,7 @@ msgstr "Den valgte bruger blev ikke fundet i privilegietabellen."
 msgid "User overview"
 msgstr "Brugeroversigt"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "De valgte brugere er blevet korrekt slettet."
 
@@ -6604,10 +6626,6 @@ msgstr "Vis dump (skema) over tabel"
 msgid "VIEW name"
 msgstr "VIEW navn"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Mappen du har sat til upload-arbejde kan ikke findes"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6625,10 +6643,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "jokertegn"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Forkert brugernavn/kodeord. Adgang nægtet."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/de.po b/po/de.po
index 57526983e..1e0592ffd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-23 21:07+0200\n"
 "Last-Translator:  <me@michaelkeck.de>\n"
 "Language-Team: german <de@li.org>\n"
@@ -91,6 +91,11 @@ msgstr "Beschreibung"
 msgid "Use this value"
 msgstr "Diesen Wert verwenden"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Die Datenbank %1$s wurde erzeugt."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Datenbankkommentar: "
@@ -207,6 +212,20 @@ msgstr "Alle auswählen"
 msgid "Unselect All"
 msgstr "Auswahl entfernen"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Der Datenbankname ist leer!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Datenbank %s wurde umbenannt zu %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Datenbank %s wurde nach %s kopiert"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Datenbank umbenennen in"
@@ -317,6 +336,15 @@ msgstr "Aktivieren"
 msgid "Collation"
 msgstr "Kollation"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Die zusätzlichen Funktionen für verknüpfte Tabellen wurden automatisch "
+"deaktiviert. Klicken Sie %shier%s um herauszufinden warum."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "PDF-Schema anzeigen"
@@ -645,7 +673,8 @@ msgstr "Tracking ist aktiviert."
 msgid "Tracking is not active."
 msgstr "Tracking ist aktiviert."
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -817,17 +846,77 @@ msgstr "Verfolge Tabelle"
 msgid "Database Log"
 msgstr "Datenbank"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Möglicherweise wurde eine zu große Datei hochgeladen. Bitte lesen Sie die %"
+"sDokumentation%s zur Lösung diese Problems."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Die Datei konnte nicht gelesen werden"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Sie haben versucht, eine Datei zu laden, die mit einem nicht unterstützten "
+"Verfahren komprimiert wurde (%s). Entweder ist die Unterstützung für "
+"selbiges nicht implementiert oder in Ihrer Konfiguration deaktiviert."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Es wurden keinen Daten zum importieren empfangen. Entweder wurde keine Datei "
+"ausgewählt, oder die Dateigröße hat die maximal erlaubte Größe der PHP "
+"Konfiguration überschritten. Siehe FAQ 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"Die Import-Plugins konnten nicht geladen werden. Bitte überprüfen Sie Ihre "
+"phpMyAdmin-Installation."
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "SQL-Abfrage wurde gelöscht."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Bookmark wird angezeigt"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Bookmark %s wurde gespeichert"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 "Der Import wurde erfolgreich abgeschlossen, %d Abfragen wurden ausgeführt."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Das Ausführungszeitlimit wurde erreicht. Wenn Sie die Datei erneut "
+"abschicken, wird der Import fortgesetzt."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin arbeitet besser mit einem <b>Frame</b>-fähigen Browser."
@@ -844,7 +933,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "Die Anweisung \"DROP DATABASE\" wurde deaktiviert."
 
@@ -884,10 +974,12 @@ msgid "The user name is empty!"
 msgstr "Kein Benutzername eingegeben!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Es wurde kein Passwort angegeben!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Die eingegebenen Passwörter sind nicht identisch!"
 
@@ -1318,7 +1410,8 @@ msgstr "Passwort:"
 msgid "Server Choice"
 msgstr "Server Auswählen"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Ab diesem Punkt müssen Cookies aktiviert sein."
 
@@ -1343,6 +1436,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Die Anmeldung am MySQL-Server ist fehlgeschlagen."
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Falscher Benutzername/Passwort. Zugriff verweigert."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1476,11 +1573,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentation"
 
@@ -1544,7 +1642,7 @@ msgid "Skip Validate SQL"
 msgstr "SQL-Validierung umgehen"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "SQL validieren"
 
@@ -1601,7 +1699,8 @@ msgstr ""
 msgid "Font size"
 msgstr "Schriftgröße"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1769,6 +1868,7 @@ msgid "Create"
 msgstr "Anlegen"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Keine Rechte"
 
@@ -1785,6 +1885,11 @@ msgstr "Neue Tabelle in Datenbank %s erstellen"
 msgid "Number of fields"
 msgstr "Anzahl der Felder"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"Export-Plugins konnten nicht geladen werden, bitte Installation überprüfen!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1813,6 +1918,29 @@ msgstr "Bestehende Datei(en) überschreiben"
 msgid "File name template"
 msgstr "Dateinamenskonvention"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "Server-Name"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "Datenbank-Name"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "Tabellen-Name"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Dieser Wert wird mit %1$sstrftime%2$s geparst, Sie können also Platzhalter "
+"für Datum und Uhrzeit verwenden. Darüber hinaus werden folgende Umformungen "
+"durchgeführt: %3$s. Der übrige Text bleibt unberührt."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "Konvention merken"
@@ -1884,6 +2012,15 @@ msgstr "Zu importierende Datei"
 msgid "Location of the text file"
 msgstr "Datei"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Das hochladen von Dateien ist auf diesem Server nicht erlaubt."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Auf das festgelegte Upload-Verzeichnis kann nicht zugegriffen werden."
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2035,6 +2172,20 @@ msgstr "Beenden"
 msgid "in query"
 msgstr "in der Abfrage"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Zeige Datensätze "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "insgesamt"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "die Abfrage dauerte %01.4f sek."
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2520,29 +2671,12 @@ msgstr "Datei konnte gespeichert werden."
 msgid "File upload stopped by extension."
 msgstr "Dateihochladen durch eine Erweiterung gestoppt."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Die Datei konnte nicht gelesen werden"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Fehler beim Verschieben der hochgeladenen Datei, siehe FAQ 1.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Sie haben versucht, eine Datei zu laden, die mit einem nicht unterstützten "
-"Verfahren komprimiert wurde (%s). Entweder ist die Unterstützung für "
-"selbiges nicht implementiert oder in Ihrer Konfiguration deaktiviert."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2569,7 +2703,7 @@ msgstr "Erstellt von"
 msgid "Rows"
 msgstr "Zeilen"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL lieferte ein leeres Resultat zurück (d.&nbsp;h. null Zeilen)."
@@ -2614,6 +2748,11 @@ msgstr "Struktur"
 msgid "Go to view"
 msgstr "Gehe zum View"
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Kein Index definiert!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2650,6 +2789,15 @@ msgstr "Der Primärschlüssel wurde gelöscht."
 msgid "Index %s has been dropped"
 msgstr "Index %s wurde entfernt."
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"Die Indizes %1$s und %2$s scheinen gleich zu sein und einer könnte "
+"möglicherweise entfernt werden."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2783,7 +2931,7 @@ msgstr "%s&nbsp;Spalten zum Index hinzufügen"
 msgid "Add a new User"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Der Benutzer wurde hinzugefügt."
 
@@ -2976,10 +3124,6 @@ msgstr "Zu BLOB-Repository hochladen"
 msgid "Let every user access this bookmark"
 msgstr "Diese gespeicherte SQL-Abfrage für jeden Benutzer verfügbar machen"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "SQL-Abfrage wurde gelöscht."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Titel"
@@ -3022,18 +3166,7 @@ msgstr "BZip-komprimiert"
 msgid "Calendar"
 msgstr "Kalender"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"Export-Plugins konnten nicht geladen werden, bitte Installation überprüfen!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"Die Import-Plugins konnten nicht geladen werden. Bitte überprüfen Sie Ihre "
-"phpMyAdmin-Installation."
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Kann Index nicht in PRIMARY umbenennen!"
 
@@ -3150,11 +3283,6 @@ msgstr "Bitte konfigurieren Sie die Koordinaten für die Tabelle %s"
 msgid "Connections"
 msgstr "Verbindungen"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Datenbank %s wurde nach %s kopiert"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Kopiere Tabelle nach (Datenbank<b>.</b>Tabellenname):"
@@ -3178,7 +3306,7 @@ msgstr "Verbindungsaufbau zu MySQL-Server schlug fehl"
 msgid "Could not connect to the target"
 msgstr "Verbindungsaufbau zu MySQL-Server schlug fehl"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3280,26 +3408,17 @@ msgstr "Tschechoslowakisch"
 msgid "Danish"
 msgstr "Dänisch"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Der Datenbankname ist leer!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Export-Optionen der Datenbank"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Die Datenbank %1$s wurde erzeugt."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "Es wurden %s Datenbanken gelöscht."
@@ -3324,7 +3443,7 @@ msgstr "Datenbankstatistiken deaktivieren"
 msgid "Enable Statistics"
 msgstr "Datenbankstatistiken aktivieren"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3373,7 +3492,7 @@ msgstr "Tabelle defragmentieren"
 msgid "Use delayed inserts"
 msgstr "Verzögerten INSERT-Befehl verwenden"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Es wurden keine Benutzer zum Löschen ausgewählt!"
 
@@ -3588,34 +3707,11 @@ msgstr ""
 "Die Datei %s besteht bereits auf dem Server. Bitte ändern Sie den Dateinamen "
 "oder wählen Sie die Überschreibungs-Option."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "Datenbank-Name"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "Server-Name"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "Tabellen-Name"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Dieser Wert wird mit %1$sstrftime%2$s geparst, Sie können also Platzhalter "
-"für Datum und Uhrzeit verwenden. Darüber hinaus werden folgende Umformungen "
-"durchgeführt: %3$s. Der übrige Text bleibt unberührt."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Dateien"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3641,7 +3737,7 @@ msgstr "Leeren des Tabellencaches (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Den Tabellencache leeren (\"FLUSH\")"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3829,15 +3925,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"Die Indizes %1$s und %2$s scheinen gleich zu sein und einer könnte "
-"möglicherweise entfernt werden."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3875,7 +3962,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr " Als neuen Datensatz speichern "
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "ID der eingefügten Zeile: %1$d"
@@ -4204,20 +4291,10 @@ msgstr "Prozesse anzeigen"
 msgid "No databases"
 msgstr "Keine Datenbanken"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Es wurden keine Datenbanken ausgewählt."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Es wurden keinen Daten zum importieren empfangen. Entweder wurde keine Datei "
-"ausgewählt, oder die Dateigröße hat die maximal erlaubte Größe der PHP "
-"Konfiguration überschritten. Siehe FAQ 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "keine Beschreibung"
@@ -4231,15 +4308,11 @@ msgstr "Für dieses Tabellenformat sind keine Statusinformationen verfügbar"
 msgid "No files found inside ZIP archive!"
 msgstr "Keine Dateien im ZIP-Archiv gefunden!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Kein Index definiert!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Keine Indizes definiert."
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Keine Änderung"
 
@@ -4257,7 +4330,7 @@ msgstr "Für dieses Format sind keine Optionen vorhanden"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Der Webserver hat keine Schreibrechte um die Datei %s zu speichern."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Sie haben nicht genug Rechte um fortzufahren!"
 
@@ -4296,7 +4369,8 @@ msgstr ""
 "Die Tabelle <b>%s</b> wurde entweder nicht gefunden oder in der "
 "Kofigurationsdatei %s nicht gesetzt."
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Es wurden keine Benutzer gefunden."
 
@@ -4343,7 +4417,7 @@ msgstr "Partitions-Hilfsmittel"
 msgid "Partition %s"
 msgstr "Partition %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Das Passwort für %s wurde geändert."
@@ -4445,11 +4519,11 @@ msgstr "Polnisch"
 msgid "Port"
 msgstr "Sortierung"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Der Name des Primärschlüssels muss PRIMARY lauten!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "Der Name des Primärschlüssels darf <b>nur</b> \"PRIMARY\" lauten."
@@ -4658,7 +4732,7 @@ msgstr "Erlaubt das Verändern von gespeicherten Daten."
 msgid "No privileges."
 msgstr "Keine Rechte."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Die Benutzerprofile wurden neu geladen."
 
@@ -4701,11 +4775,6 @@ msgstr ""
 "<b>Abfragestatistik</b>: Seit seinem Start wurden %s Abfragen an diesen "
 "MySQL-Server gesandt."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "die Abfrage dauerte %01.4f sek."
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Abfrageart"
@@ -4734,15 +4803,6 @@ msgstr "Prüfe referentielle Integrität:"
 msgid "Relational schema"
 msgstr "Beziehungsschema"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Die zusätzlichen Funktionen für verknüpfte Tabellen wurden automatisch "
-"deaktiviert. Klicken Sie %shier%s um herauszufinden warum."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Tabellenverknüpfungen"
@@ -4783,11 +4843,6 @@ msgstr "Entferne die Partitionierung"
 msgid "Remove selected users"
 msgstr "Die ausgewählten Benutzer löschen"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Datenbank %s wurde umbenannt zu %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4896,7 +4951,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -5040,7 +5095,7 @@ msgstr ""
 "Den Benutzern alle Rechte entziehen und sie anschließend aus den "
 "Benutzertabellen löschen."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Sie haben die Rechte für %s entfernt."
@@ -5210,19 +5265,11 @@ msgstr "Zeige die SQL-Abfragen vollständig an"
 msgid "Show/Hide left menu"
 msgstr "Zeige/Verstecke linkes Menü"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Bookmark wird angezeigt"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Ansicht als PHP Code"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Zeige Datensätze "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Ansicht als SQL Abfrage"
 
@@ -6127,7 +6174,7 @@ msgstr "Die Tabelle %s existiert bereits!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Die Tabelle %1$s wurde erfolgreich geändert"
@@ -6146,7 +6193,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Der Tabellenname ist leer!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "Die Tabelle %1$s wurde erzeugt."
@@ -6269,7 +6316,7 @@ msgstr "Dieser Host"
 msgid "Threads"
 msgstr "Prozesse"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Der Prozess %s wurde erfolgreich abgebrochen."
@@ -6283,14 +6330,6 @@ msgstr ""
 "dass phpMyAdmin nicht in der Lage sein wird, den Import zu beenden, sofern "
 "nicht die Ausführungszeitbeschränkungen von php gelockert werden."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Das Ausführungszeitlimit wurde erreicht. Wenn Sie die Datei erneut "
-"abschicken, wird der Import fortgesetzt."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "nach/von Seite"
@@ -6307,10 +6346,6 @@ msgstr "Wechseln klein/groß"
 msgid "To select relation, click :"
 msgstr "Um eine Relation auszuwählen, klicken Sie :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "insgesamt"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6628,7 +6663,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "unbekannt"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Die Rechte für %s wurden geändert."
@@ -6649,19 +6684,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Sie sollten auf %s %s oder neuer umsteigen."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Möglicherweise wurde eine zu große Datei hochgeladen. Bitte lesen Sie die %"
-"sDokumentation%s zur Lösung diese Problems."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Das hochladen von Dateien ist auf diesem Server nicht erlaubt."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Verbrauch"
@@ -6675,7 +6697,7 @@ msgstr " Tabellen- und Feldnamen in einfachen Anführungszeichen "
 msgid "Use Host Table"
 msgstr "Verwende Hosttabelle"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Der Benutzer %s existiert bereits!"
@@ -6688,7 +6710,7 @@ msgstr "Der Benutzer %s existiert bereits!"
 msgid "User name"
 msgstr "Benutzername"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Der gewählte Benutzer wurde in der Benutzertabelle nicht gefunden."
 
@@ -6696,7 +6718,7 @@ msgstr "Der gewählte Benutzer wurde in der Benutzertabelle nicht gefunden."
 msgid "User overview"
 msgstr "Benutzerübersicht"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Die gewählten Benutzer wurden gelöscht."
 
@@ -6760,10 +6782,6 @@ msgstr "Dump (Schema) der Tabelle anzeigen"
 msgid "VIEW name"
 msgstr "VIEW Name"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Auf das festgelegte Upload-Verzeichnis kann nicht zugegriffen werden."
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Webserver"
@@ -6781,10 +6799,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "Platzhalter"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Falscher Benutzername/Passwort. Zugriff verweigert."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/el.po b/po/el.po
index 2adf90fb5..99cd5b559 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-30 23:16+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: greek <el@li.org>\n"
@@ -91,6 +91,11 @@ msgstr "Περιγραφή"
 msgid "Use this value"
 msgstr "Χρήση αυτής της τιμής"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Δημιουργήθηκε η βάση δεδομένων %1$s."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Σχόλιο βάσης: "
@@ -207,6 +212,20 @@ msgstr "Επιλογή όλων"
 msgid "Unselect All"
 msgstr "Απεπιλογή όλων"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Το όνομα της βάσης δεδομένων είναι κενό!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Η βάση δεδομένων %s μετονομάστηκε σε %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Η βάση δεδομένων %s αντιγράφηκε στη %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Μετονομασία βάσης δεδομένων σε"
@@ -317,6 +336,15 @@ msgstr "Ενεργοποίηση"
 msgid "Collation"
 msgstr "Σύνθεση"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Οι επιπρόσθετες λειτουργίες για εργασία με συσχετισμένους πίνακες έχουν "
+"απενεργοποιηθεί. Για να μάθετε γιατί, πατήστε %sεδώ%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Εμφάνιση σχήματος PDF"
@@ -644,7 +672,8 @@ msgstr "Η παρακολούθηση είναι ενεργοποιημένη."
 msgid "Tracking is not active."
 msgstr "Η παρακολούθηση δεν έιναι ενεργοποιημένη."
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -815,16 +844,74 @@ msgstr "Παρακολούθηση πίνακα"
 msgid "Database Log"
 msgstr "Καταγραφή Βάσης Δεδομένων"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Πιθανόν προσπαθείτε να αποστείλετε πολύ μεγάλο αρχείο. Λεπτομέρειες στην %"
+"sτεκμηρίωση%s για τρόπους αντιμετώπισης αυτού του περιορισμού."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Δεν ήταν δυνατή η ανάγνωση του αρχείου"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Προσπαθήσατε να φορτώσετε αρχείο με μη υποστηριζόμενη συμπίεση (%s). Είτε η "
+"υποστήριξη για αυτή δεν έχει εφαρμοστεί ή απενεργοποιηθεί από τις ρυθμίσεις "
+"σας."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Δεν ελήφθησαν δεδομένα για εισαγωγή. Είτε δεν υποβλήθηκε αρχείο είτε το "
+"μέγεθος του αρχείου υπερβαίνει το μέγιστο επιτρεπτό μέγεθος από τη ρύθμιση "
+"της ΡΗΡ. Δείτε τις ΣΑΕ 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "Αδύνατη η φόρτωση προσθέτων εισαγωγής. Ελέξτε την εγκατάστασή σας!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Η ετικέτα διεγράφη."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Εμφάνιση σελιδοδείκτη"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Ο σελιδοδείκτης %s δημιουργήθηκε"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Η εισαγωγή ολοκληρώθηκε επιτυχώς, %d ερωτήματα εκτελέστηκαν."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Το χρονικό όριο του κώδικα εξαντλήθηκε. Αν θέλετε να τελειώσετε την "
+"εισαγωγή, επανυποβάλτε το ίδιο αρχείο και η εισαγωγή θα συνεχίσει."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -843,7 +930,8 @@ msgstr "Πατήστε για επιλογή"
 msgid "Click to unselect"
 msgstr "Πατήστε για απεπιλογή"
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "Οι εντολές «DROP DATABASE» έχουν απενεργοποιηθεί."
 
@@ -884,10 +972,12 @@ msgid "The user name is empty!"
 msgstr "Το όνομα του χρήστη είναι κενό!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Ο Κωδικός Πρόσβασης είναι κενός!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Οι κωδικοί πρόσβασης δεν είναι ίδιοι!"
 
@@ -1315,7 +1405,8 @@ msgstr "Κωδικός πρόσβασης:"
 msgid "Server Choice"
 msgstr "Επιλογή Διακομιστή"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Από αυτό το σημείο πρέπει να έχετε ενεργοποιημένα cookies."
 
@@ -1340,6 +1431,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή MySQL"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Λανθασμένο όνομα χρήστη/κωδικός πρόσβασης. Άρνηση πρόσβασης."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1473,11 +1568,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Τεκμηρίωση"
 
@@ -1541,7 +1637,7 @@ msgid "Skip Validate SQL"
 msgstr "Παράβλεψη επικύρωσης SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Επικύρωση SQL"
 
@@ -1596,7 +1692,8 @@ msgstr "Η λειτουργία %s έχει επηρρεαστεί από ένα
 msgid "Font size"
 msgstr "Μέγεθος γραμματοσειράς"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1759,6 +1856,7 @@ msgid "Create"
 msgstr "Δημιουργία"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Χωρίς Δικαιώματα"
 
@@ -1775,6 +1873,10 @@ msgstr "Δημιουργία νέου πίνακα στη βάση %s"
 msgid "Number of fields"
 msgstr "Αριθμός πεδίων"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr "Αδύνατη η φόρτωση προσθέτων εξαγωγής. Ελέξτε την εγκατάστασή σας!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1803,6 +1905,30 @@ msgstr "Αντικατάσταση υπαρχόντων αρχείων"
 msgid "File name template"
 msgstr "Μορφή ονόματος αρχείου"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "όνομα διακομιστή"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "όνομα βάσης δεδομένων"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "όνομα πίνακα"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Αυτή η τιμή μετατρέπεται με χρήση της συνάρτησης %1$sstrftime%2$s, έτσι "
+"μπορείτε να χρησιμοποιήσετε φράσεις μορφής χρόνου. Επιπρόσθετα, θα γίνουν "
+"και οι ακόλουθες μετατροπές: %3$s. Το υπόλοιπο κείμενο θα παραμείνει όπως "
+"είναι."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "αποθήκευση μορφής"
@@ -1879,6 +2005,16 @@ msgstr "Αρχείο για εισαγωγή"
 msgid "Location of the text file"
 msgstr "Τοποθεσία του αρχείου κειμένου"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Οι αποστολές αρχείων δεν επιτρέπονται σε αυτό τον διακομιστή."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr ""
+"Ο υποκατάλογος που ορίσατε για την αποθήκευση αρχείων δεν μπόρεσε να βρεθεί"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2027,6 +2163,20 @@ msgstr "Τερματισμός"
 msgid "in query"
 msgstr "στην εντολή"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Εμφάνιση εγγραφής "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "συνολικά"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Το ερώτημα χρειάστηκε %01.4f δευτερόλεπτα"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2520,29 +2670,12 @@ msgstr "Αποτυχία εγγραφής του αρχείου στο δίσκ
 msgid "File upload stopped by extension."
 msgstr "Η αποστολή του αρχείου σταμάτησε λόγω επέκτασης."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Δεν ήταν δυνατή η ανάγνωση του αρχείου"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Σφάλμα μετακίνησης του αρχείου αποστολής. Δείτε τις ΣΑΕ 1.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Προσπαθήσατε να φορτώσετε αρχείο με μη υποστηριζόμενη συμπίεση (%s). Είτε η "
-"υποστήριξη για αυτή δεν έχει εφαρμοστεί ή απενεργοποιηθεί από τις ρυθμίσεις "
-"σας."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2568,7 +2701,7 @@ msgstr "Δημιουργήθηκε από:"
 msgid "Rows"
 msgstr "Εγγραφές"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
@@ -2613,6 +2746,11 @@ msgstr "δομή"
 msgid "Go to view"
 msgstr "Μετάβαση στην προβολή"
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Δεν ορίστηκε ευρετήριο!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2649,6 +2787,15 @@ msgstr "Το πρωτεύον κλειδί διεγράφη"
 msgid "Index %s has been dropped"
 msgstr "Το ευρετήριο %s διεγράφη"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"Τα ευρετήρια %1$s και %2$s φαίνεται να είναι ίσα και ένα από αυτά μπορεί να "
+"απομακρυνθεί."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2781,7 +2928,7 @@ msgstr "Προσθήκη στο ευρετήριο «%s» στήλης(ών)"
 msgid "Add a new User"
 msgstr "Προσθήκη νέου Χρήστη"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Προσθέσατε ένα νέο χρήστη."
 
@@ -2970,10 +3117,6 @@ msgstr "Μεταφορά στην αποθήκη BLOB"
 msgid "Let every user access this bookmark"
 msgstr "Δικαίωμα πρόσβασης στο σελίδοδείκτη σε κάθε χρήστη"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Η ετικέτα διεγράφη."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Τίτλος"
@@ -3016,15 +3159,7 @@ msgstr "συμπίεση «bzip»"
 msgid "Calendar"
 msgstr "Ημερολόγιο"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr "Αδύνατη η φόρτωση προσθέτων εξαγωγής. Ελέξτε την εγκατάστασή σας!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "Αδύνατη η φόρτωση προσθέτων εισαγωγής. Ελέξτε την εγκατάστασή σας!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Η μετατροπή του ευρετηρίου σε ΠΡΩΤΕΥΟΝ σε είναι εφικτή!"
 
@@ -3146,11 +3281,6 @@ msgstr "Παρακαλώ ορίστε τις συντεταγμένες για 
 msgid "Connections"
 msgstr "Συνδέσεις"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Η βάση δεδομένων %s αντιγράφηκε στη %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Αντιγραφή πίνακα σε (βάση<b>.</b>πίνακας):"
@@ -3172,7 +3302,7 @@ msgstr "Αδύνατη η σύνδεση με την προέλευση"
 msgid "Could not connect to the target"
 msgstr "Αδύνατη η σύνδεση με τον προορισμό"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3271,26 +3401,17 @@ msgstr "Τσέχο-Σλοβάκικα"
 msgid "Danish"
 msgstr "Δανικά"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Το όνομα της βάσης δεδομένων είναι κενό!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Επιλογές εξαγωγής βάσης δεδομένων"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Δημιουργήθηκε η βάση δεδομένων %1$s."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr "Η βάση δεδομένων «%s» δεν υπάρχει."
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s βάσεις δεδομένων διεγράφησαν επιτυχώς."
@@ -3314,7 +3435,7 @@ msgstr "Απενεργοποίηση Στατιστικών"
 msgid "Enable Statistics"
 msgstr "Ενεργοποίηση Στατιστικών"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3361,7 +3482,7 @@ msgstr "Ανασυγκρότηση πίνακα"
 msgid "Use delayed inserts"
 msgstr "Χρήση εισαγωγών με καθυστέρηση"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Δεν επιλέχθηκαν χρήστες για διαγραφή!"
 
@@ -3576,35 +3697,11 @@ msgstr ""
 "Το αρχείο %s υπάρχει ήδη στον διακομιστή. Επιλέξτε διαφορετικό όνομα αρχείου "
 "ή ενεργοποιήστε την επιλογή αντικατάστασης."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "όνομα βάσης δεδομένων"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "όνομα διακομιστή"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "όνομα πίνακα"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Αυτή η τιμή μετατρέπεται με χρήση της συνάρτησης %1$sstrftime%2$s, έτσι "
-"μπορείτε να χρησιμοποιήσετε φράσεις μορφής χρόνου. Επιπρόσθετα, θα γίνουν "
-"και οι ακόλουθες μετατροπές: %3$s. Το υπόλοιπο κείμενο θα παραμείνει όπως "
-"είναι."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Αρχεία"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3630,7 +3727,7 @@ msgstr "Εκκαθάριση («FLUSH») πίνακα"
 msgid "Flush (close) all tables"
 msgstr "Εκκαθάριση (κλείσιμο) όλων των πινάκων"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3818,15 +3915,6 @@ msgstr "Βιβλίο εργασίας Excel 97-2003 XLS"
 msgid "Excel 2007 XLSX Workbook"
 msgstr "Βιβλίο εργασίας Excel 2007 XLSX"
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"Τα ευρετήρια %1$s και %2$s φαίνεται να είναι ίσα και ένα από αυτά μπορεί να "
-"απομακρυνθεί."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3863,7 +3951,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Εισαγωγή ως νέα εγγραφή"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Ταυτότητα εισερχόμενης εγγραφής: %1$d"
@@ -4195,20 +4283,10 @@ msgstr "Εμφάνιση διεργασιών"
 msgid "No databases"
 msgstr "Δεν υπάρχουν βάσεις δεδομένων"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Δεν έχετε επιλέξει βάσεις δεδομένων."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Δεν ελήφθησαν δεδομένα για εισαγωγή. Είτε δεν υποβλήθηκε αρχείο είτε το "
-"μέγεθος του αρχείου υπερβαίνει το μέγιστο επιτρεπτό μέγεθος από τη ρύθμιση "
-"της ΡΗΡ. Δείτε τις ΣΑΕ 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "χωρίς περιγραφή"
@@ -4224,15 +4302,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "Δεν βρέθηκαν αρχεία στο συμπιεσμένο αρχείο ZIP!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Δεν ορίστηκε ευρετήριο!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Δεν ορίστηκαν τα στοιχεία του ευρετηρίου!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Χωρίς αλλαγή"
 
@@ -4250,7 +4324,7 @@ msgstr "Αυτή η μορφή δεν έχει επιλογές"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Ο διακομιστής δεν έχει δικαιώματα αποθήκευσης του αρχείου %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Δεν έχετε αρκετά δικαιώματα να είσαστε εδώ τώρα!"
 
@@ -4287,7 +4361,8 @@ msgstr "δεν υφίσταται"
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "Ο πίνακας <b>%s</b> δεν βρέθηκε ή δεν ορίστηκε στη %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Δεν βρέθηκαν χρήστες."
 
@@ -4334,7 +4409,7 @@ msgstr "Συντήρηση κατάτμησης"
 msgid "Partition %s"
 msgstr "Κατάτμηση %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Ο Κωδικός Πρόσβασης για τον χρήστη %s άλλαξε επιτυχώς."
@@ -4434,11 +4509,11 @@ msgstr "Πολωνικά"
 msgid "Port"
 msgstr "Θύρα"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Το όνομα του πρωτεύοντος κλειδιού πρέπει να είναι... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4649,7 +4724,7 @@ msgstr "Επιτρέπει την αλλαγή δεδομένων."
 msgid "No privileges."
 msgstr "Χωρίς δικαιώματα."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Τα δικαιώματα επαναφορτώθηκαν επιτυχώς."
 
@@ -4692,11 +4767,6 @@ msgstr ""
 "<b>Στατιστικά ερωτημάτων</b>: Από την έναρξη λειτουργίας, %s ερωτήματα έχουν "
 "σταλεί στον διακομιστή."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Το ερώτημα χρειάστηκε %01.4f δευτερόλεπτα"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Τύπος ερωτήματος"
@@ -4725,15 +4795,6 @@ msgstr "Έλεγχος ακεραιότητας συσχετίσεων:"
 msgid "Relational schema"
 msgstr "Σχεσιακό σχήμα"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Οι επιπρόσθετες λειτουργίες για εργασία με συσχετισμένους πίνακες έχουν "
-"απενεργοποιηθεί. Για να μάθετε γιατί, πατήστε %sεδώ%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Συσχετίσεις"
@@ -4773,11 +4834,6 @@ msgstr "Απομάκρυνση κατάτμησης"
 msgid "Remove selected users"
 msgstr "Διαγραφή των επιλεγμένων χρηστών"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Η βάση δεδομένων %s μετονομάστηκε σε %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4899,7 +4955,7 @@ msgstr ""
 "Αυτός ο διακομιστής δεν έχει ρυθμιστεί ως πρωτεύων σε μια διαδικασία "
 "αναπαραγωγής. Θέλετε να τον <a href=\"%s\">ρυθμίσετε</a>;"
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -5047,7 +5103,7 @@ msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 "Ανάκληση όλων των ενεργών δικαιώματα από τους χρήστες και διαγραφή τους."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Ανακαλέσατε τα δικαιώματα για %s"
@@ -5215,19 +5271,11 @@ msgstr "Πλήρης εμφάνιση ερωτημάτων"
 msgid "Show/Hide left menu"
 msgstr "Εμφάνιση/Απόκρυψη αριστερού μενού"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Εμφάνιση σελιδοδείκτη"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Εμφάνιση ως κώδικά PHP"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Εμφάνιση εγγραφής "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Εμφάνιση ερωτήματος SQL"
 
@@ -6147,7 +6195,7 @@ msgstr "Ο πίνακας %s υπάρχει ήδη!"
 msgid "Alter column(s)"
 msgstr "Αλλαγή στήλης(ών)"
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Ο πίνακας %1$s αλλάχτηκε επιτυχώς"
@@ -6168,7 +6216,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Το όνομα του Πίνακα είναι κενό!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "Ο πίνακας %1$s έχει δημιουργηθεί."
@@ -6292,7 +6340,7 @@ msgstr "Αυτός ο διακομιστής"
 msgid "Threads"
 msgstr "Διεργασίες"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Η λειτουργία %s διεκόπη."
@@ -6306,14 +6354,6 @@ msgstr ""
 "σημαίνει ότι το phpMyAdmin δεν θα μπορέσει να τελειώσει την εισαγωγή εκτός "
 "και αν αυξήσετε τα χρονικά όρια της php."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Το χρονικό όριο του κώδικα εξαντλήθηκε. Αν θέλετε να τελειώσετε την "
-"εισαγωγή, επανυποβάλτε το ίδιο αρχείο και η εισαγωγή θα συνεχίσει."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "από/προς τη σελίδα"
@@ -6330,10 +6370,6 @@ msgstr "Εναλλαγή μικρά/μεγάλα"
 msgid "To select relation, click :"
 msgstr "Για να επιλέξετε συσχέτιση, πατήστε :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "συνολικά"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6651,7 +6687,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "άγνωστο"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Τα δικαιώματα του χρήστη %s ενημερώθηκαν."
@@ -6672,19 +6708,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Πρέπει να αναβαθμίσετε σε %s %s ή νεότερη."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Πιθανόν προσπαθείτε να αποστείλετε πολύ μεγάλο αρχείο. Λεπτομέρειες στην %"
-"sτεκμηρίωση%s για τρόπους αντιμετώπισης αυτού του περιορισμού."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Οι αποστολές αρχείων δεν επιτρέπονται σε αυτό τον διακομιστή."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Χρήση"
@@ -6698,7 +6721,7 @@ msgstr "Χρήση ανάποδων εισαγωγικών στα ονόματα
 msgid "Use Host Table"
 msgstr "Χρήση Οικείου Πίνακα"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Ο χρήστης %s υπάρχει ήδη!"
@@ -6711,7 +6734,7 @@ msgstr "Ο χρήστης %s υπάρχει ήδη!"
 msgid "User name"
 msgstr "Όνομα χρήστη"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Ο επιλεγμένος χρήστης δεν βρέθηκε στον πίνακα δικαιωμάτων."
 
@@ -6719,7 +6742,7 @@ msgstr "Ο επιλεγμένος χρήστης δεν βρέθηκε στον
 msgid "User overview"
 msgstr "Περίληψη χρηστών"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Οι επιλεγμένοι χρήστες διεγράφησαν επιτυχώς."
 
@@ -6783,11 +6806,6 @@ msgstr "Εμφάνιση σχήματος του πίνακα"
 msgid "VIEW name"
 msgstr "ΠΡΟΒΟΛΗ ονόματος"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr ""
-"Ο υποκατάλογος που ορίσατε για την αποθήκευση αρχείων δεν μπόρεσε να βρεθεί"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Διακομιστής ιστού"
@@ -6805,10 +6823,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "μπαλαντέρ"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Λανθασμένο όνομα χρήστη/κωδικός πρόσβασης. Άρνηση πρόσβασης."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/en_GB.po b/po/en_GB.po
index 1e30282da..05e40ee12 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-05-04 11:46+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: english-gb <en_GB@li.org>\n"
@@ -91,6 +91,11 @@ msgstr "Description"
 msgid "Use this value"
 msgstr "Use this value"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Database %1$s has been created."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Database comment: "
@@ -207,6 +212,20 @@ msgstr "Select All"
 msgid "Unselect All"
 msgstr "Unselect All"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "The database name is empty!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Database %s has been renamed to %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Database %s has been copied to %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Rename database to"
@@ -311,6 +330,15 @@ msgstr "Enable"
 msgid "Collation"
 msgstr "Collation"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Display PDF schema"
@@ -638,7 +666,8 @@ msgstr "Tracking is active."
 msgid "Tracking is not active."
 msgstr "Tracking is not active."
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -808,16 +837,73 @@ msgstr "Track table"
 msgid "Database Log"
 msgstr "Database Log"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "File could not be read"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "Could not load import plug-ins, please check your installation!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "The bookmark has been deleted."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Showing bookmark"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Bookmark %s created"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Import has been successfully finished, %d queries executed."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
@@ -834,7 +920,8 @@ msgstr "Click to select"
 msgid "Click to unselect"
 msgstr "Click to unselect"
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" statements are disabled."
 
@@ -874,10 +961,12 @@ msgid "The user name is empty!"
 msgstr "The user name is empty!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "The password is empty!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "The passwords aren't the same!"
 
@@ -1252,7 +1341,8 @@ msgstr "Password:"
 msgid "Server Choice"
 msgstr "Server Choice"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies must be enabled past this point."
 
@@ -1275,6 +1365,10 @@ msgstr "No activity within %s seconds; please log in again"
 msgid "Cannot log in to the MySQL server"
 msgstr "Cannot log in to the MySQL server"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Wrong username/password. Access denied."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1401,11 +1495,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Documentation"
 
@@ -1469,7 +1564,7 @@ msgid "Skip Validate SQL"
 msgstr "Skip Validate SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Validate SQL"
 
@@ -1522,7 +1617,8 @@ msgstr "The %s functionality is affected by a known bug, see %s"
 msgid "Font size"
 msgstr "Font size"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1685,6 +1781,7 @@ msgid "Create"
 msgstr "Create"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "No Privileges"
 
@@ -1701,6 +1798,10 @@ msgstr "Create table on database %s"
 msgid "Number of fields"
 msgstr "Number of fields"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr "Could not load export plug-ins, please check your installation!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1729,6 +1830,29 @@ msgstr "Overwrite existing file(s)"
 msgid "File name template"
 msgstr "File name template"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "server name"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "database name"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "table name"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "remember template"
@@ -1799,6 +1923,15 @@ msgstr "File to import"
 msgid "Location of the text file"
 msgstr "Location of the text file"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "File uploads are not allowed on this server."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "The directory you set for upload work cannot be reached"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1946,6 +2079,20 @@ msgstr "Kill"
 msgid "in query"
 msgstr "in query"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Showing rows"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "total"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Query took %01.4f sec"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2430,11 +2577,6 @@ msgstr "Failed to write file to disk."
 msgid "File upload stopped by extension."
 msgstr "File upload stopped by extension."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "File could not be read"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
@@ -2443,17 +2585,6 @@ msgstr ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2479,7 +2610,7 @@ msgstr "Generated by"
 msgid "Rows"
 msgstr "Rows"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL returned an empty result set (i.e. zero rows)."
@@ -2525,6 +2656,11 @@ msgstr "structure"
 msgid "Go to view"
 msgstr "Go to view"
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "No index defined!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2561,6 +2697,15 @@ msgstr "The primary key has been dropped"
 msgid "Index %s has been dropped"
 msgstr "Index %s has been dropped"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2690,7 +2835,7 @@ msgstr "Add to index &nbsp;%s&nbsp;column(s)"
 msgid "Add a new User"
 msgstr "Add a new User"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "You have added a new user."
 
@@ -2879,10 +3024,6 @@ msgstr "Upload to BLOB repository"
 msgid "Let every user access this bookmark"
 msgstr "Let every user access this bookmark"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "The bookmark has been deleted."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Label"
@@ -2925,15 +3066,7 @@ msgstr "\"bzipped\""
 msgid "Calendar"
 msgstr "Calendar"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr "Could not load export plug-ins, please check your installation!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "Could not load import plug-ins, please check your installation!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Can't rename index to PRIMARY!"
 
@@ -3056,11 +3189,6 @@ msgstr "Please configure the coordinates for table %s"
 msgid "Connections"
 msgstr "Connections"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Database %s has been copied to %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Copy table to (database<b>.</b>table):"
@@ -3082,7 +3210,7 @@ msgstr "Could not connect to the source"
 msgid "Could not connect to the target"
 msgstr "Could not connect to the target"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3179,26 +3307,17 @@ msgstr "Czech-Slovak"
 msgid "Danish"
 msgstr "Danish"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "The database name is empty!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Database export options"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Database %1$s has been created."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr "'%s' database does not exist."
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s databases have been dropped successfully."
@@ -3222,7 +3341,7 @@ msgstr "Disable Statistics"
 msgid "Enable Statistics"
 msgstr "Enable Statistics"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3269,7 +3388,7 @@ msgstr "Defragment table"
 msgid "Use delayed inserts"
 msgstr "Use delayed inserts"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "No users selected for deleting!"
 
@@ -3483,34 +3602,11 @@ msgid ""
 msgstr ""
 "File %s already exists on server, change filename or check overwrite option."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "database name"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "server name"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "table name"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Files"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3535,7 +3631,7 @@ msgstr "Flush the table (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Flush (close) all tables"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr "Error creating foreign key on %1$s (check data types)"
@@ -3719,15 +3815,6 @@ msgstr "Excel 97-2003 XLS Workbook"
 msgid "Excel 2007 XLSX Workbook"
 msgstr "Excel 2007 XLSX Workbook"
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3764,7 +3851,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Insert as new row"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Inserted row id: %1$d"
@@ -4094,20 +4181,10 @@ msgstr "Show processes"
 msgid "No databases"
 msgstr "No databases"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "No databases selected."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "no description"
@@ -4122,15 +4199,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "No files found inside ZIP archive!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "No index defined!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "No index parts defined!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "No change"
 
@@ -4148,7 +4221,7 @@ msgstr "This format has no options"
 msgid "The web server does not have permission to save the file %s."
 msgstr "The web server does not have permission to save the file %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "You don't have sufficient privileges to be here right now!"
 
@@ -4185,7 +4258,8 @@ msgstr "not present"
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> table not found or not set in %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "No user(s) found."
 
@@ -4232,7 +4306,7 @@ msgstr "Partition maintenance"
 msgid "Partition %s"
 msgstr "Partition %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "The password for %s was changed successfully."
@@ -4335,11 +4409,11 @@ msgstr "Polish"
 msgid "Port"
 msgstr "Port"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "The name of the primary key must be \"PRIMARY\"!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4539,7 +4613,7 @@ msgstr "Allows changing data."
 msgid "No privileges."
 msgstr "No privileges."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "The privileges were reloaded successfully."
 
@@ -4582,11 +4656,6 @@ msgstr ""
 "<b>Query statistics</b>: Since its startup, %s queries have been sent to the "
 "server."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Query took %01.4f sec"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Query type"
@@ -4615,15 +4684,6 @@ msgstr "Check referential integrity:"
 msgid "Relational schema"
 msgstr "Relational schema"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relations"
@@ -4662,11 +4722,6 @@ msgstr "Remove partitioning"
 msgid "Remove selected users"
 msgstr "Remove selected users"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Database %s has been renamed to %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4783,7 +4838,7 @@ msgstr ""
 "This server is not configured as master in a replication process. Would you "
 "like to <a href=\"%s\">configure</a> it?"
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4928,7 +4983,7 @@ msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 "Revoke all active privileges from the users and delete them afterwards."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "You have revoked the privileges for %s"
@@ -5094,19 +5149,11 @@ msgstr "Show Full Queries"
 msgid "Show/Hide left menu"
 msgstr "Show/Hide left menu"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Showing bookmark"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Showing as PHP code"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Showing rows"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Showing SQL query"
 
@@ -5978,7 +6025,7 @@ msgstr "Table %s already exists!"
 msgid "Alter column(s)"
 msgstr "Alter column(s)"
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Table %1$s has been altered successfully"
@@ -5997,7 +6044,7 @@ msgstr "Would you like to delete all the previous rows from target tables?"
 msgid "The table name is empty!"
 msgstr "The table name is empty!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "Table %1$s has been created."
@@ -6118,7 +6165,7 @@ msgstr "This Host"
 msgid "Threads"
 msgstr "Threads"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Thread %s was successfully killed."
@@ -6131,14 +6178,6 @@ msgstr ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
 "won't be able to finish this import unless you increase php time limits."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "to/from page"
@@ -6155,10 +6194,6 @@ msgstr "Toggle small/big"
 msgid "To select relation, click :"
 msgstr "To select relation, click :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "total"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6470,7 +6505,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "unknown"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "You have updated the privileges for %s."
@@ -6490,19 +6525,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "You should upgrade to %s %s or later."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "File uploads are not allowed on this server."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Usage"
@@ -6516,7 +6538,7 @@ msgstr "Enclose table and field names with backquotes"
 msgid "Use Host Table"
 msgstr "Use Host Table"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "The user %s already exists!"
@@ -6529,7 +6551,7 @@ msgstr "The user %s already exists!"
 msgid "User name"
 msgstr "User name"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "The selected user was not found in the privilege table."
 
@@ -6537,7 +6559,7 @@ msgstr "The selected user was not found in the privilege table."
 msgid "User overview"
 msgstr "User overview"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "The selected users have been deleted successfully."
 
@@ -6599,10 +6621,6 @@ msgstr "View dump (schema) of table"
 msgid "VIEW name"
 msgstr "VIEW name"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "The directory you set for upload work cannot be reached"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Web server"
@@ -6620,10 +6638,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "wildcard"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Wrong username/password. Access denied."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/es.po b/po/es.po
index 4d0240223..8602a0c8d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 11:23+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: spanish <es@li.org>\n"
@@ -91,6 +91,11 @@ msgstr "Descripción"
 msgid "Use this value"
 msgstr "Use este valor"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "La base de datos %1$s se creó."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Comentario de la base de datos: "
@@ -207,6 +212,20 @@ msgstr "Seleccionar todo"
 msgid "Unselect All"
 msgstr "Deseleccionar todo"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "¡El nombre de la base de datos está vacío!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "La base de datos %s ha sido cambiada de nombre a %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "La base de datos %s ha sido copiada a %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Cambiar el nombre de la base de datos a"
@@ -317,6 +336,15 @@ msgstr "Habilite"
 msgid "Collation"
 msgstr "Cotejamiento"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Las opciones adicionales para trabajar con tablas vinculadas fueron "
+"desactivadas. Para saber porqué, dé clic %saquí%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Mostrar esquema PDF"
@@ -644,7 +672,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -823,16 +852,76 @@ msgstr "Revisar la tabla"
 msgid "Database Log"
 msgstr "Base de datos"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Usted probablemente intentó cargar un archivo demasiado grande.  Por favor, "
+"refiérase a %sdocumentation%s para hallar modos de superar esta limitante."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "No fue posible leer el archivo"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Usted intentó cargar un archivo con un tipo de compresión desconocido (%s). "
+"Este tipo de compresión puede no estar implementado o quizá no ha sido "
+"habilitado en su archivo de configuración."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"No se recibieron datos para importar. O no se envió el nombre del archivo, o "
+"el tamaño del archivo excedió el máximo permitido por su configuración PHP. "
+"Por favor, lea el FAQ 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"No se pudieron cargar los plugins de importación, por favor revise su "
+"instalación"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "El favorito ha sido borrado."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Mostrando el favorito"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "El favorito %s fue creado"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "La importación se ejecutó exitosamente, se ejecutaron %d consultas."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Se ha agotado el tiempo de ejecución del script; si desea completar la "
+"importación, por favor, reenvíe el mismo archivo y la importación continuará."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin funciona mejor con un navegador que <b>reconoce frames</b>."
@@ -849,7 +938,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "Los enunciados \\\"DROP DATABASE\\\" están deshabilitados."
 
@@ -891,10 +981,12 @@ msgid "The user name is empty!"
 msgstr "¡El nombre de usuario está vacío!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "¡La contraseña está vacía!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "¡Las contraseñas no coinciden!"
 
@@ -1321,7 +1413,8 @@ msgstr "Contraseña:"
 msgid "Server Choice"
 msgstr "Elección del servidor"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Las \"cookies\" deben estar habilitadas."
 
@@ -1345,6 +1438,11 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "El servidor MySQL no autorizó su ingreso"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr ""
+"El nombre de usuario o la contraseña es incorrecto. El acceso fue denegado."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1476,11 +1574,12 @@ msgstr "es"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Documentación"
 
@@ -1544,7 +1643,7 @@ msgid "Skip Validate SQL"
 msgstr "Salir de la validación del SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Validar el SQL"
 
@@ -1599,7 +1698,8 @@ msgstr "La funcionalidad %s está afectada por un fallo conocido, vea %s"
 msgid "Font size"
 msgstr "Tamaño del font"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1765,6 +1865,7 @@ msgid "Create"
 msgstr "Crear"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Sin privilegios"
 
@@ -1781,6 +1882,12 @@ msgstr "Crear nueva tabla en la base de datos %s"
 msgid "Number of fields"
 msgstr "Número de campos"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"No se cargaron los plugins de exportación.  Por favor, ¡revise su "
+"instalación!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1809,6 +1916,30 @@ msgstr "Sobreescribir el(los) archivo(s) existente(s)"
 msgid "File name template"
 msgstr "Plantilla del nombre del archivo"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "nombre del servidor"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "nombre de la base de datos"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "nombre de la tabla"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Este valor es interpretado usando %1$sstrftime%2$s; así, usted puede usar "
+"cadenas de caracteres para formatear el tiempo. De manera adicional, "
+"sucederán las siguientes transformaciones: %3$s. El texto restante se "
+"mantendrá como está."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "recordar la plantilla"
@@ -1880,6 +2011,16 @@ msgstr "Archivo a importar"
 msgid "Location of the text file"
 msgstr "Localización del archivo de texto"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "No está permitido subir archivos a este servidor."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr ""
+"No está disponible el directorio que usted habilitó para subir las tareas"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2031,6 +2172,20 @@ msgstr "Matar el proceso"
 msgid "in query"
 msgstr "en la consulta"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Mostrando registros "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "total"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "La consulta tardó %01.4f seg"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2529,29 +2684,12 @@ msgstr "No fue posible grabar el archivo al disco."
 msgid "File upload stopped by extension."
 msgstr "La carga del archivo fue detenida por extensión."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "No fue posible leer el archivo"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Se detectó un error al trasladar el archivo cargado, ver FAQ 1.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Usted intentó cargar un archivo con un tipo de compresión desconocido (%s). "
-"Este tipo de compresión puede no estar implementado o quizá no ha sido "
-"habilitado en su archivo de configuración."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2578,7 +2716,7 @@ msgstr "Generado por"
 msgid "Rows"
 msgstr "Filas"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL ha devuelto un valor vacío (i.e., cero columnas)."
@@ -2625,6 +2763,11 @@ msgstr "Estructura"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "¡No se ha definido el índice!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2661,6 +2804,15 @@ msgstr "La clave primaria ha sido eliminada"
 msgid "Index %s has been dropped"
 msgstr "El índice %s ha sido eliminado"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"Los índices %1$s y %2$s parecen ser iguales y posiblemente se puede remover "
+"uno."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2795,7 +2947,7 @@ msgstr "Añadir al índice &nbsp;%s&nbsp;columna(s)"
 msgid "Add a new User"
 msgstr "Agregar un nuevo usuario"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Ha agregado un nuevo usuario."
 
@@ -2988,10 +3140,6 @@ msgstr "Cargar al repositorio BLOB"
 msgid "Let every user access this bookmark"
 msgstr "Permitir que todo usuario pueda acceder a este favorito"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "El favorito ha sido borrado."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Etiqueta"
@@ -3034,19 +3182,7 @@ msgstr "\"Comprimido con bzip\""
 msgid "Calendar"
 msgstr "Calendario"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"No se cargaron los plugins de exportación.  Por favor, ¡revise su "
-"instalación!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"No se pudieron cargar los plugins de importación, por favor revise su "
-"instalación"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "No puede cambiar el nombre del índice a ¡PRIMARY!"
 
@@ -3166,11 +3302,6 @@ msgstr "Configure las coordenadas para la tabla %s"
 msgid "Connections"
 msgstr "Conexiones"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "La base de datos %s ha sido copiada a %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Copiar la tabla a (base de datos<b>.</b>tabla):"
@@ -3194,7 +3325,7 @@ msgstr "No pudo conectarse con un servidor MySQL"
 msgid "Could not connect to the target"
 msgstr "No pudo conectarse con un servidor MySQL"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3296,26 +3427,17 @@ msgstr "Checo-Eslovaco"
 msgid "Danish"
 msgstr "Danés"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "¡El nombre de la base de datos está vacío!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Opciones de exportación de la base de datos"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "La base de datos %1$s se creó."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s bases de datos han sido eliminadas exitosamente."
@@ -3340,7 +3462,7 @@ msgstr "Desactivar las estadísticas"
 msgid "Enable Statistics"
 msgstr "Activar las estadísticas"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3389,7 +3511,7 @@ msgstr "Defragmentar la tabla"
 msgid "Use delayed inserts"
 msgstr "Usar \"inserts\" con retraso"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "¡No se han seleccionado usuarios para eliminar!"
 
@@ -3607,35 +3729,11 @@ msgstr ""
 "El archivo %s ya existe en el servidor, cambie el nombre del archivo o "
 "revise la opción de sobreescritura."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "nombre de la base de datos"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "nombre del servidor"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "nombre de la tabla"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Este valor es interpretado usando %1$sstrftime%2$s; así, usted puede usar "
-"cadenas de caracteres para formatear el tiempo. De manera adicional, "
-"sucederán las siguientes transformaciones: %3$s. El texto restante se "
-"mantendrá como está."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Archivos"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3661,7 +3759,7 @@ msgstr "Vaciar el caché de la tabla (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Vaciar el cache de todas las tablas"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3846,15 +3944,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"Los índices %1$s y %2$s parecen ser iguales y posiblemente se puede remover "
-"uno."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3894,7 +3983,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Insertar como una nueva fila"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "La Id de la fila insertada es: %1$d"
@@ -4223,20 +4312,10 @@ msgstr "Mostrar procesos"
 msgid "No databases"
 msgstr "No hay bases de datos"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "No se seleccionaron bases de datos."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"No se recibieron datos para importar. O no se envió el nombre del archivo, o "
-"el tamaño del archivo excedió el máximo permitido por su configuración PHP. "
-"Por favor, lea el FAQ 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "Sin descripción"
@@ -4252,15 +4331,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "¡No se hallaron archivos dentro del archivo ZIP!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "¡No se ha definido el índice!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "¡No se han definido las partes del índice!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Sin cambios"
 
@@ -4279,7 +4354,7 @@ msgstr "Este formato no tiene opciones"
 msgid "The web server does not have permission to save the file %s."
 msgstr "El servidor web no tiene permiso para guardar el archivo %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "¡Usted no tiene suficientes privilegios para estar aquí ahora!"
 
@@ -4316,7 +4391,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "La tabla <b>%s</b> no fue hallada o no fue definida en %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Usuario(s) no encontrado(s)."
 
@@ -4363,7 +4439,7 @@ msgstr "Mantenimiento de la partición"
 msgid "Partition %s"
 msgstr "Partición %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "La contraseña para %s se cambió exitosamente."
@@ -4465,11 +4541,11 @@ msgstr "Polaco"
 msgid "Port"
 msgstr "Ordenar"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "El nombre de la clave primaria debe ser \\\"PRIMARY\\\""
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4680,7 +4756,7 @@ msgstr "Permite cambiar los datos."
 msgid "No privileges."
 msgstr "Sin privilegios."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Los privilegios fueron cargados nuevamente de manera exitosa."
 
@@ -4723,11 +4799,6 @@ msgstr ""
 "<b>Estadísticas de consulta</b>: Desde su inicio, %s consultas han sido "
 "enviadas al servidor."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "La consulta tardó %01.4f seg"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Tipo de consulta"
@@ -4756,15 +4827,6 @@ msgstr "Comprobar la integridad referencial:"
 msgid "Relational schema"
 msgstr "Esquema relacionado"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Las opciones adicionales para trabajar con tablas vinculadas fueron "
-"desactivadas. Para saber porqué, dé clic %saquí%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relaciones"
@@ -4805,11 +4867,6 @@ msgstr "Remueva la partición"
 msgid "Remove selected users"
 msgstr "Eliminar a los usuarios seleccionados"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "La base de datos %s ha sido cambiada de nombre a %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4918,7 +4975,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -5061,7 +5118,7 @@ msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 "Revocar todos los privilegios activos de los usuarios y borrarlos después."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Ha revocado los privilegios para %s"
@@ -5227,19 +5284,11 @@ msgstr "Mostrar las consultas enteras"
 msgid "Show/Hide left menu"
 msgstr "Ocultar/mostrar menú izquierdo"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Mostrando el favorito"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Mostrar como código PHP"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Mostrando registros "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Mostrando la consulta SQL"
 
@@ -6147,7 +6196,7 @@ msgstr "¡La tabla %s ya existe!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Los cambios en la Tabla %1$s se hicieron exitosamente"
@@ -6166,7 +6215,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "¡El nombre de la tabla está vacío!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "La Tabla %1$s se creó."
@@ -6290,7 +6339,7 @@ msgstr "Este Host"
 msgid "Threads"
 msgstr "Procesos"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "El proceso %s fue destruido exitosamente."
@@ -6304,14 +6353,6 @@ msgstr ""
 "usualmente significa que phpMyAdmin no será capaz de completar esta "
 "importación a menos que usted incremente el tiempo de ejecución de php."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Se ha agotado el tiempo de ejecución del script; si desea completar la "
-"importación, por favor, reenvíe el mismo archivo y la importación continuará."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "página de/a la"
@@ -6328,10 +6369,6 @@ msgstr "Alterne entre pequeño y grande"
 msgid "To select relation, click :"
 msgstr "Para seleccionar la relación, dé clic en:"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "total"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6647,7 +6684,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "desconocido"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Ha actualizado los privilegios para %s."
@@ -6668,19 +6705,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Usted debería actualizar su %s a la versión %s o más reciente."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Usted probablemente intentó cargar un archivo demasiado grande.  Por favor, "
-"refiérase a %sdocumentation%s para hallar modos de superar esta limitante."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "No está permitido subir archivos a este servidor."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Uso"
@@ -6694,7 +6718,7 @@ msgstr "Usar \"backquotes\" con tablas y nombres de campo"
 msgid "Use Host Table"
 msgstr "Usar la tabla Anfitrión (Host)"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "¡El usuario %s ya existe!"
@@ -6707,7 +6731,7 @@ msgstr "¡El usuario %s ya existe!"
 msgid "User name"
 msgstr "Nombre de usuario"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "El usuario que seleccionó no se halló en la tabla de privilegios."
 
@@ -6715,7 +6739,7 @@ msgstr "El usuario que seleccionó no se halló en la tabla de privilegios."
 msgid "User overview"
 msgstr "Vista global de usuarios"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Los usuarios seleccionados fueron borrados exitosamente."
 
@@ -6778,11 +6802,6 @@ msgstr "Mostrar el volcado esquema de la tabla"
 msgid "VIEW name"
 msgstr "(VIEW) VER nombre"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr ""
-"No está disponible el directorio que usted habilitó para subir las tareas"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Servidor web"
@@ -6800,11 +6819,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "comodín"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr ""
-"El nombre de usuario o la contraseña es incorrecto. El acceso fue denegado."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/et.po b/po/et.po
index 247022f6b..bf5a6cc04 100644
--- a/po/et.po
+++ b/po/et.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:14+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: estonian <et@li.org>\n"
@@ -89,6 +89,11 @@ msgstr "Kirjeldus"
 msgid "Use this value"
 msgstr "Kasuta seda väärtust"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "Andmebaas %s kustutatud."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Andmebaasi kommentaar: "
@@ -205,6 +210,20 @@ msgstr "Märgista kõik"
 msgid "Unselect All"
 msgstr "Puhasta kõik"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Andmebaasi nimi on tühi!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Andmebaas %s on ümber nimetatud %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Andmebaas %s on kopeeritud %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Nimeta andmebaas ümber"
@@ -316,6 +335,15 @@ msgstr "Lubatud"
 msgid "Collation"
 msgstr "Määrang"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Lisavõimalused töötamiseks lingitud tabelitega on deaktiveeritud. Et lugeda "
+"miks see nii on, vajutage %ssiia%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Näita PDF skeemi"
@@ -643,7 +671,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -819,16 +848,73 @@ msgstr "Kontrolli tabelit"
 msgid "Database Log"
 msgstr "Andmebaas"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Te kindlasti proovisite laadida liiga suurt faili. Palun uuri "
+"dokumentatsiooni %sdocumentation%s selle limiidi seadmiseks."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Faili ei suudetud lugeda"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Proovisid laadida faili tundmatu pakkimisega (%s). Võimalik et toetus ei ole "
+"veel lisatud või on sinu seadetes keelatud."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Andmeid ei saadud importimisel. Võimalik et faili nime ei saadetud, või "
+"faili suurus ületab maksimaalset suurust lubatud PHP seadetes. Vaata FAQ "
+"1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "Pole võimalik Importida mooduleid (plugins), palun kontrolli seadeid!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Järjehodja kustutati."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Näitan järjehoidjat"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Järjehoidja %s loodud"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Import lõppetati edukalt, %d päringut käivitatud."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Skripti ajalimiit on ületatud, kui soovid importimist jätkata, palun lae "
+"sama fail uuesti ja import jätkub."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin on sõbralikum <b>frame toetava</b> browseriga."
@@ -845,7 +931,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" käsud keelatud."
 
@@ -885,10 +972,12 @@ msgid "The user name is empty!"
 msgstr "Kasutajanimi on tühi!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Parool on tühi!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Paroolid ei ühti!"
 
@@ -1310,7 +1399,8 @@ msgstr "Parool:"
 msgid "Server Choice"
 msgstr "Serveri valik"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Küpsised(cookies) peavad alates sellest momendist lubatud olema."
 
@@ -1332,6 +1422,10 @@ msgstr "Ebaaktiivne %s sekundit või rohkem, palun sisenege uuesti"
 msgid "Cannot log in to the MySQL server"
 msgstr "Ei suuda MySQL serverisse logida"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Vale kasutajanimi/parool. Ligipääs keelatud."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1462,11 +1556,12 @@ msgstr "Saadetud"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentatsioon"
 
@@ -1530,7 +1625,7 @@ msgid "Skip Validate SQL"
 msgstr "Jäta SQL-i kontroll vahele"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Kontrolli SQL-i"
 
@@ -1585,7 +1680,8 @@ msgstr "See %s funktionaalsus on mõjutatud tuntud viga, vaata %s"
 msgid "Font size"
 msgstr "Fondi suurus"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1748,6 +1844,7 @@ msgid "Create"
 msgstr "Loo"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Ei oma ühtegi privileegi"
 
@@ -1764,6 +1861,10 @@ msgstr "Loo uus tabel andmebaasi %s"
 msgid "Number of fields"
 msgstr "Väljade arv"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr "Viga eksportimis moodulite laadimisel, palun kontrolli seadeid!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1792,6 +1893,29 @@ msgstr "Kirjuta olemasolev(ad) fail(id) üle"
 msgid "File name template"
 msgstr "Faili nime template"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "serveri nimi"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "andmebaasi nimi"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "tabeli nimi"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Seda väärtust on tõlgendatud kasutades %1$sstrftime%2$s, sa võid kasutada "
+"sama aja(time) formaati. Lisaks tulevad ka järgnevad muudatused: %3$s. "
+"Ülejäänud teks jääb nii nagu ta on."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "jäta template meelde"
@@ -1863,6 +1987,15 @@ msgstr "Imporditav Fail"
 msgid "Location of the text file"
 msgstr "tekstifaili asukoht"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Faile pole lubatud laadida sellesse serverisse."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Kataloog mille Te üleslaadimiseks sättisite ei ole ligipääsetav"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2011,6 +2144,20 @@ msgstr "Tapa"
 msgid "in query"
 msgstr "päringus"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Näita ridu"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "kokku"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Päring kestis %01.4f sek"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2468,11 +2615,6 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Faili ei suudetud lugeda"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 #, fuzzy
 msgid ""
@@ -2480,17 +2622,6 @@ msgid ""
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Võib olla umbkaudne. Vaadake FAQ 3.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Proovisid laadida faili tundmatu pakkimisega (%s). Võimalik et toetus ei ole "
-"veel lisatud või on sinu seadetes keelatud."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2517,7 +2648,7 @@ msgstr "Genereerija "
 msgid "Rows"
 msgstr "Ridu"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL tagastas tühja tulemuse (s.t. null rida)."
@@ -2564,6 +2695,11 @@ msgstr "Struktuur"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Indeksit pole defineeritud!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2601,6 +2737,13 @@ msgstr "Primaarne võti kustutatud"
 msgid "Index %s has been dropped"
 msgstr "Indeks %s kustutatud"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2733,7 +2876,7 @@ msgstr "Lisa indeksisse &nbsp;%s&nbsp;rida/read"
 msgid "Add a new User"
 msgstr "Lisa uus kasutaja"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Te lisasite uue kasutaja."
 
@@ -2926,10 +3069,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "Anna kõikidele kasutajatele juurdepääs sellele järjehodjale"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Järjehodja kustutati."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Nimetus"
@@ -2972,15 +3111,7 @@ msgstr "\"bzipitud\""
 msgid "Calendar"
 msgstr "Kalender"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr "Viga eksportimis moodulite laadimisel, palun kontrolli seadeid!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "Pole võimalik Importida mooduleid (plugins), palun kontrolli seadeid!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Ei suuda muuta indeksit PRIMAARSEKS!"
 
@@ -3100,11 +3231,6 @@ msgstr "Palun seadke koordinaadid tabelile %s"
 msgid "Connections"
 msgstr "Ühendused"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Andmebaas %s on kopeeritud %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Kopeeri tabel (andmebaas<b>.</b>tabel):"
@@ -3126,7 +3252,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3226,26 +3352,17 @@ msgstr "Tsehhi-Slovaki"
 msgid "Danish"
 msgstr "Taani"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Andmebaasi nimi on tühi!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Andmebaasi eksportimise seaded"
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "Andmebaas %s kustutatud."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "andmebaasid %s kustutati õnnestunult."
@@ -3270,7 +3387,7 @@ msgstr "Keelake statistika"
 msgid "Enable Statistics"
 msgstr "Lubage statistika"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3320,7 +3437,7 @@ msgstr "Defrgamenteeri tabel"
 msgid "Use delayed inserts"
 msgstr "Kasuta ajastatud lisamisi"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Ühtegi kasutajat pole valitud kustutamiseks!"
 
@@ -3533,35 +3650,12 @@ msgstr ""
 "Fail %s on juba serveris olemas, muutke faili nime või kontrollige "
 "ülekirjutamise seadeid."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "andmebaasi nimi"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "serveri nimi"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "tabeli nimi"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Seda väärtust on tõlgendatud kasutades %1$sstrftime%2$s, sa võid kasutada "
-"sama aja(time) formaati. Lisaks tulevad ka järgnevad muudatused: %3$s. "
-"Ülejäänud teks jääb nii nagu ta on."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "Väljade arv"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3586,7 +3680,7 @@ msgstr "Ühtlusta tabelid (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Tühjenda (sulge) kõik tabelid"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3770,13 +3864,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3813,7 +3900,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Lisa uue reana"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4134,20 +4221,10 @@ msgstr "Näita protsesse"
 msgid "No databases"
 msgstr "Pole andmebaase"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Ühtegi andmebaasi ei ole valitud."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Andmeid ei saadud importimisel. Võimalik et faili nime ei saadetud, või "
-"faili suurus ületab maksimaalset suurust lubatud PHP seadetes. Vaata FAQ "
-"1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "pole kirjeldust"
@@ -4161,15 +4238,11 @@ msgstr "Detailne seisuinformatsioon antud varundusmootori kohta puudub."
 msgid "No files found inside ZIP archive!"
 msgstr "Ei leidnud ühtegi faili ZIP arhiivist!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Indeksit pole defineeritud!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Indeksi osad pole defineeritud!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Ei muudetud"
 
@@ -4188,7 +4261,7 @@ msgstr "Sellel formaadil pole seadeid"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Webiserver ei oma õigusi , et salvestada fail %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Teil pole piisavalt õigusi, et hetkel siin olla!"
 
@@ -4225,7 +4298,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> tabelit ei leitud või ei eksisteeri %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Ei leitud ühtegi kasutajat."
 
@@ -4273,7 +4347,7 @@ msgstr "Tabeli hooldus"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Kasutaja %s parool vahetati õnnestunult."
@@ -4376,11 +4450,11 @@ msgstr "Poola"
 msgid "Port"
 msgstr "Sorteeri"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Primaarse võtme nimi peab olema... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4582,7 +4656,7 @@ msgstr "Lubab muuta infot."
 msgid "No privileges."
 msgstr "Mitte ühtegi privileegi."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Privileegid taaslaeti edukalt."
 
@@ -4625,11 +4699,6 @@ msgstr ""
 "<b>Päringu statistika</b>: Alates stardist, %s päringut on saadetud "
 "serverile."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Päring kestis %01.4f sek"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Päringu tüüp"
@@ -4658,15 +4727,6 @@ msgstr "Kontrolli pärinevust:"
 msgid "Relational schema"
 msgstr "Seoseskeem"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Lisavõimalused töötamiseks lingitud tabelitega on deaktiveeritud. Et lugeda "
-"miks see nii on, vajutage %ssiia%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Suhted"
@@ -4705,11 +4765,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "Eemalda valitud kasutajad"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Andmebaas %s on ümber nimetatud %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4816,7 +4871,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4957,7 +5012,7 @@ msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 "Eemalda kõik aktiivsed privileegid kasutajatelt ning kustuta nad pärast seda."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Te võtsite tagasi privileegid %s-lt"
@@ -5116,19 +5171,11 @@ msgstr "Näita täispikkasid päringuid"
 msgid "Show/Hide left menu"
 msgstr "Näita/Peida vasak menüü"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Näitan järjehoidjat"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Näitan PHP koodina"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Näita ridu"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Näitan SQL päringut"
 
@@ -5996,7 +6043,7 @@ msgstr "tabel %s on juba olemas!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, fuzzy, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Valitud kasutajad on õnnestunult kustutatud."
@@ -6015,7 +6062,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Tabeli nimi on tühi!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "Tabel %s kustutatud"
@@ -6136,7 +6183,7 @@ msgstr "Antud host"
 msgid "Threads"
 msgstr "Lõimud"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Protsess %s katkestati edukalt."
@@ -6150,14 +6197,6 @@ msgstr ""
 "phpMyAdmin pole võimeline Importi lõpetama, kui sa php skripti aega ei "
 "pikenda."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Skripti ajalimiit on ületatud, kui soovid importimist jätkata, palun lae "
-"sama fail uuesti ja import jätkub."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "Kuhu/Kust leht"
@@ -6174,10 +6213,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr "Et valida suhe, kliki :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "kokku"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6488,7 +6523,7 @@ msgstr "Unikaalne"
 msgid "unknown"
 msgstr "tundmatu"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Te uuendasite privileege %s-l."
@@ -6507,19 +6542,6 @@ msgstr "Please see Documentation on how to update your Column_comments Table"
 msgid "You should upgrade to %s %s or later."
 msgstr "Te peaksite uuendama %s -i versioonini %s või uuemaks."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Te kindlasti proovisite laadida liiga suurt faili. Palun uuri "
-"dokumentatsiooni %sdocumentation%s selle limiidi seadmiseks."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Faile pole lubatud laadida sellesse serverisse."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Kasutus"
@@ -6533,7 +6555,7 @@ msgstr "Kasutage tagurpidi kaldkriipse tabelites või tabelinimedes"
 msgid "Use Host Table"
 msgstr "Kasuta host tabelit"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Kasutaja %s on juba olemas!"
@@ -6546,7 +6568,7 @@ msgstr "Kasutaja %s on juba olemas!"
 msgid "User name"
 msgstr "Kasutajanimi"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Valitud kasutajat ei leitud privileegide tabelist."
 
@@ -6554,7 +6576,7 @@ msgstr "Valitud kasutajat ei leitud privileegide tabelist."
 msgid "User overview"
 msgstr "Kasutaja ülevaade"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Valitud kasutajad on õnnestunult kustutatud."
 
@@ -6617,10 +6639,6 @@ msgstr "Vaata tabeli väljundit (skeemi)"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Kataloog mille Te üleslaadimiseks sättisite ei ole ligipääsetav"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6638,10 +6656,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "metamärk"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Vale kasutajanimi/parool. Ligipääs keelatud."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/eu.po b/po/eu.po
index cd86a53ac..1322136f0 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-31 10:40+0200\n"
 "Last-Translator:  <hey_neken@mundurat.net>\n"
 "Language-Team: basque <eu@li.org>\n"
@@ -91,6 +91,11 @@ msgstr "Deskribapena"
 msgid "Use this value"
 msgstr "Erabili balio hau"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "%s datu-basea ezabatua izan da."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Datu-basearen iruzkina: "
@@ -207,6 +212,21 @@ msgstr "Dena hautatu"
 msgid "Unselect All"
 msgstr "Desautatu dena"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+#, fuzzy
+msgid "The database name is empty!"
+msgstr "Taularen izena hutsik dago!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, fuzzy, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "%s taula %s-(e)ra berrizendatua izan da"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, fuzzy, php-format
+msgid "Database %s has been copied to %s"
+msgstr "%s taula hona kopiatua izan da: %s."
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 #, fuzzy
 msgid "Rename database to"
@@ -321,6 +341,15 @@ msgstr "Gaituta"
 msgid "Collation"
 msgstr "Ordenamendua"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Estekatutako taulekin lan egiteko hobespen gehigarriak ezgaitu dira . "
+"Zergatia jakiteko egizu klik %shemen%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "PDF eskema erakutsi"
@@ -648,7 +677,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -822,16 +852,64 @@ msgstr "Taula egiaztatu"
 msgid "Database Log"
 msgstr "Datu-basea"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Ezinezkoa fitxategia irakurtzea"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Gordetako kontsulta ezabatu da."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -850,7 +928,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" sententziak ezgaituta daude."
 
@@ -890,10 +969,12 @@ msgid "The user name is empty!"
 msgstr "Erabiltzailearen izena hutsik dago!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Pasahitza hutsik dago!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Pasahitzek ez dute bat egiten!"
 
@@ -1316,7 +1397,8 @@ msgstr "Pasahitza:"
 msgid "Server Choice"
 msgstr "Zerbitzariaren hautaketa"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Puntu honetarako cookie-ek gaituta egon behar dute."
 
@@ -1338,6 +1420,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Ezinezkoa MySql zerbitzarian saioa hastea"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Erabiltzaile-izena/pasahitza okerra. Atzipena ukatuta."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1465,11 +1551,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentazioa"
 
@@ -1533,7 +1620,7 @@ msgid "Skip Validate SQL"
 msgstr "SQL-ren balidapena saltatu"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "SQL balidatu"
 
@@ -1586,7 +1673,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1749,6 +1837,7 @@ msgid "Create"
 msgstr "Sortu"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Pribilegiorik gabe"
 
@@ -1765,6 +1854,10 @@ msgstr "Taula berri bat sortu %s datu-basean"
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1793,6 +1886,27 @@ msgstr "Gainean idatzi aurretik badiren fitxategiak"
 msgid "File name template"
 msgstr "Txantiloi-fitxategiaren izena"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+#, fuzzy
+msgid "server name"
+msgstr "Erabiltzaile-izena"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr ""
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "txantiloia gogoratu"
@@ -1864,6 +1978,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr "Testu-fitxategiaren kokapena"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Igoerentzat ezarri duzun direktorioa ez dago eskuragarri"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2009,6 +2132,20 @@ msgstr "Hil"
 msgid "in query"
 msgstr "kontsultan"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Errenkadak erakusten"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "guztira"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Kontsulta exekutatzeko denbora %01.4f seg"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2452,26 +2589,12 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Ezinezkoa fitxategia irakurtzea"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2498,7 +2621,7 @@ msgstr "Egilea:"
 msgid "Rows"
 msgstr "Errenkadak"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL-k emaitza hutsa itzuli du. (i.e. zero errenkada)."
@@ -2544,6 +2667,11 @@ msgstr "Egitura"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Ez dago indizerik definituta!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2581,6 +2709,13 @@ msgstr "Lehen mailako gakoa ezabatu da"
 msgid "Index %s has been dropped"
 msgstr "%s indizea ezabatu da"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2710,7 +2845,7 @@ msgstr "&nbsp;%s&nbsp; zutabe indizean gehituta"
 msgid "Add a new User"
 msgstr "Erabiltzaile berria gehitu"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Erabiltzaile berria gehitu duzu."
 
@@ -2906,10 +3041,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "Gogokoen erregistro hau edozein erabiltzailearentzat erabilgarri "
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Gordetako kontsulta ezabatu da."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Etiketa"
@@ -2952,15 +3083,7 @@ msgstr "\"Bzip-ez trinkotua\""
 msgid "Calendar"
 msgstr ""
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Ezinezkoa indizearen izena ¡PRIMARY! berrizendatzea"
 
@@ -3081,11 +3204,6 @@ msgstr "Mesedez, %s taularentzako koordinatuak konfiguratu"
 msgid "Connections"
 msgstr "Konexioak"
 
-#: libraries/messages.inc.php:186
-#, fuzzy, php-format
-msgid "Database %s has been copied to %s"
-msgstr "%s taula hona kopiatua izan da: %s."
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Taula hona kopiatu: (datu-base<b>.</b>taula):"
@@ -3107,7 +3225,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3208,27 +3326,17 @@ msgstr ""
 msgid "Danish"
 msgstr "Danesa"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-#, fuzzy
-msgid "The database name is empty!"
-msgstr "Taularen izena hutsik dago!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Datu-basea esportatzeko aukerak"
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "%s datu-basea ezabatua izan da."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s datu-base arrakastaz ezabatu dira."
@@ -3253,7 +3361,7 @@ msgstr "Estatistikak ezgaitu"
 msgid "Enable Statistics"
 msgstr "Estatistikak gaitu"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3301,7 +3409,7 @@ msgstr ""
 msgid "Use delayed inserts"
 msgstr "Use delayed inserts"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3514,33 +3622,12 @@ msgstr ""
 "%s fitxategia aurretik bazegoen zerbitzarian, izena aldatu edo aukeratu "
 "gainean idazteko hobespena."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr ""
-
-#: libraries/messages.inc.php:335
-#, fuzzy
-msgid "server name"
-msgstr "Erabiltzaile-izena"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "Eremuak"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3566,7 +3653,7 @@ msgstr "Taularen cachea hustu (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3752,13 +3839,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3795,7 +3875,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Txertatu errenkada berri batean"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4112,17 +4192,10 @@ msgstr "Erakutsi prozesuak"
 msgid "No databases"
 msgstr "Datu-baserik ez"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Ez dago datu-baserik aukeratuta."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "Deskribapenik ez"
@@ -4136,15 +4209,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Ez dago indizerik definituta!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Ez da indiziaren zatiak definitu!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Aldaketarik ez"
 
@@ -4163,7 +4232,7 @@ msgstr "Formato honek ez du aukerarik"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Web-zerbitzariak dio %s fitxategia gordetzeko baimenik ez duzula."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Ez daukazu baimen nahikorik hemen orain egoteko!"
 
@@ -4198,7 +4267,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> taula ez da aurkitu edo ez da definitu hemen: %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Ez da erabiltzailerik aurkitu."
 
@@ -4247,7 +4317,7 @@ msgstr "Taularen mantenua"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "%s-arentzako pasahitza arrakastaz aldatua izan da."
@@ -4350,11 +4420,11 @@ msgstr ""
 msgid "Port"
 msgstr "Ordenatu"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Lehen mailako gakoaren izenak behar du izan... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4569,7 +4639,7 @@ msgstr "Datuak aldatzea baimentzen du."
 msgid "No privileges."
 msgstr "Pribilegiorik ez."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Pribilegioak arrakastaz berkargatu dira."
 
@@ -4613,11 +4683,6 @@ msgstr ""
 "<b>Kontsultaren estatistikak</b>: Bere hasieratik, %s kontsulta zerbitzarira "
 "bidali dira."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Kontsulta exekutatzeko denbora %01.4f seg"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Kontsulta mota"
@@ -4646,15 +4711,6 @@ msgstr "Erreferentzien integritatea egiaztatu:"
 msgid "Relational schema"
 msgstr "Erlazio-eskema"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Estekatutako taulekin lan egiteko hobespen gehigarriak ezgaitu dira . "
-"Zergatia jakiteko egizu klik %shemen%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Erlazioak"
@@ -4693,11 +4749,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "Hautatutako erabiltzaileak baztertu"
 
-#: libraries/messages.inc.php:761
-#, fuzzy, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "%s taula %s-(e)ra berrizendatua izan da"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4804,7 +4855,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4941,7 +4992,7 @@ msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 "Erabiltzaileen pribilegio aktibo guztiak ezeztatu eta ondoren denak ezabatu."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Zuk %s-(r)en pribilegioak ezeztatu dituzu"
@@ -5107,19 +5158,11 @@ msgstr "Kontsulta osoak erakutsi"
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Errenkadak erakusten"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5885,7 +5928,7 @@ msgstr "%s erabiltzailea badago lehendik ere!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, fuzzy, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Hautatutako erabiltzaileak arrakastaz ezabatu dira."
@@ -5904,7 +5947,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Taularen izena hutsik dago!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "%s taula ezabatu egin da"
@@ -6025,7 +6068,7 @@ msgstr "Host hau"
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "%s haria arrakastaz ezabatu da."
@@ -6036,12 +6079,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6058,10 +6095,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "guztira"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6362,7 +6395,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "ezezaguna"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "%s-aren pribilegioak eguneratu dituzu."
@@ -6383,17 +6416,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "%s %s bertsiora edo handiago batera eguneratu beharko zenuke."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Erabilpena"
@@ -6407,7 +6429,7 @@ msgstr "\"Backquotes\" erabili taula eta eremuen izenekin "
 msgid "Use Host Table"
 msgstr "Host taula erabili"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "%s erabiltzailea badago lehendik ere!"
@@ -6420,7 +6442,7 @@ msgstr "%s erabiltzailea badago lehendik ere!"
 msgid "User name"
 msgstr "Erabiltzaile-izena"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Hautatutako erabiltzailea ez da pribilegioen taulan aurkitu."
 
@@ -6428,7 +6450,7 @@ msgstr "Hautatutako erabiltzailea ez da pribilegioen taulan aurkitu."
 msgid "User overview"
 msgstr "Erabiltzailearen info orokorra"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Hautatutako erabiltzaileak arrakastaz ezabatu dira."
 
@@ -6490,10 +6512,6 @@ msgstr "Ikusi taularen iraulketa (eskema)"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Igoerentzat ezarri duzun direktorioa ez dago eskuragarri"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6511,10 +6529,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "komodina"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Erabiltzaile-izena/pasahitza okerra. Atzipena ukatuta."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/fa.po b/po/fa.po
index 3ba2ee456..d94872313 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:17+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: persian <fa@li.org>\n"
@@ -86,6 +86,11 @@ msgstr "توضیحات"
 msgid "Use this value"
 msgstr ""
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "پايگاه داده %s حذف گرديد."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 #, fuzzy
 msgid "Database comment: "
@@ -203,6 +208,21 @@ msgstr "انتخاب همه"
 msgid "Unselect All"
 msgstr "عدم انتخاب همه"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+#, fuzzy
+msgid "The database name is empty!"
+msgstr "نام جدول وارد نشده‌است !"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, fuzzy, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "جدول %s به %s تغيير نام داده‌شد"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, fuzzy, php-format
+msgid "Database %s has been copied to %s"
+msgstr "جدول %s به %s كپي شد."
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 #, fuzzy
 msgid "Rename database to"
@@ -316,6 +336,15 @@ msgstr "فعال"
 msgid "Collation"
 msgstr ""
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"امكانات اضافي براي كاركردن با جدولهاي پيوندي غيرفعال شده‌است . براي پيداكردن "
+"دليل آن %sاينجا%s را بزنيد ."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "نمايش الگوي PDF"
@@ -645,7 +674,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -818,16 +848,65 @@ msgstr "بررسي جدول"
 msgid "Database Log"
 msgstr "پايگاه داده"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr ""
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+#, fuzzy
+msgid "The bookmark has been deleted."
+msgstr "سطر حذف گرديد ."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -844,7 +923,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "دستور \"DROP DATABASE\" غيرفعال مي‌باشد."
 
@@ -884,10 +964,12 @@ msgid "The user name is empty!"
 msgstr "نام كاربر خالي است!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "اسم رمز خالي است!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "اسم رمزها مانند هم نمي‌باشد!"
 
@@ -1305,7 +1387,8 @@ msgstr "اسم رمز:"
 msgid "Server Choice"
 msgstr ""
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr ""
 
@@ -1327,6 +1410,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr ""
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "نام كاربر/اسم رمز اشتباه است. دسترسي مجاز نيست."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1449,11 +1536,12 @@ msgstr ""
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "مستندات"
 
@@ -1519,7 +1607,7 @@ msgid "Skip Validate SQL"
 msgstr "معتبرسازي SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "معتبرسازي SQL"
 
@@ -1574,7 +1662,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1735,6 +1824,7 @@ msgid "Create"
 msgstr "ساختن"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 #, fuzzy
 msgid "No Privileges"
 msgstr "امتيازات"
@@ -1752,6 +1842,10 @@ msgstr "ساخت جدول جديد در پايگاه داده %s"
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1780,6 +1874,27 @@ msgstr ""
 msgid "File name template"
 msgstr ""
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+#, fuzzy
+msgid "server name"
+msgstr "نام كاربر"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr ""
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr ""
@@ -1851,6 +1966,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr "محل پرونده متني"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "پوشه‌اي را كه براي انتقال فايل انتخاب كرده‌ايد قابل دسترسي نيست."
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1995,6 +2119,20 @@ msgstr "Kill"
 msgid "in query"
 msgstr "in query"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Showing rows"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "جمع كل"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr ""
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2436,26 +2574,12 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr ""
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2482,7 +2606,7 @@ msgstr "توليد‌شده توسط"
 msgid "Rows"
 msgstr "سطرها"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL يك نتيجه خالي داد. (مثلا 0 سطر)."
@@ -2528,6 +2652,11 @@ msgstr "ساختار"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "هيچ فهرستي تعريف‌نشده‌است!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2565,6 +2694,13 @@ msgstr "كليد اصلي حذف گرديد"
 msgid "Index %s has been dropped"
 msgstr "فهرست %s حذف گرديد"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2695,7 +2831,7 @@ msgstr "ساخت يك فهرست در&nbsp;%s&nbsp;ستون"
 msgid "Add a new User"
 msgstr "افزودن يك كاربر جديد"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "شما يك كاربر جديد اضافه كرديد."
 
@@ -2890,11 +3026,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr ""
 
-#: libraries/messages.inc.php:110
-#, fuzzy
-msgid "The bookmark has been deleted."
-msgstr "سطر حذف گرديد ."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr ""
@@ -2937,15 +3068,7 @@ msgstr "\"bzipped\""
 msgid "Calendar"
 msgstr "تقویم"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "بازناميدن فهرست به PRIMARY مقدور نمي‌باشد!"
 
@@ -3064,11 +3187,6 @@ msgstr "لطفا مختصات جدول %s را تنظيم كنيد"
 msgid "Connections"
 msgstr ""
 
-#: libraries/messages.inc.php:186
-#, fuzzy, php-format
-msgid "Database %s has been copied to %s"
-msgstr "جدول %s به %s كپي شد."
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "كپي كردن جدول به (پايگاه داده<b>.</b>جدول):"
@@ -3090,7 +3208,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3189,27 +3307,17 @@ msgstr ""
 msgid "Danish"
 msgstr "دانمارکی"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-#, fuzzy
-msgid "The database name is empty!"
-msgstr "نام جدول وارد نشده‌است !"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr ""
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "پايگاه داده %s حذف گرديد."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr ""
@@ -3236,7 +3344,7 @@ msgstr "آمار پايگاههاي داده"
 msgid "Enable Statistics"
 msgstr "آمار پايگاههاي داده"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3280,7 +3388,7 @@ msgstr ""
 msgid "Use delayed inserts"
 msgstr ""
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3488,33 +3596,12 @@ msgid ""
 "File %s already exists on server, change filename or check overwrite option."
 msgstr ""
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr ""
-
-#: libraries/messages.inc.php:335
-#, fuzzy
-msgid "server name"
-msgstr "نام كاربر"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "ستونها"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3535,7 +3622,7 @@ msgstr "Flush the table (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3721,13 +3808,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3763,7 +3843,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "درج به عنوان يك سطر جديد"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4078,17 +4158,10 @@ msgstr "نمايش فرايندها"
 msgid "No databases"
 msgstr "No databases"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr ""
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "no Description"
@@ -4102,16 +4175,12 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "هيچ فهرستي تعريف‌نشده‌است!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 #, fuzzy
 msgid "No index parts defined!"
 msgstr "هيچ فهرستي تعريف‌نشده‌است!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr ""
 
@@ -4130,7 +4199,7 @@ msgstr ""
 msgid "The web server does not have permission to save the file %s."
 msgstr ""
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr ""
 
@@ -4165,7 +4234,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "جدول <b>%s</b> وجود ندارد و يا در %s تنظيم نشده‌است"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "هيچ كاربري وچود ندارد."
 
@@ -4214,7 +4284,7 @@ msgstr "نگهداشت جدول"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr ""
@@ -4317,11 +4387,11 @@ msgstr "لهستانی"
 msgid "Port"
 msgstr "ترتيب"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "نام كليد اصلي بايد PRIMARY باشد !"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(<b>فقط و فقط بايد</b> \"PRIMARY\" نام يك كليد اصلي باشد!)"
@@ -4515,7 +4585,7 @@ msgstr ""
 msgid "No privileges."
 msgstr "امتيازات"
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
@@ -4556,11 +4626,6 @@ msgid ""
 "server."
 msgstr ""
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr ""
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr ""
@@ -4589,15 +4654,6 @@ msgstr ""
 msgid "Relational schema"
 msgstr ""
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"امكانات اضافي براي كاركردن با جدولهاي پيوندي غيرفعال شده‌است . براي پيداكردن "
-"دليل آن %sاينجا%s را بزنيد ."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 #, fuzzy
 msgid "Relations"
@@ -4637,11 +4693,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr ""
 
-#: libraries/messages.inc.php:761
-#, fuzzy, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "جدول %s به %s تغيير نام داده‌شد"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4748,7 +4799,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4884,7 +4935,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "شما امتيازات %s را ابطال كرديد"
@@ -5047,19 +5098,11 @@ msgstr ""
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Showing rows"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5812,7 +5855,7 @@ msgstr ""
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr ""
@@ -5831,7 +5874,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "نام جدول وارد نشده‌است !"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "جدول %s حذف گرديد"
@@ -5953,7 +5996,7 @@ msgstr ""
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr ""
@@ -5964,12 +6007,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -5986,10 +6023,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "جمع كل"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6264,7 +6297,7 @@ msgstr ""
 msgid "unknown"
 msgstr "ناشناس"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "امتيازات %s به هنگام گرديد."
@@ -6283,17 +6316,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr ""
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "استفاده"
@@ -6307,7 +6329,7 @@ msgstr "قراردادن نام جدولها و ستونها بين علامت 
 msgid "Use Host Table"
 msgstr ""
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
@@ -6320,7 +6342,7 @@ msgstr ""
 msgid "User name"
 msgstr "نام كاربر"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
@@ -6328,7 +6350,7 @@ msgstr ""
 msgid "User overview"
 msgstr ""
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr ""
 
@@ -6388,10 +6410,6 @@ msgstr "نمايش الگوي جدول"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "پوشه‌اي را كه براي انتقال فايل انتخاب كرده‌ايد قابل دسترسي نيست."
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6409,10 +6427,6 @@ msgstr ""
 msgid "wildcard"
 msgstr ""
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "نام كاربر/اسم رمز اشتباه است. دسترسي مجاز نيست."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/fi.po b/po/fi.po
index f3ba90ef3..acdd6b7a7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-04-30 18:08+0200\n"
 "Last-Translator:  <kajouni@gmail.com>\n"
 "Language-Team: finnish <fi@li.org>\n"
@@ -91,6 +91,11 @@ msgstr "Kuvaus"
 msgid "Use this value"
 msgstr "Käytä tätä arvoa"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Tietokanta %1$s on luotu."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Tietokannan kommentti: "
@@ -207,6 +212,20 @@ msgstr "Valitse kaikki"
 msgid "Unselect All"
 msgstr "Poista valinta kaikista"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Tietokannan nimi on tyhjä!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Tietokannan %s nimi on nyt %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Tietokanta %s on kopioitu tietokantaan %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Muuta tietokannan nimi"
@@ -317,6 +336,15 @@ msgstr "Ota käyttöön"
 msgid "Collation"
 msgstr "Aakkosjärjestys"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Linkitettyihin tauluihin liittyvät lisäominaisuudet eivät ole käytössä. "
+"Katso %slisätietoja%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Näytä PDF-kaavio"
@@ -644,7 +672,8 @@ msgstr "Seuranta on käytössä."
 msgid "Tracking is not active."
 msgstr "Seuranta ei ole käytössä."
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -814,16 +843,73 @@ msgstr "Seuraa taulua"
 msgid "Database Log"
 msgstr "Tietokantaloki"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Yritit todennäköisesti lähettää palvelimelle liian suurta tiedostoa. Katso "
+"tämän rajoituksen muuttamisesta lisätietoja %sohjeista%s."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Tiedostoa ei voi lukea"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Yritit ladata tiedostoa, joka käyttää tuntematonta pakkausmuotoa (%s). Tukea "
+"kyseiselle muodolle ei joko ole toteutettu, tai se on asetuksin poistettu "
+"käytöstä."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Tuotavia tietoja ei ole. Tiedostonimeä ei joko annettu tai tiedoston koko "
+"ylitti PHP:n asetusten salliman enimmäiskoon. Katso FAQ 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "Tuontiin tarvittavaa lisäosaa ei voida tuoda, tarkista asetukset!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Kirjanmerkki on poistettu."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Näytetään kirjanmerkki"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Kirjanmerkki %s luotu"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Tuonti onnistui, %d kyselyä suoritettu."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Skriptin suoritus aikakatkaistiin. Jos haluat suorittaa tuonnin loppuun, "
+"lähetä sama tiedosto uudestaan, ja tuonti jatkuu."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "PhpMyAdmin toimii parhaiten <b>kehyksiä</b> tukevalla selaimella."
@@ -840,7 +926,8 @@ msgstr "Valitse painamalla"
 msgid "Click to unselect"
 msgstr "Poista valinta painamalla"
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" -kyselyjen käyttö on estetty."
 
@@ -881,10 +968,12 @@ msgid "The user name is empty!"
 msgstr "Käyttäjän nimi puuttuu!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Salasana puuttuu!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Salasanat eivät ole samat!"
 
@@ -1310,7 +1399,8 @@ msgstr "Salasana:"
 msgid "Server Choice"
 msgstr "Valitse palvelin"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Selaimessa on oltava evästeet päällä tästä lähtien."
 
@@ -1336,6 +1426,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "MySQL-palvelimelle ei voitu kirjautua"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Väärä käyttäjätunnus tai salasana. Käyttö estetty."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1463,11 +1557,12 @@ msgstr "Lähetetty"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Ohjeet"
 
@@ -1531,7 +1626,7 @@ msgid "Skip Validate SQL"
 msgstr "Älä tarkista SQL-kyselyä"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Tarkista SQL-lause"
 
@@ -1586,7 +1681,8 @@ msgstr "Toimintoon %s vaikuttaa tunnettu vika, katso %s"
 msgid "Font size"
 msgstr "Fonttikoko"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1750,6 +1846,7 @@ msgid "Create"
 msgstr "Luo"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Ei käyttöoikeuksia"
 
@@ -1766,6 +1863,10 @@ msgstr "Luo uusi taulu tietokantaan %s"
 msgid "Number of fields"
 msgstr "Kenttien määrä"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr "Vientiin tarvittavia lisäosia ei voitu ladata; tarkista asetukset!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1794,6 +1895,29 @@ msgstr "Korvaa jo olemassa oleva(t) tiedosto(t)"
 msgid "File name template"
 msgstr "Tiedostonimen pohja"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "palvelimen nimi"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "tietokannan nimi"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "taulun nimi"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Tämä arvo on %1$sstrftime%2$s-funktion mukainen, joten "
+"ajanmuodostostusmerkkijonoja voi käyttää. Lisäksi tapahtuu seuraavat "
+"muutokset: %3$s. Muu teksti pysyy alkuperäisenä."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "muista pohja"
@@ -1870,6 +1994,15 @@ msgstr "Tuotava tiedosto"
 msgid "Location of the text file"
 msgstr "Tiedoston sijainti"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Tällä palvelimella ei ole sallittu tiedostojen lähetystä."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Tiedostojen lähetykseen valittua hakemistoa ei voida käyttää"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2018,6 +2151,20 @@ msgstr "Lopeta"
 msgid "in query"
 msgstr "lauseessa"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Näkyvillä rivit "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "yhteensä"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "kysely kesti %01.4f sek."
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2502,29 +2649,12 @@ msgstr "Tiedoston kirjoitus levylle epäonnistui."
 msgid "File upload stopped by extension."
 msgstr "Laajennus keskeytti tiedoston lähetyksen."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Tiedostoa ei voi lukea"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Virhe lähetettäessä tiedostoa, katso FAQ 1.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Yritit ladata tiedostoa, joka käyttää tuntematonta pakkausmuotoa (%s). Tukea "
-"kyseiselle muodolle ei joko ole toteutettu, tai se on asetuksin poistettu "
-"käytöstä."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2551,7 +2681,7 @@ msgstr "Luontiympäristö"
 msgid "Rows"
 msgstr "Kpl rivejä"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL palautti tyhjän vastauksen, toisin sanoen nolla riviä."
@@ -2596,6 +2726,11 @@ msgstr "rakenne"
 msgid "Go to view"
 msgstr "Siirry näkymään"
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Indeksiä ei ole määritelty!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2632,6 +2767,15 @@ msgstr "Perusavain on poistettu"
 msgid "Index %s has been dropped"
 msgstr "Indeksi %s on poistettu"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"Indeksit %1$s ja %2$s ovat ehkä samoja, ja niistä jompikumpi kannattanee "
+"poistaa."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2764,7 +2908,7 @@ msgstr "Lisää indeksiin %s sarake(tta)"
 msgid "Add a new User"
 msgstr "Lisää uusi käyttäjä"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Uusi käyttäjä lisätty."
 
@@ -2956,10 +3100,6 @@ msgstr "Lähetä BLOB-tietokantaan"
 msgid "Let every user access this bookmark"
 msgstr "Anna kaikkien käyttäjien käyttää tätä kirjanmerkkiä"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Kirjanmerkki on poistettu."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Tunniste"
@@ -3002,15 +3142,7 @@ msgstr "\"bzip-pakkaus\""
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr "Vientiin tarvittavia lisäosia ei voitu ladata; tarkista asetukset!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "Tuontiin tarvittavaa lisäosaa ei voida tuoda, tarkista asetukset!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Indeksiä ei voi muuttaa PRIMARY-nimiseksi!"
 
@@ -3134,11 +3266,6 @@ msgstr "Määrittele koordinaatit taululle %s"
 msgid "Connections"
 msgstr "Yhteydet"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Tietokanta %s on kopioitu tietokantaan %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Kopioi taulu toiseen tauluun nimellä (tietokanta<b>.</b>taulu):"
@@ -3160,7 +3287,7 @@ msgstr "Lähteeseen ei voida muodostaa yhteyttä"
 msgid "Could not connect to the target"
 msgstr "Kohteeseen ei voida muodostaa yhteyttä"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3259,26 +3386,17 @@ msgstr "Tsekkoslovakialainen"
 msgid "Danish"
 msgstr "Tanskalainen"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Tietokannan nimi on tyhjä!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Tietokannan tulostusvalinnat"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Tietokanta %1$s on luotu."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr "Tietokantaa '%s' ei ole olemassa."
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s tietokantaa poistettiin onnistuneesti."
@@ -3302,7 +3420,7 @@ msgstr "Kätke tilastot"
 msgid "Enable Statistics"
 msgstr "Näytä tilastot"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3349,7 +3467,7 @@ msgstr "Eheytä taulu"
 msgid "Use delayed inserts"
 msgstr "Käytä viivästettyjä lisäyslauseita"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Yhtään käyttäjää ei valittu poistettavaksi!"
 
@@ -3564,34 +3682,11 @@ msgstr ""
 "Tiedosto %s on jo olemassa palvelimella, vaihda tiedostonimeä tai tarkista "
 "korvausasetuksen tila."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "tietokannan nimi"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "palvelimen nimi"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "taulun nimi"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Tämä arvo on %1$sstrftime%2$s-funktion mukainen, joten "
-"ajanmuodostostusmerkkijonoja voi käyttää. Lisäksi tapahtuu seuraavat "
-"muutokset: %3$s. Muu teksti pysyy alkuperäisenä."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Tiedostot"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3616,7 +3711,7 @@ msgstr "Tyhjennä taulun välimuisti (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Tyhjennä (sulje) kaikki taulut"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr "Virhe luotaessa kohteen %1$s viiteavainta (tarkista tietotyypit)"
@@ -3800,15 +3895,6 @@ msgstr "Excel 97-2003 XLS -työkirja"
 msgid "Excel 2007 XLSX Workbook"
 msgstr "Excel 2007 XLSX -työkirja"
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"Indeksit %1$s ja %2$s ovat ehkä samoja, ja niistä jompikumpi kannattanee "
-"poistaa."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3844,7 +3930,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Lisää uutena rivinä"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Lisätyn rivin tunnus: %1$d"
@@ -4169,19 +4255,10 @@ msgstr "Näytä prosessit"
 msgid "No databases"
 msgstr "Ei tietokantoja"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Yhtään tietokantaa ei ole valittu."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Tuotavia tietoja ei ole. Tiedostonimeä ei joko annettu tai tiedoston koko "
-"ylitti PHP:n asetusten salliman enimmäiskoon. Katso FAQ 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "ei kuvausta"
@@ -4196,15 +4273,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "ZIP-paketista ei löytynyt yhtään tiedostoa!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Indeksiä ei ole määritelty!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Indeksin osia ei ole määritelty!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Ei muutoksia"
 
@@ -4222,7 +4295,7 @@ msgstr "Tälle tiedostomuodolle ei ole valinta-asetuksia"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Palvelimella ei ole lupaa tallentaa tiedostoa %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Sinulla ei ole riittäviä oikeuksia!"
 
@@ -4258,7 +4331,8 @@ msgstr "ei käytössä"
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "Taulua <b>%s</b> ei löytynyt tai sitä ei ole määritelty tiedostossa %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Käyttäjiä ei ole."
 
@@ -4305,7 +4379,7 @@ msgstr "Osituksen ylläpito"
 msgid "Partition %s"
 msgstr "Ositus %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Käyttäjän %s salasanan vaihto onnistui."
@@ -4406,11 +4480,11 @@ msgstr "Puolalainen"
 msgid "Port"
 msgstr "Port"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Perusavaimen nimen on oltava PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(\"PRIMARY\" saa olla <b>vain ja ainoastaan</b> perusavaimen nimenä!)"
@@ -4613,7 +4687,7 @@ msgstr "Sallii tietojen muuttamisen."
 msgid "No privileges."
 msgstr "Ei käyttöoikeuksia."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Käyttöoikeuksien uudelleenlataus onnistui."
 
@@ -4656,11 +4730,6 @@ msgstr ""
 "<b>Kyselytilastot</b>: Tälle palvelimelle on lähetetty viime käynnistyksestä "
 "lähtien %s kyselyä."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "kysely kesti %01.4f sek."
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Kyselyn tyyppi"
@@ -4689,15 +4758,6 @@ msgstr "Tarkista viitteiden eheys:"
 msgid "Relational schema"
 msgstr "Relaatioskeema"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Linkitettyihin tauluihin liittyvät lisäominaisuudet eivät ole käytössä. "
-"Katso %slisätietoja%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relaatiot"
@@ -4737,11 +4797,6 @@ msgstr "Poista ositus"
 msgid "Remove selected users"
 msgstr "Poista valitut käyttäjät"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Tietokannan %s nimi on nyt %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4860,7 +4915,7 @@ msgstr ""
 "Tätä palvelinta ei ole määritetty replikaatioprosessin isäntäpalvelimeksi. "
 "Haluatko <a href=\"%s\">määrittää</a> sen?"
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -5008,7 +5063,7 @@ msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 "Pura kaikki käyttäjän aktiiviset käyttöoikeudet, ja poista ne sen jälkeen."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Käyttäjän %s käyttöoikeudet on poistettu"
@@ -5173,19 +5228,11 @@ msgstr "Näytä kyselyt kokonaisuudessaan"
 msgid "Show/Hide left menu"
 msgstr "Näytä/kätke vasen valikko"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Näytetään kirjanmerkki"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Näytetään PHP-koodina"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Näkyvillä rivit "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Näytetään SQL-kysely"
 
@@ -6081,7 +6128,7 @@ msgstr "Taulu %s on jo olemassa!"
 msgid "Alter column(s)"
 msgstr "Muuta saraketta/sarakkeita"
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Taulun %1$s muuttaminen onnistui."
@@ -6100,7 +6147,7 @@ msgstr "Haluatko poistaa kaikki edelliset rivit kohdetauluista?"
 msgid "The table name is empty!"
 msgstr "Taulun nimi puuttuu!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "Taulu %1$s on luotu."
@@ -6221,7 +6268,7 @@ msgstr "Tämä isäntä"
 msgid "Threads"
 msgstr "Säikeet"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Säikeen %s lopetus onnistui."
@@ -6235,14 +6282,6 @@ msgstr ""
 "tarkoittaa yleensä sitä, että phpMyAdmin ei voi ajaa tätä tuontia loppuun "
 "asti ellei PHP:n suoritusaikarajaa nosteta."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Skriptin suoritus aikakatkaistiin. Jos haluat suorittaa tuonnin loppuun, "
-"lähetä sama tiedosto uudestaan, ja tuonti jatkuu."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "Sivulta/sivulle"
@@ -6259,10 +6298,6 @@ msgstr "Vaihda pieneksi/suureksi"
 msgid "To select relation, click :"
 msgstr "Valitaksesi relaation, paina :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "yhteensä"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6576,7 +6611,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "tuntematon"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Käyttäjän %s käyttöoikeudet on päivitetty."
@@ -6595,19 +6630,6 @@ msgstr "Tarkista ohjeista, kuinka Column_comments-tauluja voi päivittää."
 msgid "You should upgrade to %s %s or later."
 msgstr "Sinun tulisi päivittää versioon %s %s tai sitä uudempaan."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Yritit todennäköisesti lähettää palvelimelle liian suurta tiedostoa. Katso "
-"tämän rajoituksen muuttamisesta lisätietoja %sohjeista%s."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Tällä palvelimella ei ole sallittu tiedostojen lähetystä."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Käyttö"
@@ -6621,7 +6643,7 @@ msgstr "Pane taulujen ja sarakkeiden nimet lainausmerkkeihin"
 msgid "Use Host Table"
 msgstr "Käytä isäntätaulua"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Käyttäjä %s on jo olemassa!"
@@ -6634,7 +6656,7 @@ msgstr "Käyttäjä %s on jo olemassa!"
 msgid "User name"
 msgstr "Käyttäjänimi"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Valittua käyttäjää ei löytynyt käyttöoikeustaulusta."
 
@@ -6642,7 +6664,7 @@ msgstr "Valittua käyttäjää ei löytynyt käyttöoikeustaulusta."
 msgid "User overview"
 msgstr "Käyttäjien yleiskatsaus"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Valitsemiesi käyttäjien poisto onnistui."
 
@@ -6705,10 +6727,6 @@ msgstr "Tee vedos taulusta"
 msgid "VIEW name"
 msgstr "VIEW-arvon nimi"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Tiedostojen lähetykseen valittua hakemistoa ei voida käyttää"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Verkkopalvelin"
@@ -6726,10 +6744,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "korvausmerkki"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Väärä käyttäjätunnus tai salasana. Käyttö estetty."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/fr.po b/po/fr.po
index 4d69da6bb..71a7767c7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-05-04 16:34+0200\n"
 "Last-Translator: Marc <marc@infomarc.info>\n"
 "Language-Team: french <fr@li.org>\n"
@@ -91,6 +91,11 @@ msgstr "Description"
 msgid "Use this value"
 msgstr "Utiliser cette valeur"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "La base de données %1$s a été créée."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Commentaire sur la base de données: "
@@ -207,6 +212,20 @@ msgstr "Tout sélectionner"
 msgid "Unselect All"
 msgstr "Tout désélectionner"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Le nom de la base de données est vide!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "La base de données %s a été renommée en %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "La base de données %s a été copiée sur %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "<b>Changer le nom</b> de la base de données pour"
@@ -311,6 +330,15 @@ msgstr "Activer"
 msgid "Collation"
 msgstr "Interclassement"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Certaines fonctionnalités ayant trait aux tables reliées sont désactivées. "
+"Pour une analyse du problème, cliquez %sici%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "<b>Afficher le schéma</b> en PDF"
@@ -638,7 +666,8 @@ msgstr "Le suivi est actif."
 msgid "Tracking is not active."
 msgstr "Le suivi n'est pas activé."
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -808,16 +837,77 @@ msgstr "Suivre la table"
 msgid "Database Log"
 msgstr "Journal de la base de données"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Vous avez probablement tenté de télécharger un fichier trop volumineux. "
+"Veuillez vous référer à la %sdocumentation%s pour des façons de contourner "
+"cette limite."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Le fichier n'a pu être lu"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Vous avez tenté d'importer un fichier dont le mode de compression (%s) n'est "
+"pas supporté par votre configuration PHP ou est désactivé dans celle-ci."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Aucune données n'a été reçu en vue de l'importation. Aucun nom de fichier "
+"n'a été fourni, ou encore la taille du fichier a dépassé la limite permise "
+"par votre configuration de PHP. Voir [a@./Documentation."
+"html#faq1_16@Documentation]FAQ 1.16[/a]"
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"Chargement impossible des greffons d'importation, veuillez vérifier votre "
+"installation!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Le signet a été effacé."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Affichage du signet"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Signet %s créé"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "L'importation s'est terminée avec succès, %d requêtes exécutées."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"La limite de temps a été atteinte; si vous voulez terminer l'importation, "
+"soumettez à nouveau le même fichier et l'importation continuera."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -836,7 +926,8 @@ msgstr "Cliquer pour sélectionner"
 msgid "Click to unselect"
 msgstr "Cliquer pour désélectionner"
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "La commande  «DROP DATABASE» est désactivée."
 
@@ -878,10 +969,12 @@ msgid "The user name is empty!"
 msgstr "Le nom d'utilisateur est vide"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Le mot de passe est vide"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Les mots de passe doivent être identiques"
 
@@ -1258,7 +1351,8 @@ msgstr "Mot de passe&nbsp;:"
 msgid "Server Choice"
 msgstr "Choix du serveur"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Vous devez accepter les cookies pour poursuivre."
 
@@ -1282,6 +1376,10 @@ msgstr "Aucune activité depuis %s secondes ou plus, veuillez vous reconnecter"
 msgid "Cannot log in to the MySQL server"
 msgstr "Connexion au serveur MySQL non permise"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Erreur d'utilisateur/mot de passe. Accès refusé"
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1412,11 +1510,12 @@ msgstr "fr"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Documentation"
 
@@ -1480,7 +1579,7 @@ msgid "Skip Validate SQL"
 msgstr "Ne pas valider SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Valider SQL"
 
@@ -1533,7 +1632,8 @@ msgstr "La fonctionnalité %s est affectée par une anomalie connue, voir %s"
 msgid "Font size"
 msgstr "Taille du texte"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1699,6 +1799,7 @@ msgid "Create"
 msgstr "Créer"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "aucun privilège"
 
@@ -1715,6 +1816,10 @@ msgstr "Créer une nouvelle table sur la base %s"
 msgid "Number of fields"
 msgstr "Nombre de champs"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr "Erreur lors du chargement des modules d'exportation!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1743,6 +1848,29 @@ msgstr "Écraser les fichiers existants"
 msgid "File name template"
 msgstr "Modèle de nom de fichier"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "nom de serveur"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "nom de base de données"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "nom de table"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Cette valeur est interprétée avec %1$sstrftime%2$s, vous pouvez donc "
+"utiliser des chaînes de format d'heure. Ces transformations additionnelles "
+"vont se produire: %3$s. Tout autre texte sera conservé tel quel."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "se souvenir du modèle"
@@ -1813,6 +1941,15 @@ msgstr "Fichier à importer"
 msgid "Location of the text file"
 msgstr "Emplacement du fichier texte"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Les téléchargements vers ce serveur ne sont pas permis."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Le répertoire de transfert est inaccessible"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1961,6 +2098,20 @@ msgstr "Supprimer"
 msgid "in query"
 msgstr "dans la requête"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Affichage des enregistrements"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "total"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Traitement en %01.4f sec."
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2454,11 +2605,6 @@ msgstr "Erreur lors de l'écriture du fichier sur disque."
 msgid "File upload stopped by extension."
 msgstr "Téléchargement arrêté par l'extension."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Le fichier n'a pu être lu"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
@@ -2467,17 +2613,6 @@ msgstr ""
 "Erreur lors du déplacement du fichier téléchargé, voir [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Vous avez tenté d'importer un fichier dont le mode de compression (%s) n'est "
-"pas supporté par votre configuration PHP ou est désactivé dans celle-ci."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2503,7 +2638,7 @@ msgstr "Généré par"
 msgid "Rows"
 msgstr "Enregistrements"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL n'a retourné aucun enregistrement."
@@ -2549,6 +2684,11 @@ msgstr "structure"
 msgid "Go to view"
 msgstr "Aller à la vue"
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Aucun index n'est défini!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2585,6 +2725,15 @@ msgstr "La clé primaire a été effacée"
 msgid "Index %s has been dropped"
 msgstr "L'index %s a été effacé"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"Les index %1$s et %2$s semblent identiques et l'un d'eux pourrait être "
+"supprimé."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2714,7 +2863,7 @@ msgstr "Ajouter à l'index&nbsp;%s&nbsp;colonne(s)"
 msgid "Add a new User"
 msgstr "Ajouter un utilisateur"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Vous avez ajouté un utilisateur"
 
@@ -2903,10 +3052,6 @@ msgstr "Télécharger vers le dépôt BLOB"
 msgid "Let every user access this bookmark"
 msgstr "Signet visible pour les autres utilisateurs"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Le signet a été effacé."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Intitulé"
@@ -2949,17 +3094,7 @@ msgstr " «bzippé »"
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr "Erreur lors du chargement des modules d'exportation!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"Chargement impossible des greffons d'importation, veuillez vérifier votre "
-"installation!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "La clé ne peut être renommée PRIMARY!"
 
@@ -3082,11 +3217,6 @@ msgstr "Les coordonnées de la table %s n'ont pas été configurées"
 msgid "Connections"
 msgstr "Connexions"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "La base de données %s a été copiée sur %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Copier la table vers (base<b>.</b>table) :"
@@ -3108,7 +3238,7 @@ msgstr "Connexion à la source impossible"
 msgid "Could not connect to the target"
 msgstr "Connexion à la cible impossible"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3207,26 +3337,17 @@ msgstr "tchèque-slovaque"
 msgid "Danish"
 msgstr "danois"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Le nom de la base de données est vide!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Options d'exportation"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "La base de données %1$s a été créée."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr "La base de données «%s» n'existe pas."
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s bases de données ont été supprimées."
@@ -3250,7 +3371,7 @@ msgstr "Désactiver les statistiques"
 msgid "Enable Statistics"
 msgstr "Activer les statistiques"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3297,7 +3418,7 @@ msgstr "Défragmenter la table"
 msgid "Use delayed inserts"
 msgstr "Insertions avec délais (DELAYED)"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Aucun utilisateur n'a été choisi en vue de le détruire!"
 
@@ -3513,34 +3634,11 @@ msgstr ""
 "Le fichier %s existe déjà sur le serveur, veuillez changer le nom, ou cocher "
 "l'option Écraser"
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "nom de base de données"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "nom de serveur"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "nom de table"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Cette valeur est interprétée avec %1$sstrftime%2$s, vous pouvez donc "
-"utiliser des chaînes de format d'heure. Ces transformations additionnelles "
-"vont se produire: %3$s. Tout autre texte sera conservé tel quel."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Fichiers"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3565,7 +3663,7 @@ msgstr "Recharger la table ( «FLUSH »)"
 msgid "Flush (close) all tables"
 msgstr "Fermer toutes les tables"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3751,15 +3849,6 @@ msgstr "Excel 97-2003 XLS Workbook"
 msgid "Excel 2007 XLSX Workbook"
 msgstr "Excel 2007 XLSX Workbook"
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"Les index %1$s et %2$s semblent identiques et l'un d'eux pourrait être "
-"supprimé."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3796,7 +3885,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Sauvegarder un nouvel enregistrement"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Identifiant de l'enregistrement inséré : %1$d"
@@ -4128,21 +4217,10 @@ msgstr "Afficher les processus"
 msgid "No databases"
 msgstr "Aucune base de données"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Aucune base de données n'a été sélectionnée."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Aucune données n'a été reçu en vue de l'importation. Aucun nom de fichier "
-"n'a été fourni, ou encore la taille du fichier a dépassé la limite permise "
-"par votre configuration de PHP. Voir [a@./Documentation."
-"html#faq1_16@Documentation]FAQ 1.16[/a]"
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "pas de description"
@@ -4158,15 +4236,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "Aucun fichier présent dans l'archive ZIP!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Aucun index n'est défini!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Aucune colonne n'a été définie pour cet index!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Pas de modifications"
 
@@ -4186,7 +4260,7 @@ msgstr ""
 "Le serveur web n'a pas les permissions nécessaires pour enregistrer le "
 "fichier %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Vous n'êtes pas autorisé à accéder à cette page"
 
@@ -4223,7 +4297,8 @@ msgstr "non présent"
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "La table <b>%s</b> est absente ou non définie dans %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Il n'y a aucun utilisateur"
 
@@ -4270,7 +4345,7 @@ msgstr "Gestion des partitions"
 msgid "Partition %s"
 msgstr "Partition %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Le mot de passe de %s a été changé."
@@ -4376,11 +4451,11 @@ msgstr "polonais"
 msgid "Port"
 msgstr "Port"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Le nom d'une clé primaire doit être «PRIMARY»!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(«PRIMARY» <b>doit et ne peut être</b> que le nom d'une clé primaire!)"
@@ -4596,7 +4671,7 @@ msgstr "Permission de changer des données."
 msgid "No privileges."
 msgstr "Pas de privilèges"
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Les privilèges ont été rechargés."
 
@@ -4639,11 +4714,6 @@ msgstr ""
 "<b>Statistiques sur les requêtes</b>: Depuis son démarrage, %s requêtes ont "
 "été envoyées au serveur."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Traitement en %01.4f sec."
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Type de requête"
@@ -4672,15 +4742,6 @@ msgstr "Vérifier l'intégrité référentielle"
 msgid "Relational schema"
 msgstr "Schéma relationnel"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Certaines fonctionnalités ayant trait aux tables reliées sont désactivées. "
-"Pour une analyse du problème, cliquez %sici%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relations"
@@ -4720,11 +4781,6 @@ msgstr "Supprimer le partitionnement"
 msgid "Remove selected users"
 msgstr "Effacer les utilisateurs sélectionnés."
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "La base de données %s a été renommée en %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4842,7 +4898,7 @@ msgstr ""
 "Ce serveur n'est pas configuré comme maître dans un processus de "
 "réplication. Désirez-vous le <a href=\"%s\">configurer</a>?"
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4989,7 +5045,7 @@ msgstr "Recommencer l'insertion avec %s lignes"
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Effacer tous les privilèges de ces utilisateurs, puis les effacer."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Vous avez révoqué les privilèges pour %s"
@@ -5157,19 +5213,11 @@ msgstr "Afficher les requêtes complètes"
 msgid "Show/Hide left menu"
 msgstr "Montrer/cacher le menu de gauche"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Affichage du signet"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Affichage du code PHP"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Affichage des enregistrements"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Affichage de la requête SQL"
 
@@ -6060,7 +6108,7 @@ msgstr "La table %s existe déjà!"
 msgid "Alter column(s)"
 msgstr "Modifier des colonnes"
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "La table %1$s a été modifiée avec succès."
@@ -6079,7 +6127,7 @@ msgstr "Voulez-vous supprimer tous les enregistrements des tables cible?"
 msgid "The table name is empty!"
 msgstr "Le nom de la table est vide"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "La table %1$s a été créée."
@@ -6202,7 +6250,7 @@ msgstr "Ce serveur"
 msgid "Threads"
 msgstr "Fils d'exécution"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Le processus %s a été éliminé."
@@ -6216,14 +6264,6 @@ msgstr ""
 "signifie que phpMyAdmin ne pourra terminer cette importation, à moins que la "
 "limite de temps de PHP ne soit augmentée."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"La limite de temps a été atteinte; si vous voulez terminer l'importation, "
-"soumettez à nouveau le même fichier et l'importation continuera."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "de/vers la page"
@@ -6240,10 +6280,6 @@ msgstr "Bascule agrandir/réduire"
 msgid "To select relation, click :"
 msgstr "Pour sélectionner un lien, cliquez :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "total"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6558,7 +6594,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "inconnu"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Vous avez modifié les privilèges pour %s."
@@ -6578,20 +6614,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Vous devriez utiliser %s en version %s ou plus récente."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Vous avez probablement tenté de télécharger un fichier trop volumineux. "
-"Veuillez vous référer à la %sdocumentation%s pour des façons de contourner "
-"cette limite."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Les téléchargements vers ce serveur ne sont pas permis."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Espace"
@@ -6606,7 +6628,7 @@ msgstr ""
 msgid "Use Host Table"
 msgstr "Utiliser la table Host"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "L'utilisateur %s existe déjà!"
@@ -6619,7 +6641,7 @@ msgstr "L'utilisateur %s existe déjà!"
 msgid "User name"
 msgstr "Nom d'utilisateur"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "L'utilisateur choisi n'existe pas dans la table des privilèges"
 
@@ -6627,7 +6649,7 @@ msgstr "L'utilisateur choisi n'existe pas dans la table des privilèges"
 msgid "User overview"
 msgstr "Vue d'ensemble des utilisateurs"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Les utilisateurs sélectionnés ont été effacés."
 
@@ -6690,10 +6712,6 @@ msgstr "<b>Afficher le schéma</b> de la table"
 msgid "VIEW name"
 msgstr "Nom de la vue"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Le répertoire de transfert est inaccessible"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Serveur web"
@@ -6711,10 +6729,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "passepartout"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Erreur d'utilisateur/mot de passe. Accès refusé"
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/gl.po b/po/gl.po
index ad3ad8784..32cbb58ec 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:14+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: galician <gl@li.org>\n"
@@ -90,6 +90,11 @@ msgstr "Descrición"
 msgid "Use this value"
 msgstr "Usar este valor"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Creouse  a base de datos %1$s."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Comentario da base de datos: "
@@ -206,6 +211,20 @@ msgstr "Seleccionar todo"
 msgid "Unselect All"
 msgstr "Non seleccionar nada"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Ese nome de base de datos non existe."
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Mudóuselle o nome á base de datos %s para %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Copiuse a base de datos %s para %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Mudar o nome da base de datos para"
@@ -316,6 +335,15 @@ msgstr "Activar"
 msgid "Collation"
 msgstr "Orde alfabética"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Desactivouse a funcionalidade adicional para o traballo con táboas "
+"vinculadas. Para saber o por que, prema %saqu&iacute;%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Mostrar o esquema PDF"
@@ -643,7 +671,8 @@ msgstr "O seguemento está activado."
 msgid "Tracking is not active."
 msgstr "O seguemento non está activado."
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -813,16 +842,73 @@ msgstr "Seguir a táboa"
 msgid "Database Log"
 msgstr "Rexistro de actividade da base de datos"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Posibelmente tentou enviar un ficheiro demasiado grande. Consulte a %"
+"sdocumentación%s para averiguar como evitar este límite."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Non se puido ler o ficheiro"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Tentou cargar un ficheiro cunha compresión descoñecida (%s). Ora non se sabe "
+"como descomprimir, ora está desactivada na configuración."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Non se recibiron datos para importar. Ou ben non se enviou o ficheiro ou ben "
+"o seu tamaño excede o máximo permitido pola súa configuración de PHP. "
+"Consulte FAQ 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "Non se puideron importar as extensións - Comprobe a instalación."
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Eliminouse o marcador."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "A mostrar o marcador"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Creouse o marcador %s"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "A importación rematou sen problemas. Executáronse %d procuras."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Ultrapasouse o tempo de espera do guión. Se quere rematar a importación, "
+"volva a enviar o mesmo ficheiro e a importación continuará."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin utilízase mellor cun navegador que <b>acepte molduras</b>."
@@ -839,7 +925,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "Non se permiten as ordes \"Eliminar a base de datos\"."
 
@@ -881,10 +968,12 @@ msgid "The user name is empty!"
 msgstr "O nome do usuario está vacío!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "O contrasinal está vacío!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Os contrasinais non son os mesmos."
 
@@ -1311,7 +1400,8 @@ msgstr "Contrasinal:"
 msgid "Server Choice"
 msgstr "Escolla de servidor"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "A partir de aquí debe permitir cookies."
 
@@ -1336,6 +1426,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Non se dá conectado co servidor de MySQL"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "O usuario ou o contrasinal están errados. Denegouse o acceso."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1467,11 +1561,12 @@ msgstr "Enviado"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Documentación"
 
@@ -1535,7 +1630,7 @@ msgid "Skip Validate SQL"
 msgstr "Omitir a validacion de"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Validar o SQL"
 
@@ -1590,7 +1685,8 @@ msgstr "A función %s vese afectada por un erro descoñecido; consulte %s"
 msgid "Font size"
 msgstr "Tamaño da letra"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1754,6 +1850,7 @@ msgid "Create"
 msgstr "Crear"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Sen privilexios"
 
@@ -1770,6 +1867,11 @@ msgstr "Crear unha táboa nova na base de datos %s"
 msgid "Number of fields"
 msgstr "Número de campos"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"Non se deron carregado as extensións de exportación. Verifique a instalación."
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1798,6 +1900,29 @@ msgstr "Eliminar o(s) ficheiro(s) xa existente(s)"
 msgid "File name template"
 msgstr "Modelo para o nome de ficheiro"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "nome do servidor"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "nome da base de datos"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "nome da táboa"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Este valor interprétase utilizando %1$sstrftime%2$s, de maneira que pode "
+"utilizar cadeas de formato de hora. Produciranse transformacións en "
+"consecuencia: %3$s. O resto do texto ficará como está."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "lembrar o modelo"
@@ -1874,6 +1999,15 @@ msgstr "Ficheiro a importar"
 msgid "Location of the text file"
 msgstr "Localización do arquivo de texto"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Este servidor non admite a recepción de ficheiros."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Non se pode acceder ao directorio que designou para os envíos"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2022,6 +2156,20 @@ msgstr "Matar (kill)"
 msgid "in query"
 msgstr "a procurar"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "A mostrar rexistros "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "total"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "a pesquisa levou %01.4f segundos"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2514,28 +2662,12 @@ msgstr "Non se puido escribir no disco."
 msgid "File upload stopped by extension."
 msgstr "Detívose o envío do ficheiro por causa do engadido."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Non se puido ler o ficheiro"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Erro ao mover o ficheiro enviado. Consulte FAQ 1.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Tentou cargar un ficheiro cunha compresión descoñecida (%s). Ora non se sabe "
-"como descomprimir, ora está desactivada na configuración."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2562,7 +2694,7 @@ msgstr "Xerado por"
 msgid "Rows"
 msgstr "Fileiras"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL retornou un conxunto vacío (ex. cero rexistros)."
@@ -2607,6 +2739,11 @@ msgstr "estrutura"
 msgid "Go to view"
 msgstr "Ir á vista"
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Non se definiu ningún índice"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2643,6 +2780,15 @@ msgstr "Eliminouse a chave primaria"
 msgid "Index %s has been dropped"
 msgstr "Eliminouse o índice %s"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"Parece que os índice %1$s e %2$s son iguais e posibelmente poderíase "
+"eliminar un deles"
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2775,7 +2921,7 @@ msgstr "Engadir ao índice &nbsp;%s&nbsp;coluna(s)"
 msgid "Add a new User"
 msgstr "Engadir un usuario novo"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Engadiuse o usuario."
 
@@ -2967,10 +3113,6 @@ msgstr "Enviar ao repositorio de BLOB"
 msgid "Let every user access this bookmark"
 msgstr "Permitir que calquera usuario poida acceder a este marcador"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Eliminouse o marcador."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Nome"
@@ -3013,16 +3155,7 @@ msgstr "comprimido no formato \"bzip\""
 msgid "Calendar"
 msgstr "Calendario"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"Non se deron carregado as extensións de exportación. Verifique a instalación."
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "Non se puideron importar as extensións - Comprobe a instalación."
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Non se pode facer que este índice sexa PRIMARIO!"
 
@@ -3145,11 +3278,6 @@ msgstr "Configure as coordenadas da táboa %s"
 msgid "Connections"
 msgstr "Conexións"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Copiuse a base de datos %s para %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Copiar a táboa a (base_de_datos<b>.</b>táboa):"
@@ -3171,7 +3299,7 @@ msgstr "Non foi posíbel conectar coa orixe"
 msgid "Could not connect to the target"
 msgstr "Non foi posíbel conectar co destino"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3270,26 +3398,17 @@ msgstr "Checo-eslovaco"
 msgid "Danish"
 msgstr "Dinamarqués"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Ese nome de base de datos non existe."
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Opcións de exportación da base de datos"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Creouse  a base de datos %1$s."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr "Non existe a base de datos '%s'."
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "Elimináronse %s bases de datos sen problemas."
@@ -3313,7 +3432,7 @@ msgstr "Desactivar as estatísticas"
 msgid "Enable Statistics"
 msgstr "Activar as estatísticas"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3360,7 +3479,7 @@ msgstr "Táboa de desfragmentación"
 msgid "Use delayed inserts"
 msgstr "Usar insercións demoradas"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Non se seleccionaron utilizadores para eliminar!"
 
@@ -3575,34 +3694,11 @@ msgstr ""
 "O ficheiro %s xa existe no servidor - escolla outro nome ou seleccione a "
 "opción de eliminar."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "nome da base de datos"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "nome do servidor"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "nome da táboa"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Este valor interprétase utilizando %1$sstrftime%2$s, de maneira que pode "
-"utilizar cadeas de formato de hora. Produciranse transformacións en "
-"consecuencia: %3$s. O resto do texto ficará como está."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Ficheiros"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3627,7 +3723,7 @@ msgstr "Fechar a táboa (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Limpar (fechar) todas as táboas"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3813,15 +3909,6 @@ msgstr "Libro de traballo XLS do Excel 97-2003"
 msgid "Excel 2007 XLSX Workbook"
 msgstr "Libro de traballo XLSX do Excel 2007"
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"Parece que os índice %1$s e %2$s son iguais e posibelmente poderíase "
-"eliminar un deles"
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3859,7 +3946,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Inserir unha columna nova"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Identificador da fileira inserida: %1$d"
@@ -4185,20 +4272,10 @@ msgstr "Mostrar os procesos"
 msgid "No databases"
 msgstr "Non hai ningunha base de datos"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Non hai ningunha base de datos seleccionada."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Non se recibiron datos para importar. Ou ben non se enviou o ficheiro ou ben "
-"o seu tamaño excede o máximo permitido pola súa configuración de PHP. "
-"Consulte FAQ 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "sen descrición"
@@ -4214,15 +4291,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "Non se atoparon ficheiros dentro do arquivo ZIP!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Non se definiu ningún índice"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Non se definiron partes do índice"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Sen cambios"
 
@@ -4240,7 +4313,7 @@ msgstr "Este formato non ten opcións"
 msgid "The web server does not have permission to save the file %s."
 msgstr "O servidor web non ten permiso para gardar o ficheiro %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Non ten direitos suficientes para estar aquí agora!"
 
@@ -4277,7 +4350,8 @@ msgstr "non está presente"
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "Non se atopou a táboa <b>%s</b>ou non se indicou en %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Non se achou ningún usuario."
 
@@ -4324,7 +4398,7 @@ msgstr "Mantemento da partición"
 msgid "Partition %s"
 msgstr "Partición %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Modificouse sen problemas o contrasinal de %s."
@@ -4425,11 +4499,11 @@ msgstr "Polonés"
 msgid "Port"
 msgstr "Porto"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "O nome da chave primaria debe ser... PRIMARIA"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4629,7 +4703,7 @@ msgstr "Permite modificar datos."
 msgid "No privileges."
 msgstr "Sen privilexios."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Non houbo problemas ao recargar os privilexios."
 
@@ -4672,11 +4746,6 @@ msgstr ""
 "<b>Estatística das procuras</b>: Desde que se iniciou, enviáronselle ao "
 "servidor %s procuras."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "a pesquisa levou %01.4f segundos"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Tipo de procura"
@@ -4705,15 +4774,6 @@ msgstr "Comprobar a integridade das referencias:"
 msgid "Relational schema"
 msgstr "Esquema relacional"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Desactivouse a funcionalidade adicional para o traballo con táboas "
-"vinculadas. Para saber o por que, prema %saqu&iacute;%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relacións"
@@ -4753,11 +4813,6 @@ msgstr "Eliminar particións"
 msgid "Remove selected users"
 msgstr "Eliminar os usuarios seleccionados"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Mudóuselle o nome á base de datos %s para %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4877,7 +4932,7 @@ msgstr ""
 "Este servidor non está configurado como principal nun proceso de "
 "replicación. Desexa <a href=\"%s\">configuralo</a>?"
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -5025,7 +5080,7 @@ msgstr ""
 "Retirarlles todos os privilexios activos aos usuarios e eliminalos a "
 "continuación."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Retiroulle os privilexios a %s"
@@ -5195,19 +5250,11 @@ msgstr "Mostrar as procuras completas"
 msgid "Show/Hide left menu"
 msgstr "Mostrar/Agochar o menú esquerdo"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "A mostrar o marcador"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Mostrar como código PHP"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "A mostrar rexistros "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Mostrar procura SQL"
 
@@ -6101,7 +6148,7 @@ msgstr "Xa existe a táboa %s!!"
 msgid "Alter column(s)"
 msgstr "Alterar columna(s)"
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Alterouse a táboa %1$s sen problemas"
@@ -6120,7 +6167,7 @@ msgstr "Quere eliminar todas as fileiras anteriores das táboas de destino?"
 msgid "The table name is empty!"
 msgstr "O nome da táboa está vacío!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "Creouse a táboa %1$s."
@@ -6243,7 +6290,7 @@ msgstr "Este servidor"
 msgid "Threads"
 msgstr "Fíos"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Finalizouse o fío %s."
@@ -6257,14 +6304,6 @@ msgstr ""
 "normalmente significa que o phpMyAdmin non poderá rematar esta importación a "
 "non ser que lle incrementen os limites de tempo de php."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Ultrapasouse o tempo de espera do guión. Se quere rematar a importación, "
-"volva a enviar o mesmo ficheiro e a importación continuará."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "até/desde a páxina"
@@ -6281,10 +6320,6 @@ msgstr "Alternar pequeno/grande"
 msgid "To select relation, click :"
 msgstr "Para seleccionar unha relación, prema:"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "total"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6593,7 +6628,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "descoñecido"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Acaba de actualizar os privilexios de %s."
@@ -6613,19 +6648,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Debería actualizar a %s %s ou posterior."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Posibelmente tentou enviar un ficheiro demasiado grande. Consulte a %"
-"sdocumentación%s para averiguar como evitar este límite."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Este servidor non admite a recepción de ficheiros."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Uso"
@@ -6639,7 +6661,7 @@ msgstr "Protexer os nomes das táboas e dos campos con&nbsp;\" ` \""
 msgid "Use Host Table"
 msgstr "Usar a táboa de Host"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Xa existe o usuario %s"
@@ -6652,7 +6674,7 @@ msgstr "Xa existe o usuario %s"
 msgid "User name"
 msgstr "Nome do usuario"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Non se atopou o usuario seleccionado na táboa de privilexios."
 
@@ -6660,7 +6682,7 @@ msgstr "Non se atopou o usuario seleccionado na táboa de privilexios."
 msgid "User overview"
 msgstr "Vista xeral dos usuarios"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Elimináronse sen problemas os usuarios seleccionados."
 
@@ -6723,10 +6745,6 @@ msgstr "Ver o esquema do volcado da táboa"
 msgid "VIEW name"
 msgstr "Nome da VISTA"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Non se pode acceder ao directorio que designou para os envíos"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Servidor web"
@@ -6744,10 +6762,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "comodín"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "O usuario ou o contrasinal están errados. Denegouse o acceso."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/he.po b/po/he.po
index 6d33dc804..bf1d20baf 100644
--- a/po/he.po
+++ b/po/he.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:15+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: hebrew <he@li.org>\n"
@@ -86,6 +86,11 @@ msgstr "תיאור"
 msgid "Use this value"
 msgstr "השתמש בערך זה"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "מסד הנתונים %s נמחק."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "הערה על מאגר הנתונים: "
@@ -202,6 +207,20 @@ msgstr "בחירת הכל"
 msgid "Unselect All"
 msgstr "בטל בחירת הכל"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "שם מאגר הנתונים ריק!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "מאגר נתונים %s שונה אל %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "מאגר נתונים %s הועתק אל %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "שינוי שם מאגר נתונים אל"
@@ -313,6 +332,14 @@ msgstr "מופעל"
 msgid "Collation"
 msgstr "קידוד"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"תכונות נוספות לעבודה עם טבלאות מקושרות בוטלו. לעוד מידע למה לחץ %sכאן%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "הצגת תרשים PDF"
@@ -640,7 +667,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -814,16 +842,64 @@ msgstr "בדיקת טבלה"
 msgid "Database Log"
 msgstr "מאגר נתונים"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "נכשל בקריאת הקובץ"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "כתובת מועדפת נמחקה."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin יותר ידידותי עם דפדפן <b>frames-capable</b>."
@@ -840,7 +916,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "הוראות \"DROP DATABASE\" מבוטלות."
 
@@ -880,10 +957,12 @@ msgid "The user name is empty!"
 msgstr "שם המשתמש ריק !"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "הסיסמא ריקה!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "הסיסמאות אינן זהות!"
 
@@ -1305,7 +1384,8 @@ msgstr "סיסמא:"
 msgid "Server Choice"
 msgstr "בחירת שרת"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "עוגיות (Cookies) חייבות לפעול מנקודה זאת."
 
@@ -1327,6 +1407,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "נכשל בכניסה לשרת MySQL"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "שם משתמש/סיסמה שגויים. הגישה נדחתה."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1450,11 +1534,12 @@ msgstr "נשלח"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "תיעוד"
 
@@ -1519,7 +1604,7 @@ msgid "Skip Validate SQL"
 msgstr "בדיקת תקינות SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "בדיקת תקינות SQL"
 
@@ -1574,7 +1659,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1736,6 +1822,7 @@ msgid "Create"
 msgstr "יצירה"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "ללא הרשאות"
 
@@ -1752,6 +1839,10 @@ msgstr "יצירת טבלה חדשה על מאגר נתונים %s"
 msgid "Number of fields"
 msgstr "מספר שדות"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1780,6 +1871,27 @@ msgstr ""
 msgid "File name template"
 msgstr "תבנית שם קובץ"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+#, fuzzy
+msgid "server name"
+msgstr "שם משתמש"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr ""
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "זכור תבנית"
@@ -1851,6 +1963,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr "מיקום של קובץ טקסט"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr ""
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 #, fuzzy
@@ -1998,6 +2119,20 @@ msgstr ""
 msgid "in query"
 msgstr "בשאילתה"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "מראה שורות"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "סה\"כ"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "שאילתה לקחה %01.4f שניות"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2439,11 +2574,6 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "נכשל בקריאת הקובץ"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 #, fuzzy
 msgid ""
@@ -2451,15 +2581,6 @@ msgid ""
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "יכול להיות הערכה. ראה FAQ 3.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2486,7 +2607,7 @@ msgstr "נוצר ע\"י"
 msgid "Rows"
 msgstr "שורות"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL החזיר חבילת תוצאות ריקה (לדוגמא, אפס שורות)."
@@ -2532,6 +2653,11 @@ msgstr "מבנה"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "אין אינדקסים מוגדרים!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2569,6 +2695,13 @@ msgstr "המפתח הראשי הוסר"
 msgid "Index %s has been dropped"
 msgstr "אינדקס %s הוסר"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2701,7 +2834,7 @@ msgstr "הוספה לאינדקס &nbsp;%s&nbsp;שורה/שורות"
 msgid "Add a new User"
 msgstr "הוספת משתמש חדש"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "משתמש חדש נוסף."
 
@@ -2894,10 +3027,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "אפשר לכל משתמש לגשת לכתובת מועדפת זאת"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "כתובת מועדפת נמחקה."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "תווית"
@@ -2940,15 +3069,7 @@ msgstr "\"bzipped\""
 msgid "Calendar"
 msgstr "לוח שנה"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "לא ניתן לשנות שם אינדקס אל PRIMARY!"
 
@@ -3066,11 +3187,6 @@ msgstr "אנא הגדר נקודות ציון עבור טבלה %s"
 msgid "Connections"
 msgstr "חיבורים"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "מאגר נתונים %s הועתק אל %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "העתקת טבלה אל (מסד נתונים<b>.</b>טבלה):"
@@ -3092,7 +3208,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3191,26 +3307,17 @@ msgstr ""
 msgid "Danish"
 msgstr "דנית"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "שם מאגר הנתונים ריק!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "אפשרויות ייצוא מאגר נתונים"
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "מסד הנתונים %s נמחק."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s מסדי נתונים נמחקו בהצלחה."
@@ -3235,7 +3342,7 @@ msgstr "ביטול סטטיסטיקה"
 msgid "Enable Statistics"
 msgstr "הפעלת סטטיסטיקה"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3283,7 +3390,7 @@ msgstr "איחוי טבלה"
 msgid "Use delayed inserts"
 msgstr "השתמש בהכנסות מעוכבות"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3494,33 +3601,12 @@ msgid ""
 "File %s already exists on server, change filename or check overwrite option."
 msgstr "קובץ %s כבר קיים על השרת, שנה שם קובץ או בדוק אופציית כתיבה-על."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr ""
-
-#: libraries/messages.inc.php:335
-#, fuzzy
-msgid "server name"
-msgstr "שם משתמש"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "שדות"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3544,7 +3630,7 @@ msgstr "ריקון טבלה (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3728,13 +3814,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3770,7 +3849,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "הכנסה כשורה חדשה"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4088,17 +4167,10 @@ msgstr "ראיית תהליכים"
 msgid "No databases"
 msgstr "אין מאגרי נתונים"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "אף מאגר נתונים לא נבחר."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "ללא תיאור"
@@ -4112,15 +4184,11 @@ msgstr "אין מידע מצב מפורט על מנוע אחסון זה."
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "אין אינדקסים מוגדרים!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "No index parts defined!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "ללא שינוי"
 
@@ -4139,7 +4207,7 @@ msgstr "לתבנית זאת אין אפשרויות"
 msgid "The web server does not have permission to save the file %s."
 msgstr "לשרת אין הרשאה לשמור את קובץ %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "אין לך הרשאות מספיקות להיות כאן כרגע!"
 
@@ -4174,7 +4242,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "טבלה <b>%s</b> לא נמצאה או לא קיימת בתוך %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "לא נמצאו משתמשים."
 
@@ -4224,7 +4293,7 @@ msgstr "אחזקת טבלה"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "הסיסמא עבור %s שונתה בהצלחה."
@@ -4327,11 +4396,11 @@ msgstr "Polish"
 msgid "Port"
 msgstr "סידור"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr ""
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4530,7 +4599,7 @@ msgstr "מאפשר מחיקת מידע."
 msgid "No privileges."
 msgstr "ללא הרשאות."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "ההרשאות נטענו מחדש בהצלחה."
 
@@ -4572,11 +4641,6 @@ msgid ""
 "server."
 msgstr "<b>סטטיטיקת שאילתות</b>: מאז ההפעלה, %s שאילתות נשלחו לשרת."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "שאילתה לקחה %01.4f שניות"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "סוג שאילתה"
@@ -4605,14 +4669,6 @@ msgstr ""
 msgid "Relational schema"
 msgstr ""
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"תכונות נוספות לעבודה עם טבלאות מקושרות בוטלו. לעוד מידע למה לחץ %sכאן%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "יחסים"
@@ -4651,11 +4707,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "הסרת משתמשים שנבחרו"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "מאגר נתונים %s שונה אל %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4762,7 +4813,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4898,7 +4949,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "שלילת כל ההרשאות הפעילות מהמשתמשים ומחיקתם לאחר מכן."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "אתה שללת הרשאות עבור %s"
@@ -5057,19 +5108,11 @@ msgstr "הראה שאילתות שלמות"
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "מראה שורות"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5822,7 +5865,7 @@ msgstr "שם המשתמש %s כבר קיים!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr ""
@@ -5841,7 +5884,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "שם הטבלה ריק!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "טבלה %s נמחקה"
@@ -5962,7 +6005,7 @@ msgstr "מארח זה"
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr ""
@@ -5973,12 +6016,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -5995,10 +6032,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "סה\"כ"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6273,7 +6306,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "לא ידוע"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "אתה עדכנת הרשאות עבור %s."
@@ -6292,17 +6325,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "אתה צריך לשדרג אל %s %s לפחות."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "שימוש"
@@ -6316,7 +6338,7 @@ msgstr "צירוף תוי ציטוט (backquotes) אל שמות טבלאות ו
 msgid "Use Host Table"
 msgstr "Use Host Table"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "שם המשתמש %s כבר קיים!"
@@ -6329,7 +6351,7 @@ msgstr "שם המשתמש %s כבר קיים!"
 msgid "User name"
 msgstr "שם משתמש"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "המשתמש שנבחר לא נמצא בטבלת ההרשאות."
 
@@ -6337,7 +6359,7 @@ msgstr "המשתמש שנבחר לא נמצא בטבלת ההרשאות."
 msgid "User overview"
 msgstr "סקירת משתמשים"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 #, fuzzy
 msgid "The selected users have been deleted successfully."
 msgstr "%s מסדי נתונים נמחקו בהצלחה."
@@ -6397,10 +6419,6 @@ msgstr "ראיית הוצאה (תבנית) של טבלה"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr ""
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6418,10 +6436,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "תו כללי"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "שם משתמש/סיסמה שגויים. הגישה נדחתה."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/hi.po b/po/hi.po
index 0745c971f..f12377171 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-05-05 04:47+0200\n"
 "Last-Translator:  <u4663530@anu.edu.au>\n"
 "Language-Team: hindi <hi@li.org>\n"
@@ -90,6 +90,11 @@ msgstr "वर्णन"
 msgid "Use this value"
 msgstr "इस वाल्यु का उपयोग करें"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr ""
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "डाटाबेस टिप्पणि: "
@@ -206,6 +211,20 @@ msgstr "सभी का चयन करें"
 msgid "Unselect All"
 msgstr " सभी को रद्द करें"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr ""
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr ""
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr ""
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "दताबसे का नाम बदल कर ____ रखें"
@@ -319,6 +338,13 @@ msgstr "सक्षम"
 msgid "Collation"
 msgstr ""
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "PDF schema दिखाओ"
@@ -646,7 +672,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -814,16 +841,64 @@ msgstr ""
 msgid "Database Log"
 msgstr ""
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr ""
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "यह बुकमार्क हटा दिया गया है"
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "बुकमार्क %s बनाया"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -840,7 +915,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr ""
 
@@ -880,10 +956,12 @@ msgid "The user name is empty!"
 msgstr "यूसरनेम खाली है!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr ""
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr ""
 
@@ -1295,7 +1373,8 @@ msgstr "पासव्रड:"
 msgid "Server Choice"
 msgstr "Server चुनिये"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr ""
 
@@ -1317,6 +1396,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr ""
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "यूसरनेम/पासवर्ड गलत है।  Access denied."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1430,11 +1513,12 @@ msgstr "इंग्लिश"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "डोक्युमेंटेशन"
 
@@ -1498,7 +1582,7 @@ msgid "Skip Validate SQL"
 msgstr ""
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr ""
 
@@ -1551,7 +1635,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1711,6 +1796,7 @@ msgid "Create"
 msgstr "बनाइये"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "कोइ प्रिविलेज नहीं"
 
@@ -1727,6 +1813,10 @@ msgstr " डाटाबेस मे नया टेबल बनाओ"
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1755,6 +1845,26 @@ msgstr ""
 msgid "File name template"
 msgstr ""
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr ""
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr ""
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr ""
@@ -1820,6 +1930,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr ""
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr ""
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1965,6 +2084,20 @@ msgstr ""
 msgid "in query"
 msgstr ""
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "रौ देखिये"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr " कुल"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "क्वरी को %01.4f सेकेंड का समय लगा"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2402,26 +2535,12 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr ""
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2447,7 +2566,7 @@ msgstr ""
 msgid "Rows"
 msgstr ""
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
@@ -2491,6 +2610,11 @@ msgstr ""
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr ""
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2527,6 +2651,13 @@ msgstr ""
 msgid "Index %s has been dropped"
 msgstr ""
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2658,7 +2789,7 @@ msgstr "सूचकांक में जोडें &nbsp;%s&nbsp;column(s)"
 msgid "Add a new User"
 msgstr "नया यूसर जोडें"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "आपने नया यूसर बना लिया"
 
@@ -2847,10 +2978,6 @@ msgstr "BLOB भण्डार में अपलोड करें"
 msgid "Let every user access this bookmark"
 msgstr "हर उपयोकर्ता को अनुमति दें इस बुकमार्क का उपयोग करने के लिए"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "यह बुकमार्क हटा दिया गया है"
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "लेबल"
@@ -2893,15 +3020,7 @@ msgstr ""
 msgid "Calendar"
 msgstr ""
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "इन्डेक्स को PRIMARY नाम मे नहीं बदल सकते!"
 
@@ -3018,11 +3137,6 @@ msgstr ""
 msgid "Connections"
 msgstr ""
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr ""
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr " (database<b>.</b>table) में टेबल को कापी करें:"
@@ -3044,7 +3158,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3140,26 +3254,17 @@ msgstr ""
 msgid "Danish"
 msgstr ""
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr ""
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr ""
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr ""
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s डाटाबेस को सफलता से डिलीट कर दिया गया।"
@@ -3183,7 +3288,7 @@ msgstr "आँकडे Disable करें"
 msgid "Enable Statistics"
 msgstr "आँकडे Enable करें"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3228,7 +3333,7 @@ msgstr ""
 msgid "Use delayed inserts"
 msgstr ""
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3436,31 +3541,11 @@ msgid ""
 "File %s already exists on server, change filename or check overwrite option."
 msgstr ""
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr ""
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr ""
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr ""
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3481,7 +3566,7 @@ msgstr " टेबल को Flush करें (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3663,13 +3748,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3702,7 +3780,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "इसको नया रौ में जोडे "
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4010,17 +4088,10 @@ msgstr "प्रोसेस दिखाओ"
 msgid "No databases"
 msgstr "कोइ डाटाबेस नहिं"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr " कोइ डाटाबेस नहीं चुना गया है।"
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr ""
@@ -4034,15 +4105,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr ""
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr ""
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "कोइ बदलाव नहीं"
 
@@ -4060,7 +4127,7 @@ msgstr ""
 msgid "The web server does not have permission to save the file %s."
 msgstr ""
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr ""
 
@@ -4095,7 +4162,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr ""
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "कोई यूसर नहीं।"
 
@@ -4142,7 +4210,7 @@ msgstr ""
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr ""
@@ -4242,11 +4310,11 @@ msgstr ""
 msgid "Port"
 msgstr ""
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr ""
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4441,7 +4509,7 @@ msgstr ""
 msgid "No privileges."
 msgstr ""
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
@@ -4484,11 +4552,6 @@ msgstr ""
 "<b>Query statistics</b>: Since its startup, %s queries have been sent to the "
 "server."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "क्वरी को %01.4f सेकेंड का समय लगा"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr ""
@@ -4517,13 +4580,6 @@ msgstr ""
 msgid "Relational schema"
 msgstr ""
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr ""
@@ -4562,11 +4618,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr ""
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr ""
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4670,7 +4721,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4806,7 +4857,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "आपने %s के privileges वापस ले लिया "
@@ -4961,19 +5012,11 @@ msgstr ""
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "रौ देखिये"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5723,7 +5766,7 @@ msgstr ""
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr ""
@@ -5742,7 +5785,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr " टेबल का नाम खाली है!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr ""
@@ -5863,7 +5906,7 @@ msgstr ""
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Thread %s को सफलता से मारा गया।"
@@ -5874,12 +5917,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -5896,10 +5933,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr " कुल"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6170,7 +6203,7 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "आपने %s के प्रिविलेज अपडेट कर दिया ।"
@@ -6189,17 +6222,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr ""
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "उपयोग"
@@ -6213,7 +6235,7 @@ msgstr " टेबल और फील्ड के नाम को backquotes
 msgid "Use Host Table"
 msgstr ""
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
@@ -6226,7 +6248,7 @@ msgstr ""
 msgid "User name"
 msgstr "यूसर नेम"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
@@ -6234,7 +6256,7 @@ msgstr ""
 msgid "User overview"
 msgstr ""
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr ""
 
@@ -6293,10 +6315,6 @@ msgstr ""
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr ""
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6314,10 +6332,6 @@ msgstr ""
 msgid "wildcard"
 msgstr ""
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "यूसरनेम/पासवर्ड गलत है।  Access denied."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/hr.po b/po/hr.po
index 442c49e18..d52a1ed15 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:13+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: croatian <hr@li.org>\n"
@@ -89,6 +89,11 @@ msgstr "Opis"
 msgid "Use this value"
 msgstr "Upotrijebi ovu vrijednost"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Baza podataka %1$s uspješno je izrađena."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Komentar baze podataka:  "
@@ -205,6 +210,20 @@ msgstr "Odaberi sve"
 msgid "Unselect All"
 msgstr "Ukloni sav odabir"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Naziv baze podataka je prazan!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Baza podataka %s preimenovana je u %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Baza podataka %s kopirana je u %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Preimenuj bazu podataka u"
@@ -317,6 +336,15 @@ msgstr "Omogućeno"
 msgid "Collation"
 msgstr "Uspoređivanje"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Dodatne osobine za rad s relacijski tablicama su isključene. Kako biste "
+"saznali razloge, pritisnite %sovdje%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Prikaži PDF shemu"
@@ -644,7 +672,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -821,16 +850,74 @@ msgstr "Provjeri tablicu"
 msgid "Database Log"
 msgstr "Baza podataka"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Vjerojatno ste pokušali s učitavanjem prevelike datoteke. Pogledajte %"
+"sdokumentaciju%s radi uputa o načinima rješavanja ovog ograničenja."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Datoteku nije moguće pročitati"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Pokušali ste učitati datoteku s nepodržanim načinom komprimiranja (%s). "
+"Takva podrška još nije implementirana ili je onemogućena u vašoj "
+"konfiguraciji."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Nisu primljeni nikakvi podaci za uvoz. Ili nije dat naziv datoteke ili "
+"veličina datoteke prelazi najveću dopuštenu veličinu od strane vaše PHP "
+"konfiguracije. Pogledajte ČPP 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "Nije moguće učitati dodatke za uvoz. Provjerite svoju instalaciju!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Favorit je izbrisan."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Prikazivanje oznake"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Izrađen je favorit %s"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Uvoz je uspješno dovršen. Izvršeno upita: %d ."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Vrijeme za skriptu je isteklo. Ako želite završiti uvoz, ponovo podnesite "
+"istu datoteku i uvoz će nastaviti."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -849,7 +936,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" izjave su onemogućene."
 
@@ -889,10 +977,12 @@ msgid "The user name is empty!"
 msgstr "Korisničko ime je prazno!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Lozinka je prazna!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Lozinke se ne podudaraju!"
 
@@ -1316,7 +1406,8 @@ msgstr "Lozinka:"
 msgid "Server Choice"
 msgstr "Odabir poslužitelja"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Od ovog mjesta potrebno je omogućiti kolačiće."
 
@@ -1338,6 +1429,10 @@ msgstr "Nije bilo nikakvih aktivnosti tijekom %s sekunda. Prijavite se ponovo."
 msgid "Cannot log in to the MySQL server"
 msgstr "Prijavljivanje na MySQL poslužitelj nije moguće"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Pogrešno korisničko ime ili lozinka. Pristup odbijen."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1471,11 +1566,12 @@ msgstr "Poslano"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentacija"
 
@@ -1539,7 +1635,7 @@ msgid "Skip Validate SQL"
 msgstr "Preskoči provjeru valjanosti SQL-a"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Provjera valjanosti SQL-a"
 
@@ -1594,7 +1690,8 @@ msgstr "Na funkcionalnost %s utječe poznati nedostatak. Pogledajte %s"
 msgid "Font size"
 msgstr "Veličina fonta"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1760,6 +1857,7 @@ msgid "Create"
 msgstr "Izradi"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Bez privilegija"
 
@@ -1776,6 +1874,10 @@ msgstr "Izradi novu tablicu u bazi podataka %s"
 msgid "Number of fields"
 msgstr "Broj polja"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr "Nije moguće učitati dodatke za izvoz. Provjerite svoju instalaciju!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1804,6 +1906,29 @@ msgstr "Prepiši postojeće datoteke"
 msgid "File name template"
 msgstr "Predložak naziva datoteka"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "naziv poslužitelja"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "naziv baze podataka"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "naziv tablice"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Vrijednost se interpretira pomoću %1$sstrftime%2$s, pa možete upotrijebiti "
+"naredbe oblikovanja vremena. Dodatno se mogu dogoditi sljedeća "
+"preoblikovanja: \"%3$s\". Ostatak teksta bit će zadržan u izvornom obliku."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "zapamti predložak"
@@ -1875,6 +2000,15 @@ msgstr "Datoteka za uvoz"
 msgid "Location of the text file"
 msgstr "Lokacija tekstualne datoteke"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Učitavanje datoteka nije dopušteno na ovom poslužitelju."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Mapu koju ste odabrali za potrebe učitavanja nije moguće dohvatiti"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2023,6 +2157,20 @@ msgstr "Eliminiraj"
 msgid "in query"
 msgstr "unutar upita"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Prikazivanje redaka"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "ukupno"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Upit je trajao %01.4f sek"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2512,29 +2660,12 @@ msgstr "Zapisivanje datoteke na disk nije uspjelo."
 msgid "File upload stopped by extension."
 msgstr "Učitavanje datoteke prekinuto je uslijed ekstenzije."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Datoteku nije moguće pročitati"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Pogreška tijekom premještanja učitane datoteke. Pogledajte ČPP 1.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Pokušali ste učitati datoteku s nepodržanim načinom komprimiranja (%s). "
-"Takva podrška još nije implementirana ili je onemogućena u vašoj "
-"konfiguraciji."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2561,7 +2692,7 @@ msgstr "Generirano s"
 msgid "Rows"
 msgstr "Redaka"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL je vratio prazan komplet rezultata (npr. nula redova)."
@@ -2608,6 +2739,11 @@ msgstr "Strukturu"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Nema definiranog indeksa!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2644,6 +2780,14 @@ msgstr "Primarni ključ je odbačen"
 msgid "Index %s has been dropped"
 msgstr "Index %s je odbačen"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"Indeksi %1$s i %2$s izgledaju jednakim i jednog od njih moguće je ukloniti."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2776,7 +2920,7 @@ msgstr "Dodaj u indeks &nbsp;%s&nbsp;stupci"
 msgid "Add a new User"
 msgstr "Dodaj novog korisnika"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Dodali ste novog korisnika."
 
@@ -2969,10 +3113,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "Neka svi korisnici imaju pristup ovom favoritu"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Favorit je izbrisan."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Oznaka"
@@ -3015,15 +3155,7 @@ msgstr "\"bzipano\""
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr "Nije moguće učitati dodatke za izvoz. Provjerite svoju instalaciju!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "Nije moguće učitati dodatke za uvoz. Provjerite svoju instalaciju!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Preimenovanje indeksa u PRIMARY nije moguće!"
 
@@ -3141,11 +3273,6 @@ msgstr "Konfigurirajte koordinate tablice %s"
 msgid "Connections"
 msgstr "Veze"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Baza podataka %s kopirana je u %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Kopiraj tablicu u (bazapodataka<b>.</b>tablica):"
@@ -3167,7 +3294,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3265,26 +3392,17 @@ msgstr "Češki ili Slovački"
 msgid "Danish"
 msgstr "Danski"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Naziv baze podataka je prazan!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Opcije izvoza baze podataka"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Baza podataka %1$s uspješno je izrađena."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "Baza podataka %s uspješno je odbačena."
@@ -3309,7 +3427,7 @@ msgstr "Onemogući statistike"
 msgid "Enable Statistics"
 msgstr "Omogući statistike"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3358,7 +3476,7 @@ msgstr "Defragmentiraj tablicu"
 msgid "Use delayed inserts"
 msgstr "Upotrijebi odgođena umetanja"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Nema odabranih korisnika za uklanjanje!"
 
@@ -3573,34 +3691,11 @@ msgstr ""
 "Datoteka %s već postoji na poslužitelju. Promijenite naziv ili označite "
 "opciju za prepisivanje."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "naziv baze podataka"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "naziv poslužitelja"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "naziv tablice"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Vrijednost se interpretira pomoću %1$sstrftime%2$s, pa možete upotrijebiti "
-"naredbe oblikovanja vremena. Dodatno se mogu dogoditi sljedeća "
-"preoblikovanja: \"%3$s\". Ostatak teksta bit će zadržan u izvornom obliku."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Datoteke"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3625,7 +3720,7 @@ msgstr "Isprazni tablicu (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Isprazni (zatvori) sve tablice"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3810,14 +3905,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"Indeksi %1$s i %2$s izgledaju jednakim i jednog od njih moguće je ukloniti."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3854,7 +3941,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Umetni kao novi redak"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Umetnut ID retka: %1$d"
@@ -4179,20 +4266,10 @@ msgstr "Prikaži procese"
 msgid "No databases"
 msgstr "Nema baza podataka"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Nema odabrane baze podataka."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Nisu primljeni nikakvi podaci za uvoz. Ili nije dat naziv datoteke ili "
-"veličina datoteke prelazi najveću dopuštenu veličinu od strane vaše PHP "
-"konfiguracije. Pogledajte ČPP 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "bez opisa"
@@ -4206,15 +4283,11 @@ msgstr "Za ovaj pogon pohranjivanje ne postoje raspoloživi podaci."
 msgid "No files found inside ZIP archive!"
 msgstr "Datoteke nisu pronađene unutar ZIP arhive!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Nema definiranog indeksa!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Nema definiranih dijelova indeksa!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Bez izmjena"
 
@@ -4233,7 +4306,7 @@ msgstr "Ovaj oblik nema raspoložive opcije"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Web poslužitelj nema dopuštenja za spremanje datoteke %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Nemate dovoljno privilegija da boravite ovdje!"
 
@@ -4270,7 +4343,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "tablica <b>%s</b> nije pronađena ili nije zadana u %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Korisnici nisu pronađeni."
 
@@ -4317,7 +4391,7 @@ msgstr "Održavanje particije"
 msgid "Partition %s"
 msgstr "Particija %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Lozinka za %s uspješno je promijenjena."
@@ -4419,11 +4493,11 @@ msgstr "Poljski"
 msgid "Port"
 msgstr "Presloži"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Naziv primarnog ključa mora biti \"PRIMARY\"!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4628,7 +4702,7 @@ msgstr "Dopušta mijenjanje podataka."
 msgid "No privileges."
 msgstr "Bez privilegija."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Privilegije su uspješno učitane."
 
@@ -4670,11 +4744,6 @@ msgid ""
 msgstr ""
 "<b>Statistike upita</b>: Od pokretanja poslužitelju je upućeno %s upita."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Upit je trajao %01.4f sek"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Vrsta upita"
@@ -4703,15 +4772,6 @@ msgstr "Provjeri referencijalan integritet:"
 msgid "Relational schema"
 msgstr "Shema relacija"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Dodatne osobine za rad s relacijski tablicama su isključene. Kako biste "
-"saznali razloge, pritisnite %sovdje%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relacije"
@@ -4751,11 +4811,6 @@ msgstr "Ukloni particioniranje"
 msgid "Remove selected users"
 msgstr "Ukloni odabrane korisnike"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Baza podataka %s preimenovana je u %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4861,7 +4916,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -5001,7 +5056,7 @@ msgstr "Ponovno pokreni umetanje s %s redaka"
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Opozovi sve aktivne privilegije korisnika i potom ih izbriši."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Opozvali ste privilegije za %s"
@@ -5164,19 +5219,11 @@ msgstr "Prikaži pune upite"
 msgid "Show/Hide left menu"
 msgstr "Prikaži/sakrij lijevi izbornik"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Prikazivanje oznake"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Prikazivanje kao PHP koda"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Prikazivanje redaka"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Prikazivanje SQL upita"
 
@@ -6065,7 +6112,7 @@ msgstr "Tablica %s već postoji!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Tablica %1$s uspješno je izmijenjena."
@@ -6084,7 +6131,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Naziv tablice je prazan!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "Tablica %1$s je izrađena."
@@ -6206,7 +6253,7 @@ msgstr "Ovo računalo"
 msgid "Threads"
 msgstr "Grane"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Grana %s uspješno je prekinuta."
@@ -6220,14 +6267,6 @@ msgstr ""
 "znači da phpMyAdmin neće biti u mogućnosti završiti ovaj uvoz sve dok ne "
 "povećate vremenska ograničenja unutar php."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Vrijeme za skriptu je isteklo. Ako želite završiti uvoz, ponovo podnesite "
-"istu datoteku i uvoz će nastaviti."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "stranica od / prema"
@@ -6244,10 +6283,6 @@ msgstr "Malo / Veliko"
 msgid "To select relation, click :"
 msgstr "Za odabir relacije pritisnite:"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "ukupno"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6562,7 +6597,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "nepoznato"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Ažurirali ste privilegije za %s."
@@ -6582,19 +6617,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Trebali biste nadograditi na %s %s ili kasniju."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Vjerojatno ste pokušali s učitavanjem prevelike datoteke. Pogledajte %"
-"sdokumentaciju%s radi uputa o načinima rješavanja ovog ograničenja."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Učitavanje datoteka nije dopušteno na ovom poslužitelju."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Upotreba"
@@ -6608,7 +6630,7 @@ msgstr "Unesi nazive tablica i polja sa stražnjim navodnicima"
 msgid "Use Host Table"
 msgstr "Upotrijebi tablicu poslužitelja"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Korisnik %s već postoji!"
@@ -6621,7 +6643,7 @@ msgstr "Korisnik %s već postoji!"
 msgid "User name"
 msgstr "Korisničko ime"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Odabrani korisnik nije pronađen u tablici privilegija."
 
@@ -6629,7 +6651,7 @@ msgstr "Odabrani korisnik nije pronađen u tablici privilegija."
 msgid "User overview"
 msgstr "Pregled korisnika"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Odabrani korisnici uspješno su izbrisani."
 
@@ -6692,10 +6714,6 @@ msgstr "Prikaži ispis (shemu) tablice"
 msgid "VIEW name"
 msgstr "Naziv prikaza"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Mapu koju ste odabrali za potrebe učitavanja nije moguće dohvatiti"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Web poslužitelj"
@@ -6713,10 +6731,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "džoker"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Pogrešno korisničko ime ili lozinka. Pristup odbijen."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/hu.po b/po/hu.po
index 77bbce73b..9c2949c7d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:15+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: hungarian <hu@li.org>\n"
@@ -89,6 +89,11 @@ msgstr "Leírás"
 msgid "Use this value"
 msgstr "Ezen érték használata"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "A(z) %1$s adatbázis elkészült."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Megjegyzés az adatbázishoz: "
@@ -205,6 +210,20 @@ msgstr "Mind kijelölése"
 msgid "Unselect All"
 msgstr "Mind törlése"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Üres az adatbázis neve!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "A(z) %s adatbázis átnevezése %s névre megtörtént"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "A(z) %s adatbázis másolása a(z) %s adatbázisba megtörtént"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Adatbázis átnevezése"
@@ -315,6 +334,15 @@ msgstr "Engedélyezés"
 msgid "Collation"
 msgstr "Illesztés"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"A hivatkozott táblákkal történő munka kiegészítő funkciói inaktiválásra "
+"kerültek. Ha szeretné megtudni, hogy miért, kattintson %side%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "PDF séma megjelenítése"
@@ -642,7 +670,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -819,17 +848,76 @@ msgstr "Tábla ellenőrzése"
 msgid "Database Log"
 msgstr "Adatbázis"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Ön bizonyára túl nagy fájlt próbált meg feltölteni. Kérjük, nézzen utána a %"
+"sdokumentációban%s a korlátozás feloldásának."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Nem lehetett beolvasni a fájlt"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Ön nem támogatott tömörítésű (%s) fájlt kísérelt meg betölteni. Vagy nem "
+"valósították meg a támogatását, vagy letiltják a beállítások."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Nem került importálandó adat fogadásra. Vagy nem került átadásra fájlnév, "
+"vagy a fájlméret túllépte a PHP beállításokban engedélyezett legnagyobb "
+"méretet. Lásd GYIK 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"Nem lehetett betölteni az importáló beépülő modulokat. Kérjük, ellenőrizze a "
+"telepítését!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "A könyvjelző törlése megtörtént."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Könyvjelző megjelenítése"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "A(z) %s könyvjelző elkészült"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 "Az importálás sikeresen befejeződött, %d lekérdezés került végrehajtásra."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Script időtúllépés történt, ha be akarja fejezni az importálást, akkor "
+"küldje újra ugyanazt a fájlt és az importálás folytatódni fog."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "A phpMyAdmin <b>keretkezelő</b> böngészőben használhatóbb."
@@ -846,7 +934,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "A \"DROP DATABASE\" utasítást letiltották."
 
@@ -886,10 +975,12 @@ msgid "The user name is empty!"
 msgstr "Üres a felhasználónév!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Üres a jelszó mező!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Nem egyeznek a jelszavak!"
 
@@ -1315,7 +1406,8 @@ msgstr "Jelszó:"
 msgid "Server Choice"
 msgstr "Szerver választása"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Ettől a ponttól engedélyeznie kell a cookie-k fogadását."
 
@@ -1338,6 +1430,10 @@ msgstr "Nem volt tevékenység %s másodperce; jelentkezzen be újra"
 msgid "Cannot log in to the MySQL server"
 msgstr "Nem lehet bejelentkezni a MySQL szerverre"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Hibás felhasználónév/jelszó. A hozzáférés megtagadva."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1470,11 +1566,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentáció"
 
@@ -1538,7 +1635,7 @@ msgid "Skip Validate SQL"
 msgstr "SQL érvényesítés átugrása"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "SQL érvényesítése"
 
@@ -1593,7 +1690,8 @@ msgstr "A(z) %s funkcióra egy ismert hiba van hatással, lásd itt: %s"
 msgid "Font size"
 msgstr "Betűméret"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1760,6 +1858,7 @@ msgid "Create"
 msgstr "Létrehozás"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Nincs jog"
 
@@ -1776,6 +1875,12 @@ msgstr "Új tábla létrehozása a(z) %s adatbázisban"
 msgid "Number of fields"
 msgstr "Mezők száma"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"Nem lehetett betölteni az exportáló beépülő modulokat. Kérjük, ellenőrizze a "
+"telepítését!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1804,6 +1909,29 @@ msgstr "A létező fájl(ok) felülírása"
 msgid "File name template"
 msgstr "Fájlnévsablon"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "szerver neve"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "adatbázis neve"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "tábla neve"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Ennek az értéknek az értelmezése az %1$sstrftime%2$s használatával történik, "
+"vagyis időformázó karakterláncokat használhat. A következő átalakításokra "
+"kerül továbbá sor: %3$s. Más szöveg eredeti állapotában kerül megtartásra."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "a sablon megjegyzése"
@@ -1875,6 +2003,15 @@ msgstr "Importálandó fájl"
 msgid "Location of the text file"
 msgstr "A szövegfájl helye"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Ezen a szerveren a fájlfeltöltések nem engedélyezettek."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Nem elérhető a feltöltésekhez megadott könyvtár"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2026,6 +2163,20 @@ msgstr "Leállít"
 msgid "in query"
 msgstr "lekérdezésben"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Megjelenített sorok:"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "összesen"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "a lekérdezés %01.4f másodpercig tartott"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2514,28 +2665,12 @@ msgstr "Nem sikerült lemezre írni a fájlt."
 msgid "File upload stopped by extension."
 msgstr "A fájlfeltöltés kiterjesztés alapján leállt."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Nem lehetett beolvasni a fájlt"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Hiba történt a feltöltött fájl áthelyezésekor, lásd: GYIK 1.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Ön nem támogatott tömörítésű (%s) fájlt kísérelt meg betölteni. Vagy nem "
-"valósították meg a támogatását, vagy letiltják a beállítások."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2562,7 +2697,7 @@ msgstr "Készítette"
 msgid "Rows"
 msgstr "sor"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "A MySQL üres eredményhalmazt adott vissza (pl. nulla sorok)."
@@ -2608,6 +2743,11 @@ msgstr "Szerkezet"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Nincs meghatározott index!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2644,6 +2784,15 @@ msgstr "Az elsődleges kulcs eldobása megtörtént"
 msgid "Index %s has been dropped"
 msgstr "A(z) %s index eldobása megtörtént"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"A(z) %1$s és a(z) %2$s egyenlőnek tűnik, és egyikük valószínűleg "
+"eltávolítható."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2776,7 +2925,7 @@ msgstr "Hozzáadás az index &nbsp;%s&nbsp;oszlophoz"
 msgid "Add a new User"
 msgstr "Új felhasználó hozzáadása"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Az új felhasználó hozzáadása megtörtént."
 
@@ -2970,10 +3119,6 @@ msgstr ""
 "A hozzáférés ehhez a könyvjelzőhöz az összes felhasználó számára "
 "engedélyezett"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "A könyvjelző törlése megtörtént."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Név"
@@ -3016,19 +3161,7 @@ msgstr "\"bzip tömörítés\""
 msgid "Calendar"
 msgstr "Naptár"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"Nem lehetett betölteni az exportáló beépülő modulokat. Kérjük, ellenőrizze a "
-"telepítését!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"Nem lehetett betölteni az importáló beépülő modulokat. Kérjük, ellenőrizze a "
-"telepítését!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Nem nevezhető át PRIMARY-re az index!"
 
@@ -3149,11 +3282,6 @@ msgstr "Állítsa be a(z) %s tábla koordinátáit"
 msgid "Connections"
 msgstr "Kapcsolatok"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "A(z) %s adatbázis másolása a(z) %s adatbázisba megtörtént"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Tábla másolása (adatbázis<b>.</b>tábla):"
@@ -3177,7 +3305,7 @@ msgstr "Nem lehetett kapcsolódni a MySQL-szerverhez"
 msgid "Could not connect to the target"
 msgstr "Nem lehetett kapcsolódni a MySQL-szerverhez"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3277,26 +3405,17 @@ msgstr "Csehszlovák"
 msgid "Danish"
 msgstr "Dán"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Üres az adatbázis neve!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Adatbázis exportálási beállításai"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "A(z) %1$s adatbázis elkészült."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "A(z) %s adatbázis eldobása sikerült."
@@ -3321,7 +3440,7 @@ msgstr "Statisztika letiltása"
 msgid "Enable Statistics"
 msgstr "Statisztika engedélyezése"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3369,7 +3488,7 @@ msgstr "Tábla töredezettségmentesítése"
 msgid "Use delayed inserts"
 msgstr "Késleltetett beszúrások használata"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Nincs törlésre kijelölt felhasználó!"
 
@@ -3585,34 +3704,11 @@ msgstr ""
 "már létezik %s fájl a szerveren, változtassa meg a fájlnevet, vagy állítsa "
 "be a felülírási opciót!"
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "adatbázis neve"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "szerver neve"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "tábla neve"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Ennek az értéknek az értelmezése az %1$sstrftime%2$s használatával történik, "
-"vagyis időformázó karakterláncokat használhat. A következő átalakításokra "
-"kerül továbbá sor: %3$s. Más szöveg eredeti állapotában kerül megtartásra."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Fájlok"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3637,7 +3733,7 @@ msgstr "Tábla kiírása (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Összes tábla kiírása (bezárása)"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3824,15 +3920,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"A(z) %1$s és a(z) %2$s egyenlőnek tűnik, és egyikük valószínűleg "
-"eltávolítható."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3869,7 +3956,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Beszúrás új sorként"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "A beszúrt sor azonosítószáma: %1$d"
@@ -4194,20 +4281,10 @@ msgstr "Folyamatok megjelenítése"
 msgid "No databases"
 msgstr "Nincs adatbázis"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Nincs kiválasztott adatbázis."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Nem került importálandó adat fogadásra. Vagy nem került átadásra fájlnév, "
-"vagy a fájlméret túllépte a PHP beállításokban engedélyezett legnagyobb "
-"méretet. Lásd GYIK 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "nincs leírás"
@@ -4222,15 +4299,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "Nem található fájl a ZIP archívumban!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Nincs meghatározott index!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Nincs meghatározott indexrész!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Nincs változás"
 
@@ -4248,7 +4321,7 @@ msgstr "Ennek a formátumnak nincsenek beállításai"
 msgid "The web server does not have permission to save the file %s."
 msgstr "A webszerver számára nem engedélyezett a(z) %s fájl mentése."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Önnek nincs elég joga ahhoz, hogy épp most itt tartózkodjon!"
 
@@ -4286,7 +4359,8 @@ msgid "<b>%s</b> table not found or not set in %s"
 msgstr ""
 "Nem található a(z) <b>%s</b> tábla, vagy nem adták meg a(z) %s adatbázisban"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Nem található(k) a felhasználó(k)."
 
@@ -4333,7 +4407,7 @@ msgstr "Partíció karbantartása"
 msgid "Partition %s"
 msgstr "%s partíció"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "%s jelszavának megváltoztatása sikerült."
@@ -4435,11 +4509,11 @@ msgstr "Lengyel"
 msgid "Port"
 msgstr "Rendezés"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Az elsődleges kulcs nevének \"PRIMARY\"-nak kell lennie!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4650,7 +4724,7 @@ msgstr "Engedélyezi az adatok megváltoztatását."
 msgid "No privileges."
 msgstr "Nincsenek jogok."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "A jogok újratöltése sikerült."
 
@@ -4693,11 +4767,6 @@ msgstr ""
 "<b>Lekérdezési statisztika</b>: Az indulás óta %s kérés került elküldésre a "
 "szerverhez."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "a lekérdezés %01.4f másodpercig tartott"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Lekérdezés típusa"
@@ -4726,15 +4795,6 @@ msgstr "Hivatkozási sértetlenség ellenőrzése:"
 msgid "Relational schema"
 msgstr "Kapcsolati séma"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"A hivatkozott táblákkal történő munka kiegészítő funkciói inaktiválásra "
-"kerültek. Ha szeretné megtudni, hogy miért, kattintson %side%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Kapcsolatok"
@@ -4775,11 +4835,6 @@ msgstr "Particionálás eltávolítása"
 msgid "Remove selected users"
 msgstr "A kijelölt felhasználók törlése"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "A(z) %s adatbázis átnevezése %s névre megtörtént"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4887,7 +4942,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -5028,7 +5083,7 @@ msgstr "Beszúrás újrakezdése %s sorral"
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "A felhasználók összes jogának visszavonása, majd törlése."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "%s jogainak visszavonása megtörtént"
@@ -5196,19 +5251,11 @@ msgstr "Teljes lekérdezések megjelenítése"
 msgid "Show/Hide left menu"
 msgstr "Bal oldali menü megjelenítése/elrejtése"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Könyvjelző megjelenítése"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Megjelenítés PHP kódként"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Megjelenített sorok:"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Megjelenítés SQL lekérdezésként"
 
@@ -6093,7 +6140,7 @@ msgstr "Már létezik nevű %s tábla!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "A(z) %1$s tábla módosítása sikerült"
@@ -6112,7 +6159,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Üres a tábla neve!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "A(z) %1$s tábla elkészült."
@@ -6233,7 +6280,7 @@ msgstr "Ez a hoszt"
 msgid "Threads"
 msgstr "Szálak"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Sikerült leállítani a(z) %s. szálat."
@@ -6247,14 +6294,6 @@ msgstr ""
 "jelenti, hogy a phpMyAdmin nem tudja befejezni ezt az importálást, ha Ön nem "
 "növeli meg a PHP időkorlátozását."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Script időtúllépés történt, ha be akarja fejezni az importálást, akkor "
-"küldje újra ugyanazt a fájlt és az importálás folytatódni fog."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "oldalra/-ról"
@@ -6271,10 +6310,6 @@ msgstr "Kicsi/nagy kapcsoló"
 msgid "To select relation, click :"
 msgstr "A kapcsolat kiválasztásához, kattintson :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "összesen"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6594,7 +6629,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Ön frissítette %s jogait."
@@ -6615,19 +6650,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Frissítenie kell %s %s vagy újabb verzióra."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Ön bizonyára túl nagy fájlt próbált meg feltölteni. Kérjük, nézzen utána a %"
-"sdokumentációban%s a korlátozás feloldásának."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Ezen a szerveren a fájlfeltöltések nem engedélyezettek."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Méret"
@@ -6641,7 +6663,7 @@ msgstr "Idézőjelek használata a tábla- és mezőneveknél"
 msgid "Use Host Table"
 msgstr "Hoszt-tábla használata"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "%s felhasználó már létezik!"
@@ -6654,7 +6676,7 @@ msgstr "%s felhasználó már létezik!"
 msgid "User name"
 msgstr "Felhasználónév"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Nem található a kiválasztott felhasználó a privilégium táblában."
 
@@ -6662,7 +6684,7 @@ msgstr "Nem található a kiválasztott felhasználó a privilégium táblában.
 msgid "User overview"
 msgstr "Felhasználók áttekintése"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "A kiválasztott felhasználók törlése sikerült."
 
@@ -6726,10 +6748,6 @@ msgstr "Tábla kiírás (vázlat) megtekintése"
 msgid "VIEW name"
 msgstr "NÉZET neve"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Nem elérhető a feltöltésekhez megadott könyvtár"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Webszerver"
@@ -6747,10 +6765,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "karakterhelyettesítő"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Hibás felhasználónév/jelszó. A hozzáférés megtagadva."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/id.po b/po/id.po
index 55175cbec..b6b8a8456 100644
--- a/po/id.po
+++ b/po/id.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-04-17 21:14+0200\n"
 "Last-Translator: Azhari Harahap <azhari.harahap@yahoo.com>\n"
 "Language-Team: indonesian <id@li.org>\n"
@@ -91,6 +91,11 @@ msgstr "Deskripsi"
 msgid "Use this value"
 msgstr "gunakan nilai ini"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Database %1$s telah dibuat."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Komentar Database: "
@@ -207,6 +212,20 @@ msgstr "Pilih semua"
 msgid "Unselect All"
 msgstr "Unselect semua"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Nama database kosong!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Nama database %s telah diubah menjadi %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Database %s telah disalin ke %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Ubah nama database menjadi"
@@ -316,6 +335,15 @@ msgstr "Aktif"
 msgid "Collation"
 msgstr "Penyortiran"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Fasilitas penambahan untuk bekerja dengan tabel yang di-link di nonaktifkan. "
+"Untuk mengetahui sebabnya silakan klik %sdisini%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Tampilkan skema PDF"
@@ -643,7 +671,8 @@ msgstr "Pelacakan aktif"
 msgid "Tracking is not active."
 msgstr "Pelacakan tidak aktif."
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -814,16 +843,68 @@ msgstr "Lacak tabel"
 msgid "Database Log"
 msgstr "Log Database"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Anda mungkin meng-upload file yang terlalu besar. Silahkan lihat %"
+"sdokumentasi%s untuk mendapatkan solusi tentang batasan ini."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Gagal membaca File"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Anda mencoba untuk memuat file dengan kompresi yang tidak didukung (%s). "
+"Dukungan belum diimplementasi atau tidak aktif di dalam konfigurasi Anda."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "Tidak dapat memuat plugin import, silahkan periksa instalasi Anda!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Penyimpanan telah dihapus."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -842,7 +923,8 @@ msgstr "Klik untuk memilih"
 msgid "Click to unselect"
 msgstr "Klik untuk batal memilih"
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "Perintah \"HAPUS DATABASE\" dimatikan."
 
@@ -882,10 +964,12 @@ msgid "The user name is empty!"
 msgstr "Nama pengguna masih kosong!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Kata Sandi kosong!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Kata Sandi tidak sama!"
 
@@ -1311,7 +1395,8 @@ msgstr "Kata Sandi:"
 msgid "Server Choice"
 msgstr "Pilihan Server"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Mulai dari sini Cookies harus diaktifkan."
 
@@ -1333,6 +1418,10 @@ msgstr "Tidak ada aktifitas selama %s detik atau lebih. Silakan login kembali"
 msgid "Cannot log in to the MySQL server"
 msgstr "Gagal login ke MySQL server"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Nama Pengguna/Kata Sandi salah. Akses ditolak."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1459,11 +1548,12 @@ msgstr "id"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentasi"
 
@@ -1527,7 +1617,7 @@ msgid "Skip Validate SQL"
 msgstr "Melewati pengesahan (validation) SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Mengesahkan (validate) SQL"
 
@@ -1582,7 +1672,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1747,6 +1838,7 @@ msgid "Create"
 msgstr "Ciptakan"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Tidak ada Hak Akses (privilege)"
 
@@ -1763,6 +1855,10 @@ msgstr "Ciptakan tabel baru pada database %s"
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr "Tidak dapat memuat plugin export, silahkan periksa instalasi Anda!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1791,6 +1887,27 @@ msgstr "Timpahkan (Overwrite) file(s) yang ada"
 msgid "File name template"
 msgstr "Konvensi nama file"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+#, fuzzy
+msgid "server name"
+msgstr "Nama pengguna"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr ""
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "ingat konvensi"
@@ -1862,6 +1979,16 @@ msgstr ""
 msgid "Location of the text file"
 msgstr "dari File"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Upload file tidak diizinkan di server ini."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr ""
+"Direktori yang telah ditetapkan untuk meng-upload tidak dapat dihubungi"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2007,6 +2134,20 @@ msgstr "Tutup"
 msgid "in query"
 msgstr "dalam susunan pemeriksaan"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Tampilan baris"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "jumlah"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "pencarian membutuhkan waktu %01.4f detik"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2469,11 +2610,6 @@ msgstr "Gagal menulis file ke disk"
 msgid "File upload stopped by extension."
 msgstr "Upload file dihentikan oleh ekstensi."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Gagal membaca File"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 #, fuzzy
 msgid ""
@@ -2481,17 +2617,6 @@ msgid ""
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Kemungkinan hanya perkiraan saja. Lihat FAQ 3.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Anda mencoba untuk memuat file dengan kompresi yang tidak didukung (%s). "
-"Dukungan belum diimplementasi atau tidak aktif di dalam konfigurasi Anda."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2518,7 +2643,7 @@ msgstr "Diciptakan oleh"
 msgid "Rows"
 msgstr "Baris"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL balikkan hasil kosong (a.k. baris yang kosong)."
@@ -2564,6 +2689,11 @@ msgstr "Struktur"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Indeks belum ditentukan!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2600,6 +2730,13 @@ msgstr "Kunci utama telah dihapus"
 msgid "Index %s has been dropped"
 msgstr "Indeks %s telah dihapus"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2728,7 +2865,7 @@ msgstr "Menambahkan ke indeks &nbsp;%s&nbsp;kolom"
 msgid "Add a new User"
 msgstr "Menambahkan pengguna baru"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Pengguna baru telah ditambahkan."
 
@@ -2917,10 +3054,6 @@ msgstr "Upload ke repositori BLOB"
 msgid "Let every user access this bookmark"
 msgstr "Izinkan semua pengguna untuk mengakses simpanan ini"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Penyimpanan telah dihapus."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Judul"
@@ -2964,15 +3097,7 @@ msgstr "\"Dikompress dengan BZip\""
 msgid "Calendar"
 msgstr "Kalender"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr "Tidak dapat memuat plugin export, silahkan periksa instalasi Anda!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "Tidak dapat memuat plugin import, silahkan periksa instalasi Anda!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Gagal ubah nama Indeks ke PRIMARY!"
 
@@ -3092,11 +3217,6 @@ msgstr "Silakan konfigurasikan koordinasi bagi tabel %s"
 msgid "Connections"
 msgstr "Koneksi"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Database %s telah disalin ke %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Salin tabel ke (database<b>.</b>nama tabel):"
@@ -3118,7 +3238,7 @@ msgstr "Tidak dapat terhubung ke sumber"
 msgid "Could not connect to the target"
 msgstr "Tidak dapat terhubung ke target"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3216,26 +3336,17 @@ msgstr "Cecko-Slovakia"
 msgid "Danish"
 msgstr "Bahasa Denmark"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Nama database kosong!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Pilihan cara untuk mengekspor Database"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Database %1$s telah dibuat."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr "Database %s tidak ditemukan."
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "Sukses menghapus database %s."
@@ -3259,7 +3370,7 @@ msgstr "Mencacatkan Statistik"
 msgid "Enable Statistics"
 msgstr "Menggiatkan Statistik"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3306,7 +3417,7 @@ msgstr "Defragmentasikan tabel"
 msgid "Use delayed inserts"
 msgstr "Gunakan perintah INSERT memperlambat"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Tidak ada pengguna yang dipilih untuk dihapus!"
 
@@ -3518,33 +3629,12 @@ msgstr ""
 "File %s sudah ada pada server. Gantikan nama file atau periksa pilihan "
 "Overwrite."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr ""
-
-#: libraries/messages.inc.php:335
-#, fuzzy
-msgid "server name"
-msgstr "Nama pengguna"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "Field"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3570,7 +3660,7 @@ msgstr "Tutup tabel (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3754,13 +3844,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3798,7 +3881,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Sisipkan sebagai baris baru"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4121,17 +4204,10 @@ msgstr "Tampilkan Proses"
 msgid "No databases"
 msgstr "Database tidak ditemukan"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Database belum dipilih."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "tanpa keterangan"
@@ -4146,15 +4222,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Indeks belum ditentukan!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Bagian indeks belum diberi definisin!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Tidak ada perubahan"
 
@@ -4173,7 +4245,7 @@ msgstr "Format ini tidak ada pilihannya"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Webserver tidak memilik hak (permission) untuk menyimpan file %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Hak Akses Anda untuk melanjut tidak cukup!"
 
@@ -4210,7 +4282,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> tabel tidak ditemukan atau tidak diset di %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Pengguna tidak ditemukan."
 
@@ -4258,7 +4331,7 @@ msgstr "Pemeliharaan tabel"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Sukses mengubah Kata Sandi untuk %s ."
@@ -4361,11 +4434,11 @@ msgstr "Polandia"
 msgid "Port"
 msgstr "Urutkan"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Nama Kunci utama diwajibkan... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4578,7 +4651,7 @@ msgstr "Mengizinkan untuk ubah data."
 msgid "No privileges."
 msgstr "Tanpa Hak Istimewa (Privileges)."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Sukses reload Hak Istimewa (Privileges)."
 
@@ -4622,11 +4695,6 @@ msgstr ""
 "<b>Informasi statistik</b>: Sejak dihidupkan, %s pencarian telah dikirim "
 "kepada server."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "pencarian membutuhkan waktu %01.4f detik"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Tipe Pencarian"
@@ -4655,15 +4723,6 @@ msgstr "Cek integriti referensial:"
 msgid "Relational schema"
 msgstr "Skema Relational"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Fasilitas penambahan untuk bekerja dengan tabel yang di-link di nonaktifkan. "
-"Untuk mengetahui sebabnya silakan klik %sdisini%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Tabel Relasi"
@@ -4702,11 +4761,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "Hapus pengguna yang dipilih"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Nama database %s telah diubah menjadi %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4813,7 +4867,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4951,7 +5005,7 @@ msgstr ""
 "Cabut seluruh Hak Istimewa (Privileges) dari pengguna, lantas hapus pengguna "
 "tsb. dari daftar tabel pengguna."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Hak akses untuk %s telah dicabut"
@@ -5116,19 +5170,11 @@ msgstr "Tampilkan pencarian yang lengkap"
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Tampilan baris"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5895,7 +5941,7 @@ msgstr "Pengguna %s telah terdaftar!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, fuzzy, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Sukses menghapus Pengguna yang dipilih."
@@ -5914,7 +5960,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Nama tabel kosong!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "Tabel %s telah dihapus"
@@ -6036,7 +6082,7 @@ msgstr "Host yang ini"
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Sukses hentikan Thread %s."
@@ -6047,12 +6093,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6069,10 +6109,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "jumlah"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6377,7 +6413,7 @@ msgstr "Unikode"
 msgid "unknown"
 msgstr "tidak diketahui"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Hak Akses (privilege) untuk %s telah di-update."
@@ -6398,19 +6434,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Disarankan untuk meng-update ke %s versi %s atau lebih baru."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Anda mungkin meng-upload file yang terlalu besar. Silahkan lihat %"
-"sdokumentasi%s untuk mendapatkan solusi tentang batasan ini."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Upload file tidak diizinkan di server ini."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Penggunaan"
@@ -6424,7 +6447,7 @@ msgstr "Nama tabel dan nama field dalam tanda kutip biasa"
 msgid "Use Host Table"
 msgstr "Gunakan Host Table"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Pengguna %s telah terdaftar!"
@@ -6437,7 +6460,7 @@ msgstr "Pengguna %s telah terdaftar!"
 msgid "User name"
 msgstr "Nama pengguna"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 "Pengguna yang dipilih tidak ditemukan pada tabel hak (privilege table)."
@@ -6446,7 +6469,7 @@ msgstr ""
 msgid "User overview"
 msgstr "Pandangan Umum Pengguna"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Sukses menghapus Pengguna yang dipilih."
 
@@ -6509,11 +6532,6 @@ msgstr "Tampilkan Dump (Skema) dari tabel"
 msgid "VIEW name"
 msgstr "Nama VIEW"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr ""
-"Direktori yang telah ditetapkan untuk meng-upload tidak dapat dihubungi"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Server web"
@@ -6531,10 +6549,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "wildcard"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Nama Pengguna/Kata Sandi salah. Akses ditolak."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/it.po b/po/it.po
index c46528626..750348bf4 100644
--- a/po/it.po
+++ b/po/it.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-04-11 11:19+0200\n"
 "Last-Translator: Fabio <fantonifabio@tiscali.it>\n"
 "Language-Team: italian <it@li.org>\n"
@@ -92,6 +92,11 @@ msgstr "Descrizione"
 msgid "Use this value"
 msgstr "Usa questa opzione"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Il database %1$s è stato creato."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Commento al Database: "
@@ -208,6 +213,20 @@ msgstr "Seleziona tutto"
 msgid "Unselect All"
 msgstr "Deseleziona tutto"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Il nome del DataBase è vuoto!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Il DataBase %s è stato rinominato in %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Il Database %s è stato copiato in %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Rinomina il DataBase in"
@@ -318,6 +337,15 @@ msgstr "Abilita"
 msgid "Collation"
 msgstr "Collation"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Le caratteristiche aggiuntive sono state disattivate per funzionare con le "
+"tabelle linkate. Per scoprire perché clicca %squi%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Mostra lo schema del PDF"
@@ -645,7 +673,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -823,16 +852,77 @@ msgstr "Controlla tabella"
 msgid "Database Log"
 msgstr "Database"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Stai probabilmente cercando di caricare sul server un file troppo grosso. "
+"Fai riferimento alla documentazione %sdocumentation%s Per i modi di aggirare "
+"questo limite."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Il file non può essere letto"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Stai cercando di importare un file con un tipo di compressione (%s) non "
+"supportato. Altrimenti il supporto per questo tipo di compressione non è "
+"stato ancora implementato o è stato disabilitato dalla tua configurazione."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Non sono stati ricevuti dati da importare. O non è stato indicato alcun nome "
+"file, oppure è stato superata la dimensione massima consentita per il file, "
+"impostata nella configurazione di PHP. Vedi FAQ 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"Non posso caricare i plugins di importazione, controlla la tua "
+"configurazione!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Il bookmark è stato cancellato."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Mostrando i segnalibri"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Segnalibro %s creato"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Importazione eseguita con successo, %d query eseguite."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Superato il tempo limite dello script, se vuoi finire l'importazione inoltra "
+"nuovamente il file e il processo riprenderà."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin funziona meglio con browser che supportano frames"
@@ -849,7 +939,8 @@ msgstr "Clicca per selezionare"
 msgid "Click to unselect"
 msgstr "Clicca per deselezionare"
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "I comandi \"DROP DATABASE\" sono disabilitati."
 
@@ -890,10 +981,12 @@ msgid "The user name is empty!"
 msgstr "Il nome utente è vuoto!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "La password è vuota!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "La password non coincide!"
 
@@ -1318,7 +1411,8 @@ msgstr "Password:"
 msgid "Server Choice"
 msgstr "Scelta del server"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Da questo punto in poi, i cookie devono essere abilitati."
 
@@ -1342,6 +1436,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Impossibile eseguire il login nel server MySQL"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Nome utente o password errati. Accesso negato."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1473,11 +1571,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Documentazione"
 
@@ -1541,7 +1640,7 @@ msgid "Skip Validate SQL"
 msgstr "Non Validare SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Valida SQL"
 
@@ -1596,7 +1695,8 @@ msgstr "La %s funzionalità è affetta da un bug noto, vedi %s"
 msgid "Font size"
 msgstr "Dimensione font"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1760,6 +1860,7 @@ msgid "Create"
 msgstr "Crea"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Nessun Privilegio"
 
@@ -1776,6 +1877,11 @@ msgstr "Crea una nuova tabella nel database %s"
 msgid "Number of fields"
 msgstr "Numero di campi"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"Non posso caricare i plugins di esportazione. Controlla l'installazione!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1804,6 +1910,29 @@ msgstr "Sovrascrivi file(s) esistente/i"
 msgid "File name template"
 msgstr "Nome file template"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "nome server"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "nome database"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "nome tabella"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Questo valore è interpretato usando %1$sstrftime%2$s: in questo modo puoi "
+"usare stringhe di formattazione per le date/tempi. Verranno anche aggiunte "
+"le seguenti trasformazioni: %3$s. Il testo rimanente resterà invariato."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "ricorda il template"
@@ -1880,6 +2009,15 @@ msgstr "File importato"
 msgid "Location of the text file"
 msgstr "Percorso del file"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Non è permesso l'upload dei file su questo server."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "La directory impostata per l'upload non può essere trovata"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2030,6 +2168,20 @@ msgstr "Rimuovi"
 msgid "in query"
 msgstr "nella query"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Visualizzazione record "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "Totali"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "La query ha impiegato %01.4f sec"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2518,29 +2670,12 @@ msgstr "Non riesco a scrivere il file su disco."
 msgid "File upload stopped by extension."
 msgstr "Caricamento del file interrotto per estensione errata."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Il file non può essere letto"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Errore nello spostare il file caricato, vedi FAQ 1.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Stai cercando di importare un file con un tipo di compressione (%s) non "
-"supportato. Altrimenti il supporto per questo tipo di compressione non è "
-"stato ancora implementato o è stato disabilitato dalla tua configurazione."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2566,7 +2701,7 @@ msgstr "Generato da"
 msgid "Rows"
 msgstr "Righe"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL ha restituito un insieme vuoto (i.e. zero righe)."
@@ -2612,6 +2747,11 @@ msgstr "Struttura"
 msgid "Go to view"
 msgstr "Vai alla visualizzazione"
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Nessun indice definito!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2648,6 +2788,15 @@ msgstr "La chiave primaria è stata eliminata"
 msgid "Index %s has been dropped"
 msgstr "L'indice %s è stato eliminato"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"Gli indici %1$s e %2$s sembrano essere uguali e andrebbero, possibilmente, "
+"essere rimossi."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2778,7 +2927,7 @@ msgstr "Aggiungi all'indice %s colonna/e"
 msgid "Add a new User"
 msgstr "Aggiungi un nuovo utente"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Hai aggiunto un nuovo utente."
 
@@ -2967,10 +3116,6 @@ msgstr "Carica nella repository BLOB"
 msgid "Let every user access this bookmark"
 msgstr "Permetti ad ogni utente di accedere a questo bookmark"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Il bookmark è stato cancellato."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Etichetta"
@@ -3013,18 +3158,7 @@ msgstr "\"compresso con bzip\""
 msgid "Calendar"
 msgstr "Calendario"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"Non posso caricare i plugins di esportazione. Controlla l'installazione!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"Non posso caricare i plugins di importazione, controlla la tua "
-"configurazione!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Impossibile rinominare l'indice a PRIMARIO!"
 
@@ -3148,11 +3282,6 @@ msgstr "Prego, configurare le coordinate per la tabella %s"
 msgid "Connections"
 msgstr "Connessioni"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Il Database %s è stato copiato in %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Copia la tabella nel (database<b>.</b>tabella):"
@@ -3174,7 +3303,7 @@ msgstr "Impossibile connettersi all'origine"
 msgid "Could not connect to the target"
 msgstr "Impossibile connettersi alla destinazione"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3272,26 +3401,17 @@ msgstr "Ceco-Slovacco"
 msgid "Danish"
 msgstr "Danese"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Il nome del DataBase è vuoto!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Opzioni di esportazione del database"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Il database %1$s è stato creato."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr "database '%s' non esistente."
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s databases sono stati cancellati correttamente."
@@ -3315,7 +3435,7 @@ msgstr "Disabilita le Statistiche"
 msgid "Enable Statistics"
 msgstr "Abilita le Statistiche"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3362,7 +3482,7 @@ msgstr "Deframmenta la tabella"
 msgid "Use delayed inserts"
 msgstr "Utilizza inserimenti ritardati"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Nessun utente selezionato per la cancellazione!"
 
@@ -3578,34 +3698,11 @@ msgstr ""
 "Il file %s esiste già sul server: prego, cambiare nome del file o "
 "selezionare l'opzione \"sovrascrivi\"."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "nome database"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "nome server"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "nome tabella"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Questo valore è interpretato usando %1$sstrftime%2$s: in questo modo puoi "
-"usare stringhe di formattazione per le date/tempi. Verranno anche aggiunte "
-"le seguenti trasformazioni: %3$s. Il testo rimanente resterà invariato."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "File"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3630,7 +3727,7 @@ msgstr "Inizializza (\"FLUSH\") la tabella"
 msgid "Flush (close) all tables"
 msgstr "Rinfresca (chiudi) tutte le tabelle"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3817,15 +3914,6 @@ msgstr "Excel 97-2003 XLS Workbook"
 msgid "Excel 2007 XLSX Workbook"
 msgstr "Excel 2007 XLSX Workbook"
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"Gli indici %1$s e %2$s sembrano essere uguali e andrebbero, possibilmente, "
-"essere rimossi."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3862,7 +3950,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Inserisci come nuova riga"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Inserita riga id: %1$d"
@@ -4194,20 +4282,10 @@ msgstr "Visualizza processi in esecuzione"
 msgid "No databases"
 msgstr "Nessun database"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Nessun database selezionato."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Non sono stati ricevuti dati da importare. O non è stato indicato alcun nome "
-"file, oppure è stato superata la dimensione massima consentita per il file, "
-"impostata nella configurazione di PHP. Vedi FAQ 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "nessuna Description"
@@ -4223,15 +4301,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "Non sono stati trovati file ZIP all'interno dell'archivio!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Nessun indice definito!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Nessuna parte di indice definita!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Nessun cambiamento"
 
@@ -4249,7 +4323,7 @@ msgstr "Questo formato non ha opzioni"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Il server web non possiede i privilegi per salvare il file %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Non hai i permessi per effettuare questa operazione!"
 
@@ -4286,7 +4360,8 @@ msgstr "non presente"
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> tabella non trovata o non settata in %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Nessun utente trovato."
 
@@ -4333,7 +4408,7 @@ msgstr "Manutenzione partizione"
 msgid "Partition %s"
 msgstr "Partizione %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "La password per l'utente %s è cambiata con successo."
@@ -4436,11 +4511,11 @@ msgstr "Polacco"
 msgid "Port"
 msgstr "Ordinamento"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Il nome della chiave primaria deve essere... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4648,7 +4723,7 @@ msgstr "Permette di cambiare i dati."
 msgid "No privileges."
 msgstr "Nessun privilegio."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "I privilegi sono stati ricaricati con successo."
 
@@ -4691,11 +4766,6 @@ msgstr ""
 "<b>Query delle Statistiche</b>: Dall'avvio, %s query sono state effettuate "
 "sul server."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "La query ha impiegato %01.4f sec"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Tipo di Query"
@@ -4724,15 +4794,6 @@ msgstr "Controlla l'integrità delle referenze:"
 msgid "Relational schema"
 msgstr "Schema relazionale"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Le caratteristiche aggiuntive sono state disattivate per funzionare con le "
-"tabelle linkate. Per scoprire perché clicca %squi%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relazioni"
@@ -4773,11 +4834,6 @@ msgstr "Rimuove partizionamento"
 msgid "Remove selected users"
 msgstr "Rimuove gli utenti selezionati"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Il DataBase %s è stato rinominato in %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4885,7 +4941,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -5027,7 +5083,7 @@ msgstr "Riprendi inserimento con la riga %s"
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Revoca tutti i privilegi attivi agli utenti e dopo li cancella."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Hai revocato i privilegi per %s"
@@ -5192,19 +5248,11 @@ msgstr "Mostra query complete"
 msgid "Show/Hide left menu"
 msgstr "Mostra/nascondi il menù di sinistra"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Mostrando i segnalibri"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Mostrando il codice PHP"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Visualizzazione record "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Mostrando la query SQL"
 
@@ -6104,7 +6152,7 @@ msgstr "La tabella %s esiste già!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "La tabella %1$s è già stata modificata con successo"
@@ -6123,7 +6171,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Il nome della tabella è vuoto!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "La tabella %1$s è stata creata."
@@ -6245,7 +6293,7 @@ msgstr "Questo Host"
 msgid "Threads"
 msgstr "Processi"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Il thread %s è stato terminato con successo."
@@ -6259,14 +6307,6 @@ msgstr ""
 "vuole dire che che phpMyAdmin non è in grado di ultimare l'operazione fino a "
 "che non verrà aumentato il parametro php time limits."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Superato il tempo limite dello script, se vuoi finire l'importazione inoltra "
-"nuovamente il file e il processo riprenderà."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "da/per pagina"
@@ -6283,10 +6323,6 @@ msgstr "Contrai/Espandi"
 msgid "To select relation, click :"
 msgstr "Per selezionare una relazione, click :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "Totali"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6603,7 +6639,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Hai aggiornato i permessi per %s."
@@ -6624,20 +6660,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Si dovrebbe aggiornare %s alla versione %s o successiva."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Stai probabilmente cercando di caricare sul server un file troppo grosso. "
-"Fai riferimento alla documentazione %sdocumentation%s Per i modi di aggirare "
-"questo limite."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Non è permesso l'upload dei file su questo server."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Utilizzo"
@@ -6651,7 +6673,7 @@ msgstr "Usa i backquotes con i nomi delle tabelle e dei campi"
 msgid "Use Host Table"
 msgstr "Utilizza la Tabella dell'Host"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "L'utente %s esiste già!"
@@ -6664,7 +6686,7 @@ msgstr "L'utente %s esiste già!"
 msgid "User name"
 msgstr "Nome utente"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "L'utente selezionato non è stato trovato nella tabella dei privilegi."
 
@@ -6672,7 +6694,7 @@ msgstr "L'utente selezionato non è stato trovato nella tabella dei privilegi."
 msgid "User overview"
 msgstr "Vista d'insieme dell'utente"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Gli utenti selezionati sono stati cancellati con successo."
 
@@ -6736,10 +6758,6 @@ msgstr "Visualizza dump (schema) della tabella"
 msgid "VIEW name"
 msgstr "Nome VISTA"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "La directory impostata per l'upload non può essere trovata"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Web server"
@@ -6757,10 +6775,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "wildcard"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Nome utente o password errati. Accesso negato."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/ja.po b/po/ja.po
index 4861d48c6..762866306 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 11:22+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: japanese <jp@li.org>\n"
@@ -91,6 +91,11 @@ msgstr "説明"
 msgid "Use this value"
 msgstr "この値を利用する"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "データベース %1$s を作成しました。"
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "データベースのコメント:"
@@ -207,6 +212,20 @@ msgstr "全選択"
 msgid "Unselect All"
 msgstr "全選択解除"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "データベース名が空です!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "データベース %s を %s にリネームしました"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "データベース %s を %s にコピーしました"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "新しいデータベース名"
@@ -317,6 +336,15 @@ msgstr ""
 msgid "Collation"
 msgstr "照合順序"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"リンクテーブルを処理するための追加機能が無効になっています。理由については%s"
+"こちら%sをご覧ください"
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "PDF スキーマを表示する"
@@ -644,7 +672,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -812,16 +841,75 @@ msgstr ""
 msgid "Database Log"
 msgstr ""
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"アップロードしようとしたファイルが大きすぎるようです。対策については %sドキュ"
+"メント%s をご覧ください"
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "ファイルを読み込めませんでした"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"サポートされていない圧縮形式(%s)のファイルをロードしようとしました。この形式"
+"はサポートされていないか設定で無効にされています"
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"インポートするデータを受信できませんでした。ファイル名が送信されていないか、"
+"ファイルサイズが PHP の設定で許可された最大値を超えています。FAQ 1.16をご覧く"
+"ださい"
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"インポートプラグインをロードできません。正しくインストールされているか確認し"
+"てください!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "ブックマークを削除しました"
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "表示中のブックマーク"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "ブックマーク %s を作成しました"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "インポートは正常終了しました。%d 個のクエリを実行しました"
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"スクリプトがタイムアウトしました。インポートを完了させたいのであれば同じファ"
+"イルを再送信すればインポートが再開されます"
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin は<b>フレーム対応</b>ブラウザでの利用をお勧めします"
@@ -838,7 +926,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "DROP DATABASE 文は無効にされています"
 
@@ -878,10 +967,12 @@ msgid "The user name is empty!"
 msgstr "ユーザ名が空です!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "パスワードが空です!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "パスワードが異なっています!"
 
@@ -1301,7 +1392,8 @@ msgstr "パスワード:"
 msgid "Server Choice"
 msgstr "サーバの選択"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "クッキーを有効にしてください"
 
@@ -1323,6 +1415,11 @@ msgstr "%s 秒以上操作をしませんでした。ログインしなおして
 msgid "Cannot log in to the MySQL server"
 msgstr "MySQL サーバにログインできません"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr ""
+"ユーザ名ないしパスワードが間違っています。<br />アクセスは拒否されました"
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1449,11 +1546,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "ドキュメント"
 
@@ -1517,7 +1615,7 @@ msgid "Skip Validate SQL"
 msgstr "SQL の検証をスキップ"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "SQL の検証"
 
@@ -1572,7 +1670,8 @@ msgstr "%s の機能には既知のバグがあります。%s をご覧くださ
 msgid "Font size"
 msgstr "フォントサイズ"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1736,6 +1835,7 @@ msgid "Create"
 msgstr "作成"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "特権なし"
 
@@ -1752,6 +1852,12 @@ msgstr "データベース %s に新しいテーブルを作成する"
 msgid "Number of fields"
 msgstr "フィールド数"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"エクスポートプラグインをロードできません。正しくインストールされているか確認"
+"してください!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1780,6 +1886,29 @@ msgstr "既存のファイルは上書き"
 msgid "File name template"
 msgstr "ファイル名のテンプレート"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "サーバ名"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "データベース名"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "テーブル名"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"このテンプレートは %1$sstrftime%2$s を使って解釈されます。そのため、時間の書"
+"式文字列を利用できます。また、次の変換も行われます。%3$s それ以外のテキストは"
+"修正されません"
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "テンプレートを記憶させる"
@@ -1851,6 +1980,15 @@ msgstr "インポートするファイル"
 msgid "Location of the text file"
 msgstr "テキストファイルの位置"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "このサーバではファイルのアップロードはできません"
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "指定したアップロードディレクトリが利用できません"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1998,6 +2136,20 @@ msgstr "停止"
 msgid "in query"
 msgstr "行/クエリ"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "表示中の列"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "合計"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "クエリの実行時間 %01.4f 秒"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2481,11 +2633,6 @@ msgstr "ファイルをディスクに書き込めません。"
 msgid "File upload stopped by extension."
 msgstr "拡張のせいでファイルのアップロードが中断されました。"
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "ファイルを読み込めませんでした"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
@@ -2493,17 +2640,6 @@ msgid ""
 msgstr ""
 "アップロードされたファイルの移動に失敗しました。FAQ 1.11 をご覧ください。"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"サポートされていない圧縮形式(%s)のファイルをロードしようとしました。この形式"
-"はサポートされていないか設定で無効にされています"
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2529,7 +2665,7 @@ msgstr "生成環境"
 msgid "Rows"
 msgstr "行"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "返り値が空でした(行数0)"
@@ -2573,6 +2709,11 @@ msgstr ""
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "インデックスが定義されていません!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2609,6 +2750,15 @@ msgstr "主キーを削除しました"
 msgid "Index %s has been dropped"
 msgstr "インデックス %s を削除しました"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"インデックス %1$s と %2$s は同一のもののようです。一方は削除してもよいかもし"
+"れません。"
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2738,7 +2888,7 @@ msgstr "インデックスに&nbsp;%s&nbsp; の列を追加しました"
 msgid "Add a new User"
 msgstr "新しいユーザを追加する"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "新しいユーザを追加しました"
 
@@ -2927,10 +3077,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "すべてのユーザがこのブックマークを利用できるようにする"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "ブックマークを削除しました"
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "ラベル"
@@ -2973,19 +3119,7 @@ msgstr "\"bzip 形式\""
 msgid "Calendar"
 msgstr "カレンダー"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"エクスポートプラグインをロードできません。正しくインストールされているか確認"
-"してください!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"インポートプラグインをロードできません。正しくインストールされているか確認し"
-"てください!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "インデックス名を PRIMARY に変更することはできません!"
 
@@ -3102,11 +3236,6 @@ msgstr "テーブル %s の座標を設定してください"
 msgid "Connections"
 msgstr "接続"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "データベース %s を %s にコピーしました"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "テーブルを(database<b>.</b>table)にコピーする:"
@@ -3128,7 +3257,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3224,26 +3353,17 @@ msgstr "チェコのスロバキア語"
 msgid "Danish"
 msgstr "デンマーク語"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "データベース名が空です!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "データベースエクスポートオプション"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "データベース %1$s を作成しました。"
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "データベース %s を正常に削除しました"
@@ -3267,7 +3387,7 @@ msgstr "統計を無効にする"
 msgid "Enable Statistics"
 msgstr "統計を有効にする"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3314,7 +3434,7 @@ msgstr "テーブルのデフラグ"
 msgid "Use delayed inserts"
 msgstr "遅延インサートを使用する"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "削除するユーザが選択されていません!"
 
@@ -3529,34 +3649,11 @@ msgstr ""
 "サーバ上に既存のファイル %s があります。ファイル名を変更するか、上書きオプ"
 "ションを有効にしてください"
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "データベース名"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "サーバ名"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "テーブル名"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"このテンプレートは %1$sstrftime%2$s を使って解釈されます。そのため、時間の書"
-"式文字列を利用できます。また、次の変換も行われます。%3$s それ以外のテキストは"
-"修正されません"
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "ファイル"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3581,7 +3678,7 @@ msgstr "テーブルをフラッシュする(\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "すべてのテーブルをフラッシュする(閉じる)"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3765,15 +3862,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"インデックス %1$s と %2$s は同一のもののようです。一方は削除してもよいかもし"
-"れません。"
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3810,7 +3898,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "新しい行として挿入する"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "id %1$d の行を挿入しました"
@@ -4133,20 +4221,10 @@ msgstr "MySQL プロセスの表示"
 msgid "No databases"
 msgstr "データベースが存在しません"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "データベースが選択されていません"
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"インポートするデータを受信できませんでした。ファイル名が送信されていないか、"
-"ファイルサイズが PHP の設定で許可された最大値を超えています。FAQ 1.16をご覧く"
-"ださい"
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "説明がありません"
@@ -4160,15 +4238,11 @@ msgstr "このストレージエンジンにはステータスの詳細情報は
 msgid "No files found inside ZIP archive!"
 msgstr "ZIP アーカイブにファイルが含まれていません!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "インデックスが定義されていません!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "インデックス部分が定義されていません!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "変更なし"
 
@@ -4186,7 +4260,7 @@ msgstr "この書式にはオプションはありません"
 msgid "The web server does not have permission to save the file %s."
 msgstr "このウェブサーバにはファイル %s を保存する権限がありません"
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "特権不足でアクセスできません!"
 
@@ -4222,7 +4296,8 @@ msgid "<b>%s</b> table not found or not set in %s"
 msgstr ""
 "テーブル <b>%s</b> が見つかりません。あるいは %s には設定されていません"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "ユーザが存在しません"
 
@@ -4269,7 +4344,7 @@ msgstr "パーティション管理"
 msgid "Partition %s"
 msgstr "パーティション %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "%s のパスワードは正しく変更されました"
@@ -4369,11 +4444,11 @@ msgstr "ポーランド語"
 msgid "Port"
 msgstr ""
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "主キーの名前は PRIMARY でなければなりません!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4572,7 +4647,7 @@ msgstr "データの修正を許可する"
 msgid "No privileges."
 msgstr "特権はありません"
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "特権を正常にリロードしました"
 
@@ -4614,11 +4689,6 @@ msgid ""
 msgstr ""
 "<b>クエリ統計</b>: 起動時から数えて %s 個のクエリをサーバに送信しました"
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "クエリの実行時間 %01.4f 秒"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "クエリ種別"
@@ -4647,15 +4717,6 @@ msgstr "参照整合性の確認:"
 msgid "Relational schema"
 msgstr "リレーショナルスキーマ"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"リンクテーブルを処理するための追加機能が無効になっています。理由については%s"
-"こちら%sをご覧ください"
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "リレーション"
@@ -4694,11 +4755,6 @@ msgstr "パーティションを削除"
 msgid "Remove selected users"
 msgstr "選択したユーザを削除する"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "データベース %s を %s にリネームしました"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4802,7 +4858,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4938,7 +4994,7 @@ msgstr "%s 行から挿入を再開する"
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "特権をすべて取り消してユーザを削除する"
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "%s の特権を取り消しました"
@@ -5100,19 +5156,11 @@ msgstr "クエリ全体を表示"
 msgid "Show/Hide left menu"
 msgstr "左側のメニューを表示する/隠す"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "表示中のブックマーク"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "PHP コードとして表示"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "表示中の列"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "SQL クエリを表示"
 
@@ -5967,7 +6015,7 @@ msgstr "テーブル %s は既に存在します!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "テーブル %1$s を変更しました"
@@ -5986,7 +6034,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "テーブル名が空です!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "テーブル %1$s を作成しました。"
@@ -6107,7 +6155,7 @@ msgstr "このホスト"
 msgid "Threads"
 msgstr "スレッド"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "スレッド %s は正常終了しました"
@@ -6120,14 +6168,6 @@ msgstr ""
 "ただし、最後に実行したときはまったくデータを解析できませんでした。ふつうは "
 "PHP の時間制限を伸ばさない限りこのデータのインポートはできません"
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"スクリプトがタイムアウトしました。インポートを完了させたいのであれば同じファ"
-"イルを再送信すればインポートが再開されます"
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "開始/終了ページ"
@@ -6144,10 +6184,6 @@ msgstr "大小を切り替える"
 msgid "To select relation, click :"
 msgstr "リレーションを選択します:"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "合計"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6454,7 +6490,7 @@ msgstr "UNICODE"
 msgid "unknown"
 msgstr "不明"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "%s の特権を更新しました"
@@ -6473,19 +6509,6 @@ msgstr "column_comments テーブルの更新方法についてはドキュメ
 msgid "You should upgrade to %s %s or later."
 msgstr "%s を %s 以降にアップグレードしてください"
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"アップロードしようとしたファイルが大きすぎるようです。対策については %sドキュ"
-"メント%s をご覧ください"
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "このサーバではファイルのアップロードはできません"
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "使用量"
@@ -6499,7 +6522,7 @@ msgstr "テーブル名やフィールド名を逆クォートで囲む"
 msgid "Use Host Table"
 msgstr "ホストテーブルを使う"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "ユーザ %s は既に存在します!"
@@ -6512,7 +6535,7 @@ msgstr "ユーザ %s は既に存在します!"
 msgid "User name"
 msgstr "ユーザ名"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "特権テーブルには選択したユーザがいません"
 
@@ -6520,7 +6543,7 @@ msgstr "特権テーブルには選択したユーザがいません"
 msgid "User overview"
 msgstr "ユーザ概略"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "選択したユーザを正しく削除しました"
 
@@ -6583,10 +6606,6 @@ msgstr "テーブルのダンプ(スキーマ)表示"
 msgid "VIEW name"
 msgstr "VIEW の名前"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "指定したアップロードディレクトリが利用できません"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Web サーバ"
@@ -6604,11 +6623,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "ワイルドカード"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr ""
-"ユーザ名ないしパスワードが間違っています。<br />アクセスは拒否されました"
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/ka.po b/po/ka.po
index 999585d42..002c7a78c 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:14+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: georgian <ka@li.org>\n"
@@ -89,6 +89,11 @@ msgstr "აღწერილობა"
 msgid "Use this value"
 msgstr "გამოიყენე ეს ველი"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "შეიქმნა მონაცემთა ბაზა %1$s."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "მონაცემთა ბაზის კომენტარი: "
@@ -205,6 +210,20 @@ msgstr "ყველას მონიშნვა"
 msgid "Unselect All"
 msgstr "მონიშნვის მოხსნა"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "მონაცემთა ბაზა ცარიელია!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Database %s has been renamed to %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Database %s has been copied to %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Rename database to"
@@ -315,6 +334,15 @@ msgstr "ჩართვა"
 msgid "Collation"
 msgstr "კოლაცია"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "PDF სქემის ჩვენება"
@@ -642,7 +670,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -820,16 +849,73 @@ msgstr "ცხრილის შემოწმება"
 msgid "Database Log"
 msgstr "მონაცემთა ბაზა"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "ფაილის წაკითხვა ვერ მოხერხდა"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "Could not load import plugins, please check your installation!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "The bookmark has been deleted."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Showing bookmark"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Bookmark %s created"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Import has been successfully finished, %d queries executed."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
@@ -846,7 +932,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" statements are disabled."
 
@@ -886,10 +973,12 @@ msgid "The user name is empty!"
 msgstr "მომხმარებლის სახელი ცარიელია!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "პაროლი ცარიელია!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "პაროლები არ ემთხვევა!"
 
@@ -1314,7 +1403,8 @@ msgstr "პაროლი:"
 msgid "Server Choice"
 msgstr "სერვერის არჩევა"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies must be enabled past this point."
 
@@ -1336,6 +1426,10 @@ msgstr "No activity within %s seconds; please log in again"
 msgid "Cannot log in to the MySQL server"
 msgstr "MySQL სერვერზე შესვლა შეუძლებელია"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Wrong username/password. Access denied."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1465,11 +1559,12 @@ msgstr "ka"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "დოკუმენტაცია"
 
@@ -1533,7 +1628,7 @@ msgid "Skip Validate SQL"
 msgstr "Skip Validate SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Validate SQL"
 
@@ -1588,7 +1683,8 @@ msgstr "The %s functionality is affected by a known bug, see %s"
 msgid "Font size"
 msgstr "შრიფტის ზომა"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1753,6 +1849,7 @@ msgid "Create"
 msgstr "შექმნა"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "პრივილეგიები არაა"
 
@@ -1769,6 +1866,10 @@ msgstr "Create new table on database %s"
 msgid "Number of fields"
 msgstr "ველების რაოდენობა"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr "Could not load export plugins, please check your installation!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1797,6 +1898,29 @@ msgstr "Overwrite existing file(s)"
 msgid "File name template"
 msgstr "File name template"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "სერვერის სახელი"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "მონაცემთა ბაზა"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "ცხრილის სახელი"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "remember template"
@@ -1868,6 +1992,15 @@ msgstr "შემოსატანი ფაილი"
 msgid "Location of the text file"
 msgstr "Location of the text file"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "File uploads are not allowed on this server."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "The directory you set for upload work cannot be reached"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2016,6 +2149,20 @@ msgstr "Kill"
 msgid "in query"
 msgstr "მოთხოვნაში"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Showing rows"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "სულ"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "მოთხოვნას დასჭირდა %01.4f წმ"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2500,11 +2647,6 @@ msgstr "Failed to write file to disk."
 msgid "File upload stopped by extension."
 msgstr "File upload stopped by extension."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "ფაილის წაკითხვა ვერ მოხერხდა"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
@@ -2513,17 +2655,6 @@ msgstr ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2550,7 +2681,7 @@ msgstr "Generated by"
 msgid "Rows"
 msgstr "სტრიქონები"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL returned an empty result set (i.e. zero rows)."
@@ -2597,6 +2728,11 @@ msgstr "სტრუქტურა"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "ინდექსი არაა განსაზღვრული!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2633,6 +2769,15 @@ msgstr "The primary key has been dropped"
 msgid "Index %s has been dropped"
 msgstr "Index %s has been dropped"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2765,7 +2910,7 @@ msgstr "Add to index &nbsp;%s&nbsp;column(s)"
 msgid "Add a new User"
 msgstr "ახალი მომხმარებლის დამატება"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "თქვენ დაამატეთ ახალი მომხმარებელი."
 
@@ -2958,10 +3103,6 @@ msgstr "Upload to BLOB repository"
 msgid "Let every user access this bookmark"
 msgstr "Let every user access this bookmark"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "The bookmark has been deleted."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Label"
@@ -3004,15 +3145,7 @@ msgstr "\"bzip-ით დაარქივებული\""
 msgid "Calendar"
 msgstr "კალენდარი"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr "Could not load export plugins, please check your installation!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "Could not load import plugins, please check your installation!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Can't rename index to PRIMARY!"
 
@@ -3132,11 +3265,6 @@ msgstr "Please configure the coordinates for table %s"
 msgid "Connections"
 msgstr "კავშირები"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Database %s has been copied to %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Copy table to (database<b>.</b>table):"
@@ -3160,7 +3288,7 @@ msgstr "MySQL სერვერთან დაკავშირება ვ
 msgid "Could not connect to the target"
 msgstr "MySQL სერვერთან დაკავშირება ვერ მოხერხდა"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3260,26 +3388,17 @@ msgstr "ჩეხოსლოვალური"
 msgid "Danish"
 msgstr "დანიური"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "მონაცემთა ბაზა ცარიელია!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "მონაცემთა ბაზის ექსპორტის პარამეტრები"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "შეიქმნა მონაცემთა ბაზა %1$s."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s databases have been dropped successfully."
@@ -3304,7 +3423,7 @@ msgstr "სტატისტიკის გათიშვა"
 msgid "Enable Statistics"
 msgstr "სტატისტიკის ჩართვა"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3353,7 +3472,7 @@ msgstr "Defragment table"
 msgid "Use delayed inserts"
 msgstr "Use delayed inserts"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "No users selected for deleting!"
 
@@ -3567,34 +3686,11 @@ msgid ""
 msgstr ""
 "File %s already exists on server, change filename or check overwrite option."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "მონაცემთა ბაზა"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "სერვერის სახელი"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "ცხრილის სახელი"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "ფაილები"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3619,7 +3715,7 @@ msgstr "Flush the table (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Flush (close) all tables"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr "Error creating foreign key on %1$s (check data types)"
@@ -3803,15 +3899,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3848,7 +3935,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "ახალი სტრიქონის ჩამატება"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "ჩამატებული სტრიქონის id: %1$d"
@@ -4176,20 +4263,10 @@ msgstr "პროცესების ჩვენება"
 msgid "No databases"
 msgstr "მონაცემთა ბაზები არაა"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "No databases selected."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "no description"
@@ -4204,15 +4281,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "ZIP არქივში ფაილების პოვნა ვერ მოხერხდა!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "ინდექსი არაა განსაზღვრული!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "No index parts defined!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "ცვლილების გარეშე"
 
@@ -4231,7 +4304,7 @@ msgstr "ამ ფორმატს არ აქვს პარამეტ
 msgid "The web server does not have permission to save the file %s."
 msgstr "The web server does not have permission to save the file %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "You don't have sufficient privileges to be here right now!"
 
@@ -4268,7 +4341,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> table not found or not set in %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "მომხმარებლ(ებ)ის პოვნა ვერ მოხერხდა."
 
@@ -4315,7 +4389,7 @@ msgstr "Partition maintenance"
 msgid "Partition %s"
 msgstr "დანაყოფი %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "The password for %s was changed successfully."
@@ -4417,11 +4491,11 @@ msgstr "პოლონური"
 msgid "Port"
 msgstr "დალაგება"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "The name of the primary key must be \"PRIMARY\"!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4621,7 +4695,7 @@ msgstr "Allows changing data."
 msgid "No privileges."
 msgstr "პრივილეგიები არაა."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "The privileges were reloaded successfully."
 
@@ -4664,11 +4738,6 @@ msgstr ""
 "<b>Query statistics</b>: Since its startup, %s queries have been sent to the "
 "server."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "მოთხოვნას დასჭირდა %01.4f წმ"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "მოთხოვნის ტიპი"
@@ -4697,15 +4766,6 @@ msgstr "Check referential integrity:"
 msgid "Relational schema"
 msgstr "Relational schema"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relations"
@@ -4746,11 +4806,6 @@ msgstr "Remove partitioning"
 msgid "Remove selected users"
 msgstr "Remove selected users"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Database %s has been renamed to %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4859,7 +4914,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -5002,7 +5057,7 @@ msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 "Revoke all active privileges from the users and delete them afterwards."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "You have revoked the privileges for %s"
@@ -5168,19 +5223,11 @@ msgstr "Show Full Queries"
 msgid "Show/Hide left menu"
 msgstr "Show/Hide left menu"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Showing bookmark"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "PHP კოდის სახით ჩვენება"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Showing rows"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Showing SQL query"
 
@@ -6051,7 +6098,7 @@ msgstr "ცხრილი %s უკვე არსებობს!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Table %1$s has been altered successfully"
@@ -6070,7 +6117,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "ცხრილის სახელი ცარიელია!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "Table %1$s has been created."
@@ -6191,7 +6238,7 @@ msgstr "ეს ჰოსტი"
 msgid "Threads"
 msgstr "Threads"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Thread %s was successfully killed."
@@ -6204,14 +6251,6 @@ msgstr ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
 "won't be able to finish this import unless you increase php time limits."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "to/from page"
@@ -6228,10 +6267,6 @@ msgstr "Toggle small/big"
 msgid "To select relation, click :"
 msgstr "To select relation, click :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "სულ"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6545,7 +6580,7 @@ msgstr "უნიკოდი"
 msgid "unknown"
 msgstr "უცნობი"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "You have updated the privileges for %s."
@@ -6565,19 +6600,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "You should upgrade to %s %s or later."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "File uploads are not allowed on this server."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "გამოყენება"
@@ -6591,7 +6613,7 @@ msgstr "Enclose table and field names with backquotes"
 msgid "Use Host Table"
 msgstr "Use Host Table"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "მომხმარებელი %s უკვე არსებობს!"
@@ -6604,7 +6626,7 @@ msgstr "მომხმარებელი %s უკვე არსებო
 msgid "User name"
 msgstr "მომხმარებლის სახელი"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "The selected user was not found in the privilege table."
 
@@ -6612,7 +6634,7 @@ msgstr "The selected user was not found in the privilege table."
 msgid "User overview"
 msgstr "მომხმარებლის მიმოხილვა"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "The selected users have been deleted successfully."
 
@@ -6674,10 +6696,6 @@ msgstr "View dump (schema) of table"
 msgid "VIEW name"
 msgstr "VIEW name"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "The directory you set for upload work cannot be reached"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "ვებ სერვერი"
@@ -6695,10 +6713,6 @@ msgstr "ვიკი"
 msgid "wildcard"
 msgstr "wildcard"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Wrong username/password. Access denied."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/ko.po b/po/ko.po
index 93d59c3c3..12161e51b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:16+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: korean <ko@li.org>\n"
@@ -87,6 +87,11 @@ msgstr "설명이 없습니다"
 msgid "Use this value"
 msgstr ""
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "데이터베이스 %s 를 제거했습니다."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 #, fuzzy
 msgid "Database comment: "
@@ -204,6 +209,21 @@ msgstr "모두 선택"
 msgid "Unselect All"
 msgstr "모두 선택안함"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+#, fuzzy
+msgid "The database name is empty!"
+msgstr "테이블명이 없습니다!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, fuzzy, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "테이블 %s을(를) %s(으)로 변경하였습니다."
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, fuzzy, php-format
+msgid "Database %s has been copied to %s"
+msgstr "%s 테이블이 %s 으로 복사되었습니다."
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 #, fuzzy
 msgid "Rename database to"
@@ -320,6 +340,15 @@ msgstr "사용가능"
 msgid "Collation"
 msgstr "생성"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"linked Tables에서 작동하는 부가기능이 사용되지 않습니다. 이유를 알려면 %s여기"
+"를 클릭%s하십시오."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr ""
@@ -648,7 +677,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -821,16 +851,64 @@ msgstr "테이블 검사"
 msgid "Database Log"
 msgstr "데이터베이스"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "파일을 읽을 수 없습니다"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "북마크를 제거했습니다."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin 은 <b>프레임을 지원하는</b> 브라우저에서 잘 보입니다."
@@ -847,7 +925,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" 구문은 허락되지 않습니다."
 
@@ -887,10 +966,12 @@ msgid "The user name is empty!"
 msgstr "사용자명이 없습니다!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "암호가 비었습니다!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "암호가 동일하지 않습니다!"
 
@@ -1308,7 +1389,8 @@ msgstr "암호:"
 msgid "Server Choice"
 msgstr "서버 선택"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "쿠키 사용이 가능해야 합니다 past this point."
 
@@ -1330,6 +1412,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "MySQL 서버에 로그인할 수 없습니다"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "사용자명/암호가 틀렸습니다. 접근이 거부되었습니다."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1450,11 +1536,12 @@ msgstr "보냄"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "도움말"
 
@@ -1519,7 +1606,7 @@ msgid "Skip Validate SQL"
 msgstr "SQL 검사"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "SQL 검사"
 
@@ -1572,7 +1659,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1732,6 +1820,7 @@ msgid "Create"
 msgstr " 만들기 "
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "권한 없음"
 
@@ -1748,6 +1837,10 @@ msgstr "데이터베이스 %s에 새로운 테이블을 만듭니다."
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1776,6 +1869,27 @@ msgstr ""
 msgid "File name template"
 msgstr "파일명 템플릿"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+#, fuzzy
+msgid "server name"
+msgstr "사용자명"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr ""
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "템플릿 기억"
@@ -1847,6 +1961,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr "SQL 텍스트파일의 위치"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "업로드 디렉토리에 접근할 수 없습니다"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1991,6 +2114,20 @@ msgstr "Kill"
 msgid "in query"
 msgstr "질의(in query)"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "행(레코드) 보기"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "합계"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "질의 실행시간 %01.4f 초"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2434,26 +2571,12 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "파일을 읽을 수 없습니다"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2480,7 +2603,7 @@ msgstr ""
 msgid "Rows"
 msgstr "행(레코드)"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "결과값이 없습니다. (빈 레코드 리턴.)"
@@ -2526,6 +2649,11 @@ msgstr "구조"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "인덱스가 설정되지 않았습니다!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2563,6 +2691,13 @@ msgstr "기본 키를 제거했습니다"
 msgid "Index %s has been dropped"
 msgstr "인덱스 %s 를 제거했습니다"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2693,7 +2828,7 @@ msgstr "%s개 열(칼럼)에 인덱스 추가"
 msgid "Add a new User"
 msgstr "새 사용자 추가"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "새 사용자를 추가했습니다."
 
@@ -2891,10 +3026,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr ""
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "북마크를 제거했습니다."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Label"
@@ -2937,15 +3068,7 @@ msgstr "\"bz 압축\""
 msgid "Calendar"
 msgstr ""
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "인덱스 이름을 기본 키로 바꿀 수 없습니다!"
 
@@ -3065,11 +3188,6 @@ msgstr ""
 msgid "Connections"
 msgstr "연결 수"
 
-#: libraries/messages.inc.php:186
-#, fuzzy, php-format
-msgid "Database %s has been copied to %s"
-msgstr "%s 테이블이 %s 으로 복사되었습니다."
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "테이블 복사 (데이터베이스명<b>.</b>테이블명):"
@@ -3091,7 +3209,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3191,27 +3309,17 @@ msgstr ""
 msgid "Danish"
 msgstr ""
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-#, fuzzy
-msgid "The database name is empty!"
-msgstr "테이블명이 없습니다!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr ""
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "데이터베이스 %s 를 제거했습니다."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s 데이터베이스를 삭제했습니다."
@@ -3236,7 +3344,7 @@ msgstr "통계 숨기기"
 msgid "Enable Statistics"
 msgstr "통계 보기"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3281,7 +3389,7 @@ msgstr ""
 msgid "Use delayed inserts"
 msgstr ""
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3491,33 +3599,12 @@ msgid ""
 "File %s already exists on server, change filename or check overwrite option."
 msgstr ""
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr ""
-
-#: libraries/messages.inc.php:335
-#, fuzzy
-msgid "server name"
-msgstr "사용자명"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "필드"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3538,7 +3625,7 @@ msgstr "테이블 닫기(캐시 삭제)"
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3723,13 +3810,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3765,7 +3845,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "새 열을 삽입합니다"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4079,17 +4159,10 @@ msgstr "MySQL 프로세스 보기"
 msgid "No databases"
 msgstr "데이터베이스가 없습니다"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "데이터베이스를 선택하지 않았습니다."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "설명이 없습니다"
@@ -4103,15 +4176,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "인덱스가 설정되지 않았습니다!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "No index parts defined!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "변화 없음"
 
@@ -4130,7 +4199,7 @@ msgstr ""
 msgid "The web server does not have permission to save the file %s."
 msgstr ""
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "어떻게 들어오셨어요? 지금 여기 있을 권한이 없습니다!"
 
@@ -4165,7 +4234,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr ""
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "사용자가 없습니다."
 
@@ -4214,7 +4284,7 @@ msgstr "테이블 유지보수"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "%s 의 암호가 바뀌었습니다."
@@ -4317,11 +4387,11 @@ msgstr ""
 msgid "Port"
 msgstr "정렬"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "기본 키의 이름은 반드시 PRIMARY여야 합니다!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(\"PRIMARY\"는 기본 키만의 <b>유일한</b> 이름입니다!)"
@@ -4521,7 +4591,7 @@ msgstr "데이터 변경 허용."
 msgid "No privileges."
 msgstr "권한 없음."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "권한을 다시 로딩했습니다."
 
@@ -4563,11 +4633,6 @@ msgid ""
 "server."
 msgstr "<b>SQL 질의 통계</b>: 이 서버에 %s 번의 질의가 보내졌습니다."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "질의 실행시간 %01.4f 초"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "질의 종류"
@@ -4596,15 +4661,6 @@ msgstr "referential 무결성 검사:"
 msgid "Relational schema"
 msgstr ""
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"linked Tables에서 작동하는 부가기능이 사용되지 않습니다. 이유를 알려면 %s여기"
-"를 클릭%s하십시오."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 #, fuzzy
 msgid "Relations"
@@ -4644,11 +4700,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "선택한 사용자를 삭제"
 
-#: libraries/messages.inc.php:761
-#, fuzzy, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "테이블 %s을(를) %s(으)로 변경하였습니다."
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4755,7 +4806,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4891,7 +4942,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "모든 활성화된 권한을 박탈하고 사용자를 삭제함."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "%s의 권한을 제거했습니다."
@@ -5053,19 +5104,11 @@ msgstr ""
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "행(레코드) 보기"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5820,7 +5863,7 @@ msgstr "사용자 %s 가 이미 존재합니다!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, fuzzy, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "선택한 사용자들을 삭제했습니다."
@@ -5839,7 +5882,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "테이블명이 없습니다!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "테이블 %s 을 제거했습니다."
@@ -5961,7 +6004,7 @@ msgstr ""
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "쓰레드 %s 를 죽였습니다."
@@ -5972,12 +6015,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -5994,10 +6031,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "합계"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6272,7 +6305,7 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "%s 의 권한을 업데이트했습니다."
@@ -6291,17 +6324,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr ""
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "사용법(량)"
@@ -6315,7 +6337,7 @@ msgstr "테이블, 필드명에 백쿼터(`) 사용"
 msgid "Use Host Table"
 msgstr ""
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "사용자 %s 가 이미 존재합니다!"
@@ -6328,7 +6350,7 @@ msgstr "사용자 %s 가 이미 존재합니다!"
 msgid "User name"
 msgstr "사용자명"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "선택한 사용자는 사용권한 테이블에 존재하지 않습니다."
 
@@ -6336,7 +6358,7 @@ msgstr "선택한 사용자는 사용권한 테이블에 존재하지 않습니
 msgid "User overview"
 msgstr "사용자 개요"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "선택한 사용자들을 삭제했습니다."
 
@@ -6398,10 +6420,6 @@ msgstr "테이블의 덤프(스키마) 데이터 보기"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "업로드 디렉토리에 접근할 수 없습니다"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6419,10 +6437,6 @@ msgstr ""
 msgid "wildcard"
 msgstr ""
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "사용자명/암호가 틀렸습니다. 접근이 거부되었습니다."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/lt.po b/po/lt.po
index a0e1947ad..47564a7b1 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-04-16 19:52+0200\n"
 "Last-Translator: Rytis <rytis.s@gmail.com>\n"
 "Language-Team: lithuanian <lt@li.org>\n"
@@ -91,6 +91,11 @@ msgstr "Paaiškinimas"
 msgid "Use this value"
 msgstr "Naudokite šią reikšmę"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Duomenų bazė %1$s sukurta."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Duombazės komantaras: "
@@ -207,6 +212,20 @@ msgstr "Pažymėti visus"
 msgid "Unselect All"
 msgstr "Atžymėti visus"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Nenurodytas duombazės vardas!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Duombazė %s pervadinta į %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Duombazė %s buvo nukopijuota į %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Pervadinti duombazę į"
@@ -317,6 +336,15 @@ msgstr "Įjungti"
 msgid "Collation"
 msgstr "Palyginimas"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Nėra PMA lentelių, kurios leidžia dirbti su jungtinėmis MySQL lentelėmis. %"
+"sPaaiškinimas%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Rodyti PDF vaizdą"
@@ -644,7 +672,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -817,16 +846,64 @@ msgstr "Patikrinti lentelę"
 msgid "Database Log"
 msgstr "Duombazė"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Negalima perskaityti failo"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Nuoroda ištrinta."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Žymė %s sukurta"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -844,7 +921,8 @@ msgstr "Spustelėkite pažymėjimui"
 msgid "Click to unselect"
 msgstr "Spustelėkite atžymėjimui"
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" komandos įvykdyti negalima."
 
@@ -884,10 +962,12 @@ msgid "The user name is empty!"
 msgstr "Tuščias vartotojo vardas!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Tuščias slaptažodis!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Slaptažodžiai nesutampa!"
 
@@ -1314,7 +1394,8 @@ msgstr "Slaptažodis:"
 msgid "Server Choice"
 msgstr "Pasirinkti serverį"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Sausainėliai(Cookies) turi būti priimami."
 
@@ -1338,6 +1419,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Nepavyksta prisijungti prie MySQL darbinės stoties"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Neteisingas vartotojo vardas arba slaptažodis. Priėjimas uždraustas."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1465,11 +1550,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "?"
 
@@ -1533,7 +1619,7 @@ msgid "Skip Validate SQL"
 msgstr "Praleisti SQL užklausos tikrinimą"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Patikrinti SQL užklausą"
 
@@ -1586,7 +1672,8 @@ msgstr ""
 msgid "Font size"
 msgstr "Šrifto dydis"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1750,6 +1837,7 @@ msgid "Create"
 msgstr "Sukurti"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Nėra privilegijų"
 
@@ -1766,6 +1854,10 @@ msgstr "Sukurti naują lentelę duombazėje %s"
 msgid "Number of fields"
 msgstr "Laukų skaičius"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1794,6 +1886,29 @@ msgstr "Perrašyti esamus failus"
 msgid "File name template"
 msgstr "Failo pavadinimo šablonas"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "serverio vardas"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "duomenų bazės vardas"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "lentelės vardas"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Ši reikšmė interpretuojama naudojant %1$sstrftime%2$s, taigi, galite naudoti "
+"laiko formatavimo eilutes. Taip pat pakeičiamos šios eilutės: %3$s. Kitas "
+"tekstas bus paliktas kaip yra."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "atsiminti šabloną"
@@ -1865,6 +1980,15 @@ msgstr "Failas importavimui"
 msgid "Location of the text file"
 msgstr "Tekstiniai SQL užklausų failai"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Nepasiekimas nurodytas www-serverio katalogas atsiuntimams."
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2012,6 +2136,20 @@ msgstr "Stabdyti procesą"
 msgid "in query"
 msgstr "užklausą vykdoma"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Rodomi įrašai"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr " iš viso "
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Užklausa užtruko %01.4f sek."
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2463,11 +2601,6 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Negalima perskaityti failo"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 #, fuzzy
 msgid ""
@@ -2475,15 +2608,6 @@ msgid ""
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Gali būti apytikslis. Žiūrėkite DUK 3.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2510,7 +2634,7 @@ msgstr "Generavo:"
 msgid "Rows"
 msgstr "Eilutės"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL gražino tuščią rezultatų rinkinį (nėra eilučių)."
@@ -2555,6 +2679,11 @@ msgstr "Struktūra"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Neaprašyti indeksai!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2591,6 +2720,13 @@ msgstr "Panaikintas pirminis raktas"
 msgid "Index %s has been dropped"
 msgstr "Indeksas %s panaikintas"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2723,7 +2859,7 @@ msgstr "Įterpti indeksui papildomus &nbsp;%s&nbsp;stulpelį(ius)"
 msgid "Add a new User"
 msgstr "Sukurti naują vartotoją"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Jūs sukūrėte naują vartotoją."
 
@@ -2912,10 +3048,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "Leisti kitiems vartotojams naudotis šia žyme"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Nuoroda ištrinta."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Nuorodos Antraštė"
@@ -2958,15 +3090,7 @@ msgstr "\"bzip\""
 msgid "Calendar"
 msgstr "Kalendorius"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Indeksą pervadinti PIRMINIU nepavyko!"
 
@@ -3087,11 +3211,6 @@ msgstr "Nustatykite lentelės %s koordinates"
 msgid "Connections"
 msgstr "Prisijungimai"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Duombazė %s buvo nukopijuota į %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Kopijuoti lentelė į (duombazė<b>.</b>lentelė):"
@@ -3115,7 +3234,7 @@ msgstr "Nepavyko prisijungti prie MySQL serverio"
 msgid "Could not connect to the target"
 msgstr "Nepavyko prisijungti prie MySQL serverio"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3215,26 +3334,17 @@ msgstr "Čekų-Slovakų"
 msgid "Danish"
 msgstr "Danų"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Nenurodytas duombazės vardas!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Duombazės eksportavimo parinktys"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Duomenų bazė %1$s sukurta."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr "'%s' duomenų bazė neegzistuoja."
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "Sėkmingai pašalintos %s duombazės."
@@ -3259,7 +3369,7 @@ msgstr "Leisti statistiką"
 msgid "Enable Statistics"
 msgstr "Neleisti statistikos"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3308,7 +3418,7 @@ msgstr "Defragmentuoti lentelę"
 msgid "Use delayed inserts"
 msgstr "Naudoti užlaikytus įterpimus"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Nepasirinta vartotojų trynimui!"
 
@@ -3521,34 +3631,11 @@ msgstr ""
 "Failas pavadinimu %s jau yra darbinėje stotyje, pakeiskite norimą pavadinimą "
 "arba pasirinkite nustatymą leidžiantį perrašyti esamus failus."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "duomenų bazės vardas"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "serverio vardas"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "lentelės vardas"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Ši reikšmė interpretuojama naudojant %1$sstrftime%2$s, taigi, galite naudoti "
-"laiko formatavimo eilutes. Taip pat pakeičiamos šios eilutės: %3$s. Kitas "
-"tekstas bus paliktas kaip yra."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Failai"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3572,7 +3659,7 @@ msgstr "Išvalyti lentelę (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3756,13 +3843,6 @@ msgstr "Excel 97-2003 XLS darbaknygė"
 msgid "Excel 2007 XLSX Workbook"
 msgstr "Excel 2007 XLSX darbaknygė"
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3799,7 +3879,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Įterpti naują įrašą"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4124,17 +4204,10 @@ msgstr "Rodyti procesus"
 msgid "No databases"
 msgstr "Nėra duombazių"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Nepažymėjote duombazės."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "Aprašymo nėra"
@@ -4148,15 +4221,11 @@ msgstr "Apie šio Saugojimo Variklio būseną nėra išsamios informacijos."
 msgid "No files found inside ZIP archive!"
 msgstr "ZIP archyve nerasta failų!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Neaprašyti indeksai!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Neaprašytos indekso dalys!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Nėra pakeitimų"
 
@@ -4175,7 +4244,7 @@ msgstr "Šis formatas neturi nustatymų"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Nėra teisių išsaugoti failui %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Neturite pakankamai teisių"
 
@@ -4212,7 +4281,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "Lentelė <b>%s</b> nerasta arba nenurodyta %s faile"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Nerasta vartotojo(ų)."
 
@@ -4260,7 +4330,7 @@ msgstr "Lentelės diagnostika"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Vartotojo %s slaptažodis sėkmingai pakeistas."
@@ -4361,11 +4431,11 @@ msgstr "Lenkų"
 msgid "Port"
 msgstr "Jungtis"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Pirminio rakto pavadinimas turi būti \"PRIMARY\"!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(\"PRIMARY\" <b>yra vienintelis</b> pirminio rakto tipas!)"
@@ -4572,7 +4642,7 @@ msgstr "Leisti modifikuoti duomenis."
 msgid "No privileges."
 msgstr "Be teisių."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Teisės sėkmingai perkrautos."
 
@@ -4615,11 +4685,6 @@ msgstr ""
 "<b>Užklausų statistika</b>: nuo paleidimo dienos buvo išsiųsta %s užklausų į "
 "serverį."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Užklausa užtruko %01.4f sek."
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Užklausos tipas"
@@ -4648,15 +4713,6 @@ msgstr "Patikrinti sąryšių vientisumą:"
 msgid "Relational schema"
 msgstr "Ryšių schema"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Nėra PMA lentelių, kurios leidžia dirbti su jungtinėmis MySQL lentelėmis. %"
-"sPaaiškinimas%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Sąryšiai"
@@ -4695,11 +4751,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "Pašalinti pažymėtus vartotojus"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Duombazė %s pervadinta į %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4807,7 +4858,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4947,7 +4998,7 @@ msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 "Panaikinti visas aktyvias vartotojų privilegijas ir pašalinti vartotojus."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Jūs panaikinote privilegijas %s"
@@ -5108,19 +5159,11 @@ msgstr "Rodyti pilnas užklausas"
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Rodomas PHP kodas"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Rodomi įrašai"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Rodoma SQL užklausa"
 
@@ -5902,7 +5945,7 @@ msgstr "Lentelė %s jau yra!"
 msgid "Alter column(s)"
 msgstr "Pakeisti stulpelį(-ius)"
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Lentelė %1$s sėkmingai pakeista"
@@ -5922,7 +5965,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Tuščias lentelės vardas!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "Duomenų bazė %1$s sukurta."
@@ -6045,7 +6088,7 @@ msgstr "Dabartinis serveris"
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "%s buvo sėkmingai išjungtas."
@@ -6056,12 +6099,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6078,10 +6115,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr " iš viso "
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6382,7 +6415,7 @@ msgstr "Unicodas"
 msgid "unknown"
 msgstr "nežinoma"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Jūs pakeitėte privilegijas  %s."
@@ -6403,17 +6436,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Rekomenduojame atnaujint %s iki %s ar vėlesnės versijos."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Išnaudota"
@@ -6427,7 +6449,7 @@ msgstr "Lentelių ir laukų vardams naudoti šias kabutes ` `"
 msgid "Use Host Table"
 msgstr "Naudoti Host lentelę"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Vartotojas %s jau yra!"
@@ -6440,7 +6462,7 @@ msgstr "Vartotojas %s jau yra!"
 msgid "User name"
 msgstr "Vartotojo vardas"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Privilegijų lentelėje pasirinktas vartotojas nerastas."
 
@@ -6448,7 +6470,7 @@ msgstr "Privilegijų lentelėje pasirinktas vartotojas nerastas."
 msgid "User overview"
 msgstr "Vartotojų peržiūra"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Pažymėti vartotojai sėkmingai pašalinti."
 
@@ -6510,10 +6532,6 @@ msgstr "Peržiūrėti lentelės struktūros atvaizdį"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Nepasiekimas nurodytas www-serverio katalogas atsiuntimams."
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Interneto serveris"
@@ -6531,10 +6549,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "pakaitos simbolis"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Neteisingas vartotojo vardas arba slaptažodis. Priėjimas uždraustas."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/lv.po b/po/lv.po
index dc3a02c29..96bb3b7dc 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:16+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: latvian <lv@li.org>\n"
@@ -89,6 +89,11 @@ msgstr "Apraksts"
 msgid "Use this value"
 msgstr "Lietot šo vērtību"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "Datubāze %s tika izdzēsta."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Datubāzes komentārs: "
@@ -205,6 +210,20 @@ msgstr "Iezīmēt visu"
 msgid "Unselect All"
 msgstr "Neiezīmēt neko"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Datubāzes nosaukums ir tukšs!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Datubāze %s tika pārsaukta par %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Datubāze %s tika pārkopēta uz %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Pārsaukt datubāzi par"
@@ -316,6 +335,15 @@ msgstr "Ieslēgts"
 msgid "Collation"
 msgstr "Izkārtojumi"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Papildiespējas darbam ar saistītām tabulām tika izslēgtas. Lai uzzinātu "
+"kāpēc, klikškiniet %sšeit%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Rādīt PDF shēmu"
@@ -643,7 +671,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -817,16 +846,64 @@ msgstr "Pārbaudīt tabulu"
 msgid "Database Log"
 msgstr "Datubāze"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Nevar nolasīt failu"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Ieraksts tika dzēsts."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -844,7 +921,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" komanda ir aizliegta."
 
@@ -884,10 +962,12 @@ msgid "The user name is empty!"
 msgstr "Lietotāja vārds nav norādīts!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Parole nav norādīta!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Paroles nesakrīt!"
 
@@ -1310,7 +1390,8 @@ msgstr "Parole:"
 msgid "Server Choice"
 msgstr "Servera izvēle"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "\"Cookies\" ir jābūt atļautiem aiz šī punkta."
 
@@ -1333,6 +1414,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Nevar pieslēgties MySQL serverim"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Kļūdains lietotājvārds/parole. Pieeja aizliegta."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1461,11 +1546,12 @@ msgstr "Nosūtīts"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentācija"
 
@@ -1529,7 +1615,7 @@ msgid "Skip Validate SQL"
 msgstr "Nepārbaudīt SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Pārbaudīt SQL"
 
@@ -1582,7 +1668,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1746,6 +1833,7 @@ msgid "Create"
 msgstr "Izveidot"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Nav privilēģiju"
 
@@ -1762,6 +1850,10 @@ msgstr "Izveidot jaunu tabulu datubāzē %s"
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1790,6 +1882,27 @@ msgstr "Pārrakstīt eksistējošos failus"
 msgid "File name template"
 msgstr "Faila nosaukuma šablons"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+#, fuzzy
+msgid "server name"
+msgstr "Lietotājvārds"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr ""
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "atcerēties šablonu"
@@ -1861,6 +1974,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr "Teksta faila atrašanās vieta"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Direktoija, kuru norādijāt augšupielādei, nav pieejama"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2006,6 +2128,20 @@ msgstr "Nogalināt"
 msgid "in query"
 msgstr "vaicājumā"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Parādu rindas"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "kopā"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Vaicājums ilga %01.4f s"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2449,11 +2585,6 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Nevar nolasīt failu"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 #, fuzzy
 msgid ""
@@ -2461,15 +2592,6 @@ msgid ""
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Var būt aptuvens skaits. Skatīt FAQ 3.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2496,7 +2618,7 @@ msgstr "Uzģenerēja"
 msgid "Rows"
 msgstr "Rindas"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL atgrieza tukšo rezultātu (0 rindas)."
@@ -2542,6 +2664,11 @@ msgstr "Struktūra"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Nav definēti indeksi!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2579,6 +2706,13 @@ msgstr "Primārā atslēga tika izdzēsta"
 msgid "Index %s has been dropped"
 msgstr "Indekss %s tika izdzēsts"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2711,7 +2845,7 @@ msgstr "Pievienot indeksam &nbsp;%s&nbsp;kolonn(u/as)"
 msgid "Add a new User"
 msgstr "Pievienot jaunu lietotāju"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Jūs pievienojāt jaunu lietotāju."
 
@@ -2904,10 +3038,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "Dot ikvienam lietotājam pieeju šai grāmatzīmei"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Ieraksts tika dzēsts."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Nosaukums"
@@ -2951,15 +3081,7 @@ msgstr "Arhivēts ar bzip"
 msgid "Calendar"
 msgstr "Kalendārs"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Nevar pārsaukt indeksu par PRIMARY!"
 
@@ -3081,11 +3203,6 @@ msgstr "Lūdzu konfigurējiet koordinātes tabulai %s"
 msgid "Connections"
 msgstr "Konekcijas"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Datubāze %s tika pārkopēta uz %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Kopēt tabulu uz (datubāze<b>.</b>tabula):"
@@ -3107,7 +3224,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3208,26 +3325,17 @@ msgstr "Čehu-Slovāku"
 msgid "Danish"
 msgstr "Dāņu"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Datubāzes nosaukums ir tukšs!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Datubāzu eksporta opcijas"
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "Datubāze %s tika izdzēsta."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s datubāzes tika veiksmīgi dzēstas."
@@ -3252,7 +3360,7 @@ msgstr "Izslēgt statistiku"
 msgid "Enable Statistics"
 msgstr "Ieslēgt statistiku"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3300,7 +3408,7 @@ msgstr "Defragmentēt tabulu"
 msgid "Use delayed inserts"
 msgstr "Lietot aizturētos INSERT"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3513,33 +3621,12 @@ msgstr ""
 "Fails %s jau eksistē uz servera. Lūdzu nomainiet faila nosaukumu vai "
 "atzīmējiet failu pārrakstīšanas opciju."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr ""
-
-#: libraries/messages.inc.php:335
-#, fuzzy
-msgid "server name"
-msgstr "Lietotājvārds"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "Lauki"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3564,7 +3651,7 @@ msgstr "Atsvaidzināt tabulu (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3748,13 +3835,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3791,7 +3871,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Ievietot kā jaunu rindu"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4107,17 +4187,10 @@ msgstr "Parādīt procesus"
 msgid "No databases"
 msgstr "Nav datubāzu"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Datubāze nav izvēlēta."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "Bez apraksta"
@@ -4131,15 +4204,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Nav definēti indeksi!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Nav definēto indeksa daļu!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Netika labots"
 
@@ -4158,7 +4227,7 @@ msgstr "Šim formātam nav opciju"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Web serverim nav tiesību rakstīt failā %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Jums nav pietiekoši tiesību, lai atrastos šeit tagad!"
 
@@ -4195,7 +4264,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "Tabula <b>%s</b> nav atrasta vai nav atzīmeta iekš %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Lietotāji netika atrasti."
 
@@ -4243,7 +4313,7 @@ msgstr "Tabulas apkalpošana"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Lietotāja %s parole tika veiksmīgi mainīta."
@@ -4346,11 +4416,11 @@ msgstr "Poļu"
 msgid "Port"
 msgstr "Kārtošana"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Primārās atslēgas nosaukumam jābūt... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4561,7 +4631,7 @@ msgstr "Ļauj mainīt datus."
 msgid "No privileges."
 msgstr "Nav privilēģiju."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Privilēģijas tika veiksmīgi pārlādētas."
 
@@ -4605,11 +4675,6 @@ msgstr ""
 "<b>Pieprasījumu statistika</b>: %s pieprasījumi tika nosūtīti uz serveri "
 "kopš tā palaišanās brīža."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Vaicājums ilga %01.4f s"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Vaicājuma tips"
@@ -4638,15 +4703,6 @@ msgstr "Pārbaudīt referenciālo integritāti:"
 msgid "Relational schema"
 msgstr "Relāciju shēma"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Papildiespējas darbam ar saistītām tabulām tika izslēgtas. Lai uzzinātu "
-"kāpēc, klikškiniet %sšeit%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relācijas"
@@ -4685,11 +4741,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "Dzēst izvēlētos lietotājus"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Datubāze %s tika pārsaukta par %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4796,7 +4847,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4932,7 +4983,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Atņemt visas aktīvās privilēģijas lietotājiem, un pēc tam dzēst tos."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Jūs atņēmāt privilēgijas lietotājam %s"
@@ -5093,19 +5144,11 @@ msgstr "Rādīt pilnos vaicājumus"
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Parādu rindas"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5870,7 +5913,7 @@ msgstr "Lietotājs %s jau eksistē!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, fuzzy, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Izvēlētie lietotāji tika veiksmīgi dzēsti."
@@ -5889,7 +5932,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Tabulas nosaukums nav norādīts!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "Tabula %s tika izdzēsta"
@@ -6010,7 +6053,7 @@ msgstr "Šis hosts"
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Process %s tika veiksmīgi nogalināts."
@@ -6021,12 +6064,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6043,10 +6080,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "kopā"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6346,7 +6379,7 @@ msgstr "Unikods"
 msgid "unknown"
 msgstr "nazināma"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Jūs modificējāt privilēģijas objektam %s."
@@ -6366,17 +6399,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Jums ir jāuzliek %s %s vai jaunāks."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Aizņem"
@@ -6390,7 +6412,7 @@ msgstr "Lietot apostrofa simbolu [`] tabulu un lauku nosaukumiem"
 msgid "Use Host Table"
 msgstr "Lietot hostu tabulu"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Lietotājs %s jau eksistē!"
@@ -6403,7 +6425,7 @@ msgstr "Lietotājs %s jau eksistē!"
 msgid "User name"
 msgstr "Lietotājvārds"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Izvēlētais lietotājs nav atrasts privilēģiju tabulā."
 
@@ -6411,7 +6433,7 @@ msgstr "Izvēlētais lietotājs nav atrasts privilēģiju tabulā."
 msgid "User overview"
 msgstr "Lietotāju pārskats"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Izvēlētie lietotāji tika veiksmīgi dzēsti."
 
@@ -6474,10 +6496,6 @@ msgstr "Apskatīt tabulas dampu (shēmu)"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Direktoija, kuru norādijāt augšupielādei, nav pieejama"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6495,10 +6513,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "aizstājējzīme"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Kļūdains lietotājvārds/parole. Pieeja aizliegta."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/mk.po b/po/mk.po
index 4b08e7bc7..dae26fe09 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:16+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: macedonian_cyrillic <mk@li.org>\n"
@@ -89,6 +89,11 @@ msgstr "Опис"
 msgid "Use this value"
 msgstr "Користи ја оваа вредност"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "Базата на податоци %s не е прифатена"
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Коментар на базата на податоци:"
@@ -205,6 +210,20 @@ msgstr "избери се"
 msgid "Unselect All"
 msgstr "ништо"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Името на базата на податоци не е зададено!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Базата на податоци %s е преименувана во %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Базата на податоци %s е ископирана во %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Преименувај ја базата на податоци во"
@@ -316,6 +335,15 @@ msgstr "Овозможено"
 msgid "Collation"
 msgstr "Подредување"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Дополнителните можности за работа со поврзаните табели се исклучени. За да "
+"дознаете зошто, кликнете %sовде%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Прикажи PDF шема"
@@ -643,7 +671,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -817,16 +846,64 @@ msgstr "Проверка на табелата"
 msgid "Database Log"
 msgstr "База на податоци"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Податотеката не е можно да се прочита"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Маркерот е избришан."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin преферира веб прелистувачи кои подржуваат рамки."
@@ -843,7 +920,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" командата е оневозможена."
 
@@ -883,10 +961,12 @@ msgid "The user name is empty!"
 msgstr "Не е внесен назив на корисник!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Лозинка е празна!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Лозинките не се идентични!"
 
@@ -1309,7 +1389,8 @@ msgstr "Лозинка:"
 msgid "Server Choice"
 msgstr "Избор на сервер"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "вашиот веб прелистувач треба да допушти cookies"
 
@@ -1333,6 +1414,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Не можам да се пријавам на MySQL серверот"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Погрешно корисничко име/лозинка. Пристапот не е допуштен."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1461,11 +1546,12 @@ msgstr "Пратено"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Документација"
 
@@ -1529,7 +1615,7 @@ msgid "Skip Validate SQL"
 msgstr "Прескокни ја проверката на SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Провери SQL"
 
@@ -1584,7 +1670,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1750,6 +1837,7 @@ msgid "Create"
 msgstr "Креирај"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Нема привилегии"
 
@@ -1766,6 +1854,10 @@ msgstr "Креирај нова табела во базата на подато
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1794,6 +1886,27 @@ msgstr "Препиши ги постоечките податотеки"
 msgid "File name template"
 msgstr "Шаблон на име на податотека"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+#, fuzzy
+msgid "server name"
+msgstr "Назив на корисник"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr ""
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "запамти го шаблонот"
@@ -1865,6 +1978,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr "Локација на текстуалната податотека"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Директориумот кој го избравте за праќање не е достапен"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2010,6 +2132,20 @@ msgstr "Прекини"
 msgid "in query"
 msgstr "во упитот"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Приказ на записи од "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "вкупно"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "време на извршување на упитот %01.4f секунди"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2472,11 +2608,6 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Податотеката не е можно да се прочита"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 #, fuzzy
 msgid ""
@@ -2486,15 +2617,6 @@ msgstr ""
 "Бројот на записи може да биде приближен. За подетални информации види FAQ "
 "3.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2521,7 +2643,7 @@ msgstr "Генерирал"
 msgid "Rows"
 msgstr "Записи"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL врати празен резултат (нула записи)."
@@ -2567,6 +2689,11 @@ msgstr "Структура"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Клучот не е дефиниран!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2604,6 +2731,13 @@ msgstr "Примарниот клуч е избришан"
 msgid "Index %s has been dropped"
 msgstr "Клучот %s е избиршан"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2736,7 +2870,7 @@ msgstr "Додади во клучот &nbsp;%s&nbsp;колона(и)"
 msgid "Add a new User"
 msgstr "Додади нов корисник"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Додадовте нов корисник."
 
@@ -2929,10 +3063,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "дади дозвола на секој корисник да пристапува на овој упит."
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Маркерот е избришан."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Назив"
@@ -2976,15 +3106,7 @@ msgstr "\"bzip\""
 msgid "Calendar"
 msgstr "Календар"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Не можам да го променам клучот во PRIMARY (примарен) !"
 
@@ -3104,11 +3226,6 @@ msgstr "Подесете ги координатите за табелата %s"
 msgid "Connections"
 msgstr "Конекции"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Базата на податоци %s е ископирана во %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Копирај ја табелата во (база<b>.</b>табела):"
@@ -3130,7 +3247,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3230,26 +3347,17 @@ msgstr "Чехословачки"
 msgid "Danish"
 msgstr "Дански"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Името на базата на податоци не е зададено!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Опции за извоз на бази на податоци"
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "Базата на податоци %s не е прифатена"
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s базата на податоци успешно е избришана."
@@ -3274,7 +3382,7 @@ msgstr "Исклучи статистики"
 msgid "Enable Statistics"
 msgstr "Вклучи статистики"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3322,7 +3430,7 @@ msgstr "Дефрагментирај ја табелата"
 msgid "Use delayed inserts"
 msgstr "Користи одложен внес"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3537,33 +3645,12 @@ msgstr ""
 "Податотека %s постои на серверот, променете го името на податотеката или "
 "изберете опција за пишување врз неа."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr ""
-
-#: libraries/messages.inc.php:335
-#, fuzzy
-msgid "server name"
-msgstr "Назив на корисник"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "Полиња"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3589,7 +3676,7 @@ msgstr "Освежување на табелата (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3773,13 +3860,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3816,7 +3896,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Внеси како нов запис"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4139,17 +4219,10 @@ msgstr "Прикажи листа на процеси"
 msgid "No databases"
 msgstr "Базата на податоци не постои"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Не е избрана ни една база на податоци."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "нема опис"
@@ -4163,15 +4236,11 @@ msgstr "Нема детални информации за статусот на
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Клучот не е дефиниран!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Делови од клучот не се дефинирани!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Нема измени"
 
@@ -4190,7 +4259,7 @@ msgstr "Не постојат опции за овој формат"
 msgid "The web server does not have permission to save the file %s."
 msgstr "На веб серверот не му е допуштено да ја сочува  податотеката %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Немате право на пристап овде!"
 
@@ -4227,7 +4296,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> табелата не е пронајдена или не е поставена во %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Корисникот не е пронајден."
 
@@ -4275,7 +4345,7 @@ msgstr "Можете да извршите:"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Лозинката за %s успешно е променета."
@@ -4378,11 +4448,11 @@ msgstr "Полски"
 msgid "Port"
 msgstr "Подредуваање"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Името на примарниот клуч мора да биде... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(\"PRIMARY\" <b>може</b> да биде име <b>само</b> на примарниот клуч!)"
@@ -4592,7 +4662,7 @@ msgstr "Дозволува измена на податоци."
 msgid "No privileges."
 msgstr "Нема привилегии."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Привилегиите се успешно вчитани."
 
@@ -4637,11 +4707,6 @@ msgstr ""
 "<b>Статистики на упити</b>: %s упити се поставени на серверот од времето на "
 "неговото стартување."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "време на извршување на упитот %01.4f секунди"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Вид на упит"
@@ -4670,15 +4735,6 @@ msgstr "Провери го референцијалниот интегрите
 msgid "Relational schema"
 msgstr "Релациона шема"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Дополнителните можности за работа со поврзаните табели се исклучени. За да "
-"дознаете зошто, кликнете %sовде%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Релации"
@@ -4717,11 +4773,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "Избриши ги селектираните корисници"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Базата на податоци %s е преименувана во %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4828,7 +4879,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4964,7 +5015,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Одземи ги сите привилегии на активните корисници а потоа избриши ги."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Ги забранивте привилегиите за %s"
@@ -5126,19 +5177,11 @@ msgstr "Прикажи комплетни упити"
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Приказ на записи од "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5902,7 +5945,7 @@ msgstr "Корисник %s веќе постои!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, fuzzy, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Изабраните корисници успешно се избришани."
@@ -5921,7 +5964,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Името на табелата е празно!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "Табелата %s е избришана"
@@ -6044,7 +6087,7 @@ msgstr "Овој host"
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Процесот %s е успешно прекинат."
@@ -6055,12 +6098,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6077,10 +6114,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "вкупно"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6386,7 +6419,7 @@ msgstr "Уникод"
 msgid "unknown"
 msgstr "непознат"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Ги ажуриравте привилегиите за %s."
@@ -6408,17 +6441,6 @@ msgid "You should upgrade to %s %s or later."
 msgstr ""
 "Би требало да го надоградите вашиот %s сервер на верзија %s или понова."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Големина"
@@ -6432,7 +6454,7 @@ msgstr "Името на полето стави го во '"
 msgid "Use Host Table"
 msgstr "Користи ја табелата на host-от"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Корисник %s веќе постои!"
@@ -6445,7 +6467,7 @@ msgstr "Корисник %s веќе постои!"
 msgid "User name"
 msgstr "Назив на корисник"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Изабраниот корисник не е пронајден во табелата на привилегии."
 
@@ -6453,7 +6475,7 @@ msgstr "Изабраниот корисник не е пронајден во т
 msgid "User overview"
 msgstr "Преглед на корисници"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Изабраните корисници успешно се избришани."
 
@@ -6516,10 +6538,6 @@ msgstr "Прикажи содржина (шема) на табелите"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Директориумот кој го избравте за праќање не е достапен"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6537,10 +6555,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "џокер"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Погрешно корисничко име/лозинка. Пристапот не е допуштен."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/mn.po b/po/mn.po
index 69e2041bf..0817b855d 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:17+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: mongolian <mn@li.org>\n"
@@ -88,6 +88,11 @@ msgstr "Тайлбар"
 msgid "Use this value"
 msgstr "Уг утгыг хэрэглэх"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr ""
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "ӨС-ийн тайлбар: "
@@ -204,6 +209,20 @@ msgstr "Бүгдийг сонгох"
 msgid "Unselect All"
 msgstr "Бүх сонгосныг болих"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Өгөгдлийн сангийн нэр хоосон!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "ӨС %s-н нэр нь %s-ээр солигджээ"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "ӨС %s нь %s руу хуулагдлаа"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Өгөгдлийн санг д.нэрлэх нь"
@@ -314,6 +333,15 @@ msgstr ""
 msgid "Collation"
 msgstr "Жишилт"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Холбогдсон хүснэгтүүдтэй ажиллах нэмэлт онцлогууд идэвхгүй болжээ. %sЭнд%s "
+"дарж шалгах."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "PDF-схем харуулах"
@@ -641,7 +669,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -809,16 +838,64 @@ msgstr ""
 msgid "Database Log"
 msgstr ""
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Файл уншигдахгүй байна"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "Оруулах нэмэлтүүд дуудагдсангүй, суулгацаа шалгана уу!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Тэмдэглэгээ устгагдсан."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Тэмдэглэл харуулах"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Тэмдэглэл %s нь үүсгэгдлээ"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Оруулалт амжилттай дууслаа, %d асуудал ажиллав."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin нь ямар ч хөтөч дээр <b>фрейм</b> гаргах чадвартай."
@@ -835,7 +912,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"ӨС устгах\" нь хаалттай."
 
@@ -875,10 +953,12 @@ msgid "The user name is empty!"
 msgstr "Хэрэглэгчийн нэр хоосон!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Нууц үг хоосон байна!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Нууц їгнїїд ялгаатай байна!"
 
@@ -1299,7 +1379,8 @@ msgstr "Нууц үг:"
 msgid "Server Choice"
 msgstr "Сервэр сонго"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Энэ газарт Cookies нээлттэй байх ёстой."
 
@@ -1321,6 +1402,10 @@ msgstr "%s секунд ба түүнээс их идэвхгүй байжээ,
 msgid "Cannot log in to the MySQL server"
 msgstr "MySQL руу нэвтэрч чадсангүй"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Нэвтрэгч/нууц үг буруу. Хандах боломжгүй"
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1447,11 +1532,12 @@ msgstr ""
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Баримт"
 
@@ -1515,7 +1601,7 @@ msgid "Skip Validate SQL"
 msgstr "SQL шалгалтыг алгасах"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "SQL-ийг батлах"
 
@@ -1570,7 +1656,8 @@ msgstr ""
 msgid "Font size"
 msgstr "Үсгийн хэмжээ"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1731,6 +1818,7 @@ msgid "Create"
 msgstr "Үүсгэх"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Онцгой эрхгүй"
 
@@ -1747,6 +1835,10 @@ msgstr "%s ӨС-д шинэ хүснэгт үүсгэх"
 msgid "Number of fields"
 msgstr "Талбаруудын тоо"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1775,6 +1867,29 @@ msgstr "Файл(ууд)-г дарж бичих"
 msgid "File name template"
 msgstr "Файлын нэрийн загвар"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "сервэрийн нэр"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "өгөгдлийн сангийн нэр"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "хүснэгтийн нэр"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Энэ утга нь %1$sstrftime%2$s -ийг хэрэглэж үүссэн, тиймээс та хугацааны "
+"тогтнолын тэмдэгтийг хэрэглэж болно. Нэмэлтээр дараах хувиргалт байх болно: %"
+"3$s. Бусад бичвэрүүд үүн шиг хадгалагдана."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "загварыг санах"
@@ -1846,6 +1961,15 @@ msgstr "Оруулах файл"
 msgid "Location of the text file"
 msgstr "Бичвэрфайлын байрлал"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Таны сонгосон хавтас \"upload\" хийгдэхгүй байна"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1992,6 +2116,20 @@ msgstr "Алах"
 msgid "in query"
 msgstr "асуултад"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Мөрүүдийг харуулж байна "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "Нийт"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Асуулт нь %01.4f сек авлаа"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2446,26 +2584,12 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Файл уншигдахгүй байна"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2491,7 +2615,7 @@ msgstr "Үүсгэгч"
 msgid "Rows"
 msgstr "Мөрүүд"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL хоосон үр дүн буцаалаа (тэг мөрүүд г.м.)."
@@ -2535,6 +2659,11 @@ msgstr ""
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Индекс тодорхойлогдоогүй!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2571,6 +2700,13 @@ msgstr "Үндсэн түлхүүр устгагдлаа"
 msgid "Index %s has been dropped"
 msgstr "Индекс %s нь устгагдсан"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2702,7 +2838,7 @@ msgstr "Индекст нэмэх&nbsp;%s&nbsp;багана(ууд)"
 msgid "Add a new User"
 msgstr "Шинэ хэрэглэгч нэмэх"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Шинэ хэрэглэгч нэмэгдлээ."
 
@@ -2891,10 +3027,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "Энэ тэмдэглэгээг бүх хэрэглэгчид хандахыг зөвшөөрөх"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Тэмдэглэгээ устгагдсан."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Хаяг"
@@ -2937,15 +3069,7 @@ msgstr "bzip-ээр шахагдсан"
 msgid "Calendar"
 msgstr "Цагалбар"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "Оруулах нэмэлтүүд дуудагдсангүй, суулгацаа шалгана уу!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Индексийг PRIMARY болгож чадсангүй!"
 
@@ -3064,11 +3188,6 @@ msgstr "%s хүснэгтийн координатыг тохируулна уу
 msgid "Connections"
 msgstr "Холболт"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "ӨС %s нь %s руу хуулагдлаа"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Хүснэгт хуулах(өгөгдлийн сан<b>.</b>хүснэгт):"
@@ -3090,7 +3209,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3187,26 +3306,17 @@ msgstr "Чехословак"
 msgid "Danish"
 msgstr "Дани"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Өгөгдлийн сангийн нэр хоосон!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "ӨС гаргах сонголтууд"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr ""
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s ӨС амжилттай устгагдлаа."
@@ -3230,7 +3340,7 @@ msgstr "Хаалттай статистик"
 msgid "Enable Statistics"
 msgstr "Нээлттэй статистик"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3276,7 +3386,7 @@ msgstr "Хүснэгт янзлах"
 msgid "Use delayed inserts"
 msgstr "Давталттай оруулалт хэрэглэх"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Устгахаар хэрэглэгч сонгогдсонгүй!"
 
@@ -3487,34 +3597,11 @@ msgid ""
 msgstr ""
 "Файл %s нь сервэр дээр байна, нэрээ соль эсвэл давхарлах сонголтыг шалга."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "өгөгдлийн сангийн нэр"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "сервэрийн нэр"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "хүснэгтийн нэр"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Энэ утга нь %1$sstrftime%2$s -ийг хэрэглэж үүссэн, тиймээс та хугацааны "
-"тогтнолын тэмдэгтийг хэрэглэж болно. Нэмэлтээр дараах хувиргалт байх болно: %"
-"3$s. Бусад бичвэрүүд үүн шиг хадгалагдана."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Файлууд"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3539,7 +3626,7 @@ msgstr "Flush the table (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Бүх хүснэгтийг цэвэрлэх (хаах)"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, fuzzy, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr "Гадаад түлхүүр үүсгэхэд алдаа гарлаа %1$s (өгөгдлийн төрлөө шалга)"
@@ -3721,13 +3808,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3763,7 +3843,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Шинэ мөр оруулаад"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4083,17 +4163,10 @@ msgstr "Процесууд харах"
 msgid "No databases"
 msgstr "ӨС байхгүй"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "ӨС сонгогдоогүй."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "тайлбаргүй"
@@ -4107,15 +4180,11 @@ msgstr "Энд уг агуулах хөдөлгүүрийн дэлгэрэнгү
 msgid "No files found inside ZIP archive!"
 msgstr "ZIP архив дотор файл байхгүй байна!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Индекс тодорхойлогдоогүй!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Тодорхойлогдсон индексийн хэсэггүй!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Солигдохгүй"
 
@@ -4133,7 +4202,7 @@ msgstr "Энэ тогтнол сонголтгүй"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Вэб-сервэр файл %s-г хадгалахад зөвшөөрөлгүй байна."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Танд хангалттай эрх байхгүй!"
 
@@ -4170,7 +4239,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> хүснэгт олдсонгүй эсвэл %s-д сонгогдоогүй"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Хэрэглэгч олдсонгүй."
 
@@ -4217,7 +4287,7 @@ msgstr ""
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "%s-ы нууц үг солигдлоо."
@@ -4317,11 +4387,11 @@ msgstr "Польш"
 msgid "Port"
 msgstr ""
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Үндсэн түлхүүрийн нэр нь PRIMARY байх ёстой!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4521,7 +4591,7 @@ msgstr "Өгөгдөл солихыг зөвшөөрөх."
 msgid "No privileges."
 msgstr "Онцгой эрхгүй."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Онцгой эрхүүд дахин дуудагдлаа."
 
@@ -4563,11 +4633,6 @@ msgid ""
 msgstr ""
 "<b>Асуултын статистик</b>: Эхэлснээс хойш, %s асуулт сервэр рүү илгээгдсэн."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Асуулт нь %01.4f сек авлаа"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Асуултын төрөл"
@@ -4596,15 +4661,6 @@ msgstr "Үнэн зөв өгөгдлийг шалгах:"
 msgid "Relational schema"
 msgstr "Хамааралтай схем"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Холбогдсон хүснэгтүүдтэй ажиллах нэмэлт онцлогууд идэвхгүй болжээ. %sЭнд%s "
-"дарж шалгах."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Хамаарал"
@@ -4643,11 +4699,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "Сонгогдсон хэрэглэгчдийг хасах"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "ӨС %s-н нэр нь %s-ээр солигджээ"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4751,7 +4802,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4889,7 +4940,7 @@ msgstr ""
 "Устгахын төгсгөлд нь хэрэглэгчдээс идэвхтэй бүх онцгой эрхийг хүчингүй "
 "болгох."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Онцгой эрх %s -ыг хүчингүй болголоо"
@@ -5048,19 +5099,11 @@ msgstr "Бүтэн асуулт харуулах"
 msgid "Show/Hide left menu"
 msgstr "Харуулах/Нуух зүүн цэс"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Тэмдэглэл харуулах"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "PHP кодоор харуулах"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Мөрүүдийг харуулж байна "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "SQL асуудал харуулах"
 
@@ -5868,7 +5911,7 @@ msgstr "Хүснэгт %s нь оршин байна!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr ""
@@ -5887,7 +5930,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Хүснэгтийн нэр хоосон байна!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr ""
@@ -6008,7 +6051,7 @@ msgstr "Энэ хост"
 msgid "Threads"
 msgstr "Thread-үүд"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Thread %s нь устгагдав."
@@ -6019,12 +6062,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "хаанаас/хаашаа хуудас"
@@ -6041,10 +6078,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr "Холбоо сонгохдоо, дарах нь :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "Нийт"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6342,7 +6375,7 @@ msgstr "Юникод"
 msgid "unknown"
 msgstr "үлмэдэх"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, fuzzy, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Онцгой эрх шинэчлэгдлээ"
@@ -6362,17 +6395,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Та хувилбар %s -г %s -ээр сайжруулах хэрэгтэй эсвэл дараа."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Ашиглалт"
@@ -6386,7 +6408,7 @@ msgstr "Хүснэгт ба талбарын нэрийг буруу хашил
 msgid "Use Host Table"
 msgstr "Хост хүснэгт хэрэглэх"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Хэрэглэгч %s оршин байна!"
@@ -6399,7 +6421,7 @@ msgstr "Хэрэглэгч %s оршин байна!"
 msgid "User name"
 msgstr "Хэрэглэгчийн нэр"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Сонгогдсон хэрэглэгч онцгой эрхийн хүснэгтэд алга байна."
 
@@ -6407,7 +6429,7 @@ msgstr "Сонгогдсон хэрэглэгч онцгой эрхийн хүс
 msgid "User overview"
 msgstr "User overview"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Сонгогдсон хэрэглэгч устгагдлаа."
 
@@ -6470,10 +6492,6 @@ msgstr "Хүснэгтийн схем харах"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Таны сонгосон хавтас \"upload\" хийгдэхгүй байна"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6491,10 +6509,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "загвар"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Нэвтрэгч/нууц үг буруу. Хандах боломжгүй"
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/ms.po b/po/ms.po
index 6a1064a8c..dc3d5cdd7 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:17+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: malay <ms@li.org>\n"
@@ -87,6 +87,11 @@ msgstr "tiada keterangan"
 msgid "Use this value"
 msgstr ""
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "angkalan data %s telah digugurkan."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 #, fuzzy
 msgid "Database comment: "
@@ -204,6 +209,21 @@ msgstr "Sila pilih pangkalan data"
 msgid "Unselect All"
 msgstr "Nyahpilih Semua"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+#, fuzzy
+msgid "The database name is empty!"
+msgstr "Nama jadual  adalah kosong"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, fuzzy, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Jadual %s telah ditukarnama ke %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, fuzzy, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Jadual %s telah disalin ke %s."
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 #, fuzzy
 msgid "Rename database to"
@@ -317,6 +337,15 @@ msgstr "Membenarkan"
 msgid "Collation"
 msgstr ""
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Ciri-ciri tambahan ini adalah untuk bekerja dengan pautan jadual yang telah "
+"tidak diaktifkan. Untuk mengetahuinya klik %shere%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Papar Skema PDF"
@@ -645,7 +674,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -818,16 +848,64 @@ msgstr "Periksa Jadual"
 msgid "Database Log"
 msgstr "Pangkalan Data"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr ""
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "TandaBuku telah dipadam."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -846,7 +924,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "keterangan \"DROP DATABASE\" di tidak aktifkan ."
 
@@ -886,10 +965,12 @@ msgid "The user name is empty!"
 msgstr "Kata Pengenalan kosong!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Katalaluan adalah kosong!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Katalaluan tidak sama!"
 
@@ -1309,7 +1390,8 @@ msgstr "Katalaluan:"
 msgid "Server Choice"
 msgstr "Pilihan Pelayan"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Cecikut mestilah dihidupkan ketika ini."
 
@@ -1331,6 +1413,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Tidak boleh log-masuk ke server MySQL"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Salah kata pengenalan/kata laluan. Akses dilarang."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1457,11 +1543,12 @@ msgstr "Hantar"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentasi"
 
@@ -1525,7 +1612,7 @@ msgid "Skip Validate SQL"
 msgstr "Melangkau Pengesahan SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Mengesahkan SQL"
 
@@ -1578,7 +1665,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1739,6 +1827,7 @@ msgid "Create"
 msgstr "Cipta"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Tiada Privilej"
 
@@ -1755,6 +1844,10 @@ msgstr "Cipta jadual baru pada pangkalan data %s"
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1783,6 +1876,27 @@ msgstr ""
 msgid "File name template"
 msgstr ""
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+#, fuzzy
+msgid "server name"
+msgstr "Kata Pengenalan"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr ""
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr ""
@@ -1854,6 +1968,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr "Lokasi bagi fail teks"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Direktori muatnaik yang telah ditetapkan tidak dapat dicapai"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1999,6 +2122,20 @@ msgstr "Bunuh"
 msgid "in query"
 msgstr "pada kueri"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Papar baris"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "jumlah"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr ""
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2442,26 +2579,12 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr ""
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2488,7 +2611,7 @@ msgstr "Dijana oleh"
 msgid "Rows"
 msgstr "Baris"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL memulangkan set hasil kosong (i.e. sifar baris)"
@@ -2534,6 +2657,11 @@ msgstr "Struktur"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Tiada indeks ditafrifkan!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2571,6 +2699,13 @@ msgstr "Kekunci utama telah digugurkan"
 msgid "Index %s has been dropped"
 msgstr "Indeks %s telah digugurkan"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2701,7 +2836,7 @@ msgstr "Tambah ke indeks &nbsp;%s&nbsp;kolum"
 msgid "Add a new User"
 msgstr "Tambah Pengguna Baru"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Anda telah menambah pengguna baru."
 
@@ -2898,10 +3033,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr ""
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "TandaBuku telah dipadam."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Label"
@@ -2944,15 +3075,7 @@ msgstr "bzipped"
 msgid "Calendar"
 msgstr ""
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Tidak boleh menukar indekx ke PRIMARY!"
 
@@ -3070,11 +3193,6 @@ msgstr "Sila konfigurasikan kordinat bagi jadual %s"
 msgid "Connections"
 msgstr "Hubungan"
 
-#: libraries/messages.inc.php:186
-#, fuzzy, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Jadual %s telah disalin ke %s."
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Salin jadual ke (pangkalandata<b>.</b>jadual):"
@@ -3096,7 +3214,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3196,27 +3314,17 @@ msgstr ""
 msgid "Danish"
 msgstr ""
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-#, fuzzy
-msgid "The database name is empty!"
-msgstr "Nama jadual  adalah kosong"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr ""
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "angkalan data %s telah digugurkan."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr ""
@@ -3243,7 +3351,7 @@ msgstr "Statistik pangkalan data"
 msgid "Enable Statistics"
 msgstr "Statistik pangkalan data"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3287,7 +3395,7 @@ msgstr ""
 msgid "Use delayed inserts"
 msgstr ""
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3497,33 +3605,12 @@ msgid ""
 "File %s already exists on server, change filename or check overwrite option."
 msgstr ""
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr ""
-
-#: libraries/messages.inc.php:335
-#, fuzzy
-msgid "server name"
-msgstr "Kata Pengenalan"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "Medan"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3544,7 +3631,7 @@ msgstr "Buang jadual (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3730,13 +3817,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3773,7 +3853,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Selitkan baris baru"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4088,17 +4168,10 @@ msgstr "Papar proses"
 msgid "No databases"
 msgstr "Tiada pangkalan data"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr ""
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "tiada keterangan"
@@ -4112,15 +4185,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Tiada indeks ditafrifkan!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Tiada bahagian indeks ditakrifkan!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Tiada perubahan"
 
@@ -4139,7 +4208,7 @@ msgstr ""
 msgid "The web server does not have permission to save the file %s."
 msgstr ""
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Anda tidak mempunyai hak mencukupi untuk berada disini sekarang!"
 
@@ -4174,7 +4243,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "Jadual <b>%s</b> tidak dijumpai atau ditetapkan pada %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Tiada pengguna dijumpai."
 
@@ -4223,7 +4293,7 @@ msgstr "Penyenggaraan Jadual"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr ""
@@ -4326,11 +4396,11 @@ msgstr ""
 msgid "Port"
 msgstr "Isih"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Nama kekunci utama mestilah... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(\"PRIMARY\" <b>mesti</b> nama dan <b>semesti</b> dari kekunci utama!)"
@@ -4527,7 +4597,7 @@ msgstr ""
 msgid "No privileges."
 msgstr "Tiada Privilej"
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
@@ -4571,11 +4641,6 @@ msgstr ""
 "<b>Kueri Statistik</b>: Sejak ia dijalankan, %s kueri telah dihantar kepada "
 "pelayan."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr ""
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Jenis Kueri"
@@ -4604,15 +4669,6 @@ msgstr "Semak integriti rujukan:"
 msgid "Relational schema"
 msgstr "Skema Hubungan"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Ciri-ciri tambahan ini adalah untuk bekerja dengan pautan jadual yang telah "
-"tidak diaktifkan. Untuk mengetahuinya klik %shere%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 #, fuzzy
 msgid "Relations"
@@ -4652,11 +4708,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr ""
 
-#: libraries/messages.inc.php:761
-#, fuzzy, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Jadual %s telah ditukarnama ke %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4763,7 +4814,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4899,7 +4950,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Anda telah menarikbalik privilej Keistimewaan untuk %s"
@@ -5061,19 +5112,11 @@ msgstr ""
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Papar baris"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5838,7 +5881,7 @@ msgstr ""
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr ""
@@ -5857,7 +5900,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Nama jadual  adalah kosong"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "Jadual %s telah digugurkan"
@@ -5978,7 +6021,7 @@ msgstr ""
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Bebenang %s telah berjaya dimatikan."
@@ -5989,12 +6032,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6011,10 +6048,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "jumlah"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6289,7 +6322,7 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Anda telah mengemaskini privilej bagi %s."
@@ -6308,17 +6341,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr ""
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Penggunaan"
@@ -6332,7 +6354,7 @@ msgstr "Sertakan nama jadual dan medan dengan backquotes"
 msgid "Use Host Table"
 msgstr ""
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
@@ -6345,7 +6367,7 @@ msgstr ""
 msgid "User name"
 msgstr "Kata Pengenalan"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
@@ -6353,7 +6375,7 @@ msgstr ""
 msgid "User overview"
 msgstr ""
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr ""
 
@@ -6415,10 +6437,6 @@ msgstr "Lihat longgokan (skema) pangkalan data"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Direktori muatnaik yang telah ditetapkan tidak dapat dicapai"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6436,10 +6454,6 @@ msgstr ""
 msgid "wildcard"
 msgstr ""
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Salah kata pengenalan/kata laluan. Akses dilarang."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/nb.po b/po/nb.po
index 3af9d7515..5681d256f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-05-06 08:35+0200\n"
 "Last-Translator:  <sven.erik.andersen@gmail.com>\n"
 "Language-Team: norwegian <no@li.org>\n"
@@ -90,6 +90,11 @@ msgstr "Beskrivelse"
 msgid "Use this value"
 msgstr "Bruk denne verdien"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Databasen %1$s har blitt opprettet."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Database kommentar: "
@@ -206,6 +211,20 @@ msgstr "Velg alle"
 msgid "Unselect All"
 msgstr "Fjern alle valgte"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Databasen er uten navn!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Databasen %s har endret navn til %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Databasen %s har blitt kopiert til %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Endre databasens navn til"
@@ -310,6 +329,15 @@ msgstr "Slå på"
 msgid "Collation"
 msgstr "Sammenligning"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Tilleggsfunksjonene for å kunne jobbe med koblede tabeller er deaktivert. "
+"For å finne ut hvorfor, klikk %sher%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Vis PDF-skjema"
@@ -637,7 +665,8 @@ msgstr "Overvåkning er aktiv."
 msgid "Tracking is not active."
 msgstr "Overvåkning er ikke aktiv."
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -805,16 +834,74 @@ msgstr "Overvåk tabell"
 msgid "Database Log"
 msgstr "Databaselogg"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Du forsøkte sansynligvis å laste opp en for stor fil. Sjekk %sdokumentasjonen"
+"%s for måter å omgå denne begrensningen."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Fila kunne ikke leses"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Du forsøkte å laste en komprimert fil som det ikke er støtte for (%s). Enten "
+"så er ikke støtte implementert eller den er slått av i din konfigurasjon."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Ingen data ble mottatt for importering. Enten ble ingen filnavn gitt, eller "
+"filstørrelsen oversteg maksimum størrelse tillatt i din PHP konfigurasjon. "
+"Se FAQ 1.16"
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"Kan ikke starte importeringsprogramtilleggene, kontroller din installasjon!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Bokmerket har blitt slettet."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Vis bokmerke"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Bokmerke %s opprettet"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Importen er fullført, %d spørringer utført."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Skripttidsabrudd passert, hvis du ønsker å fortsette importen kan du "
+"gjennopplaste fila og importeringen vil fortsette."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin er mer brukervennlig med en <b>rammekapabel</b> nettleser."
@@ -831,7 +918,8 @@ msgstr "Klikk for å velge"
 msgid "Click to unselect"
 msgstr "Klikk for å fjerne valg"
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\"-uttrykk er avslått."
 
@@ -872,10 +960,12 @@ msgid "The user name is empty!"
 msgstr "Brukernavnet er tomt!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Passordet er blankt!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Passordene er ikke like!"
 
@@ -1250,7 +1340,8 @@ msgstr "Passord:"
 msgid "Server Choice"
 msgstr "Tjenervalg"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies må være slått på forbi dette punkt."
 
@@ -1273,6 +1364,10 @@ msgstr "Ingen aktivitet på %s sekunder eller mer, du må logge inn på nytt"
 msgid "Cannot log in to the MySQL server"
 msgstr "Kan ikke logge inn til MySQL tjeneren"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Ugyldig brukernavn/passord. Ingen tilgang."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1398,11 +1493,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentasjon"
 
@@ -1466,7 +1562,7 @@ msgid "Skip Validate SQL"
 msgstr "Ikke teste SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Test SQL"
 
@@ -1519,7 +1615,8 @@ msgstr "Funksjonaliteten %s er påvirket av en kjent feil, se %s"
 msgid "Font size"
 msgstr "Fontstørrelse"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1680,6 +1777,7 @@ msgid "Create"
 msgstr "Opprett"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Ingen privilegier"
 
@@ -1696,6 +1794,10 @@ msgstr "Opprett ny tabell i database %s"
 msgid "Number of fields"
 msgstr "Antall felter"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr "Kunne ikke laste eksporttillegg, kontroller din innstallasjon!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1724,6 +1826,29 @@ msgstr "Skriv over eksisterende filer"
 msgid "File name template"
 msgstr "Filnavnsmal"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "tjenernavn"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "databasenavn"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "tabellnavn"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Denne verdien blir tolket slik som %1$sstrftime%2$s, så du kan bruke "
+"tidformateringsstrenger. I tillegg vil følgende transformasjoner skje: %3$s. "
+"All annen tekst beholdes som den er."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "husk malen"
@@ -1793,6 +1918,15 @@ msgstr "Fil for importering"
 msgid "Location of the text file"
 msgstr "Plassering av filen"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Filopplastinger er ikke tillatt på denne tjeneren."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Katalogen du anga for opplasting kan ikke nåes"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1941,6 +2075,20 @@ msgstr "Avslutt"
 msgid "in query"
 msgstr "i spørring"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Viser rader "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "totalt"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Spørring tok %01.4f sek"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2426,11 +2574,6 @@ msgstr "Klarte ikke å skrive fila til harddisken."
 msgid "File upload stopped by extension."
 msgstr "Filopplasting stoppet av utvidelse."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Fila kunne ikke leses"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
@@ -2438,17 +2581,6 @@ msgid ""
 msgstr ""
 "Feil oppstod under forsøk på flytting av den opplastede fila, se FAQ 1.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Du forsøkte å laste en komprimert fil som det ikke er støtte for (%s). Enten "
-"så er ikke støtte implementert eller den er slått av i din konfigurasjon."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2474,7 +2606,7 @@ msgstr "Generert av"
 msgid "Rows"
 msgstr "Rader"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL returnerte ett tomt resultat (m.a.o. ingen rader)."
@@ -2521,6 +2653,11 @@ msgstr "struktur"
 msgid "Go to view"
 msgstr "Gå til visning"
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Ingen indeks definert!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2557,6 +2694,15 @@ msgstr "Primærnøkkelen har blitt slettet"
 msgid "Index %s has been dropped"
 msgstr "Indeksen %s har blitt slettet"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"Indeksene %1$s og %2$s ser ut til å være like og en av dem burde kunne "
+"fjernes."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2686,7 +2832,7 @@ msgstr "Legg til indeks&nbsp;%s&nbsp;kolonne(r)"
 msgid "Add a new User"
 msgstr "Legg til en ny bruker"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Du har lagt til en ny bruker."
 
@@ -2875,10 +3021,6 @@ msgstr "Last opp til BLOB lager"
 msgid "Let every user access this bookmark"
 msgstr "La alle brukere ha adgang til dette bokmerket"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Bokmerket har blitt slettet."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Navn"
@@ -2921,16 +3063,7 @@ msgstr "Komprimert (bz2)"
 msgid "Calendar"
 msgstr "Kalender"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr "Kunne ikke laste eksporttillegg, kontroller din innstallasjon!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"Kan ikke starte importeringsprogramtilleggene, kontroller din installasjon!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Kan ikke endre indeks til PRIMARY!"
 
@@ -3052,11 +3185,6 @@ msgstr "Vennligst konfigurer koordinatene for tabell %s"
 msgid "Connections"
 msgstr "tilkoblinger"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Databasen %s har blitt kopiert til %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Kopier tabell til (database<b>.</b>tabell):"
@@ -3078,7 +3206,7 @@ msgstr "Kunne ikke koble til kilden"
 msgid "Could not connect to the target"
 msgstr "Kunne ikke koble til målet"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3175,26 +3303,17 @@ msgstr "Tjekkoslovakisk"
 msgid "Danish"
 msgstr "dansk"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Databasen er uten navn!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Databaseeksportinnstillinger"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Databasen %1$s har blitt opprettet."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr "'%s' database eksisterer ikke."
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s databasene har blitt slettet."
@@ -3218,7 +3337,7 @@ msgstr "Slå av statistikk"
 msgid "Enable Statistics"
 msgstr "Slå på statistikk"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3265,7 +3384,7 @@ msgstr "Defragmenter tabell"
 msgid "Use delayed inserts"
 msgstr "Bruk forsinkede innsettinger"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Ingen brukere merket for sletting!"
 
@@ -3480,34 +3599,11 @@ msgstr ""
 "Fila %s eksisterer alt på serveren, endre navnet eller merk av for "
 "overskriving av fil."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "databasenavn"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "tjenernavn"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "tabellnavn"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Denne verdien blir tolket slik som %1$sstrftime%2$s, så du kan bruke "
-"tidformateringsstrenger. I tillegg vil følgende transformasjoner skje: %3$s. "
-"All annen tekst beholdes som den er."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Filer"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3532,7 +3628,7 @@ msgstr "Oppfrisk tabellen (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Flush (close) all tables"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3718,15 +3814,6 @@ msgstr "Excel 97-2003 XLS Workbook"
 msgid "Excel 2007 XLSX Workbook"
 msgstr "Excel 2007 XLSX Workbook"
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"Indeksene %1$s og %2$s ser ut til å være like og en av dem burde kunne "
-"fjernes."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3763,7 +3850,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Sett inn som ny rad"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Insatt rad id: %1$d"
@@ -4092,20 +4179,10 @@ msgstr "Vis prosesser"
 msgid "No databases"
 msgstr "Ingen databaser"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Ingen databaser er valgt."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Ingen data ble mottatt for importering. Enten ble ingen filnavn gitt, eller "
-"filstørrelsen oversteg maksimum størrelse tillatt i din PHP konfigurasjon. "
-"Se FAQ 1.16"
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "ingen beskrivelse"
@@ -4120,15 +4197,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "Ingen filer funnet inne i ZIP arkivet!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Ingen indeks definert!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Ingen indeksdeler definert!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Ingen endring"
 
@@ -4146,7 +4219,7 @@ msgstr "Dette formatet har ingen valg"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Webserveren har ikke tillatelse til å lagre fila %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Du har ikke nok rettigheter til å være her nå!"
 
@@ -4183,7 +4256,8 @@ msgstr "ikke tilstede"
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> tabellen ble ikke funnet eller ikke konfigurert i %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Ingen bruker(e) funnet."
 
@@ -4230,7 +4304,7 @@ msgstr "Partisjonsvedlikehold"
 msgid "Partition %s"
 msgstr "Partisjon %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Passordet til %s er endret."
@@ -4333,11 +4407,11 @@ msgstr "Polsk"
 msgid "Port"
 msgstr "Port"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Navnet til  primærnøkkelen må være... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4541,7 +4615,7 @@ msgstr "Tillater endring av data."
 msgid "No privileges."
 msgstr "Ingen privilegier."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Oppfriskingen av privilegiene lyktes."
 
@@ -4584,11 +4658,6 @@ msgstr ""
 "<b>Spørrings statistikk</b>: Siden oppstart, har %s spørringer blitt sendt "
 "til tjeneren."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Spørring tok %01.4f sek"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Spørringstype"
@@ -4617,15 +4686,6 @@ msgstr "Sjekk referanseintegritet:"
 msgid "Relational schema"
 msgstr "Relasjonsskjema"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Tilleggsfunksjonene for å kunne jobbe med koblede tabeller er deaktivert. "
-"For å finne ut hvorfor, klikk %sher%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relasjoner"
@@ -4664,11 +4724,6 @@ msgstr "Fjern partisjonering"
 msgid "Remove selected users"
 msgstr "Fjern valgte brukere"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Databasen %s har endret navn til %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4785,7 +4840,7 @@ msgstr ""
 "Denne tjeneren er ikke konfigurert som master i en replikasjonsprosess. "
 "Ønsker du å <a href=\"%s\">konfigurere</a> den?"
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4928,7 +4983,7 @@ msgstr "Restarte innsettinga med %s rader"
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Tilbakekall alle aktive privilegier fra brukerne og slett dem etterpå."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Du har fjernet privilegiene til %s"
@@ -5094,19 +5149,11 @@ msgstr "Vis hele spørringen"
 msgid "Show/Hide left menu"
 msgstr "Skjul/Vis venstre meny"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Vis bokmerke"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Viser som PHP kode"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Viser rader "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Viser SQL spørring"
 
@@ -5989,7 +6036,7 @@ msgstr "Tabel %s eksisterer allerede!"
 msgid "Alter column(s)"
 msgstr "Endre kolonne(r)"
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Tabellen %1$s har blitt endrett"
@@ -6008,7 +6055,7 @@ msgstr "Ønsker du å slette alle tidligere rader fra måltabeller?"
 msgid "The table name is empty!"
 msgstr "Tabellnavnet er tomt!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "Tabellen %1$s har blitt opprettet."
@@ -6131,7 +6178,7 @@ msgstr "Denne vert"
 msgid "Threads"
 msgstr "Tråder"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Tråd %s ble avsluttet med suksess."
@@ -6145,14 +6192,6 @@ msgstr ""
 "at phpMyAdmin ikke vil være istand til å fullføre importeringen uten at du "
 "øker php tidsgrensen."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Skripttidsabrudd passert, hvis du ønsker å fortsette importen kan du "
-"gjennopplaste fila og importeringen vil fortsette."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "til/fra side"
@@ -6169,10 +6208,6 @@ msgstr "Veksle mellom liten/stor"
 msgid "To select relation, click :"
 msgstr "For å velge relasjon, klikk :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "totalt"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6481,7 +6516,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "ukjent"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Du har oppdatert privilegiene til %s."
@@ -6500,19 +6535,6 @@ msgstr "Les i dokumentasjonen hvordan du oppdaterer din Column_comments tabell"
 msgid "You should upgrade to %s %s or later."
 msgstr "Du burde oppgradere til %s %s eller nyere."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Du forsøkte sansynligvis å laste opp en for stor fil. Sjekk %sdokumentasjonen"
-"%s for måter å omgå denne begrensningen."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Filopplastinger er ikke tillatt på denne tjeneren."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Bruk"
@@ -6526,7 +6548,7 @@ msgstr "Bruk venstre anførselstegn med tabell og feltnavn"
 msgid "Use Host Table"
 msgstr "Vis vert tabell"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Brukeren %s finnes fra før!"
@@ -6539,7 +6561,7 @@ msgstr "Brukeren %s finnes fra før!"
 msgid "User name"
 msgstr "Brukernavn"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Den valgte brukeren ble ikke funnet i privilegietabellen."
 
@@ -6547,7 +6569,7 @@ msgstr "Den valgte brukeren ble ikke funnet i privilegietabellen."
 msgid "User overview"
 msgstr "Brukeroversikt"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "De valgte brukerne har blitt slettet."
 
@@ -6610,10 +6632,6 @@ msgstr "Vis dump (skjema) av tabell"
 msgid "VIEW name"
 msgstr "VIEW navn"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Katalogen du anga for opplasting kan ikke nåes"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Webserver"
@@ -6631,10 +6649,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "jokertegn"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Ugyldig brukernavn/passord. Ingen tilgang."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/nl.po b/po/nl.po
index d66f8f5d3..a0ac35da5 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-26 15:46+0200\n"
 "Last-Translator:  <rink@initfour.nl>\n"
 "Language-Team: dutch <nl@li.org>\n"
@@ -90,6 +90,11 @@ msgstr "Beschrijving"
 msgid "Use this value"
 msgstr "Gebruik deze waarde"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Database %1$s is aangemaakt."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Database commentaar: "
@@ -206,6 +211,20 @@ msgstr "Selecteer alles"
 msgid "Unselect All"
 msgstr "Deselecteer alles"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "De database naam is leeg!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Database %s is hernoemd naar %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Database %s is gekopieerd naar %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Hernoem database naar"
@@ -316,6 +335,15 @@ msgstr "Inschakelen"
 msgid "Collation"
 msgstr "Collatie"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Extra opties om met tabellen te werken, die gelinkt zijn, zijn "
+"uitgeschakeld. Om te weten te komen waarom klik %shier%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Geef het PDF-schema weer"
@@ -643,7 +671,8 @@ msgstr "Tracking is ingeschakeld."
 msgid "Tracking is not active."
 msgstr "Tracking is niet actief."
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -812,16 +841,77 @@ msgstr "Tabel tracken"
 msgid "Database Log"
 msgstr "Database-log"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"U probeerde waarschijnlijk een bestand dat te groot is te uploaden. Zie de %"
+"sdocumentatie%s voor mogelijkheden om dit te omzeilen."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Bestand kon niet worden gelezen"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"U probeerde een bestand met een niet ondersteunde compressie (%s) te "
+"uploaden. De ondersteuning is niet geïmplementeerd of uitgeschakeld in de "
+"configuratie."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Er is geen data ontvangen om te importeren. Dit kan gebeuren wanneer er geen "
+"bestand werd verzonden, of wanneer deze werd afgekeurd op basis van de "
+"maximale bestandsgrootte zoals opgegeven in de PHP-configuratie. Zie [a@./"
+"Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"De plugins voor het importeren konden niet worden geladen, controleer uw "
+"installatie!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "De boekenlegger (Bookmark) is verwijderd."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Toon bookmark"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Bookmark %s aangemaakt"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Import is geslaagd, %d queries uitgevoerd."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"De maximale uitvoertijd is verstreken, indien u de import wil afmaken kunt u "
+"het bestand opnieuw invoeren."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -840,7 +930,8 @@ msgstr "Klik om te selecteren"
 msgid "Click to unselect"
 msgstr "Klik om te de-selecteren"
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\"-opdrachten zijn niet mogelijk."
 
@@ -882,10 +973,12 @@ msgid "The user name is empty!"
 msgstr "De gebruikersnaam is leeg!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Het wachtwoord is leeg!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "De wachtwoorden zijn niet gelijk!"
 
@@ -1312,7 +1405,8 @@ msgstr "Wachtwoord:"
 msgid "Server Choice"
 msgstr "Serverkeuze"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies moeten aan staan voorbij dit punt."
 
@@ -1336,6 +1430,10 @@ msgstr "Geen activiteit voor %s seconden of meer, log a.u.b. opnieuw in"
 msgid "Cannot log in to the MySQL server"
 msgstr "Kan niet inloggen op de MySQL-server"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Verkeerde gebruikersnaam/wachtwoord. Toegang geweigerd."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1464,11 +1562,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Documentatie"
 
@@ -1532,7 +1631,7 @@ msgid "Skip Validate SQL"
 msgstr "SQL-validatie overslaan"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Valideer SQL"
 
@@ -1587,7 +1686,8 @@ msgstr "De %s functionaliteit heeft last van een bekend probleem, zie %s"
 msgid "Font size"
 msgstr "Font formaat"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1754,6 +1854,7 @@ msgid "Create"
 msgstr "Aanmaken"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Geen rechten"
 
@@ -1770,6 +1871,12 @@ msgstr "Nieuwe tabel aanmaken in database %s"
 msgid "Number of fields"
 msgstr "Aantal velden"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"De plugins voor het exporteren konden niet worden geladen, controleer uw "
+"installatie!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1798,6 +1905,29 @@ msgstr "Overschrijf bestaand(e) bestand(en)"
 msgid "File name template"
 msgstr "Bestandsnaam template"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "servernaam"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "databasenaam"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "tabelnaam"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Deze waarde wordt geïnterpreteerd met behulp van %1$sstrftime%2$s, het "
+"gebruik van opmaakcodes is dan ook toegestaan. Daarnaast worden de volgende "
+"vertalingen toegepast: %3$s. Overige tekst zal gelijk blijven."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "Onthoud template"
@@ -1874,6 +2004,16 @@ msgstr "Te importeren bestand"
 msgid "Location of the text file"
 msgstr "Locatie van het tekstbestand"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Het uploaden van bestanden is niet toegestaan op deze server."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr ""
+"De directory die u heeft ingesteld om te uploaden kan niet worden bereikt."
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2022,6 +2162,20 @@ msgstr "stop proces"
 msgid "in query"
 msgstr "in query"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Toon Records"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "totaal"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Query duurde %01.4f sec"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2514,11 +2668,6 @@ msgstr "Opslaan van het bestand op de hardeschijf is mislukt."
 msgid "File upload stopped by extension."
 msgstr "Upload afgebroken vanwege de extensie."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Bestand kon niet worden gelezen"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
@@ -2527,18 +2676,6 @@ msgstr ""
 "Fout bij het verplaatsen van het geuploade bestand, zie [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"U probeerde een bestand met een niet ondersteunde compressie (%s) te "
-"uploaden. De ondersteuning is niet geïmplementeerd of uitgeschakeld in de "
-"configuratie."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2565,7 +2702,7 @@ msgstr "Gegenereerd door"
 msgid "Rows"
 msgstr "Rijen"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL gaf een lege resultaat set terug (0 rijen)."
@@ -2609,6 +2746,11 @@ msgstr "structuur"
 msgid "Go to view"
 msgstr "Ga naar view"
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Geen index gedefinieerd!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2645,6 +2787,15 @@ msgstr "De primaire sleutel is vervallen"
 msgid "Index %s has been dropped"
 msgstr "Index %s is vervallen"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"De indexen %1$s en %2$s lijken hetzelfde, mogelijk kan een van beide worden "
+"verwijderd."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2777,7 +2928,7 @@ msgstr "Voeg &nbsp;%s&nbsp; kolom(men) toe aan index"
 msgid "Add a new User"
 msgstr "Voeg een nieuwe gebruiker toe"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "U heeft een nieuwe gebruiker toegevoegd."
 
@@ -2966,10 +3117,6 @@ msgstr "Upload naar BLOB bewaarplaats"
 msgid "Let every user access this bookmark"
 msgstr "Geef elke gebruiker toegang tot deze bookmark"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "De boekenlegger (Bookmark) is verwijderd."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Label"
@@ -3012,19 +3159,7 @@ msgstr "\"ge-bzipt\""
 msgid "Calendar"
 msgstr "Kalender"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"De plugins voor het exporteren konden niet worden geladen, controleer uw "
-"installatie!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"De plugins voor het importeren konden niet worden geladen, controleer uw "
-"installatie!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Kan index niet naar PRIMARY hernoemen"
 
@@ -3147,11 +3282,6 @@ msgstr "Configureer de coördinaten voor de tabel %s"
 msgid "Connections"
 msgstr "Connecties"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Database %s is gekopieerd naar %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Kopieer tabel naar (database<b>.</b>tabel):"
@@ -3173,7 +3303,7 @@ msgstr "Verbinding naar de brondatabase is mislukt"
 msgid "Could not connect to the target"
 msgstr "Verbinding naar de bestemmingsdatabase is mislukt"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3273,26 +3403,17 @@ msgstr "Tsjechische-Slowaak"
 msgid "Danish"
 msgstr "Deens"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "De database naam is leeg!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Database export opties"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Database %1$s is aangemaakt."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr "Database '%s' bestaat niet."
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s databases zijn succesvol verwijderd."
@@ -3316,7 +3437,7 @@ msgstr "Statistieken uitzetten"
 msgid "Enable Statistics"
 msgstr "Statistieken aanzetten"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3363,7 +3484,7 @@ msgstr "Defragmenteer tabel"
 msgid "Use delayed inserts"
 msgstr "Gebruik vertraagde inserts"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Geen gebruikers geselecteerd om te verwijderen!"
 
@@ -3580,34 +3701,11 @@ msgstr ""
 "Bestand %s bestaat al op de server, verander de bestandsnaam of activeer de "
 "overschrijven optie."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "databasenaam"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "servernaam"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "tabelnaam"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Deze waarde wordt geïnterpreteerd met behulp van %1$sstrftime%2$s, het "
-"gebruik van opmaakcodes is dan ook toegestaan. Daarnaast worden de volgende "
-"vertalingen toegepast: %3$s. Overige tekst zal gelijk blijven."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "bestanden"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3633,7 +3731,7 @@ msgstr "Schoon de tabel (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Schoon (sluit) alle tabellen"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3818,15 +3916,6 @@ msgstr "Excel 97-2003 XLS Werkboek"
 msgid "Excel 2007 XLSX Workbook"
 msgstr "Excel 2007 XLSX Werkboek"
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"De indexen %1$s en %2$s lijken hetzelfde, mogelijk kan een van beide worden "
-"verwijderd."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3863,7 +3952,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Voeg toe als nieuwe rij"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Toegevoegd rij nummer: %1$d"
@@ -4191,21 +4280,10 @@ msgstr "Laat processen zien"
 msgid "No databases"
 msgstr "Geen databases"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Er zijn geen databases geselecteerd."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Er is geen data ontvangen om te importeren. Dit kan gebeuren wanneer er geen "
-"bestand werd verzonden, of wanneer deze werd afgekeurd op basis van de "
-"maximale bestandsgrootte zoals opgegeven in de PHP-configuratie. Zie [a@./"
-"Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "Geen beschrijving aanwezig"
@@ -4221,15 +4299,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "Geen bestanden gevonden in ZIP archief!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Geen index gedefinieerd!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Geen index-delen gedefinieerd!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Geen verandering"
 
@@ -4247,7 +4321,7 @@ msgstr "Dit format heeft geen opties"
 msgid "The web server does not have permission to save the file %s."
 msgstr "De web server heeft geen rechten om het bestand %s op te slaan."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "U heeft niet genoeg rechten om hier te zijn!"
 
@@ -4284,7 +4358,8 @@ msgstr "niet aanwezig"
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> tabel niet gevonden of niet ingesteld in %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Geen gebruiker(s) gevonden."
 
@@ -4331,7 +4406,7 @@ msgstr "Partitie onderhoud"
 msgid "Partition %s"
 msgstr "Partitie %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Het wachtwoord voor %s is succesvol veranderd."
@@ -4432,11 +4507,11 @@ msgstr "Pools"
 msgid "Port"
 msgstr "Poort"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "De naam van de primaire sleutel moet PRIMARY zijn!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4649,7 +4724,7 @@ msgstr "Maakt het mogelijk data aan te passen."
 msgid "No privileges."
 msgstr "Geen privileges."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "De privileges zijn succesvol vernieuwd"
 
@@ -4692,11 +4767,6 @@ msgstr ""
 "<b>Query-statistieken</b>: Sinds het opstarten zijn er %s queries gestuurd "
 "naar de server."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Query duurde %01.4f sec"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Query-type"
@@ -4725,15 +4795,6 @@ msgstr "Controleer referentiële integriteit"
 msgid "Relational schema"
 msgstr "Relationeel schema"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Extra opties om met tabellen te werken, die gelinkt zijn, zijn "
-"uitgeschakeld. Om te weten te komen waarom klik %shier%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relaties"
@@ -4773,11 +4834,6 @@ msgstr "Verwijder partitionering"
 msgid "Remove selected users"
 msgstr "Verwijder de geselecteerde gebruikers"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Database %s is hernoemd naar %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4894,7 +4950,7 @@ msgstr ""
 "Deze server is niet ingesteld als master in een replicatie proces. Wilt u "
 "dit nu <a href=\"%s\">instellen</a>?"
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -5040,7 +5096,7 @@ msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 "Trek alle actieve privileges in van alle gebruikers en verwijder deze daarna."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "U heeft de rechten ingetrokken voor %s"
@@ -5207,19 +5263,11 @@ msgstr "Toon volledige Queries"
 msgid "Show/Hide left menu"
 msgstr "Toon/Verberg linker menu"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Toon bookmark"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Getoond als PHP-code"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Toon Records"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Toont SQL-query"
 
@@ -6116,7 +6164,7 @@ msgstr "Tabel %s bestaat reeds!"
 msgid "Alter column(s)"
 msgstr "Kolom(men) wijzigen"
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Tabel %1$s is bijgewerkt"
@@ -6135,7 +6183,7 @@ msgstr "Verwijder alle huidige rij(en) uit de bestemmings tabellen"
 msgid "The table name is empty!"
 msgstr "De tabelnaam is leeg!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "Tabel %1$s is aangemaakt."
@@ -6256,7 +6304,7 @@ msgstr "Deze machine"
 msgid "Threads"
 msgstr "Threads"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Thread %s is succesvol afgesloten."
@@ -6270,14 +6318,6 @@ msgstr ""
 "dit dat phpMyAdmin dit niet af kan maken tenzij de tijdsrestricties van PHP "
 "worden versoepeld."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"De maximale uitvoertijd is verstreken, indien u de import wil afmaken kunt u "
-"het bestand opnieuw invoeren."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "Van/tot pagina"
@@ -6294,10 +6334,6 @@ msgstr "Wissel klein/groot"
 msgid "To select relation, click :"
 msgstr "Klik om een relatie te selecteren:"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "totaal"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6612,7 +6648,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "onbekend"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "U heeft de rechten aangepast voor %s."
@@ -6632,19 +6668,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "U moet opwaarderen (upgraden) naar %s %s of hoger."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"U probeerde waarschijnlijk een bestand dat te groot is te uploaden. Zie de %"
-"sdocumentatie%s voor mogelijkheden om dit te omzeilen."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Het uploaden van bestanden is niet toegestaan op deze server."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Gebruik"
@@ -6658,7 +6681,7 @@ msgstr "Gebruik backticks (`) bij tabellen- en veldnamen"
 msgid "Use Host Table"
 msgstr "Gebruik Host Tabel"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "De gebruiker %s bestaat al!"
@@ -6671,7 +6694,7 @@ msgstr "De gebruiker %s bestaat al!"
 msgid "User name"
 msgstr "Gebruikersnaam"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 "De geselecteerde gebruiker werd niet aangetroffen in de privileges tabel"
@@ -6680,7 +6703,7 @@ msgstr ""
 msgid "User overview"
 msgstr "Gebruikers Overzicht"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "De geselecteerde gebruikers zijn met succes verwijderd."
 
@@ -6743,11 +6766,6 @@ msgstr "Bekijk een dump (schema) van tabel"
 msgid "VIEW name"
 msgstr "VIEW-naam"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr ""
-"De directory die u heeft ingesteld om te uploaden kan niet worden bereikt."
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Web server"
@@ -6765,10 +6783,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "jokerteken"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Verkeerde gebruikersnaam/wachtwoord. Toegang geweigerd."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot
index 1559b615b..196475462 100644
--- a/po/phpmyadmin.pot
+++ b/po/phpmyadmin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -91,6 +91,11 @@ msgstr ""
 msgid "Use this value"
 msgstr ""
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, possible-php-format
+msgid "Database %1$s has been created."
+msgstr ""
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr ""
@@ -207,6 +212,20 @@ msgstr ""
 msgid "Unselect All"
 msgstr ""
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr ""
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, possible-php-format
+msgid "Database %s has been renamed to %s"
+msgstr ""
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, possible-php-format
+msgid "Database %s has been copied to %s"
+msgstr ""
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr ""
@@ -311,6 +330,13 @@ msgstr ""
 msgid "Collation"
 msgstr ""
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, possible-php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr ""
@@ -638,7 +664,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, possible-php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -806,16 +833,64 @@ msgstr ""
 msgid "Database Log"
 msgstr ""
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, possible-php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr ""
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, possible-php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr ""
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, possible-php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, possible-php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -832,7 +907,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr ""
 
@@ -872,10 +948,12 @@ msgid "The user name is empty!"
 msgstr ""
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr ""
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr ""
 
@@ -1244,7 +1322,8 @@ msgstr ""
 msgid "Server Choice"
 msgstr ""
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr ""
 
@@ -1266,6 +1345,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr ""
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr ""
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, possible-php-format
@@ -1379,11 +1462,12 @@ msgstr ""
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr ""
 
@@ -1447,7 +1531,7 @@ msgid "Skip Validate SQL"
 msgstr ""
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr ""
 
@@ -1500,7 +1584,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, possible-php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1659,6 +1744,7 @@ msgid "Create"
 msgstr ""
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr ""
 
@@ -1675,6 +1761,10 @@ msgstr ""
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, possible-php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1703,6 +1793,26 @@ msgstr ""
 msgid "File name template"
 msgstr ""
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr ""
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr ""
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, possible-php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr ""
@@ -1768,6 +1878,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr ""
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr ""
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1911,6 +2030,20 @@ msgstr ""
 msgid "in query"
 msgstr ""
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr ""
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr ""
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, possible-php-format
+msgid "Query took %01.4f sec"
+msgstr ""
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2348,26 +2481,12 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr ""
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, possible-php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2393,7 +2512,7 @@ msgstr ""
 msgid "Rows"
 msgstr ""
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
@@ -2437,6 +2556,11 @@ msgstr ""
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr ""
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2473,6 +2597,13 @@ msgstr ""
 msgid "Index %s has been dropped"
 msgstr ""
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, possible-php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2602,7 +2733,7 @@ msgstr ""
 msgid "Add a new User"
 msgstr ""
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr ""
 
@@ -2791,10 +2922,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr ""
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr ""
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr ""
@@ -2837,15 +2964,7 @@ msgstr ""
 msgid "Calendar"
 msgstr ""
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr ""
 
@@ -2962,11 +3081,6 @@ msgstr ""
 msgid "Connections"
 msgstr ""
 
-#: libraries/messages.inc.php:186
-#, possible-php-format
-msgid "Database %s has been copied to %s"
-msgstr ""
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr ""
@@ -2988,7 +3102,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, possible-php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3084,26 +3198,17 @@ msgstr ""
 msgid "Danish"
 msgstr ""
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr ""
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr ""
 
-#: libraries/messages.inc.php:223
-#, possible-php-format
-msgid "Database %1$s has been created."
-msgstr ""
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, possible-php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, possible-php-format
 msgid "%s databases have been dropped successfully."
 msgstr ""
@@ -3127,7 +3232,7 @@ msgstr ""
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3170,7 +3275,7 @@ msgstr ""
 msgid "Use delayed inserts"
 msgstr ""
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3378,31 +3483,11 @@ msgid ""
 "File %s already exists on server, change filename or check overwrite option."
 msgstr ""
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr ""
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr ""
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, possible-php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr ""
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, possible-php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3423,7 +3508,7 @@ msgstr ""
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, possible-php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3605,13 +3690,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, possible-php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3644,7 +3722,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, possible-php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -3952,17 +4030,10 @@ msgstr ""
 msgid "No databases"
 msgstr ""
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr ""
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr ""
@@ -3976,15 +4047,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr ""
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr ""
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr ""
 
@@ -4002,7 +4069,7 @@ msgstr ""
 msgid "The web server does not have permission to save the file %s."
 msgstr ""
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr ""
 
@@ -4037,7 +4104,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr ""
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr ""
 
@@ -4084,7 +4152,7 @@ msgstr ""
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, possible-php-format
 msgid "The password for %s was changed successfully."
 msgstr ""
@@ -4184,11 +4252,11 @@ msgstr ""
 msgid "Port"
 msgstr ""
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr ""
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4381,7 +4449,7 @@ msgstr ""
 msgid "No privileges."
 msgstr ""
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
@@ -4422,11 +4490,6 @@ msgid ""
 "server."
 msgstr ""
 
-#: libraries/messages.inc.php:735
-#, possible-php-format
-msgid "Query took %01.4f sec"
-msgstr ""
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr ""
@@ -4455,13 +4518,6 @@ msgstr ""
 msgid "Relational schema"
 msgstr ""
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, possible-php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr ""
@@ -4500,11 +4556,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr ""
 
-#: libraries/messages.inc.php:761
-#, possible-php-format
-msgid "Database %s has been renamed to %s"
-msgstr ""
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, possible-php-format
 msgid "Table %s has been renamed to %s"
@@ -4608,7 +4659,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4744,7 +4795,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, possible-php-format
 msgid "You have revoked the privileges for %s"
 msgstr ""
@@ -4897,19 +4948,11 @@ msgstr ""
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr ""
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5659,7 +5702,7 @@ msgstr ""
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, possible-php-format
 msgid "Table %1$s has been altered successfully"
 msgstr ""
@@ -5678,7 +5721,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr ""
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, possible-php-format
 msgid "Table %1$s has been created."
 msgstr ""
@@ -5799,7 +5842,7 @@ msgstr ""
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, possible-php-format
 msgid "Thread %s was successfully killed."
 msgstr ""
@@ -5810,12 +5853,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -5832,10 +5869,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr ""
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, possible-php-format
 msgid "Tracking of %s.%s is activated."
@@ -6106,7 +6139,7 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, possible-php-format
 msgid "You have updated the privileges for %s."
 msgstr ""
@@ -6125,17 +6158,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr ""
 
-#: libraries/messages.inc.php:1210
-#, possible-php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr ""
@@ -6149,7 +6171,7 @@ msgstr ""
 msgid "Use Host Table"
 msgstr ""
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, possible-php-format
 msgid "The user %s already exists!"
 msgstr ""
@@ -6162,7 +6184,7 @@ msgstr ""
 msgid "User name"
 msgstr ""
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
@@ -6170,7 +6192,7 @@ msgstr ""
 msgid "User overview"
 msgstr ""
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr ""
 
@@ -6229,10 +6251,6 @@ msgstr ""
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr ""
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6250,10 +6268,6 @@ msgstr ""
 msgid "wildcard"
 msgstr ""
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr ""
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/pl.po b/po/pl.po
index 3a0a8f89a..a17d5ce3d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:17+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: polish <pl@li.org>\n"
@@ -89,6 +89,11 @@ msgstr "Opis"
 msgid "Use this value"
 msgstr "Użyj tej wartości"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Baza danych %1$s została utworzona."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Komentarz bazy danych: "
@@ -205,6 +210,20 @@ msgstr "Zaznacz wszystkie"
 msgid "Unselect All"
 msgstr "Odznacz wszystkie"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Nazwa bazy danych jest pusta!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Baza danych %s ma nazwę zmienioną na %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Baza danych %s została skopiowana do %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Zmień nazwę bazy danych na"
@@ -315,6 +334,15 @@ msgstr "Włącz"
 msgid "Collation"
 msgstr "Metoda porównywania napisów"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Dodatkowe możliwości pracy z połączonymi tabelami zostały wyłączone. Aby "
+"dowiedzieć się, dlaczego - kliknij %stutaj%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Wyświetl schemat PDF"
@@ -642,7 +670,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -820,16 +849,73 @@ msgstr "Sprawdź tabelę"
 msgid "Database Log"
 msgstr "Baza danych"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Prawdopodobnie próbowano wrzucić duży plik. Aby poznać sposoby obejścia tego "
+"limitu, proszę zapoznać się z %sdokumenacją%s."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Nie można odczytać pliku"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Próbowano wczytać plik z nieobsługiwanym typem kompresji (%s). Albo jego "
+"obsługa nie została zaimplementowana albo została konfiguracyjnie wyłączona."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Nie otrzymano żadnych danych do importu. Albo nie została wysłana nazwa "
+"pliku, albo plik był zbyt duży (maksymalny dopuszczalny rozmiar pliku "
+"określa się w konfiguracji PHP). Zobacz FAQ 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "Nie udało się załadować modułów importu, proszę sprawdzić instalację!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Zapamiętane zapytanie SQL zostało usunięte."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Pokaz zapamiętanego zapytania"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Zapytanie %s zostało zapamiętane"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Import zakończony sukcesem, wykonano %d zapytań."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Limit czasu wykonania skryptu minął; aby ukończyć import, proszę przedłożyć "
+"ten sam plik a import zostanie wznowiony."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -848,7 +934,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "Polecenie \"DROP DATABASE\" jest zablokowane."
 
@@ -888,10 +975,12 @@ msgid "The user name is empty!"
 msgstr "Brak nazwy użytkownika!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Puste hasło!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Hasła nie są identyczne!"
 
@@ -1316,7 +1405,8 @@ msgstr "Hasło:"
 msgid "Server Choice"
 msgstr "Wybór serwera"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Odtąd musi być włączona obsługa ciasteczek."
 
@@ -1339,6 +1429,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Nie udało się zalogować na serwer MySQL"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Błędne pola użytkownik/hasło. Brak dostępu."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1470,11 +1564,12 @@ msgstr "Wysłane"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentacja"
 
@@ -1538,7 +1633,7 @@ msgid "Skip Validate SQL"
 msgstr "Pomiń sprawdzanie poprawności SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Sprawdź poprawność SQL"
 
@@ -1593,7 +1688,8 @@ msgstr "Funkcja %s jest dotknięta przez znany błąd, zobacz %s"
 msgid "Font size"
 msgstr "Rozmiar pisma"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1758,6 +1854,7 @@ msgid "Create"
 msgstr "Utwórz"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Brak uprawnień"
 
@@ -1774,6 +1871,10 @@ msgstr "Utwórz nową tabelę w bazie danych %s"
 msgid "Number of fields"
 msgstr "Liczba pól"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr "Nie udało się załadować modułów eksportu, proszę sprawdzić instalację!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1802,6 +1903,29 @@ msgstr "Nadpisuj istniejące pliki"
 msgid "File name template"
 msgstr "Szablon nazwy"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "nazwa serwera"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "nazwa bazy danych"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "nazwa tabeli"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Interpretacja tej wartości należy do funkcji %1$sstrftime%2$s i można użyć "
+"jej napisów formatujących. Dodatkowo zostaną zastosowane następujące "
+"przekształcenia: %3$s. Pozostały tekst będzie niezmieniony."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "pamiętaj szablon"
@@ -1873,6 +1997,15 @@ msgstr "Plik do importu"
 msgid "Location of the text file"
 msgstr "Lokalizacja pliku tekstowego"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Serwer nie pozwala na upload plików."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Katalog ustalony dla uploadu jest nieosiągalny"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2024,6 +2157,20 @@ msgstr "Unicestwij"
 msgid "in query"
 msgstr "w zapytaniu"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Pokaż rekordy "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "wszystkich"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Wykonanie zapytania trwało %01.4f sekund(y)"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2503,28 +2650,12 @@ msgstr "Nie udało się zapisać pliku na dysk."
 msgid "File upload stopped by extension."
 msgstr "Wrzucanie pliku zostało zatrzymane przez rozszerzenie."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Nie można odczytać pliku"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Błąd podczas przesuwania wrzuconego pliku, zobacz FAQ 1.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Próbowano wczytać plik z nieobsługiwanym typem kompresji (%s). Albo jego "
-"obsługa nie została zaimplementowana albo została konfiguracyjnie wyłączona."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2551,7 +2682,7 @@ msgstr "Wygenerowany przez"
 msgid "Rows"
 msgstr "Rekordów"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL zwrócił pusty wynik (zero rekordów)."
@@ -2598,6 +2729,11 @@ msgstr "Struktura"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Brak zdefiniowanego indeksu!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2634,6 +2770,15 @@ msgstr "Klucz podstawowy został usunięty"
 msgid "Index %s has been dropped"
 msgstr "Klucz %s został usunięty"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"Indeksy %1$s i %2$s wyglądają na identyczne i jeden z nich mógłby zostać "
+"usunięty."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2766,7 +2911,7 @@ msgstr "Dodaj &nbsp;%s&nbsp;kolumn do indeksu "
 msgid "Add a new User"
 msgstr "Dodaj nowego użytkownika"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Nowy użytkownik został dodany."
 
@@ -2959,10 +3104,6 @@ msgstr "Wrzuć do repozytorium BLOBów"
 msgid "Let every user access this bookmark"
 msgstr "Pozwól na dostęp wszystkim użytkownikom"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Zapamiętane zapytanie SQL zostało usunięte."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Nazwa"
@@ -3005,15 +3146,7 @@ msgstr "\".bz2\""
 msgid "Calendar"
 msgstr "Kalendarz"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr "Nie udało się załadować modułów eksportu, proszę sprawdzić instalację!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "Nie udało się załadować modułów importu, proszę sprawdzić instalację!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Nie można zmienić nazwy indeksu na PRIMARY!"
 
@@ -3131,11 +3264,6 @@ msgstr "Proszę skonfigurować współrzędne dla tabeli %s"
 msgid "Connections"
 msgstr "Połączenia"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Baza danych %s została skopiowana do %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Skopiuj tabelę do (bazadanych<b>.</b>tabela):"
@@ -3159,7 +3287,7 @@ msgstr "Nie można połączyć się z serwerem MySQL"
 msgid "Could not connect to the target"
 msgstr "Nie można połączyć się z serwerem MySQL"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3261,26 +3389,17 @@ msgstr "Czesko-słowacki"
 msgid "Danish"
 msgstr "Duński"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Nazwa bazy danych jest pusta!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Opcje eksportu bazy danych"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Baza danych %1$s została utworzona."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s baz danych zostało pomyślnie usuniętych."
@@ -3305,7 +3424,7 @@ msgstr "Wyłącz statystyki"
 msgid "Enable Statistics"
 msgstr "Włącz statystyki"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3354,7 +3473,7 @@ msgstr "Defragmentuj tabelę"
 msgid "Use delayed inserts"
 msgstr "Użyj opóźnionych dodań"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Żaden użytkownik ze został zaznaczony do usunięcia!"
 
@@ -3566,34 +3685,11 @@ msgstr ""
 "Plik %s już istnieje na serwerze, zmień nazwę pliku lub zaznacz opcję "
 "nadpisywania plików."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "nazwa bazy danych"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "nazwa serwera"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "nazwa tabeli"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Interpretacja tej wartości należy do funkcji %1$sstrftime%2$s i można użyć "
-"jej napisów formatujących. Dodatkowo zostaną zastosowane następujące "
-"przekształcenia: %3$s. Pozostały tekst będzie niezmieniony."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Pliki"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3618,7 +3714,7 @@ msgstr "Przeładuj tabelę (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Przeładuj (zamknij) wszystkie tabele"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3804,15 +3900,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"Indeksy %1$s i %2$s wyglądają na identyczne i jeden z nich mógłby zostać "
-"usunięty."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3849,7 +3936,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Dodaj jako nowy rekord"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Identyfikator wstawionego rekordu: %1$d"
@@ -4173,20 +4260,10 @@ msgstr "Pokaż procesy"
 msgid "No databases"
 msgstr "Brak baz danych"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Żadna baza danych nie został wybrana."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Nie otrzymano żadnych danych do importu. Albo nie została wysłana nazwa "
-"pliku, albo plik był zbyt duży (maksymalny dopuszczalny rozmiar pliku "
-"określa się w konfiguracji PHP). Zobacz FAQ 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "brak opisu"
@@ -4200,15 +4277,11 @@ msgstr "Brak szczegółowych informacji o tym mechanizmie składowania"
 msgid "No files found inside ZIP archive!"
 msgstr "Archiwum ZIP jest puste!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Brak zdefiniowanego indeksu!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Brak zdefiniowanych części indeksu!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Bez zmian"
 
@@ -4227,7 +4300,7 @@ msgstr "Ten format nie ma żadnych opcji"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Serwer WWW nie ma praw do zapisu pliku %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Brak wystarczających uprawnień!"
 
@@ -4264,7 +4337,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "Tabela <b>%s</b> nie została znaleziona lub nie jest ustawiona w %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Nie znaleziono użytkownika(ów)."
 
@@ -4311,7 +4385,7 @@ msgstr "Zarządzanie partycjami"
 msgid "Partition %s"
 msgstr "Partycja %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Hasło dla %s zostało pomyślnie zmienione."
@@ -4413,11 +4487,11 @@ msgstr "Polski"
 msgid "Port"
 msgstr "Sortuj"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Nazwą podstawowego klucza musi być… PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4622,7 +4696,7 @@ msgstr "Pozwól zmieniać dane."
 msgid "No privileges."
 msgstr "Brak uprawnień."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Uprawnienia zostały pomyślnie przeładowane."
 
@@ -4665,11 +4739,6 @@ msgstr ""
 "<b>Statystyki zapytań</b>: Od rozpoczęcia jego pracy, do serwera zostało "
 "wysłanych %s zapytań."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Wykonanie zapytania trwało %01.4f sekund(y)"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Rodzaj zapytania"
@@ -4698,15 +4767,6 @@ msgstr "Sprawdź spójność powiązań:"
 msgid "Relational schema"
 msgstr "Schemat relacyjny"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Dodatkowe możliwości pracy z połączonymi tabelami zostały wyłączone. Aby "
-"dowiedzieć się, dlaczego - kliknij %stutaj%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relacje"
@@ -4747,11 +4807,6 @@ msgstr "Usuń partycjonowanie"
 msgid "Remove selected users"
 msgstr "Usuń zaznaczonych użytkowników"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Baza danych %s ma nazwę zmienioną na %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4859,7 +4914,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -5002,7 +5057,7 @@ msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 "Cofnij wszystkie aktywne uprawnienia użytkownikom, a następnie usuń ich."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Uprawnienia dla %s zostały cofnięte"
@@ -5165,19 +5220,11 @@ msgstr "Pokaż pełne zapytania"
 msgid "Show/Hide left menu"
 msgstr "Pokaż/ukryj lewe menu"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Pokaz zapamiętanego zapytania"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Wyświetlany jest kod PHP."
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Pokaż rekordy "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Wyświetlane jest zapytanie SQL."
 
@@ -6063,7 +6110,7 @@ msgstr "Tabela %s już istnieje!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Tabela %1$s została pomyślnie zmodyfikowana"
@@ -6082,7 +6129,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Brak nazwy tabeli!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "Tabela %1$s została utworzona."
@@ -6204,7 +6251,7 @@ msgstr "Ten host"
 msgid "Threads"
 msgstr "Wątki"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Wątek %s został pomyślnie unicestwiony."
@@ -6218,14 +6265,6 @@ msgstr ""
 "dane, co zwykle oznacza, że phpMyAdmin nie będzie w stanie ukończyć tego "
 "importu bez zwiększenia limitów czasowych PHP."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Limit czasu wykonania skryptu minął; aby ukończyć import, proszę przedłożyć "
-"ten sam plik a import zostanie wznowiony."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "od/do strony"
@@ -6242,10 +6281,6 @@ msgstr "Przełącz małe/duże"
 msgid "To select relation, click :"
 msgstr "Aby wybrać powiązanie, kliknij :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "wszystkich"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6557,7 +6592,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "nieznany"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Uaktualniłeś uprawnienia dla %s."
@@ -6578,19 +6613,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Poleca się aktualizację do %s w wersji %s lub późniejszej."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Prawdopodobnie próbowano wrzucić duży plik. Aby poznać sposoby obejścia tego "
-"limitu, proszę zapoznać się z %sdokumenacją%s."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Serwer nie pozwala na upload plików."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Wykorzystanie"
@@ -6604,7 +6626,7 @@ msgstr "Użyj cudzysłowów z nazwami tabel i pól"
 msgid "Use Host Table"
 msgstr "Użyj tabeli hostów"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Użytkownik %s już istnieje!"
@@ -6617,7 +6639,7 @@ msgstr "Użytkownik %s już istnieje!"
 msgid "User name"
 msgstr "Nazwa użytkownika"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Wybrany użytkownik nie został znaleziony w tabeli uprawnień."
 
@@ -6625,7 +6647,7 @@ msgstr "Wybrany użytkownik nie został znaleziony w tabeli uprawnień."
 msgid "User overview"
 msgstr "Opis użytkownika"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Wybrani użytkownicy zostali pomyślnie usunięci."
 
@@ -6689,10 +6711,6 @@ msgstr "Zrzut tabeli"
 msgid "VIEW name"
 msgstr "Nazwa perspektywy"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Katalog ustalony dla uploadu jest nieosiągalny"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Serwer WWW"
@@ -6710,10 +6728,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "znak wieloznaczny"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Błędne pola użytkownik/hasło. Brak dostępu."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/pt.po b/po/pt.po
index 1a5c7b600..11446f821 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:17+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: portuguese <pt@li.org>\n"
@@ -86,6 +86,11 @@ msgstr "Descrição"
 msgid "Use this value"
 msgstr "Usar este valor"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "A base de dados %s foi eliminada."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Comentário da Base de Dados: "
@@ -202,6 +207,21 @@ msgstr "Selecciona Todas"
 msgid "Unselect All"
 msgstr "Limpa Todas as Selecções"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+#, fuzzy
+msgid "The database name is empty!"
+msgstr "O nome da tabela está vazio!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, fuzzy, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Tabela %s renomeada para %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, fuzzy, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Tabela %s copiada para %s."
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 #, fuzzy
 msgid "Rename database to"
@@ -317,6 +337,15 @@ msgstr "Activado"
 msgid "Collation"
 msgstr "Criação"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"As Características adicionais para trabalhar com ligações entre Tabelas "
+"foram desactivadas. Para saber porquê carregue %saqui%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Mostrar o esquema de PDF"
@@ -644,7 +673,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -821,16 +851,64 @@ msgstr "Verificar tabela"
 msgid "Database Log"
 msgstr "Base de Dados"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Não foi possível ler o ficheiro"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Marcador apagado com sucesso."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -849,7 +927,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "Os comandos \"DROP DATABASE\" estão inibidos."
 
@@ -889,10 +968,12 @@ msgid "The user name is empty!"
 msgstr "O nome do utilizador está vazio!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Indique a palavras-passe!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr ""
 "As palavras-passe são diferentes!\\nLembre-se de confirmar a palavra-passe!"
@@ -1315,7 +1396,8 @@ msgstr "Palavra-passe&nbsp;:"
 msgid "Server Choice"
 msgstr "Escolha do Servidor"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "O mecanismo de \"Cookies\" tem de estar ligado a partir deste ponto."
 
@@ -1337,6 +1419,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Não é possível fazer login no servidor MySQL"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Utilizador ou Palavra-passe errada. Acesso Negado."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1467,11 +1553,12 @@ msgstr "pt"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Documentação"
 
@@ -1535,7 +1622,7 @@ msgid "Skip Validate SQL"
 msgstr "Saltar a validação SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Validar SQL"
 
@@ -1588,7 +1675,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1752,6 +1840,7 @@ msgid "Create"
 msgstr "Criar"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Sem Privilégios"
 
@@ -1768,6 +1857,10 @@ msgstr "Criar nova tabela na base de dados %s"
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1796,6 +1889,28 @@ msgstr "Substituir o(s) ficheiro(s) existente(s)"
 msgid "File name template"
 msgstr "Nome do ficheiro modelo"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+#, fuzzy
+msgid "server name"
+msgstr "Nome do Utilizador"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+#, fuzzy
+msgid "database name"
+msgstr "Base de Dados"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "Lembrar-se do modelo"
@@ -1867,6 +1982,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr "Localização do arquivo de texto"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Não é possivel alcançar a directoria que configurou para fazer upload"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2012,6 +2136,20 @@ msgstr "Termina"
 msgid "in query"
 msgstr "na pesquisa"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Mostrando registos "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "total"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "O Query demorou %01.4f sec"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2457,26 +2595,12 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Não foi possível ler o ficheiro"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2503,7 +2627,7 @@ msgstr "Gerado por"
 msgid "Rows"
 msgstr "Registos"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL não retornou nenhum registo."
@@ -2550,6 +2674,11 @@ msgstr "Estrutura"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Nenhum indíce definido!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2587,6 +2716,13 @@ msgstr "A chave primária foi eliminada"
 msgid "Index %s has been dropped"
 msgstr "O Índice %s foi eliminado"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2717,7 +2853,7 @@ msgstr "Adicionar ao índice &nbsp;%s&nbsp;coluna(s)"
 msgid "Add a new User"
 msgstr "Acrescenta um utilizador"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Acrescentou um novo utilizador."
 
@@ -2915,10 +3051,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "Deixar todos os utilizadores acederem a este marcador"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Marcador apagado com sucesso."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Etiqueta"
@@ -2961,15 +3093,7 @@ msgstr "\"Compressão bzip\""
 msgid "Calendar"
 msgstr ""
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Impossível renomear índice para PRIMARY!"
 
@@ -3090,11 +3214,6 @@ msgstr "Configure as cordenadas para a tabela %s"
 msgid "Connections"
 msgstr "Ligações"
 
-#: libraries/messages.inc.php:186
-#, fuzzy, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Tabela %s copiada para %s."
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Copia tabela para (base-de-dados<b>.</b>tabela):"
@@ -3116,7 +3235,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3216,27 +3335,17 @@ msgstr "Checo-Eslovaco"
 msgid "Danish"
 msgstr "Dinamarquês"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-#, fuzzy
-msgid "The database name is empty!"
-msgstr "O nome da tabela está vazio!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Opções de exportação da Base de Dados"
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "A base de dados %s foi eliminada."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "As Bases de Dados %s foram apagadas com sucesso."
@@ -3261,7 +3370,7 @@ msgstr "Desactivar Estatísticas"
 msgid "Enable Statistics"
 msgstr "Activar Estatísticas"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3308,7 +3417,7 @@ msgstr ""
 msgid "Use delayed inserts"
 msgstr "Instrucções de inserção múltiplas"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3520,34 +3629,12 @@ msgstr ""
 "O ficheiro  %s já existe no servidor, mude o nome do ficheiro ou verifique a "
 "opção de substituição (re-escrita)."
 
-#: libraries/messages.inc.php:334
-#, fuzzy
-msgid "database name"
-msgstr "Base de Dados"
-
-#: libraries/messages.inc.php:335
-#, fuzzy
-msgid "server name"
-msgstr "Nome do Utilizador"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "Qtd Campos"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3572,7 +3659,7 @@ msgstr "Fecha a tabela (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3757,13 +3844,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3800,7 +3880,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Insere como novo registo"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4118,17 +4198,10 @@ msgstr "Mostra os Processos"
 msgid "No databases"
 msgstr "Sem bases de dados"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Nenhuma base de dados selecionada."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "sem Descrição"
@@ -4142,15 +4215,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Nenhum indíce definido!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Nenhuma parte do índice definida!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Sem alterações"
 
@@ -4169,7 +4238,7 @@ msgstr "Este formato não tem opções"
 msgid "The web server does not have permission to save the file %s."
 msgstr "O servidor web não tem permissões para gravar o ficheiro %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Não tem permissões suficientes para aceder aqui, neste momento!"
 
@@ -4204,7 +4273,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "A Tabela <b>%s</b> não foi encontrada ou não foi definida em %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Nenhum utilizador encontrado."
 
@@ -4253,7 +4323,7 @@ msgstr "Manutenção da tabela"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "A palavra-passe para %s foi alterada com sucesso."
@@ -4358,11 +4428,11 @@ msgstr ""
 msgid "Port"
 msgstr "Ordenação"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "O nome da chave primária tem de ser... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4567,7 +4637,7 @@ msgstr "Permite alterar dados."
 msgid "No privileges."
 msgstr "Sem privilégios."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "O privilégios foram recarregados com sucesso."
 
@@ -4611,11 +4681,6 @@ msgstr ""
 "<b>Query statistics</b>: Since its startup, %s queries have been sent to the "
 "server."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "O Query demorou %01.4f sec"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Tipo de Query"
@@ -4644,15 +4709,6 @@ msgstr "Verificar Integridade referencial:"
 msgid "Relational schema"
 msgstr "Esquema relacional"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"As Características adicionais para trabalhar com ligações entre Tabelas "
-"foram desactivadas. Para saber porquê carregue %saqui%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relações"
@@ -4691,11 +4747,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "Remover utilizadores seleccionados"
 
-#: libraries/messages.inc.php:761
-#, fuzzy, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Tabela %s renomeada para %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4802,7 +4853,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4939,7 +4990,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Revogar todos os privilégios dos utilizadores e apagá-los a seguir."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Anulou os privilégios para %s"
@@ -5103,19 +5154,11 @@ msgstr "Mostrar queries completos"
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Mostrando registos "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 #, fuzzy
 msgid "Showing SQL query"
 msgstr "Mostrar queries completos"
@@ -5884,7 +5927,7 @@ msgstr "O utilizador %s já existe!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, fuzzy, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Os utilizadores selecionado foram apagados com sucesso."
@@ -5903,7 +5946,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "O nome da tabela está vazio!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "A tabela %s foi eliminada"
@@ -6024,7 +6067,7 @@ msgstr "Este Anfitrião"
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr ""
@@ -6035,12 +6078,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6057,10 +6094,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "total"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6338,7 +6371,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "desconhecido"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Actualizou os privilégios de %s."
@@ -6358,17 +6391,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "deve actualizar para %s %s ou mais recente."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Utilização"
@@ -6382,7 +6404,7 @@ msgstr "Usar apóstrofes com os nomes das tabelas e campos"
 msgid "Use Host Table"
 msgstr "Usar a tabela do anfitrião"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "O utilizador %s já existe!"
@@ -6395,7 +6417,7 @@ msgstr "O utilizador %s já existe!"
 msgid "User name"
 msgstr "Nome do Utilizador"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "O utilizador selecionado não se encontra na tabela de privilégios."
 
@@ -6403,7 +6425,7 @@ msgstr "O utilizador selecionado não se encontra na tabela de privilégios."
 msgid "User overview"
 msgstr ""
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Os utilizadores selecionado foram apagados com sucesso."
 
@@ -6463,10 +6485,6 @@ msgstr "Ver o esquema da tabela"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Não é possivel alcançar a directoria que configurou para fazer upload"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6484,10 +6502,6 @@ msgstr ""
 msgid "wildcard"
 msgstr ""
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Utilizador ou Palavra-passe errada. Acesso Negado."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d2165f71a..1895c0c46 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-21 05:17+0200\n"
 "Last-Translator: Maurício Meneghini Fauth <mauriciofauth@gmail.com>\n"
 "Language-Team: brazilian_portuguese <pt_BR@li.org>\n"
@@ -91,6 +91,11 @@ msgstr "Descrição"
 msgid "Use this value"
 msgstr "Usar este valor"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Banco de dados %1$s foi criado."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Comentário do Banco de Dados: "
@@ -207,6 +212,20 @@ msgstr "Selecionar Todos"
 msgid "Unselect All"
 msgstr "Desmarcar Todos"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "O nome do Banco de Dados está em branco!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "O Banco de Dados %s foi renomeado para %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Banco de Dados %s copiado para %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Renomear Banco de Dados para"
@@ -317,6 +336,15 @@ msgstr "Habilitar"
 msgid "Collation"
 msgstr "Collation"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Os recursos adicionais para trabalhar com tabelas linkadas foram "
+"desativadas. Para descobrir o motivo clique %saqui%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Exibir esquema PDF"
@@ -644,7 +672,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -820,16 +849,74 @@ msgstr "Verificar tabela"
 msgid "Database Log"
 msgstr "Banco de Dados"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Você provavelmente tentou carregar um arquivo muito grande. Veja referências "
+"na %sdocumentation%s para burlar esses limites."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "O arquivo não pode ser lido"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Você tentou carregar um arquivo com compressão não suportada (%s). Pode o "
+"suporte para isso não ter sido implementado ou pode ter sido desabilitado "
+"por sua configuração PHP."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Nenhum dado foi recebido pra importar. Tampouco um nome de arquivo foi "
+"submetido, ou o tamanho do arquivo excedeu o tamanho máximo permitido pelas "
+"suas configurações do PHP. Veja FAQ 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "Não foi possível importar plugins, verifique sua instalação!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "O marcador foi removido."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Exibindo marcadores"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Marcador %s criado"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Importação finalizada com sucesso, %d consultas executadas."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Script passou do tempo limite, se você deseja terminar a importação, reenvie "
+"o mesmo arquivo que a importação será resumida."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -847,7 +934,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "O comando \"DROP DATABASE\" está desabilitado."
 
@@ -887,10 +975,12 @@ msgid "The user name is empty!"
 msgstr "O nome do usuário está em branco!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "A senhas está em branco!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "As senhas não são iguais!"
 
@@ -1312,7 +1402,8 @@ msgstr "Senha:"
 msgid "Server Choice"
 msgstr "Seleção do Servidor"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies devem estar ativos após este ponto."
 
@@ -1334,6 +1425,10 @@ msgstr "Sem atividade por %s segundos ou mais, faça o login novamente"
 msgid "Cannot log in to the MySQL server"
 msgstr "Não foi possível se logar no servidor MySQL"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Usuário ou senha incorreta. Acesso negado."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1463,11 +1558,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Documentação"
 
@@ -1531,7 +1627,7 @@ msgid "Skip Validate SQL"
 msgstr "Pular validação SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Validar SQL"
 
@@ -1586,7 +1682,8 @@ msgstr "A funcionalidade %s é afetada por um bug conhecido, veja %s"
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1749,6 +1846,7 @@ msgid "Create"
 msgstr "Criar"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Sem privilégios"
 
@@ -1765,6 +1863,10 @@ msgstr "Criar nova tabela no Banco de Dados %s"
 msgid "Number of fields"
 msgstr "Número de arquivos"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr "Não pode carregar exportação dos plugins, verifique sua instalação!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1793,6 +1895,29 @@ msgstr "Sobrescrever arquivo(s) existente(s)"
 msgid "File name template"
 msgstr "Nome do arquivo do modelo"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "nome do servidor"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "nome do Banco de Dados"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "nome da tabela"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Esse valor é interpretado usando %1$sstrftime%2$s, então você pode usar as "
+"strings de formatação de tempo. Adicionalmente a seguinte transformação "
+"ocorrerá: %3$s. Outros textos serão mantidos como são."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "lembrar modelo"
@@ -1864,6 +1989,16 @@ msgstr "Arquivo para importar"
 msgid "Location of the text file"
 msgstr "Localização do arquivo texto"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Não é permitido subir arquivos neste servidor."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr ""
+"O diretório que você especificou para subir arquivos não foi encontrado."
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2012,6 +2147,20 @@ msgstr "Matar"
 msgid "in query"
 msgstr "na consulta"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Mostrando registros "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "total"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Consulta levou %01.4f segundos"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2476,29 +2625,12 @@ msgstr "Falhou ao salvar arquivo no disco."
 msgid "File upload stopped by extension."
 msgstr "Carregamento do arquivo parado pela extenção."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "O arquivo não pode ser lido"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Erro ao mover o arquivo carregado, veja FAQ 1.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Você tentou carregar um arquivo com compressão não suportada (%s). Pode o "
-"suporte para isso não ter sido implementado ou pode ter sido desabilitado "
-"por sua configuração PHP."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2524,7 +2656,7 @@ msgstr "Gerado por"
 msgid "Rows"
 msgstr "Registros"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL retornou um conjunto vazio (ex. zero registros)."
@@ -2571,6 +2703,11 @@ msgstr "Estrutura"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Nenhum índice definido!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2607,6 +2744,15 @@ msgstr "A chave primária foi deletada"
 msgid "Index %s has been dropped"
 msgstr "Índice %s foi eliminado"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"A indexação %1$s e %2$s parecem ser iguais ou uma delas pode ter sido "
+"removida."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2739,7 +2885,7 @@ msgstr "Adicionar ao índice &nbsp;%s&nbsp;coluna(s)"
 msgid "Add a new User"
 msgstr "Adicionar novo usuário"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Adicionado usuário"
 
@@ -2928,10 +3074,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "Deixar qualquer usuário acessar esse marcador"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "O marcador foi removido."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Nome"
@@ -2974,15 +3116,7 @@ msgstr "\"compactado com bzip\""
 msgid "Calendar"
 msgstr "Calendário"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr "Não pode carregar exportação dos plugins, verifique sua instalação!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "Não foi possível importar plugins, verifique sua instalação!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Não foi possível renomear o índice para \"PRIMARY\"!"
 
@@ -3101,11 +3235,6 @@ msgstr "Configure as coordenadas para a tabela %s"
 msgid "Connections"
 msgstr "Conexões"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Banco de Dados %s copiado para %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Copiar tabela para (Banco de Dados<b>.</b>tabela):"
@@ -3127,7 +3256,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3225,26 +3354,17 @@ msgstr "Tcheco-Eslováquio"
 msgid "Danish"
 msgstr "Dinamarquês"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "O nome do Banco de Dados está em branco!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Opções de exportação do Banco de Dados"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Banco de dados %1$s foi criado."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "Banco de Dados %s foi eliminado com sucesso!"
@@ -3269,7 +3389,7 @@ msgstr "Disabilitar estatísticas"
 msgid "Enable Statistics"
 msgstr "Habilitar estatísticas"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3318,7 +3438,7 @@ msgstr "Desfragmentar tabela"
 msgid "Use delayed inserts"
 msgstr "Usar inserções demoradas"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Nenhum usuário selecionado para exclusão!"
 
@@ -3533,34 +3653,11 @@ msgstr ""
 "O arquivo %s já existe no servidor, mude o nome do arquivo ou verifique sua "
 "opção de sobrescrever."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "nome do Banco de Dados"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "nome do servidor"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "nome da tabela"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Esse valor é interpretado usando %1$sstrftime%2$s, então você pode usar as "
-"strings de formatação de tempo. Adicionalmente a seguinte transformação "
-"ocorrerá: %3$s. Outros textos serão mantidos como são."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Arquivos"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3585,7 +3682,7 @@ msgstr "Limpar a tabela (\"LIMPAR\")"
 msgid "Flush (close) all tables"
 msgstr "Nivelar (fechar) todas as tabelas"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr "Erro ao criar chave externa no %1$s (check data types)"
@@ -3769,15 +3866,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"A indexação %1$s e %2$s parecem ser iguais ou uma delas pode ter sido "
-"removida."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3814,7 +3902,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Inserir como um novo registro"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Id da linha inserida: %1$d"
@@ -4138,20 +4226,10 @@ msgstr "Mostrar os Processos"
 msgid "No databases"
 msgstr "Sem bases"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Nenhum Banco de Dados selecionado."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Nenhum dado foi recebido pra importar. Tampouco um nome de arquivo foi "
-"submetido, ou o tamanho do arquivo excedeu o tamanho máximo permitido pelas "
-"suas configurações do PHP. Veja FAQ 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "sem Descrição"
@@ -4167,15 +4245,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "Nenhum arquivo encontrado dentro do arquivo ZIP!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Nenhum índice definido!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Nenhuma parte de índice definida!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Sem Mudança"
 
@@ -4193,7 +4267,7 @@ msgstr "Esse formato não tem opções"
 msgid "The web server does not have permission to save the file %s."
 msgstr "O servidor web não tem permissão para salvar o arquivo %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Você não tem direitos suficientes para estar aqui agora!"
 
@@ -4230,7 +4304,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> tabela não encontrada ou não configurada em %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Nenhum usuário(s) encontrado."
 
@@ -4277,7 +4352,7 @@ msgstr "Manutenção da partição"
 msgid "Partition %s"
 msgstr "Partição %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "A senha para %s foi modificada com sucesso."
@@ -4377,11 +4452,11 @@ msgstr "Polonês"
 msgid "Port"
 msgstr "Porta"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "O nome da chave primária deve ser... \"PRIMARY\"!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4586,7 +4661,7 @@ msgstr "Permitir modificar dados."
 msgid "No privileges."
 msgstr "Sem privilégios."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Os privilégios foram recarregados com sucesso."
 
@@ -4629,11 +4704,6 @@ msgstr ""
 "<b>Estatísticas das consultas</b>: Desde o início, %s consultas foram "
 "enviadas para o servidor."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Consulta levou %01.4f segundos"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Tipo de consulta"
@@ -4662,15 +4732,6 @@ msgstr "Verificar integridade referencial:"
 msgid "Relational schema"
 msgstr "Esquema relacional"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Os recursos adicionais para trabalhar com tabelas linkadas foram "
-"desativadas. Para descobrir o motivo clique %saqui%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relações"
@@ -4709,11 +4770,6 @@ msgstr "Remover partição"
 msgid "Remove selected users"
 msgstr "Remover os usuários selecionados"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "O Banco de Dados %s foi renomeado para %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4819,7 +4875,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4959,7 +5015,7 @@ msgstr "Reiniciar inserção com %s registros"
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Revogar todos os privilégios ativos dos usuarios e depois apagar eles."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Você revogou os privilégios para %s"
@@ -5122,19 +5178,11 @@ msgstr "Mostrar consultas completas"
 msgid "Show/Hide left menu"
 msgstr "Exibir/Ocultar menu da esquerda"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Exibindo marcadores"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Exibindo como código PHP"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Mostrando registros "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Exibindo consulta SQL"
 
@@ -6024,7 +6072,7 @@ msgstr "Tabela %s já existe!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "A tabela %1$s foi alterada com sucesso"
@@ -6043,7 +6091,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "O Nome da Tabela está vazio!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "A tabela %1$s foi criada."
@@ -6164,7 +6212,7 @@ msgstr "Esse Servidor"
 msgid "Threads"
 msgstr "Processos"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Processo %s foi morto com sucesso."
@@ -6178,14 +6226,6 @@ msgstr ""
 "que o phpMyAdmin não é capaz de finalizar essa importação à menos que você "
 "aumente o tempo limite do PHP."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Script passou do tempo limite, se você deseja terminar a importação, reenvie "
-"o mesmo arquivo que a importação será resumida."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "página de/para"
@@ -6202,10 +6242,6 @@ msgstr "Mudar para pequeno/grande"
 msgid "To select relation, click :"
 msgstr "Para selecionar relacionamento, clique :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "total"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6517,7 +6553,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "desconhecido"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Você mudou os priviléios para %s."
@@ -6537,19 +6573,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Você deveria atualizar para %s %s ou posterior."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Você provavelmente tentou carregar um arquivo muito grande. Veja referências "
-"na %sdocumentation%s para burlar esses limites."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Não é permitido subir arquivos neste servidor."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Uso"
@@ -6563,7 +6586,7 @@ msgstr "Usar aspas simples nos nomes de tabelas e campos"
 msgid "Use Host Table"
 msgstr "Usar Tabela do Servidor"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "O usuário %s já existe!"
@@ -6576,7 +6599,7 @@ msgstr "O usuário %s já existe!"
 msgid "User name"
 msgstr "Nome do usuário"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "O usuário selecionado não foi encontrado na tabela de privilégios."
 
@@ -6584,7 +6607,7 @@ msgstr "O usuário selecionado não foi encontrado na tabela de privilégios."
 msgid "User overview"
 msgstr "Avaliação dos usuários"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Os usuários selecionados foram apagados com sucesso."
 
@@ -6647,11 +6670,6 @@ msgstr "Ver o esquema da tabela"
 msgid "VIEW name"
 msgstr "Nome da VISÃO"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr ""
-"O diretório que você especificou para subir arquivos não foi encontrado."
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6669,10 +6687,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "coringa"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Usuário ou senha incorreta. Acesso negado."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/ro.po b/po/ro.po
index ca5301570..90198b98f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-13 00:41+0200\n"
 "Last-Translator: <ronaldinia@yahoo.com>\n"
 "Language-Team: romanian <ro@li.org>\n"
@@ -92,6 +92,11 @@ msgstr "Descriere"
 msgid "Use this value"
 msgstr "Folosește această valoare"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Baza de date %1$s a fost creată."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Comentarii referitoare la baza de date: "
@@ -208,6 +213,20 @@ msgstr "Selectează tot"
 msgid "Unselect All"
 msgstr "Deselectează tot"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Cîmpul de denumire al bazei de date este gol!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Baza de date %s a fost redenumită în %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Baza de date %s a fost copiata la %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Redenumire bază de date în"
@@ -318,6 +337,15 @@ msgstr "Activează"
 msgid "Collation"
 msgstr "Interclasare"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Opțiunile adiționale pentru folosirea tabelelor intercalate au fost "
+"dezactivate. Pentru a afla de ce ...  %shere%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Arată schema PDF"
@@ -645,7 +673,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -822,16 +851,76 @@ msgstr "Verificare tabel"
 msgid "Database Log"
 msgstr "Baza de date"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Probabil ați încercat să încărcați un fișier prea mare. Faceți referire la %"
+"sdocumentație%s pentru căi de ocolire a acestei limite."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Fișierul nu poate fi citit"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Ați încercat să încărcați un fișier cu compresie nesuportată (%s). Fie "
+"suportul pentru aceasta nu este implementat, fie este dezactivat de "
+"configurația dumneavoastră."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Nicio informație nu a fost recepționată pentru import. Ori niciun fișier nu "
+"a fost trimit, ori mărimea fișierului a depășit mărimea maximă permisă de "
+"configurația PHP-ului dumneavoastră. Vedeți FAQ 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"Nu au putut fi încărcate modulele adiționale de import, vă rog verificați "
+"instalarea!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Eticheta a fost ștearsă."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Afișînd semn de carte"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Semnul de carte %s a fost creat"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Importul s-a terminat cu succes, %d interogări executate."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -850,7 +939,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "Comenzile \"DROP DATABASE\" sînt dezactivate."
 
@@ -890,10 +980,12 @@ msgid "The user name is empty!"
 msgstr "Numele de utilizator este gol!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Parola este goală!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Parolele nu corespund!"
 
@@ -1318,7 +1410,8 @@ msgstr "Parolă:"
 msgid "Server Choice"
 msgstr "Alegerea serverului"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Trebuie sa aveti activat \"cookies\"."
 
@@ -1342,6 +1435,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Nu pot face conexiunea catre serverul MySQL"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Nume de utilizator/parolă incorecte. Accesul interzis."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1473,11 +1570,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Documentație"
 
@@ -1541,7 +1639,7 @@ msgid "Skip Validate SQL"
 msgstr "Sari peste validarea SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Validează SQL"
 
@@ -1596,7 +1694,8 @@ msgstr "Funcționalitatea %s este afectată de o eroare cunoscută, vedeți %s"
 msgid "Font size"
 msgstr "Dimensiune font"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1759,6 +1858,7 @@ msgid "Create"
 msgstr "Creează"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Nu există drepturi de acces"
 
@@ -1775,6 +1875,12 @@ msgstr "Creează tabel nou în baza de date %s"
 msgid "Number of fields"
 msgstr "Număr de cîmpuri"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"Nu au putut fi încărcate modulele de export adiționale, vă rog verificați "
+"instalarea!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1803,6 +1909,29 @@ msgstr "Suprascrie fișier(e) existent(e)"
 msgid "File name template"
 msgstr "Șablon nume fișier"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "nume server"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "nume bază de date"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "nume tabel"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "ține minte șablonul"
@@ -1874,6 +2003,15 @@ msgstr "Fișier de importat"
 msgid "Location of the text file"
 msgstr "Locația fișierului textual"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Încărcările de fișiere nu sînt permise pe acest server."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Directorul stabilit pentru încărcare nu poate fi găsit"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2021,6 +2159,20 @@ msgstr "Oprește"
 msgid "in query"
 msgstr "în interogarea"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Afișează înregistrări"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "total"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "comanda a durat %01.4f sec"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2506,29 +2658,12 @@ msgstr "Eșec la scrierea fișierului pe disc."
 msgid "File upload stopped by extension."
 msgstr "Încărcarea fișierului a fost împiedicată de extensie."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Fișierul nu poate fi citit"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Eroare la mutarea fișierului încărcat, vezi FAQ 1.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Ați încercat să încărcați un fișier cu compresie nesuportată (%s). Fie "
-"suportul pentru aceasta nu este implementat, fie este dezactivat de "
-"configurația dumneavoastră."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2555,7 +2690,7 @@ msgstr "Generat de"
 msgid "Rows"
 msgstr "Linie"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL a dat un set de rezultate gol (zero linii)."
@@ -2602,6 +2737,11 @@ msgstr "Structură"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Index nu este definit!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2638,6 +2778,13 @@ msgstr "Cheia primară a fost aruncată"
 msgid "Index %s has been dropped"
 msgstr "Indexul %s a fost aruncat"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr "Indecșii %1$s și %2$s par a fi egali și unul din ei poate fi șters."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2773,7 +2920,7 @@ msgstr "Adaugă la coloana(ele) index &nbsp;%s&nbsp;"
 msgid "Add a new User"
 msgstr "Adaugă un utilizator nou"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Ați adăugat un nou utilizator."
 
@@ -2966,10 +3113,6 @@ msgstr "Upload to BLOB repository"
 msgid "Let every user access this bookmark"
 msgstr "Permite tuturor utilizatorilor să acceseze acest semn de carte"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Eticheta a fost ștearsă."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Etichetă"
@@ -3012,19 +3155,7 @@ msgstr "cu „bzip2”"
 msgid "Calendar"
 msgstr "Calendar"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"Nu au putut fi încărcate modulele de export adiționale, vă rog verificați "
-"instalarea!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"Nu au putut fi încărcate modulele adiționale de import, vă rog verificați "
-"instalarea!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Nu puteți redenumi index-ul la un nume PRIMARY!"
 
@@ -3144,11 +3275,6 @@ msgstr "Configureaza coordonatelepentru tabelul %s"
 msgid "Connections"
 msgstr "Conexiuni"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Baza de date %s a fost copiata la %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Copiază tabelul la (bază_de_date<b>.</b>tabel):"
@@ -3172,7 +3298,7 @@ msgstr "Comprimă conexiunea la serverul MySQL"
 msgid "Could not connect to the target"
 msgstr "Comprimă conexiunea la serverul MySQL"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3272,26 +3398,17 @@ msgstr "Cehoslovac"
 msgid "Danish"
 msgstr "Danez"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Cîmpul de denumire al bazei de date este gol!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Opțiuni de exportare a bazei de date"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Baza de date %1$s a fost creată."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s baza(ele) de data(e) au fost aruncate."
@@ -3316,7 +3433,7 @@ msgstr "Dezactivează statisticile"
 msgid "Enable Statistics"
 msgstr "Activează statisticile"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3365,7 +3482,7 @@ msgstr "Defragmentare tabel"
 msgid "Use delayed inserts"
 msgstr "Folosește inserări întîrziate"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Nici un utilizator ales pentru ștergere!"
 
@@ -3580,34 +3697,11 @@ msgstr ""
 "Fișierul %s există deja pe server. Schimbați denumirea fișierului sau bifați "
 "opțiunea de suprascriere."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "nume bază de date"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "nume server"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "nume tabel"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Fișiere"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3632,7 +3726,7 @@ msgstr "Curățarea tabelului (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Flush (close) all tables"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr "Error creating foreign key on %1$s (check data types)"
@@ -3816,13 +3910,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr "Indecșii %1$s și %2$s par a fi egali și unul din ei poate fi șters."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3858,7 +3945,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Inserează ca o nouă linie"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "ID rînd inserat: %1$d"
@@ -4185,20 +4272,10 @@ msgstr "Afișează procesele"
 msgid "No databases"
 msgstr "Nu sînt baze de date"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Nu este selectată nici o bază de date."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Nicio informație nu a fost recepționată pentru import. Ori niciun fișier nu "
-"a fost trimit, ori mărimea fișierului a depășit mărimea maximă permisă de "
-"configurația PHP-ului dumneavoastră. Vedeți FAQ 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "Nu există descriere"
@@ -4214,15 +4291,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "Niciun fișier nu a fost găsit în arhiva ZIP!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Index nu este definit!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Nu sînt definite părți din index!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Nici o schimbare"
 
@@ -4241,7 +4314,7 @@ msgstr "Acest format nu are opțiuni"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Serverul web nu poate salva fișierul %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Nu dețineți drepturi de acces pentru a vă afla aici!"
 
@@ -4278,7 +4351,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> tabelul nu a fost găsit sau nu este stabilit în %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Nu s-a găsit nici un utilizator."
 
@@ -4325,7 +4399,7 @@ msgstr "Întreținerea partiției"
 msgid "Partition %s"
 msgstr "Partiția %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Parola pentru %s a fost schimbată cu succes."
@@ -4427,11 +4501,11 @@ msgstr "Polononez"
 msgid "Port"
 msgstr "Sortare"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Numele cheii primare trebuie să fie... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4640,7 +4714,7 @@ msgstr "Permite schimbarea datelor."
 msgid "No privileges."
 msgstr "Fără drepturi."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Drepturile au fost reîncarcate cu succes."
 
@@ -4683,11 +4757,6 @@ msgstr ""
 "<b>Statistică interogări</b>: De la început, s-au trimis %s interogări la "
 "server."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "comanda a durat %01.4f sec"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Tip interogare"
@@ -4716,15 +4785,6 @@ msgstr "Verificarea integrității referinței:"
 msgid "Relational schema"
 msgstr "Schema relațională"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Opțiunile adiționale pentru folosirea tabelelor intercalate au fost "
-"dezactivate. Pentru a afla de ce ...  %shere%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Legături"
@@ -4765,11 +4825,6 @@ msgstr "Elimină partiționarea"
 msgid "Remove selected users"
 msgstr "Eliminarea utilizatorilor selectați"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Baza de date %s a fost redenumită în %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4875,7 +4930,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -5017,7 +5072,7 @@ msgstr ""
 "Revocarea tuturor drepturilor active ale utilizatorilor și stergerea "
 "acestora."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Drepturile tale au fost revocate pentru %s"
@@ -5180,19 +5235,11 @@ msgstr "Afișare comandă întreagă"
 msgid "Show/Hide left menu"
 msgstr "Arată/ascunde meniul stîng"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Afișînd semn de carte"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Afișare ca și cod PHP"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Afișează înregistrări"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Afișare interogare SQL"
 
@@ -6066,7 +6113,7 @@ msgstr "Tabelul %s există deja!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Tabelul %1$s a fost alterat cu succes"
@@ -6085,7 +6132,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Numele de tabel este gol!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "Tabelul %1$s a fost creat."
@@ -6207,7 +6254,7 @@ msgstr "Această gazdă"
 msgid "Threads"
 msgstr "Fire"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Firul de execuție %s a fost oprit cu succes."
@@ -6220,14 +6267,6 @@ msgstr ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
 "won't be able to finish this import unless you increase php time limits."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "în/din pagină"
@@ -6244,10 +6283,6 @@ msgstr "Comutare mare/mică"
 msgid "To select relation, click :"
 msgstr "Pentru a alege relația, faceți clic:"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "total"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6560,7 +6595,7 @@ msgstr "Unicod"
 msgid "unknown"
 msgstr "necunoscut"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Ați actualizat privilegiile pentru %s."
@@ -6580,19 +6615,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Ar trebui sa reactualizati serverul %s %s la o versiune mai noua."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Probabil ați încercat să încărcați un fișier prea mare. Faceți referire la %"
-"sdocumentație%s pentru căi de ocolire a acestei limite."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Încărcările de fișiere nu sînt permise pe acest server."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Utilizare"
@@ -6606,7 +6628,7 @@ msgstr "Utilizati apostroful pentru numele tabelelor și a campurilor"
 msgid "Use Host Table"
 msgstr "Utilizare tabel gazde"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Utilizatorul %s există deja!"
@@ -6619,7 +6641,7 @@ msgstr "Utilizatorul %s există deja!"
 msgid "User name"
 msgstr "Nume utilizator"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Utilizatorul selectat nu a fost găsit în tabelul de drepturi."
 
@@ -6627,7 +6649,7 @@ msgstr "Utilizatorul selectat nu a fost găsit în tabelul de drepturi."
 msgid "User overview"
 msgstr "Descriere utilizator"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Utilizatorii selectați au fost eliminați."
 
@@ -6690,10 +6712,6 @@ msgstr "Vizualizarea schemei tabelului"
 msgid "VIEW name"
 msgstr "Denumire VIZIUNE"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Directorul stabilit pentru încărcare nu poate fi găsit"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Server Web"
@@ -6711,10 +6729,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "Metacaracter"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Nume de utilizator/parolă incorecte. Accesul interzis."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/ru.po b/po/ru.po
index 91c3edd5a..ad370c656 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-30 23:23+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: russian <ru@li.org>\n"
@@ -92,6 +92,11 @@ msgstr "Описание"
 msgid "Use this value"
 msgstr "Использовать это значение"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "База данных %1$s была создана."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Комментарий к базе данных:"
@@ -208,6 +213,20 @@ msgstr "Выделить все"
 msgid "Unselect All"
 msgstr "Снять выделение"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Не указано имя базы данных!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "База данных `%s` переименована в `%s`."
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "База данных %s была скопирована в %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Переименовать базу данных в"
@@ -318,6 +337,15 @@ msgstr "Включить"
 msgid "Collation"
 msgstr "Сравнение"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Дополнительные возможности для работы со связанными таблицами недоступны. "
+"Для определения причины нажмите %sздесь%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Показать PDF-схему"
@@ -645,7 +673,8 @@ msgstr "Слежение включено."
 msgid "Tracking is not active."
 msgstr "Слежение выключено."
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -815,16 +844,77 @@ msgstr "Отслеживать таблицу"
 msgid "Database Log"
 msgstr "Журнал базы данных"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Вероятно, размер загружаемого файла слишком велик. Способы обхода данного "
+"ограничения описаны в %sдокументации%s."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Ошибка при чтении файла"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Загружаемый файл сжат методом (%s), который не поддерживается, и поэтому не "
+"может быть импортирован. Поддержка данного метода еще не реализована, либо "
+"отключена при конфигурировании."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Операция импорта невозможна. Причины: не выбран импортируемый файл; размер "
+"импортируемого файла превышает максимально допустимый, заданный в настройках "
+"PHP. См. FAQ 1.16"
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"Модули импорта - отсутствуют! Проверьте содержимое каталога libraries/import "
+"установленной копии phpMyAdmin."
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Закладка удалена."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Отображение закладки"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Закладка &quot;%s&quot; создана"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Импорт успешно завершен, запросов выполнено: %d."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Достигнут временной лимит. Если вы хотите завершить импорт, перезапустите "
+"его выбрав тот же файл, и процесс продолжится с того места на котором "
+"остановился."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "Для работы phpMyAdmin нужен браузер с поддержкой <b>фреймов</b>."
@@ -841,7 +931,8 @@ msgstr "Выделение"
 msgid "Click to unselect"
 msgstr "Снятие выделения"
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "Команда \"DROP DATABASE\" (удалить базу данных) - отключена."
 
@@ -881,10 +972,12 @@ msgid "The user name is empty!"
 msgstr "Не задано имя пользователя!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Пароль не задан!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Некорректное подтверждение пароля!"
 
@@ -1311,7 +1404,8 @@ msgstr "Пароль:"
 msgid "Server Choice"
 msgstr "Выбор сервера"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Для полноценной работы необходима поддержка cookies браузером."
 
@@ -1334,6 +1428,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Невозможно подключиться к серверу MySQL"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Данные для входа не верны. В доступе отказано."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1465,11 +1563,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Документация"
 
@@ -1533,7 +1632,7 @@ msgid "Skip Validate SQL"
 msgstr "Убрать проверку синтаксиса SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Проверка синтаксиса"
 
@@ -1589,7 +1688,8 @@ msgstr ""
 msgid "Font size"
 msgstr "Размер шрифта"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1755,6 +1855,7 @@ msgid "Create"
 msgstr "Создать"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Нет привилегий"
 
@@ -1771,6 +1872,12 @@ msgstr "Создать новую таблицу в базе данных %s"
 msgid "Number of fields"
 msgstr "Количество полей"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"Модули экспорта, отсутствуют! Проверьте содержимое каталога libraries/export "
+"установленной копии phpMyAdmin."
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1799,6 +1906,29 @@ msgstr "Перезаписать существующий(е) файл(ы)"
 msgid "File name template"
 msgstr "Шаблон имени файла"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "имя сервера"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "имя базы данных"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "имя таблицы"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Значение обрабатывается функцией %1$sstrftime%2$s, благодаря чему возможна "
+"вставка текущей даты и времени. Дополнительно могут быть использованы "
+"следующие подстановки: %3$s. Остальной текст останется без изменений."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "запомнить шаблон"
@@ -1873,6 +2003,15 @@ msgstr "Импортируемый файл"
 msgid "Location of the text file"
 msgstr "Выбор файла"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Загрузка файлов на сервер, невозможна."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Установленный каталог загрузки не доступен"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2020,6 +2159,20 @@ msgstr "Завершить"
 msgid "in query"
 msgstr "по запросу"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Отображает строки"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "всего"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "запрос занял %01.4f сек."
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2512,29 +2665,12 @@ msgstr "Ошибка при попытке записи файла на диск
 msgid "File upload stopped by extension."
 msgstr "Загрузка файла остановлена из-за расширения."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Ошибка при чтении файла"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Ошибка при перемещении загруженного файла, см. FAQ 1.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Загружаемый файл сжат методом (%s), который не поддерживается, и поэтому не "
-"может быть импортирован. Поддержка данного метода еще не реализована, либо "
-"отключена при конфигурировании."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2561,7 +2697,7 @@ msgstr "Создан"
 msgid "Rows"
 msgstr "Строки"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL вернула пустой результат (т.е. ноль строк)."
@@ -2605,6 +2741,11 @@ msgstr "структура"
 msgid "Go to view"
 msgstr "Перейти к отображению (VIEW)"
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Индекс не определен!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2641,6 +2782,13 @@ msgstr "Первичный ключ был удален"
 msgid "Index %s has been dropped"
 msgstr "Индекс %s был удален"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr "Индексы %1$s и %2$s равнозначны и один из них может быть удалён."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2773,7 +2921,7 @@ msgstr "Добавить к индексу&nbsp;%s&nbsp;столбец(ы)"
 msgid "Add a new User"
 msgstr "Добавить нового пользователя"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Был добавлен новый пользователь."
 
@@ -2965,10 +3113,6 @@ msgstr "Загрузить в хранилище BLOB данных"
 msgid "Let every user access this bookmark"
 msgstr "Доступна для всех пользователей"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Закладка удалена."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Метка"
@@ -3011,19 +3155,7 @@ msgstr "bzip"
 msgid "Calendar"
 msgstr "Календарь"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"Модули экспорта, отсутствуют! Проверьте содержимое каталога libraries/export "
-"установленной копии phpMyAdmin."
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"Модули импорта - отсутствуют! Проверьте содержимое каталога libraries/import "
-"установленной копии phpMyAdmin."
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Невозможно переименовать индекс в PRIMARY!"
 
@@ -3143,11 +3275,6 @@ msgstr "Измените координаты таблицы %s"
 msgid "Connections"
 msgstr "Соединения"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "База данных %s была скопирована в %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Скопировать таблицу в (база данных<b>.</b>таблица):"
@@ -3169,7 +3296,7 @@ msgstr "Не получилось соединиться с источником
 msgid "Could not connect to the target"
 msgstr "Не получилось соединиться с целевой базой данных"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3273,26 +3400,17 @@ msgstr "Чехословацкий"
 msgid "Danish"
 msgstr "Датский"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Не указано имя базы данных!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Параметры экспорта базы данных"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "База данных %1$s была создана."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr "База данных '%s' не существует."
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "Удалено баз данных: %s"
@@ -3316,7 +3434,7 @@ msgstr "Отключить статистику"
 msgid "Enable Statistics"
 msgstr "Включить статистику"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3363,7 +3481,7 @@ msgstr "Дефрагментировать таблицу"
 msgid "Use delayed inserts"
 msgstr "Использовать отложенные вставки (DELAYED)"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Не выбраны пользователи подлежащие удалению!"
 
@@ -3578,34 +3696,11 @@ msgstr ""
 "Файл %s уже существует на сервере, измените имя или включите параметр "
 "перезаписи."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "имя базы данных"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "имя сервера"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "имя таблицы"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Значение обрабатывается функцией %1$sstrftime%2$s, благодаря чему возможна "
-"вставка текущей даты и времени. Дополнительно могут быть использованы "
-"следующие подстановки: %3$s. Остальной текст останется без изменений."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Файлов"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3630,7 +3725,7 @@ msgstr "Обновить кеш таблицы (&quot;FLUSH&quot;)"
 msgid "Flush (close) all tables"
 msgstr "Закрыть все таблицы"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr "Ошибка создания внешнего ключа на %1$s (проверьте типы данных)"
@@ -3815,13 +3910,6 @@ msgstr "Excel 97-2003 XLS Workbook"
 msgid "Excel 2007 XLSX Workbook"
 msgstr "Excel 2007 XLSX Workbook"
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr "Индексы %1$s и %2$s равнозначны и один из них может быть удалён."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3859,7 +3947,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Вставить запись"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Идентификатор вставленной строки: %1$d"
@@ -4187,20 +4275,10 @@ msgstr "Список процессов"
 msgid "No databases"
 msgstr "Базы данных отсутствуют"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Ни одна база данных не выбрана."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Операция импорта невозможна. Причины: не выбран импортируемый файл; размер "
-"импортируемого файла превышает максимально допустимый, заданный в настройках "
-"PHP. См. FAQ 1.16"
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "нет описания"
@@ -4215,15 +4293,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "Файлов внутри ZIP-архива не найдено!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Индекс не определен!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Части индекса не определены!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Нет изменений"
 
@@ -4241,7 +4315,7 @@ msgstr "Для этого формата нет настраиваемых па
 msgid "The web server does not have permission to save the file %s."
 msgstr "Не достаточно прав для сохранения файла %s на веб-сервере."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Для доступа к данной странице у вас недостаточно прав!"
 
@@ -4278,7 +4352,8 @@ msgstr "отсутствует"
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "Таблица <b>%s</b> не найдена или не установлена в %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Пользователей не найдено."
 
@@ -4325,7 +4400,7 @@ msgstr "Обслуживание разделов"
 msgid "Partition %s"
 msgstr "Раздел %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Пароль для %s был успешно изменен."
@@ -4426,11 +4501,11 @@ msgstr "Польский"
 msgid "Port"
 msgstr "Порт"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Имя первичного индекса должно быть PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(Имя &quot;PRIMARY&quot; должен иметь <b>только</b> первичный индекс!)"
@@ -4636,7 +4711,7 @@ msgstr "Разрешает изменение данных"
 msgid "No privileges."
 msgstr "Нет привилегий"
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Привилегии были успешно перезагружены."
 
@@ -4679,11 +4754,6 @@ msgstr ""
 "Статистика запросов: со времени запуска, на сервер было отослано запросов - %"
 "s."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "запрос занял %01.4f сек."
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Тип запроса"
@@ -4712,15 +4782,6 @@ msgstr "Проверить целостность данных:"
 msgid "Relational schema"
 msgstr "Cхема связей"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Дополнительные возможности для работы со связанными таблицами недоступны. "
-"Для определения причины нажмите %sздесь%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Связи"
@@ -4760,11 +4821,6 @@ msgstr "Удалить разделение"
 msgid "Remove selected users"
 msgstr "Удалить выделенных пользователей"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "База данных `%s` переименована в `%s`."
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4883,7 +4939,7 @@ msgstr ""
 "Данный сервер не настроен в качестве головного для процесса репликации. "
 "Хотите произвести <a href=\"%s\">настройку</a>?"
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -5030,7 +5086,7 @@ msgstr "Количество вставляемых строк: %s"
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Отменить все активные привилегии пользователей и затем удалить их."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Отменены привилегии для %s."
@@ -5197,19 +5253,11 @@ msgstr "Развернутое отображение запросов"
 msgid "Show/Hide left menu"
 msgstr "Показать/скрыть левое меню"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Отображение закладки"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Отображает как PHP-код"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Отображает строки"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Отображает SQL-запрос"
 
@@ -6114,7 +6162,7 @@ msgstr "Таблица %s уже существует!"
 msgid "Alter column(s)"
 msgstr "Изменить поле(я)"
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Таблица %1$s была успешно изменена"
@@ -6133,7 +6181,7 @@ msgstr "Удалить все предыдущие строки из целев
 msgid "The table name is empty!"
 msgstr "Не задано имя таблицы!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "Таблица %1$s была создана."
@@ -6254,7 +6302,7 @@ msgstr "Этот хост"
 msgid "Threads"
 msgstr "Потоки"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Процесс %s был успешно завершен."
@@ -6268,15 +6316,6 @@ msgstr ""
 "означает, что phpMyAdmin не сможет завершить процесс импорта до тех пор, "
 "пока не будет увеличено ограничение времени выполнения php-сценариев."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Достигнут временной лимит. Если вы хотите завершить импорт, перезапустите "
-"его выбрав тот же файл, и процесс продолжится с того места на котором "
-"остановился."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "Страница"
@@ -6294,10 +6333,6 @@ msgid "To select relation, click :"
 msgstr ""
 "Для выбора связи нажмите на точке соединения, как показано на картинке:"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "всего"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6614,7 +6649,7 @@ msgstr "Юникод"
 msgid "unknown"
 msgstr "неизвестно"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Были изменены привилегии для %s."
@@ -6634,19 +6669,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Необходимо обновить %s до версии %s или выше."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Вероятно, размер загружаемого файла слишком велик. Способы обхода данного "
-"ограничения описаны в %sдокументации%s."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Загрузка файлов на сервер, невозможна."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Использование"
@@ -6660,7 +6682,7 @@ msgstr "Заключить названия таблиц и полей в кос
 msgid "Use Host Table"
 msgstr "Использовать таблицу хостов"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Пользователь %s уже существует!"
@@ -6673,7 +6695,7 @@ msgstr "Пользователь %s уже существует!"
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Выделенный пользователь не был найден в таблице привилегий."
 
@@ -6681,7 +6703,7 @@ msgstr "Выделенный пользователь не был найден 
 msgid "User overview"
 msgstr "Обзор учетных записей"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Выбранные пользователи были успешно удалены."
 
@@ -6744,10 +6766,6 @@ msgstr "Отобразить дамп (схему) таблицы"
 msgid "VIEW name"
 msgstr "VIEW название"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Установленный каталог загрузки не доступен"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Веб-сервер"
@@ -6765,10 +6783,6 @@ msgstr "Вики"
 msgid "wildcard"
 msgstr "Групповой символ"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Данные для входа не верны. В доступе отказано."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/si.po b/po/si.po
index 1ad9eaa9d..03b4ecb36 100644
--- a/po/si.po
+++ b/po/si.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-30 23:09+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: sinhala <si@li.org>\n"
@@ -90,6 +90,11 @@ msgstr "විස්තරය"
 msgid "Use this value"
 msgstr "Use this value"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "%s දත්තගබඩාව හලන ලදි."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "දත්තගබඩා විස්තර: "
@@ -206,6 +211,20 @@ msgstr "සියල්ල තෝරන්න"
 msgid "Unselect All"
 msgstr "සියල්ලේ තෝරාගැනීම ඉවත් කරන්න‍"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "දත්තගබඩා නම හිස්ව පවතී!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "%s දත්තගබඩාව %s බවට නම වෙනස් කරන ලදි"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "%s දත්තගබඩාව %s වෙතට පිටපත් කරන ලදි"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "බවට දත්තගබඩාවේ නම වෙනස් කරන්න"
@@ -317,6 +336,15 @@ msgstr "සක්‍රිය කරන් ලද"
 msgid "Collation"
 msgstr "Collation"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "PDF නිරූපනය පෙන්වන්න"
@@ -644,7 +672,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -820,16 +849,73 @@ msgstr "වගුව පරීක්ෂා කරන්න"
 msgid "Database Log"
 msgstr "දත්තගබඩාව"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "ගොනුව කියවිය නොහැක"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"FAQ 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "Could not load import plugins, please check your installation!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "පොත් සලකුණ ඉවත් කරන ලදි."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "පොත් සලකුණ පෙන්වන්න"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "%s පොත් සලකුණ සාදන ලදි"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "ආනයනය සාර්ථකව අවසන් කරන ලදි, විමසුම්%d ක්‍රියාත්මක කරන ලදි."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
@@ -846,7 +932,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" statements are disabled."
 
@@ -886,10 +973,12 @@ msgid "The user name is empty!"
 msgstr "භාවිත නාමය හිස්ව පවතී!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "The password is empty!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "The passwords aren't the same!"
 
@@ -1313,7 +1402,8 @@ msgstr "මුරපදය:"
 msgid "Server Choice"
 msgstr "සර්වරයේ තේරීම"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "මෙම ස්ථානය පසු කිරීම සඳහා කුකීස් - Cookies සක්‍රිය කල යුතුයි."
 
@@ -1335,6 +1425,10 @@ msgstr "No activity within %s seconds; please log in again"
 msgid "Cannot log in to the MySQL server"
 msgstr "MySQL සර්වරයට ලොග් විය නොහැක"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "වැරදි භාවිත නාමය/මුරපදය. පිවිසුම වලක්වා ඇත."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1463,11 +1557,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "ලියකියවිලි"
 
@@ -1531,7 +1626,7 @@ msgid "Skip Validate SQL"
 msgstr "Skip Validate SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Validate SQL"
 
@@ -1586,7 +1681,8 @@ msgstr ""
 msgid "Font size"
 msgstr "ෆොන්ට් එකෙහි ප්‍රමාණය"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1750,6 +1846,7 @@ msgid "Create"
 msgstr "සාදන්න"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "වරප්‍රසාද නොමැත"
 
@@ -1766,6 +1863,10 @@ msgstr "%s දත්තගබඩාවේ නව වගුවක් සාදන
 msgid "Number of fields"
 msgstr "ක්ෂේත්‍ර ගණන"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr "Could not load export plugins, please check your installation!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1794,6 +1895,29 @@ msgstr "Overwrite existing file(s)"
 msgid "File name template"
 msgstr "ෆයිල් නම් ටෙම්ප්ලේටය"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "සර්වරයේ නම"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "දත්තගබඩාවේ නම"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "වගුවේ නම"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "ටෙම්ප්ලේටය මතක තබා ගන්න"
@@ -1865,6 +1989,15 @@ msgstr "ආනයනය සඳහා වූ ගොනුව"
 msgid "Location of the text file"
 msgstr "පාඨ ගොනුවෙහි පිහිටුම"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "File uploads are not allowed on this server."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "අප්ලෝඩ් කිරීම් සඳහා සැකසූ ඩිරෙක්ටරිය වෙත පිවිසිය නොහැක"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2014,6 +2147,20 @@ msgstr "Kill"
 msgid "in query"
 msgstr "in query"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "පේළි පෙන්වන්න"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "මුළු එකතුව"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Query took %01.4f sec"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2473,11 +2620,6 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "ගොනුව කියවිය නොහැක"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 #, fuzzy
 msgid ""
@@ -2485,17 +2627,6 @@ msgid ""
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "සමහර විට ආසන්න වශයෙන්. FAQ 3.11 බලන්න"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2522,7 +2653,7 @@ msgstr "උත්පාදනය කරන ලද්දේ"
 msgid "Rows"
 msgstr "පේළි"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL returned an empty result set (i.e. zero rows)."
@@ -2569,6 +2700,11 @@ msgstr "සැකිල්ල"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "No index defined!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2606,6 +2742,13 @@ msgstr "The primary key has been dropped"
 msgid "Index %s has been dropped"
 msgstr "%s සූචිය හලන ලදි"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2738,7 +2881,7 @@ msgstr "&nbsp;%s&nbsp;තීර(ය) සූචියට එක් කරන්
 msgid "Add a new User"
 msgstr "නව භාවිතා කරන්නේක් එක් කරන්න"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "ඔබ නව භාවිතා කරන්නනෙක් එක් කරන ලදි."
 
@@ -2931,10 +3074,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "සියලු භාවිතා කරන්නනට මෙම පොත් සලකුණට පිවිසීමට ඉඩ දෙන්න"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "පොත් සලකුණ ඉවත් කරන ලදි."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "ලේබලය"
@@ -2977,15 +3116,7 @@ msgstr "\"bzipp ගතකරන ලදි\""
 msgid "Calendar"
 msgstr "දින දර්ශනය"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr "Could not load export plugins, please check your installation!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "Could not load import plugins, please check your installation!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Can't rename index to PRIMARY!"
 
@@ -3104,11 +3235,6 @@ msgstr "Please configure the coordinates for table %s"
 msgid "Connections"
 msgstr "සම්බන්ධතා"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "%s දත්තගබඩාව %s වෙතට පිටපත් කරන ලදි"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "වගුව (දත්තගබඩාව<b>.</b>වගුව) වෙතට පිටපත් කරන්න:"
@@ -3130,7 +3256,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3231,26 +3357,17 @@ msgstr "චෙකොස්ලෝවැකියානු-ස්ලෝවැක
 msgid "Danish"
 msgstr "ඩෙන්මාර්කියානු"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "දත්තගබඩා නම හිස්ව පවතී!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "දත්තගබඩා අපනයන විකල්ප"
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "%s දත්තගබඩාව හලන ලදි."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s දත්තගබඩාව සාර්ථකව හලන ලදි."
@@ -3275,7 +3392,7 @@ msgstr "සංඛ්‍යා ලේඛන අක්‍රිය කරන්න
 msgid "Enable Statistics"
 msgstr "සංඛ්‍යා ලේඛන සක්‍රිය කරන්න"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3323,7 +3440,7 @@ msgstr "Defragment table"
 msgid "Use delayed inserts"
 msgstr "ප්‍රමාද කරන ලද ඇතුල් කිරීම භාවිතා කරන්න"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "ඉවත් කිරීම සඳහා භාවිතා කරන්නන් කිසිවෙක් තෝරාගෙන නොමැත!"
 
@@ -3535,35 +3652,12 @@ msgid ""
 msgstr ""
 "File %s already exists on server, change filename or check overwrite option."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "දත්තගබඩාවේ නම"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "සර්වරයේ නම"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "වගුවේ නම"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "ක්ෂේත්‍ර"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3588,7 +3682,7 @@ msgstr "Flush the table (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Flush (close) all tables"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3773,13 +3867,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3816,7 +3903,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Insert as new row"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4139,20 +4226,10 @@ msgstr "ක්‍රියාවලිය පෙන්වන්න"
 msgid "No databases"
 msgstr "දත්තගබඩා නොමැත"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "දත්තගබඩාවක් තෝරාගෙන නොමැත."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"FAQ 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "no description"
@@ -4167,15 +4244,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "No files found inside ZIP archive!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "No index defined!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "No index parts defined!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "වෙනස්කම් නැත"
 
@@ -4194,7 +4267,7 @@ msgstr "මෙම ආකෘතියේ විකල්ප කිසිවක්
 msgid "The web server does not have permission to save the file %s."
 msgstr "The web server does not have permission to save the file %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "You don't have sufficient privileges to be here right now!"
 
@@ -4231,7 +4304,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> table not found or not set in %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "No user(s) found."
 
@@ -4280,7 +4354,7 @@ msgstr "වගු නඩත්තුව"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "The password for %s was changed successfully."
@@ -4383,11 +4457,11 @@ msgstr "පෝලන්ත"
 msgid "Port"
 msgstr "‍තෝරනවා"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "The name of the primary key must be \"PRIMARY\"!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4588,7 +4662,7 @@ msgstr "Allows changing data."
 msgid "No privileges."
 msgstr "වරප්‍රසාද නොමැත."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "The privileges were reloaded successfully."
 
@@ -4631,11 +4705,6 @@ msgstr ""
 "<b>Query statistics</b>: Since its startup, %s queries have been sent to the "
 "server."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Query took %01.4f sec"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "විමසුම් වර්ගය"
@@ -4664,15 +4733,6 @@ msgstr "Check referential integrity:"
 msgid "Relational schema"
 msgstr "Relational schema"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relations"
@@ -4711,11 +4771,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "තෝරාගත් භාවිතා කරන්නන් ඉවත් කරන්න"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "%s දත්තගබඩාව %s බවට නම වෙනස් කරන ලදි"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4822,7 +4877,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4963,7 +5018,7 @@ msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 "Revoke all active privileges from the users and delete them afterwards."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "You have revoked the privileges for %s"
@@ -5123,19 +5178,11 @@ msgstr "සම්පූර්ණ විමසුම් පෙන්වන්න"
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "පොත් සලකුණ පෙන්වන්න"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "පේළි පෙන්වන්න"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 #, fuzzy
 msgid "Showing SQL query"
 msgstr "සම්පූර්ණ විමසුම් පෙන්වන්න"
@@ -6008,7 +6055,7 @@ msgstr " %s වගුව දැනටමත් පවතී!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, fuzzy, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "The selected users have been deleted successfully."
@@ -6027,7 +6074,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "වගුවෙහි නම හිස්ව ඇත!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "%s වගුව හලන ලදි"
@@ -6149,7 +6196,7 @@ msgstr "this host"
 msgid "Threads"
 msgstr "ත්‍රෙඩයන්"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Thread %s was successfully killed."
@@ -6162,14 +6209,6 @@ msgstr ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
 "won't be able to finish this import unless you increase php time limits."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6186,10 +6225,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "මුළු එකතුව"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6495,7 +6530,7 @@ msgstr "යුනිකෝඩ්"
 msgid "unknown"
 msgstr "නොදන්නා"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "You have updated the privileges for %s."
@@ -6515,19 +6550,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "You should upgrade to %s %s or later."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "File uploads are not allowed on this server."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "භාවිතය"
@@ -6541,7 +6563,7 @@ msgstr "Enclose table and field names with backquotes"
 msgid "Use Host Table"
 msgstr "දායක වගුව භාවිතා කරන්න"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "%s භාවිතා කරන්නා දැනටමත් පවතී!"
@@ -6554,7 +6576,7 @@ msgstr "%s භාවිතා කරන්නා දැනටමත් පවත
 msgid "User name"
 msgstr "භාවිත නාමය"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "The selected user was not found in the privilege table."
 
@@ -6562,7 +6584,7 @@ msgstr "The selected user was not found in the privilege table."
 msgid "User overview"
 msgstr "User overview"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "The selected users have been deleted successfully."
 
@@ -6624,10 +6646,6 @@ msgstr "View dump (schema) of table"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "අප්ලෝඩ් කිරීම් සඳහා සැකසූ ඩිරෙක්ටරිය වෙත පිවිසිය නොහැක"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6645,10 +6663,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "wildcard"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "වැරදි භාවිත නාමය/මුරපදය. පිවිසුම වලක්වා ඇත."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/sk.po b/po/sk.po
index 246cf2e9f..9c287d8e5 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-30 23:47+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: slovak <sk@li.org>\n"
@@ -91,6 +91,11 @@ msgstr "Popis"
 msgid "Use this value"
 msgstr "Použiť túto hodnotu"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Databáza %1$s bola vytvorená."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Komentár k databáze: "
@@ -207,6 +212,20 @@ msgstr "Označiť všetko"
 msgid "Unselect All"
 msgstr "Odznačiť všetko"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Meno databázy je prázdne!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Databáza %s bola premenovaná na %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Databáza %s bola skopírovaná na %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Premenovať databázu na"
@@ -319,6 +338,15 @@ msgstr "Zapnuté"
 msgid "Collation"
 msgstr "Zotriedenie"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Prídavné vlastnosti pre prácu s prepojenými tabuľkami boli deaktivované. Ak "
+"chcete zistiť prečo, kliknite %ssem%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Zobraziť schému PDF"
@@ -647,7 +675,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -820,16 +849,74 @@ msgstr "Skontrolovať tabuľku"
 msgid "Database Log"
 msgstr "Databáza"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Pravdepodobne ste sa pokúsili uploadnuť príliš veľký súbor. Prečítajte si "
+"prosím %sdokumentáciu%s, ako sa dá toto obmedzenie obísť."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Súbor sa nedá prečítať"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Pokúsili ste sa načítať súbor s nepodporovanou kompresiou (%s). Buď nie je "
+"zahrnutá podpora tejto kompresie alebo bola deaktivovaná v konfigurácii."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Neboli prijaté žiadne dáta na import. Buď nebol načítaný žiadny súbor alebo "
+"jeho veľkosť prekročila maximálnu veľkosť povolenú v PHP. Pozri FAQ 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"Nebolo možné načítať importovacie pluginy, skontrolujte prosím vašu "
+"inštaláciu!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Záznam z obľúbených bol zmazaný."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Zobrazujem obľúbený príkaz"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Príkaz %s bol zaradený medzi obľúbené"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Import bol úspešne ukončený, bolo vykonaných %d dopytov."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Časový limit behu skriptu vypršal. Ak chcete import súboru dokončiť, "
+"odošlite znova formulár a import bude pokračovať."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin funguje lepšie s prehliadačmi podporujúcimi <b>rámy</b>."
@@ -846,7 +933,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "Možnosť \"DROP DATABASE\" vypnutá."
 
@@ -886,10 +974,12 @@ msgid "The user name is empty!"
 msgstr "Meno používateľa je prázdne!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Heslo je prázdne!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Heslá sa nezhodujú!"
 
@@ -1315,7 +1405,8 @@ msgstr "Heslo:"
 msgid "Server Choice"
 msgstr "Voľba serveru"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies musia byť povolené, pokiaľ chcete pokračovať."
 
@@ -1338,6 +1429,10 @@ msgstr "Boli ste neaktívni viac ako %s sekúnd, prihláste sa prosím znovu"
 msgid "Cannot log in to the MySQL server"
 msgstr "Nedá sa prihlásiť k MySQL serveru"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Zlé používateľské meno alebo heslo. Prístup zamietnutý."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1466,11 +1561,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentácia"
 
@@ -1534,7 +1630,7 @@ msgid "Skip Validate SQL"
 msgstr "Preskočiť potvrdenie platnosti SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Potvrdiť platnosť SQL"
 
@@ -1589,7 +1685,8 @@ msgstr "Funkčnosť %s je ovplyvnená známou chybou, pozri %s"
 msgid "Font size"
 msgstr "Veľkosť písma"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1750,6 +1847,7 @@ msgid "Create"
 msgstr "Vytvoriť"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Žiadne oprávnenia"
 
@@ -1766,6 +1864,11 @@ msgstr "Vytvoriť novú tabuľku v databáze %s"
 msgid "Number of fields"
 msgstr "Počet polí"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"Nepodarilo sa načítať exportné pluginy, skontrolujte prosím vašu inštaláciu!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1794,6 +1897,29 @@ msgstr "Prepísať existujúci súbor(y)"
 msgid "File name template"
 msgstr "Vzor pre názov súboru"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "meno servera"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "meno databázy"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "meno tabuľky"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Táto hodnota je interpretovaná pomocou %1$sstrftime%2$s, takže môžete použiť "
+"reťazec pre formátovanie dátumu a času. Naviac budú vykonané tieto "
+"nahradenia: %3$s. Ostatný text bude zachovaný."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "zapamätať si vzor"
@@ -1868,6 +1994,15 @@ msgstr "Súbor na importovanie"
 msgid "Location of the text file"
 msgstr "Lokácia textového súboru"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Ukladanie súborov na server nie je povolené."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Adresár určený pre upload súborov sa nedá otvoriť"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2019,6 +2154,20 @@ msgstr "Zabiť"
 msgid "in query"
 msgstr "v dopyte"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Ukázať záznamy "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "celkovo"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Dopyt zabral %01.4f sek."
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2476,28 +2625,12 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Súbor sa nedá prečítať"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Chyba pri presune súboru, pozrite FAQ 1.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Pokúsili ste sa načítať súbor s nepodporovanou kompresiou (%s). Buď nie je "
-"zahrnutá podpora tejto kompresie alebo bola deaktivovaná v konfigurácii."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2524,7 +2657,7 @@ msgstr "Vygenerované"
 msgid "Rows"
 msgstr "Riadkov"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL vrátil prázdny výsledok (tj. nulový počet riadkov)."
@@ -2569,6 +2702,11 @@ msgstr "Štruktúra"
 msgid "Go to view"
 msgstr "Prejsť na Prejsť na pohľad"
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Nebol definovaný žiadny index!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2605,6 +2743,13 @@ msgstr "Primárny kľúč bol zrušený"
 msgid "Index %s has been dropped"
 msgstr "Index pre %s bol odstránený"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2737,7 +2882,7 @@ msgstr "Pridať do indexu &nbsp;%s&nbsp;stĺpec"
 msgid "Add a new User"
 msgstr "Pridať nového používateľa"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Používateľ bol pridaný."
 
@@ -2929,10 +3074,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "Dovoliť používať túto položku všetkým používateľom"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Záznam z obľúbených bol zmazaný."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Názov"
@@ -2975,18 +3116,7 @@ msgstr "\"bzipped\""
 msgid "Calendar"
 msgstr "Kalendár"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"Nepodarilo sa načítať exportné pluginy, skontrolujte prosím vašu inštaláciu!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"Nebolo možné načítať importovacie pluginy, skontrolujte prosím vašu "
-"inštaláciu!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Nie je možné premenovať index na PRIMARY!"
 
@@ -3109,11 +3239,6 @@ msgstr "Prosím skonfigurujte koordináty pre tabuľku %s"
 msgid "Connections"
 msgstr "Spojenia"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Databáza %s bola skopírovaná na %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Skopírovať tabuľku do (databáza<b>.</b>tabuľka):"
@@ -3135,7 +3260,7 @@ msgstr "Nepodarilo sa pripojiť k zdroju"
 msgid "Could not connect to the target"
 msgstr "Nepodarilo sa pripojiť k cieľu"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3233,26 +3358,17 @@ msgstr "Čeština/Slovenčina"
 msgid "Danish"
 msgstr "Dánsky"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Meno databázy je prázdne!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Nastavenia exportu databáz"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Databáza %1$s bola vytvorená."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr "'%s' databáza neexistuje."
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "Úspešne zrušených databáz: %s."
@@ -3276,7 +3392,7 @@ msgstr "Skryť štatistiky"
 msgid "Enable Statistics"
 msgstr "Zobraziť štatistiky"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3323,7 +3439,7 @@ msgstr "Defragmentovať tabuľku"
 msgid "Use delayed inserts"
 msgstr "Použiť oneskorené vloženia"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Na odstránenie neboli vybraní žiadni používatelia!"
 
@@ -3536,34 +3652,11 @@ msgstr ""
 "Súbor %s už existuje na servery, zmente názov súboru alebo zvolte prepísanie "
 "súboru."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "meno databázy"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "meno servera"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "meno tabuľky"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Táto hodnota je interpretovaná pomocou %1$sstrftime%2$s, takže môžete použiť "
-"reťazec pre formátovanie dátumu a času. Naviac budú vykonané tieto "
-"nahradenia: %3$s. Ostatný text bude zachovaný."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Súbory"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3588,7 +3681,7 @@ msgstr "Vyprázdniť tabuľku (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Vyprázdniť (uzavrieť) všetky tabuľky"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3774,13 +3867,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3817,7 +3903,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Vložiť ako nový riadok"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4141,19 +4227,10 @@ msgstr "Zobraziť procesy"
 msgid "No databases"
 msgstr "Žiadne databázy"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Neboli vybrané žiadne databázy."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Neboli prijaté žiadne dáta na import. Buď nebol načítaný žiadny súbor alebo "
-"jeho veľkosť prekročila maximálnu veľkosť povolenú v PHP. Pozri FAQ 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "bez Popisu"
@@ -4168,15 +4245,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "V ZIP archíve neboli nájdené žiadne súbory!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Nebol definovaný žiadny index!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Časti indexu neboli definované!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Žiadna zmena"
 
@@ -4194,7 +4267,7 @@ msgstr "Tento formát nemá žiadne nastavenia"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Web server nemá oprávenia na uloženie do súboru %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Nemáte dostatočné práva na vykonanie tejto akcie!"
 
@@ -4231,7 +4304,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "Tabuľka <b>%s</b> nebola nájdená alebo nie je nastavená v %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Nebol nájdený žiadny používateľ."
 
@@ -4279,7 +4353,7 @@ msgstr "Údržba tabuľky"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Heslo pre %s bolo úspešne zmenené."
@@ -4380,11 +4454,11 @@ msgstr "Poľština"
 msgid "Port"
 msgstr "Port"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Názov primárneho kľúča musí byť... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(\"PRIMARY\" <b>musí</b> byť <b>iba</b> meno primárneho kľúča!)"
@@ -4586,7 +4660,7 @@ msgstr "Povolí menenie dát."
 msgid "No privileges."
 msgstr "Žiadne práva."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Práva boli úspešne znovunačítané."
 
@@ -4629,11 +4703,6 @@ msgstr ""
 "<b>Query statistics</b>: Since its startup, %s queries have been sent to the "
 "server."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Dopyt zabral %01.4f sek."
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Typ dopytu"
@@ -4662,15 +4731,6 @@ msgstr "Skontrolovať referenčnú integritu:"
 msgid "Relational schema"
 msgstr "Relačná schéma"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Prídavné vlastnosti pre prácu s prepojenými tabuľkami boli deaktivované. Ak "
-"chcete zistiť prečo, kliknite %ssem%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Prepojenia"
@@ -4709,11 +4769,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "Odstrániť vybraných používateľov"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Databáza %s bola premenovaná na %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4821,7 +4876,7 @@ msgstr ""
 "Tento server nie je nakonfigurovaný ako slave v replikačnom procese. Chceli "
 "by ste ho <a href=\"%s\">nakonfigurovať</a>?"
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4970,7 +5025,7 @@ msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 "Odobranie všetkých aktívnych práv používateľom a ich následné odstránenie."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Boli zrušené oprávnenia pre %s"
@@ -5133,19 +5188,11 @@ msgstr "Zobraziť kompletné dopyty"
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Zobrazujem obľúbený príkaz"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Zobrazujem ako PHP kód"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Ukázať záznamy "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Zobrazujem SQL dotaz"
 
@@ -6022,7 +6069,7 @@ msgstr "Tabuľka %s už existuje!"
 msgid "Alter column(s)"
 msgstr "Upraviť stĺpec/stĺpce"
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Tabuľka %1$s bola úspešné upravená"
@@ -6042,7 +6089,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Tabuľka je prázdna!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "Tabuľka %1$s bola vytvorená."
@@ -6163,7 +6210,7 @@ msgstr "Tento počítač"
 msgid "Threads"
 msgstr "Počet vlákien"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Vlákno %s bol úspešne zabité."
@@ -6177,14 +6224,6 @@ msgstr ""
 "že phpMyAdmin nebude schopný dokončiť tento import, pokiaľ nebude zvýšený "
 "časový limit behu skriptu v php."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Časový limit behu skriptu vypršal. Ak chcete import súboru dokončiť, "
-"odošlite znova formulár a import bude pokračovať."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6201,10 +6240,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "celkovo"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6505,7 +6540,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "neznámy"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Boli aktualizované oprávnenia pre %s."
@@ -6526,19 +6561,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Mali by ste aktualizovať %s na verziu %s alebo vyššiu."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Pravdepodobne ste sa pokúsili uploadnuť príliš veľký súbor. Prečítajte si "
-"prosím %sdokumentáciu%s, ako sa dá toto obmedzenie obísť."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Ukladanie súborov na server nie je povolené."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Využitie"
@@ -6552,7 +6574,7 @@ msgstr " Použiť opačný apostrof pri názvoch tabuliek a polí "
 msgid "Use Host Table"
 msgstr "Použiť tabuľku s hostiteľmi"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Používateľ %s už existuje!"
@@ -6565,7 +6587,7 @@ msgstr "Používateľ %s už existuje!"
 msgid "User name"
 msgstr "Meno používateľa"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Zvolený používateľ nebol nájdený v tabuľke práv."
 
@@ -6573,7 +6595,7 @@ msgstr "Zvolený používateľ nebol nájdený v tabuľke práv."
 msgid "User overview"
 msgstr "Prehľad používatelov"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Vybraní používatelia bol úspešne odstránený."
 
@@ -6637,10 +6659,6 @@ msgstr "Zobraziť dump (schému) tabuľky"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Adresár určený pre upload súborov sa nedá otvoriť"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Webový server"
@@ -6658,10 +6676,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "nahradzujúci znak"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Zlé používateľské meno alebo heslo. Prístup zamietnutý."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/sl.po b/po/sl.po
index fe8813bb9..bff13b526 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-05-07 23:30+0200\n"
 "Last-Translator:  <dbc334@gmail.com>\n"
 "Language-Team: slovenian <sl@li.org>\n"
@@ -91,6 +91,11 @@ msgstr "Opis"
 msgid "Use this value"
 msgstr "Uporabi to vrednost"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Podatkovna zbirka %1$s je ustvarjena."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Komentar zbirke podatkov: "
@@ -207,6 +212,20 @@ msgstr "Izberi vse"
 msgid "Unselect All"
 msgstr "Prekliči izbor vsega"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Ime podatkovne zbirke je prazno!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Zbirka podatkov %s je preimenovana v %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Zbirka podatkov %s je kopirana v %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Preimenuj zbirko podatkov v"
@@ -311,6 +330,15 @@ msgstr "Omogoči"
 msgid "Collation"
 msgstr "Pravilo za razvrščanje znakov"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Dodatne funkcije za delo s povezanimi tabelami so bile izkjučene. Če želite "
+"izvedeti zakaj, kliknite %stukaj%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Prikaži PDF-shemo"
@@ -638,7 +666,8 @@ msgstr "Sledenje je aktivno."
 msgid "Tracking is not active."
 msgstr "Sledenje ni aktivno."
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -806,16 +835,74 @@ msgstr "Sledi tabeli"
 msgid "Database Log"
 msgstr "Dnevnik podatkovne zbirke"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Najverjetneje ste poskušali naložiti preveliko datoteko. Prosimo, oglejte si "
+"%sdokumentacijo%s za načine, kako obiti to omejitev."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Ne morem prebrati datoteke"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Poskušali ste naložiti datoteko z nepodprtim stiskanjem (%s). Bodisi podpora "
+"za njega ni vključena ali pa je onemogočena z vašo konfiguracijo."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Za uvoz ni bilo prejetih podatkov. Ali ime datoteke ni bilo določeno ali pa "
+"je velikost datoteke presegala največjo velikost, dovoljeno v konfiguraciji "
+"PHP. Glej [a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"Ne morem naložiti vtičnikov za uvoz, prosimo, preverite vašo namestitev!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Zaznamek je odstranjen."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Prikazovanje zaznamka"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Zaznamek %s je ustvarjen"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Uvažanje je uspešno zaključeno, izvedenih je bilo %d poizvedb."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Časovna omejitev skripta je potekla; če želite končati uvoz, prosimo, "
+"ponovno pošljite isto datoteko in uvoz se bo nadaljeval."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin je prijaznejši z brskalnikom, ki <b>podpira okvirje</b>."
@@ -832,7 +919,8 @@ msgstr "Kliknite za označitev"
 msgid "Click to unselect"
 msgstr "Kliknite za odznačitev"
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "Poizvedbe \"DROP DATABASE\" so izključene."
 
@@ -874,10 +962,12 @@ msgid "The user name is empty!"
 msgstr "Uporabniško ime je prazno!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Geslo je prazno!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Gesli se ne ujemata!"
 
@@ -1251,7 +1341,8 @@ msgstr "Geslo:"
 msgid "Server Choice"
 msgstr "Izbira strežnika"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Če želite še dalje uporabljati program, morate omogočiti piškotke."
 
@@ -1274,6 +1365,10 @@ msgstr "Brez aktivnosti v zadnjih %s sekundah; prosimo, prijavite se znova"
 msgid "Cannot log in to the MySQL server"
 msgstr "Ne morem se prijaviti v strežnik MySQL"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Napačno uporabniško ime/geslo. Dostop zavrnjen."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1402,11 +1497,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentacija"
 
@@ -1470,7 +1566,7 @@ msgid "Skip Validate SQL"
 msgstr "Preskoči preverjanje pravilnosti SQL stavka"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Preveri pravilnost stavka SQL"
 
@@ -1523,7 +1619,8 @@ msgstr "Na funkcionalnost %s vpliva znan hrošč, glej %s"
 msgid "Font size"
 msgstr "Velikost pisave"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1688,6 +1785,7 @@ msgid "Create"
 msgstr "Ustvari"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Brez privilegijev"
 
@@ -1704,6 +1802,11 @@ msgstr "Ustvari novo tabelo v podatkovni zbirki %s"
 msgid "Number of fields"
 msgstr "Število polj"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"Ne morem naložiti vtičnikov za izvoz, prosimo, preverite vašo namestitev!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1732,6 +1835,29 @@ msgstr "Prepiši obstoječo(e) datoteko(e)"
 msgid "File name template"
 msgstr "Predloga datoteke"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "ime strežnika"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "ime podatkovne zbirke"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "ime tabele"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Vrednost je prevedena z uporabo %1$sstrftime%2$s, tako da lahko uporabljate "
+"nize za zapis časa. Dodatno bo prišlo še do naslednjih pretvorb: %3$s. "
+"Ostalo besedilo bo ostalo takšno, kot je."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "shrani predlogo"
@@ -1802,6 +1928,15 @@ msgstr "Datoteka za uvoz"
 msgid "Location of the text file"
 msgstr "Mesto datoteke z besedilom"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Nalaganje datotek na tem strežniku ni dovoljeno."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Imenik, ki ste ga določili za nalaganje, je nedosegljiv"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1950,6 +2085,20 @@ msgstr "Prekini proces"
 msgid "in query"
 msgstr "v poizvedbi"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Prikazujem vrstice"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "skupaj"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Poizvedba je potrebovala %01.4f s"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2399,11 +2548,6 @@ msgstr "Pisanje datoteke na disk je spodletelo."
 msgid "File upload stopped by extension."
 msgstr "Nalaganje datoteke je ustavila razširitev."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Ne morem prebrati datoteke"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
@@ -2412,17 +2556,6 @@ msgstr ""
 "Napaka pri premikanju naložene datoteke, glej [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Poskušali ste naložiti datoteko z nepodprtim stiskanjem (%s). Bodisi podpora "
-"za njega ni vključena ali pa je onemogočena z vašo konfiguracijo."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2448,7 +2581,7 @@ msgstr "Ustvaril"
 msgid "Rows"
 msgstr "Vrstice"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL je vrnil kot rezultat prazno množico (npr. nič vrstic)."
@@ -2495,6 +2628,11 @@ msgstr "struktura"
 msgid "Go to view"
 msgstr "Pojdi na pogled"
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Ni definiranega indeksa!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2531,6 +2669,15 @@ msgstr "Primarni ključ je zavržen"
 msgid "Index %s has been dropped"
 msgstr "Indeks %s je zavržen"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"Kaže, da sta indeksa %1$s in %2$s enaka, zato se enega od njiju morda lahko "
+"odstrani."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2666,7 +2813,7 @@ msgstr "Dodaj indeksu &nbsp;%s&nbsp;stolpec(ce)"
 msgid "Add a new User"
 msgstr "Dodaj novega uporabnika"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Dodali ste novega uporabnika."
 
@@ -2855,10 +3002,6 @@ msgstr "Naloži v shrambo BLOB"
 msgid "Let every user access this bookmark"
 msgstr "Dovoli dostop do zaznamka vsem uporabnikom"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Zaznamek je odstranjen."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Oznaka"
@@ -2901,17 +3044,7 @@ msgstr "\"bzipano\""
 msgid "Calendar"
 msgstr "Koledar"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"Ne morem naložiti vtičnikov za izvoz, prosimo, preverite vašo namestitev!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"Ne morem naložiti vtičnikov za uvoz, prosimo, preverite vašo namestitev!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Indeksa ni mogoče preimenovati v PRIMARY!"
 
@@ -3033,11 +3166,6 @@ msgstr "Prosimo, konfigurirajte koordinate za tabelo %s"
 msgid "Connections"
 msgstr "Povezave"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Zbirka podatkov %s je kopirana v %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Kopiraj tabelo v (podatkovna_zbirka<b>.</b>tabela):"
@@ -3059,7 +3187,7 @@ msgstr "Ne morem se povezati z virom"
 msgid "Could not connect to the target"
 msgstr "Ne morem se povezati s ciljem"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3156,26 +3284,17 @@ msgstr "Češkoslovaško"
 msgid "Danish"
 msgstr "Dansko"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Ime podatkovne zbirke je prazno!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Možnosti za izvoz zbirke podatkov"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Podatkovna zbirka %1$s je ustvarjena."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr "Podatkovna zbirka '%s' ne obstaja."
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s podatkovne zbirke so uspešno zavržene."
@@ -3199,7 +3318,7 @@ msgstr "Onemogoči statistiko"
 msgid "Enable Statistics"
 msgstr "Omogoči statistiko"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3246,7 +3365,7 @@ msgstr "Defragmentiraj tabelo"
 msgid "Use delayed inserts"
 msgstr "Uporabi zakasnjeno vstavljanje"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Ni izbranih uporabnikov za brisanje!"
 
@@ -3458,34 +3577,11 @@ msgstr ""
 "Datoteka %s že obstaja na strežniku, spremenite ime novi ali prepišite "
 "obstoječo datoteko."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "ime podatkovne zbirke"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "ime strežnika"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "ime tabele"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Vrednost je prevedena z uporabo %1$sstrftime%2$s, tako da lahko uporabljate "
-"nize za zapis časa. Dodatno bo prišlo še do naslednjih pretvorb: %3$s. "
-"Ostalo besedilo bo ostalo takšno, kot je."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Datoteke"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3510,7 +3606,7 @@ msgstr "Počisti tabelo (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Izplakni (zapri) vse tabele"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3695,15 +3791,6 @@ msgstr "Excelov delovni zvezek 97-2003 XLS"
 msgid "Excel 2007 XLSX Workbook"
 msgstr "Excelov delovni zvezek 2007 XLSX"
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"Kaže, da sta indeksa %1$s in %2$s enaka, zato se enega od njiju morda lahko "
-"odstrani."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3740,7 +3827,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Vstavi kot novo vrstico"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Id vstavljene vrstice: %1$d"
@@ -4066,20 +4153,10 @@ msgstr "Pokaži procese"
 msgid "No databases"
 msgstr "Brez zbirk podatkov"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Ni izbranih zbirk podatkov."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Za uvoz ni bilo prejetih podatkov. Ali ime datoteke ni bilo določeno ali pa "
-"je velikost datoteke presegala največjo velikost, dovoljeno v konfiguraciji "
-"PHP. Glej [a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "brez opisa"
@@ -4094,15 +4171,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "V arhivu ZIP ni bilo najdenih datotek!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Ni definiranega indeksa!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Ni definiranega dela indeksa!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Brez sprememb"
 
@@ -4120,7 +4193,7 @@ msgstr "Za to obliko ni možnosti"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Spletni strežnik nima dovoljenja za shranjevanje datoteke %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Nimate dovolj pravic, da bi bili sedaj tukaj!"
 
@@ -4157,7 +4230,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "Tabele <b>%s</b> ni mogoče najti ali pa ni v %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Ni mogoče najti uporabnika(-ov)."
 
@@ -4204,7 +4278,7 @@ msgstr "Vzdrževanje particij"
 msgid "Partition %s"
 msgstr "Particija %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Geslo za %s je uspešno spremenjeno."
@@ -4308,11 +4382,11 @@ msgstr "Poljsko"
 msgid "Port"
 msgstr "Vrata"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Ime primarnega ključa mora biti \"PRIMARY\"!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(\"PRIMARY\" <b>mora</b> biti ime <b>samo</b> primarnega ključa!)"
@@ -4516,7 +4590,7 @@ msgstr "Omogoča spreminjanje podatkov."
 msgid "No privileges."
 msgstr "Brez privilegijev."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Uspešno sem osvežil privilegije."
 
@@ -4559,11 +4633,6 @@ msgstr ""
 "<b>Statistika poizvedbe</b>: Od zagona je bilo strežniku poslanih %s "
 "poizvedb."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Poizvedba je potrebovala %01.4f s"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Vrsta poizvedbe"
@@ -4592,15 +4661,6 @@ msgstr "Preveri referenčno integriteto:"
 msgid "Relational schema"
 msgstr "Relacijska shema"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Dodatne funkcije za delo s povezanimi tabelami so bile izkjučene. Če želite "
-"izvedeti zakaj, kliknite %stukaj%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relacije"
@@ -4639,11 +4699,6 @@ msgstr "Odstrani particioniranje"
 msgid "Remove selected users"
 msgstr "Izbriši izbrane uporabnike"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Zbirka podatkov %s je preimenovana v %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4749,7 +4804,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4885,7 +4940,7 @@ msgstr "Ponovno začni vstavljanje z %s vrsticami"
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Odvzemi uporabnikom aktivne privilegije in jih potem izbriši."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Odvzeli ste privilegije za %s"
@@ -5052,19 +5107,11 @@ msgstr "Pokaži celotne poizvedbe"
 msgid "Show/Hide left menu"
 msgstr "Pokaži/Skrij levi meni"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Prikazovanje zaznamka"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Prikazovanje kot koda PHP"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Prikazujem vrstice"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Prikazovanje poizvedbe SQL"
 
@@ -5843,7 +5890,7 @@ msgstr "Tabela %s že obstaja!"
 msgid "Alter column(s)"
 msgstr "Spremeni stolpec(-ce)"
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Tabela %1$s je bila uspešno spremenjena"
@@ -5862,7 +5909,7 @@ msgstr "Ali želite izbrisati vse prejšnje vrstice iz ciljnih tabel?"
 msgid "The table name is empty!"
 msgstr "Ime tabele je prazno!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "Tabela %1$s je ustvarjena."
@@ -5984,7 +6031,7 @@ msgstr "Ta strežnik"
 msgid "Threads"
 msgstr "Niti"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Nit %s je bila prekinjena."
@@ -5998,14 +6045,6 @@ msgstr ""
 "navadi pomeni, da phpMyAdmin ne bo mogel dokončati tega uvoza, razen če "
 "povečate vaše časovne omejitve PHP."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Časovna omejitev skripta je potekla; če želite končati uvoz, prosimo, "
-"ponovno pošljite isto datoteko in uvoz se bo nadaljeval."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6022,10 +6061,6 @@ msgstr "Preklopi majhno/veliko"
 msgid "To select relation, click :"
 msgstr "Za izbiro relacije, kliknite:"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "skupaj"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6328,7 +6363,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "neznano"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Posodobili ste privilegije za %s."
@@ -6347,19 +6382,6 @@ msgstr "Navodila za posodobitev tabele column_comments najdete v dokumentaciji"
 msgid "You should upgrade to %s %s or later."
 msgstr "%s bi morali nadgraditi v verzijo %s ali novejšo."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Najverjetneje ste poskušali naložiti preveliko datoteko. Prosimo, oglejte si "
-"%sdokumentacijo%s za načine, kako obiti to omejitev."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Nalaganje datotek na tem strežniku ni dovoljeno."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Uporaba"
@@ -6373,7 +6395,7 @@ msgstr "Obdaj imena tabel in polj z enojnimi poševnimi narekovaji"
 msgid "Use Host Table"
 msgstr "Uporabi tabelo gostiteljev"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Uporabnik %s že obstaja!"
@@ -6386,7 +6408,7 @@ msgstr "Uporabnik %s že obstaja!"
 msgid "User name"
 msgstr "Uporabniško ime"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Izbranega uporabnika v tabelah privilegijev nisem našel."
 
@@ -6394,7 +6416,7 @@ msgstr "Izbranega uporabnika v tabelah privilegijev nisem našel."
 msgid "User overview"
 msgstr "Pregled uporabnikov"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Uspešno sem izbrisal izbrane uporabnike."
 
@@ -6457,10 +6479,6 @@ msgstr "Preglej povzetek stanja tabele"
 msgid "VIEW name"
 msgstr "Ime VIEW"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Imenik, ki ste ga določili za nalaganje, je nedosegljiv"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Spletni strežnik"
@@ -6478,10 +6496,6 @@ msgstr "wiki"
 msgid "wildcard"
 msgstr "nadomestni znak"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Napačno uporabniško ime/geslo. Dostop zavrnjen."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/sq.po b/po/sq.po
index f4307a47b..7eaa5d470 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-30 23:08+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: albanian <sq@li.org>\n"
@@ -91,6 +91,11 @@ msgstr "Përshkrimi"
 msgid "Use this value"
 msgstr "Përdor këtë vlerë"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "Databaza %s u eleminua."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Komenti për Databazën: "
@@ -207,6 +212,20 @@ msgstr "Zgjidh gjithçka"
 msgid "Unselect All"
 msgstr "Ç'zgjidh gjithçka"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Emri i databazës mungon!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Databazës %s i është ndryshuar emri në %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, fuzzy, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Databazës %s i është ndryshuar emri në %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Ndysho emrin e databazës në"
@@ -320,6 +339,15 @@ msgstr "Aktiv"
 msgid "Collation"
 msgstr "Collation"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Karakteristikat shtesë janë ç'aktivuar për sa i takon funksionimit me "
+"tabelat e lidhura. Për të zbuluar përse, klikoni %skëtu%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Shfaq skemën e PDF"
@@ -647,7 +675,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -821,16 +850,64 @@ msgstr "Kontrollo tabelën"
 msgid "Database Log"
 msgstr "Databazat"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "File nuk mund të lexohet"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Libërshënuesi u fshi."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin funksionon më mirë me shfletues që suportojnë frames"
@@ -847,7 +924,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "Komandat \"DROP DATABASE\" nuk janë aktive."
 
@@ -887,10 +965,12 @@ msgid "The user name is empty!"
 msgstr "Emri i përdoruesit është bosh!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Fjalëkalimi është bosh!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Fjalëkalimi nuk korrispondon!"
 
@@ -1313,7 +1393,8 @@ msgstr "Fjalëkalimi:"
 msgid "Server Choice"
 msgstr "Zgjedhja e serverit"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Nga kjo pikë e tutje, cookies duhet të jenë të aktivuara."
 
@@ -1335,6 +1416,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "E pamundur kryerja e login tek server-i MySQL"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Emër përdoruesi apo fjalëkalim i gabuar. Ndalohet hyrja."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1461,11 +1546,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentet"
 
@@ -1529,7 +1615,7 @@ msgid "Skip Validate SQL"
 msgstr "Mos vleftëso SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Vleftëso SQL"
 
@@ -1582,7 +1668,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1744,6 +1831,7 @@ msgid "Create"
 msgstr "Krijo"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Asnjë e drejtë"
 
@@ -1760,6 +1848,10 @@ msgstr "Krijo një tabelë të re tek databaza %s"
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1788,6 +1880,27 @@ msgstr "Mbishkruaj file(s) ekzistues"
 msgid "File name template"
 msgstr "Emri i file template"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+#, fuzzy
+msgid "server name"
+msgstr "Emri i përdoruesit"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr ""
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "kujto template"
@@ -1859,6 +1972,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr "Pozicioni i file"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Directory që keni zgjedhur për upload nuk arrin të gjehet"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2004,6 +2126,20 @@ msgstr "Hiq"
 msgid "in query"
 msgstr "tek query"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Shfaqja e regjistrimeve "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "Gjithsej"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Query ka zgjatur %01.4f sec"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2447,26 +2583,12 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "File nuk mund të lexohet"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2493,7 +2615,7 @@ msgstr "Gjeneruar nga"
 msgid "Rows"
 msgstr "rreshta"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL ka kthyer një të përbashkët boshe (p.sh. zero rreshta)."
@@ -2539,6 +2661,11 @@ msgstr "Struktura"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Asnjë tregues i përcaktuar!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2576,6 +2703,13 @@ msgstr "Kyçi primar u eleminua"
 msgid "Index %s has been dropped"
 msgstr "Treguesi %s u eleminua"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2708,7 +2842,7 @@ msgstr "Shto tek treguesi i &nbsp;%s&nbsp;kolonës(ave)"
 msgid "Add a new User"
 msgstr "Shto një përdorues të ri"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Ke shtuar një përdorues të ri."
 
@@ -2905,10 +3039,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "Lejo që çdo përdorues të ketë hyrje në këtë libërshënues"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Libërshënuesi u fshi."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Etiketë"
@@ -2952,15 +3082,7 @@ msgstr "\"kompresuar me bzip2\""
 msgid "Calendar"
 msgstr "Kalendari"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "I pamundur riemërtimi i treguesit në PRIMAR!"
 
@@ -3079,11 +3201,6 @@ msgstr "Ju lutem, konfiguroni koordinatat për tabelën %s"
 msgid "Connections"
 msgstr "Lidhje"
 
-#: libraries/messages.inc.php:186
-#, fuzzy, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Databazës %s i është ndryshuar emri në %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Kopjo tabelën tek (databaza<b>.</b>tabela):"
@@ -3105,7 +3222,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3206,26 +3323,17 @@ msgstr "Çeko-Sllovak"
 msgid "Danish"
 msgstr "Danisht"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Emri i databazës mungon!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Opcione të eksportimit të databazës"
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "Databaza %s u eleminua."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s databaza u eleminuan korrektësisht."
@@ -3250,7 +3358,7 @@ msgstr "Disaktivo Statistikat"
 msgid "Enable Statistics"
 msgstr "Aktivo Statistikat"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3298,7 +3406,7 @@ msgstr "Defragmento tabelën"
 msgid "Use delayed inserts"
 msgstr "Përdor shtimet me vonesë"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3511,33 +3619,12 @@ msgstr ""
 "File %s ekziston në server: të lutem, ndrysho emrin e file ose zgjidh "
 "opcionin \"Mbishkruaj\"."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr ""
-
-#: libraries/messages.inc.php:335
-#, fuzzy
-msgid "server name"
-msgstr "Emri i përdoruesit"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "Fusha"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3562,7 +3649,7 @@ msgstr "Rifillo (\"FLUSH\") tabelën"
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3746,13 +3833,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3789,7 +3869,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Shto një rresht të ri"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4107,17 +4187,10 @@ msgstr "Shfaq proceset në ekzekutim"
 msgid "No databases"
 msgstr "Asnjë databazë"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Nuk është zgjedhur asnjë databazë."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "asnjë përshkrim"
@@ -4131,15 +4204,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Asnjë tregues i përcaktuar!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Asnjë pjesë e treguesit është përcaktuar!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Asnjë ndryshim"
 
@@ -4158,7 +4227,7 @@ msgstr "Ky format nuk ka opcione"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Serveri web nuk ka të drejtat e duhura për të ruajtur file %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Nuk ke të drejta të mjaftueshme për të kryer këtë operacion!"
 
@@ -4193,7 +4262,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> tabela nuk u gjet ose nuk është përcaktuar tek %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Nuk u gjet asnjë përdorues."
 
@@ -4241,7 +4311,7 @@ msgstr "Administrimi i tabelës"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Fjalëkalimi për përdoruesin %s u ndryshua me sukses."
@@ -4345,11 +4415,11 @@ msgstr "Polonisht"
 msgid "Port"
 msgstr "rreshtimi"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Emri i kyçit primar duhet të jetë... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4563,7 +4633,7 @@ msgstr "Lejon ndryshimin e të dhënave."
 msgid "No privileges."
 msgstr "Asnjë të drejtë."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Të drejtat u përditësuan me sukses."
 
@@ -4607,11 +4677,6 @@ msgstr ""
 "<b>Statistikat e Query</b>: Që nga nisja e tij, serverit i janë dërguar %s "
 "queries."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Query ka zgjatur %01.4f sec"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Lloji i query"
@@ -4640,15 +4705,6 @@ msgstr "Kontrollo integritetin e informacioneve:"
 msgid "Relational schema"
 msgstr "Skema relacionale"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Karakteristikat shtesë janë ç'aktivuar për sa i takon funksionimit me "
-"tabelat e lidhura. Për të zbuluar përse, klikoni %skëtu%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relacione"
@@ -4687,11 +4743,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "Heq përdoruesit e zgjedhur"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Databazës %s i është ndryshuar emri në %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4798,7 +4849,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4934,7 +4985,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Hiqja të gjitha të drejtat aktive përdoruesve dhe pastaj eleminoi."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Ke anulluar të drejtat për %s"
@@ -5096,19 +5147,11 @@ msgstr "Shfaq të gjitha kërkesat"
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Shfaqja e regjistrimeve "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5875,7 +5918,7 @@ msgstr "Përdoruesi %s ekziston!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, fuzzy, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Përdoruesit e zgjedhur u hoqën me sukses."
@@ -5894,7 +5937,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Emri i tabelës është bosh!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "Tabela %s u eleminua"
@@ -6015,7 +6058,7 @@ msgstr "Këtë Host"
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Thread %s u përfundua me sukses."
@@ -6026,12 +6069,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6048,10 +6085,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "Gjithsej"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6354,7 +6387,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "e panjohur"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Ke rifreskuar lejet për %s."
@@ -6374,17 +6407,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Duhet të instaloni %s %s ose superior."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Përdorimi"
@@ -6398,7 +6420,7 @@ msgstr "Përdor backquotes me emrat e tabelave dhe fushave"
 msgid "Use Host Table"
 msgstr "Përdor Tabelën e Host-it"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Përdoruesi %s ekziston!"
@@ -6411,7 +6433,7 @@ msgstr "Përdoruesi %s ekziston!"
 msgid "User name"
 msgstr "Emri i përdoruesit"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Përdoruesi i zgjedhur nuk u gjet tek tabela e të drejtave."
 
@@ -6419,7 +6441,7 @@ msgstr "Përdoruesi i zgjedhur nuk u gjet tek tabela e të drejtave."
 msgid "User overview"
 msgstr "Paraqitja e përgjithshme e përdoruesve"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Përdoruesit e zgjedhur u hoqën me sukses."
 
@@ -6480,10 +6502,6 @@ msgstr "Shfaq dump (skema) e tabelës"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Directory që keni zgjedhur për upload nuk arrin të gjehet"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6501,10 +6519,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "wildcard"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Emër përdoruesi apo fjalëkalim i gabuar. Ndalohet hyrja."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/sr.po b/po/sr.po
index 922573bf8..4eccec8b0 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-30 23:47+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: serbian_cyrillic <sr@li.org>\n"
@@ -92,6 +92,11 @@ msgstr "Опис"
 msgid "Use this value"
 msgstr "Користи ову вредност"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "База %s је одбачена."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Коментар базе:"
@@ -208,6 +213,20 @@ msgstr "Изабери све"
 msgid "Unselect All"
 msgstr "ништа"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Име базе није задато!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "База %s је преименована у %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "База %s је прекопирана у %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Преименуј базу у"
@@ -319,6 +338,15 @@ msgstr "Омогућено"
 msgid "Collation"
 msgstr "Сортирање"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Додатне могућности за рад са повезаним табелама су искључене. Да бисте "
+"сазнали зашто, кликните %sовде%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Прикажи PDF схему"
@@ -646,7 +674,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -822,16 +851,73 @@ msgstr "Провери табелу"
 msgid "Database Log"
 msgstr "База података"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Вероватно сте покушали да увезете превелику датотеку. Молимо погледајте %"
+"sдокументацију%s за начине превазилажења овог ограничења."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Датотеку није могуће прочитати"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Покушали сте да увезете датотеку са компресијом која није подржана (%s). Или "
+"подршка за њу није имплементирана, или је искључена у вашој конфигурацији."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Нису примљени никави подаци за увоз. Или није био наведен назив датотеке, "
+"или величина датотеке превазилази максималну величину дозвољену у вашој "
+"конфигурацији PHP-а. Погледајте. See FAQ 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "Не могу да учитам додатке за увоз, молим проверите своју инсталацију!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Обележивач је управо обрисан."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Приказивање маркера"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Направљен маркер %s"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Увоз је успешно завршен, извршено је %d упита."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Време извршења скрипта је истекло, ако желите да довршите увоз, молимо "
+"пошаљите исту датотеку и увоз ће се наставити."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin преферира читаче који подржавају оквире."
@@ -848,7 +934,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" команда је онемогућена."
 
@@ -888,10 +975,12 @@ msgid "The user name is empty!"
 msgstr "Име корисника није унето!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Лозинка је празна!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Лозинке нису идентичне!"
 
@@ -1313,7 +1402,8 @@ msgstr "Лозинка:"
 msgid "Server Choice"
 msgstr "Избор сервера"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Колачићи (Cookies) морају у овом случају бити активни."
 
@@ -1335,6 +1425,10 @@ msgstr "Није било активности %s или више секунди
 msgid "Cannot log in to the MySQL server"
 msgstr "Не могу да се пријавим на MySQL сервер"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Погрешно корисничко име/лозинка. Приступ одбијен."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1463,11 +1557,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Документација"
 
@@ -1531,7 +1626,7 @@ msgid "Skip Validate SQL"
 msgstr "Прескочи проверу SQL-a"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Провери SQL"
 
@@ -1586,7 +1681,8 @@ msgstr "Ова функционалност %s је погођена позна
 msgid "Font size"
 msgstr "Величина фонта"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1751,6 +1847,7 @@ msgid "Create"
 msgstr "Направи"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Нема привилегија"
 
@@ -1767,6 +1864,11 @@ msgstr "Направи нову табелу у бази %s"
 msgid "Number of fields"
 msgstr "Број поља"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"Није могуће учитати додатке за извоз, молимо проверите своју инсталацију!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1795,6 +1897,29 @@ msgstr "Препиши постојеће датотеке"
 msgid "File name template"
 msgstr "Шаблон имена датотеке"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "назив сервера"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "назив базе"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "назив табеле"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Ова вредност се тумачи коришћењем %1$sstrftime%2$s, тако да можете да "
+"користите стрингове за форматирање времена. Такође ће се десити и следеће "
+"трансформације: %3$s. Преостали текст ће остати како јесте."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "запамти шаблон"
@@ -1866,6 +1991,15 @@ msgstr "Датотека за увоз"
 msgid "Location of the text file"
 msgstr "Локација текстуалне датотеке"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Слање датотека на овај сервер није дозвољено."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Директоријум који сте изабрали за слање није доступан"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2015,6 +2149,20 @@ msgstr "Обустави"
 msgid "in query"
 msgstr "у упиту"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Приказ записа"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "укупно"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Упит је трајао %01.4f секунди"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2477,28 +2625,12 @@ msgstr "Неуспело уписивање датотеке на диск."
 msgid "File upload stopped by extension."
 msgstr "Пријем датотеке заустављен због екстензије."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Датотеку није могуће прочитати"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Грешка у премештању примљене датотеке, погледајте FAQ 1.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Покушали сте да увезете датотеку са компресијом која није подржана (%s). Или "
-"подршка за њу није имплементирана, или је искључена у вашој конфигурацији."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2525,7 +2657,7 @@ msgstr "Генерисао"
 msgid "Rows"
 msgstr "Редова"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL је вратио празан резултат (нула редова)."
@@ -2572,6 +2704,11 @@ msgstr "Структура"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Кључ није дефинисан!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2609,6 +2746,13 @@ msgstr "Примарни кључ је обрисан"
 msgid "Index %s has been dropped"
 msgstr "Кључ %s је обрисан"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2741,7 +2885,7 @@ msgstr "Додај у кључ &nbsp;%s&nbsp;колона(е)"
 msgid "Add a new User"
 msgstr "Додај новог корисника"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Додали сте новог корисника."
 
@@ -2934,10 +3078,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "Дозволи сваком кориснику да приступа овом упамћеном упиту"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Обележивач је управо обрисан."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Назив"
@@ -2980,16 +3120,7 @@ msgstr "\"бзип-овано\""
 msgid "Calendar"
 msgstr "Календар"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"Није могуће учитати додатке за извоз, молимо проверите своју инсталацију!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "Не могу да учитам додатке за увоз, молим проверите своју инсталацију!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Не могу да променим кључ у PRIMARY (примарни) !"
 
@@ -3108,11 +3239,6 @@ msgstr "Подесите координате за табелу %s"
 msgid "Connections"
 msgstr "Конекције"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "База %s је прекопирана у %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Копирај табелу у (база<b>.</b>табела):"
@@ -3134,7 +3260,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3232,26 +3358,17 @@ msgstr "Чешко-словачки"
 msgid "Danish"
 msgstr "Дански"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Име базе није задато!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Опције за извоз базе"
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "База %s је одбачена."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s база је успешно одбачено."
@@ -3276,7 +3393,7 @@ msgstr "Искључи статистике"
 msgid "Enable Statistics"
 msgstr "Укључи статистике"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3325,7 +3442,7 @@ msgstr "Дефрагментирај табелу"
 msgid "Use delayed inserts"
 msgstr "Користи одложена уметања"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Ниједан корисник није одабран за брисање!"
 
@@ -3540,34 +3657,11 @@ msgstr ""
 "Датотека %s већ постоји на серверу, промените име датотеке или укључите "
 "опцију преписивања."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "назив базе"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "назив сервера"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "назив табеле"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Ова вредност се тумачи коришћењем %1$sstrftime%2$s, тако да можете да "
-"користите стрингове за форматирање времена. Такође ће се десити и следеће "
-"трансформације: %3$s. Преостали текст ће остати како јесте."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Датотеке"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3592,7 +3686,7 @@ msgstr "Освежи табелу (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Очисти (затвори) све табеле"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3776,13 +3870,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3819,7 +3906,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Унеси као нови ред"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4142,20 +4229,10 @@ msgstr "Прикажи листу процеса"
 msgid "No databases"
 msgstr "База не постоји"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Није изабрана ни једна база."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Нису примљени никави подаци за увоз. Или није био наведен назив датотеке, "
-"или величина датотеке превазилази максималну величину дозвољену у вашој "
-"конфигурацији PHP-а. Погледајте. See FAQ 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "нема описа"
@@ -4169,15 +4246,11 @@ msgstr "Нема детаљнијих информација о статусу 
 msgid "No files found inside ZIP archive!"
 msgstr "У ZIP архиви нема датотека!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Кључ није дефинисан!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Делови кључа нису дефинисани!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Нема измена"
 
@@ -4196,7 +4269,7 @@ msgstr "Не постоје опције за овај формат"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Веб серверу није дозвољено да сачува датотеку %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Није Вам дозвољено да будете овде!"
 
@@ -4233,7 +4306,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> табела није пронађена или није постављена у %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Корисник није нађен."
 
@@ -4281,7 +4355,7 @@ msgstr "Радње на табели"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Лозинка за %s је успешно промењена."
@@ -4384,11 +4458,11 @@ msgstr "Пољски"
 msgid "Port"
 msgstr "Сортирање"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Име примарног кључа мора да буде... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(\"PRIMARY\" <b>мора</b> бити име <b>само</b> примарног кључа!)"
@@ -4590,7 +4664,7 @@ msgstr "Дозвољава измену података."
 msgid "No privileges."
 msgstr "Нема привилегија."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Привилегије су успешно поново учитане."
 
@@ -4632,11 +4706,6 @@ msgid ""
 msgstr ""
 "<b>Статистике упита</b>: %s упита је постављено серверу од његовог покретања."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Упит је трајао %01.4f секунди"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Врста упита"
@@ -4665,15 +4734,6 @@ msgstr "Провери референцијални интегритет:"
 msgid "Relational schema"
 msgstr "Релациона схема"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Додатне могућности за рад са повезаним табелама су искључене. Да бисте "
-"сазнали зашто, кликните %sовде%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Релације"
@@ -4712,11 +4772,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "Уклони изабране кориснике"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "База %s је преименована у %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4823,7 +4878,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4963,7 +5018,7 @@ msgstr "Поново покрени уношење са %s редова"
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Обустави све активне привилегије корисника и затим их обриши."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Забранили сте привилегије за %s"
@@ -5124,19 +5179,11 @@ msgstr "Прикажи комплетне упите"
 msgid "Show/Hide left menu"
 msgstr "Прикажи/сакриј мени с леве стране"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Приказивање маркера"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Приказ као PHP код"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Приказ записа"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Приказ као SQL упит"
 
@@ -6009,7 +6056,7 @@ msgstr "Табела %s већ постоји!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, fuzzy, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Изабрани корисници су успешно обрисани."
@@ -6028,7 +6075,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Има табеле је празно!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "Табела %s је одбачена"
@@ -6149,7 +6196,7 @@ msgstr "Овај сервер"
 msgid "Threads"
 msgstr "Нити"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Процес %s је успешно прекинут."
@@ -6163,14 +6210,6 @@ msgstr ""
 "да phpMyAdmin неће бити у могућности да заврши овај увоз осим ако не "
 "повећате временска ограничења у PHP-у"
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Време извршења скрипта је истекло, ако желите да довршите увоз, молимо "
-"пошаљите исту датотеку и увоз ће се наставити."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "од/до странице"
@@ -6187,10 +6226,6 @@ msgstr "Промени мало/велико"
 msgid "To select relation, click :"
 msgstr "Да одаберете релацију, кликните :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "укупно"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6499,7 +6534,7 @@ msgstr "Уникод"
 msgid "unknown"
 msgstr "непознат"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Ажурирали сте привилегије за %s."
@@ -6519,19 +6554,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Требало би да унапредите ваш %s сервер на верзију %s или новију."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Вероватно сте покушали да увезете превелику датотеку. Молимо погледајте %"
-"sдокументацију%s за начине превазилажења овог ограничења."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Слање датотека на овај сервер није дозвољено."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Заузеће"
@@ -6545,7 +6567,7 @@ msgstr "Користи ' за ограничавање имена поља"
 msgid "Use Host Table"
 msgstr "Користи табелу домаћина"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Корисник %s већ постоји!"
@@ -6558,7 +6580,7 @@ msgstr "Корисник %s већ постоји!"
 msgid "User name"
 msgstr "Име корисника"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Изабрани корисник није пронађен у табели привилегија."
 
@@ -6566,7 +6588,7 @@ msgstr "Изабрани корисник није пронађен у табе
 msgid "User overview"
 msgstr "Преглед корисника"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Изабрани корисници су успешно обрисани."
 
@@ -6629,10 +6651,6 @@ msgstr "Прикажи садржај (схему) табеле"
 msgid "VIEW name"
 msgstr "назив за VIEW"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Директоријум који сте изабрали за слање није доступан"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6650,10 +6668,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "џокер"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Погрешно корисничко име/лозинка. Приступ одбијен."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/sr@latin.po b/po/sr@latin.po
index e116c36c8..2c6285b1c 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-30 23:47+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: serbian_latin <sr@latin@li.org>\n"
@@ -92,6 +92,11 @@ msgstr "Opis"
 msgid "Use this value"
 msgstr "Koristi ovu vrednost"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "Baza %s je odbačena."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Komentar baze:"
@@ -208,6 +213,20 @@ msgstr "Izaberi sve"
 msgid "Unselect All"
 msgstr "ništa"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Ime baze nije zadato!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Baza %s je preimenovana u %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Baza %s je prekopirana u %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Preimenuj bazu u"
@@ -319,6 +338,15 @@ msgstr "Omogućeno"
 msgid "Collation"
 msgstr "Sortiranje"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Dodatne mogućnosti za rad sa povezanim tabelama su isključene. Da biste "
+"saznali zašto, kliknite %sovde%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Prikaži PDF shemu"
@@ -646,7 +674,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -822,16 +851,73 @@ msgstr "Proveri tabelu"
 msgid "Database Log"
 msgstr "Baza podataka"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Verovatno ste pokušali da uvezete preveliku datoteku. Molimo pogledajte %"
+"sdokumentaciju%s za načine prevazilaženja ovog ograničenja."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Datoteku nije moguće pročitati"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Pokušali ste da uvezete datoteku sa kompresijom koja nije podržana (%s). Ili "
+"podrška za nju nije implementirana, ili je isključena u vašoj konfiguraciji."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Nisu primljeni nikavi podaci za uvoz. Ili nije bio naveden naziv datoteke, "
+"ili veličina datoteke prevazilazi maksimalnu veličinu dozvoljenu u vašoj "
+"konfiguraciji PHP-a. Pogledajte. See FAQ 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "Ne mogu da učitam dodatke za uvoz, molim proverite svoju instalaciju!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Obeleživač je upravo obrisan."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Prikazivanje markera"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Napravljen marker %s"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Uvoz je uspešno završen, izvršeno je %d upita."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Vreme izvršenja skripta je isteklo, ako želite da dovršite uvoz, molimo "
+"pošaljite istu datoteku i uvoz će se nastaviti."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin preferira čitače koji podržavaju okvire."
@@ -848,7 +934,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" komanda je onemogućena."
 
@@ -888,10 +975,12 @@ msgid "The user name is empty!"
 msgstr "Ime korisnika nije uneto!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Lozinka je prazna!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Lozinke nisu identične!"
 
@@ -1313,7 +1402,8 @@ msgstr "Lozinka:"
 msgid "Server Choice"
 msgstr "Izbor servera"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Kolačići (Cookies) moraju u ovom slučaju biti aktivni."
 
@@ -1335,6 +1425,10 @@ msgstr "Nije bilo aktivnosti %s ili više sekundi, molimo prijavite se ponovo"
 msgid "Cannot log in to the MySQL server"
 msgstr "Ne mogu da se prijavim na MySQL server"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Pogrešno korisničko ime/lozinka. Pristup odbijen."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1463,11 +1557,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentacija"
 
@@ -1531,7 +1626,7 @@ msgid "Skip Validate SQL"
 msgstr "Preskoči proveru SQL-a"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Proveri SQL"
 
@@ -1586,7 +1681,8 @@ msgstr "Ova funkcionalnost %s je pogođena poznatom greškom, vidite %s"
 msgid "Font size"
 msgstr "Veličina fonta"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1751,6 +1847,7 @@ msgid "Create"
 msgstr "Napravi"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Nema privilegija"
 
@@ -1767,6 +1864,11 @@ msgstr "Napravi novu tabelu u bazi %s"
 msgid "Number of fields"
 msgstr "Broj polja"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"Nije moguće učitati dodatke za izvoz, molimo proverite svoju instalaciju!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1795,6 +1897,29 @@ msgstr "Prepiši postojeće datoteke"
 msgid "File name template"
 msgstr "Šablon imena datoteke"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "naziv servera"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "naziv baze"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "naziv tabele"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Ova vrednost se tumači korišćenjem %1$sstrftime%2$s, tako da možete da "
+"koristite stringove za formatiranje vremena. Takođe će se desiti i sledeće "
+"transformacije: %3$s. Preostali tekst će ostati kako jeste."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "zapamti šablon"
@@ -1866,6 +1991,15 @@ msgstr "Datoteka za uvoz"
 msgid "Location of the text file"
 msgstr "Lokacija tekstualne datoteke"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Slanje datoteka na ovaj server nije dozvoljeno."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Direktorijum koji ste izabrali za slanje nije dostupan"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2015,6 +2149,20 @@ msgstr "Obustavi"
 msgid "in query"
 msgstr "u upitu"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Prikaz zapisa"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "ukupno"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Upit je trajao %01.4f sekundi"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2477,28 +2625,12 @@ msgstr "Neuspelo upisivanje datoteke na disk."
 msgid "File upload stopped by extension."
 msgstr "Prijem datoteke zaustavljen zbog ekstenzije."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Datoteku nije moguće pročitati"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Greška u premeštanju primljene datoteke, pogledajte FAQ 1.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Pokušali ste da uvezete datoteku sa kompresijom koja nije podržana (%s). Ili "
-"podrška za nju nije implementirana, ili je isključena u vašoj konfiguraciji."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2525,7 +2657,7 @@ msgstr "Generisao"
 msgid "Rows"
 msgstr "Redova"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL je vratio prazan rezultat (nula redova)."
@@ -2572,6 +2704,11 @@ msgstr "Struktura"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Ključ nije definisan!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2609,6 +2746,13 @@ msgstr "Primarni ključ je obrisan"
 msgid "Index %s has been dropped"
 msgstr "Ključ %s je obrisan"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2741,7 +2885,7 @@ msgstr "Dodaj u ključ &nbsp;%s&nbsp;kolona(e)"
 msgid "Add a new User"
 msgstr "Dodaj novog korisnika"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Dodali ste novog korisnika."
 
@@ -2934,10 +3078,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "Dozvoli svakom korisniku da pristupa ovom upamćenom upitu"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Obeleživač je upravo obrisan."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Naziv"
@@ -2980,16 +3120,7 @@ msgstr "\"bzip-ovano\""
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"Nije moguće učitati dodatke za izvoz, molimo proverite svoju instalaciju!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "Ne mogu da učitam dodatke za uvoz, molim proverite svoju instalaciju!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Ne mogu da promenim ključ u PRIMARY (primarni) !"
 
@@ -3108,11 +3239,6 @@ msgstr "Podesite koordinate za tabelu %s"
 msgid "Connections"
 msgstr "Konekcije"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Baza %s je prekopirana u %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Kopiraj tabelu u (baza<b>.</b>tabela):"
@@ -3134,7 +3260,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3232,26 +3358,17 @@ msgstr "Češko-slovački"
 msgid "Danish"
 msgstr "Danski"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Ime baze nije zadato!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Opcije za izvoz baze"
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "Baza %s je odbačena."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s baza je uspešno odbačeno."
@@ -3276,7 +3393,7 @@ msgstr "Isključi statistike"
 msgid "Enable Statistics"
 msgstr "Uključi statistike"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3325,7 +3442,7 @@ msgstr "Defragmentiraj tabelu"
 msgid "Use delayed inserts"
 msgstr "Koristi odložena umetanja"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Nijedan korisnik nije odabran za brisanje!"
 
@@ -3540,34 +3657,11 @@ msgstr ""
 "Datoteka %s već postoji na serveru, promenite ime datoteke ili uključite "
 "opciju prepisivanja."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "naziv baze"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "naziv servera"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "naziv tabele"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Ova vrednost se tumači korišćenjem %1$sstrftime%2$s, tako da možete da "
-"koristite stringove za formatiranje vremena. Takođe će se desiti i sledeće "
-"transformacije: %3$s. Preostali tekst će ostati kako jeste."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Datoteke"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3592,7 +3686,7 @@ msgstr "Osveži tabelu (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Očisti (zatvori) sve tabele"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3776,13 +3870,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3819,7 +3906,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Unesi kao novi red"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4143,20 +4230,10 @@ msgstr "Prikaži listu procesa"
 msgid "No databases"
 msgstr "Baza ne postoji"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Nije izabrana ni jedna baza."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Nisu primljeni nikavi podaci za uvoz. Ili nije bio naveden naziv datoteke, "
-"ili veličina datoteke prevazilazi maksimalnu veličinu dozvoljenu u vašoj "
-"konfiguraciji PHP-a. Pogledajte. See FAQ 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "nema opisa"
@@ -4170,15 +4247,11 @@ msgstr "Nema detaljnijih informacija o statusu za ovaj pogon skladištenja."
 msgid "No files found inside ZIP archive!"
 msgstr "U ZIP arhivi nema datoteka!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Ključ nije definisan!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Delovi ključa nisu definisani!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Nema izmena"
 
@@ -4197,7 +4270,7 @@ msgstr "Ne postoje opcije za ovaj format"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Veb serveru nije dozvoljeno da sačuva datoteku %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Nije Vam dozvoljeno da budete ovde!"
 
@@ -4234,7 +4307,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> tabela nije pronađena ili nije postavljena u %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Korisnik nije nađen."
 
@@ -4282,7 +4356,7 @@ msgstr "Radnje na tabeli"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Lozinka za %s je uspešno promenjena."
@@ -4385,11 +4459,11 @@ msgstr "Poljski"
 msgid "Port"
 msgstr "Sortiranje"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Ime primarnog ključa mora da bude... PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(\"PRIMARY\" <b>mora</b> biti ime <b>samo</b> primarnog ključa!)"
@@ -4591,7 +4665,7 @@ msgstr "Dozvoljava izmenu podataka."
 msgid "No privileges."
 msgstr "Nema privilegija."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Privilegije su uspešno ponovo učitane."
 
@@ -4634,11 +4708,6 @@ msgstr ""
 "<b>Statistike upita</b>: %s upita je postavljeno serveru od njegovog "
 "pokretanja."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Upit je trajao %01.4f sekundi"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Vrsta upita"
@@ -4667,15 +4736,6 @@ msgstr "Proveri referencijalni integritet:"
 msgid "Relational schema"
 msgstr "Relaciona shema"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Dodatne mogućnosti za rad sa povezanim tabelama su isključene. Da biste "
-"saznali zašto, kliknite %sovde%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relacije"
@@ -4714,11 +4774,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "Ukloni izabrane korisnike"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Baza %s je preimenovana u %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4825,7 +4880,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4965,7 +5020,7 @@ msgstr "Ponovo pokreni unošenje sa %s redova"
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Obustavi sve aktivne privilegije korisnika i zatim ih obriši."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Zabranili ste privilegije za %s"
@@ -5126,19 +5181,11 @@ msgstr "Prikaži kompletne upite"
 msgid "Show/Hide left menu"
 msgstr "Prikaži/sakrij meni s leve strane"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Prikazivanje markera"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Prikaz kao PHP kod"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Prikaz zapisa"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Prikaz kao SQL upit"
 
@@ -6013,7 +6060,7 @@ msgstr "Tabela %s već postoji!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, fuzzy, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Izabrani korisnici su uspešno obrisani."
@@ -6032,7 +6079,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Ima tabele je prazno!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "Tabela %s je odbačena"
@@ -6153,7 +6200,7 @@ msgstr "Ovaj server"
 msgid "Threads"
 msgstr "Niti"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Proces %s je uspešno prekinut."
@@ -6167,14 +6214,6 @@ msgstr ""
 "znači da phpMyAdmin neće biti u mogućnosti da završi ovaj uvoz osim ako ne "
 "povećate vremenska ograničenja u PHP-u"
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Vreme izvršenja skripta je isteklo, ako želite da dovršite uvoz, molimo "
-"pošaljite istu datoteku i uvoz će se nastaviti."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "od/do stranice"
@@ -6191,10 +6230,6 @@ msgstr "Promeni malo/veliko"
 msgid "To select relation, click :"
 msgstr "Da odaberete relaciju, kliknite :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "ukupno"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6504,7 +6539,7 @@ msgstr "Unikod"
 msgid "unknown"
 msgstr "nepoznat"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Ažurirali ste privilegije za %s."
@@ -6524,19 +6559,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "Trebalo bi da unapredite vaš %s server na verziju %s ili noviju."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Verovatno ste pokušali da uvezete preveliku datoteku. Molimo pogledajte %"
-"sdokumentaciju%s za načine prevazilaženja ovog ograničenja."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Slanje datoteka na ovaj server nije dozvoljeno."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Zauzeće"
@@ -6550,7 +6572,7 @@ msgstr "Koristi ' za ograničavanje imena polja"
 msgid "Use Host Table"
 msgstr "Koristi tabelu domaćina"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Korisnik %s već postoji!"
@@ -6563,7 +6585,7 @@ msgstr "Korisnik %s već postoji!"
 msgid "User name"
 msgstr "Ime korisnika"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Izabrani korisnik nije pronađen u tabeli privilegija."
 
@@ -6571,7 +6593,7 @@ msgstr "Izabrani korisnik nije pronađen u tabeli privilegija."
 msgid "User overview"
 msgstr "Pregled korisnika"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Izabrani korisnici su uspešno obrisani."
 
@@ -6634,10 +6656,6 @@ msgstr "Prikaži sadržaj (shemu) tabele"
 msgid "VIEW name"
 msgstr "naziv za VIEW"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Direktorijum koji ste izabrali za slanje nije dostupan"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6655,10 +6673,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "džoker"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Pogrešno korisničko ime/lozinka. Pristup odbijen."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/sv.po b/po/sv.po
index 2ff677a79..d6bea3d66 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:19+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: swedish <sv@li.org>\n"
@@ -89,6 +89,11 @@ msgstr "Beskrivning"
 msgid "Use this value"
 msgstr "Använd detta värde"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Databas %1$s har skapats."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Databaskommentar: "
@@ -205,6 +210,20 @@ msgstr "Markera alla"
 msgid "Unselect All"
 msgstr "Avmarkera alla"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Databasens namn är tomt!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "Databas %s har döpts om till %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Databas %s har kopierats till %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Döp om databasen till"
@@ -315,6 +334,15 @@ msgstr "Aktivera"
 msgid "Collation"
 msgstr "Kollationering"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Den extra funktionaliteten för att hantera länkade tabeller har "
+"inaktiverats. %sVisa orsaken%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Visa PDF-schema"
@@ -642,7 +670,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -818,16 +847,73 @@ msgstr "Kontrollera tabell"
 msgid "Database Log"
 msgstr "Databas"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Du försökte förmodligen ladda upp en för stor fil. Se %sdokumentationen%s "
+"för metoder att gå runt denna begränsning."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Filen kunde inte läsas"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Du försökta ladda en fil med komprimering (%s) som inte stöds. Antingen är "
+"stöd för det inte implementerat eller inaktiverat i din konfiguration."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Inga data att importera mottogs. Antingen skickades inget filnamn eller så "
+"översteg filens storlek den maximala som tillåts av din PHP-konfiguration.. "
+"Se FAQ 1.16."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "Kunde inte ladda tillägg för import. Kontrollera din installation!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Bokmärket har tagits bort."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Visar bokmärke"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "Bokmärket %s har skapats"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Importen har avslutats korrekt, %d frågor utförda."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Skriptets tidsbegränsning har överskridits. Om du vill slutföra importen, "
+"importera samma fil igen så kommer importen att återupptas."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin fungerar tyvärr endast med webbläsare som hanterar ramar."
@@ -844,7 +930,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\"-satser är inaktiverade."
 
@@ -884,10 +971,12 @@ msgid "The user name is empty!"
 msgstr "Användarnamnet är tomt!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Lösenordet är tomt!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Lösenorden är inte lika!"
 
@@ -1312,7 +1401,8 @@ msgstr "Lösenord:"
 msgid "Server Choice"
 msgstr "Serverval"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Kakor (cookies) måste tillåtas för att gå vidare."
 
@@ -1336,6 +1426,10 @@ msgstr "Ingen aktivitet sedan %s sekunder eller mer. Var god logga in igen"
 msgid "Cannot log in to the MySQL server"
 msgstr "Kan ej logga in på MySQL-server"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Fel användarnamn/lösenord. Åtkomst nekad."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1466,11 +1560,12 @@ msgstr "Skickade"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentation"
 
@@ -1534,7 +1629,7 @@ msgid "Skip Validate SQL"
 msgstr "Utan SQL-validering"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Validera SQL-kod"
 
@@ -1589,7 +1684,8 @@ msgstr "Funktionaliteten för %s påverkas av en känd bugg, se %s"
 msgid "Font size"
 msgstr "Teckenstorlek"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1751,6 +1847,7 @@ msgid "Create"
 msgstr "Skapa"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Inga privilegier"
 
@@ -1767,6 +1864,10 @@ msgstr "Skapa ny tabell i databas %s"
 msgid "Number of fields"
 msgstr "Antal fält"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr "Kunde inte ladda export-tillägg. Kontrollera din installation."
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1795,6 +1896,29 @@ msgstr "Skriv över befintlig fil(er)"
 msgid "File name template"
 msgstr "Mall för filnamn"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "servernamn"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "databasnamn"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "tabellnamn"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Detta värde tolkas mha %1$sstrftime%2$s, så du kan använda strängar med "
+"tidsformatering. Dessutom kommer följande omvandlingar att ske: %3$s. Övrig "
+"text behålls som den är."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "kom ihåg mall"
@@ -1871,6 +1995,15 @@ msgstr "Fil att importera"
 msgid "Location of the text file"
 msgstr "Textfilens plats"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Filuppladdningar är inte tillåtna på denna server."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Katalogen som du konfigurerat för uppladdning kan inte nås"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2020,6 +2153,20 @@ msgstr "Döda"
 msgid "in query"
 msgstr "i fråga"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Visar rader "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "totalt"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Frågan tog %01.4f sek"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2503,28 +2650,12 @@ msgstr "Misslyckades att skriva fil till disk."
 msgid "File upload stopped by extension."
 msgstr "Filuppladdning stoppades av tillägg."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Filen kunde inte läsas"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Fel vid flytt av uppladdad fil, se FAQ 1.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Du försökta ladda en fil med komprimering (%s) som inte stöds. Antingen är "
-"stöd för det inte implementerat eller inaktiverat i din konfiguration."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2551,7 +2682,7 @@ msgstr "Genererad av"
 msgid "Rows"
 msgstr "Rader"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL returnerade ett tomt resultat (dvs inga rader)."
@@ -2598,6 +2729,11 @@ msgstr "Struktur"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Inga index är definierade!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2634,6 +2770,15 @@ msgstr "Den primära nyckeln har tagits bort"
 msgid "Index %s has been dropped"
 msgstr "Index %s har tagits bort"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"Indexen %1$s och %2$s verkar vara identiska och ett av dem kan möjligen tas "
+"bort."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2766,7 +2911,7 @@ msgstr "Lägg till&nbsp;%s&nbsp;kolumn(er) till index"
 msgid "Add a new User"
 msgstr "Lägg till ny användare"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Du har lagt till en ny användare."
 
@@ -2958,10 +3103,6 @@ msgstr "Ladda upp till BLOB-förvaringsplats"
 msgid "Let every user access this bookmark"
 msgstr "Låt varje användare få tillgång till detta bokmärke"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Bokmärket har tagits bort."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Etikett"
@@ -3004,15 +3145,7 @@ msgstr "\"bzippad\""
 msgid "Calendar"
 msgstr "Kalender"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr "Kunde inte ladda export-tillägg. Kontrollera din installation."
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "Kunde inte ladda tillägg för import. Kontrollera din installation!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Kan inte byta namn på index till \"PRIMARY\"!"
 
@@ -3135,11 +3268,6 @@ msgstr "Var god ange koordinaterna för tabellen %s"
 msgid "Connections"
 msgstr "Uppkopplingar"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Databas %s har kopierats till %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Kopiera tabellen till (databas<b>.</b>tabell):"
@@ -3163,7 +3291,7 @@ msgstr "Kunde inte ansluta till MySQL-server"
 msgid "Could not connect to the target"
 msgstr "Kunde inte ansluta till MySQL-server"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3262,26 +3390,17 @@ msgstr "Tjeckisk-Slovakisk"
 msgid "Danish"
 msgstr "Dansk"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Databasens namn är tomt!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Exportalternativ för databas"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Databas %1$s har skapats."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s databaser har tagits bort."
@@ -3306,7 +3425,7 @@ msgstr "Stäng av statistik"
 msgid "Enable Statistics"
 msgstr "Slå på statistik"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3355,7 +3474,7 @@ msgstr "Defragmentera tabell"
 msgid "Use delayed inserts"
 msgstr "Använd fördröjda infogningar"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Inga användare valda för borttagning!"
 
@@ -3569,34 +3688,11 @@ msgstr ""
 "Filen %s finns redan på servern. Ändra filnamnet eller kryssa i skriv över-"
 "alternativet."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "databasnamn"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "servernamn"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "tabellnamn"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Detta värde tolkas mha %1$sstrftime%2$s, så du kan använda strängar med "
-"tidsformatering. Dessutom kommer följande omvandlingar att ske: %3$s. Övrig "
-"text behålls som den är."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Filer"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3621,7 +3717,7 @@ msgstr "Rensa tabell"
 msgid "Flush (close) all tables"
 msgstr "Stäng alla tabeller"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr "Fel vid skapande av främmande nyckel för %1$s (kontrollera datatyper)"
@@ -3807,15 +3903,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"Indexen %1$s och %2$s verkar vara identiska och ett av dem kan möjligen tas "
-"bort."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3852,7 +3939,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Lägg till som ny rad"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Infogade rad id: %1$d"
@@ -4178,20 +4265,10 @@ msgstr "Visa processer"
 msgid "No databases"
 msgstr "Inga databaser"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Inga databaser markerade."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Inga data att importera mottogs. Antingen skickades inget filnamn eller så "
-"översteg filens storlek den maximala som tillåts av din PHP-konfiguration.. "
-"Se FAQ 1.16."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "Ingen beskrivning"
@@ -4207,15 +4284,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr "Inga filer hittades i ZIP-arkivet!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Inga index är definierade!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Inga delar av index är definierade!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Ingen förändring"
 
@@ -4233,7 +4306,7 @@ msgstr "Detta format har inga alternativ"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Webbservern har inte tillåtelse att spara filen %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Du har inte tillräcklig behörighet för att vara här nu!"
 
@@ -4270,7 +4343,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b>-tabellen ej funnen eller ej angiven i %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Hittade ingen användare."
 
@@ -4317,7 +4391,7 @@ msgstr "Partitionsunderhåll"
 msgid "Partition %s"
 msgstr "Partition %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Lösenordet för %s har ändrats."
@@ -4419,11 +4493,11 @@ msgstr "Polska"
 msgid "Port"
 msgstr "Sortering"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Primärnyckelns namn måste vara \"PRIMARY\"!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4626,7 +4700,7 @@ msgstr "Tillåter ändring av data."
 msgid "No privileges."
 msgstr "Inga privilegier."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Privilegierna har laddats om."
 
@@ -4669,11 +4743,6 @@ msgstr ""
 "<b>Frågestatistik</b>: %s frågor har skickats till servern sedan den "
 "startade."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Frågan tog %01.4f sek"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Typ av fråga"
@@ -4702,15 +4771,6 @@ msgstr "Kontrollera referensintegritet:"
 msgid "Relational schema"
 msgstr "Relationsschema"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Den extra funktionaliteten för att hantera länkade tabeller har "
-"inaktiverats. %sVisa orsaken%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Relationer"
@@ -4751,11 +4811,6 @@ msgstr "Ta bort partitionering"
 msgid "Remove selected users"
 msgstr "Ta bort markerade användare"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "Databas %s har döpts om till %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4864,7 +4919,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -5007,7 +5062,7 @@ msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 "Upphäv användarnas alla aktiva privilegier och ta bort användarna efteråt."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Du har upphävt privilegierna för %s"
@@ -5172,19 +5227,11 @@ msgstr "Visa fullständiga frågor"
 msgid "Show/Hide left menu"
 msgstr "Visa/Dölj vänster meny"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Visar bokmärke"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "Visar som PHP-kod"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Visar rader "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "Visar SQL-fråga"
 
@@ -6060,7 +6107,7 @@ msgstr "Tabell %s finns redan!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Tabell %1$s har ändrats"
@@ -6079,7 +6126,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Tabellnamnet är tomt!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "Tabell %1$s har skapats."
@@ -6200,7 +6247,7 @@ msgstr "Denna värd"
 msgid "Threads"
 msgstr "Trådar"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Tråd %s dödades med framgång."
@@ -6214,14 +6261,6 @@ msgstr ""
 "att phpMyAdmin inte kan slutföra denna import såvida du inte ökar PHP:s "
 "tidsbegränsningar."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Skriptets tidsbegränsning har överskridits. Om du vill slutföra importen, "
-"importera samma fil igen så kommer importen att återupptas."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "till/från sida"
@@ -6238,10 +6277,6 @@ msgstr "Växla liten/stor"
 msgid "To select relation, click :"
 msgstr "För att välja relation, klicka :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "totalt"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6554,7 +6589,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "okänd"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Du har uppdaterat privilegierna för %s."
@@ -6573,19 +6608,6 @@ msgstr "Se dokumentationen för uppdatering av din tabell column_comments"
 msgid "You should upgrade to %s %s or later."
 msgstr "Du bör uppgradera till %s %s eller senare."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Du försökte förmodligen ladda upp en för stor fil. Se %sdokumentationen%s "
-"för metoder att gå runt denna begränsning."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Filuppladdningar är inte tillåtna på denna server."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Användning"
@@ -6599,7 +6621,7 @@ msgstr "Använd bakåtcitat runt tabell- och fältnamn"
 msgid "Use Host Table"
 msgstr "Använd värdtabell"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Användaren %s finns redan!"
@@ -6612,7 +6634,7 @@ msgstr "Användaren %s finns redan!"
 msgid "User name"
 msgstr "Användarnamn"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Den markerade användaren kunde inte hittas i privilegiumtabellen."
 
@@ -6620,7 +6642,7 @@ msgstr "Den markerade användaren kunde inte hittas i privilegiumtabellen."
 msgid "User overview"
 msgstr "Användaröversikt"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "De markerade användarna har tagits bort."
 
@@ -6683,10 +6705,6 @@ msgstr "Visa SQL-satser för tabellen"
 msgid "VIEW name"
 msgstr "Namn på vy"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Katalogen som du konfigurerat för uppladdning kan inte nås"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Webbserver"
@@ -6704,10 +6722,6 @@ msgstr "Wiki"
 msgid "wildcard"
 msgstr "jokertecken"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Fel användarnamn/lösenord. Åtkomst nekad."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/ta.po b/po/ta.po
index 641ea6334..2a9c46e6c 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-04-16 10:43+0200\n"
 "Last-Translator: Sutharshan <sutharshan02@gmail.com>\n"
 "Language-Team: Tamil <ta@li.org>\n"
@@ -91,6 +91,11 @@ msgstr ""
 msgid "Use this value"
 msgstr ""
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr ""
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr ""
@@ -207,6 +212,20 @@ msgstr ""
 msgid "Unselect All"
 msgstr ""
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr ""
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr ""
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr ""
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr ""
@@ -311,6 +330,13 @@ msgstr ""
 msgid "Collation"
 msgstr ""
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr ""
@@ -638,7 +664,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -806,16 +833,64 @@ msgstr ""
 msgid "Database Log"
 msgstr ""
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr ""
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr ""
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -832,7 +907,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr ""
 
@@ -872,10 +948,12 @@ msgid "The user name is empty!"
 msgstr ""
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr ""
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr ""
 
@@ -1287,7 +1365,8 @@ msgstr ""
 msgid "Server Choice"
 msgstr ""
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr ""
 
@@ -1309,6 +1388,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr ""
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr ""
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1422,11 +1505,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr ""
 
@@ -1490,7 +1574,7 @@ msgid "Skip Validate SQL"
 msgstr ""
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr ""
 
@@ -1543,7 +1627,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1702,6 +1787,7 @@ msgid "Create"
 msgstr ""
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr ""
 
@@ -1718,6 +1804,10 @@ msgstr ""
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1746,6 +1836,26 @@ msgstr ""
 msgid "File name template"
 msgstr ""
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr ""
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr ""
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr ""
@@ -1811,6 +1921,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr ""
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr ""
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1954,6 +2073,20 @@ msgstr ""
 msgid "in query"
 msgstr ""
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr ""
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr ""
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr ""
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2391,26 +2524,12 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr ""
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2436,7 +2555,7 @@ msgstr ""
 msgid "Rows"
 msgstr ""
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
@@ -2480,6 +2599,11 @@ msgstr ""
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr ""
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2516,6 +2640,13 @@ msgstr ""
 msgid "Index %s has been dropped"
 msgstr ""
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2645,7 +2776,7 @@ msgstr ""
 msgid "Add a new User"
 msgstr "புதிய பயனாளரை சேர்க்க"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "நீங்கள் புதிய பயனாளரை சேர்த்துள்ளீர்கள்"
 
@@ -2834,10 +2965,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr ""
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr ""
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr ""
@@ -2880,15 +3007,7 @@ msgstr ""
 msgid "Calendar"
 msgstr ""
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr ""
 
@@ -3005,11 +3124,6 @@ msgstr ""
 msgid "Connections"
 msgstr ""
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr ""
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr ""
@@ -3031,7 +3145,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3127,26 +3241,17 @@ msgstr ""
 msgid "Danish"
 msgstr ""
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr ""
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr ""
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr ""
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr ""
@@ -3170,7 +3275,7 @@ msgstr ""
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3213,7 +3318,7 @@ msgstr ""
 msgid "Use delayed inserts"
 msgstr ""
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3421,31 +3526,11 @@ msgid ""
 "File %s already exists on server, change filename or check overwrite option."
 msgstr ""
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr ""
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr ""
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr ""
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3466,7 +3551,7 @@ msgstr ""
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3648,13 +3733,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3687,7 +3765,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -3995,17 +4073,10 @@ msgstr ""
 msgid "No databases"
 msgstr ""
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr ""
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr ""
@@ -4019,15 +4090,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr ""
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr ""
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr ""
 
@@ -4045,7 +4112,7 @@ msgstr ""
 msgid "The web server does not have permission to save the file %s."
 msgstr ""
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr ""
 
@@ -4080,7 +4147,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr ""
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr ""
 
@@ -4127,7 +4195,7 @@ msgstr ""
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr ""
@@ -4227,11 +4295,11 @@ msgstr ""
 msgid "Port"
 msgstr ""
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr ""
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4424,7 +4492,7 @@ msgstr ""
 msgid "No privileges."
 msgstr ""
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
@@ -4465,11 +4533,6 @@ msgid ""
 "server."
 msgstr ""
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr ""
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr ""
@@ -4498,13 +4561,6 @@ msgstr ""
 msgid "Relational schema"
 msgstr ""
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr ""
@@ -4543,11 +4599,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr ""
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr ""
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4651,7 +4702,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4787,7 +4838,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr ""
@@ -4940,19 +4991,11 @@ msgstr ""
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr ""
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5702,7 +5745,7 @@ msgstr ""
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr ""
@@ -5721,7 +5764,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr ""
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr ""
@@ -5842,7 +5885,7 @@ msgstr ""
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr ""
@@ -5853,12 +5896,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -5875,10 +5912,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr ""
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6149,7 +6182,7 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr ""
@@ -6168,17 +6201,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr ""
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr ""
@@ -6192,7 +6214,7 @@ msgstr ""
 msgid "Use Host Table"
 msgstr ""
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
@@ -6205,7 +6227,7 @@ msgstr ""
 msgid "User name"
 msgstr ""
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
@@ -6213,7 +6235,7 @@ msgstr ""
 msgid "User overview"
 msgstr ""
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr ""
 
@@ -6272,10 +6294,6 @@ msgstr ""
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr ""
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6293,10 +6311,6 @@ msgstr ""
 msgid "wildcard"
 msgstr ""
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr ""
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/te.po b/po/te.po
index d58cae611..08b3ac231 100644
--- a/po/te.po
+++ b/po/te.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-04-02 12:04+0200\n"
 "Last-Translator:  <veeven@gmail.com>\n"
 "Language-Team: Telugu <te@li.org>\n"
@@ -92,6 +92,11 @@ msgstr "వివరణ"
 msgid "Use this value"
 msgstr ""
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr ""
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr ""
@@ -208,6 +213,21 @@ msgstr ""
 msgid "Unselect All"
 msgstr ""
 
+# మొదటి అనువాదము
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "డేటాబేస్ పేరు ఖాళీగా ఉన్నది"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr ""
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr ""
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr ""
@@ -316,6 +336,13 @@ msgstr ""
 msgid "Collation"
 msgstr ""
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr ""
@@ -649,7 +676,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -820,16 +848,64 @@ msgstr ""
 msgid "Database Log"
 msgstr ""
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr ""
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr ""
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -846,7 +922,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr ""
 
@@ -887,10 +964,12 @@ msgid "The user name is empty!"
 msgstr "వాడుకరి పేరులో ఏమీ లేదు"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "సంకేతపదం ఖాళీగా ఉంది!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "సంకేతపదాలు సరిపోలలేదు!"
 
@@ -1311,7 +1390,8 @@ msgstr "సంకేతపదం:"
 msgid "Server Choice"
 msgstr ""
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr ""
 
@@ -1333,6 +1413,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr ""
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr ""
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1448,11 +1532,12 @@ msgstr ""
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr ""
 
@@ -1516,7 +1601,7 @@ msgid "Skip Validate SQL"
 msgstr ""
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr ""
 
@@ -1571,7 +1656,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1731,6 +1817,7 @@ msgid "Create"
 msgstr "సృష్టించు"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr ""
 
@@ -1747,6 +1834,10 @@ msgstr ""
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1775,6 +1866,26 @@ msgstr ""
 msgid "File name template"
 msgstr ""
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr ""
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr ""
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr ""
@@ -1840,6 +1951,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr "పాఠ్యపు దస్త్రం యొక్క ప్రాంతం"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr ""
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1984,6 +2104,20 @@ msgstr ""
 msgid "in query"
 msgstr ""
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr ""
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "మొత్తం"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr ""
+
 # మొదటి అనువాదము
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
@@ -2424,26 +2558,12 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr ""
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2469,7 +2589,7 @@ msgstr ""
 msgid "Rows"
 msgstr ""
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
@@ -2513,6 +2633,11 @@ msgstr ""
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr ""
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2549,6 +2674,13 @@ msgstr ""
 msgid "Index %s has been dropped"
 msgstr ""
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2682,7 +2814,7 @@ msgid "Add a new User"
 msgstr "క్రొత్త వినియోగదారుని చేర్చు"
 
 # మొదటి అనువాదము
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "మీరు క్రొత్త వినియోగదారుని చేర్చారు"
 
@@ -2878,10 +3010,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr ""
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr ""
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr ""
@@ -2924,15 +3052,7 @@ msgstr ""
 msgid "Calendar"
 msgstr ""
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr ""
 
@@ -3051,11 +3171,6 @@ msgstr ""
 msgid "Connections"
 msgstr "అనుసంధానాలు"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr ""
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr ""
@@ -3077,7 +3192,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3176,27 +3291,17 @@ msgstr "ఛెక్-స్లోవాక్"
 msgid "Danish"
 msgstr "డానిష్"
 
-# మొదటి అనువాదము
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "డేటాబేస్ పేరు ఖాళీగా ఉన్నది"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr ""
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr ""
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr ""
@@ -3220,7 +3325,7 @@ msgstr "గణాంకాలని అచేతనంచేయి"
 msgid "Enable Statistics"
 msgstr "గణాంకాలని చేతనంచేయి"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3263,7 +3368,7 @@ msgstr ""
 msgid "Use delayed inserts"
 msgstr ""
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3471,31 +3576,11 @@ msgid ""
 "File %s already exists on server, change filename or check overwrite option."
 msgstr ""
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr ""
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr ""
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "దస్త్రాలు"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3516,7 +3601,7 @@ msgstr ""
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3699,13 +3784,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3738,7 +3816,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4048,17 +4126,10 @@ msgstr ""
 msgid "No databases"
 msgstr ""
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr ""
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "వివరణ లేదు"
@@ -4072,15 +4143,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr ""
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr ""
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr ""
 
@@ -4098,7 +4165,7 @@ msgstr ""
 msgid "The web server does not have permission to save the file %s."
 msgstr ""
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr ""
 
@@ -4133,7 +4200,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr ""
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr ""
 
@@ -4180,7 +4248,7 @@ msgstr ""
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr ""
@@ -4282,11 +4350,11 @@ msgstr "పోలిష్"
 msgid "Port"
 msgstr ""
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr ""
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4479,7 +4547,7 @@ msgstr ""
 msgid "No privileges."
 msgstr ""
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
@@ -4520,11 +4588,6 @@ msgid ""
 "server."
 msgstr ""
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr ""
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr ""
@@ -4553,13 +4616,6 @@ msgstr ""
 msgid "Relational schema"
 msgstr ""
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "సంబంధాలు"
@@ -4598,11 +4654,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr ""
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr ""
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4706,7 +4757,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4842,7 +4893,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr ""
@@ -4997,19 +5048,11 @@ msgstr ""
 msgid "Show/Hide left menu"
 msgstr "ఎడమవైపున మెనుని చూపించు/దాచు"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr ""
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5769,7 +5812,7 @@ msgstr ""
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr ""
@@ -5788,7 +5831,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr ""
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr ""
@@ -5911,7 +5954,7 @@ msgstr ""
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr ""
@@ -5922,12 +5965,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -5944,10 +5981,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "మొత్తం"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6220,7 +6253,7 @@ msgstr "యూనికోడ్"
 msgid "unknown"
 msgstr ""
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr ""
@@ -6239,17 +6272,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr ""
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "వాడుక"
@@ -6263,7 +6285,7 @@ msgstr ""
 msgid "Use Host Table"
 msgstr ""
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
@@ -6276,7 +6298,7 @@ msgstr ""
 msgid "User name"
 msgstr "వాడుకరి పేరు"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
@@ -6284,7 +6306,7 @@ msgstr ""
 msgid "User overview"
 msgstr ""
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr ""
 
@@ -6344,10 +6366,6 @@ msgstr ""
 msgid "VIEW name"
 msgstr "నామధేయమును చూపుము"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr ""
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6365,10 +6383,6 @@ msgstr "వికీ"
 msgid "wildcard"
 msgstr ""
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr ""
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/th.po b/po/th.po
index 5622009ad..8323c8707 100644
--- a/po/th.po
+++ b/po/th.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:19+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: thai <th@li.org>\n"
@@ -86,6 +86,11 @@ msgstr "รายละเอียด"
 msgid "Use this value"
 msgstr "ใช้ค่านี้"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "โยนฐานข้อมูล %s ทิ้งไปเรียบร้อยแล้ว"
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "หมายเหตุของฐานข้อมูล: "
@@ -202,6 +207,21 @@ msgstr "เลือกทั้งหมด"
 msgid "Unselect All"
 msgstr "ไม่เลือกเลย"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+#, fuzzy
+msgid "The database name is empty!"
+msgstr "ชื่อตารางยังว่างอยู่!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, fuzzy, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "ตาราง %s ได้ถูกเปลี่ยนชื่อเป็น %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, fuzzy, php-format
+msgid "Database %s has been copied to %s"
+msgstr "คัดลอกตาราง %s ไปเก็บในชื่อ %s เรียบร้อยแล้ว."
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "เปลี่ยนชื่อฐานข้อมูลเป็น"
@@ -315,6 +335,14 @@ msgstr "เปิดใช้อยู่"
 msgid "Collation"
 msgstr "การเรียงลำดับ"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"ความสามารถเพิ่มเติมสำหรับ linked Tables ได้ถูกระงับเอาไว้ ตามเหตุผลที่แจ้งไว้ใน %shere%s"
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "แสดงสกีมาของ PDF"
@@ -642,7 +670,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -816,16 +845,64 @@ msgstr "ตรวจสอบตาราง"
 msgid "Database Log"
 msgstr "ฐานข้อมูล"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "อ่านไฟล์ไม่ได้"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "ลบคำค้นที่จดไว้เรียบร้อยแล้ว"
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "เบราเซอร์ที่<b>ใช้เฟรมได้</b> จะช่วยให้ใช้ phpMyAdmin ได้ง่ายขึ้น"
@@ -842,7 +919,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "คำสั่ง \"DROP DATABASE\" ถูกปิดไว้"
 
@@ -882,10 +960,12 @@ msgid "The user name is empty!"
 msgstr "ชื่อผู้ใช้ยังว่างอยู่!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "รหัสผ่านยังว่างอยู่!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "รหัสผ่านไม่ตรงกัน!"
 
@@ -1304,7 +1384,8 @@ msgstr "รหัสผ่าน:"
 msgid "Server Choice"
 msgstr "ตัวเลือกเซิร์ฟเวอร์"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "ต้องอนุญาตใช้ใช้ 'คุ๊กกี้' (cookie) เสียก่อน จึงจะผ่านจุดนี้ไปได้"
 
@@ -1326,6 +1407,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "ไม่สามารถล็อกอินเข้าเซิร์ฟเวอร์ MySQL ได้"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "อนุญาตให้เข้าใช้ไม่ได้ ชื่อผู้ใช้หรือรหัสผ่านผิด"
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1450,11 +1535,12 @@ msgstr "ถูกส่ง"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "เอกสารอ้างอิง"
 
@@ -1518,7 +1604,7 @@ msgid "Skip Validate SQL"
 msgstr "ไม่ต้องตรวจสอบ SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "ตรวจสอบ SQL"
 
@@ -1571,7 +1657,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1732,6 +1819,7 @@ msgid "Create"
 msgstr "สร้าง"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "ไม่มีสิทธิ"
 
@@ -1748,6 +1836,10 @@ msgstr "สร้างตารางในฐานข้อมูลนี้
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1776,6 +1868,27 @@ msgstr "เขียนทับแฟ้มที่มีอยู่แล้
 msgid "File name template"
 msgstr "รูปแบบของชื่อไฟล์"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+#, fuzzy
+msgid "server name"
+msgstr "ชื่อผู้ใช้"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr ""
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "จำรูปแบบ"
@@ -1847,6 +1960,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr "เลือกไฟล์ข้อความจาก"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "ไม่สามารถใช้งาน ไดเรกทอรีที่ตั้งไว้สำหรับอัพโหลดได้"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1993,6 +2115,20 @@ msgstr "ฆ่าทิ้ง"
 msgid "in query"
 msgstr "ในคำค้น"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "แสดงระเบียนที่ "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "ทั้งหมด"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "คำค้นใช้เวลา %01.4f วินาที"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2436,26 +2572,12 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "อ่านไฟล์ไม่ได้"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2482,7 +2604,7 @@ msgstr "สร้างโดย"
 msgid "Rows"
 msgstr "แถว"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL คืนผลลัพธ์ว่างเปล่ากลับมา (null / 0 แถว)."
@@ -2528,6 +2650,11 @@ msgstr "โครงสร้าง"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "ยังไม่ได้กำหนดดัชนีใดๆ!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2565,6 +2692,13 @@ msgstr "โยนไพรมารีคีย์ทิ้งไปเรีย
 msgid "Index %s has been dropped"
 msgstr "โยนดัชนี %s ทิ้งไปเรียบร้อยแล้ว"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2697,7 +2831,7 @@ msgstr "เพิ่มดัชนีคอลัมน์ %s"
 msgid "Add a new User"
 msgstr "เพิ่มผู้ใช้ใหม่"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "เพิ่มผู้ใช้ใหม่เรียบร้อยแล้ว"
 
@@ -2895,10 +3029,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr ""
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "ลบคำค้นที่จดไว้เรียบร้อยแล้ว"
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "ป้ายชื่อ"
@@ -2941,15 +3071,7 @@ msgstr "\"bzipped\""
 msgid "Calendar"
 msgstr "ปฏิทิน"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "เปลี่ยนชื่อดัชนีเป็น PRIMARY ไม่ได้!"
 
@@ -3067,11 +3189,6 @@ msgstr "กรุณาตั้งค่าโคออร์ดิเนตข
 msgid "Connections"
 msgstr "การเชื่อมต่อ"
 
-#: libraries/messages.inc.php:186
-#, fuzzy, php-format
-msgid "Database %s has been copied to %s"
-msgstr "คัดลอกตาราง %s ไปเก็บในชื่อ %s เรียบร้อยแล้ว."
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "คัดลอกตารางไปยัง (ฐานข้อมูล<b>.</b>ตาราง):"
@@ -3093,7 +3210,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3192,27 +3309,17 @@ msgstr "เช็ค-สโลวัก"
 msgid "Danish"
 msgstr "เดนมาร์ก"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-#, fuzzy
-msgid "The database name is empty!"
-msgstr "ชื่อตารางยังว่างอยู่!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr ""
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "โยนฐานข้อมูล %s ทิ้งไปเรียบร้อยแล้ว"
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s ฐานข้อมูลได้ถูกทิ้งไปเรียบร้อยแล้ว."
@@ -3237,7 +3344,7 @@ msgstr "ยกเลิกการเก็บสถิติ"
 msgid "Enable Statistics"
 msgstr "ให้มีการเก็บสถิติ"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3283,7 +3390,7 @@ msgstr "จัดระเบียบตาราง"
 msgid "Use delayed inserts"
 msgstr ""
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3492,33 +3599,12 @@ msgid ""
 "File %s already exists on server, change filename or check overwrite option."
 msgstr ""
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr ""
-
-#: libraries/messages.inc.php:335
-#, fuzzy
-msgid "server name"
-msgstr "ชื่อผู้ใช้"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "จำนวนฟิลด์"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3539,7 +3625,7 @@ msgstr "ล้างตาราง (flush)"
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3723,13 +3809,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3765,7 +3844,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "แทรกเป็นแถวใหม่"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4077,17 +4156,10 @@ msgstr "แสดงงานที่ทำอยู่ของ MySQL"
 msgid "No databases"
 msgstr "ไม่มีฐานข้อมูล"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "ยังไม่ได้เลือกฐานข้อมูล."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "ไม่มีรายละเอียด"
@@ -4101,15 +4173,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "ยังไม่ได้กำหนดดัชนีใดๆ!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "ไม่ได้กำหนดส่วนใดๆ ของดัชนี!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "ไม่มีการเปลี่ยนแปลง"
 
@@ -4128,7 +4196,7 @@ msgstr "รูปแบบนี้ไม่มีตัวเลือก"
 msgid "The web server does not have permission to save the file %s."
 msgstr ""
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "คุณไม่มีสิทธิที่จะเข้ามาตรงนี้!"
 
@@ -4163,7 +4231,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "ไม่พบตาราง <b>%s</b> ใน %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "ไม่พบผู้ใช้ใดๆ."
 
@@ -4212,7 +4281,7 @@ msgstr "การดูแลรักษาตาราง"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "เปลี่ยนรหัสผ่านของ %s เรียบร้อยแล้ว"
@@ -4316,11 +4385,11 @@ msgstr "โปแลนด์"
 msgid "Port"
 msgstr "เรียง"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "ชื่อของไพรมารีคีย์ จะต้องเป็น PRIMARY เท่านั้น"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(ชื่อของไพรมารีคีย์<b>จะต้องเป็น</b> \"PRIMARY\" เท่านั้น!)"
@@ -4519,7 +4588,7 @@ msgstr "อนุญาตให้เปลี่ยนข้อมูลได
 msgid "No privileges."
 msgstr "ไม่มีสิทธิใดๆ."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "สิทธิได้ถูกเรียกใช้ใหม่เรียบร้อยแล้ว"
 
@@ -4561,11 +4630,6 @@ msgid ""
 "server."
 msgstr "<b>สถิติคำค้น</b>: มี %s คำค้น ถูกส่งไปที่เซิร์ฟเวอร์ นับตั้งแต่เริ่มระบบ."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "คำค้นใช้เวลา %01.4f วินาที"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "ชนิดคำค้น"
@@ -4594,14 +4658,6 @@ msgstr "ตรวจสอบความสมบูรณ์ของการ
 msgid "Relational schema"
 msgstr "รีเลชันแนล สกีมา"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"ความสามารถเพิ่มเติมสำหรับ linked Tables ได้ถูกระงับเอาไว้ ตามเหตุผลที่แจ้งไว้ใน %shere%s"
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "รีเลชัน"
@@ -4640,11 +4696,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "ถอนผู้ใช้ที่เลือก"
 
-#: libraries/messages.inc.php:761
-#, fuzzy, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "ตาราง %s ได้ถูกเปลี่ยนชื่อเป็น %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4751,7 +4802,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4887,7 +4938,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "เพิกถอน active privileges ทั้งหมดจากผู้ใช้ และลบผู้ใช้ทิ้งหลังจากนั้น."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "คุณได้เพิกถอนสิทธิของ %s"
@@ -5047,19 +5098,11 @@ msgstr "แสดงคำค้นแบบเต็ม"
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "แสดงระเบียนที่ "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5822,7 +5865,7 @@ msgstr "มีผู้ใช้ %s อยู่แล้ว!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, fuzzy, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "ลบผู้ใช้ที่เลือกไว้เรียบร้อยแล้ว."
@@ -5841,7 +5884,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "ชื่อตารางยังว่างอยู่!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "โยนตาราง %s ทิ้งไปเรียบร้อยแล้ว"
@@ -5962,7 +6005,7 @@ msgstr "โฮสต์นี้"
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "เธรด %s ถูกทำลายเรียบร้อยแล้ว."
@@ -5973,12 +6016,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -5995,10 +6032,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "ทั้งหมด"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6275,7 +6308,7 @@ msgstr "ยูนิโค้ด"
 msgid "unknown"
 msgstr "ไม่ระบุ"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "คุณได้ปรับปรุงสิทธิสำหรับ %s แล้ว"
@@ -6296,17 +6329,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr ""
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "ใช้งาน"
@@ -6320,7 +6342,7 @@ msgstr "ใส่ 'backqoute' ให้กับชื่อตารางแ
 msgid "Use Host Table"
 msgstr ""
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "มีผู้ใช้ %s อยู่แล้ว!"
@@ -6333,7 +6355,7 @@ msgstr "มีผู้ใช้ %s อยู่แล้ว!"
 msgid "User name"
 msgstr "ชื่อผู้ใช้"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "ไม่พบผู้ใช้ที่เลือกในตารางแสดงสิทธิ"
 
@@ -6341,7 +6363,7 @@ msgstr "ไม่พบผู้ใช้ที่เลือกในตาร
 msgid "User overview"
 msgstr "ข้อมูลทั่วไปของผู้ใช้"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "ลบผู้ใช้ที่เลือกไว้เรียบร้อยแล้ว."
 
@@ -6403,10 +6425,6 @@ msgstr "ดูโครงสร้างของตาราง"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "ไม่สามารถใช้งาน ไดเรกทอรีที่ตั้งไว้สำหรับอัพโหลดได้"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6424,10 +6442,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "ไวล์การ์ด"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "อนุญาตให้เข้าใช้ไม่ได้ ชื่อผู้ใช้หรือรหัสผ่านผิด"
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/tr.po b/po/tr.po
index 0b47587d9..943f55ef2 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-04-03 11:44+0200\n"
 "Last-Translator:  <hitowerdigit@hotmail.com>\n"
 "Language-Team: turkish <tr@li.org>\n"
@@ -91,6 +91,11 @@ msgstr "Açıklama"
 msgid "Use this value"
 msgstr "Bu değeri kullan"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "Veritabanı %1$s oluşturuldu."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Veritabanı yorumu:"
@@ -207,6 +212,20 @@ msgstr "Tümünü Seç"
 msgid "Unselect All"
 msgstr "Tüm Seçimi Kaldır"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Veritabanı adı boş!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "%s veritabanı %s olarak yeniden adlandırıldı"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "%s veritabanı %s'e kopyalandı."
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Veritabanını şuna yeniden adlandır"
@@ -317,6 +336,15 @@ msgstr "Etkin"
 msgid "Collation"
 msgstr "Karşılaştırma"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Bağlı tablolar ile çalışan ilave özellikler etkisizleştirildi. Nedenini "
+"öğrenmek için %sburaya%s tıklayın."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "PDF şemasını göster"
@@ -644,7 +672,8 @@ msgstr "İzleme aktif."
 msgid "Tracking is not active."
 msgstr "İzleme aktif değil."
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -814,16 +843,74 @@ msgstr "Tabloyu izle"
 msgid "Database Log"
 msgstr "Veritabanı Günlüğü"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Muhtemelen çok büyük dosya göndermeyi denediniz. Lütfen bu sınıra çözüm yolu "
+"bulmak için %sbelgelere%s başvurun."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Dosya okunamadı"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Desteklenmeyen sıkıştırmayla (%s) dosya yüklemeyi denediniz. Ya bunun için "
+"destek henüz tamamlanmadı ya da yapılandırmanız tarafından etkisizleştirildi."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"İçeri aktarmak için veri alınmadı. Ya dosya adı gönderilmedi ya da PHP "
+"yapılandırmanız tarafından izin verilen en fazla boyut aşıldı. SSS 1.16'ya "
+"bakın."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"İçeri aktarma eklentileri yüklenemedi, lütfen kurulumunuzu kontrol edin!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "İşaretleme silindi."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "İşaret gösteriliyor"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "İşaretleme %s oluşturuldu"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "İçeri aktarma başarılı olarak bitti, %d sorgu çalıştırıldı."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Küçük program zaman aşımı geçti, eğer içeri aktarmayı bitirmek istiyorsanız, "
+"lütfen aynı dosyayı yeniden gönderin ve içeri aktarma devam edecektir."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -841,7 +928,8 @@ msgstr "Seçmek için tıklayın"
 msgid "Click to unselect"
 msgstr "Seçimi kaldırmak için tıklayın"
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" ifadesi etkisiz."
 
@@ -883,10 +971,12 @@ msgid "The user name is empty!"
 msgstr "Kullanıcı adı boş!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Parola boş!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Parolalar birbiriyle aynı değil!"
 
@@ -1313,7 +1403,8 @@ msgstr "Parola:"
 msgid "Server Choice"
 msgstr "Sunucu Seçimi"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Bu kısmı geçmek için tanımlama bilgileri (Cookies) açık olmalı."
 
@@ -1337,6 +1428,10 @@ msgstr "%s saniye içinde hiçbir işlem yapılmadı, lütfen yeniden oturum aç
 msgid "Cannot log in to the MySQL server"
 msgstr "MySQL sunucusuna oturum açılamıyor"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Yanlış kullanıcı adı/parola girdiniz. Erişim engellendi."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1467,11 +1562,12 @@ msgstr "tr"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Belgeler"
 
@@ -1535,7 +1631,7 @@ msgid "Skip Validate SQL"
 msgstr "SQL Onaylamayı atla"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "SQL'i onayla"
 
@@ -1590,7 +1686,8 @@ msgstr "%s işlevselliği bilinen bir hata tarafından zarar görmüş, bakını
 msgid "Font size"
 msgstr "Yazı Tipi boyutu"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1757,6 +1854,7 @@ msgid "Create"
 msgstr "Oluştur"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Yetkiniz yok"
 
@@ -1773,6 +1871,11 @@ msgstr "%s veritabanında yeni tablo oluştur"
 msgid "Number of fields"
 msgstr "Alan sayısı"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"Dışarı aktarma eklentileri yüklenemedi, lütfen kurulumunuzu kontrol edin!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1801,6 +1904,29 @@ msgstr "Mevcut dosya(ların)nın üzerine yaz"
 msgid "File name template"
 msgstr "Dosya adı şablonu"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "sunucu adı"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "veritabanı adı"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "tablo adı"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Bu değer %1$sstrftime%2$s kullanılarak yorumlanır, bu yüzden zaman "
+"biçimlendirme dizgisi kullanabilirsiniz. İlave olarak yandaki dönüşümler "
+"meydana gelecek: %3$s. Diğer metin olduğu gibi tutulacak."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "şablonu hatırla"
@@ -1877,6 +2003,15 @@ msgstr "İçeri aktarmak için dosya"
 msgid "Location of the text file"
 msgstr "Metin dosyasının yeri"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Bu sunucuda dosya gönderimlerine izin verilmez."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Gönderme işi için ayarladığınız dizine ulaşılamıyor"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2027,6 +2162,20 @@ msgstr "Sonlandır"
 msgid "in query"
 msgstr "sorgu içerisinde"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Satırlar gösteriliyor"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "toplam"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Sorgu %01.4f san. sürdü"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2514,28 +2663,12 @@ msgstr "Dosyayı diske yazma başarısız."
 msgid "File upload stopped by extension."
 msgstr "Dosya gönderme uzantısından dolayı durduruldu."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Dosya okunamadı"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Gönderilen dosyayı taşıma hatası, SSS 1.11'e bakın"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Desteklenmeyen sıkıştırmayla (%s) dosya yüklemeyi denediniz. Ya bunun için "
-"destek henüz tamamlanmadı ya da yapılandırmanız tarafından etkisizleştirildi."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2561,7 +2694,7 @@ msgstr "Üreten:"
 msgid "Rows"
 msgstr "Satır"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL boş bir sonuç kümesi döndürdü (örn. sıfır satır)."
@@ -2607,6 +2740,11 @@ msgstr "yapı"
 msgid "Go to view"
 msgstr "Görünüme git"
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Tanımlı indeks yok!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2643,6 +2781,15 @@ msgstr "Birincil anahtar kaldırıldı"
 msgid "Index %s has been dropped"
 msgstr "%s indeksi kaldırıldı"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+"İndeks %1$s ve %2$s eşit görünüyor ve bunlardan birinin silinmesi mümkün "
+"olabilir."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2769,7 +2916,7 @@ msgstr "İndekse&nbsp;%s&nbsp;sütun ekle"
 msgid "Add a new User"
 msgstr "Yeni Kullanıcı ekle"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Yeni bir kullanıcı eklediniz."
 
@@ -2961,10 +3108,6 @@ msgstr "BLOB Havuzuna gönder"
 msgid "Let every user access this bookmark"
 msgstr "Bütün kullanıcıların bu işaretlemeye erişimlerine izin ver"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "İşaretleme silindi."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Etiket"
@@ -3007,17 +3150,7 @@ msgstr "\"bzip olarak\""
 msgid "Calendar"
 msgstr "Takvim"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"Dışarı aktarma eklentileri yüklenemedi, lütfen kurulumunuzu kontrol edin!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"İçeri aktarma eklentileri yüklenemedi, lütfen kurulumunuzu kontrol edin!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "İndeks'i PRIMARY olarak yeniden adlandıramazsınız!"
 
@@ -3139,11 +3272,6 @@ msgstr "Lütfen %s tablosu için koordinatları yapılandırın"
 msgid "Connections"
 msgstr "Bağlantılar"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "%s veritabanı %s'e kopyalandı."
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Tabloyu şuna (veritabanı<b>.</b>tablo) kopyala:"
@@ -3165,7 +3293,7 @@ msgstr "Kaynağa bağlanamadı"
 msgid "Could not connect to the target"
 msgstr "Hedefe bağlanamadı"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3263,26 +3391,17 @@ msgstr "Çekçe-Slovakça"
 msgid "Danish"
 msgstr "Danca"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Veritabanı adı boş!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Veritabanı dışarı aktarma seçenekleri"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "Veritabanı %1$s oluşturuldu."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr "'%s' veritabanı mevcut değil."
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s veritabanları başarılı olarak kaldırıldı."
@@ -3306,7 +3425,7 @@ msgstr "İstatistikler etkisiz"
 msgid "Enable Statistics"
 msgstr "İstatistikler etkin"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3353,7 +3472,7 @@ msgstr "Tabloyu birleştir"
 msgid "Use delayed inserts"
 msgstr "Gecikmiş eklemeleri kullan"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Silmek için kullanıcı seçilmedi!"
 
@@ -3568,34 +3687,11 @@ msgstr ""
 "%s dosyası zaten sunucuda var, dosya adını değiştirin veya üzerine yazma "
 "seçeneğini işaretleyin."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "veritabanı adı"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "sunucu adı"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "tablo adı"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Bu değer %1$sstrftime%2$s kullanılarak yorumlanır, bu yüzden zaman "
-"biçimlendirme dizgisi kullanabilirsiniz. İlave olarak yandaki dönüşümler "
-"meydana gelecek: %3$s. Diğer metin olduğu gibi tutulacak."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Dosyalar"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3620,7 +3716,7 @@ msgstr "Tabloyu temizle (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Tüm tabloları temizle (kapat)"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3805,15 +3901,6 @@ msgstr "Excel 97-2003 XLS Kitabı"
 msgid "Excel 2007 XLSX Workbook"
 msgstr "Excel 2007 XLSX Kitabı"
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-"İndeks %1$s ve %2$s eşit görünüyor ve bunlardan birinin silinmesi mümkün "
-"olabilir."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3850,7 +3937,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Yeni satır olarak ekle"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Eklenen satır id: %1$d"
@@ -4180,20 +4267,10 @@ msgstr "İşlemleri göster"
 msgid "No databases"
 msgstr "Veritabanı yok"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Veritabanı seçilmedi."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"İçeri aktarmak için veri alınmadı. Ya dosya adı gönderilmedi ya da PHP "
-"yapılandırmanız tarafından izin verilen en fazla boyut aşıldı. SSS 1.16'ya "
-"bakın."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "Açıklama yok"
@@ -4207,15 +4284,11 @@ msgstr "Bu depolama motoru için ayrıntılı durum bilgisi mevcut değil."
 msgid "No files found inside ZIP archive!"
 msgstr "ZIP arşivi içinde hiç dosya bulunamadı!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Tanımlı indeks yok!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Tanımlı indeks kısımları yok!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Değişiklik yok"
 
@@ -4233,7 +4306,7 @@ msgstr "Bu biçimin seçenekleri yok"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Web sunucusu %s dosyasını kaydetmek için izne sahip değil."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Burada bulunmak için yeterli izinlere sahip değilsiniz!"
 
@@ -4270,7 +4343,8 @@ msgstr "mevcut değil"
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> tablosu bulunamadı veya %s içinde ayarlanmadı"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Kullanıcı(lar) bulunamadı."
 
@@ -4317,7 +4391,7 @@ msgstr "Bölüm bakımı"
 msgid "Partition %s"
 msgstr "Bölüm %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "%s için parola başarılı olarak değiştirildi."
@@ -4421,11 +4495,11 @@ msgstr "Polonyaca"
 msgid "Port"
 msgstr "B.Noktası"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Birincil anahtarın ismi \"PRIMARY\" olmalıdır!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4633,7 +4707,7 @@ msgstr "Veri değiştirilmesine izin ver."
 msgid "No privileges."
 msgstr "Yetkiniz yok."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Yetkiler başarılı olarak yüklendi."
 
@@ -4675,11 +4749,6 @@ msgid ""
 msgstr ""
 "<b>Sorgu istatistikleri</b>: Başlangıçtan beri sunucuya %s sorgu gönderildi."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Sorgu %01.4f san. sürdü"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Sorgu türü"
@@ -4708,15 +4777,6 @@ msgstr "İlgili bütünlük kontrolü:"
 msgid "Relational schema"
 msgstr "İlişkisel şema"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Bağlı tablolar ile çalışan ilave özellikler etkisizleştirildi. Nedenini "
-"öğrenmek için %sburaya%s tıklayın."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "İlişkiler"
@@ -4755,11 +4815,6 @@ msgstr "Bölümlendirmeyi kaldır"
 msgid "Remove selected users"
 msgstr "Seçili kullanıcıları kaldır"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "%s veritabanı %s olarak yeniden adlandırıldı"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4877,7 +4932,7 @@ msgstr ""
 "Bu sunucu kopya etme işlemi sırasında asıl sunucu olarak yapılandırılmadı. "
 "Bunu <a href=\"%s\">yapılandırmak</a> ister misiniz?"
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -5022,7 +5077,7 @@ msgstr "%s satırlı eklemeyi yeniden başlat"
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Kullanıcılardan tüm aktif yetkileri geri al ve sonra da sil."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "%s için yetkileri geri aldınız"
@@ -5190,19 +5245,11 @@ msgstr "Tüm Sorguları Göster"
 msgid "Show/Hide left menu"
 msgstr "Sol menüyü Göster/Gizle"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "İşaret gösteriliyor"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "PHP kodu olarak gösteriliyor"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Satırlar gösteriliyor"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "SQL sorgusu gösteriliyor"
 
@@ -6082,7 +6129,7 @@ msgstr "%s tablosu zaten var!"
 msgid "Alter column(s)"
 msgstr "Sekme(leri)yi değiştir"
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Tablo %1$s başarılı olarak değiştirldi"
@@ -6101,7 +6148,7 @@ msgstr "Hedef tablolardan önceki tüm sıraları silme istiyor musunuz?"
 msgid "The table name is empty!"
 msgstr "Tablo adı boş!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "Tablo %1$s oluşturuldu."
@@ -6222,7 +6269,7 @@ msgstr "Bu Anamakine"
 msgid "Threads"
 msgstr "İşlemler"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "%s işlemi başarılı olarak sonlandırıldı."
@@ -6236,14 +6283,6 @@ msgstr ""
 "sınırlarını arttırmadığınız sürece phpMyAdmin'in bu içeri aktarmayı "
 "biteremeyeceği anlamına gelir."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Küçük program zaman aşımı geçti, eğer içeri aktarmayı bitirmek istiyorsanız, "
-"lütfen aynı dosyayı yeniden gönderin ve içeri aktarma devam edecektir."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "sayfadan/sayfaya"
@@ -6260,10 +6299,6 @@ msgstr "Küçüğü/büyüğü değiştir"
 msgid "To select relation, click :"
 msgstr "İlişkiyi seçmek için buraya tıklayın :"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "toplam"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6579,7 +6614,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "%s için yetkileri güncellediniz."
@@ -6600,19 +6635,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr "%s %s veya sonrasına yükseltmelisiniz."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Muhtemelen çok büyük dosya göndermeyi denediniz. Lütfen bu sınıra çözüm yolu "
-"bulmak için %sbelgelere%s başvurun."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Bu sunucuda dosya gönderimlerine izin verilmez."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Kullanım"
@@ -6626,7 +6648,7 @@ msgstr "Tablo ve alan adlarını ters tırnak ile kapsa"
 msgid "Use Host Table"
 msgstr "Anamakine Tablosu kullan"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "%s kullanıcısı zaten var!"
@@ -6639,7 +6661,7 @@ msgstr "%s kullanıcısı zaten var!"
 msgid "User name"
 msgstr "Kullanıcı Adı"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Seçili kullanıcı yetki tablosunda bulunamadı."
 
@@ -6647,7 +6669,7 @@ msgstr "Seçili kullanıcı yetki tablosunda bulunamadı."
 msgid "User overview"
 msgstr "Kullanıcı gözden geçirme"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Seçili kullanıcılar başarılı olarak silindi."
 
@@ -6710,10 +6732,6 @@ msgstr "Tablonun dökümünü (şemasını) göster"
 msgid "VIEW name"
 msgstr "GÖRÜNÜM adı"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Gönderme işi için ayarladığınız dizine ulaşılamıyor"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Web sunucusu"
@@ -6731,10 +6749,6 @@ msgstr "Viki"
 msgid "wildcard"
 msgstr "joker"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Yanlış kullanıcı adı/parola girdiniz. Erişim engellendi."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/tt.po b/po/tt.po
index 6a2d865b2..6f4afb664 100644
--- a/po/tt.po
+++ b/po/tt.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-30 23:14+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: tatarish <tt@li.org>\n"
@@ -91,6 +91,11 @@ msgstr "Açıqlama"
 msgid "Use this value"
 msgstr "Bu bäyä belän"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "%s biremlege beterelde."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Biremlek açıqlaması:"
@@ -207,6 +212,20 @@ msgstr "Saylap Beter"
 msgid "Unselect All"
 msgstr "Saylanunı Töşer"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Biremlek iseme buş!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "\"%s\" biremlege \"%s\" itep ataldı"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "Database %s has been copied to %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Biremlekne bolay atap quy"
@@ -318,6 +337,15 @@ msgstr "Açıq"
 msgid "Collation"
 msgstr "Tezü cayı"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Bäyläneştä torğan tüşämä belän eşläp bulmas, östämä eşli-alu sünek tora. Anı "
+"qabızu öçen, %sbonda çirtäse%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "PDF schema kürsätü"
@@ -645,7 +673,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -822,16 +851,64 @@ msgstr "Tüşämä tikşerü"
 msgid "Database Log"
 msgstr "Biremlek"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Birem uqıp bulmadı"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "Totaşmalar yökläp bulmadı, quyılışın tikşerep alası!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Tamğa beterelde."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Bitbilge kürsätü"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "%s digän bitbilge yaratıldı"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
@@ -848,7 +925,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" cönläläre sünderelgän."
 
@@ -888,10 +966,12 @@ msgid "The user name is empty!"
 msgstr "Atama buş!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Sersüzeñ buş!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Sersüzlär berbersenä kileşmi!"
 
@@ -1313,7 +1393,8 @@ msgstr "Sersüz:"
 msgid "Server Choice"
 msgstr "Server Saylaw"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies must be enabled past this point."
 
@@ -1335,6 +1416,10 @@ msgstr "Kimendä %s sekund eşlämi tordıq, şuña kürä yañadan keräse"
 msgid "Cannot log in to the MySQL server"
 msgstr "MySQL servergä totaşılıp bulmadı"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Atama/sersüzeñ yalğış buluına kürä ireşep bulmadı."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1463,11 +1548,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Qullanma"
 
@@ -1531,7 +1617,7 @@ msgid "Skip Validate SQL"
 msgstr "SQL Tikşermäskä"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "SQL'nı Tikşer"
 
@@ -1586,7 +1672,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1748,6 +1835,7 @@ msgid "Create"
 msgstr "Yarat"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Xoquqsız"
 
@@ -1764,6 +1852,11 @@ msgstr "%s biremlegendä yaña tüşämä yaratu"
 msgid "Number of fields"
 msgstr "Alannar sanı"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+#, fuzzy
+msgid "Could not load export plugins, please check your installation!"
+msgstr "Totaşmalar yökläp bulmadı, quyılışın tikşerep alası!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1792,6 +1885,26 @@ msgstr "Birem bar bulsa, östän yazdırası"
 msgid "File name template"
 msgstr "Birem adınıñ tözeleşe"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "server adı"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "biremlek adı"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "tüşämä adı"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "tözeleşen yatla"
@@ -1863,6 +1976,15 @@ msgstr "Yöklise birem"
 msgid "Location of the text file"
 msgstr "SQL-ämerlege belän birem yökläw"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Yökläw öçen bigelängän törgäkne uqıp bulmí"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2008,6 +2130,20 @@ msgstr "Üter"
 msgid "in query"
 msgstr "sorawda"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Yazma sanı:"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "tulayım"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Soraw eşkärtü %01.4f sek aldı"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2466,11 +2602,6 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Birem uqıp bulmadı"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 #, fuzzy
 msgid ""
@@ -2478,15 +2609,6 @@ msgid ""
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "Törle buluı bar. YBS 3.11 qarísı"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2513,7 +2635,7 @@ msgstr "Ürçätkeç:"
 msgid "Rows"
 msgstr "Kerem"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL sorawğa buş cawap, yäğni nül kertem qaytarttı."
@@ -2560,6 +2682,11 @@ msgstr "Tözeleş"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Açqıç bilgelänmäde!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2597,6 +2724,13 @@ msgstr "Töp açqıç beterelde"
 msgid "Index %s has been dropped"
 msgstr "\"%s\" digän tezeş salındı"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2729,7 +2863,7 @@ msgstr "Açqıçqa tağın &nbsp;%s&nbsp;alan östise"
 msgid "Add a new User"
 msgstr "Yaña qullanuçı östäw"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Yana qullanuçı östälände."
 
@@ -2922,10 +3056,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "Bu tamğanı bar qullanuçığa da ireşüle itäse"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Tamğa beterelde."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Yarlıq"
@@ -2969,16 +3099,7 @@ msgstr "\"bziple\""
 msgid "Calendar"
 msgstr "Täqwim"
 
-#: libraries/messages.inc.php:132
-#, fuzzy
-msgid "Could not load export plugins, please check your installation!"
-msgstr "Totaşmalar yökläp bulmadı, quyılışın tikşerep alası!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "Totaşmalar yökläp bulmadı, quyılışın tikşerep alası!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Açqıçnı \"PRIMARY\" itep atap bulmí!"
 
@@ -3099,11 +3220,6 @@ msgstr "Please configure the coordinates for table %s"
 msgid "Connections"
 msgstr "Totaşular"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "Database %s has been copied to %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Boña kübäyt (biremlek<b>.</b>tüşämä):"
@@ -3125,7 +3241,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3225,26 +3341,17 @@ msgstr "Çex-Slovak"
 msgid "Danish"
 msgstr "Dança"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Biremlek iseme buş!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Biremlek saqlaw köyläneşe"
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "%s biremlege beterelde."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "\"%s\" biremlegen beterü uñışlı uzdı."
@@ -3269,7 +3376,7 @@ msgstr "Nöfüse Sünderü"
 msgid "Enable Statistics"
 msgstr "Nöfüsne Cibärü"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3317,7 +3424,7 @@ msgstr "Tüşämä kisäklären berläşterü"
 msgid "Use delayed inserts"
 msgstr "Kötterep östise"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Beteräse qullanuçılar saylanmağan!"
 
@@ -3530,32 +3637,12 @@ msgstr ""
 "Serverdä %s digän birem bar inde, adın almaştırası, yä inde östän yazu "
 "tamğasın açası qala."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "biremlek adı"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "server adı"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "tüşämä adı"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "Alan"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3580,7 +3667,7 @@ msgstr "Tüşäwne awdar (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Tüşämälärne yabıp beteräse"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3765,13 +3852,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3807,7 +3887,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Yaña yazma kert tä"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4129,17 +4209,10 @@ msgstr "Proseslär tezmäse"
 msgid "No databases"
 msgstr "Biremleklär yuq"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Biremlek saylanmağan."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "Açıqlamasız"
@@ -4153,15 +4226,11 @@ msgstr "Bu saqlaw engine öçen xälät turında centekle belem yuq."
 msgid "No files found inside ZIP archive!"
 msgstr "ZIP-tuplama eçendä biremnär tabılmadı!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Açqıç bilgelänmäde!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "No index parts defined!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Üzgäreşsez"
 
@@ -4180,7 +4249,7 @@ msgstr "Bu tözeleşeneñ köyläneşe yuq"
 msgid "The web server does not have permission to save the file %s."
 msgstr "The web server does not have permission to save the file %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Bonda bulu öçen, xoquqlarıñ citmi!"
 
@@ -4217,7 +4286,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> atlı tüşämä yuq, yä ki \"%s\" tezmäsenä kermi"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Qullanuçı yuq."
 
@@ -4266,7 +4336,7 @@ msgstr "Tüşämä eşkärtü"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "\"%s\" öçen sezsüz üzgärtü uñışlı uzdı."
@@ -4369,11 +4439,11 @@ msgstr "Polça"
 msgid "Port"
 msgstr "Tezü"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Bu töp açqıçnıñ adı \"PRIMARY\" bulırğa tieş!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(Töp açqıçnıñ <b>ğına</b> adı \"PRIMARY\" bulırğa <b>tieş</b>!)"
@@ -4574,7 +4644,7 @@ msgstr "Eçtälek üzgärtü xoquqı."
 msgid "No privileges."
 msgstr "Xoquqlar yuq."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Bu xoquqlarnı yökläw uñışlı uzdı."
 
@@ -4616,11 +4686,6 @@ msgid ""
 msgstr ""
 "<b>Soraw nöfüse</b>: Bu server yöklännän birle, aña taba %s soraw kilgän."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Soraw eşkärtü %01.4f sek aldı"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Soraw töre"
@@ -4649,15 +4714,6 @@ msgstr "Bäyläneşlärne döreslekkä tikşerü:"
 msgid "Relational schema"
 msgstr "Bäyläneşlär sxeme"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Bäyläneştä torğan tüşämä belän eşläp bulmas, östämä eşli-alu sünek tora. Anı "
-"qabızu öçen, %sbonda çirtäse%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Bäyläneşlär"
@@ -4696,11 +4752,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "Saylanğan qullanuçı beterü"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "\"%s\" biremlege \"%s\" itep ataldı"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4807,7 +4858,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4944,7 +4995,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Qullanuçı xoquqların awdarıp beteräse."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "You have revoked the privileges for %s"
@@ -5103,19 +5154,11 @@ msgstr "Tulı Sorawlar Kürsät"
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Bitbilge kürsätü"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Yazma sanı:"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 #, fuzzy
 msgid "Showing SQL query"
 msgstr "Tulı Sorawlar Kürsät"
@@ -5892,7 +5935,7 @@ msgstr "%s atlı tüşämä bar inde!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, fuzzy, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "Saylanğan qullanuçını beterü uñışlı uzdı."
@@ -5911,7 +5954,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Tüşämä adı kertelmi qaldı!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "\"%s\" atlı tüşämä beterelde"
@@ -6033,7 +6076,7 @@ msgstr "Bu Sanaq"
 msgid "Threads"
 msgstr "Ceplär"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "%s cebe uñışlı üterelgän buldı."
@@ -6044,12 +6087,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -6066,10 +6103,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "tulayım"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6370,7 +6403,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "belgesez"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "You have updated the privileges for %s."
@@ -6389,17 +6422,6 @@ msgstr "Sineñ Column_comments Tüşämä yañartu eşe turında Qullanmada qar
 msgid "You should upgrade to %s %s or later."
 msgstr "You should upgrade to %s %s or later."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Totılu"
@@ -6413,7 +6435,7 @@ msgstr "Tüşämä/alan isemnären kirequote eçenä salası"
 msgid "Use Host Table"
 msgstr "Host Tüşämä eçennän"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "\"%s\" atlı qullanuçı bar inde!"
@@ -6426,7 +6448,7 @@ msgstr "\"%s\" atlı qullanuçı bar inde!"
 msgid "User name"
 msgstr "İreşü iseme"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Bu qullanuçı xoquqlar tüşämä eçendä tabılmadı."
 
@@ -6434,7 +6456,7 @@ msgstr "Bu qullanuçı xoquqlar tüşämä eçendä tabılmadı."
 msgid "User overview"
 msgstr "Qullanuçılar tezmäse"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Saylanğan qullanuçını beterü uñışlı uzdı."
 
@@ -6497,10 +6519,6 @@ msgstr "Tüşämä eçtälegen (tözeleşen) çığaru"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Yökläw öçen bigelängän törgäkne uqıp bulmí"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6518,10 +6536,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "almaşbilge"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Atama/sersüzeñ yalğış buluına kürä ireşep bulmadı."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/uk.po b/po/uk.po
index f587f4acc..9b1c1be77 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:19+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: ukrainian <uk@li.org>\n"
@@ -86,6 +86,11 @@ msgstr "Опис"
 msgid "Use this value"
 msgstr ""
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr ""
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Коментар бази даних: "
@@ -202,6 +207,20 @@ msgstr "Відмітити все"
 msgid "Unselect All"
 msgstr "Зняти всі відмітки"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr ""
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr ""
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr ""
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr ""
@@ -312,6 +331,15 @@ msgstr ""
 msgid "Collation"
 msgstr "Порівняння"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Додаткова можливість роботи із залінкованими таблицями деактивована. Для "
+"того, щоб довідатись чому, натисніть %sтут%s."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "Показати PDF схему"
@@ -639,7 +667,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -807,16 +836,64 @@ msgstr ""
 msgid "Database Log"
 msgstr ""
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Неможливо прочитати файл"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Закладку було видалено."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "Для роботи phpMyAdmin потрібно браузер з підтримкою <b>фреймів</b>."
@@ -833,7 +910,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "Оператори \"DROP DATABASE\" заборонені."
 
@@ -873,10 +951,12 @@ msgid "The user name is empty!"
 msgstr "Порожнє і'мя користувача!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Порожній пароль!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Паролі не однакові!"
 
@@ -1297,7 +1377,8 @@ msgstr "Пароль:"
 msgid "Server Choice"
 msgstr "Вибір сервера"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "З цього моменту Cookies повинні бути дозволені."
 
@@ -1319,6 +1400,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "Не можу зареєструватися на MySQL сервері"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Невірний логін/пароль. Доступ не дозволено."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1447,11 +1532,12 @@ msgstr ""
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Документація"
 
@@ -1515,7 +1601,7 @@ msgid "Skip Validate SQL"
 msgstr "Не перевіряти SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "Перевірити SQL"
 
@@ -1568,7 +1654,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1727,6 +1814,7 @@ msgid "Create"
 msgstr "Створити"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Без привілеїв"
 
@@ -1743,6 +1831,10 @@ msgstr "Створити нову таблицю в БД %s"
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1771,6 +1863,26 @@ msgstr "Заміняти існуючі файли"
 msgid "File name template"
 msgstr "Шаблон назви файлу"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr ""
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr ""
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "запам'ятати шаблон"
@@ -1842,6 +1954,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr "вкажіть розташування текстового файлу"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Встановлений Вами каталог для завантаження файлів недоступний"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1985,6 +2106,20 @@ msgstr "Вбити"
 msgid "in query"
 msgstr "по запиту"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Показано записи "
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "всього"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Запит виконувався %01.4f сек"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2422,26 +2557,12 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Неможливо прочитати файл"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2467,7 +2588,7 @@ msgstr "Згенеровано"
 msgid "Rows"
 msgstr "Рядки"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL повернула пустий результат (тобто нуль рядків)."
@@ -2511,6 +2632,11 @@ msgstr ""
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Індекс не визначено!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2547,6 +2673,13 @@ msgstr "Первинний ключ було знищено"
 msgid "Index %s has been dropped"
 msgstr "Індекс %s було знищено"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2676,7 +2809,7 @@ msgstr "Додати до індексу&nbsp;%s&nbsp;колоноку(и)"
 msgid "Add a new User"
 msgstr "Додати нового користувача"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Було додано нового користувача."
 
@@ -2865,10 +2998,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr ""
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Закладку було видалено."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Мітка"
@@ -2911,15 +3040,7 @@ msgstr "запакувати в \"bzip\""
 msgid "Calendar"
 msgstr ""
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Неможливо перейменувати індекс в PRIMARY!"
 
@@ -3040,11 +3161,6 @@ msgstr "Прошу сконфіґурувати координати табли
 msgid "Connections"
 msgstr "З'єднань"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr ""
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Скопіювати таблицю в (база даних<b>.</b>таблиця):"
@@ -3066,7 +3182,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3162,26 +3278,17 @@ msgstr ""
 msgid "Danish"
 msgstr "Данське"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr ""
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Налаштування експорту бази даних"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr ""
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s баз(а\\и) даних успішно знищено."
@@ -3205,7 +3312,7 @@ msgstr "Заборонити статистику"
 msgid "Enable Statistics"
 msgstr "Дозволити статистику"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3252,7 +3359,7 @@ msgstr ""
 msgid "Use delayed inserts"
 msgstr ""
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3464,31 +3571,11 @@ msgstr ""
 "Файл %s існує на сервері, прошу змінити назву файлу, або відмітити опцію "
 "заміни існуючих файлів."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr ""
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr ""
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr ""
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3513,7 +3600,7 @@ msgstr "Очистити кеш таблиці (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3695,13 +3782,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3738,7 +3818,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Вставити як новий рядок"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4053,17 +4133,10 @@ msgstr "Показати процеси"
 msgid "No databases"
 msgstr "БД відсутні"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Не вибрано бази даних."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "без опису"
@@ -4077,15 +4150,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Індекс не визначено!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Не визначено частини індекса!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Змін немає"
 
@@ -4103,7 +4172,7 @@ msgstr "Цей формат не має опцій"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Веб-сервер не має привілеїв для збереження файлу %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Ви для цього маєте недостатньо прав!"
 
@@ -4138,7 +4207,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "Таблицю <b>%s</b> не знайдено або не визначено у %s"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Не знайдено користувача."
 
@@ -4185,7 +4255,7 @@ msgstr ""
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "Пароль для %s успішно змінено."
@@ -4285,11 +4355,11 @@ msgstr ""
 msgid "Port"
 msgstr ""
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Ім'я первинного ключа повинно бути PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(\"PRIMARY\" <b>повинно</b> бути іменем <b>лише</b> первинного ключа!)"
@@ -4492,7 +4562,7 @@ msgstr "Дозволити зміну даних."
 msgid "No privileges."
 msgstr "Немає прав."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Права успішно перезавантажено."
 
@@ -4535,11 +4605,6 @@ msgstr ""
 "<b>Статистика запитів</b>: З моменту запуску, до сервера було надіслано %s "
 "запитів."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Запит виконувався %01.4f сек"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Тип запиту"
@@ -4568,15 +4633,6 @@ msgstr "Перевір цілісність даних на рівні поси
 msgid "Relational schema"
 msgstr "Схема зв'язків"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Додаткова можливість роботи із залінкованими таблицями деактивована. Для "
-"того, щоб довідатись чому, натисніть %sтут%s."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Зв'язки"
@@ -4615,11 +4671,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "Усунути відмічених користувачів"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr ""
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4723,7 +4774,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4859,7 +4910,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "Відмінити всі активні права користувачів та усунути їх після цього."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "Ви змінили привілеї для %s"
@@ -5018,19 +5069,11 @@ msgstr "Показати повні запити"
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Показано записи "
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5793,7 +5836,7 @@ msgstr ""
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr ""
@@ -5812,7 +5855,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "Порожня назва таблиці!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr ""
@@ -5933,7 +5976,7 @@ msgstr "Цей хост"
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "Процес %s припинено."
@@ -5944,12 +5987,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -5966,10 +6003,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "всього"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6261,7 +6294,7 @@ msgstr "Юнікод"
 msgid "unknown"
 msgstr "невідоме"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, fuzzy, php-format
 msgid "You have updated the privileges for %s."
 msgstr "Було змінено привілеї для"
@@ -6282,17 +6315,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr ""
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Використання"
@@ -6306,7 +6328,7 @@ msgstr "Зворотні лапки в назвах таблиць і полів
 msgid "Use Host Table"
 msgstr "Використовувати Таблицю Хостів"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Користувач %s вже існує!"
@@ -6319,7 +6341,7 @@ msgstr "Користувач %s вже існує!"
 msgid "User name"
 msgstr "Ім'я користувача"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Вказаного користувача не знайдено в таблиці прав."
 
@@ -6327,7 +6349,7 @@ msgstr "Вказаного користувача не знайдено в та
 msgid "User overview"
 msgstr "Огляд користувачів"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Відмічених користувачів успішно усунуто."
 
@@ -6388,10 +6410,6 @@ msgstr "Переглянути дамп (схему) таблиці"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Встановлений Вами каталог для завантаження файлів недоступний"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6409,10 +6427,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "шаблон"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Невірний логін/пароль. Доступ не дозволено."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/ur.po b/po/ur.po
index 8338d1c2e..07a255727 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-04-09 14:02+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: Urdu <ur@li.org>\n"
@@ -91,6 +91,11 @@ msgstr ""
 msgid "Use this value"
 msgstr ""
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr ""
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr ""
@@ -207,6 +212,20 @@ msgstr ""
 msgid "Unselect All"
 msgstr ""
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr ""
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr ""
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr ""
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr ""
@@ -311,6 +330,13 @@ msgstr ""
 msgid "Collation"
 msgstr ""
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr ""
@@ -638,7 +664,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -806,16 +833,64 @@ msgstr ""
 msgid "Database Log"
 msgstr ""
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr ""
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr ""
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr ""
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr ""
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr ""
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -832,7 +907,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr ""
 
@@ -872,10 +948,12 @@ msgid "The user name is empty!"
 msgstr ""
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr ""
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr ""
 
@@ -1244,7 +1322,8 @@ msgstr ""
 msgid "Server Choice"
 msgstr ""
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr ""
 
@@ -1266,6 +1345,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr ""
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr ""
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1379,11 +1462,12 @@ msgstr "en"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr ""
 
@@ -1447,7 +1531,7 @@ msgid "Skip Validate SQL"
 msgstr ""
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr ""
 
@@ -1500,7 +1584,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1659,6 +1744,7 @@ msgid "Create"
 msgstr ""
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr ""
 
@@ -1675,6 +1761,10 @@ msgstr ""
 msgid "Number of fields"
 msgstr ""
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1703,6 +1793,26 @@ msgstr ""
 msgid "File name template"
 msgstr ""
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr ""
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr ""
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr ""
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr ""
@@ -1768,6 +1878,15 @@ msgstr ""
 msgid "Location of the text file"
 msgstr ""
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr ""
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1911,6 +2030,20 @@ msgstr ""
 msgid "in query"
 msgstr ""
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr ""
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr ""
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr ""
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2348,26 +2481,12 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr ""
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2393,7 +2512,7 @@ msgstr ""
 msgid "Rows"
 msgstr ""
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
@@ -2437,6 +2556,11 @@ msgstr ""
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr ""
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2473,6 +2597,13 @@ msgstr ""
 msgid "Index %s has been dropped"
 msgstr ""
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2602,7 +2733,7 @@ msgstr ""
 msgid "Add a new User"
 msgstr ""
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr ""
 
@@ -2791,10 +2922,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr ""
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr ""
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr ""
@@ -2837,15 +2964,7 @@ msgstr ""
 msgid "Calendar"
 msgstr ""
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr ""
 
@@ -2962,11 +3081,6 @@ msgstr ""
 msgid "Connections"
 msgstr ""
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr ""
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr ""
@@ -2988,7 +3102,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3084,26 +3198,17 @@ msgstr ""
 msgid "Danish"
 msgstr ""
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr ""
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr ""
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr ""
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr ""
@@ -3127,7 +3232,7 @@ msgstr ""
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3170,7 +3275,7 @@ msgstr ""
 msgid "Use delayed inserts"
 msgstr ""
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr ""
 
@@ -3378,31 +3483,11 @@ msgid ""
 "File %s already exists on server, change filename or check overwrite option."
 msgstr ""
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr ""
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr ""
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr ""
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr ""
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3423,7 +3508,7 @@ msgstr ""
 msgid "Flush (close) all tables"
 msgstr ""
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3605,13 +3690,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3644,7 +3722,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -3952,17 +4030,10 @@ msgstr ""
 msgid "No databases"
 msgstr ""
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr ""
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr ""
@@ -3976,15 +4047,11 @@ msgstr ""
 msgid "No files found inside ZIP archive!"
 msgstr ""
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr ""
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr ""
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr ""
 
@@ -4002,7 +4069,7 @@ msgstr ""
 msgid "The web server does not have permission to save the file %s."
 msgstr ""
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr ""
 
@@ -4037,7 +4104,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr ""
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr ""
 
@@ -4084,7 +4152,7 @@ msgstr ""
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr ""
@@ -4184,11 +4252,11 @@ msgstr ""
 msgid "Port"
 msgstr ""
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr ""
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
@@ -4381,7 +4449,7 @@ msgstr ""
 msgid "No privileges."
 msgstr ""
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
@@ -4422,11 +4490,6 @@ msgid ""
 "server."
 msgstr ""
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr ""
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr ""
@@ -4455,13 +4518,6 @@ msgstr ""
 msgid "Relational schema"
 msgstr ""
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr ""
@@ -4500,11 +4556,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr ""
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr ""
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4608,7 +4659,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4744,7 +4795,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr ""
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr ""
@@ -4897,19 +4948,11 @@ msgstr ""
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr ""
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr ""
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5659,7 +5702,7 @@ msgstr ""
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr ""
@@ -5678,7 +5721,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr ""
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr ""
@@ -5799,7 +5842,7 @@ msgstr ""
 msgid "Threads"
 msgstr ""
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr ""
@@ -5810,12 +5853,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -5832,10 +5869,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr ""
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6106,7 +6139,7 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr ""
@@ -6125,17 +6158,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr ""
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr ""
@@ -6149,7 +6171,7 @@ msgstr ""
 msgid "Use Host Table"
 msgstr ""
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
@@ -6162,7 +6184,7 @@ msgstr ""
 msgid "User name"
 msgstr ""
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
@@ -6170,7 +6192,7 @@ msgstr ""
 msgid "User overview"
 msgstr ""
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr ""
 
@@ -6229,10 +6251,6 @@ msgstr ""
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr ""
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6250,10 +6268,6 @@ msgstr ""
 msgid "wildcard"
 msgstr ""
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr ""
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/uz.po b/po/uz.po
index 5cc356d33..091af0421 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: uzbek_cyrillic <uz@li.org>\n"
@@ -88,6 +88,11 @@ msgstr "Тавсифи"
 msgid "Use this value"
 msgstr "Ушбу қийматни ишлатиш"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr " %1$s маълумотлар базаси тузилди."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Маълумотлар базасига изоҳ:"
@@ -204,6 +209,20 @@ msgstr "Барчасини белгилаш"
 msgid "Unselect All"
 msgstr "Белгилашни бекор қилиш"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Маълумотлар базаси номи бўш!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr " `\"%s\"` маълумотлар базасининг номи `\"%s\"` деб ўзгартирилди."
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "\"%s\" маълумотлар базасидан \"%s\" га нусха кўчирилди."
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Маълумотлар базаси номини қуйидагига ўзгартириш"
@@ -314,6 +333,15 @@ msgstr "Фаоллантириш"
 msgid "Collation"
 msgstr "Таққослаш"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Алоқадор жадваллар билан ишлаш учун қўшимча имкониятлар мавжуд эмас. "
+"Сабабларини аниқлаш учун %sбу ерга%s босинг."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "PDF-схемани кўрсатиш"
@@ -641,7 +669,8 @@ msgstr "Кузатиш фаол."
 msgid "Tracking is not active."
 msgstr "Кузатиш фаол эмас."
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -811,16 +840,78 @@ msgstr "Жадвални кузатиш"
 msgid "Database Log"
 msgstr "База лог файлини"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Эҳтимол, юкланаётган файл ҳажми жуда катта. Бу муаммони ечишнинг усуллари %"
+"sдокументацияда%s келтирилган."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Файлни ўқиб бўлмади!!"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Юкланаётган файл (\"%s\") ёрдамида қисилган. Лекин у дастур тизимда мавжуд "
+"эмас, шунинг учун ушбу файлни импорт қилиб бўлмайди. Агар дастур мавжуд "
+"бўлса, демак у конфигурация вақтида ўчириб қўйилган."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Импорт қилиш имкони йўқ. Сабаблар: импорт файли танланмаган; импорт "
+"қилинаётган файл ҳажми PHP конфигурацион файлида кўрсатилган максимал "
+"қийматдан катта. Қаранг: [a@./Documentation.html#faq1_16@Documentation]FAQ "
+"1.16[/a]."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"Импорт модуллари мавжуд эмас! Ўрнатилган phpMyAdmin нусхасининг libraries/"
+"export каталогини текширинг."
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Хатчўп ўчирилди."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Хатчўпларни кўрсатиш"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "\"%s\" хатчўпи тузилди"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Импорт муваффақиятли тугатилди, бажарилган сўровлар сони: %d."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Чегараланган вақт бўлди. Агар импорт жараёнини якунламоқчи бўлсангиз, унда "
+"ўша файлни танлаган ҳолда уни қайта ишга туширинг ва жараён узилган жойдан "
+"бошлаб давом этади."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -838,7 +929,8 @@ msgstr "Танлаш учун сичқонча тугмасини босинг"
 msgid "Click to unselect"
 msgstr "Танлашни бекор қилиш учун сичқонча тугмасини босинг"
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" (маълумотлар базасини ўчириш) буйруғи ўчирилган."
 
@@ -880,10 +972,12 @@ msgid "The user name is empty!"
 msgstr "Фойдаланувчи номи белгиланмаган!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Парол белгиланмаган!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Киритилган пароллар бир хил эмас!"
 
@@ -1307,7 +1401,8 @@ msgstr "Парол:"
 msgid "Server Choice"
 msgstr "Серверни танланг"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Браузерда \"cookies\" фаоллаштирилган бўлиши шарт."
 
@@ -1333,6 +1428,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "MySQL серверига уланиб бўлмади"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Киритилган маълумотлар нотўғри. Кириш мумкин эмас."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1467,11 +1566,12 @@ msgstr "Юборилди"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Документация"
 
@@ -1535,7 +1635,7 @@ msgid "Skip Validate SQL"
 msgstr "SQL синтаксиси текширувини олиб ташлаш"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "SQL тўғрилигини текшириш"
 
@@ -1592,7 +1692,8 @@ msgstr ""
 msgid "Font size"
 msgstr "Шрифт ўлчами"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1759,6 +1860,7 @@ msgid "Create"
 msgstr "Тузиш"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Привилегиялар йўқ"
 
@@ -1775,6 +1877,12 @@ msgstr "\"%s\" маълумотлар базасида янги жадвал т
 msgid "Number of fields"
 msgstr "Майдонлар сони "
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"Экспорт модуллари мавжуд эмас! Ўрнатилган phpMyAdmin нусхасининг libraries/"
+"export каталогини текширинг."
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1803,6 +1911,29 @@ msgstr "Мавжуд файл(лар) устидан ёзиш"
 msgid "File name template"
 msgstr "Файл номи шаблони"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "сервер номи"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "маълумотлар базаси номи"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "жадвал номи"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Қиймат %1$sstrftime%2$s функцияси билан қайта ишланган, шунинг учун ҳозирги "
+"вақт ва санани қўйиш мумкин. Қўшимча равишда қуйидагилар ишлатилиши мумкин: %"
+"3$s. Матннинг бошқа қисмлари ўзгаришсиз қолади."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr " шаблонни ёдда тутиш"
@@ -1879,6 +2010,15 @@ msgstr "Импорт қилинаётган файл "
 msgid "Location of the text file"
 msgstr "Файлни танлаш"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Файлларни серверга юклаб бўлмади."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Кўрсатилган каталокка юклаб бўлмади"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2028,6 +2168,20 @@ msgstr "Тугатиш"
 msgid "in query"
 msgstr "сўров бўйича"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Ёзувларни кўрсатиш"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "жами"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "Сўров %01.4f секунд вақт олди"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2516,11 +2670,6 @@ msgstr "Файлни дискка ёзишдахатолик юз берди."
 msgid "File upload stopped by extension."
 msgstr "Файлнинг юкланиши унинг кенгайтмаси сабали тўхтатилди."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Файлни ўқиб бўлмади!!"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
@@ -2529,18 +2678,6 @@ msgstr ""
 "Юкланган файл жойини ўзгартиришда хатолик, [a@./Documentation."
 "html#faq1_11@Documentation]\"FAQ 1.11\"[/a]га қаранг"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Юкланаётган файл (\"%s\") ёрдамида қисилган. Лекин у дастур тизимда мавжуд "
-"эмас, шунинг учун ушбу файлни импорт қилиб бўлмайди. Агар дастур мавжуд "
-"бўлса, демак у конфигурация вақтида ўчириб қўйилган."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2566,7 +2703,7 @@ msgstr "Тузилган"
 msgid "Rows"
 msgstr "Қаторларсони"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL бўш натижа берди (яъни нольта сатр)."
@@ -2612,6 +2749,11 @@ msgstr "тузилиш"
 msgid "Go to view"
 msgstr "Ушбу кўринишга ўтиш"
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Индекс белгиланмаган!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2648,6 +2790,13 @@ msgstr "Бирламчи калит ўчирилди"
 msgid "Index %s has been dropped"
 msgstr " \"%s\" индекси ўчирилди"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr " %1$s ва %2$s индекслари бир хил, улардан бирини ўчириш мумкин."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2780,7 +2929,7 @@ msgstr " \"%s\" майдон(лар)ини индексга қўшиш"
 msgid "Add a new User"
 msgstr "Янги фойдаланувчи қўшиш"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Сиз янги фойдаланувчи қўшдингиз."
 
@@ -2972,10 +3121,6 @@ msgstr "BLOB омборига юклаш"
 msgid "Let every user access this bookmark"
 msgstr "Барча фойдаланувчиларга рухсат бериш"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Хатчўп ўчирилди."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Хатчўп белгиси"
@@ -3018,19 +3163,7 @@ msgstr "bzip ёрдамида сиқилган"
 msgid "Calendar"
 msgstr "Тақвим"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"Экспорт модуллари мавжуд эмас! Ўрнатилган phpMyAdmin нусхасининг libraries/"
-"export каталогини текширинг."
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"Импорт модуллари мавжуд эмас! Ўрнатилган phpMyAdmin нусхасининг libraries/"
-"export каталогини текширинг."
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Индексни \"PRIMARY\"га қайта номлаб бўлмади!"
 
@@ -3151,11 +3284,6 @@ msgstr " \"%s\" жадвалининг координаталарини ўзга
 msgid "Connections"
 msgstr "Уланишлар"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "\"%s\" маълумотлар базасидан \"%s\" га нусха кўчирилди."
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Жадвалдан (маълумотлар омбори<b>.</b>жадвал) га нусха кўчириш:"
@@ -3177,7 +3305,7 @@ msgstr "Манбага уланиб бўлмади"
 msgid "Could not connect to the target"
 msgstr "Нишонга уланиб бўлмади"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3278,26 +3406,17 @@ msgstr "Чехословакча"
 msgid "Danish"
 msgstr "Данияча"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Маълумотлар базаси номи бўш!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Маълумотлар базаси экспорт параметрлари"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr " %1$s маълумотлар базаси тузилди."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr "'%s' номли база мавжуд эмас."
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "\"%s\" маълумотлар базаси муваффақиятли ўчирилди."
@@ -3321,7 +3440,7 @@ msgstr "Статискани ўчириш"
 msgid "Enable Statistics"
 msgstr "Статискани ёқиш"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3368,7 +3487,7 @@ msgstr "Жадвални дефрагментациялаш"
 msgid "Use delayed inserts"
 msgstr "Кечиктирилган қўйиш (DELAYED INSERTS) дан фойдаланиш"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "Ўчириш лозим бўлган фойдаланувчилар танланмаган!"
 
@@ -3582,34 +3701,11 @@ msgstr ""
 "\"%s\" файли серверда мавжуд, унинг номини ўзгартиринг ёки қайта ёзиш "
 "параметрини ёқинг."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "маълумотлар базаси номи"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "сервер номи"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "жадвал номи"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Қиймат %1$sstrftime%2$s функцияси билан қайта ишланган, шунинг учун ҳозирги "
-"вақт ва санани қўйиш мумкин. Қўшимча равишда қуйидагилар ишлатилиши мумкин: %"
-"3$s. Матннинг бошқа қисмлари ўзгаришсиз қолади."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Файллар сони "
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3634,7 +3730,7 @@ msgstr "Жадвал кешини янгилаш (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Барча жадвалларни ёпиш"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3821,13 +3917,6 @@ msgstr "Excel 97-2003 XLS иш китоби"
 msgid "Excel 2007 XLSX Workbook"
 msgstr "Excel 2007 XLSX иш китоби"
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr " %1$s ва %2$s индекслари бир хил, улардан бирини ўчириш мумкин."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3864,7 +3953,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Ёзув киритиш"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Киритилган қатор идентификатори: %1$d"
@@ -4197,21 +4286,10 @@ msgstr "Жараёнлар рўйхати"
 msgid "No databases"
 msgstr "Маълумотлар базаси мавжуд эмас"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Биронта ҳам маълумотлар базаси танланмаган."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Импорт қилиш имкони йўқ. Сабаблар: импорт файли танланмаган; импорт "
-"қилинаётган файл ҳажми PHP конфигурацион файлида кўрсатилган максимал "
-"қийматдан катта. Қаранг: [a@./Documentation.html#faq1_16@Documentation]FAQ "
-"1.16[/a]."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "тавсиф мавжуд эмас"
@@ -4225,15 +4303,11 @@ msgstr "Ушбу турдаги жадваллар ҳақида қўшимча 
 msgid "No files found inside ZIP archive!"
 msgstr "ZIP-архив ичида файл мавжуд эмас!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Индекс белгиланмаган!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Индекс қисмлари белгиланмаган!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "Ўзгариш йўқ"
 
@@ -4251,7 +4325,7 @@ msgstr "Ушбу формат учун созланадиган параметр
 msgid "The web server does not have permission to save the file %s."
 msgstr "\"%s\" файлини веб-серверга сақлаш учун ҳуқуқлар етарли эмас."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Ушбу саҳифага кириш учун Сизда етарли ҳуқуқ мавжуд эмас!"
 
@@ -4288,7 +4362,8 @@ msgstr "Мавжуд эмас"
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr " <b>\"%s\"</b> жадвали топилмади ёки <b>\"%s\"</b>да ўрнатилмаган"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Биронта ҳам фойдаланувчи топилмади."
 
@@ -4335,7 +4410,7 @@ msgstr "бўлакларга хизмат кўрсатиш"
 msgid "Partition %s"
 msgstr "\"%s\" бўлаги"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "\"%s\" фойдаланувчининг пароли муваффақиятли ўзгартирилди."
@@ -4440,11 +4515,11 @@ msgstr "Полякча"
 msgid "Port"
 msgstr "Порт"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Бирламчи индекс номи \"PRIMARY\" бўлиши керак!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(\"PRIMARY\" номи <b>фақат</b> бирламчи индексгаэга бўлиши шарт!)"
@@ -4653,7 +4728,7 @@ msgstr "Маълумотларни ўзгартиришга рухсат бер
 msgid "No privileges."
 msgstr "Привилегиялар йўқ"
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Привилегиялар муваффақиятли қайта юкланди."
 
@@ -4696,11 +4771,6 @@ msgstr ""
 "Сўровлар статискаси: ишга туширилгандан вақтдан бошлаб серверга юборилган "
 "сўровлар сони - \"%s\"."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "Сўров %01.4f секунд вақт олди"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "Сўров тури"
@@ -4729,15 +4799,6 @@ msgstr "Маълумотлар яхлитлигини текшириш:"
 msgid "Relational schema"
 msgstr "Алоқалар схемаси"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Алоқадор жадваллар билан ишлаш учун қўшимча имкониятлар мавжуд эмас. "
-"Сабабларини аниқлаш учун %sбу ерга%s босинг."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Алоқалар"
@@ -4776,11 +4837,6 @@ msgstr "Бўлакларни (PARTITIONS) ўчириш"
 msgid "Remove selected users"
 msgstr "Белгиланган фойдаланувчиларни ўчириш"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr " `\"%s\"` маълумотлар базасининг номи `\"%s\"` деб ўзгартирилди."
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4898,7 +4954,7 @@ msgstr ""
 "Ушбу сервер репликация жараёнида \"бош сервер\" деб конфигурация қилинмаган. "
 "Сиз уни <a href=\"%s\">конфигурация</a> қилмоқчимисиз?"
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -5047,7 +5103,7 @@ msgstr ""
 "Фойдаланувчиларнинг барча фаол привилегияларини бекор қилиш, сўнг уларни "
 "ўчириш."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr " \"%s\" фойдаланувчининг привилегиялари бекор қилинди."
@@ -5215,19 +5271,11 @@ msgstr "Сўровларнинг кенгайтирилган кўриниши"
 msgid "Show/Hide left menu"
 msgstr "Чап менюни кўрсатиш/яшириш"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Хатчўпларни кўрсатиш"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "PHP-код сифатида кўрсатиш"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Ёзувларни кўрсатиш"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "SQL-сўровни кўрсатиш"
 
@@ -6121,7 +6169,7 @@ msgstr "\"%s\" номли жадвал мавжуд!"
 msgid "Alter column(s)"
 msgstr "Устун(лар)ни ўзгартириш"
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "%1$s жадвали муваффақиятли ўзгартирилди"
@@ -6140,7 +6188,7 @@ msgstr "Нишон жадвалдаги барча олдинги қаторла
 msgid "The table name is empty!"
 msgstr "Жадвал номи кўрсатилмаган!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "%1$s жадвали тузилди."
@@ -6261,7 +6309,7 @@ msgstr "Ушбу хост"
 msgid "Threads"
 msgstr "Оқимлар"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr " \"%s\" жараёни муваффақиятли якунланди."
@@ -6275,15 +6323,6 @@ msgstr ""
 "Одатда, бу ҳол, php-сценарийлар учун ажратилган вақт оширилмагунча "
 "phpMyAdmin дастури импорт жараёнини якунла олмаслигини билдиради."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Чегараланган вақт бўлди. Агар импорт жараёнини якунламоқчи бўлсангиз, унда "
-"ўша файлни танлаган ҳолда уни қайта ишга туширинг ва жараён узилган жойдан "
-"бошлаб давом этади."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "Саҳифа"
@@ -6300,10 +6339,6 @@ msgstr "Тескари кўрсатиш"
 msgid "To select relation, click :"
 msgstr "Алоқани танлаш учун расмда кўрсатилганикаби уланиш нуқтасига босинг:"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "жами"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6620,7 +6655,7 @@ msgstr "Юникод"
 msgid "unknown"
 msgstr "номаълум"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr " \"%s\" учун привилегиялар ўзгартирилди."
@@ -6641,19 +6676,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr " \"%s\" ни \"%s\" версияга ёки каттароқ версияга янгилаш зарур."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Эҳтимол, юкланаётган файл ҳажми жуда катта. Бу муаммони ечишнинг усуллари %"
-"sдокументацияда%s келтирилган."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Файлларни серверга юклаб бўлмади."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Ишлатилиш"
@@ -6667,7 +6689,7 @@ msgstr "Жадвал ва майдон номларини тескари қўш
 msgid "Use Host Table"
 msgstr "Хостлар жадвалидан фойдаланиш"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr " \"%s\" номли фойдаланувчи мавжуд!"
@@ -6680,7 +6702,7 @@ msgstr " \"%s\" номли фойдаланувчи мавжуд!"
 msgid "User name"
 msgstr "Фойдаланувчи номи"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Белгиланган фойдаланувчи привилегиялар жадвалида топилмади."
 
@@ -6688,7 +6710,7 @@ msgstr "Белгиланган фойдаланувчи привилегияла
 msgid "User overview"
 msgstr "Фойдаланувчилар ҳисобини кўриб чиқиш"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Белгиланган фойдаланувчилар муваффақиятли ўчирилди."
 
@@ -6750,10 +6772,6 @@ msgstr "Жадвал дампини (схемасини) намойиш этиш
 msgid "VIEW name"
 msgstr "Ном кўриниши"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Кўрсатилган каталокка юклаб бўлмади"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Веб сервер"
@@ -6771,10 +6789,6 @@ msgstr "Вики"
 msgid "wildcard"
 msgstr "Гуруҳлаш белгиси"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Киритилган маълумотлар нотўғри. Кириш мумкин эмас."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/uz@latin.po b/po/uz@latin.po
index ced952111..41b513d94 100644
--- a/po/uz@latin.po
+++ b/po/uz@latin.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: uzbek_latin <uz@latin@li.org>\n"
@@ -89,6 +89,11 @@ msgstr "Tavsifi"
 msgid "Use this value"
 msgstr "Ushbu qiymatni ishlatish"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr " %1$s ma`lumotlar bazasi tuzildi."
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "Ma`lumotlar bazasiga izoh:"
@@ -205,6 +210,20 @@ msgstr "Barchasini belgilash"
 msgid "Unselect All"
 msgstr "Belgilashni bekor qilish"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "Ma`lumotlar bazasi nomi bo‘sh!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr " `\"%s\"` ma`lumotlar bazasining nomi `\"%s\"` deb o‘zgartirildi."
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "\"%s\" ma`lumotlar bazasidan \"%s\" ga nusxa ko‘chirildi."
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "Ma`lumotlar bazasi nomini quyidagiga o‘zgartirish"
@@ -315,6 +334,15 @@ msgstr "Faollantirish"
 msgid "Collation"
 msgstr "Taqqoslash"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr ""
+"Aloqador jadvallar bilan ishlash uchun qo‘shimcha imkoniyatlar mavjud emas. "
+"Sabablarini aniqlash uchun %sbu yerga%s bosing."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "PDF-sxemani ko‘rsatish"
@@ -643,7 +671,8 @@ msgstr "Kuzatish faol."
 msgid "Tracking is not active."
 msgstr "Kuzatish faol emas."
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -813,16 +842,78 @@ msgstr "Jadvalni kuzatish"
 msgid "Database Log"
 msgstr "Baza log faylini"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr ""
+"Ehtimol, yuklanayotgan fayl hajmi juda katta. Bu muammoni yechishning "
+"usullari %sdokumentatsiyada%s keltirilgan."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "Faylni o‘qib bo‘lmadi!!"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"Yuklanayotgan fayl (\"%s\") yordamida qisilgan. Lekin u dastur tizimda "
+"mavjud emas, shuning uchun ushbu faylni import qilib bo‘lmaydi. Agar dastur "
+"mavjud bo‘lsa, demak u konfiguratsiya vaqtida o‘chirib qo‘yilgan."
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"Import qilish imkoni yo‘q. Sabablar: import fayli tanlanmagan; import "
+"qilinayotgan fayl hajmi PHP konfiguratsion faylida ko‘rsatilgan maksimal "
+"qiymatdan katta. Qarang: [a@./Documentation.html#faq1_16@Documentation]FAQ "
+"1.16[/a]."
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr ""
+"Import modullari mavjud emas! O‘rnatilgan phpMyAdmin nusxasining libraries/"
+"export katalogini tekshiring."
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "Xatcho‘p o‘chirildi."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "Xatcho‘plarni ko‘rsatish"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "\"%s\" xatcho‘pi tuzildi"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "Import muvaffaqiyatli tugatildi, bajarilgan so‘rovlar soni: %d."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+"Chegaralangan vaqt bo‘ldi. Agar import jarayonini yakunlamoqchi bo‘lsangiz, "
+"unda o‘sha faylni tanlagan holda uni qayta ishga tushiring va jarayon "
+"uzilgan joydan boshlab davom etadi."
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
@@ -841,7 +932,8 @@ msgstr "Tanlash uchun sichqoncha tugmasini bosing"
 msgid "Click to unselect"
 msgstr "Tanlashni bеkor qilish uchun sichqoncha tugmasini bosing"
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr ""
 "\"DROP DATABASE\" (ma`lumotlar bazasini o‘chirish) buyrug‘i o‘chirilgan."
@@ -884,10 +976,12 @@ msgid "The user name is empty!"
 msgstr "Foydalanuvchi nomi belgilanmagan!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "Parol belgilanmagan!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "Kiritilgan parollar bir xil emas!"
 
@@ -1312,7 +1406,8 @@ msgstr "Parol:"
 msgid "Server Choice"
 msgstr "Serverni tanlang"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Brauzerda \"cookies\" faollashtirilgan bo‘lishi shart."
 
@@ -1338,6 +1433,10 @@ msgstr ""
 msgid "Cannot log in to the MySQL server"
 msgstr "MySQL serveriga ulanib bo‘lmadi"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "Kiritilgan ma`lumotlar noto‘g‘ri. Kirish mumkin emas."
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1474,11 +1573,12 @@ msgstr "Yuborildi"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "Dokumentatsiya"
 
@@ -1542,7 +1642,7 @@ msgid "Skip Validate SQL"
 msgstr "SQL sintaksisi tekshiruvini olib tashlash"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "SQL to‘g‘riligini tekshirish"
 
@@ -1599,7 +1699,8 @@ msgstr ""
 msgid "Font size"
 msgstr "Shrift o‘lchami"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1766,6 +1867,7 @@ msgid "Create"
 msgstr "Tuzish"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "Privilegiyalar yo‘q"
 
@@ -1782,6 +1884,12 @@ msgstr "\"%s\" ma`lumotlar bazasida yangi jadval tuzish"
 msgid "Number of fields"
 msgstr "Maydonlar soni "
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr ""
+"Eksport modullari mavjud emas! O‘rnatilgan phpMyAdmin nusxasining libraries/"
+"export katalogini tekshiring."
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1810,6 +1918,29 @@ msgstr "Mavjud fayl(lar) ustidan yozish"
 msgid "File name template"
 msgstr "Fayl nomi shabloni"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "server nomi"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "ma`lumotlar bazasi nomi"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "jadval nomi"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"Qiymat %1$sstrftime%2$s funksiyasi bilan qayta ishlangan, shuning uchun "
+"hozirgi vaqt va sanani qo‘yish mumkin. Qo‘shimcha ravishda quyidagilar "
+"ishlatilishi mumkin: %3$s. Matnning boshqa qismlari o‘zgarishsiz qoladi."
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr " shablonni yodda tutish"
@@ -1886,6 +2017,15 @@ msgstr "Import qilinayotgan fayl "
 msgid "Location of the text file"
 msgstr "Faylni tanlash"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "Fayllarni serverga yuklab bo‘lmadi."
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "Ko‘rsatilgan katalokka yuklab bo‘lmadi"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -2038,6 +2178,20 @@ msgstr "Tugatish"
 msgid "in query"
 msgstr "so‘rov bo‘yicha"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "Yozuvlarni ko‘rsatish"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "jami"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "So‘rov %01.4f sekund vaqt oldi"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2529,11 +2683,6 @@ msgstr "Faylni diskka yozishdaxatolik yuz berdi."
 msgid "File upload stopped by extension."
 msgstr "Faylning yuklanishi uning kengaytmasi sabali to‘xtatildi."
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "Faylni o‘qib bo‘lmadi!!"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
@@ -2542,18 +2691,6 @@ msgstr ""
 "Yuklangan fayl joyini o‘zgartirishda xatolik, [a@./Documentation."
 "html#faq1_11@Documentation]\"FAQ 1.11\"[/a]ga qarang"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"Yuklanayotgan fayl (\"%s\") yordamida qisilgan. Lekin u dastur tizimda "
-"mavjud emas, shuning uchun ushbu faylni import qilib bo‘lmaydi. Agar dastur "
-"mavjud bo‘lsa, demak u konfiguratsiya vaqtida o‘chirib qo‘yilgan."
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2579,7 +2716,7 @@ msgstr "Tuzilgan"
 msgid "Rows"
 msgstr "Qatorlarsoni"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL bo‘sh natija berdi (ya`ni nolta satr)."
@@ -2625,6 +2762,11 @@ msgstr "tuzilish"
 msgid "Go to view"
 msgstr "Ushbu ko‘rinishga o‘tish"
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "Indeks belgilanmagan!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2661,6 +2803,13 @@ msgstr "Birlamchi kalit o‘chirildi"
 msgid "Index %s has been dropped"
 msgstr " \"%s\" indeksi o‘chirildi"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr " %1$s va %2$s indekslari bir xil, ulardan birini o‘chirish mumkin."
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2794,7 +2943,7 @@ msgstr " \"%s\" maydon(lar)ini indeksga qo‘shish"
 msgid "Add a new User"
 msgstr "Yangi foydalanuvchi qo‘shish"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "Siz yangi foydalanuvchi qo‘shdingiz."
 
@@ -2986,10 +3135,6 @@ msgstr "BLOB omboriga yuklash"
 msgid "Let every user access this bookmark"
 msgstr "Barcha foydalanuvchilarga ruxsat berish"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "Xatcho‘p o‘chirildi."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "Xatcho‘p belgisi"
@@ -3032,19 +3177,7 @@ msgstr "bzip yordamida siqilgan"
 msgid "Calendar"
 msgstr "Taqvim"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr ""
-"Eksport modullari mavjud emas! O‘rnatilgan phpMyAdmin nusxasining libraries/"
-"export katalogini tekshiring."
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr ""
-"Import modullari mavjud emas! O‘rnatilgan phpMyAdmin nusxasining libraries/"
-"export katalogini tekshiring."
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "Indeksni \"PRIMARY\"ga qayta nomlab bo‘lmadi!"
 
@@ -3166,11 +3299,6 @@ msgstr " \"%s\" jadvalining koordinatalarini o‘zgartirish"
 msgid "Connections"
 msgstr "Ulanishlar"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "\"%s\" ma`lumotlar bazasidan \"%s\" ga nusxa ko‘chirildi."
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "Jadvaldan (ma`lumotlar ombori<b>.</b>jadval) ga nusxa ko‘chirish:"
@@ -3192,7 +3320,7 @@ msgstr "Manbaga ulanib bo‘lmadi"
 msgid "Could not connect to the target"
 msgstr "Nishonga ulanib bo‘lmadi"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3294,26 +3422,17 @@ msgstr "Chexoslovakcha"
 msgid "Danish"
 msgstr "Daniyacha"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "Ma`lumotlar bazasi nomi bo‘sh!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "Ma`lumotlar bazasi eksport parametrlari"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr " %1$s ma`lumotlar bazasi tuzildi."
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr "'%s' nomli baza mavjud emas."
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "\"%s\" ma`lumotlar bazasi muvaffaqiyatli o‘chirildi."
@@ -3337,7 +3456,7 @@ msgstr "Statiskani o‘chirish"
 msgid "Enable Statistics"
 msgstr "Statiskani yoqish"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3384,7 +3503,7 @@ msgstr "Jadvalni defragmentatsiyalash"
 msgid "Use delayed inserts"
 msgstr "Kechiktirilgan qo‘yish (DELAYED INSERTS) dan foydalanish"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "O‘chirish lozim bo‘lgan foydalanuvchilar tanlanmagan!"
 
@@ -3600,34 +3719,11 @@ msgstr ""
 "\"%s\" fayli serverda mavjud, uning nomini o‘zgartiring yoki qayta yozish "
 "parametrini yoqing."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "ma`lumotlar bazasi nomi"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "server nomi"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "jadval nomi"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"Qiymat %1$sstrftime%2$s funksiyasi bilan qayta ishlangan, shuning uchun "
-"hozirgi vaqt va sanani qo‘yish mumkin. Qo‘shimcha ravishda quyidagilar "
-"ishlatilishi mumkin: %3$s. Matnning boshqa qismlari o‘zgarishsiz qoladi."
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "Fayllar soni "
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3652,7 +3748,7 @@ msgstr "Jadval keshini yangilash (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "Barcha jadvallarni yopish"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3839,13 +3935,6 @@ msgstr "Excel 97-2003 XLS ish kitobi"
 msgid "Excel 2007 XLSX Workbook"
 msgstr "Excel 2007 XLSX ish kitobi"
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr " %1$s va %2$s indekslari bir xil, ulardan birini o‘chirish mumkin."
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3883,7 +3972,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "Yozuv kiritish"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Kiritilgan qator identifikatori: %1$d"
@@ -4218,21 +4307,10 @@ msgstr "Jarayonlar ro‘yxati"
 msgid "No databases"
 msgstr "Ma`lumotlar bazasi mavjud emas"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "Bironta ham ma`lumotlar bazasi tanlanmagan."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"Import qilish imkoni yo‘q. Sabablar: import fayli tanlanmagan; import "
-"qilinayotgan fayl hajmi PHP konfiguratsion faylida ko‘rsatilgan maksimal "
-"qiymatdan katta. Qarang: [a@./Documentation.html#faq1_16@Documentation]FAQ "
-"1.16[/a]."
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "tavsif mavjud emas"
@@ -4246,15 +4324,11 @@ msgstr "Ushbu turdagi jadvallar haqida qo‘shimcha ma`lumot mavjud emas. "
 msgid "No files found inside ZIP archive!"
 msgstr "ZIP-arxiv ichida fayl mavjud emas!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "Indeks belgilanmagan!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "Indeks qismlari belgilanmagan!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "O‘zgarish yo‘q"
 
@@ -4272,7 +4346,7 @@ msgstr "Ushbu format uchun sozlanadigan parametr mavjud emas"
 msgid "The web server does not have permission to save the file %s."
 msgstr "\"%s\" faylini veb-serverga saqlash uchun huquqlar yetarli emas."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "Ushbu sahifaga kirish uchun Sizda yetarli huquq mavjud emas!"
 
@@ -4310,7 +4384,8 @@ msgstr "Mavjud emas"
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr " <b>\"%s\"</b> jadvali topilmadi yoki <b>\"%s\"</b>da o‘rnatilmagan"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "Bironta ham foydalanuvchi topilmadi."
 
@@ -4357,7 +4432,7 @@ msgstr "bo‘laklarga xizmat ko‘rsatish"
 msgid "Partition %s"
 msgstr "\"%s\" bo‘lagi"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "\"%s\" foydalanuvchining paroli muvaffaqiyatli o‘zgartirildi."
@@ -4464,11 +4539,11 @@ msgstr "Polyakcha"
 msgid "Port"
 msgstr "Port"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "Birlamchi indeks nomi \"PRIMARY\" bo‘lishi kerak!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(\"PRIMARY\" nomi <b>faqat</b> birlamchi indeksgaega bo‘lishi shart!)"
@@ -4682,7 +4757,7 @@ msgstr "Ma`lumotlarni o‘zgartirishga ruxsat beradi"
 msgid "No privileges."
 msgstr "Privilegiyalar yo‘q"
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "Privilegiyalar muvaffaqiyatli qayta yuklandi."
 
@@ -4725,11 +4800,6 @@ msgstr ""
 "So‘rovlar statiskasi: ishga tushirilgandan vaqtdan boshlab serverga "
 "yuborilgan so‘rovlar soni - \"%s\"."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "So‘rov %01.4f sekund vaqt oldi"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "So‘rov turi"
@@ -4758,15 +4828,6 @@ msgstr "Ma`lumotlar yaxlitligini tekshirish:"
 msgid "Relational schema"
 msgstr "Aloqalar sxemasi"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr ""
-"Aloqador jadvallar bilan ishlash uchun qo‘shimcha imkoniyatlar mavjud emas. "
-"Sabablarini aniqlash uchun %sbu yerga%s bosing."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "Aloqalar"
@@ -4805,11 +4866,6 @@ msgstr "Bo‘laklarni (PARTITIONS) o‘chirish"
 msgid "Remove selected users"
 msgstr "Belgilangan foydalanuvchilarni o‘chirish"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr " `\"%s\"` ma`lumotlar bazasining nomi `\"%s\"` deb o‘zgartirildi."
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4929,7 +4985,7 @@ msgstr ""
 "Ushbu sеrvеr rеplikatsiya jarayonida \"bosh sеrvеr\" dеb konfiguratsiya "
 "qilinmagan. Siz uni <a href=\"%s\">konfiguratsiya</a> qilmoqchimisiz?"
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -5079,7 +5135,7 @@ msgstr ""
 "Foydalanuvchilarning barcha faol privilegiyalarini bekor qilish, so‘ng "
 "ularni o‘chirish."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr " \"%s\" foydalanuvchining privilegiyalari bekor qilindi."
@@ -5248,19 +5304,11 @@ msgstr "So‘rovlarning kengaytirilgan ko‘rinishi"
 msgid "Show/Hide left menu"
 msgstr "Chap menyuni ko‘rsatish/yashirish"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "Xatcho‘plarni ko‘rsatish"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "PHP-kod sifatida ko‘rsatish"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "Yozuvlarni ko‘rsatish"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "SQL-so‘rovni ko‘rsatish"
 
@@ -6162,7 +6210,7 @@ msgstr "\"%s\" nomli jadval mavjud!"
 msgid "Alter column(s)"
 msgstr "Ustun(lar)ni o‘zgartirish"
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "%1$s jadvali muvaffaqiyatli o‘zgartirildi"
@@ -6181,7 +6229,7 @@ msgstr "Nishon jadvaldagi barcha oldingi qatorlarni o‘chirmoqchimisiz?"
 msgid "The table name is empty!"
 msgstr "Jadval nomi ko‘rsatilmagan!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "%1$s jadvali tuzildi."
@@ -6302,7 +6350,7 @@ msgstr "Ushbu xost"
 msgid "Threads"
 msgstr "Oqimlar"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr " \"%s\" jarayoni muvaffaqiyatli yakunlandi."
@@ -6316,15 +6364,6 @@ msgstr ""
 "Odatda, bu hol, php-ssenariylar uchun ajratilgan vaqt oshirilmaguncha "
 "phpMyAdmin dasturi import jarayonini yakunla olmasligini bildiradi."
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-"Chegaralangan vaqt bo‘ldi. Agar import jarayonini yakunlamoqchi bo‘lsangiz, "
-"unda o‘sha faylni tanlagan holda uni qayta ishga tushiring va jarayon "
-"uzilgan joydan boshlab davom etadi."
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "Sahifa"
@@ -6342,10 +6381,6 @@ msgid "To select relation, click :"
 msgstr ""
 "Aloqani tanlash uchun rasmda ko‘rsatilganikabi ulanish nuqtasiga bosing:"
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "jami"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6666,7 +6701,7 @@ msgstr "Yunikod"
 msgid "unknown"
 msgstr "noma`lum"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr " \"%s\" uchun privilegiyalar o‘zgartirildi."
@@ -6687,19 +6722,6 @@ msgstr ""
 msgid "You should upgrade to %s %s or later."
 msgstr " \"%s\" ni \"%s\" versiyaga yoki kattaroq versiyaga yangilash zarur."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr ""
-"Ehtimol, yuklanayotgan fayl hajmi juda katta. Bu muammoni yechishning "
-"usullari %sdokumentatsiyada%s keltirilgan."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "Fayllarni serverga yuklab bo‘lmadi."
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "Ishlatilish"
@@ -6713,7 +6735,7 @@ msgstr "Jadval va maydon nomlarini teskari qo‘shtirnoqqa olish"
 msgid "Use Host Table"
 msgstr "Xostlar jadvalidan foydalanish"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr " \"%s\" nomli foydalanuvchi mavjud!"
@@ -6726,7 +6748,7 @@ msgstr " \"%s\" nomli foydalanuvchi mavjud!"
 msgid "User name"
 msgstr "Foydalanuvchi nomi"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "Belgilangan foydalanuvchi privilegiyalar jadvalida topilmadi."
 
@@ -6734,7 +6756,7 @@ msgstr "Belgilangan foydalanuvchi privilegiyalar jadvalida topilmadi."
 msgid "User overview"
 msgstr "Foydalanuvchilar hisobini ko‘rib chiqish"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "Belgilangan foydalanuvchilar muvaffaqiyatli o‘chirildi."
 
@@ -6798,10 +6820,6 @@ msgstr "Jadval dampini (sxemasini) namoyish etish"
 msgid "VIEW name"
 msgstr "Nom ko‘rinishi"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "Ko‘rsatilgan katalokka yuklab bo‘lmadi"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "Veb server"
@@ -6819,10 +6837,6 @@ msgstr "Viki"
 msgid "wildcard"
 msgstr "Guruhlash belgisi"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "Kiritilgan ma`lumotlar noto‘g‘ri. Kirish mumkin emas."
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 36cc67687..f0182be3c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-04-08 13:06+0200\n"
 "Last-Translator: shanyan baishui <Siramizu@gmail.com>\n"
 "Language-Team: chinese_simplified <zh_CN@li.org>\n"
@@ -90,6 +90,11 @@ msgstr "说明"
 msgid "Use this value"
 msgstr "使用此值"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, php-format
+msgid "Database %1$s has been created."
+msgstr "创建数据库 %1$s 成功。"
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "数据库注释："
@@ -206,6 +211,20 @@ msgstr "全选"
 msgid "Unselect All"
 msgstr "全不选"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "数据库名不能为空！"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "已将数据库 %s 改名为 %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "已将数据库 %s 复制为 %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "将数据库改名为"
@@ -316,6 +335,13 @@ msgstr "启用"
 msgid "Collation"
 msgstr "整理"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr "链接表的附加功能尚未激活。要查出原因，请点击%s此处%s。"
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "显示 PDF 大纲"
@@ -643,7 +669,8 @@ msgstr "追踪已启用。"
 msgid "Tracking is not active."
 msgstr "追踪已禁用。"
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -811,16 +838,67 @@ msgstr "追踪表"
 msgid "Database Log"
 msgstr "数据库日志"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr "您可能正在上传很大的文件，请参考%s文档%s来寻找解决方法。"
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "无法读取文件"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+"您正在载入不支持的压缩格式 (%s)。配置文件中没有对应这种格式的配置说明。"
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+"没有接收到要导入的数据。可能是文件名没有提交，也可能是文件大小超出 PHP 限制。"
+"参见 [a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]。"
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "无法加载导入插件，请检查你的安装！"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "书签已删除。"
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "显示书签"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "已创建书签 %s"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "导入成功，执行了 %d 个查询。"
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr "脚本超时，如果你要完成导入，请重新提交相同的文件，导入将会继续进行。"
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin 更适合在支持<b>框架</b>的浏览器中使用。"
@@ -837,7 +915,8 @@ msgstr "点击选中"
 msgid "Click to unselect"
 msgstr "点击取消"
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "已经禁用删除数据库 (“DROP DATABASE”) 语句。"
 
@@ -877,10 +956,12 @@ msgid "The user name is empty!"
 msgstr "用户名不能为空！"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "密码不能为空！"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "两次密码不一致！"
 
@@ -1302,7 +1383,8 @@ msgstr "密码："
 msgid "Server Choice"
 msgstr "选择服务器"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "必须启用 Cookies 才能登录。"
 
@@ -1324,6 +1406,10 @@ msgstr "登录超时 (%s 秒未活动)，请重新登录"
 msgid "Cannot log in to the MySQL server"
 msgstr "无法登录 MySQL 服务器"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "用户名/密码错误。拒绝访问。"
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1447,11 +1533,12 @@ msgstr "zh"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "文档"
 
@@ -1515,7 +1602,7 @@ msgid "Skip Validate SQL"
 msgstr "略过校验 SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "校验 SQL"
 
@@ -1568,7 +1655,8 @@ msgstr "%s 功能受到一个已知的缺陷 (bug) 影响，参见 %s"
 msgid "Font size"
 msgstr "字号"
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1732,6 +1820,7 @@ msgid "Create"
 msgstr "创建"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "无权限"
 
@@ -1748,6 +1837,10 @@ msgstr "在数据库 %s 中新建一张数据表"
 msgid "Number of fields"
 msgstr "字段数"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+msgid "Could not load export plugins, please check your installation!"
+msgstr "无法加载导出插件，请检查安装！"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1776,6 +1869,28 @@ msgstr "覆盖已有文件"
 msgid "File name template"
 msgstr "文件名模板"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "服务器名"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "数据库名"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "数据表名"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+"这个值是使用 %1$sstrftime%2$s 来解析的，所以你能用时间格式的字符串。另外，下"
+"列内容也将被转换：%3$s。其他文本将保持原样。"
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "记住模板"
@@ -1849,6 +1964,15 @@ msgstr "要导入的文件"
 msgid "Location of the text file"
 msgstr "文本文件的位置"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr "此服务器禁止了文件上传。"
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "用于上传的文件夹出错，无法使用"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1994,6 +2118,20 @@ msgstr "杀死"
 msgid "in query"
 msgstr "查询中"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "显示行"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "总计"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "查询花费 %01.4f 秒"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2450,11 +2588,6 @@ msgstr "将文件写入磁盘失败。"
 msgid "File upload stopped by extension."
 msgstr "因扩展而停止文件上传。"
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "无法读取文件"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
@@ -2463,16 +2596,6 @@ msgstr ""
 "移动上传文件时发生错误，参见 [a@./Documentation.html#faq1_11@Documentation]"
 "FAQ 1.11[/a]。"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-"您正在载入不支持的压缩格式 (%s)。配置文件中没有对应这种格式的配置说明。"
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2498,7 +2621,7 @@ msgstr "生成者"
 msgid "Rows"
 msgstr "行数"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL 返回的查询结果为空 (即零行)。"
@@ -2542,6 +2665,11 @@ msgstr "结构"
 msgid "Go to view"
 msgstr "转到视图"
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "没有已定义的索引！"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2578,6 +2706,13 @@ msgstr "已删除主键"
 msgid "Index %s has been dropped"
 msgstr "已删除索引 %s "
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr "索引 %1$s 和 %2$s 可能是相同的，其中一个将可能被删除"
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2704,7 +2839,7 @@ msgstr "添加 %s 个索引字段"
 msgid "Add a new User"
 msgstr "添加新用户"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "您已添加了一个新用户。"
 
@@ -2893,10 +3028,6 @@ msgstr "上传到 BLOB 容器"
 msgid "Let every user access this bookmark"
 msgstr "让所有用户均可访问此书签"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "书签已删除。"
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "标签"
@@ -2939,15 +3070,7 @@ msgstr "bzip 压缩"
 msgid "Calendar"
 msgstr "日历"
 
-#: libraries/messages.inc.php:132
-msgid "Could not load export plugins, please check your installation!"
-msgstr "无法加载导出插件，请检查安装！"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "无法加载导入插件，请检查你的安装！"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "无法将索引改为主键 (PRIMARY) ！"
 
@@ -3066,11 +3189,6 @@ msgstr "请配置表 %s 的并发"
 msgid "Connections"
 msgstr "连接"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "已将数据库 %s 复制为 %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "将数据表复制到(数据库名<b>.</b>数据表名)："
@@ -3092,7 +3210,7 @@ msgstr "无法连接到源数据库"
 msgid "Could not connect to the target"
 msgstr "无法连接到目标数据库"
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3188,26 +3306,17 @@ msgstr "捷克斯洛伐克语"
 msgid "Danish"
 msgstr "丹麦语"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "数据库名不能为空！"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "数据库导出选项"
 
-#: libraries/messages.inc.php:223
-#, php-format
-msgid "Database %1$s has been created."
-msgstr "创建数据库 %1$s 成功。"
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr "数据库 '%s' 不存在。"
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "已成功删除 %s 个数据库。"
@@ -3231,7 +3340,7 @@ msgstr "禁用统计"
 msgid "Enable Statistics"
 msgstr "启用统计"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3275,7 +3384,7 @@ msgstr "整理表碎片"
 msgid "Use delayed inserts"
 msgstr "使用延迟插入"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "没有选择要删除的用户！"
 
@@ -3485,33 +3594,11 @@ msgid ""
 "File %s already exists on server, change filename or check overwrite option."
 msgstr "服务器上已存在文件 %s，请修改文件名或选中覆盖选项。"
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "数据库名"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "服务器名"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "数据表名"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-"这个值是使用 %1$sstrftime%2$s 来解析的，所以你能用时间格式的字符串。另外，下"
-"列内容也将被转换：%3$s。其他文本将保持原样。"
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 msgid "Files"
 msgstr "文件"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3535,7 +3622,7 @@ msgstr "强制更新表 (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "强制更新 (关闭) 所有表"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr "在 %1$s 创建外键时发生错误 (检查数据类型)"
@@ -3717,13 +3804,6 @@ msgstr "Excel 97-2003 XLS 工作簿"
 msgid "Excel 2007 XLSX Workbook"
 msgstr "Excel 2007 XLSX 工作簿"
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr "索引 %1$s 和 %2$s 可能是相同的，其中一个将可能被删除"
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3759,7 +3839,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "以新行插入"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "插入的行 id: %1$d"
@@ -4077,19 +4157,10 @@ msgstr "显示进程"
 msgid "No databases"
 msgstr "无数据库"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "未选中数据库。"
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-"没有接收到要导入的数据。可能是文件名没有提交，也可能是文件大小超出 PHP 限制。"
-"参见 [a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]。"
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "无说明"
@@ -4103,15 +4174,11 @@ msgstr "没有该存储引擎的详细信息。"
 msgid "No files found inside ZIP archive!"
 msgstr "ZIP 包中未找到文件！"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "没有已定义的索引！"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "没有定义的索引部分！"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "无更改"
 
@@ -4129,7 +4196,7 @@ msgstr "此格式没有选项"
 msgid "The web server does not have permission to save the file %s."
 msgstr "网站服务器没有保存文件 %s 的权限。"
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "权限不足！"
 
@@ -4164,7 +4231,8 @@ msgstr "未找到"
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "找不到 <b>%s</b> 表或还未在 %s 设置"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "找不到用户。"
 
@@ -4211,7 +4279,7 @@ msgstr "分区维护"
 msgid "Partition %s"
 msgstr "分区 %s"
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "%s 的密码已修改。"
@@ -4313,11 +4381,11 @@ msgstr "波兰语"
 msgid "Port"
 msgstr "端口"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "主键的名称必须称为 “PRIMARY”！"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(“PRIMARY”<b>必须</b>而且<b>只能</b>作为主键的名称！)"
@@ -4512,7 +4580,7 @@ msgstr "允许修改数据。"
 msgid "No privileges."
 msgstr "无权限。"
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "已成功重新载入权限。"
 
@@ -4553,11 +4621,6 @@ msgid ""
 "server."
 msgstr "<b>查询统计</b>：自启动后，服务器共收到了 %s 次查询。"
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "查询花费 %01.4f 秒"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "查询方式"
@@ -4586,13 +4649,6 @@ msgstr "检查引用完整性："
 msgid "Relational schema"
 msgstr "关系大纲"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr "链接表的附加功能尚未激活。要查出原因，请点击%s此处%s。"
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "关系"
@@ -4631,11 +4687,6 @@ msgstr "删除分区"
 msgid "Remove selected users"
 msgstr "删除选中的用户"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "已将数据库 %s 改名为 %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4745,7 +4796,7 @@ msgstr ""
 "此服务器尚未配置为一个复制进程中的主服务器。你想现在<a href=\"%s\">配置</a>"
 "吗？"
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4885,7 +4936,7 @@ msgstr "重新进行插入操作，共 %s 行"
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "撤销用户所有权限，然后删除用户。"
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "您已撤销 %s 的权限"
@@ -5047,19 +5098,11 @@ msgstr "显示完整查询"
 msgid "Show/Hide left menu"
 msgstr "显示/隐藏左侧菜单"
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "显示书签"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr "显示为 PHP 代码"
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "显示行"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr "显示 SQL 查询"
 
@@ -5877,7 +5920,7 @@ msgstr "数据表 %s 已存在！"
 msgid "Alter column(s)"
 msgstr "修改字段"
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "已成功修改表 %1$s "
@@ -5896,7 +5939,7 @@ msgstr "你希望删除当前目标表中的所有数据吗？"
 msgid "The table name is empty!"
 msgstr "表名不能为空！"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, php-format
 msgid "Table %1$s has been created."
 msgstr "创建数据表 %1$s 成功。"
@@ -6017,7 +6060,7 @@ msgstr "此主机"
 msgid "Threads"
 msgstr "线程"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "已杀死线程 %s 。"
@@ -6030,12 +6073,6 @@ msgstr ""
 "在最后一次执行时没有数据被解析，建议您增加 PHP 运行时间限制，否则 phpMyAdmin "
 "将无法完成导入操作。"
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr "脚本超时，如果你要完成导入，请重新提交相同的文件，导入将会继续进行。"
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr "到/从 页"
@@ -6052,10 +6089,6 @@ msgstr "反向收缩/展开"
 msgid "To select relation, click :"
 msgstr "要选择关系，点击："
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "总计"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6347,7 +6380,7 @@ msgstr "Unicode"
 msgid "unknown"
 msgstr "未知"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "您已更新了 %s 的权限。"
@@ -6366,17 +6399,6 @@ msgstr "请参见文档中关于如何更新您的 column_comments 表"
 msgid "You should upgrade to %s %s or later."
 msgstr "您应升级到 %s %s 或更高版本。"
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr "您可能正在上传很大的文件，请参考%s文档%s来寻找解决方法。"
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr "此服务器禁止了文件上传。"
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "已用"
@@ -6390,7 +6412,7 @@ msgstr "给数据表名及字段名加上反引号"
 msgid "Use Host Table"
 msgstr "使用主机表"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "用户 %s 己存在！"
@@ -6403,7 +6425,7 @@ msgstr "用户 %s 己存在！"
 msgid "User name"
 msgstr "用户名"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "在权限表内找不到选中的用户。"
 
@@ -6411,7 +6433,7 @@ msgstr "在权限表内找不到选中的用户。"
 msgid "User overview"
 msgstr "查看用户"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "已成功删除选中的用户。"
 
@@ -6471,10 +6493,6 @@ msgstr "查看数据表的转存(大纲)。"
 msgid "VIEW name"
 msgstr "视图名"
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "用于上传的文件夹出错，无法使用"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr "网站服务器"
@@ -6492,10 +6510,6 @@ msgstr "维基 (Wiki) (外链，英文)"
 msgid "wildcard"
 msgstr "通配符"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "用户名/密码错误。拒绝访问。"
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9a20e2dbe..0c9ec7a71 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-09 15:12-0400\n"
+"POT-Creation-Date: 2010-05-09 16:24-0400\n"
 "PO-Revision-Date: 2010-03-12 09:15+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: chinese_traditional <zh_TW@li.org>\n"
@@ -88,6 +88,11 @@ msgstr "說明"
 msgid "Use this value"
 msgstr "使用此值"
 
+#: db_create.php:46 libraries/messages.inc.php:223
+#, fuzzy, php-format
+msgid "Database %1$s has been created."
+msgstr "資料庫 %s 已被刪除"
+
 #: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
 msgid "Database comment: "
 msgstr "資料庫註解文字: "
@@ -204,6 +209,20 @@ msgstr "全選"
 msgid "Unselect All"
 msgstr "全部取消"
 
+#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
+msgid "The database name is empty!"
+msgstr "資料庫名稱並未輸入!!"
+
+#: db_operations.php:236 libraries/messages.inc.php:761
+#, php-format
+msgid "Database %s has been renamed to %s"
+msgstr "資料庫 %s 已更改名稱為 %s"
+
+#: db_operations.php:240 libraries/messages.inc.php:186
+#, php-format
+msgid "Database %s has been copied to %s"
+msgstr "資料庫 %s 已複製到 %s"
+
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
 msgstr "更改資料庫名稱到"
@@ -315,6 +334,13 @@ msgstr "啟動"
 msgid "Collation"
 msgstr "校對"
 
+#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
+#, php-format
+msgid ""
+"The additional features for working with linked tables have been "
+"deactivated. To find out why click %shere%s."
+msgstr "關聯資料表的附加功能未能啟動, %s請按此%s 查出問題原因."
+
 #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528
 msgid "Display PDF schema"
 msgstr "顯示 PDF 概要"
@@ -642,7 +668,8 @@ msgstr ""
 msgid "Tracking is not active."
 msgstr ""
 
-#: db_structure.php:420 libraries/messages.inc.php:1236
+#: db_structure.php:420 libraries/display_tbl.lib.php:1939
+#: libraries/messages.inc.php:1236
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
@@ -815,16 +842,64 @@ msgstr "檢查資料表"
 msgid "Database Log"
 msgstr "資料庫"
 
+#: import.php:60 libraries/messages.inc.php:1210
+#, php-format
+msgid ""
+"You probably tried to upload too large file. Please refer to %sdocumentation%"
+"s for ways to workaround this limit."
+msgstr "你正嘗試上載大容量檔案，請查看此 %s文件%s 如何略過此限制."
+
+#: import.php:279 import.php:332 libraries/File.class.php:849
+#: libraries/File.class.php:961 libraries/messages.inc.php:333
+msgid "File could not be read"
+msgstr "讀案無法讀取"
+
+#: import.php:287 import.php:296 import.php:315 import.php:324
+#: libraries/File.class.php:1031 libraries/File.class.php:1039
+#: libraries/File.class.php:1055 libraries/File.class.php:1063
+#: libraries/messages.inc.php:1197
+#, php-format
+msgid ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
+msgstr ""
+
+#: import.php:337 libraries/messages.inc.php:555
+msgid ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
+msgstr ""
+
+#: import.php:372 libraries/display_import.lib.php:24
+#: libraries/messages.inc.php:133
+msgid "Could not load import plugins, please check your installation!"
+msgstr "無法讀取載入的外掛程式, 請檢查安裝程序!"
+
+#: import.php:397 libraries/messages.inc.php:110
+msgid "The bookmark has been deleted."
+msgstr "書籤已經刪除."
+
+#: import.php:401 libraries/messages.inc.php:887
+msgid "Showing bookmark"
+msgstr "顯示書籤"
+
 #: import.php:403 libraries/messages.inc.php:109
 #, php-format
 msgid "Bookmark %s created"
 msgstr "書籤 %s 已建立"
 
-#: import.php:409 libraries/messages.inc.php:415
+#: import.php:409 import.php:415 libraries/messages.inc.php:415
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
 msgstr "載入成功, 共 %d 句語法已執行."
 
+#: import.php:424 libraries/messages.inc.php:1115
+msgid ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
+msgstr ""
+
 #: index.php:190 libraries/messages.inc.php:561
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr "phpMyAdmin 較為適合使用在支援<b>頁框</b>的瀏覽器."
@@ -841,7 +916,8 @@ msgstr ""
 msgid "Click to unselect"
 msgstr ""
 
-#: js/messages.php:27 libraries/messages.inc.php:558 sql.php:89
+#: js/messages.php:27 libraries/import.lib.php:103
+#: libraries/messages.inc.php:558 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" 指令已經停用."
 
@@ -881,10 +957,12 @@ msgid "The user name is empty!"
 msgstr "請輸入使用者名稱!"
 
 #: js/messages.php:44 libraries/messages.inc.php:615
+#: server_privileges.php:1197 user_password.php:70
 msgid "The password is empty!"
 msgstr "請輸入密碼!"
 
 #: js/messages.php:45 libraries/messages.inc.php:617
+#: server_privileges.php:1195 user_password.php:73
 msgid "The passwords aren't the same!"
 msgstr "第二次輸入的密碼不同!"
 
@@ -1306,7 +1384,8 @@ msgstr "密碼:"
 msgid "Server Choice"
 msgstr "選擇伺服器"
 
-#: libraries/auth/cookie.auth.lib.php:320 libraries/messages.inc.php:185
+#: libraries/auth/cookie.auth.lib.php:320 libraries/header.inc.php:59
+#: libraries/messages.inc.php:185
 msgid "Cookies must be enabled past this point."
 msgstr "Cookies 必須啟動才能登入."
 
@@ -1328,6 +1407,10 @@ msgstr "由於已閒置了達 %s 秒, 請重新登入"
 msgid "Cannot log in to the MySQL server"
 msgstr "無法登入 MySQL 伺服器"
 
+#: libraries/auth/http.auth.lib.php:70 libraries/messages.inc.php:1253
+msgid "Wrong username/password. Access denied."
+msgstr "錯誤的使用者名稱或密碼，拒絕存取"
+
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #: libraries/messages.inc.php:1065
 #, php-format
@@ -1453,11 +1536,12 @@ msgstr "zh"
 
 #: libraries/common.lib.php:428 libraries/common.lib.php:430
 #: libraries/common.lib.php:432 libraries/common.lib.php:448
-#: libraries/common.lib.php:450 libraries/display_export.lib.php:164
-#: libraries/messages.inc.php:275 libraries/relation.lib.php:97
-#: libraries/sql_query_form.lib.php:451 libraries/sql_query_form.lib.php:454
-#: main.php:229 pdf_pages.php:37 pdf_pages.php:43 pdf_pages.php:49
-#: pdf_pages.php:54 setup/lib/FormDisplay.tpl.php:124
+#: libraries/common.lib.php:450 libraries/dbg/setup.php:25
+#: libraries/display_export.lib.php:164 libraries/messages.inc.php:275
+#: libraries/relation.lib.php:97 libraries/sql_query_form.lib.php:451
+#: libraries/sql_query_form.lib.php:454 main.php:229 pdf_pages.php:37
+#: pdf_pages.php:43 pdf_pages.php:49 pdf_pages.php:54
+#: setup/lib/FormDisplay.tpl.php:124
 msgid "Documentation"
 msgstr "說明文件"
 
@@ -1521,7 +1605,7 @@ msgid "Skip Validate SQL"
 msgstr "略過檢查 SQL"
 
 #: libraries/common.lib.php:1245 libraries/messages.inc.php:1228
-#: setup/lib/messages.inc.php:356
+#: setup/lib/messages.inc.php:356 sql.php:518
 msgid "Validate SQL"
 msgstr "檢查 SQL"
 
@@ -1576,7 +1660,8 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: libraries/core.lib.php:286 libraries/messages.inc.php:135
+#: libraries/core.lib.php:286 libraries/dbg/setup.php:22
+#: libraries/messages.inc.php:135
 #, php-format
 msgid ""
 "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
@@ -1737,6 +1822,7 @@ msgid "Create"
 msgstr "建立"
 
 #: libraries/display_create_database.lib.php:40 libraries/messages.inc.php:572
+#: server_privileges.php:74 server_privileges.php:1388
 msgid "No Privileges"
 msgstr "沒有權限"
 
@@ -1753,6 +1839,11 @@ msgstr "建立新資料表於資料庫 %s"
 msgid "Number of fields"
 msgstr "欄位數目"
 
+#: libraries/display_export.lib.php:42 libraries/messages.inc.php:132
+#, fuzzy
+msgid "Could not load export plugins, please check your installation!"
+msgstr "無法讀取載入的外掛程式, 請檢查安裝程序!"
+
 #: libraries/display_export.lib.php:107 libraries/messages.inc.php:285
 #, php-format
 msgid "Dump %s row(s) starting at record # %s"
@@ -1781,6 +1872,26 @@ msgstr "覆寫已存在檔案"
 msgid "File name template"
 msgstr "檔案名稱樣式"
 
+#: libraries/display_export.lib.php:152 libraries/messages.inc.php:335
+msgid "server name"
+msgstr "伺服器名稱"
+
+#: libraries/display_export.lib.php:155 libraries/messages.inc.php:334
+msgid "database name"
+msgstr "資料庫名稱"
+
+#: libraries/display_export.lib.php:158 libraries/messages.inc.php:336
+msgid "table name"
+msgstr "資料表名稱"
+
+#: libraries/display_export.lib.php:162 libraries/messages.inc.php:337
+#, php-format
+msgid ""
+"This value is interpreted using %1$sstrftime%2$s, so you can use time "
+"formatting strings. Additionally the following transformations will happen: %"
+"3$s. Other text will be kept as is."
+msgstr ""
+
 #: libraries/display_export.lib.php:202 libraries/messages.inc.php:339
 msgid "remember template"
 msgstr "保留樣式名稱"
@@ -1852,6 +1963,15 @@ msgstr "載入檔案"
 msgid "Location of the text file"
 msgstr "文字檔案的位置"
 
+#: libraries/display_import.lib.php:148 libraries/messages.inc.php:1211
+msgid "File uploads are not allowed on this server."
+msgstr ""
+
+#: libraries/display_import.lib.php:163 libraries/messages.inc.php:1243
+#: libraries/sql_query_form.lib.php:533 tbl_change.php:1028
+msgid "The directory you set for upload work cannot be reached"
+msgstr "設定之上載目錄錯誤，未能使用"
+
 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:1244
 #: libraries/sql_query_form.lib.php:536 tbl_change.php:1031
 msgid "web server upload directory"
@@ -1997,6 +2117,20 @@ msgstr "Kill"
 msgid "in query"
 msgstr "查詢中"
 
+#: libraries/display_tbl.lib.php:1947 libraries/messages.inc.php:889
+msgid "Showing rows"
+msgstr "顯示記錄"
+
+#: libraries/display_tbl.lib.php:1957 libraries/messages.inc.php:1121
+msgid "total"
+msgstr "總計"
+
+#: libraries/display_tbl.lib.php:1965 libraries/messages.inc.php:735
+#: sql.php:524
+#, php-format
+msgid "Query took %01.4f sec"
+msgstr "查詢需時 %01.4f 秒"
+
 #: libraries/display_tbl.lib.php:2084 libraries/messages.inc.php:143
 #: libraries/mult_submits.inc.php:113 querywindow.php:125 querywindow.php:129
 #: querywindow.php:132 tbl_structure.php:25 tbl_structure.php:150
@@ -2447,11 +2581,6 @@ msgstr ""
 msgid "File upload stopped by extension."
 msgstr ""
 
-#: libraries/File.class.php:849 libraries/File.class.php:961
-#: libraries/messages.inc.php:333
-msgid "File could not be read"
-msgstr "讀案無法讀取"
-
 #: libraries/File.class.php:908 libraries/messages.inc.php:327
 #, fuzzy
 msgid ""
@@ -2459,15 +2588,6 @@ msgid ""
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr "可能接近. 請參看 FAQ 3.11"
 
-#: libraries/File.class.php:1031 libraries/File.class.php:1039
-#: libraries/File.class.php:1055 libraries/File.class.php:1063
-#: libraries/messages.inc.php:1197
-#, php-format
-msgid ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
-msgstr ""
-
 #: libraries/footer.inc.php:184 libraries/footer.inc.php:195
 #: libraries/footer.inc.php:198 libraries/messages.inc.php:594
 msgid "Open new phpMyAdmin window"
@@ -2494,7 +2614,7 @@ msgstr "建立"
 msgid "Rows"
 msgstr "資料列列數"
 
-#: libraries/import.lib.php:150 libraries/messages.inc.php:293
+#: libraries/import.lib.php:150 libraries/messages.inc.php:293 sql.php:520
 #: tbl_change.php:181 tbl_get_field.php:35
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL 傳回的查詢結果為空 (原因可能為：沒有找到符合條件的記錄)"
@@ -2540,6 +2660,11 @@ msgstr "結構"
 msgid "Go to view"
 msgstr ""
 
+#: libraries/Index.class.php:428 libraries/messages.inc.php:562
+#: tbl_relation.php:529
+msgid "No index defined!"
+msgstr "沒有已定義的索引!"
+
 #: libraries/Index.class.php:433 libraries/messages.inc.php:419
 #: server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -2577,6 +2702,13 @@ msgstr "主鍵已被刪除"
 msgid "Index %s has been dropped"
 msgstr "索引 %s 已被刪除"
 
+#: libraries/Index.class.php:576 libraries/messages.inc.php:420
+#, php-format
+msgid ""
+"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
+"removed."
+msgstr ""
+
 #: libraries/List_Database.class.php:431 libraries/messages.inc.php:226
 #: libraries/server_links.inc.php:41 server_databases.php:88
 #: server_privileges.php:1621 setup/lib/messages.inc.php:110 test/theme.php:93
@@ -2709,7 +2841,7 @@ msgstr "新增 &nbsp;%s&nbsp; 組索引欄"
 msgid "Add a new User"
 msgstr "新增使用者"
 
-#: libraries/messages.inc.php:51
+#: libraries/messages.inc.php:51 server_privileges.php:931
 msgid "You have added a new user."
 msgstr "您已新增了一個新使用者."
 
@@ -2902,10 +3034,6 @@ msgstr ""
 msgid "Let every user access this bookmark"
 msgstr "所有用者可讀取此書籤"
 
-#: libraries/messages.inc.php:110
-msgid "The bookmark has been deleted."
-msgstr "書籤已經刪除."
-
 #: libraries/messages.inc.php:111 sql.php:671
 msgid "Label"
 msgstr "書籤名稱"
@@ -2948,16 +3076,7 @@ msgstr "\"bzipped\""
 msgid "Calendar"
 msgstr "日曆"
 
-#: libraries/messages.inc.php:132
-#, fuzzy
-msgid "Could not load export plugins, please check your installation!"
-msgstr "無法讀取載入的外掛程式, 請檢查安裝程序!"
-
-#: libraries/messages.inc.php:133
-msgid "Could not load import plugins, please check your installation!"
-msgstr "無法讀取載入的外掛程式, 請檢查安裝程序!"
-
-#: libraries/messages.inc.php:137
+#: libraries/messages.inc.php:137 tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
 msgstr "無法將索引更名為 PRIMARY!"
 
@@ -3075,11 +3194,6 @@ msgstr "請設定表格 %s 內的坐標"
 msgid "Connections"
 msgstr "連線"
 
-#: libraries/messages.inc.php:186
-#, php-format
-msgid "Database %s has been copied to %s"
-msgstr "資料庫 %s 已複製到 %s"
-
 #: libraries/messages.inc.php:187 tbl_operations.php:509
 msgid "Copy table to (database<b>.</b>table):"
 msgstr "複製資料表到： (格式為 資料庫名稱<b>.</b>資料表名稱):"
@@ -3101,7 +3215,7 @@ msgstr ""
 msgid "Could not connect to the target"
 msgstr ""
 
-#: libraries/messages.inc.php:192
+#: libraries/messages.inc.php:192 server_processlist.php:24
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
@@ -3200,26 +3314,17 @@ msgstr "捷克語"
 msgid "Danish"
 msgstr "丹麥語"
 
-#: libraries/messages.inc.php:221 tbl_create.php:54
-msgid "The database name is empty!"
-msgstr "資料庫名稱並未輸入!!"
-
 #: libraries/messages.inc.php:222
 msgid "Database export options"
 msgstr "資料庫輸出選項"
 
-#: libraries/messages.inc.php:223
-#, fuzzy, php-format
-msgid "Database %1$s has been created."
-msgstr "資料庫 %s 已被刪除"
-
 #: libraries/messages.inc.php:225 server_synchronize.php:122
 #: server_synchronize.php:125 tbl_create.php:82 tbl_get_field.php:20
 #, php-format
 msgid "'%s' database does not exist."
 msgstr ""
 
-#: libraries/messages.inc.php:227
+#: libraries/messages.inc.php:227 server_databases.php:63
 #, php-format
 msgid "%s databases have been dropped successfully."
 msgstr "%s 個資料庫已成功刪除."
@@ -3244,7 +3349,7 @@ msgstr "停止統計數據"
 msgid "Enable Statistics"
 msgstr "啟動統計數據"
 
-#: libraries/messages.inc.php:232
+#: libraries/messages.inc.php:232 server_databases.php:366
 msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
@@ -3288,7 +3393,7 @@ msgstr "整理資料表"
 msgid "Use delayed inserts"
 msgstr "使用延遲式新增"
 
-#: libraries/messages.inc.php:253
+#: libraries/messages.inc.php:253 server_privileges.php:1243
 msgid "No users selected for deleting!"
 msgstr "並未選擇需要刪除之使用者!"
 
@@ -3497,32 +3602,12 @@ msgid ""
 "File %s already exists on server, change filename or check overwrite option."
 msgstr "檔案 %s 已存在,請更改檔案名稱或選擇「覆寫己存在檔案」選項."
 
-#: libraries/messages.inc.php:334
-msgid "database name"
-msgstr "資料庫名稱"
-
-#: libraries/messages.inc.php:335
-msgid "server name"
-msgstr "伺服器名稱"
-
-#: libraries/messages.inc.php:336
-msgid "table name"
-msgstr "資料表名稱"
-
-#: libraries/messages.inc.php:337
-#, php-format
-msgid ""
-"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
-msgstr ""
-
 #: libraries/messages.inc.php:340 server_binlog.php:136
 #, fuzzy
 msgid "Files"
 msgstr "欄位"
 
-#: libraries/messages.inc.php:342
+#: libraries/messages.inc.php:342 server_privileges.php:1597
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -3546,7 +3631,7 @@ msgstr "強迫更新資料表 (\"FLUSH\")"
 msgid "Flush (close) all tables"
 msgstr "強迫更新 (關閉) 所有資料表"
 
-#: libraries/messages.inc.php:347
+#: libraries/messages.inc.php:347 tbl_relation.php:279
 #, php-format
 msgid "Error creating foreign key on %1$s (check data types)"
 msgstr ""
@@ -3730,13 +3815,6 @@ msgstr ""
 msgid "Excel 2007 XLSX Workbook"
 msgstr ""
 
-#: libraries/messages.inc.php:420
-#, php-format
-msgid ""
-"The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
-"removed."
-msgstr ""
-
 #: libraries/messages.inc.php:422 libraries/mult_submits.inc.php:98
 #: libraries/tbl_properties.inc.php:116 libraries/tbl_properties.inc.php:525
 #: tbl_printview.php:326 tbl_structure.php:31 tbl_structure.php:154
@@ -3771,7 +3849,7 @@ msgstr ""
 msgid "Insert as new row"
 msgstr "儲存為新記錄"
 
-#: libraries/messages.inc.php:437
+#: libraries/messages.inc.php:437 sql.php:496
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -4085,17 +4163,10 @@ msgstr "顯示程序 (Process)"
 msgid "No databases"
 msgstr "沒有資料庫"
 
-#: libraries/messages.inc.php:554
+#: libraries/messages.inc.php:554 server_databases.php:52
 msgid "No databases selected."
 msgstr "沒有資料庫選擇."
 
-#: libraries/messages.inc.php:555
-msgid ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
-
 #: libraries/messages.inc.php:556 libraries/relation.lib.php:1173
 msgid "no description"
 msgstr "沒有說明"
@@ -4109,15 +4180,11 @@ msgstr "這儲存引擎並無詳細的狀態資料."
 msgid "No files found inside ZIP archive!"
 msgstr "於 ZIP 檔案內找不到任何檔案!"
 
-#: libraries/messages.inc.php:562 tbl_relation.php:529
-msgid "No index defined!"
-msgstr "沒有已定義的索引!"
-
-#: libraries/messages.inc.php:563
+#: libraries/messages.inc.php:563 tbl_indexes.php:91
 msgid "No index parts defined!"
 msgstr "部份索引資料還未定義!"
 
-#: libraries/messages.inc.php:564
+#: libraries/messages.inc.php:564 libraries/mult_submits.inc.php:435
 msgid "No change"
 msgstr "沒有變更"
 
@@ -4136,7 +4203,7 @@ msgstr "這種格式並無選項"
 msgid "The web server does not have permission to save the file %s."
 msgstr "Web 伺服器沒有權限儲存檔案 %s."
 
-#: libraries/messages.inc.php:573
+#: libraries/messages.inc.php:573 user_password.php:54
 msgid "You don't have sufficient privileges to be here right now!"
 msgstr "您現在沒有足夠的權限!"
 
@@ -4171,7 +4238,8 @@ msgstr ""
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr "<b>%s</b> 資料表找不到或還未在 %s 設定"
 
-#: libraries/messages.inc.php:582 server_privileges.php:2166
+#: libraries/messages.inc.php:582 server_privileges.php:804
+#: server_privileges.php:2166
 msgid "No user(s) found."
 msgstr "找不到使用者"
 
@@ -4220,7 +4288,7 @@ msgstr "資料表維護"
 msgid "Partition %s"
 msgstr ""
 
-#: libraries/messages.inc.php:614
+#: libraries/messages.inc.php:614 server_privileges.php:1212
 #, php-format
 msgid "The password for %s was changed successfully."
 msgstr "%s 的密碼已成功更改."
@@ -4323,11 +4391,11 @@ msgstr "波蘭語"
 msgid "Port"
 msgstr "排序"
 
-#: libraries/messages.inc.php:675
+#: libraries/messages.inc.php:675 tbl_indexes.php:67
 msgid "The name of the primary key must be \"PRIMARY\"!"
 msgstr "主鍵的名稱必須稱為 PRIMARY!"
 
-#: libraries/messages.inc.php:676
+#: libraries/messages.inc.php:676 tbl_indexes.php:184
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr "(\"PRIMARY\" <b>必須</b>是主鍵的名稱以及是<b>唯一</b>一組主鍵!)"
@@ -4523,7 +4591,7 @@ msgstr "容許更新數據."
 msgid "No privileges."
 msgstr "沒有權限."
 
-#: libraries/messages.inc.php:718
+#: libraries/messages.inc.php:718 server_privileges.php:1296
 msgid "The privileges were reloaded successfully."
 msgstr "權限已成功重新讀取."
 
@@ -4564,11 +4632,6 @@ msgid ""
 "server."
 msgstr "<b>查詣統計</b>: 當統計啟動後, 共有 %s 個查詢傳送到此伺服器."
 
-#: libraries/messages.inc.php:735
-#, php-format
-msgid "Query took %01.4f sec"
-msgstr "查詢需時 %01.4f 秒"
-
 #: libraries/messages.inc.php:736 server_status.php:554
 msgid "Query type"
 msgstr "查詢方式"
@@ -4597,13 +4660,6 @@ msgstr "檢查指示完整性:"
 msgid "Relational schema"
 msgstr "關聯概要"
 
-#: libraries/messages.inc.php:750 pdf_schema.php:34
-#, php-format
-msgid ""
-"The additional features for working with linked tables have been "
-"deactivated. To find out why click %shere%s."
-msgstr "關聯資料表的附加功能未能啟動, %s請按此%s 查出問題原因."
-
 #: libraries/messages.inc.php:752 tbl_relation.php:399
 msgid "Relations"
 msgstr "關聯"
@@ -4642,11 +4698,6 @@ msgstr ""
 msgid "Remove selected users"
 msgstr "移除已選擇使用者"
 
-#: libraries/messages.inc.php:761
-#, php-format
-msgid "Database %s has been renamed to %s"
-msgstr "資料庫 %s 已更改名稱為 %s"
-
 #: libraries/messages.inc.php:762 libraries/Table.class.php:1132
 #, php-format
 msgid "Table %s has been renamed to %s"
@@ -4753,7 +4804,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 
-#: libraries/messages.inc.php:785
+#: libraries/messages.inc.php:785 libraries/replication_gui.lib.php:188
 msgid ""
 "Only slaves started with the --report-host=host_name option are visible in "
 "this list."
@@ -4892,7 +4943,7 @@ msgstr ""
 msgid "Revoke all active privileges from the users and delete them afterwards."
 msgstr "廢除使用者所有有效之權限並刪除."
 
-#: libraries/messages.inc.php:816
+#: libraries/messages.inc.php:816 server_privileges.php:1176
 #, php-format
 msgid "You have revoked the privileges for %s"
 msgstr "您已移除這位使用者的權限: %s"
@@ -5050,19 +5101,11 @@ msgstr "顯示完整查詢"
 msgid "Show/Hide left menu"
 msgstr ""
 
-#: libraries/messages.inc.php:887
-msgid "Showing bookmark"
-msgstr "顯示書籤"
-
-#: libraries/messages.inc.php:888
+#: libraries/messages.inc.php:888 sql.php:513
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/messages.inc.php:889
-msgid "Showing rows"
-msgstr "顯示記錄"
-
-#: libraries/messages.inc.php:890
+#: libraries/messages.inc.php:890 sql.php:516
 msgid "Showing SQL query"
 msgstr ""
 
@@ -5821,7 +5864,7 @@ msgstr "資料表 %s 已存在!"
 msgid "Alter column(s)"
 msgstr ""
 
-#: libraries/messages.inc.php:1076
+#: libraries/messages.inc.php:1076 tbl_alter.php:103 tbl_indexes.php:98
 #, fuzzy, php-format
 msgid "Table %1$s has been altered successfully"
 msgstr "選擇的使用者已成功刪除."
@@ -5840,7 +5883,7 @@ msgstr ""
 msgid "The table name is empty!"
 msgstr "請輸入資料表名稱!"
 
-#: libraries/messages.inc.php:1081
+#: libraries/messages.inc.php:1081 tbl_create.php:249
 #, fuzzy, php-format
 msgid "Table %1$s has been created."
 msgstr "資料表 %s 已被刪除"
@@ -5962,7 +6005,7 @@ msgstr "指定主機"
 msgid "Threads"
 msgstr "線程"
 
-#: libraries/messages.inc.php:1112
+#: libraries/messages.inc.php:1112 server_processlist.php:22
 #, php-format
 msgid "Thread %s was successfully killed."
 msgstr "指令 %s 已成功中止."
@@ -5973,12 +6016,6 @@ msgid ""
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
 
-#: libraries/messages.inc.php:1115
-msgid ""
-"Script timeout passed, if you want to finish import, please resubmit same "
-"file and import will resume."
-msgstr ""
-
 #: libraries/messages.inc.php:1117 pmd_pdf.php:94
 msgid "to/from page"
 msgstr ""
@@ -5995,10 +6032,6 @@ msgstr ""
 msgid "To select relation, click :"
 msgstr ""
 
-#: libraries/messages.inc.php:1121
-msgid "total"
-msgstr "總計"
-
 #: libraries/messages.inc.php:1123 libraries/tbl_links.inc.php:149
 #, php-format
 msgid "Tracking of %s.%s is activated."
@@ -6288,7 +6321,7 @@ msgstr "統一碼 (Unicode)"
 msgid "unknown"
 msgstr "不詳"
 
-#: libraries/messages.inc.php:1198
+#: libraries/messages.inc.php:1198 server_privileges.php:1152
 #, php-format
 msgid "You have updated the privileges for %s."
 msgstr "您已經更新了 %s 的權限."
@@ -6307,17 +6340,6 @@ msgstr "請參看說明文件查詢如何更新 Column_comments 資料表"
 msgid "You should upgrade to %s %s or later."
 msgstr "您應該更新到 %s %s 或之後."
 
-#: libraries/messages.inc.php:1210
-#, php-format
-msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
-msgstr "你正嘗試上載大容量檔案，請查看此 %s文件%s 如何略過此限制."
-
-#: libraries/messages.inc.php:1211
-msgid "File uploads are not allowed on this server."
-msgstr ""
-
 #: libraries/messages.inc.php:1212 tbl_printview.php:314 tbl_structure.php:661
 msgid "Usage"
 msgstr "使用"
@@ -6331,7 +6353,7 @@ msgstr "在資料表及欄位使用引號"
 msgid "Use Host Table"
 msgstr "使用主機資料表"
 
-#: libraries/messages.inc.php:1215
+#: libraries/messages.inc.php:1215 server_privileges.php:848
 #, php-format
 msgid "The user %s already exists!"
 msgstr "使用者 %s 己存在!"
@@ -6344,7 +6366,7 @@ msgstr "使用者 %s 己存在!"
 msgid "User name"
 msgstr "使用者名稱"
 
-#: libraries/messages.inc.php:1218
+#: libraries/messages.inc.php:1218 server_privileges.php:1645
 msgid "The selected user was not found in the privilege table."
 msgstr "選擇的使用者在權限資料表內找不到."
 
@@ -6352,7 +6374,7 @@ msgstr "選擇的使用者在權限資料表內找不到."
 msgid "User overview"
 msgstr "使用者一覽"
 
-#: libraries/messages.inc.php:1220
+#: libraries/messages.inc.php:1220 server_privileges.php:1261
 msgid "The selected users have been deleted successfully."
 msgstr "選擇的使用者已成功刪除."
 
@@ -6411,10 +6433,6 @@ msgstr "檢視資料表的備份概要 (dump schema)"
 msgid "VIEW name"
 msgstr ""
 
-#: libraries/messages.inc.php:1243 tbl_change.php:1028
-msgid "The directory you set for upload work cannot be reached"
-msgstr "設定之上載目錄錯誤，未能使用"
-
 #: libraries/messages.inc.php:1245 main.php:205
 msgid "Web server"
 msgstr ""
@@ -6432,10 +6450,6 @@ msgstr ""
 msgid "wildcard"
 msgstr "萬用字元"
 
-#: libraries/messages.inc.php:1253
-msgid "Wrong username/password. Access denied."
-msgstr "錯誤的使用者名稱或密碼，拒絕存取"
-
 #: libraries/messages.inc.php:1255
 msgid ""
 "The XML file specified was either malformed or incomplete. Please correct "
diff --git a/server_databases.php b/server_databases.php
index 410e959b9..073706e9a 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -49,7 +49,7 @@ if (isset($_REQUEST['drop_selected_dbs_x'])) {
 if ((isset($_REQUEST['drop_selected_dbs']) || isset($_REQUEST['query_type']))
   && ($is_superuser || $cfg['AllowUserDropDatabase'])) {
     if (! isset($_REQUEST['selected_dbs']) && ! isset($_REQUEST['query_type'])) {
-        $message = PMA_Message::error('strNoDatabasesSelected');
+        $message = PMA_Message::error(__('No databases selected.'));
     } else {
         $action = 'server_databases.php';
         $submit_mult = 'drop_db' ;
@@ -60,7 +60,7 @@ if ((isset($_REQUEST['drop_selected_dbs']) || isset($_REQUEST['query_type']))
         require './libraries/mult_submits.inc.php';
         unset($action, $submit_mult, $err_url, $selected_db);
         if (empty($message)) {
-            $message = PMA_Message::success('strDatabasesDropped');
+            $message = PMA_Message::success(__('%s databases have been dropped successfully.'));
             if ($mult_btn == __('Yes')) {
                 $message->addParam(count($selected));
             } else {
@@ -363,7 +363,7 @@ if ($databases_count > 0) {
             .'            ' . __('Disable Statistics');
     }
     echo '</a></strong><br />' . "\n";
-    PMA_Message::warning('strDatabasesStatsHeavyTraffic')->display();
+    PMA_Message::warning(__('Note: Enabling the database statistics here might cause heavy traffic between the web server and the MySQL server.'))->display();
     echo '</li>' . "\n"
         .'</ul>' . "\n";
     echo '</form>';
diff --git a/server_privileges.php b/server_privileges.php
index 4c87f98eb..a17f48576 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -71,7 +71,7 @@ if (!$is_superuser) {
        . PMA_getIcon('b_usrlist.png')
        . __('Privileges') . "\n"
        . '</h2>' . "\n";
-    PMA_Message::error('strNoPrivileges')->display();
+    PMA_Message::error(__('No Privileges'))->display();
     require_once './libraries/footer.inc.php';
 }
 
@@ -801,7 +801,7 @@ if (isset($_REQUEST['change_copy'])) {
         .' = \'' . PMA_sqlAddslashes($old_hostname) . '\';';
     $row = PMA_DBI_fetch_single_row('SELECT * FROM `mysql`.`user` ' . $user_host_condition);
     if (! $row) {
-        PMA_Message::notice('strNoUsersFound')->display();
+        PMA_Message::notice(__('No user(s) found.'))->display();
         unset($_REQUEST['change_copy']);
     } else {
         extract($row, EXTR_OVERWRITE);
@@ -845,7 +845,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
         . " WHERE `User` = '" . PMA_sqlAddslashes($username) . "'"
         . " AND `Host` = '" . PMA_sqlAddslashes($hostname) . "';";
     if (PMA_DBI_fetch_value($sql) == 1) {
-        $message = PMA_Message::error('strUserAlreadyExists');
+        $message = PMA_Message::error(__('The user %s already exists!'));
         $message->addParam('[i]\'' . $username . '\'@\'' . $hostname . '\'[/i]');
         $_REQUEST['adduser'] = true;
     } else {
@@ -928,7 +928,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
                 $_REQUEST['createdb'] = false;
                 $message = PMA_Message::rawError(PMA_DBI_getError());
             } else {
-                $message = PMA_Message::success('strAddUserMessage');
+                $message = PMA_Message::success(__('You have added a new user.'));
             }
 
             switch (PMA_ifSetOr($_REQUEST['createdb'], '0')) {
@@ -1149,7 +1149,7 @@ if (!empty($update_privs)) {
         $sql_query2 = '';
     }
     $sql_query = $sql_query0 . ' ' . $sql_query1 . ' ' . $sql_query2;
-    $message = PMA_Message::success('strUpdatePrivMessage');
+    $message = PMA_Message::success(__('You have updated the privileges for %s.'));
     $message->addParam('\'' . $username . '\'@\'' . $hostname . '\'');
 }
 
@@ -1173,7 +1173,7 @@ if (isset($_REQUEST['revokeall'])) {
         $sql_query1 = '';
     }
     $sql_query = $sql_query0 . ' ' . $sql_query1;
-    $message = PMA_Message::success('strRevokeMessage');
+    $message = PMA_Message::success(__('You have revoked the privileges for %s'));
     $message->addParam('\'' . $username . '\'@\'' . $hostname . '\'');
     if (! isset($tablename)) {
         unset($dbname);
@@ -1192,9 +1192,9 @@ if (isset($_REQUEST['change_pw'])) {
 
     if ($nopass == 0 && isset($pma_pw) && isset($pma_pw2)) {
         if ($pma_pw != $pma_pw2) {
-            $message = PMA_Message::error('strPasswordNotSame');
+            $message = PMA_Message::error(__('The passwords aren\'t the same!'));
         } elseif (empty($pma_pw) || empty($pma_pw2)) {
-            $message = PMA_Message::error('strPasswordEmpty');
+            $message = PMA_Message::error(__('The password is empty!'));
         }
     } // end if
 
@@ -1209,7 +1209,7 @@ if (isset($_REQUEST['change_pw'])) {
         $local_query      = 'SET PASSWORD FOR \'' . PMA_sqlAddslashes($username) . '\'@\'' . PMA_sqlAddslashes($hostname) . '\' = ' . (($pma_pw == '') ? '\'\'' : $hashing_function . '(\'' . PMA_sqlAddslashes($pma_pw) . '\')');
         PMA_DBI_try_query($local_query)
             or PMA_mysqlDie(PMA_DBI_getError(), $sql_query, FALSE, $err_url);
-        $message = PMA_Message::success('strPasswordChanged');
+        $message = PMA_Message::success(__('The password for %s was changed successfully.'));
         $message->addParam('\'' . $username . '\'@\'' . $hostname . '\'');
     }
 }
@@ -1240,7 +1240,7 @@ if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST[
     }
     if (empty($_REQUEST['change_copy'])) {
         if (empty($queries)) {
-            $message = PMA_Message::error('strDeleteNoUsersSelected');
+            $message = PMA_Message::error(__('No users selected for deleting!'));
         } else {
             if ($_REQUEST['mode'] == 3) {
                 $queries[] = '# ' . __('Reloading the privileges') . ' ...';
@@ -1258,7 +1258,7 @@ if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST[
             if (! empty($drop_user_error)) {
                 $message = PMA_Message::rawError($drop_user_error);
             } else {
-                $message = PMA_Message::success('strUsersDeleted');
+                $message = PMA_Message::success(__('The selected users have been deleted successfully.'));
             }
         }
         unset($queries);
@@ -1293,7 +1293,7 @@ if (isset($_REQUEST['change_copy'])) {
 if (isset($_REQUEST['flush_privileges'])) {
     $sql_query = 'FLUSH PRIVILEGES;';
     PMA_DBI_query($sql_query);
-    $message = PMA_Message::success('strPrivilegesReloaded');
+    $message = PMA_Message::success(__('The privileges were reloaded successfully.'));
 }
 
 
@@ -1385,7 +1385,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
             $res = PMA_DBI_try_query($sql_query, null, PMA_DBI_QUERY_STORE);
 
             if (!$res) {
-                PMA_Message::error('strNoPrivileges')->display();
+                PMA_Message::error(__('No Privileges'))->display();
                 PMA_DBI_free_result($res);
                 unset($res);
             } else {
@@ -1594,7 +1594,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                    . '            ' . __('Add a new User') . '</a>' . "\n"
                    . '    </fieldset>' . "\n";
             } // end if (display overview)
-            $flushnote = new PMA_Message('strFlushPrivilegesNote', PMA_Message::NOTICE);
+            $flushnote = new PMA_Message(__('Note: phpMyAdmin gets the users\' privileges directly from MySQL\'s privilege tables. The content of these tables may differ from the privileges the server uses, if they have been changed manually. In this case, you should %sreload the privileges%s before you continue.'), PMA_Message::NOTICE);
             $flushnote->addParam('<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;flush_privileges=1">', false);
             $flushnote->addParam('</a>', false);
             $flushnote->display();
@@ -1642,7 +1642,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
         $user_does_not_exists = (bool) ! PMA_DBI_fetch_value($sql);
         unset($sql);
         if ($user_does_not_exists) {
-            PMA_Message::warning('strUserNotFound')->display();
+            PMA_Message::warning(__('The selected user was not found in the privilege table.'))->display();
             PMA_displayLoginInformationFields();
             //require_once './libraries/footer.inc.php';
         }
diff --git a/server_processlist.php b/server_processlist.php
index ed60d77f7..a77706097 100644
--- a/server_processlist.php
+++ b/server_processlist.php
@@ -19,9 +19,9 @@ require './libraries/server_links.inc.php';
  */
 if (!empty($_REQUEST['kill'])) {
     if (PMA_DBI_try_query('KILL ' . $_REQUEST['kill'] . ';')) {
-        $message = PMA_Message::success('strThreadSuccessfullyKilled');
+        $message = PMA_Message::success(__('Thread %s was successfully killed.'));
     } else {
-        $message = PMA_Message::error('strCouldNotKill');
+        $message = PMA_Message::error(__('phpMyAdmin was unable to kill thread %s. It probably has already been closed.'));
     }
     $message->addParam($_REQUEST['kill']);
     $message->display();
diff --git a/sql.php b/sql.php
index fc75ea02a..ccc77292e 100644
--- a/sql.php
+++ b/sql.php
@@ -493,7 +493,7 @@ if (0 == $num_rows || $is_affected) {
             // need to use a temporary because the Message class
             // currently supports adding parameters only to the first
             // message
-            $_inserted = PMA_Message::notice('strInsertedRowId');
+            $_inserted = PMA_Message::notice(__('Inserted row id: %1$d'));
             $_inserted->addParam($insert_id + $num_rows - 1);
             $message->addMessage($_inserted);
         }
@@ -510,18 +510,18 @@ if (0 == $num_rows || $is_affected) {
     } elseif (!empty($zero_rows) && !$is_select) {
         $message = PMA_Message::rawSuccess(htmlspecialchars($zero_rows));
     } elseif (!empty($GLOBALS['show_as_php'])) {
-        $message = PMA_Message::success('strShowingPhp');
+        $message = PMA_Message::success(__('Showing as PHP code'));
     } elseif (isset($GLOBALS['show_as_php'])) {
         /* User disable showing as PHP, query is only displayed */
-        $message = PMA_Message::notice('strShowingSQL');
+        $message = PMA_Message::notice(__('Showing SQL query'));
     } elseif (!empty($GLOBALS['validatequery'])) {
-        $message = PMA_Message::notice('strValidateSQL');
+        $message = PMA_Message::notice(__('Validate SQL'));
     } else {
-        $message = PMA_Message::success('strEmptyResultSet');
+        $message = PMA_Message::success(__('MySQL returned an empty result set (i.e. zero rows).'));
     }
 
     if (isset($GLOBALS['querytime'])) {
-        $_querytime = PMA_Message::notice('strQueryTime');
+        $_querytime = PMA_Message::notice(__('Query took %01.4f sec'));
         $_querytime->addParam($GLOBALS['querytime']);
         $message->addMessage('(');
         $message->addMessage($_querytime);
diff --git a/tbl_alter.php b/tbl_alter.php
index bd82396a7..4a2a208c0 100644
--- a/tbl_alter.php
+++ b/tbl_alter.php
@@ -100,7 +100,7 @@ if (isset($_REQUEST['do_save_data'])) {
     $result    = PMA_DBI_try_query($sql_query);
 
     if ($result !== false) {
-        $message = PMA_Message::success('strTableAlteredSuccessfully');
+        $message = PMA_Message::success(__('Table %1$s has been altered successfully'));
         $message->addParam($table);
         $btnDrop = 'Fake';
 
diff --git a/tbl_create.php b/tbl_create.php
index a0b9bad74..02c637dff 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -246,7 +246,7 @@ if (isset($_REQUEST['do_save_data'])) {
             }
         }
 
-        $message = PMA_Message::success('strTableHasBeenCreated');
+        $message = PMA_Message::success(__('Table %1$s has been created.'));
         $message->addParam(PMA_backquote($db) . '.' . PMA_backquote($table));
 
         $display_query = $sql_query;
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 1eda8072a..1d05e2092 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -64,7 +64,7 @@ if (isset($_REQUEST['do_save_data'])) {
             if ($index->getName() == '') {
                 $index->setName('PRIMARY');
             } elseif ($index->getName() != 'PRIMARY') {
-                $error = PMA_Message::error('strPrimaryKeyName');
+                $error = PMA_Message::error(__('The name of the primary key must be "PRIMARY"!'));
             }
             $sql_query .= ' ADD PRIMARY KEY';
             break;
@@ -72,7 +72,7 @@ if (isset($_REQUEST['do_save_data'])) {
         case 'UNIQUE':
         case 'INDEX':
             if ($index->getName() == 'PRIMARY') {
-                $error = PMA_Message::error('strCantRenameIdxToPrimary');
+                $error = PMA_Message::error(__('Can\'t rename index to PRIMARY!'));
             }
             $sql_query .= ' ADD ' . $index->getType() . ' '
                 . ($index->getName() ? PMA_backquote($index->getName()) : '');
@@ -88,14 +88,14 @@ if (isset($_REQUEST['do_save_data'])) {
     } // end while
 
     if (empty($index_fields)){
-        $error = PMA_Message::error('strNoIndexPartsDefined');
+        $error = PMA_Message::error(__('No index parts defined!'));
     } else {
         $sql_query .= ' (' . implode(', ', $index_fields) . ')';
     }
 
     if (! $error) {
         PMA_DBI_query($sql_query);
-        $message = PMA_Message::success('strTableAlteredSuccessfully');
+        $message = PMA_Message::success(__('Table %1$s has been altered successfully'));
         $message->addParam($table);
 
         $active_page = 'tbl_structure.php';
@@ -181,7 +181,7 @@ if (isset($_REQUEST['create_index'])) {
 
 <br class="clearfloat" />
 <?php
-PMA_Message::warning('strPrimaryKeyWarning')->display();
+PMA_Message::warning(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)'))->display();
 ?>
 
 <table>
diff --git a/tbl_relation.php b/tbl_relation.php
index 463f437a1..4a9afa9e2 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -276,7 +276,7 @@ if (isset($_REQUEST['destination_foreign'])) {
                 echo PMA_showMySQLDocu('manual_Table_types', 'InnoDB_foreign_key_constraints') . "\n";
             }
             if (substr($tmp_error, 1, 4) == '1005') {
-                $message = PMA_Message::warning('strForeignKeyError');
+                $message = PMA_Message::warning( __('Error creating foreign key on %1$s (check data types)'));
                 $message->addParam($master_field);
                 $message->display();
                 echo PMA_showMySQLDocu('manual_Table_types', 'InnoDB_foreign_key_constraints') . "\n";
diff --git a/user_password.php b/user_password.php
index 56429bba7..9bfa280d0 100644
--- a/user_password.php
+++ b/user_password.php
@@ -51,7 +51,7 @@ if (!$cfg['ShowChgPassword']) {
 }
 if ($cfg['Server']['auth_type'] == 'config' || !$cfg['ShowChgPassword']) {
     require_once './libraries/header.inc.php';
-    PMA_Message::error('strNoRights')->display();
+    PMA_Message::error(__('You don\'t have sufficient privileges to be here right now!'))->display();
     require_once './libraries/footer.inc.php';
 } // end if
 
@@ -67,10 +67,10 @@ if (isset($_REQUEST['nopass'])) {
     if ($_REQUEST['nopass'] == '1') {
         $password = '';
     } elseif (empty($_REQUEST['pma_pw']) || empty($_REQUEST['pma_pw2'])) {
-        $message = PMA_Message::error('strPasswordEmpty');
+        $message = PMA_Message::error(__('The password is empty!'));
         $_error = true;
     } elseif ($_REQUEST['pma_pw'] != $_REQUEST['pma_pw2']) {
-        $message = PMA_Message::error('strPasswordNotSame');
+        $message = PMA_Message::error(__('The passwords aren\'t the same!'));
         $_error = true;
     } else {
         $password = $_REQUEST['pma_pw'];