Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

Resolved conflicts: setup/lib/forms.inc.php setup/lib/messages.inc.php
2010-07-20 12:19:21 +02:00
parent c67340d023 d7192b3a95
commit 52550eff13
21 changed files with 727 additions and 267 deletions
--- a/Documentation.html
+++ b/Documentation.html
@@ -1703,15 +1703,6 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
        expression. For example if you want only Czech and English, you should
        set filter to <code>'^(cs|en)'</code>.</dd>

-    <dt id="cfg_DefaultCharset">$cfg['DefaultCharset'] string</dt>
-    <dd>Default character set to use for recoding of MySQL queries. This must be
-        enabled and it's described by
-        <a href="#cfg_AllowAnywhereRecoding" class="configrule">$cfg['AllowAnywhereRecoding']</a>
-        option.<br />
-        You can give here any character set which is in
-        <a href="#cfg_AvailableCharsets" class="configrule">$cfg['AvailableCharsets']</a>
-        array and this is just default choice, user can select any of them.</dd>
-
    <dt id="cfg_AllowAnywhereRecoding">$cfg['AllowAnywhereRecoding'] boolean</dt>
    <dd>Allow character set recoding of MySQL queries. You need recode or iconv
        support (compiled in or module) in PHP to allow MySQL queries recoding
--- a/db_search.php
+++ b/db_search.php
@@ -257,7 +257,7 @@ if (isset($_REQUEST['submit_search'])) {
        $sql_query .= $newsearchsqls['select_count'];

        echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">'
-            .'<td>' . sprintf(__('%s match(es) inside table <i>%s</i>'), $res_cnt,
+            .'<td>' . sprintf(_ngettext('%s match inside table <i>%s</i>', '%s matches inside table <i>%s</i>', $res_cnt), $res_cnt,
                htmlspecialchars($each_table)) . "</td>\n";

        if ($res_cnt > 0) {
@@ -282,7 +282,7 @@ if (isset($_REQUEST['submit_search'])) {
    echo '</table>' . "\n";

    if (count($tables_selected) > 1) {
-        echo '<p>' . sprintf(__('<b>Total:</b> <i>%s</i> match(es)'),
+        echo '<p>' . sprintf(_ngettext('<b>Total:</b> <i>%s</i> match', '<b>Total:</b> <i>%s</i> matches', $num_search_result_total),
            $num_search_result_total) . '</p>' . "\n";
    }
 } // end 1.
--- a/export.php
+++ b/export.php
@@ -265,11 +265,7 @@ if ($asfile) {
    }

    // convert filename to iso-8859-1, it is safer
-    if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] )) {
-        $filename = PMA_convert_string($charset, 'iso-8859-1', $filename);
-    } else {
-        $filename = PMA_convert_string($convcharset, 'iso-8859-1', $filename);
-    }
+    $filename = PMA_convert_string($charset, 'iso-8859-1', $filename);

    // Grab basic dump extension and mime type
    $filename  .= '.' . $export_list[$type]['extension'];
--- a/index.php
+++ b/index.php
@@ -63,7 +63,7 @@ unset($cfgRelation);
 /**
 * pass variables to child pages
 */
-$drops = array('lang', 'server', 'convcharset', 'collation_connection',
+$drops = array('lang', 'server', 'collation_connection',
    'db', 'table');

 foreach ($drops as $each_drop) {
--- a/libraries/charset_conversion.lib.php
+++ b/libraries/charset_conversion.lib.php
@@ -120,43 +120,6 @@ if ($PMA_recoding_engine == PMA_CHARSET_ICONV_AIX) {
    require_once './libraries/iconv_wrapper.lib.php';
 }

-/**
- * Converts encoding of text according to current settings.
- *
- * @param   string   what to convert
- *
- * @return  string   converted text
- *
- * @global  array    the configuration array
- * @global  boolean  whether recoding is allowed or not
- * @global  string   the current charset
- * @global  array    the charset to convert to
- *
- * @access  public
- *
- */
-function PMA_convert_charset($what) {
-    global $cfg, $charset, $convcharset;
-
-    if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] )
-        || $convcharset == $charset) { // if input and output charset are the same, we don't have to do anything...
-        return $what;
-    } else {
-        switch ($GLOBALS['PMA_recoding_engine']) {
-            case PMA_CHARSET_RECODE:
-                return recode_string($charset . '..'  . $convcharset, $what);
-            case PMA_CHARSET_ICONV:
-                return iconv($charset, $convcharset . $cfg['IconvExtraParams'], $what);
-            case PMA_CHARSET_ICONV_AIX:
-                return PMA_aix_iconv_wrapper($charset, $convcharset . $cfg['IconvExtraParams'], $what);
-            case PMA_CHARSET_LIBICONV:
-                return libiconv($charset, $convcharset . $GLOBALS['cfg']['IconvExtraParams'], $what);
-            default:
-                return $what;
-        }
-    }
-} //  end of the "PMA_convert_charset()" function
-
 /**
 * Converts encoding of text according to parameters with detected
 * conversion function.
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -454,7 +454,7 @@ if (PMA_checkPageValidity($_REQUEST['back'], $goto_whitelist)) {
 * f.e. PMA_Config: fontsize
 *
 * @todo variables should be handled by their respective owners (objects)
- * f.e. lang, server, convcharset, collation_connection in PMA_Config
+ * f.e. lang, server, collation_connection in PMA_Config
 */
 if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST['token']) {
    /**
@@ -468,7 +468,7 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST['
        /* Session ID */
        'phpMyAdmin',
        /* Cookie preferences */
-        'pma_lang', 'pma_charset', 'pma_collation_connection',
+        'pma_lang', 'pma_collation_connection',
        /* Possible login form */
        'pma_servername', 'pma_username', 'pma_password',
        /* for playing blobstreamable media */
@@ -488,14 +488,6 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST['
 }


-/**
- * @global string $GLOBALS['convcharset']
- * @see select_lang.lib.php
- */
-if (isset($_REQUEST['convcharset'])) {
-    $GLOBALS['convcharset'] = strip_tags($_REQUEST['convcharset']);
-}
-
 /**
 * current selected database
 * @global string $GLOBALS['db']
@@ -793,7 +785,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
     * @todo should be done in PMA_Config
     */
    $GLOBALS['PMA_Config']->setCookie('pma_lang', $GLOBALS['lang']);
-    $GLOBALS['PMA_Config']->setCookie('pma_charset', $GLOBALS['convcharset']);
    $GLOBALS['PMA_Config']->setCookie('pma_collation_connection', $GLOBALS['collation_connection']);

    $_SESSION['PMA_Theme_Manager']->setThemeCookie();
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -553,7 +553,7 @@ $cfg['SessionSavePath'] = '';
 /**
 * maximum allocated bytes ('0' for no limit)
 * this is a string because '16M' is a valid value; we must put here
- * a string as the default value so that /setup accepts strings 
+ * a string as the default value so that /setup accepts strings
 *
 * @global string $cfg['MemoryLimit']
 */
@@ -2001,16 +2001,6 @@ $cfg['DefaultConnectionCollation'] = 'utf8_general_ci';
 */
 $cfg['FilterLanguages'] = '';

-/**
- * Default character set to use for recoding of MySQL queries, does not take
- * any effect when character sets recoding is switched off by
- * $cfg['AllowAnywhereRecoding'] or in language file
- * (see $cfg['AvailableCharsets'] to possible choices, you can add your own)
- *
- * @global string $cfg['DefaultCharset']
- */
-$cfg['DefaultCharset'] = 'utf-8';
-
 /**
 * Allow character set recoding of MySQL queries, must be also enabled in language
 * file to make harder using other language files than Unicode.
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -25,7 +25,6 @@ $cfg_db['Servers'] = array(1 => array(
        'order'    => array('', 'deny,allow', 'allow,deny', 'explicit')),
    'only_db'      => 'array'));
 $cfg_db['RecodingEngine'] = array('auto', 'iconv', 'recode');
-$cfg_db['DefaultCharset'] = $GLOBALS['cfg']['AvailableCharsets'];
 $cfg_db['OBGzip'] = array('auto', true, false);
 $cfg_db['MemoryLimit'] = 'short_string';
 $cfg_db['ShowTooltipAliasTB'] = array('nested', true, false);
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -13,7 +13,6 @@ if (!function_exists('__')) {
 }


-$strConfigAllowAnywhereRecoding_name = __('Allow character set conversion');
 $strConfigAllowArbitraryServer_desc = __('If enabled user can enter any MySQL server in login form for cookie auth');
 $strConfigAllowArbitraryServer_name = __('Allow login to any MySQL server');
 $strConfigAllowUserDropDatabase_name = __('Show &quot;Drop database&quot; link to normal users');
@@ -38,8 +37,6 @@ $strConfigConfigurationFile = __('Configuration file');
 $strConfigConfirm_desc = __('Whether a warning (&quot;Are your really sure...&quot;) should be displayed when you\'re about to lose data');
 $strConfigConfirm_name = __('Confirm DROP queries');
 $strConfigCtrlArrowsMoving_name = __('Field navigation using Ctrl+Arrows');
-$strConfigDefaultCharset_desc = __('Default character set used for conversions');
-$strConfigDefaultCharset_name = __('Default character set');
 $strConfigDefaultDisplay_name = __('Default display direction');
 $strConfigDefaultPropDisplay_desc = __('[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates maximum number for which vertical model is used');
 $strConfigDefaultPropDisplay_name = __('Display direction for altering/creating columns');
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -75,8 +75,6 @@ $forms['Servers']['Server_tracking'] = array('Servers' => array(1 => array(
 $forms['Features']['Import_export'] = array(
    'UploadDir',
    'SaveDir',
-    'AllowAnywhereRecoding',
-    'DefaultCharset',
    'RecodingEngine',
    'IconvExtraParams',
    'ZipDump',
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -144,7 +144,6 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu
 * selects given database
 *
 * @uses    $GLOBALS['userlink']
- * @uses    PMA_convert_charset()
 * @uses    mysqli_select_db()
 * @param   string          $dbname database name to select
 * @param   object mysqli   $link   the mysqli object
@@ -168,7 +167,6 @@ function PMA_DBI_select_db($dbname, $link = null)
 * @uses    PMA_DBI_QUERY_STORE
 * @uses    PMA_DBI_QUERY_UNBUFFERED
 * @uses    $GLOBALS['userlink']
- * @uses    PMA_convert_charset()
 * @uses    MYSQLI_STORE_RESULT
 * @uses    MYSQLI_USE_RESULT
 * @uses    mysqli_query()
--- a/libraries/grab_globals.lib.php
+++ b/libraries/grab_globals.lib.php
@@ -71,7 +71,6 @@ $_import_blacklist = array(
    '/^goto$/i',        // page to display
    '/^back$/i',        // the page go back
    '/^lang$/i',        // selected language
-    '/^convcharset$/i', // PMA convert charset
    '/^collation_connection$/i', //
    '/^set_theme$/i',   //
    '/^sql_query$/i',   // the query to be executed
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -32,7 +32,6 @@ function PMA_langName($tmplang) {
 * @uses    $GLOBALS['lang_failed_cfg']
 * @uses    $GLOBALS['lang_failed_cookie']
 * @uses    $GLOBALS['lang_failed_request']
- * @uses    $GLOBALS['convcharset'] to set it if not set
 * @uses    $_REQUEST['lang']
 * @uses    $_COOKIE['pma_lang']
 * @uses    $_SERVER['HTTP_ACCEPT_LANGUAGE']
@@ -444,16 +443,6 @@ $GLOBALS['mysql_charset_map'] = array(
 * Do the work!
 */

-if (empty($GLOBALS['convcharset'])) {
-    if (isset($_COOKIE['pma_charset'])) {
-        $GLOBALS['convcharset'] = $_COOKIE['pma_charset'];
-    } else {
-        // session.save_path might point to a bad folder, in which case
-        // $GLOBALS['cfg'] would not exist
-        $GLOBALS['convcharset'] = isset($GLOBALS['cfg']['DefaultCharset']) ? $GLOBALS['cfg']['DefaultCharset'] : 'utf-8';
-    }
-}
-
 if (! PMA_langCheck()) {
    // fallback language
    $fall_back_lang = 'en';
--- a/libraries/url_generating.lib.php
+++ b/libraries/url_generating.lib.php
@@ -57,10 +57,6 @@ function PMA_generate_common_hidden_inputs($db = '', $table = '', $indent = 0, $
    && ! empty($GLOBALS['lang'])) {
        $params['lang'] = $GLOBALS['lang'];
    }
-    if (empty($_COOKIE['pma_charset'])
-    && ! empty($GLOBALS['convcharset'])) {
-        $params['convcharset'] = $GLOBALS['convcharset'];
-    }
    if (empty($_COOKIE['pma_collation_connection'])
    && ! empty($GLOBALS['collation_connection'])) {
        $params['collation_connection'] = $GLOBALS['collation_connection'];
@@ -170,8 +166,6 @@ function PMA_getHiddenFields($values, $pre = '')
 * @uses    $GLOBALS['cfg']['ServerDefault']
 * @uses    $_COOKIE['pma_lang']
 * @uses    $GLOBALS['lang']
- * @uses    $_COOKIE['pma_charset']
- * @uses    $GLOBALS['convcharset']
 * @uses    $_COOKIE['pma_collation_connection']
 * @uses    $GLOBALS['collation_connection']
 * @uses    $_SESSION[' PMA_token ']
@@ -249,10 +243,6 @@ function PMA_generate_common_url()
      && ! empty($GLOBALS['lang'])) {
        $params['lang'] = $GLOBALS['lang'];
    }
-    if (empty($_COOKIE['pma_charset'])
-      && ! empty($GLOBALS['convcharset'])) {
-        $params['convcharset'] = $GLOBALS['convcharset'];
-    }
    if (empty($_COOKIE['pma_collation_connection'])
      && ! empty($GLOBALS['collation_connection'])) {
        $params['collation_connection'] = $GLOBALS['collation_connection'];
--- a/pdf_schema.php
+++ b/pdf_schema.php
@@ -224,7 +224,7 @@ class PMA_PDF extends TCPDF {
    function PMA_PDF_die($error_message = '')
    {
        global $cfg;
-        global $server, $lang, $convcharset, $db;
+        global $server, $lang, $db;
        global $charset, $text_dir;

        require_once './libraries/header.inc.php';
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-07-19 10:04-0400\n"
-"PO-Revision-Date: 2010-06-08 10:43+0200\n"
+"PO-Revision-Date: 2010-07-20 11:10+0200\n"
 "Last-Translator: Michal <michal@cihar.com>\n"
 "Language-Team: czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -613,8 +613,8 @@ msgstr "Sledování není zapnuté."
 #: db_structure.php:420 libraries/display_tbl.lib.php:1944
 #, php-format
 msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
 msgstr ""
 "Tento pohled má alespoň tolik řádek. Podrobnosti naleznete v %sdokumentaci%s."

@@ -805,8 +805,8 @@ msgstr "Výpis byl uložen do souboru %s."
 #: import.php:60
 #, php-format
 msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"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."
@@ -1001,7 +1001,6 @@ msgid "Choose column to display"
 msgstr "Zvolte která pole zobrazit"

 #: js/messages.php:66
-#, fuzzy
 #| msgid "Generate Password"
 msgid "Generate password"
 msgstr "Vytvořit heslo"
@@ -1478,8 +1477,8 @@ msgstr "Vítejte v %s"
 #: libraries/auth/config.auth.lib.php:107
 #, php-format
 msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
 msgstr ""
 "Pravděpodobná příčina je, že nemáte vytvořený konfigurační soubor. Pro jeho "
 "vytvoření by se vám mohl hodit %1$snastavovací skript%2$s."
@@ -2035,8 +2034,8 @@ msgstr "jméno tabulky"
 #, 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."
+"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 "
@@ -3787,8 +3786,8 @@ msgid ""
 "For a list of available transformation options and their MIME type "
 "transformations, click on %stransformation descriptions%s"
 msgstr ""
-"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na %"
-"spopisy transformací%s"
+"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na "
+"%spopisy transformací%s"

 #: libraries/tbl_properties.inc.php:145
 msgid "Transformation options"
@@ -3821,8 +3820,8 @@ msgid ""
 "No description is available for this transformation.<br />Please ask the "
 "author what %s does."
 msgstr ""
-"Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co %"
-"s dělá."
+"Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co "
+"%s dělá."

 #: libraries/tbl_properties.inc.php:726 server_engines.php:58
 #: tbl_operations.php:355
@@ -4783,8 +4782,8 @@ msgstr "Odstranit databáze se stejnými jmény jako uživatelé."
 msgid ""
 "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."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
 msgstr ""
 "Poznámka: phpMyAdmin získává oprávnění přímo z tabulek MySQL. Obsah těchto "
 "tabulek se může lišit od oprávnění, která server právě používá, pokud byly "
@@ -7058,8 +7057,9 @@ msgstr ""
 "Nastavil jste typ autentizace [kbd]config[/kbd] a zadal jste uživatelské "
 "jméno a heslo pro automatické přihlášení, což není doporučená volba pro "
 "produkční servery. Kdokoli kdo zná URL phpMyAdminu může přímo přistoupit k "
-"Vašemu phpMyAdmin panelu. Nastavte [a@?page=servers&amp;mode=edit&amp;id=%1"
-"$d#tab_Server]typ autentizace[/a] na [kbd]cookie[/kbd] nebo [kbd]http[/kbd]."
+"Vašemu phpMyAdmin panelu. Nastavte [a@?page=servers&amp;mode=edit&amp;id="
+"%1$d#tab_Server]typ autentizace[/a] na [kbd]cookie[/kbd] nebo [kbd]http[/"
+"kbd]."

 #: setup/lib/messages.inc.php:239
 msgid "You should use mysqli for performance reasons"
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-07-19 10:04-0400\n"
-"PO-Revision-Date: 2010-07-01 19:56+0200\n"
+"PO-Revision-Date: 2010-07-19 19:46+0200\n"
 "Last-Translator: Marc Delisle <marc@infomarc.info>\n"
 "Language-Team: french <fr@li.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.1\n"

@@ -24,7 +24,7 @@ msgstr "Tout afficher"
 #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123
 #: pdf_schema.php:1139
 msgid "Page number:"
-msgstr "Page n°:"
+msgstr "Page n°: "

 #: browse_foreigners.php:132
 msgid ""
@@ -210,7 +210,7 @@ msgstr "Tout désélectionner"

 #: db_operations.php:38 tbl_create.php:54
 msgid "The database name is empty!"
-msgstr "Le nom de la base de données est vide!"
+msgstr "Le nom de la base de données est vide !"

 #: db_operations.php:236
 #, php-format
@@ -464,7 +464,7 @@ msgstr "Utiliser les tables"
 #: db_qbe.php:640
 #, php-format
 msgid "SQL query on database <b>%s</b>:"
-msgstr "Requête SQL sur la base <b>%s</b>:"
+msgstr "Requête SQL sur la base <b>%s</b>: "

 #: db_qbe.php:934 libraries/common.lib.php:1225
 msgid "Submit Query"
@@ -530,7 +530,7 @@ msgstr "Effectuer une nouvelle recherche dans la base de données"

 #: db_search.php:302
 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):"
-msgstr "Mot ou Valeur à rechercher (passe-partout: «%») :"
+msgstr "Mot ou valeur à rechercher (passe-partout: «%») :"

 #: db_search.php:307
 msgid "Find:"
@@ -546,7 +546,7 @@ msgstr "Dans la(les) table(s) :"

 #: db_search.php:355
 msgid "Inside column:"
-msgstr "Dans la colonne:"
+msgstr "Dans la colonne: "

 #: db_structure.php:81 db_structure.php:82 db_structure.php:94
 #: db_structure.php:95 db_structure.php:107 db_structure.php:108
@@ -775,7 +775,7 @@ msgstr "Journal de la base de données"

 #: export.php:62
 msgid "Selected export type has to be saved in file!"
-msgstr "Ce choix d'exportation doit être sauvegardé dans un fichier!"
+msgstr "Ce choix d'exportation doit être sauvegardé dans un fichier !"

 #: export.php:154 export.php:179 export.php:627
 #, php-format
@@ -788,7 +788,7 @@ msgid ""
 "File %s already exists on server, change filename or check overwrite option."
 msgstr ""
 "Le fichier %s existe déjà sur le serveur, veuillez changer le nom, ou cocher "
-"l'option Écraser"
+"l'option «écraser»."

 #: export.php:298 export.php:302
 #, php-format
@@ -836,14 +836,14 @@ msgid ""
 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]"
+"par votre configuration de PHP. Voir "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."

 #: import.php:372 libraries/display_import.lib.php:23
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 "Chargement impossible des greffons d'importation, veuillez vérifier votre "
-"installation!"
+"installation !"

 #: import.php:397
 msgid "The bookmark has been deleted."
@@ -904,7 +904,7 @@ msgstr "Cliquer pour désélectionner"

 #: js/messages.php:27 libraries/import.lib.php:104 sql.php:89
 msgid "\"DROP DATABASE\" statements are disabled."
-msgstr "La commande  «DROP DATABASE» est désactivée."
+msgstr "La commande «DROP DATABASE» est désactivée."

 #: js/messages.php:30 libraries/mult_submits.inc.php:258 sql.php:188
 msgid "Do you really want to "
@@ -912,18 +912,18 @@ msgstr "Voulez-vous vraiment effectuer "

 #: js/messages.php:31 libraries/mult_submits.inc.php:258 sql.php:172
 msgid "You are about to DESTROY a complete database!"
-msgstr "Vous êtes sur le point de DÉTRUIRE une base de données!"
+msgstr "Vous êtes sur le point de DÉTRUIRE une base de données !"

 #: js/messages.php:34
 msgid "You are about to DISABLE a BLOB Repository!"
-msgstr "Vous allez DÉSACTIVER un dépôt BLOB!"
+msgstr "Vous allez DÉSACTIVER un dépôt BLOB !"

 #: js/messages.php:35
 #, php-format
 msgid "Are you sure you want to disable all BLOB references for database %s?"
 msgstr ""
 "Êtes-vous certain de vouloir désactiver toutes les références BLOB pour la "
-"base %s?"
+"base %s ?"

 #: js/messages.php:38
 msgid "Missing value in the form!"
@@ -935,19 +935,19 @@ msgstr "Ce n'est pas un nombre !"

 #: js/messages.php:42
 msgid "The host name is empty!"
-msgstr "Le nom de serveur est vide"
+msgstr "Le nom de serveur est vide !"

 #: js/messages.php:43
 msgid "The user name is empty!"
-msgstr "Le nom d'utilisateur est vide"
+msgstr "Le nom d'utilisateur est vide !"

 #: js/messages.php:44 server_privileges.php:1229 user_password.php:73
 msgid "The password is empty!"
-msgstr "Le mot de passe est vide"
+msgstr "Le mot de passe est vide !"

 #: js/messages.php:45 server_privileges.php:1227 user_password.php:76
 msgid "The passwords aren't the same!"
-msgstr "Les mots de passe doivent être identiques"
+msgstr "Les mots de passe doivent être identiques !"

 #: js/messages.php:49 pmd_general.php:342 pmd_general.php:379
 msgid "Cancel"
@@ -955,7 +955,7 @@ msgstr "Annuler"

 #: js/messages.php:52 pmd_save_pos.php:54
 msgid "Modifications have been saved"
-msgstr "Les modifications ont été sauvegardées."
+msgstr "Les modifications ont été sauvegardées"

 #: js/messages.php:53 pmd_relation_upd.php:49
 msgid "Relation deleted"
@@ -1313,7 +1313,7 @@ msgstr ""

 #: libraries/Index.class.php:428 tbl_relation.php:529
 msgid "No index defined!"
-msgstr "Aucun index n'est défini!"
+msgstr "Aucun index n'est défini !"

 #: libraries/Index.class.php:433 server_databases.php:132 tbl_tracking.php:316
 msgid "Indexes"
@@ -1441,7 +1441,7 @@ msgstr "La table %s se nomme maintenant %s"
 #: libraries/Theme.class.php:162
 #, php-format
 msgid "No valid image path for theme %s found!"
-msgstr "Chemin des images inexistant pour le thème %s!"
+msgstr "Chemin des images inexistant pour le thème %s !"

 #: libraries/Theme.class.php:384
 msgid "No preview available."
@@ -1454,17 +1454,17 @@ msgstr "utiliser celui-ci"
 #: libraries/Theme_Manager.class.php:115
 #, php-format
 msgid "Default theme %s not found!"
-msgstr "Thème par défaut %s inexistant!"
+msgstr "Thème par défaut %s inexistant !"

 #: libraries/Theme_Manager.class.php:153
 #, php-format
 msgid "Theme %s not found!"
-msgstr "Thème %s inexistant!"
+msgstr "Thème %s inexistant !"

 #: libraries/Theme_Manager.class.php:221
 #, php-format
 msgid "Theme path not found for theme %s!"
-msgstr "Chemin non trouvé pour le thème %s!"
+msgstr "Chemin non trouvé pour le thème %s !"

 #: libraries/Theme_Manager.class.php:297 test/theme.php:161 themes.php:21
 #: themes.php:41
@@ -1523,15 +1523,15 @@ msgstr ""

 #: libraries/auth/cookie.auth.lib.php:256
 msgid "Server:"
-msgstr "Serveur"
+msgstr "Serveur: "

 #: libraries/auth/cookie.auth.lib.php:261
 msgid "Username:"
-msgstr "Utilisateur&nbsp;:"
+msgstr "Utilisateur : "

 #: libraries/auth/cookie.auth.lib.php:265
 msgid "Password:"
-msgstr "Mot de passe&nbsp;:"
+msgstr "Mot de passe : "

 #: libraries/auth/cookie.auth.lib.php:272
 msgid "Server Choice"
@@ -1563,7 +1563,7 @@ msgstr "Connexion au serveur MySQL non permise"

 #: libraries/auth/http.auth.lib.php:70
 msgid "Wrong username/password. Access denied."
-msgstr "Erreur d'utilisateur/mot de passe. Accès refusé"
+msgstr "Erreur d'utilisateur/mot de passe. Accès refusé."

 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #, php-format
@@ -1607,7 +1607,8 @@ msgid ""
 msgstr ""
 "Erreur lors du chargement de l'extension iconv ou recode, utilisée pour "
 "convertir le jeu de caractères. Veuillez activer l'une de ces extensions "
-"dans PHP, ou désactiver la conversion des jeux de caractères dans phpMyAdmin"
+"dans PHP, ou désactiver la conversion des jeux de caractères dans "
+"phpMyAdmin."

 #: libraries/charset_conversion.lib.php:79
 #: libraries/charset_conversion.lib.php:90
@@ -1876,7 +1877,7 @@ msgstr "La base de données %s a été effacée."
 #: libraries/db_links.inc.php:57 libraries/db_links.inc.php:58
 #: libraries/db_links.inc.php:59
 msgid "Database seems to be empty!"
-msgstr "La base de données semble vide!"
+msgstr "La base de données semble vide !"

 #: libraries/db_links.inc.php:81 libraries/relation.lib.php:155
 #: libraries/tbl_links.inc.php:69
@@ -1932,7 +1933,7 @@ msgstr ""
 #: libraries/dbi/mysql.dbi.lib.php:353 libraries/dbi/mysql.dbi.lib.php:355
 #: libraries/dbi/mysqli.dbi.lib.php:410
 msgid "The server is not responding"
-msgstr "Le serveur ne répond pas."
+msgstr "Le serveur ne répond pas"

 #: libraries/dbi/mysql.dbi.lib.php:353 libraries/dbi/mysqli.dbi.lib.php:410
 msgid "(or the local MySQL server's socket is not correctly configured)"
@@ -1993,7 +1994,7 @@ msgstr "Aucun privilège"

 #: libraries/display_create_table.lib.php:41
 msgid "Table must have at least one column."
-msgstr "La table doit comporter au moins une colonne"
+msgstr "La table doit comporter au moins une colonne."

 #: libraries/display_create_table.lib.php:48
 #, php-format
@@ -2006,7 +2007,7 @@ msgstr "Nombre de colonnes"

 #: libraries/display_export.lib.php:42
 msgid "Could not load export plugins, please check your installation!"
-msgstr "Erreur lors du chargement des modules d'exportation!"
+msgstr "Erreur lors du chargement des modules d'exportation !"

 #: libraries/display_export.lib.php:107
 #, php-format
@@ -2064,7 +2065,7 @@ msgstr "se souvenir du modèle"
 #: libraries/display_export.lib.php:210 libraries/display_import.lib.php:177
 #: libraries/display_import.lib.php:190 libraries/sql_query_form.lib.php:549
 msgid "Character set of the file:"
-msgstr "Jeu de caractères du fichier:"
+msgstr "Jeu de caractères du fichier: "

 #: libraries/display_export.lib.php:235 setup/lib/messages.inc.php:84
 msgid "Compression"
@@ -2102,7 +2103,7 @@ msgid ""
 msgstr ""
 "Le fichier téléchargé est probablement plus grand que le maximum alloué, ou "
 "bien il s'agit d'une anomalie connue dans les navigateurs basés sur webkit "
-"(Safari, Google Chrome, Arora, etc)"
+"(Safari, Google Chrome, Arora, etc)."

 #: libraries/display_import.lib.php:76
 msgid "The file is being processed, please be patient."
@@ -2136,7 +2137,7 @@ msgstr "Le répertoire de transfert est inaccessible"
 #: libraries/display_import.lib.php:165 libraries/sql_query_form.lib.php:536
 #: tbl_change.php:1028
 msgid "web server upload directory"
-msgstr "répertoire de transfert du serveur Web"
+msgstr "répertoire de transfert du serveur web"

 #: libraries/display_import.lib.php:211
 #, php-format
@@ -2195,11 +2196,11 @@ msgstr "Afficher toutes les tables avec une largeur identique"

 #: libraries/display_pdf_schema.lib.php:46
 msgid "Only show keys"
-msgstr "Ne montrer que les clés."
+msgstr "Ne montrer que les clés"

 #: libraries/display_pdf_schema.lib.php:48
 msgid "Data Dictionary Format"
-msgstr "Orientation du dictionnaire:"
+msgstr "Orientation du dictionnaire"

 #: libraries/display_pdf_schema.lib.php:50
 msgid "Landscape"
@@ -2246,7 +2247,7 @@ msgstr "en mode %s et répéter les en-têtes à chaque groupe de %s"

 #: libraries/display_tbl.lib.php:346
 msgid "This operation could take a long time. Proceed anyway?"
-msgstr "Cette opération pourrait être longue. Procéder quand même?"
+msgstr "Cette opération pourrait être longue. Procéder quand même ?"

 #: libraries/display_tbl.lib.php:512
 msgid "Sort by key"
@@ -2336,7 +2337,7 @@ msgstr "total"
 #: libraries/display_tbl.lib.php:1970 sql.php:524
 #, php-format
 msgid "Query took %01.4f sec"
-msgstr "Traitement en %01.4f sec."
+msgstr "Traitement en %01.4f sec"

 #: libraries/display_tbl.lib.php:2089 libraries/mult_submits.inc.php:113
 #: querywindow.php:125 querywindow.php:129 querywindow.php:132
@@ -2374,7 +2375,7 @@ msgstr "Fichiers de données"

 #: libraries/engines/innodb.lib.php:37
 msgid "Autoextend increment"
-msgstr "Auto-croissant: Taille de l'incrément"
+msgstr "Auto-croissant: taille de l'incrément"

 #: libraries/engines/innodb.lib.php:38
 msgid ""
@@ -2480,7 +2481,7 @@ msgid ""
 "tables when no MAX_ROWS option is specified."
 msgstr ""
 "La taille du pointeur (en octets) qui servira lors d'un CREATE TABLE sur une "
-"table MyISAM si aucune option MAX_ROWS n'est indiquée"
+"table MyISAM si aucune option MAX_ROWS n'est indiquée."

 #: libraries/engines/myisam.lib.php:28
 msgid "Automatic recovery mode"
@@ -2492,7 +2493,7 @@ msgid ""
 "myisam-recover server startup option."
 msgstr ""
 "Le mode de recouvrement automatique en cas de tables MyISAM en mauvais état, "
-"tel que réglé via l'option --myisam-recover au départ du serveur"
+"tel que réglé via l'option --myisam-recover au départ du serveur."

 #: libraries/engines/myisam.lib.php:32
 msgid "Maximum size for temporary sort files"
@@ -2506,7 +2507,7 @@ msgid ""
 msgstr ""
 "La taille maximum du fichier temporaire qu'il est permis à MySQL d'allouer "
 "pour recréer un index MyISAM (durant un REPAIR TABLE, ALTER TABLE ou LOAD "
-"DATA INFILE)"
+"DATA INFILE)."

 #: libraries/engines/myisam.lib.php:37
 msgid "Maximum size for temporary files on index creation"
@@ -2522,7 +2523,7 @@ msgid ""
 msgstr ""
 "Si le fichier temporaire utilisé pour la création rapide des index MyISAM "
 "devrait s'avérer plus volumineux que d'employer la cache des clés (la "
-"différence étant spécifiée ici), utiliser la méthode de cache des clés"
+"différence étant spécifiée ici), utiliser la méthode de cache des clés."

 #: libraries/engines/myisam.lib.php:42
 msgid "Repair threads"
@@ -2548,7 +2549,7 @@ msgid ""
 msgstr ""
 "La mémoire tampon qui est allouée pour trier les index MyISAM durant une "
 "opération REPAIR TABLE ou pour créer les index lors d'un CREATE INDEX ou "
-"ALTER TABLE"
+"ALTER TABLE."

 #: libraries/engines/pbxt.lib.php:23
 msgid "Index cache size"
@@ -2910,11 +2911,11 @@ msgstr "Taille maximum de la requête générée"

 #: libraries/export/sql.php:114
 msgid "Use delayed inserts"
-msgstr "Insertions avec délais (DELAYED)"
+msgstr "Insertions avec délais (delayed)"

 #: libraries/export/sql.php:116
 msgid "Use ignore inserts"
-msgstr "Ignorer les erreurs de doublons (INSERT IGNORE)"
+msgstr "Ignorer les erreurs de doublons (insert ignore)"

 #: libraries/export/sql.php:118
 msgid "Use hexadecimal for BLOB"
@@ -3043,12 +3044,11 @@ msgstr "Consulter le contenu d'une structure en cliquant sur son nom"
 #: libraries/import.lib.php:1113
 msgid ""
 "Change any of its settings by clicking the corresponding \"Options\" link"
-msgstr ""
-"Modifiez l'un des réglages en cliquant le lien  «Options » correspondant"
+msgstr "Modifiez l'un des réglages en cliquant le lien «Options» correspondant"

 #: libraries/import.lib.php:1114
 msgid "Edit its structure by following the \"Structure\" link"
-msgstr "Modifier sa structure via le lien  «Structure »"
+msgstr "Modifier sa structure via le lien «Structure»"

 #: libraries/import.lib.php:1117
 msgid "Go to database"
@@ -3097,7 +3097,7 @@ msgstr "Paramètres invalides pour l'importation CSV: %s"
 #: libraries/import/csv.php:119
 #, php-format
 msgid "Invalid column (%s) specified!"
-msgstr "La colonne %s est invalide!"
+msgstr "La colonne %s est invalide !"

 #: libraries/import/csv.php:177 libraries/import/csv.php:424
 #, php-format
@@ -3107,7 +3107,7 @@ msgstr "Format invalide pour les données CSV à la ligne %d."
 #: libraries/import/csv.php:312
 #, php-format
 msgid "Invalid column count in CSV input on line %d."
-msgstr "Nombre de colonnes invalide dans les données CSV à la ligne %d"
+msgstr "Nombre de colonnes invalide dans les données CSV à la ligne %d."

 #: libraries/import/docsql.php:29
 msgid "DocSQL"
@@ -3128,7 +3128,7 @@ msgstr "Utiliser l'option LOCAL"

 #: libraries/import/ldi.php:55
 msgid "This plugin does not support compressed imports!"
-msgstr "Ce greffon ne supporte pas les importations en format comprimé!"
+msgstr "Ce greffon ne supporte pas les importations en format comprimé !"

 #: libraries/import/ods.php:26
 msgid "Do not import empty rows"
@@ -3152,7 +3152,7 @@ msgid ""
 "the issue and try again."
 msgstr ""
 "Le fichier XML spécifié était mal formé ou incomplet. Veuillez le corriger "
-"et essayer à nouveau"
+"et essayer à nouveau."

 #. l10n: This is currently used only in Japanese locales
 #: libraries/kanji-encoding.lib.php:143
@@ -3400,7 +3400,7 @@ msgstr "Quitter"
 #: libraries/navigation_header.inc.php:83
 #: libraries/navigation_header.inc.php:86 setup/lib/messages.inc.php:122
 msgid "Query window"
-msgstr "Fenêtre SQL"
+msgstr "Fenêtre de requête"

 #: libraries/plugin_interface.lib.php:312
 msgid "This format has no options"
@@ -3434,7 +3434,7 @@ msgstr "Commentaires de colonnes"
 msgid ""
 "Please see the documentation on how to update your column_comments table"
 msgstr ""
-"La documentation indique comment mettre à jour votre table Column_comments"
+"La documentation indique comment mettre à jour votre table column_comments"

 #: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433
 msgid "Bookmarked SQL query"
@@ -3539,7 +3539,7 @@ msgstr ""

 #: libraries/replication_gui.lib.php:243 server_replication.php:194
 msgid "Add slave replication user"
-msgstr "Ajouter un utilisateur pour la réplication vers l'esclave?"
+msgstr "Ajouter un utilisateur pour la réplication vers l'esclave"

 #: libraries/replication_gui.lib.php:257 server_privileges.php:717
 msgid "Any user"
@@ -3731,7 +3731,7 @@ msgstr ""
 "essayer votre requête. Le message d'erreur présenté plus bas pourrait vous "
 "indiquer la source du problème. En dernier recours, veuillez trouver la plus "
 "courte requête possible qui cause le problème, et soumettre un rapport "
-"d'anomalie en incluant la section à couper:"
+"d'anomalie en incluant la section à couper: "

 #: libraries/sqlparser.lib.php:175
 msgid "BEGIN CUT"
@@ -3773,7 +3773,7 @@ msgstr ""
 #: libraries/tbl_links.inc.php:107 libraries/tbl_links.inc.php:140
 #: libraries/tbl_links.inc.php:141
 msgid "Table seems to be empty!"
-msgstr "La table semble vide!"
+msgstr "La table semble vide !"

 #: libraries/tbl_links.inc.php:149
 #, php-format
@@ -3816,7 +3816,7 @@ msgid ""
 "transformations, click on %stransformation descriptions%s"
 msgstr ""
 "La %sdescription des transformations%s explique les transformations "
-"possibles en fonction des types MIME."
+"possibles en fonction des types MIME"

 #: libraries/tbl_properties.inc.php:145
 msgid "Transformation options"
@@ -3889,7 +3889,7 @@ msgid ""
 "need to set the first option to the empty string."
 msgstr ""
 "Affiche un lien pour télécharger le contenu binaire d'une colonne. La "
-"première option est le nom du fichier binaire;  la seconde option est le nom "
+"première option est le nom du fichier binaire; la seconde option est le nom "
 "de la colonne contenant le nom du fichier. Si vous utilisez la seconde "
 "option, veuillez laisser la première option vide."

@@ -3913,7 +3913,7 @@ msgstr ""

 #: libraries/transformations/image_jpeg__link.inc.php:10
 msgid "Displays a link to download this image."
-msgstr "Affiche un lien vers cette image"
+msgstr "Affiche un lien vers cette image."

 #: libraries/transformations/text_plain__dateformat.inc.php:10
 msgid ""
@@ -4017,7 +4017,7 @@ msgstr ""

 #: libraries/zip_extension.lib.php:26
 msgid "No files found inside ZIP archive!"
-msgstr "Aucun fichier présent dans l'archive ZIP!"
+msgstr "Aucun fichier présent dans l'archive ZIP !"

 #: libraries/zip_extension.lib.php:49 libraries/zip_extension.lib.php:51
 #: libraries/zip_extension.lib.php:66
@@ -4103,7 +4103,7 @@ msgid ""
 msgstr ""
 "Vous avez activé mbstring.func_overload dans votre configuration PHP. Cette "
 "option est incompatible avec phpMyAdmin et peut nuire au traitement des "
-"données!"
+"données !"

 #: main.php:282
 msgid ""
@@ -4237,7 +4237,7 @@ msgid ""
 "like to delete those references?"
 msgstr ""
 "Cette page fait référence à des tables qui n'existent plus. Voulez-vous "
-"effacer ces références?"
+"effacer ces références ?"

 #: pdf_schema.php:636
 #, php-format
@@ -4256,7 +4256,7 @@ msgstr "Schéma de la base %s - Page %s"

 #: pdf_schema.php:1013
 msgid "No tables"
-msgstr "Pas de table !"
+msgstr "Pas de table"

 #: pdf_schema.php:1032 pdf_schema.php:1141
 msgid "Relational schema"
@@ -4341,7 +4341,7 @@ msgstr "Effacer la relation"

 #: pmd_help.php:27
 msgid "To select relation, click :"
-msgstr "Pour sélectionner un lien, cliquez :"
+msgstr "Pour sélectionner un lien, cliquez : "

 #: pmd_help.php:29
 msgid ""
@@ -4350,12 +4350,12 @@ msgid ""
 "appropriate column name."
 msgstr ""
 "La colonne descriptive est montrée en rose. Pour indiquer qu'une colonne est "
-"ou n'est plus la colonne descriptive, cliquer l'icône  «Colonne descriptive», "
-"puis cliquer sur le nom de colonne approprié."
+"ou n'est plus la colonne descriptive, cliquer l'icône «Colonne "
+"descriptive», puis cliquer sur le nom de colonne approprié."

 #: pmd_pdf.php:63
 msgid "Page has been created"
-msgstr "La page a été créée."
+msgstr "La page a été créée"

 #: pmd_pdf.php:65
 msgid "Page creation failed"
@@ -4531,7 +4531,7 @@ msgstr "Permission de créer des tables temporaires."
 #: server_privileges.php:32 server_privileges.php:210
 #: server_privileges.php:555
 msgid "Allows creating, dropping and renaming user accounts."
-msgstr "Permission de créer, supprimer et renommer des comptes utilisateurs"
+msgstr "Permission de créer, supprimer et renommer des comptes utilisateurs."

 #: server_privileges.php:33 server_privileges.php:200
 #: server_privileges.php:204 server_privileges.php:527
@@ -4542,7 +4542,7 @@ msgstr "Permission de créer des vues."
 #: server_privileges.php:34 server_privileges.php:184
 #: server_privileges.php:507
 msgid "Allows deleting data."
-msgstr "Permission de détruire des données"
+msgstr "Permission de détruire des données."

 #: server_privileges.php:35 server_privileges.php:186
 #: server_privileges.php:518
@@ -4563,7 +4563,7 @@ msgstr ""
 #: server_privileges.php:38 server_privileges.php:211
 #: server_privileges.php:523
 msgid "Allows executing stored routines."
-msgstr "Permission d'exécuter des procédures stockées"
+msgstr "Permission d'exécuter des procédures stockées."

 #: server_privileges.php:39 server_privileges.php:190
 #: server_privileges.php:510
@@ -4587,7 +4587,7 @@ msgstr "Permission de créer et d'effacer des index."
 #: server_privileges.php:42 server_privileges.php:182
 #: server_privileges.php:443 server_privileges.php:505
 msgid "Allows inserting and replacing data."
-msgstr "Permission d'ajouter et de remplacer des données"
+msgstr "Permission d'ajouter et de remplacer des données."

 #: server_privileges.php:43 server_privileges.php:197
 #: server_privileges.php:550
@@ -4672,7 +4672,7 @@ msgstr "Permission d'exécuter SHOW CREATE VIEW."
 #: server_privileges.php:56 server_privileges.php:188
 #: server_privileges.php:547
 msgid "Allows shutting down the server."
-msgstr "Permission d'arrêter le serveur MySQL."
+msgstr "Permission d'arrêter le serveur."

 #: server_privileges.php:57 server_privileges.php:195
 #: server_privileges.php:544
@@ -4698,7 +4698,7 @@ msgstr "Permission de changer des données."

 #: server_privileges.php:60 server_privileges.php:261
 msgid "No privileges."
-msgstr "Pas de privilèges"
+msgstr "Pas de privilèges."

 #: server_privileges.php:303 server_privileges.php:304
 msgctxt "None privileges"
@@ -4729,7 +4729,7 @@ msgstr "Administration"

 #: server_privileges.php:631
 msgid "Resource limits"
-msgstr "Limites de ressources."
+msgstr "Limites de ressources"

 #: server_privileges.php:632
 msgid "Note: Setting these options to 0 (zero) removes the limit."
@@ -4750,11 +4750,11 @@ msgstr "Aucun utilisateur n'a été trouvé."
 #: server_privileges.php:880
 #, php-format
 msgid "The user %s already exists!"
-msgstr "L'utilisateur %s existe déjà!"
+msgstr "L'utilisateur %s existe déjà !"

 #: server_privileges.php:963
 msgid "You have added a new user."
-msgstr "Vous avez ajouté un utilisateur"
+msgstr "Vous avez ajouté un utilisateur."

 #: server_privileges.php:1184
 #, php-format
@@ -4778,11 +4778,11 @@ msgstr "Destruction de %s"

 #: server_privileges.php:1275
 msgid "No users selected for deleting!"
-msgstr "Aucun utilisateur n'a été choisi en vue de le détruire!"
+msgstr "Aucun utilisateur n'a été choisi en vue de le détruire !"

 #: server_privileges.php:1278
 msgid "Reloading the privileges"
-msgstr "Chargement des privilèges en cours."
+msgstr "Chargement des privilèges en cours"

 #: server_privileges.php:1293
 msgid "The selected users have been deleted successfully."
@@ -4820,7 +4820,7 @@ msgstr "Ajouter un utilisateur"

 #: server_privileges.php:1607
 msgid "Remove selected users"
-msgstr "Effacer les utilisateurs sélectionnés."
+msgstr "Effacer les utilisateurs sélectionnés"

 #: server_privileges.php:1610
 msgid "Revoke all active privileges from the users and delete them afterwards."
@@ -4830,7 +4830,7 @@ msgstr "Effacer tous les privilèges de ces utilisateurs, puis les effacer."
 #: server_privileges.php:1613
 msgid "Drop the databases that have the same names as the users."
 msgstr ""
-"Supprimer les bases de données portant le même nom que les utilisateurs"
+"Supprimer les bases de données portant le même nom que les utilisateurs."

 #: server_privileges.php:1629
 #, php-format
@@ -4847,7 +4847,7 @@ msgstr ""

 #: server_privileges.php:1677
 msgid "The selected user was not found in the privilege table."
-msgstr "L'utilisateur choisi n'existe pas dans la table des privilèges"
+msgstr "L'utilisateur choisi n'existe pas dans la table des privilèges."

 #: server_privileges.php:1717
 msgid "Column-specific privileges"
@@ -4979,7 +4979,7 @@ msgstr "Le serveur maître est maintenant %s"

 #: server_replication.php:182
 msgid "This server is configured as master in a replication process."
-msgstr "Ce serveur est un serveur maître dans le processus de réplication"
+msgstr "Ce serveur est un serveur maître dans le processus de réplication."

 #: server_replication.php:184 server_status.php:392
 msgid "Show master status"
@@ -4996,7 +4996,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 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>?"
+"réplication. Désirez-vous le <a href=\"%s\">configurer</a> ?"

 #: server_replication.php:217
 msgid "Master configuration"
@@ -5026,7 +5026,7 @@ msgstr "Ignorer toutes les bases de données; Répliquer :"

 #: server_replication.php:225
 msgid "Please select databases:"
-msgstr "Sélectionnez les bases de données"
+msgstr "Sélectionnez les bases de données : "

 #: server_replication.php:228
 msgid ""
@@ -5034,7 +5034,7 @@ msgid ""
 "and please restart the MySQL server afterwards."
 msgstr ""
 "Maintenant, ajoutez les lignes suivantes à la fin de votre fichier my.cnf "
-"puis redémarrez le serveur MySQL"
+"puis redémarrez le serveur MySQL."

 #: server_replication.php:230
 msgid ""
@@ -5048,11 +5048,11 @@ msgstr ""

 #: server_replication.php:293
 msgid "Slave SQL Thread not running!"
-msgstr "Le fil d'exécution SQL ne tourne pas sur le serveur esclave!"
+msgstr "Le fil d'exécution SQL ne tourne pas sur le serveur esclave !"

 #: server_replication.php:296
 msgid "Slave IO Thread not running!"
-msgstr "Le fil d'exécution IO ne tourne pas sur le serveur esclave!"
+msgstr "Le fil d'exécution IO ne tourne pas sur le serveur esclave !"

 #: server_replication.php:305
 msgid ""
@@ -5071,7 +5071,7 @@ msgstr "Synchroniser les bases de données avec le serveur maître"

 #: server_replication.php:322
 msgid "Control slave:"
-msgstr "Contrôler le serveur esclave:"
+msgstr "Contrôler le serveur esclave: "

 #: server_replication.php:325
 msgid "Full start"
@@ -5105,13 +5105,13 @@ msgstr "%s seulement le fil d'exécution des entrées-sorties"

 #: server_replication.php:332
 msgid "Error management:"
-msgstr "Gestion des erreurs"
+msgstr "Gestion des erreurs : "

 #: server_replication.php:334
 msgid "Skipping errors might lead into unsynchronized master and slave!"
 msgstr ""
 "Ignorer les erreurs peut mener à une désynchronisation entre les serveurs "
-"maître et esclave!"
+"maître et esclave !"

 #: server_replication.php:336
 msgid "Skip current error"
@@ -5132,7 +5132,7 @@ msgid ""
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
 "Ce serveur n'est pas configuré comme esclave dans un processus de "
-"réplication. Désirez-vous le <a href=\"%s\">configurer</a>?"
+"réplication. Désirez-vous le <a href=\"%s\">configurer</a> ?"

 #: server_status.php:40
 msgid ""
@@ -5251,7 +5251,7 @@ msgid ""
 "method is mainly used to optimize ORDER BY ... DESC."
 msgstr ""
 "Le nombre de requêtes de lecture de l'enregistrement précédent, en ordre de "
-"clé. Utilisé surtout pour optimiser ORDER BY ... DESC"
+"clé. Utilisé surtout pour optimiser ORDER BY ... DESC."

 #: server_status.php:56
 msgid ""
@@ -5296,7 +5296,7 @@ msgstr "Le nombre de pages contenant des données."

 #: server_status.php:62
 msgid "The number of pages currently dirty."
-msgstr "Le nombre de pages contenant des données «dirty»"
+msgstr "Le nombre de pages contenant des données «dirty»."

 #: server_status.php:63
 msgid "The number of buffer pool pages that have been requested to be flushed."
@@ -5304,7 +5304,7 @@ msgstr "Le nombre de pages de mémoire-tampon qui ont été effacées."

 #: server_status.php:64
 msgid "The number of free pages."
-msgstr "Le nombre de pages libres"
+msgstr "Le nombre de pages libres."

 #: server_status.php:65
 msgid ""
@@ -5779,7 +5779,7 @@ msgstr ""
 "nombre est trop grand, vous pourriez augmenter la valeur du paramètre "
 "thread_cache_size. (Normalement, ceci ne procure pas une amélioration "
 "perceptible de la performance si votre serveur gère correctement les fils "
-"d'exécution."
+"d'exécution.)"

 #: server_status.php:146
 msgid "The number of threads that are not sleeping."
@@ -6026,7 +6026,7 @@ msgstr "Insérer des enregistrements"

 #: server_synchronize.php:446 server_synchronize.php:890
 msgid "Would you like to delete all the previous rows from target tables?"
-msgstr "Voulez-vous supprimer tous les enregistrements des tables cible?"
+msgstr "Voulez-vous supprimer tous les enregistrements des tables cible ?"

 #: server_synchronize.php:449 server_synchronize.php:894
 msgid "Apply Selected Changes"
@@ -6100,8 +6100,8 @@ msgid ""
 "You are not using a secure connection; all data (including potentially "
 "sensitive information, like passwords) is transferred unencrypted!"
 msgstr ""
-"Votre connexion n'est pas sécurisée; toutes les données sont transférées non-"
-"encryptées!"
+"Votre connexion n'est pas sécurisée; toutes les données sont transférées "
+"non-encryptées !"

 #: setup/frames/index.inc.php:87 setup/frames/menu.inc.php:17
 #: setup/lib/messages.inc.php:219
@@ -6114,7 +6114,7 @@ msgstr "Afficher les messages cachés (#MSG_COUNT)"

 #: setup/frames/index.inc.php:135 setup/lib/messages.inc.php:213
 msgid "There are no configured servers"
-msgstr "Aucun serveur n'est configuré."
+msgstr "Aucun serveur n'est configuré"

 #: setup/frames/index.inc.php:143 setup/lib/messages.inc.php:212
 msgid "New server"
@@ -6247,7 +6247,7 @@ msgstr ""

 #: setup/lib/messages.inc.php:23
 msgid "Key is too short, it should have at least 8 characters"
-msgstr "La clé doit avoir un minimum de 8 caractères."
+msgstr "La clé doit avoir un minimum de 8 caractères"

 #: setup/lib/messages.inc.php:24
 msgid ""
@@ -6432,32 +6432,32 @@ msgstr "Affiche les serveurs sous forme de liste"

 #: setup/lib/messages.inc.php:67
 msgid "Could not connect to MySQL server"
-msgstr "Connexion au serveur MySQL impossible."
+msgstr "Connexion au serveur MySQL impossible"

 #: setup/lib/messages.inc.php:68
 msgid "Empty phpMyAdmin control user password while using pmadb"
-msgstr "Le controlpass est vide."
+msgstr "Le controlpass est vide"

 #: setup/lib/messages.inc.php:69
 msgid "Empty phpMyAdmin control user while using pmadb"
-msgstr "Le controluser est vide."
+msgstr "Le controluser est vide"

 #: setup/lib/messages.inc.php:70
 msgid "Empty signon session name while using signon authentication method"
-msgstr "Le nom de session signon est vide."
+msgstr "Le nom de session signon est vide"

 #: setup/lib/messages.inc.php:71
 msgid "Empty signon URL while using signon authentication method"
-msgstr "L'URL de signon est vide."
+msgstr "L'URL de signon est vide"

 #: setup/lib/messages.inc.php:72
 msgid "Empty username while using config authentication method"
 msgstr ""
-"Le code d'utilisateur est vide alors que vous utilisez la méthode config."
+"Le code d'utilisateur est vide alors que vous utilisez la méthode config"

 #: setup/lib/messages.inc.php:73
 msgid "Submitted form contains errors"
-msgstr "Le formulaire soumis contient des erreurs."
+msgstr "Le formulaire soumis contient des erreurs"

 #: setup/lib/messages.inc.php:74
 #, php-format
@@ -7000,7 +7000,9 @@ msgstr "Taille maximum des requêtes SQL affichées"

 #: setup/lib/messages.inc.php:202
 msgid "Maximum number of databases displayed in left frame and database list"
-msgstr "...affichées dans le panneau de gauche et la liste des bases"
+msgstr ""
+"Nombre maximum de bases de données affichées dans le panneau de gauche et la "
+"liste des bases"

 #: setup/lib/messages.inc.php:203
 msgid "Maximum databases"
@@ -7023,7 +7025,7 @@ msgstr "Nombre maximum d'enregistrements à afficher"

 #: setup/lib/messages.inc.php:206
 msgid "Maximum number of tables displayed in table list"
-msgstr "...affichées dans la liste des tables"
+msgstr "Nombre maximum de tables affichées dans la liste des tables"

 #: setup/lib/messages.inc.php:207
 msgid "Maximum tables"
@@ -7095,7 +7097,7 @@ msgid ""
 "this utilizes JS-routines to display query history (lost by window close)."
 msgstr ""
 "Activer si vous désirez un historique permanent (nécessite pmadb). Si "
-"désactivé, utilise JS pour afficher un historique temporaire"
+"désactivé, utilise JS pour afficher un historique temporaire."

 #: setup/lib/messages.inc.php:227
 msgid "Permanent query history"
@@ -7218,7 +7220,7 @@ msgstr "Type d'authentification"

 #: setup/lib/messages.inc.php:253
 msgid "Authentication type"
-msgstr "Type d'Authentification"
+msgstr "Type d'authentification"

 #: setup/lib/messages.inc.php:254
 msgid ""
@@ -7255,7 +7257,8 @@ msgstr "Utiliser le mode compression sur la connexion"
 #: setup/lib/messages.inc.php:260
 msgid "How to connect to server, keep [kbd]tcp[/kbd] if unsure"
 msgstr ""
-"Comment se connecter au serveur, utilisez TCP si vous êtes dans le doute"
+"Comment se connecter au serveur, utilisez [kbd]tcp[/kbd] si vous êtes dans "
+"le doute"

 #: setup/lib/messages.inc.php:261
 msgid "Connection type"
@@ -7599,7 +7602,7 @@ msgstr "Nom à afficher pour ce serveur"

 #: setup/lib/messages.inc.php:329
 msgid "Whether a user should be displayed a &quot;show all (rows)&quot; button"
-msgstr "Devrait-on afficher un bouton &quot;Tout afficher&quot;"
+msgstr "Devrait-on afficher un bouton «Tout afficher»"

 #: setup/lib/messages.inc.php:330
 msgid "Allow to display all the rows"
@@ -7640,8 +7643,8 @@ msgid ""
 "Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
 "output"
 msgstr ""
-"...lien vers le résultat de [a@http://php.net/manual/function.phpinfo.php]"
-"phpinfo()[/a]"
+"Montre un lien vers le résultat de "
+"[a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a]"

 #: setup/lib/messages.inc.php:339
 msgid "Show phpinfo() link"
@@ -7662,7 +7665,9 @@ msgstr "Afficher les requêtes SQL"

 #: setup/lib/messages.inc.php:343
 msgid "Allow to display database and table statistics (eg. space usage)"
-msgstr "...sur les bases de données et les tables (espace utilisé)"
+msgstr ""
+"Affiche les statistiques sur les bases de données et les tables (espace "
+"utilisé)"

 #: setup/lib/messages.inc.php:344
 msgid "Show statistics"
@@ -7950,7 +7955,7 @@ msgstr "Recommencer l'insertion avec %s lignes"
 #: tbl_create.php:62
 #, php-format
 msgid "Table %s already exists!"
-msgstr "La table %s existe déjà!"
+msgstr "La table %s existe déjà !"

 #: tbl_create.php:249
 #, php-format
@@ -8121,7 +8126,7 @@ msgstr "Espace"

 #: tbl_printview.php:340 tbl_structure.php:687
 msgid "Effective"
-msgstr "effectif"
+msgstr "Effectif"

 #: tbl_printview.php:365 tbl_structure.php:725
 msgid "Row Statistics"
@@ -8176,7 +8181,7 @@ msgstr "Aucun enregistrement n'a été sélectionné"

 #: tbl_select.php:131
 msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Recherche «par valeur» (passepartout:  «% ») "
+msgstr "Recherche «par valeur» (passepartout: «% ») "

 #: tbl_select.php:137
 msgid "Operator"
@@ -8205,7 +8210,7 @@ msgstr "Affiche les valeurs distinctes"
 #: tbl_structure.php:361
 msgctxt "None for default"
 msgid "None"
-msgstr "aucune"
+msgstr "Aucune"

 #: tbl_structure.php:374
 #, php-format
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-07-19 10:04-0400\n"
-"PO-Revision-Date: 2010-07-16 14:00+0200\n"
+"PO-Revision-Date: 2010-07-20 11:03+0200\n"
 "Last-Translator:  <gheni@yahoo.cn>\n"
 "Language-Team: Uyghur <ug@li.org>\n"
+"Language: ug\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.1\n"

@@ -800,11 +800,13 @@ msgid "Dump has been saved to file %s."
 msgstr "%s ھۆججىتىدە ساقلاندى."

 #: import.php:60
-#, php-format
+#, php-format, fuzzy
 msgid ""
 "You probably tried to upload too large file. Please refer to %sdocumentation%"
 "s for ways to workaround this limit."
 msgstr ""
+"سىز يوللىماقچى بولغان ھۆججەت بەك چوڭكەن، %ياردەم%s ھۆججىتىدىن ھەل قىلىش "
+"چارىسىنى كۆرۈڭ."

 #: import.php:279 import.php:332 libraries/File.class.php:849
 #: libraries/File.class.php:961
--- a/setup/lib/forms.inc.php
+++ b/setup/lib/forms.inc.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * List of avaible forms, each form is described as an array of fields to display.
+ * Fields MUST have their counterparts in the $cfg array.
+ *
+ * There are two possible notations:
+ * $forms['Form name'] = array('Servers' => array(1 => array('host')));
+ * can be written as
+ * $forms['Form name'] = array('Servers/1/host');
+ *
+ * You can assign default values set by special button ("set value: ..."), eg.:
+ * $forms['Server_pmadb'] = array('Servers' => array(1 => array(
+ *  'pmadb' => 'phpmyadmin')));
+ *
+ * @package    phpMyAdmin-setup
+ * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
+ * @version    $Id$
+ */
+
+$forms = array();
+$forms['_config.php'] = array(
+    'DefaultLang',
+    'ServerDefault');
+$forms['Server'] = array('Servers' => array(1 => array(
+    'verbose',
+    'host',
+    'port',
+    'socket',
+    'ssl',
+    'connect_type',
+    'extension',
+    'compress',
+    'auth_type',
+    'auth_http_realm',
+    'user',
+    'password',
+    'nopassword',
+    'auth_swekey_config' => './swekey.conf')));
+$forms['Server_login_options'] = array('Servers' => array(1 => array(
+    'SignonSession',
+    'SignonURL',
+    'LogoutURL')));
+$forms['Server_config'] = array('Servers' => array(1 => array(
+    'only_db',
+    'hide_db',
+    'AllowRoot',
+    'AllowNoPassword',
+    'DisableIS',
+    'AllowDeny/order',
+    'AllowDeny/rules',
+    'ShowDatabasesCommand',
+    'CountTables')));
+$forms['Server_pmadb'] = array('Servers' => array(1 => array(
+    'pmadb' => 'phpmyadmin',
+    'controluser',
+    'controlpass',
+    'verbose_check',
+    'bookmarktable' => 'pma_bookmark',
+    'relation' => 'pma_relation',
+    'table_info' => 'pma_table_info',
+    'table_coords' => 'pma_table_coords',
+    'pdf_pages' => 'pma_pdf_pages',
+    'column_info' => 'pma_column_info',
+    'history' => 'pma_history',
+    'tracking' => 'pma_tracking',
+    'designer_coords' => 'pma_designer_coords')));
+$forms['Server_tracking'] = array('Servers' => array(1 => array(
+    'tracking_version_auto_create',
+    'tracking_default_statements',
+    'tracking_add_drop_view',
+    'tracking_add_drop_table',
+    'tracking_add_drop_database',
+)));
+$forms['Import_export'] = array(
+    'UploadDir',
+    'SaveDir',
+    'AllowAnywhereRecoding',
+    'RecodingEngine',
+    'IconvExtraParams',
+    'ZipDump',
+    'GZipDump',
+    'BZipDump',
+    'CompressOnFly');
+$forms['Security'] = array(
+    'blowfish_secret',
+    'ForceSSL',
+    'CheckConfigurationPermissions',
+    'TrustedProxies',
+    'AllowUserDropDatabase',
+    'AllowArbitraryServer',
+    'LoginCookieRecall',
+    'LoginCookieValidity',
+    'LoginCookieStore',
+    'LoginCookieDeleteAll');
+$forms['Sql_queries'] = array(
+    'ShowSQL',
+    'Confirm',
+    'QueryHistoryDB',
+    'QueryHistoryMax',
+    'IgnoreMultiSubmitErrors',
+    'VerboseMultiSubmit');
+$forms['Other_core_settings'] = array(
+    'MaxDbList',
+    'MaxTableList',
+    'MaxCharactersInDisplayedSQL',
+    'OBGzip',
+    'PersistentConnections',
+    'ExecTimeLimit',
+    'MemoryLimit',
+    'SkipLockedTables',
+    'UseDbSearch');
+$forms['Left_frame'] = array(
+    'LeftFrameLight',
+    'LeftDisplayLogo',
+    'LeftLogoLink',
+    'LeftLogoLinkWindow',
+    'LeftDefaultTabTable',
+    'LeftPointerEnable');
+$forms['Left_servers'] = array(
+    'LeftDisplayServers',
+    'DisplayServersList');
+$forms['Left_databases'] = array(
+    'DisplayDatabasesList',
+    'LeftFrameDBTree',
+    'LeftFrameDBSeparator',
+    'ShowTooltipAliasDB');
+$forms['Left_tables'] = array(
+    'LeftFrameTableSeparator',
+    'LeftFrameTableLevel',
+    'ShowTooltip',
+    'ShowTooltipAliasTB');
+$forms['Startup'] = array(
+    'ShowStats',
+    'ShowPhpInfo',
+    'ShowServerInfo',
+    'ShowChgPassword',
+    'ShowCreateDb',
+    'SuggestDBName');
+$forms['Browse'] = array(
+    'NavigationBarIconic',
+    'ShowAll',
+    'MaxRows',
+    'Order',
+    'BrowsePointerEnable',
+    'BrowseMarkerEnable');
+$forms['Edit'] = array(
+    'ProtectBinary',
+    'ShowFunctionFields',
+    'CharEditing',
+    'CharTextareaCols',
+    'CharTextareaRows',
+    'InsertRows',
+    'ForeignKeyDropdownOrder',
+    'ForeignKeyMaxLimit');
+$forms['Tabs'] = array(
+    'LightTabs',
+    'PropertiesIconic',
+    'DefaultTabServer',
+    'DefaultTabDatabase',
+    'DefaultTabTable',
+	'QueryWindowDefTab');
+$forms['Sql_box'] = array('SQLQuery' => array(
+    'Edit',
+    'Explain',
+    'ShowAsPHP',
+    'Validate',
+    'Refresh'));
+$forms['Import_defaults'] = array('Import' => array(
+    'format',
+    'allow_interrupt',
+    'skip_queries'));
+$forms['Export_defaults'] = array('Export' => array(
+    'format',
+    'compression',
+    'asfile',
+    'charset',
+    'onserver',
+    'onserver_overwrite',
+    'remember_file_template',
+    'file_template_table',
+    'file_template_database',
+    'file_template_server'));
+?>
--- a/setup/lib/messages.inc.php
+++ b/setup/lib/messages.inc.php
@@ -0,0 +1,381 @@
+<?php
+/* $Id$ */
+/**
+ * Messages for phpMyAdmin.
+ *
+ * This file is here for easy transition to Gettext. You should not add any
+ * new messages here, use instead gettext directly in your template/PHP
+ * file.
+ */
+
+if (!function_exists('__')) {
+    die('Bad invocation!');
+}
+
+
+$strSetupAllowAnywhereRecoding_name = __('Allow character set conversion');
+$strSetupAllowArbitraryServer_desc = __('If enabled user can enter any MySQL server in login form for cookie auth');
+$strSetupAllowArbitraryServerMsg = __('This [a@?page=form&amp;formset=features#tab_Security]option[/a] should be disabled as it allows attackers to bruteforce login to any MySQL server. If you feel this is necessary, use [a@?page=form&amp;formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.');
+$strSetupAllowArbitraryServer_name = __('Allow login to any MySQL server');
+$strSetupAllowUserDropDatabase_name = __('Show &quot;Drop database&quot; link to normal users');
+$strSetupBlowfishSecretCharsMsg = __('Key should contain letters, numbers [em]and[/em] special characters');
+$strSetupblowfish_secret_desc = __('Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] authentication');
+$strSetupBlowfishSecretLengthMsg = __('Key is too short, it should have at least 8 characters');
+$strSetupBlowfishSecretMsg = __('You didn\'t have blowfish secret set and have enabled cookie authentication, so a key was automatically generated for you. It is used to encrypt cookies; you don\'t need to remember it.');
+$strSetupblowfish_secret_name = __('Blowfish secret');
+$strSetupBrowseMarkerEnable_desc = __('Highlight selected rows');
+$strSetupBrowseMarkerEnable_name = __('Row marker');
+$strSetupBrowsePointerEnable_desc = __('Highlight row pointed by the mouse cursor');
+$strSetupBrowsePointerEnable_name = __('Highlight pointer');
+$strSetupBZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for import and export operations');
+$strSetupBZipDump_name = __('Bzip2');
+$strSetupBZipDumpWarning = __('[a@?page=form&amp;formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.');
+$strSetupCannotLoadConfig = __('Cannot load or save configuration');
+$strSetupCannotLoadConfigMsg = __('Please create web server writable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@../Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.');
+$strSetupCharEditing_desc = __('Defines which type of editing controls should be used for CHAR and VARCHAR columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in columns');
+$strSetupCharEditing_name = __('CHAR columns editing');
+$strSetupCharTextareaCols_desc = __('Number of columns for CHAR/VARCHAR textareas');
+$strSetupCharTextareaCols_name = __('CHAR textarea columns');
+$strSetupCharTextareaRows_desc = __('Number of rows for CHAR/VARCHAR textareas');
+$strSetupCharTextareaRows_name = __('CHAR textarea rows');
+$strSetupCheckConfigurationPermissions_name = __('Check config file permissions');
+$strSetupClear = __('Clear');
+$strSetupCompressOnFly_desc = __('Compress gzip/bzip2 exports on the fly without the need for much memory; if you encounter problems with created gzip/bzip2 files disable this feature');
+$strSetupCompressOnFly_name = __('Compress on the fly');
+$strSetupConfigurationFile = __('Configuration file');
+$strSetupConfirm_desc = __('Whether a warning (&quot;Are your really sure...&quot;) should be displayed when you\'re about to lose data');
+$strSetupConfirm_name = __('Confirm DROP queries');
+$strSetupDefaultLanguage = __('Default language');
+$strSetupDefaultServer = __('Default server');
+$strSetupDefaultTabDatabase_desc = __('Tab that is displayed when entering a database');
+$strSetupDefaultTabDatabase_name = __('Default database tab');
+$strSetupDefaultTabServer_desc = __('Tab that is displayed when entering a server');
+$strSetupDefaultTabServer_name = __('Default server tab');
+$strSetupDefaultTabTable_desc = __('Tab that is displayed when entering a table');
+$strSetupDefaultTabTable_name = __('Default table tab');
+$strSetupDirectoryNotice = __('This value should be double checked to ensure that this directory is neither world accessible nor readable or writable by other users on your server.');
+$strSetupDisplayDatabasesList_desc = __('Show database listing as a list instead of a drop down');
+$strSetupDisplayDatabasesList_name = __('Display databases as a list');
+$strSetupDisplay = __('Display');
+$strSetupDisplayServersList_desc = __('Show server listing as a list instead of a drop down');
+$strSetupDisplayServersList_name = __('Display servers as a list');
+$strSetupDonateLink = __('Donate');
+$strSetupDownload = __('Download');
+$strSetupEndOfLine = __('End of line');
+$strSetuperror_connection = __('Could not connect to MySQL server');
+$strSetuperror_empty_pmadb_password = __('Empty phpMyAdmin control user password while using pmadb');
+$strSetuperror_empty_pmadb_user = __('Empty phpMyAdmin control user while using pmadb');
+$strSetuperror_empty_signon_session = __('Empty signon session name while using signon authentication method');
+$strSetuperror_empty_signon_url = __('Empty signon URL while using signon authentication method');
+$strSetuperror_empty_user_for_config_auth = __('Empty username while using config authentication method');
+$strSetuperror_form = __('Submitted form contains errors');
+$strSetuperror_incorrect_ip_address = __('Incorrect IP address: %s');
+$strSetuperror_incorrect_port = __('Not a valid port number');
+$strSetuperror_incorrect_value = __('Incorrect value');
+$strSetuperror_missing_field_data = __('Missing data for %s');
+$strSetuperror_nan_nneg = __('Not a non-negative number');
+$strSetuperror_nan_p = __('Not a positive number');
+$strSetupExecTimeLimit_desc = __('Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no limit)');
+$strSetupExecTimeLimit_name = __('Maximum execution time');
+$strSetupExport_asfile_name = __('Save as file');
+$strSetupExport_charset_name = __('Character set of the file');
+$strSetupExport_compression_name = __('Compression');
+$strSetupExport_file_template_database_name = __('Database name template');
+$strSetupExport_file_template_server_name = __('Server name template');
+$strSetupExport_file_template_table_name = __('Table name template');
+$strSetupExport_format_name = __('Format');
+$strSetupExport_onserver_name = __('Save on server');
+$strSetupExport_onserver_overwrite_name = __('Overwrite existing file(s)');
+$strSetupExport_remember_file_template_name = __('Remember file name template');
+$strSetupFalse = __('no');
+$strSetupForceSSL_desc = __('Force secured connection while using phpMyAdmin');
+$strSetupForceSSLMsg = __('This [a@?page=form&amp;formset=features#tab_Security]option[/a] should be enabled if your web server supports it');
+$strSetupForceSSL_name = __('Force SSL connection');
+$strSetupForeignKeyDropdownOrder_desc = __('Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is the referenced data, [kbd]id[/kbd] is the key value');
+$strSetupForeignKeyDropdownOrder_name = __('Foreign key dropdown order');
+$strSetupForeignKeyMaxLimit_desc = __('A dropdown will be used if fewer items are present');
+$strSetupForeignKeyMaxLimit_name = __('Foreign key limit');
+$strSetupForm_Browse = __('Browse mode');
+$strSetupForm_Browse_desc = __('Customize browse mode');
+$strSetupForm_Edit_desc = __('Customize edit mode');
+$strSetupForm_Edit = __('Edit mode');
+$strSetupForm_Export_defaults_desc = __('Customize default export options');
+$strSetupForm_Export_defaults = __('Export defaults');
+$strSetupForm_Import_defaults_desc = __('Customize default common import options');
+$strSetupForm_Import_defaults = __('Import defaults');
+$strSetupForm_Import_export_desc = __('Set import and export directories and compression options');
+$strSetupForm_Import_export = __('Import / export');
+$strSetupForm_Left_databases = __('Databases');
+$strSetupForm_Left_databases_desc = __('Databases display options');
+$strSetupForm_Left_frame_desc = __('Customize appearance of the navigation frame');
+$strSetupForm_Left_frame = __('Navigation frame');
+$strSetupForm_Left_servers_desc = __('Servers display options');
+$strSetupForm_Left_servers = __('Servers');
+$strSetupForm_Left_tables_desc = __('Tables display options');
+$strSetupForm_Left_tables = __('Tables');
+$strSetupForm_Main_frame = __('Main frame');
+$strSetupForm_Other_core_settings_desc = __('Settings that didn\'t fit enywhere else');
+$strSetupForm_Other_core_settings = __('Other core settings');
+$strSetupForm_Query_window_desc = __('Customize query window options');
+$strSetupForm_Query_window = __('Query window');
+$strSetupForm_Security_desc = __('Please note that phpMyAdmin is just a user interface and its features do not limit MySQL');
+$strSetupForm_Security = __('Security');
+$strSetupForm_Server = __('Basic settings');
+$strSetupForm_Server_config_desc = __('Advanced server configuration, do not change these options unless you know what they are for');
+$strSetupForm_Server_config = __('Server configuration');
+$strSetupForm_Server_desc = __('Enter server connection parameters');
+$strSetupForm_Server_login_options_desc = __('Enter login options for signon authentication');
+$strSetupForm_Server_login_options = __('Signon login options');
+$strSetupForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@../Documentation.html#linked-tables]linked-tables infrastructure[/a] in documentation');
+$strSetupForm_Server_pmadb = __('PMA database');
+$strSetupForm_Server_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.');
+$strSetupForm_Server_tracking = __('Changes tracking');
+$strSetupFormset_customization = __('Customization');
+$strSetupFormset_export = __('Customize export options');
+$strSetupFormset_features = __('Features');
+$strSetupFormset_import = __('Customize import defaults');
+$strSetupFormset_left_frame = __('Customize navigation frame');
+$strSetupFormset_main_frame = __('Customize main frame');
+$strSetupForm_Sql_box_desc = __('Customize links shown in SQL Query boxes');
+$strSetupForm_Sql_box = __('SQL Query box');
+$strSetupForm_Sql_queries_desc = __('SQL queries settings, for SQL Query box options see [a@?page=form&amp;formset=main_frame#tab_Sql_box]Navigation frame[/a] settings');
+$strSetupForm_Sql_queries = __('SQL queries');
+$strSetupForm_Startup_desc = __('Customize startup page');
+$strSetupForm_Startup = __('Startup');
+$strSetupForm_Tabs_desc = __('Choose how you want tabs to work');
+$strSetupForm_Tabs = __('Tabs');
+$strSetupGZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import and export operations');
+$strSetupGZipDump_name = __('GZip');
+$strSetupGZipDumpWarning = __('[a@?page=form&amp;formset=features#tab_Import_export]GZip compression and decompression[/a] requires functions (%s) which are unavailable on this system.');
+$strSetupHomepageLink = __('phpMyAdmin homepage');
+$strSetupIconvExtraParams_name = __('Extra parameters for iconv');
+$strSetupIgnoreErrors = __('Ignore errors');
+$strSetupIgnoreMultiSubmitErrors_desc = __('If enabled, phpMyAdmin continues computing multiple-statement queries even if one of the queries failed');
+$strSetupIgnoreMultiSubmitErrors_name = __('Ignore multiple statement errors');
+$strSetupImport_allow_interrupt_desc = __('Allow interrupt of import in case script detects it is close to time limit. This might be good way to import large files, however it can break transactions.');
+$strSetupImport_allow_interrupt_name = __('Partial import: allow interrupt');
+$strSetupImport_format_desc = __('Default format; be aware that this list depends on location (database, table) and only SQL is always available');
+$strSetupImport_format_name = __('Format of imported file');
+$strSetupImport_skip_queries_desc = __('Number of queries to skip from start');
+$strSetupImport_skip_queries_name = __('Partial import: skip queries');
+$strSetupInsecureConnection = __('Insecure connection');
+$strSetupInsecureConnectionMsg1 = __('You are not using a secure connection; all data (including potentially sensitive information, like passwords) is transferred unencrypted!');
+$strSetupInsecureConnectionMsg2 = __('If your server is also configured to accept HTTPS requests follow [a@%s]this link[/a] to use a secure connection.');
+$strSetupInsertRows_desc = __('How many rows can be inserted at one time');
+$strSetupInsertRows_name = __('Number of inserted rows');
+$strSetupLeftDefaultTabTable_name = __('Target for quick access icon');
+$strSetupLeftDisplayLogo_desc = __('Show logo in left frame');
+$strSetupLeftDisplayLogo_name = __('Display logo');
+$strSetupLeftDisplayServers_desc = __('Display server choice at the top of the left frame');
+$strSetupLeftDisplayServers_name = __('Display servers selection');
+$strSetupLeftFrameDBSeparator_desc = __('String that separates databases into different tree levels');
+$strSetupLeftFrameDBSeparator_name = __('Database tree separator');
+$strSetupLeftFrameDBTree_desc = __('Only light version; display databases in a tree (determined by the separator defined below)');
+$strSetupLeftFrameDBTree_name = __('Display databases in a tree');
+$strSetupLeftFrameLight_desc = __('Disable this if you want to see all databases at once');
+$strSetupLeftFrameLight_name = __('Use light version');
+$strSetupLeftFrameTableLevel_name = __('Maximum table tree depth');
+$strSetupLeftFrameTableSeparator_desc = __('String that separates tables into different tree levels');
+$strSetupLeftFrameTableSeparator_name = __('Table tree separator');
+$strSetupLeftLogoLink_name = __('Logo link URL');
+$strSetupLeftLogoLinkWindow_desc = __('Open the linked page in the main window ([kbd]main[/kbd]) or in a new one ([kbd]new[/kbd])');
+$strSetupLeftLogoLinkWindow_name = __('Logo link target');
+$strSetupLeftPointerEnable_desc = __('Highlight server under the mouse cursor');
+$strSetupLeftPointerEnable_name = __('Enable highlighting');
+$strSetupLetUserChoose = __('let the user choose');
+$strSetupLightTabs_desc = __('Use less graphically intense tabs');
+$strSetupLightTabs_name = __('Light tabs');
+$strSetupLoad = __('Load');
+$strSetupLoginCookieDeleteAll_desc = __('If TRUE, logout deletes cookies for all servers; when set to FALSE, logout only occurs for the current server. Setting this to FALSE makes it easy to forget to log out from other servers when connected to multiple servers.');
+$strSetupLoginCookieDeleteAll_name = __('Delete all cookies on logout');
+$strSetupLoginCookieRecall_desc = __('Define whether the previous login should be recalled or not in cookie authentication mode');
+$strSetupLoginCookieRecall_name = __('Recall user name');
+$strSetupLoginCookieStore_desc = __('Defines how long (in seconds) a login cookie should be stored in browser. The default of 0 means that it will be kept for the existing session only, and will be deleted as soon as you close the browser window. This is recommended for non-trusted environments.');
+$strSetupLoginCookieStore_name = __('Login cookie store');
+$strSetupLoginCookieValidity_desc = __('Define how long (in seconds) a login cookie is valid');
+$strSetupLoginCookieValidityMsg = __('[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.');
+$strSetupLoginCookieValidity_name = __('Login cookie validity');
+$strSetupMaxCharactersInDisplayedSQL_desc = __('Maximum number of characters used when a SQL query is displayed');
+$strSetupMaxCharactersInDisplayedSQL_name = __('Maximum displayed SQL length');
+$strSetupMaxDbList_desc = __('Maximum number of databases displayed in left frame and database list');
+$strSetupMaxDbList_name = __('Maximum databases');
+$strSetupMaxRows_desc = __('Number of rows displayed when browsing a result set. If the result set contains more rows, &quot;Previous&quot; and &quot;Next&quot; links will be shown.');
+$strSetupMaxRows_name = __('Maximum number of rows to display');
+$strSetupMaxTableList_desc = __('Maximum number of tables displayed in table list');
+$strSetupMaxTableList_name = __('Maximum tables');
+$strSetupMemoryLimit_desc = __('The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] ([kbd]0[/kbd] for no limit)');
+$strSetupMemoryLimit_name = __('Memory limit');
+$strSetupNavigationBarIconic_desc = __('Use only icons, only text or both');
+$strSetupNavigationBarIconic_name = __('Iconic navigation bar');
+$strSetupNewServer = __('New server');
+$strSetupNoServers = __('There are no configured servers');
+$strSetupOBGzip_desc = __('use GZip output buffering for increased speed in HTTP transfers');
+$strSetupOBGzip_name = __('GZip output buffering');
+$strSetupOptionNone = __('- none -');
+$strSetupOrder_desc = __('[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, DATETIME and TIMESTAMP, ascending order otherwise');
+$strSetupOrder_name = __('Default sorting order');
+$strSetupOverview = __('Overview');
+$strSetupPersistentConnections_desc = __('Use persistent connections to MySQL databases');
+$strSetupPersistentConnections_name = __('Persistent connections');
+$strSetupPropertiesIconic_desc = __('Use only icons, only text or both');
+$strSetupPropertiesIconic_name = __('Iconic table operations');
+$strSetupProtectBinary_desc = __('Disallow BLOB and BINARY columns from editing');
+$strSetupProtectBinary_name = __('Protect binary columns');
+$strSetupQueryHistoryDB_desc = __('Enable if you want DB-based query history (requires pmadb). If disabled, this utilizes JS-routines to display query history (lost by window close).');
+$strSetupQueryHistoryDB_name = __('Permanent query history');
+$strSetupQueryHistoryMax_desc = __('How many queries are kept in history');
+$strSetupQueryHistoryMax_name = __('Query history length');
+$strSetupQueryWindowDefTab_desc = __('Tab displayed when opening a new query window');
+$strSetupQueryWindowDefTab_name = __('Default query window tab');
+$strSetupRecodingEngine_desc = __('Select which functions will be used for character set conversion');
+$strSetupRecodingEngine_name = __('Recoding engine');
+$strSetupRestoreDefaultValue = __('Restore default value');
+$strSetupRevertErroneousFields = __('Try to revert erroneous fields to their default values');
+$strSetupSaveDir_desc = __('Directory where exports can be saved on server');
+$strSetupSaveDir_name = __('Save directory');
+$strSetupServerAuthConfigMsg = __('You set the [kbd]config[/kbd] authentication type and included username and password for auto-login, which is not a desirable option for live hosts. Anyone who knows or guesses your phpMyAdmin URL can directly access your phpMyAdmin panel. Set [a@?page=servers&amp;mode=edit&amp;id=%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/kbd].');
+$strSetupServerExtensionMsg = __('You should use mysqli for performance reasons');
+$strSetupServerNoPasswordMsg = __('You allow for connecting to the server without a password.');
+$strSetupServersAdd = __('Add a new server');
+$strSetupServers_AllowDeny_order_desc = __('Leave blank if not used');
+$strSetupServers_AllowDeny_order_name = __('Host authentication order');
+$strSetupServers_AllowDeny_rules_desc = __('Leave blank for defaults');
+$strSetupServers_AllowDeny_rules_name = __('Host authentication rules');
+$strSetupServers_AllowNoPassword_name = __('Allow logins without a password');
+$strSetupServers_AllowRoot_name = __('Allow root login');
+$strSetupServers_auth_http_realm_desc = __('HTTP Basic Auth Realm name to display when doing HTTP Auth');
+$strSetupServers_auth_http_realm_name = __('HTTP Realm');
+$strSetupServers_auth_swekey_config_desc = __('The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)');
+$strSetupServers_auth_swekey_config_name = __('SweKey config file');
+$strSetupServers_auth_type_desc = __('Authentication method to use');
+$strSetupServers_auth_type_name = __('Authentication type');
+$strSetupServers_bookmarktable_desc = __('Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] support, suggested: [kbd]pma_bookmark[/kbd]');
+$strSetupServers_bookmarktable_name = __('Bookmark table');
+$strSetupServers_column_info_desc = __('Leave blank for no column comments/mime types, suggested: [kbd]pma_column_info[/kbd]');
+$strSetupServers_column_info_name = __('Column information table');
+$strSetupServers_compress_desc = __('Compress connection to MySQL server');
+$strSetupServers_compress_name = __('Compress connection');
+$strSetupServers_connect_type_desc = __('How to connect to server, keep [kbd]tcp[/kbd] if unsure');
+$strSetupServers_connect_type_name = __('Connection type');
+$strSetupServers_controlpass_name = __('Control user password');
+$strSetupServers_controluser_desc = __('A special MySQL user configured with limited permissions, more information available on [a@http://wiki.phpmyadmin.net/pma/controluser]wiki[/a]');
+$strSetupServers_controluser_name = __('Control user');
+$strSetupServers_CountTables_desc = __('Count tables when showing database list');
+$strSetupServers_CountTables_name = __('Count tables');
+$strSetupServers_designer_coords_desc = __('Leave blank for no Designer support, suggested: [kbd]pma_designer_coords[/kbd]');
+$strSetupServers_designer_coords_name = __('Designer table');
+$strSetupServers_DisableIS_desc = __('More information on [a@http://sf.net/support/tracker.php?aid=1849494]PMA bug tracker[/a] and [a@http://bugs.mysql.com/19588]MySQL Bugs[/a]');
+$strSetupServers_DisableIS_name = __('Disable use of INFORMATION_SCHEMA');
+$strSetupServerSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - [a@?page=servers&amp;mode=edit&amp;id=%1$d#tab_Server_config]host authentication[/a] settings and [a@?page=form&amp;formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.');
+$strSetupServersEdit = __('Edit server');
+$strSetupServers_extension_desc = __('What PHP extension to use; you should use mysqli if supported');
+$strSetupServers_extension_name = __('PHP extension to use');
+$strSetupServers_hide_db_desc = __('Hide databases matching regular expression (PCRE)');
+$strSetupServers_hide_db_name = __('Hide databases');
+$strSetupServers_history_desc = __('Leave blank for no SQL query history support, suggested: [kbd]pma_history[/kbd]');
+$strSetupServers_history_name = __('SQL query history table');
+$strSetupServers_tracking_desc = __('Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/kbd]');
+$strSetupServers_tracking_name = __('SQL query tracking table');
+$strSetupServers_host_desc = __('Hostname where MySQL server is running');
+$strSetupServers_host_name = __('Server hostname');
+$strSetupServers_LogoutURL_name = __('Logout URL');
+$strSetupServers_nopassword_desc = __('Try to connect without password');
+$strSetupServers_nopassword_name = __('Connect without password');
+$strSetupServers_only_db_desc = __('You can use MySQL wildcard characters (% and _), escape them if you want to use their literal instances, i.e. use \'my\_db\' and not \'my_db\'');
+$strSetupServers_only_db_name = __('Show only listed databases');
+$strSetupServers_password_desc = __('Leave empty if not using config auth');
+$strSetupServers_password_name = __('Password for config auth');
+$strSetupServers_pdf_pages_desc = __('Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]');
+$strSetupServers_pdf_pages_name = __('PDF schema: pages table');
+$strSetupServers_pmadb_desc = __('Database used for relations, bookmarks, and PDF features. See [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for no support. Suggested: [kbd]phpmyadmin[/kbd]');
+$strSetupServers_pmadb_name = __('PMA database');
+$strSetupServers_port_desc = __('Port on which MySQL server is listening, leave empty for default');
+$strSetupServers_port_name = __('Server port');
+$strSetupServers_relation_desc = __('Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links[/a] support, suggested: [kbd]pma_relation[/kbd]');
+$strSetupServers_relation_name = __('Relation table');
+$strSetupServers_ShowDatabasesCommand_desc = __('SQL command to fetch available databases');
+$strSetupServers_ShowDatabasesCommand_name = __('SHOW DATABASES command');
+$strSetupServers_SignonSession_desc = __('See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types[/a] for an example');
+$strSetupServers_SignonSession_name = __('Signon session name');
+$strSetupServers_SignonURL_name = __('Signon URL');
+$strSetupServers_tracking_version_auto_create_desc = __('Whether the tracking mechanism creates versions for tables and views automatically.');
+$strSetupServers_tracking_version_auto_create_name = __('Automatically create versions');
+$strSetupServers_tracking_default_statements_desc = __('Defines the list of statements the auto-creation uses for new versions.');
+$strSetupServers_tracking_default_statements_name = __('Statements to track');
+$strSetupServers_tracking_add_drop_view_desc = __('Whether a DROP VIEW IF EXISTS statement will be added as first line to the log when creating a view.');
+$strSetupServers_tracking_add_drop_view_name = __('Add DROP VIEW');
+$strSetupServers_tracking_add_drop_table_desc = __('Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table.');
+$strSetupServers_tracking_add_drop_table_name = __('Add DROP TABLE');
+$strSetupServers_tracking_add_drop_database_desc = __('Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database.');
+$strSetupServers_tracking_add_drop_database_name = __('Add DROP DATABASE');
+$strSetupServerSslMsg = __('You should use SSL connections if your web server supports it');
+$strSetupServers_socket_desc = __('Socket on which MySQL server is listening, leave empty for default');
+$strSetupServers_socket_name = __('Server socket');
+$strSetupServers_ssl_desc = __('Enable SSL for connection to MySQL server');
+$strSetupServers_ssl_name = __('Use SSL');
+$strSetupServers_table_coords_desc = __('Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]');
+$strSetupServers_table_coords_name = __('PDF schema: table coordinates');
+$strSetupServers_table_info_desc = __('Table to describe the display columns, leave blank for no support; suggested: [kbd]pma_table_info[/kbd]');
+$strSetupServers_table_info_name = __('Display columns table');
+$strSetupServers_user_desc = __('Leave empty if not using config auth');
+$strSetupServers_user_name = __('User for config auth');
+$strSetupServers_verbose_check_desc = __('Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance');
+$strSetupServers_verbose_check_name = __('Verbose check');
+$strSetupServers_verbose_desc = __('A user-friendly description of this server. Leave blank to display the hostname instead.');
+$strSetupServers_verbose_name = __('Verbose name of this server');
+$strSetupSetValue = __('Set value: %s');
+$strSetupShowAll_desc = __('Whether a user should be displayed a &quot;show all (rows)&quot; button');
+$strSetupShowAll_name = __('Allow to display all the rows');
+$strSetupShowChgPassword_desc = __('Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly');
+$strSetupShowChgPassword_name = __('Show password change form');
+$strSetupShowCreateDb_name = __('Show create database form');
+$strSetupShowForm = __('Show form');
+$strSetupShowFunctionFields_desc = __('Display the function fields in edit/insert mode');
+$strSetupShowFunctionFields_name = __('Show function fields');
+$strSetupShowHiddenMessages = __('Show hidden messages (#MSG_COUNT)');
+$strSetupShowPhpInfo_desc = __('Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] output');
+$strSetupShowPhpInfo_name = __('Show phpinfo() link');
+$strSetupShowServerInfo_name = __('Show detailed MySQL server information');
+$strSetupShowSQL_desc = __('Defines whether SQL queries generated by phpMyAdmin should be displayed');
+$strSetupShowSQL_name = __('Show SQL queries');
+$strSetupShowStats_desc = __('Allow to display database and table statistics (eg. space usage)');
+$strSetupShowStats_name = __('Show statistics');
+$strSetupShowTooltipAliasDB_desc = __('If tooltips are enabled and a database comment is set, this will flip the comment and the real name');
+$strSetupShowTooltipAliasDB_name = __('Display database comment instead of its name');
+$strSetupShowTooltipAliasTB_desc = __('When setting this to [kbd]nested[/kbd], the alias of the table name is only used to split/nest the tables according to the $cfg[\'LeftFrameTableSeparator\'] directive, so only the folder is called like the alias, the table name itself stays unchanged');
+$strSetupShowTooltipAliasTB_name = __('Display table comment instead of its name');
+$strSetupShowTooltip_name = __('Display table comments in tooltips');
+$strSetupSkipLockedTables_desc = __('Mark used tables and make it possible to show databases with locked tables');
+$strSetupSkipLockedTables_name = __('Skip locked tables');
+$strSetupSQLQuery_Edit_name = __('Edit');
+$strSetupSQLQuery_Explain_name = __('Explain SQL');
+$strSetupSQLQuery_Refresh_name = __('Refresh');
+$strSetupSQLQuery_ShowAsPHP_name = __('Create PHP Code');
+$strSetupSQLQuery_Validate_name = __('Validate SQL');
+$strSetupSuggestDBName_desc = __('Suggest a database name on the &quot;Create Database&quot; form (if possible) or keep the text field empty');
+$strSetupSuggestDBName_name = __('Suggest new database name');
+$strSetupTrue = __('yes');
+$strSetupTrustedProxies_desc = __('Input proxies as [kbd]IP: trusted HTTP header[/kbd]. The following example specifies that phpMyAdmin should trust a HTTP_X_FORWARDED_FOR (X-Forwarded-For) header coming from the proxy 1.2.3.4:[br][kbd]1.2.3.4: HTTP_X_FORWARDED_FOR[/kbd]');
+$strSetupTrustedProxies_name = __('List of trusted proxies for IP allow/deny');
+$strSetupUploadDir_desc = __('Directory on server where you can upload files for import');
+$strSetupUploadDir_name = __('Upload directory');
+$strSetupUseDbSearch_desc = __('Allow for searching inside the entire database');
+$strSetupUseDbSearch_name = __('Use database search');
+$strSetupVerboseMultiSubmit_desc = __('Show affected rows of each statement on multiple-statement queries. See libraries/import.lib.php for defaults on how many queries a statement may contain.');
+$strSetupVerboseMultiSubmit_name = __('Verbose multiple statements');
+$strSetupVersionCheckDataError = __('Reading of version failed. Maybe you\'re offline or the upgrade server does not respond.');
+$strSetupVersionCheckInvalid = __('Got invalid version string from server');
+$strSetupVersionCheckLink = __('Check for latest version');
+$strSetupVersionCheckNewAvailable = __('A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.');
+$strSetupVersionCheckNewAvailableSvn = __('You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable version is %s, released on %s.');
+$strSetupVersionCheckNone = __('No newer stable version is available');
+$strSetupVersionCheckUnparsable = __('Unparsable version string');
+$strSetupVersionCheck = __('Version check');
+$strSetupVersionCheckWrapperError = __('Neither URL wrapper nor CURL is available. Version check is not possible.');
+$strSetupWarning = __('Warning');
+$strSetupZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression for import and export operations');
+$strSetupZipDumpExportWarning = __('[a@?page=form&amp;formset=features#tab_Import_export]Zip compression[/a] requires functions (%s) which are unavailable on this system.');
+$strSetupZipDumpImportWarning = __('[a@?page=form&amp;formset=features#tab_Import_export]Zip decompression[/a] requires functions (%s) which are unavailable on this system.');
+$strSetupZipDump_name = __('ZIP');
+
+?>
--- a/test/PMA_generateCommonUrl_test.php
+++ b/test/PMA_generateCommonUrl_test.php
@@ -21,14 +21,13 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
 {
    public function setUp()
    {
-        unset($_COOKIE['pma_lang'], $_COOKIE['pma_charset'], $_COOKIE['pma_collation_connection']);
+        unset($_COOKIE['pma_lang'], $_COOKIE['pma_collation_connection']);
    }

    public function testOldStyle()
    {
        $GLOBALS['server'] = 'x';
        $GLOBALS['lang'] = 'x';
-        $GLOBALS['convcharset'] = 'x';
        $GLOBALS['collation_connection'] = 'x';
        $_SESSION[' PMA_token '] = 'x';
        $GLOBALS['cfg']['ServerDefault'] = 'y';
@@ -36,7 +35,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
        $separator = PMA_get_arg_separator();
        $expected = 'server=x' . htmlentities($separator)
            . 'lang=x' . htmlentities($separator)
-            . 'convcharset=x' . htmlentities($separator)
            . 'collation_connection=x' . htmlentities($separator)
            . 'token=x'
            ;
@@ -52,7 +50,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
    {
        $GLOBALS['server'] = 'x';
        $GLOBALS['lang'] = 'x';
-        $GLOBALS['convcharset'] = 'x';
        $GLOBALS['collation_connection'] = 'x';
        $_SESSION[' PMA_token '] = 'x';
        $GLOBALS['cfg']['ServerDefault'] = 'y';
@@ -60,7 +57,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
        $separator = PMA_get_arg_separator();
        $expected = 'server=x' . htmlentities($separator)
            . 'lang=x' . htmlentities($separator)
-            . 'convcharset=x' . htmlentities($separator)
            . 'collation_connection=x' . htmlentities($separator)
            . 'token=x'
            ;
@@ -75,7 +71,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
    {
        $GLOBALS['server'] = 'x';
        $GLOBALS['lang'] = 'x';
-        $GLOBALS['convcharset'] = 'x';
        $GLOBALS['collation_connection'] = 'x';
        $_SESSION[' PMA_token '] = 'x';
        $GLOBALS['cfg']['ServerDefault'] = 'y';
@@ -83,7 +78,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
        $separator = PMA_get_arg_separator();
        $expected = 'server=x' . htmlentities($separator)
            . 'lang=x' . htmlentities($separator)
-            . 'convcharset=x' . htmlentities($separator)
            . 'collation_connection=x' . htmlentities($separator)
            . 'token=x'
            ;
@@ -99,7 +93,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
    {
        $GLOBALS['server'] = 'x';
        $GLOBALS['lang'] = 'x';
-        $GLOBALS['convcharset'] = 'x';
        $GLOBALS['collation_connection'] = 'x';
        $_SESSION[' PMA_token '] = 'x';
        $GLOBALS['cfg']['ServerDefault'] = 'y';
@@ -107,7 +100,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
        $separator = PMA_get_arg_separator();
        $expected = 'server=x' . $separator
            . 'lang=x' . $separator
-            . 'convcharset=x' . $separator
            . 'collation_connection=x' . $separator
            . 'token=x'
            ;
@@ -120,7 +112,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
    {
        $GLOBALS['server'] = 'x';
        $GLOBALS['lang'] = 'x';
-        $GLOBALS['convcharset'] = 'x';
        $GLOBALS['collation_connection'] = 'x';
        $_SESSION[' PMA_token '] = 'x';
        $GLOBALS['cfg']['ServerDefault'] = 'y';
@@ -128,7 +119,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
        $separator = PMA_get_arg_separator();
        $expected = 'server=x' . $separator
            . 'lang=x' . $separator
-            . 'convcharset=x' . $separator
            . 'collation_connection=x' . $separator
            . 'token=x'
            ;
@@ -141,7 +131,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
    {
        $GLOBALS['server'] = 'x';
        $GLOBALS['lang'] = 'x';
-        $GLOBALS['convcharset'] = 'x';
        $GLOBALS['collation_connection'] = 'x';
        $_SESSION[' PMA_token '] = 'x';
        $GLOBALS['cfg']['ServerDefault'] = 'y';
@@ -149,7 +138,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
        $separator = PMA_get_arg_separator();
        $expected = 'server=x' . htmlentities($separator)
            . 'lang=x' . htmlentities($separator)
-            . 'convcharset=x' . htmlentities($separator)
            . 'collation_connection=x' . htmlentities($separator)
            . 'token=x'
            ;