July 2010 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5776-gdf4a6ef
by Michal Čihař 20 Jul '10

20 Jul '10

The branch, master has been updated via df4a6efe472599ba52afac169399d2a649414ced (commit) via 8ceb240551f1504a711544d6de123adbd36be351 (commit) via 4603f7e88170b3e5b2c72e16d56c9c3cffb69da6 (commit) via c9aa65668c7d3b2332748ca469e944ae68614e78 (commit) via 765e9021e48b52013bdc0d850b05c6ce490fffd0 (commit) from 857b1250e76068fd0713b1c657de901711b426c4 (commit) - Log ----------------------------------------------------------------- commit df4a6efe472599ba52afac169399d2a649414ced Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 11:46:11 2010 +0200 Drop convcharset/pma_charset handling. This code had no real use, it was used for converting strings from MySQL to browser encoding. commit 8ceb240551f1504a711544d6de123adbd36be351 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 11:43:10 2010 +0200 Drop passing of convcharset. commit 4603f7e88170b3e5b2c72e16d56c9c3cffb69da6 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 11:42:53 2010 +0200 This function is not used anywhere. commit c9aa65668c7d3b2332748ca469e944ae68614e78 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 11:42:38 2010 +0200 Fix comment. commit 765e9021e48b52013bdc0d850b05c6ce490fffd0 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 11:41:21 2010 +0200 No need to handle convcharset here. ----------------------------------------------------------------------- Summary of changes: export.php | 6 +---- index.php | 2 +- libraries/charset_conversion.lib.php | 37 ---------------------------------- libraries/common.inc.php | 13 +---------- libraries/dbi/mysqli.dbi.lib.php | 2 - libraries/grab_globals.lib.php | 1 - libraries/select_lang.lib.php | 11 ---------- libraries/url_generating.lib.php | 10 --------- pdf_schema.php | 2 +- test/PMA_generateCommonUrl_test.php | 14 +------------ 10 files changed, 6 insertions(+), 92 deletions(-) diff --git a/export.php b/export.php index 5d487a1..8476a52 100644 --- a/export.php +++ b/export.php @@ -262,11 +262,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']; diff --git a/index.php b/index.php index d2d16fa..0b4a982 100644 --- 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) { diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php index dbcb4fd..ed44a64 100644 --- a/libraries/charset_conversion.lib.php +++ b/libraries/charset_conversion.lib.php @@ -121,43 +121,6 @@ if ($PMA_recoding_engine == PMA_CHARSET_ICONV_AIX) { } /** - * 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. * diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 5366c18..8ad8a2c 100644 --- 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 */ @@ -489,14 +489,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(); diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 2a59ed5..80779d8 100644 --- 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() diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php index 2b626da..a582e82 100644 --- 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 diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index c39e2df..f4c0c1b 100644 --- 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'; diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php index fddeb7e..ef5c7fa 100644 --- 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']; diff --git a/pdf_schema.php b/pdf_schema.php index 598c9a4..43bffae 100644 --- 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'; diff --git a/test/PMA_generateCommonUrl_test.php b/test/PMA_generateCommonUrl_test.php index 2d69574..8f62a82 100644 --- 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' ; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5771-g857b125
by Michal Čihař 20 Jul '10

20 Jul '10

The branch, master has been updated via 857b1250e76068fd0713b1c657de901711b426c4 (commit) via 0f4dacb2b1ca17e508886133cb2680d12f27123f (commit) from fa44618a16731b0bde30011c27e509c0e17428fa (commit) - Log ----------------------------------------------------------------- commit 857b1250e76068fd0713b1c657de901711b426c4 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 11:11:18 2010 +0200 Czech translation update. commit 0f4dacb2b1ca17e508886133cb2680d12f27123f Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 11:10:34 2010 +0200 Missing format string, so mark it fuzzy. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 36 ++++++++++++++++++------------------ po/ug.po | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/po/cs.po b/po/cs.po index 75d9703..5383e48 100644 --- 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(a)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(a)cihar.com>\n" "Language-Team: czech <cs(a)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&mode=edit&id=%1" -"$d#tab_Server]typ autentizace[/a] na [kbd]cookie[/kbd] nebo [kbd]http[/kbd]." +"Vašemu phpMyAdmin panelu. Nastavte [a@?page=servers&mode=edit&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" diff --git a/po/ug.po b/po/ug.po index 16481ed..3d1a1c5 100644 --- a/po/ug.po +++ b/po/ug.po @@ -800,7 +800,7 @@ 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." hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5769-gfa44618
by Michal Čihař 20 Jul '10

20 Jul '10

The branch, master has been updated via fa44618a16731b0bde30011c27e509c0e17428fa (commit) via ec065a139b0eee0c3da14435213fbfd49460f65f (commit) via b1b4e0a920b05570d4f69b787c872baaa624ab7d (commit) via f48834217f491cf9d833088ed489a8d1f8267e32 (commit) via e684e92c993fd722bf8138847948532f8d169f78 (commit) via b147c386c0d50a154ae4bab603dcf99ac655c0ea (commit) via 1c6dd50061b621d53208d9c3cbe410d3f443afa7 (commit) via 51bd2ae28fca8f969cb2346eb0b15f89b412a71b (commit) via 43056682a5b6369d3ec69e624b0373760eb2a93a (commit) via c1410e8362be2645d6ef80aef5af26ef19c6e7f1 (commit) via 955e794a3d111333a5321c1cba6ab54e4df5bf50 (commit) via 0d5cf31ce04862aafc93f173a15bc3d03215d2db (commit) via aaeec77ed8a83759ca67e413a88065778e4e2dbe (commit) via 09e873d1f0652dcd505c416b3b20a2b24e2d9c4b (commit) via dc6a088ab6f295cc74982eb6cec69ab477f9b4be (commit) via 18e5e2b761c273825e0c29a77558b491bb84f4de (commit) via 416e38b48d71756c4ca2153a0e646a2e829a0a9a (commit) via de6c11333c4cf81462bceaecacb04f0f2419898b (commit) via 798009cbf72adc2628f60b4db0aa2abb68245c69 (commit) via 36d1053fcc3f72a76590d6bc07dfb467cdfd0560 (commit) via 2c322a2b3edc27e9cf9addb05f1204f61ff87ab9 (commit) via ead375a059efe9bae90819a6be2b30a2915aaf70 (commit) via 8a52ba07eb30d582893aa011a6f7d46b4c71fc6c (commit) via dd573106f6e81f46e09780c1b448a9507118712b (commit) via d8ec696946d3a7fc1453b340149cbbbdda720373 (commit) via 6030dc414d1c2df2f69aada189e338ec322f0bce (commit) via 21d37cdb69e336db3de8d3c2ae62001bbe62299b (commit) via 7fdb79e6ff4661ea9b24ebb6e247a0bcc741c355 (commit) via e03cee9b51dc16cb0e2cdcc0044607af90f3e349 (commit) via 6296b9dc95b00529a411be7ade90db1591e1c097 (commit) via feeed0eea235004b612c9ff484c5c49dfb36ed58 (commit) via 5139df75ecde016fc42fb1d522c7d5086051d996 (commit) via 446102d25e9f045265f5c38189b49f998a2ac376 (commit) via 18ba34c5c0eb743420c6b38335d93c4dfb263ce0 (commit) via fcdf25e2d0d44ef58d8fc957b7f013c7fd077c82 (commit) via 74f8c9adf4395707c711237caed65b616ae351a9 (commit) via 5bb683b89f6529316d596a71f42cc07a06697dec (commit) via 41d101773e6dae25fb7ef466e7f162bcd6437a99 (commit) via 634effd65a358158be88114fa38be6d8609d4a75 (commit) via 0cedafc687c9c1a88519f5e2c8e2bfdd54de800f (commit) via eea8ed3ad67111516b30f5386c370fc7b0fac534 (commit) via 956666c1d4c4bccfc34834d4ed59591ac3052d4b (commit) via 92e280da5dcd022d531d8431325fd311a95bc7ce (commit) via 101d48c215c686544c83de5bd0eb2c3055224275 (commit) via 081363901fbf569d25feb9772788b6ba0fe1a460 (commit) via f0adecc141971009b110e077387f355d8ed973f4 (commit) via b9a4a41ba6fc2e0f58a58159975cfe964659cb8b (commit) via 42a5b8a6eb841e4c22862ea50dc49a4bc753365a (commit) via 5cf5f9ec3bbee7246b5ab131dcfed8f8908eb297 (commit) via d2ad261fccdc675b1e6249b38baa338d01b8c0c7 (commit) via 1ee6d8250b66b5fbc28a9d7555a1546720989abb (commit) via 06183eb3ee68e0b9fde1aa0d30b32d1e307497fa (commit) via 3f276c49715fb36dc22b5ff5f147ce7d4dc1c805 (commit) via 514b442c64d2be22e16a1f42e01bb43b31572d94 (commit) via 58c86e14d87bed527e37e13c461615133d23c122 (commit) via 725157e44e5d54b38c7966a587bf80378d524949 (commit) via 8521d4121230f39b40081aa342888caf3abea7e1 (commit) via c70f92ff73af99c92ca5db9108010b065ebc4ef0 (commit) via 0c198081f6ac837800dfa47724c1f0030037582d (commit) via 0396da53fc31fd2484d5a9023ae8768fa8e8dbaf (commit) via 4d4f2a6d58961540a56a1f427b5c47a52ea10c14 (commit) via 9d499b3563bb643505b7b656db2ec29686b63137 (commit) via a89e9bf1961aa380f10487cf080308064b4345ea (commit) via 8fe3a3aaf84f746aaf41dd0046e730c726d04378 (commit) via 58672520f4b3d3d0770b0f7c75d12a2e927f3518 (commit) via f8c598001ed4467a03b874a8445b500adca8b917 (commit) via 3c3b51743272c81925fa23d71a261ef5f2605eac (commit) via b13f20f198bc0ab19dd5950fda15022d9e4eb226 (commit) via b79f66c5ea6438ca1319306a7081f29323da07c0 (commit) via ebff4d768c9997d2bc1ff6d673374976adcb836d (commit) via 4207a2d0926f3cf7200bed778789285f01f9133d (commit) via 29ab6fcc7db1c54f70346ba972952debd90e5cb3 (commit) via 878a47005412cd81f2daf66ae9f36a7faf6e37a3 (commit) via 97f4ee63814264feffa0afa1b2e6b7364e6638ce (commit) via 5e4ac6770eb5ecb8ce283542eb69883fe3b52c79 (commit) via a418f7f0e1bc17bc466eaef7512b04fb5eec7f0c (commit) via 771861e99d20fe11446a3e19eb89291f14fb549a (commit) via 62010333473c40d278a1e726a4e963fe7c30850d (commit) via ebd95067ca8ba2be26fde9dac77c0f3f00c3da64 (commit) via 4e879b0ae809fd8c2148296048ab62b79ff2474c (commit) via 7d6c41ddf9c2b34ae0bcd8a3cb6c0766839995d4 (commit) via 8d3e5b8eb28e20765e5c2a6413d553bfa269acc0 (commit) via c67a4f23b106a2aa234a6bc377aef55c882b5021 (commit) via 05e0013330bbf2a5ac9d6a39958d5afc1c90ebfb (commit) via 976e6db77a51ca483e71656d6815a1e0674781e8 (commit) via d1f456749291e0d0d56a535f13a08c34262b381e (commit) via fea6fb10ae4208f9fae2afa9de9c2c6d5ec21150 (commit) via e9efb107f17d04612f14c3871808a44c44ddf60a (commit) via b22ba06535d6bbb5441118c4690784cce9adcfd7 (commit) via 3e3218efcf8cea2c19a1f07b91d95f89be15990b (commit) via 09f0de1ae129b21e4d5e54ac4fb2db5f33728540 (commit) via 855c763a5ad9322487b680a01b8ed4ba5fe14faf (commit) via 480e8a20ef864897a981fd8f3923d1f1112e8601 (commit) via 45e1fc947fea2d55ba396370a6711d9f2c7f73be (commit) via 3ffb926440f748d96d92106b03ba334a168ee1f6 (commit) via 613a65de39358ce1ad765cc7467b865854c7d672 (commit) via ab30576bd19200d5d965a8140f9792c5adad1b73 (commit) via 9ae83fad42f548e5db9f38ecaff2d9dc22768f50 (commit) via 7da42229763969f85aff4283a51e7fdffbdc8f7c (commit) via 65efdf95c469014cc8584ddad1b0f6e26af271d0 (commit) via 6959c045ffa8de41c3245f7c8ec0592ca3a492d9 (commit) via c9c7ec06bfba2f7aadeb0e3feb7d9d7e04d5c8d3 (commit) via af170497bdd04298f87a6ee4bb3d05e5ec504c8b (commit) via 3f7332a530dc8ca9831c28345b6f3db27a4c62c3 (commit) via 514bc537704b85cdd2ac3d49a0f558666eb3ab8a (commit) via 048e3e9b89de8be217c09fd9ce95959092c2ea80 (commit) via abd8eafc21e7e056b0be1ba7c064ee54adac0d33 (commit) via 07d93227fdafb2842730ddf408a2d2aabbe4bf88 (commit) via 45bc74d815848de436f780b02254033263662656 (commit) via 92a4f9c4b02f49e29cc57aacf017efd0518a0b87 (commit) via 8e1916fbfb22404704a26989421efa6917dea816 (commit) via e86f589dfd4e87a69c176695472d987fa905af94 (commit) via 582949438680f8a326b0811fc380c6baab100736 (commit) via bfe11931a8a185684e4b431792c829c9d2de1d46 (commit) via 61136f46fb80e60a5ae2f1b0e399c20c9f375d52 (commit) via d0f9a6459aa455931d7e1169f1913e3ae4c5c8e9 (commit) via 343c0f0eeca2edf848aa9b138508da91d1493448 (commit) via 3089b917ee778f6f38f8a825c709df4c12ce200d (commit) via b007caa2477e92530763ad438d9a566ff1821046 (commit) via ea414232b7f61d85354e1b0467eae1a570dfa066 (commit) via a2dac1409a1f92afe50a5ce30c6d07c6c9981831 (commit) via 64da8896098b46d71323cace464a674dc4ec6775 (commit) from 6fb9c5bb1498d740fd6e5de3f55fe8c115dfe160 (commit) - Log ----------------------------------------------------------------- commit fa44618a16731b0bde30011c27e509c0e17428fa Author: gheni <gheni(a)yahoo.cn> Date: Tue Jul 20 11:03:49 2010 +0200 Translation update done using Pootle. commit ec065a139b0eee0c3da14435213fbfd49460f65f Merge: b1b4e0a920b05570d4f69b787c872baaa624ab7d 6fb9c5bb1498d740fd6e5de3f55fe8c115dfe160 Author: Pootle server <pootle(a)cihar.com> Date: Mon Jul 19 20:40:11 2010 +0200 Merge remote branch 'origin/master' commit b1b4e0a920b05570d4f69b787c872baaa624ab7d Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:46:33 2010 +0200 Translation update done using Pootle. commit f48834217f491cf9d833088ed489a8d1f8267e32 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:46:13 2010 +0200 Translation update done using Pootle. commit e684e92c993fd722bf8138847948532f8d169f78 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:45:48 2010 +0200 Translation update done using Pootle. commit b147c386c0d50a154ae4bab603dcf99ac655c0ea Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:45:45 2010 +0200 Translation update done using Pootle. commit 1c6dd50061b621d53208d9c3cbe410d3f443afa7 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:45:42 2010 +0200 Translation update done using Pootle. commit 51bd2ae28fca8f969cb2346eb0b15f89b412a71b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:45:40 2010 +0200 Translation update done using Pootle. commit 43056682a5b6369d3ec69e624b0373760eb2a93a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:45:37 2010 +0200 Translation update done using Pootle. commit c1410e8362be2645d6ef80aef5af26ef19c6e7f1 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:45:34 2010 +0200 Translation update done using Pootle. commit 955e794a3d111333a5321c1cba6ab54e4df5bf50 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:45:28 2010 +0200 Translation update done using Pootle. commit 0d5cf31ce04862aafc93f173a15bc3d03215d2db Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:45:25 2010 +0200 Translation update done using Pootle. commit aaeec77ed8a83759ca67e413a88065778e4e2dbe Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:45:20 2010 +0200 Translation update done using Pootle. commit 09e873d1f0652dcd505c416b3b20a2b24e2d9c4b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:45:15 2010 +0200 Translation update done using Pootle. commit dc6a088ab6f295cc74982eb6cec69ab477f9b4be Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:45:11 2010 +0200 Translation update done using Pootle. commit 18e5e2b761c273825e0c29a77558b491bb84f4de Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:45:05 2010 +0200 Translation update done using Pootle. commit 416e38b48d71756c4ca2153a0e646a2e829a0a9a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:44:51 2010 +0200 Translation update done using Pootle. commit de6c11333c4cf81462bceaecacb04f0f2419898b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:44:47 2010 +0200 Translation update done using Pootle. commit 798009cbf72adc2628f60b4db0aa2abb68245c69 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:44:41 2010 +0200 Translation update done using Pootle. commit 36d1053fcc3f72a76590d6bc07dfb467cdfd0560 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:44:36 2010 +0200 Translation update done using Pootle. commit 2c322a2b3edc27e9cf9addb05f1204f61ff87ab9 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:44:31 2010 +0200 Translation update done using Pootle. commit ead375a059efe9bae90819a6be2b30a2915aaf70 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:44:22 2010 +0200 Translation update done using Pootle. commit 8a52ba07eb30d582893aa011a6f7d46b4c71fc6c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:44:12 2010 +0200 Translation update done using Pootle. commit dd573106f6e81f46e09780c1b448a9507118712b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:44:07 2010 +0200 Translation update done using Pootle. commit d8ec696946d3a7fc1453b340149cbbbdda720373 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:44:03 2010 +0200 Translation update done using Pootle. commit 6030dc414d1c2df2f69aada189e338ec322f0bce Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:43:51 2010 +0200 Translation update done using Pootle. commit 21d37cdb69e336db3de8d3c2ae62001bbe62299b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:43:46 2010 +0200 Translation update done using Pootle. commit 7fdb79e6ff4661ea9b24ebb6e247a0bcc741c355 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:43:38 2010 +0200 Translation update done using Pootle. commit e03cee9b51dc16cb0e2cdcc0044607af90f3e349 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:43:33 2010 +0200 Translation update done using Pootle. commit 6296b9dc95b00529a411be7ade90db1591e1c097 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:43:29 2010 +0200 Translation update done using Pootle. commit feeed0eea235004b612c9ff484c5c49dfb36ed58 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:43:23 2010 +0200 Translation update done using Pootle. commit 5139df75ecde016fc42fb1d522c7d5086051d996 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:43:18 2010 +0200 Translation update done using Pootle. commit 446102d25e9f045265f5c38189b49f998a2ac376 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:43:14 2010 +0200 Translation update done using Pootle. commit 18ba34c5c0eb743420c6b38335d93c4dfb263ce0 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:43:08 2010 +0200 Translation update done using Pootle. commit fcdf25e2d0d44ef58d8fc957b7f013c7fd077c82 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:41:48 2010 +0200 Translation update done using Pootle. commit 74f8c9adf4395707c711237caed65b616ae351a9 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:41:41 2010 +0200 Translation update done using Pootle. commit 5bb683b89f6529316d596a71f42cc07a06697dec Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:41:37 2010 +0200 Translation update done using Pootle. commit 41d101773e6dae25fb7ef466e7f162bcd6437a99 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:41:33 2010 +0200 Translation update done using Pootle. commit 634effd65a358158be88114fa38be6d8609d4a75 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:41:30 2010 +0200 Translation update done using Pootle. commit 0cedafc687c9c1a88519f5e2c8e2bfdd54de800f Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:41:27 2010 +0200 Translation update done using Pootle. commit eea8ed3ad67111516b30f5386c370fc7b0fac534 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:41:24 2010 +0200 Translation update done using Pootle. commit 956666c1d4c4bccfc34834d4ed59591ac3052d4b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:41:15 2010 +0200 Translation update done using Pootle. commit 92e280da5dcd022d531d8431325fd311a95bc7ce Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:41:09 2010 +0200 Translation update done using Pootle. commit 101d48c215c686544c83de5bd0eb2c3055224275 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:41:04 2010 +0200 Translation update done using Pootle. commit 081363901fbf569d25feb9772788b6ba0fe1a460 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:41:00 2010 +0200 Translation update done using Pootle. commit f0adecc141971009b110e077387f355d8ed973f4 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:40:53 2010 +0200 Translation update done using Pootle. commit b9a4a41ba6fc2e0f58a58159975cfe964659cb8b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:40:47 2010 +0200 Translation update done using Pootle. commit 42a5b8a6eb841e4c22862ea50dc49a4bc753365a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:40:42 2010 +0200 Translation update done using Pootle. commit 5cf5f9ec3bbee7246b5ab131dcfed8f8908eb297 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:40:38 2010 +0200 Translation update done using Pootle. commit d2ad261fccdc675b1e6249b38baa338d01b8c0c7 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:40:34 2010 +0200 Translation update done using Pootle. commit 1ee6d8250b66b5fbc28a9d7555a1546720989abb Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:40:26 2010 +0200 Translation update done using Pootle. commit 06183eb3ee68e0b9fde1aa0d30b32d1e307497fa Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:40:21 2010 +0200 Translation update done using Pootle. commit 3f276c49715fb36dc22b5ff5f147ce7d4dc1c805 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:40:00 2010 +0200 Translation update done using Pootle. commit 514b442c64d2be22e16a1f42e01bb43b31572d94 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:39:52 2010 +0200 Translation update done using Pootle. commit 58c86e14d87bed527e37e13c461615133d23c122 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:39:48 2010 +0200 Translation update done using Pootle. commit 725157e44e5d54b38c7966a587bf80378d524949 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:39:43 2010 +0200 Translation update done using Pootle. commit 8521d4121230f39b40081aa342888caf3abea7e1 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:39:39 2010 +0200 Translation update done using Pootle. commit c70f92ff73af99c92ca5db9108010b065ebc4ef0 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:39:28 2010 +0200 Translation update done using Pootle. commit 0c198081f6ac837800dfa47724c1f0030037582d Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:39:24 2010 +0200 Translation update done using Pootle. commit 0396da53fc31fd2484d5a9023ae8768fa8e8dbaf Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:39:20 2010 +0200 Translation update done using Pootle. commit 4d4f2a6d58961540a56a1f427b5c47a52ea10c14 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:39:16 2010 +0200 Translation update done using Pootle. commit 9d499b3563bb643505b7b656db2ec29686b63137 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:39:12 2010 +0200 Translation update done using Pootle. commit a89e9bf1961aa380f10487cf080308064b4345ea Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:39:05 2010 +0200 Translation update done using Pootle. commit 8fe3a3aaf84f746aaf41dd0046e730c726d04378 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:38:52 2010 +0200 Translation update done using Pootle. commit 58672520f4b3d3d0770b0f7c75d12a2e927f3518 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:38:45 2010 +0200 Translation update done using Pootle. commit f8c598001ed4467a03b874a8445b500adca8b917 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:38:39 2010 +0200 Translation update done using Pootle. commit 3c3b51743272c81925fa23d71a261ef5f2605eac Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:38:34 2010 +0200 Translation update done using Pootle. commit b13f20f198bc0ab19dd5950fda15022d9e4eb226 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:38:27 2010 +0200 Translation update done using Pootle. commit b79f66c5ea6438ca1319306a7081f29323da07c0 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:38:23 2010 +0200 Translation update done using Pootle. commit ebff4d768c9997d2bc1ff6d673374976adcb836d Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:38:18 2010 +0200 Translation update done using Pootle. commit 4207a2d0926f3cf7200bed778789285f01f9133d Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:38:12 2010 +0200 Translation update done using Pootle. commit 29ab6fcc7db1c54f70346ba972952debd90e5cb3 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:38:06 2010 +0200 Translation update done using Pootle. commit 878a47005412cd81f2daf66ae9f36a7faf6e37a3 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:37:55 2010 +0200 Translation update done using Pootle. commit 97f4ee63814264feffa0afa1b2e6b7364e6638ce Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:37:48 2010 +0200 Translation update done using Pootle. commit 5e4ac6770eb5ecb8ce283542eb69883fe3b52c79 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:37:43 2010 +0200 Translation update done using Pootle. commit a418f7f0e1bc17bc466eaef7512b04fb5eec7f0c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:37:35 2010 +0200 Translation update done using Pootle. commit 771861e99d20fe11446a3e19eb89291f14fb549a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:37:22 2010 +0200 Translation update done using Pootle. commit 62010333473c40d278a1e726a4e963fe7c30850d Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:37:12 2010 +0200 Translation update done using Pootle. commit ebd95067ca8ba2be26fde9dac77c0f3f00c3da64 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:37:08 2010 +0200 Translation update done using Pootle. commit 4e879b0ae809fd8c2148296048ab62b79ff2474c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:37:04 2010 +0200 Translation update done using Pootle. commit 7d6c41ddf9c2b34ae0bcd8a3cb6c0766839995d4 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:37:00 2010 +0200 Translation update done using Pootle. commit 8d3e5b8eb28e20765e5c2a6413d553bfa269acc0 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:36:56 2010 +0200 Translation update done using Pootle. commit c67a4f23b106a2aa234a6bc377aef55c882b5021 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:36:50 2010 +0200 Translation update done using Pootle. commit 05e0013330bbf2a5ac9d6a39958d5afc1c90ebfb Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:36:42 2010 +0200 Translation update done using Pootle. commit 976e6db77a51ca483e71656d6815a1e0674781e8 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:36:38 2010 +0200 Translation update done using Pootle. commit d1f456749291e0d0d56a535f13a08c34262b381e Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:36:34 2010 +0200 Translation update done using Pootle. commit fea6fb10ae4208f9fae2afa9de9c2c6d5ec21150 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:36:29 2010 +0200 Translation update done using Pootle. commit e9efb107f17d04612f14c3871808a44c44ddf60a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:36:21 2010 +0200 Translation update done using Pootle. commit b22ba06535d6bbb5441118c4690784cce9adcfd7 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:36:13 2010 +0200 Translation update done using Pootle. commit 3e3218efcf8cea2c19a1f07b91d95f89be15990b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:36:05 2010 +0200 Translation update done using Pootle. commit 09f0de1ae129b21e4d5e54ac4fb2db5f33728540 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:36:00 2010 +0200 Translation update done using Pootle. commit 855c763a5ad9322487b680a01b8ed4ba5fe14faf Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:35:45 2010 +0200 Translation update done using Pootle. commit 480e8a20ef864897a981fd8f3923d1f1112e8601 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:35:24 2010 +0200 Translation update done using Pootle. commit 45e1fc947fea2d55ba396370a6711d9f2c7f73be Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:35:19 2010 +0200 Translation update done using Pootle. commit 3ffb926440f748d96d92106b03ba334a168ee1f6 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:35:10 2010 +0200 Translation update done using Pootle. commit 613a65de39358ce1ad765cc7467b865854c7d672 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:35:02 2010 +0200 Translation update done using Pootle. commit ab30576bd19200d5d965a8140f9792c5adad1b73 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:34:59 2010 +0200 Translation update done using Pootle. commit 9ae83fad42f548e5db9f38ecaff2d9dc22768f50 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:34:40 2010 +0200 Translation update done using Pootle. commit 7da42229763969f85aff4283a51e7fdffbdc8f7c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:32:32 2010 +0200 Translation update done using Pootle. commit 65efdf95c469014cc8584ddad1b0f6e26af271d0 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:31:09 2010 +0200 Translation update done using Pootle. commit 6959c045ffa8de41c3245f7c8ec0592ca3a492d9 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:30:55 2010 +0200 Translation update done using Pootle. commit c9c7ec06bfba2f7aadeb0e3feb7d9d7e04d5c8d3 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:30:43 2010 +0200 Translation update done using Pootle. commit af170497bdd04298f87a6ee4bb3d05e5ec504c8b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:30:30 2010 +0200 Translation update done using Pootle. commit 3f7332a530dc8ca9831c28345b6f3db27a4c62c3 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:30:18 2010 +0200 Translation update done using Pootle. commit 514bc537704b85cdd2ac3d49a0f558666eb3ab8a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:02:21 2010 +0200 Translation update done using Pootle. commit 048e3e9b89de8be217c09fd9ce95959092c2ea80 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:02:14 2010 +0200 Translation update done using Pootle. commit abd8eafc21e7e056b0be1ba7c064ee54adac0d33 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:02:08 2010 +0200 Translation update done using Pootle. commit 07d93227fdafb2842730ddf408a2d2aabbe4bf88 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:01:46 2010 +0200 Translation update done using Pootle. commit 45bc74d815848de436f780b02254033263662656 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:01:31 2010 +0200 Translation update done using Pootle. commit 92a4f9c4b02f49e29cc57aacf017efd0518a0b87 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 19:00:36 2010 +0200 Translation update done using Pootle. commit 8e1916fbfb22404704a26989421efa6917dea816 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 18:59:55 2010 +0200 Translation update done using Pootle. commit e86f589dfd4e87a69c176695472d987fa905af94 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 18:59:48 2010 +0200 Translation update done using Pootle. commit 582949438680f8a326b0811fc380c6baab100736 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 18:59:31 2010 +0200 Translation update done using Pootle. commit bfe11931a8a185684e4b431792c829c9d2de1d46 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 18:58:51 2010 +0200 Translation update done using Pootle. commit 61136f46fb80e60a5ae2f1b0e399c20c9f375d52 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 18:42:25 2010 +0200 Translation update done using Pootle. commit d0f9a6459aa455931d7e1169f1913e3ae4c5c8e9 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 18:42:13 2010 +0200 Translation update done using Pootle. commit 343c0f0eeca2edf848aa9b138508da91d1493448 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 18:41:48 2010 +0200 Translation update done using Pootle. commit 3089b917ee778f6f38f8a825c709df4c12ce200d Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 18:41:30 2010 +0200 Translation update done using Pootle. commit b007caa2477e92530763ad438d9a566ff1821046 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 18:41:19 2010 +0200 Translation update done using Pootle. commit ea414232b7f61d85354e1b0467eae1a570dfa066 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 18:41:11 2010 +0200 Translation update done using Pootle. commit a2dac1409a1f92afe50a5ce30c6d07c6c9981831 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 18:40:52 2010 +0200 Translation update done using Pootle. commit 64da8896098b46d71323cace464a674dc4ec6775 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 18:39:14 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 257 +++++++++++++++++++++++++++++++------------------------------ po/ug.po | 6 +- 2 files changed, 135 insertions(+), 128 deletions(-) diff --git a/po/fr.po b/po/fr.po index b2debb6..e2a779c 100644 --- 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(a)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(a)infomarc.info>\n" "Language-Team: french <fr(a)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 :" +msgstr "Utilisateur : " #: libraries/auth/cookie.auth.lib.php:265 msgid "Password:" -msgstr "Mot de passe :" +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 "show all (rows)" button" -msgstr "Devrait-on afficher un bouton "Tout afficher"" +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 diff --git a/po/ug.po b/po/ug.po index d853d56..16481ed 100644 --- 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(a)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(a)yahoo.cn>\n" "Language-Team: Uyghur <ug(a)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" @@ -805,6 +805,8 @@ 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 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5647-g6fb9c5b
by Marc Delisle 19 Jul '10

19 Jul '10

The branch, master has been updated via 6fb9c5bb1498d740fd6e5de3f55fe8c115dfe160 (commit) from d0106c29edc5eba444c984f74fabad51639b9315 (commit) - Log ----------------------------------------------------------------- commit 6fb9c5bb1498d740fd6e5de3f55fe8c115dfe160 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 13:22:42 2010 -0400 more plural forms ----------------------------------------------------------------------- Summary of changes: db_search.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/db_search.php b/db_search.php index 627ac25..03e146f 100644 --- 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. hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5645-g4e5061d
by Marc Delisle 19 Jul '10

19 Jul '10

The branch, master has been updated via 4e5061d32356428960c8da7f988c83ebd30c94c6 (commit) from e0d1e92336a43b0b2997ff11f15957156cbb35f4 (commit) - Log ----------------------------------------------------------------- commit 4e5061d32356428960c8da7f988c83ebd30c94c6 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 19 10:03:17 2010 -0400 Generate password only available if JS is enabled ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ js/messages.php | 4 ++++ js/password_generation.js | 10 ++++++++++ libraries/display_change_password.lib.php | 11 +---------- server_privileges.php | 13 +++---------- user_password.php | 5 ++++- 6 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 js/password_generation.js diff --git a/ChangeLog b/ChangeLog index 43d3184..4240463 100644 --- a/ChangeLog +++ b/ChangeLog @@ -85,6 +85,8 @@ $Id$ - patch #2999595, rfe #2998130 [interface] Cleanup navigation frame. - patch #3025161 [core] Prevent sending of unnecessary cookies, thanks to Piotr Przybylski - crackpl +- bug [password] Generate password only available if JS is enabled + (fixed for Privileges and Change password) 3.3.6.0 (not yet released) diff --git a/js/messages.php b/js/messages.php index 8eb745a..aeb93f5 100644 --- a/js/messages.php +++ b/js/messages.php @@ -62,6 +62,10 @@ $js_messages['strSelectForeignKey'] = __('Select Foreign Key'); $js_messages['strPleaseSelectPrimaryOrUniqueKey'] = __('Please select the primary key or a unique key'); $js_messages['strChangeDisplay'] = __('Choose column to display'); +/* password generation */ +$js_messages['strGeneratePassword'] = __('Generate password'); +$js_messages['strGenerate'] = __('Generate'); + echo "var PMA_messages = new Array();\n"; foreach ($js_messages as $name => $js_message) { PMA_printJsValue("PMA_messages['" . $name . "']", $js_message); diff --git a/js/password_generation.js b/js/password_generation.js new file mode 100644 index 0000000..9153cc9 --- /dev/null +++ b/js/password_generation.js @@ -0,0 +1,10 @@ +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * for libraries/display_change_password.lib.php + * + */ + +$(document).ready(function() { + $('#tr_element_before_generate_password').parent().append('<tr><td>' + PMA_messages['strGeneratePassword'] + '</td><td><input type="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /><input type="text" name="generated_pw" id="generated_pw" /></td></tr>'); + $('#div_element_before_generate_password').parent().append('<div class="item"><label for="button_generate_password">' + PMA_messages['strGeneratePassword'] + ':</label><span class="options"><input type="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /></span><input type="text" name="generated_pw" id="generated_pw" /></div>'); +}); diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php index b541aa5..1e88a4a 100644 --- a/libraries/display_change_password.lib.php +++ b/libraries/display_change_password.lib.php @@ -58,7 +58,7 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5) </label> </td> </tr> - <tr> + <tr id="tr_element_before_generate_password"> <td> </td> <td> <input type="radio" name="pw_hash" id="radio_pw_hash_old" value="old" /> @@ -67,15 +67,6 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5) </label> </td> </tr> - <tr> - <td> - <?php echo __('Generate Password'); ?> - </td> - <td> - <input type="button" id="button_generate_password" value="<?php echo __('Generate'); ?>" onclick="suggestPassword(this.form)" /> - <input type="text" name="generated_pw" id="generated_pw" /> - </td> - </tr> </table> </fieldset> <fieldset id="fieldset_change_password_footer" class="tblFooters"> diff --git a/server_privileges.php b/server_privileges.php index 576c0a1..ea4b8c8 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -16,6 +16,7 @@ require_once './libraries/common.inc.php'; */ $GLOBALS['js_include'][] = 'server_privileges.js'; $GLOBALS['js_include'][] = 'functions.js'; +$GLOBALS['js_include'][] = 'password_generation.js'; require './libraries/server_common.inc.php'; /** @@ -810,22 +811,14 @@ function PMA_displayLoginInformationFields($mode = 'new') . '</span>' . "\n" . '<input type="password" id="text_pma_pw" name="pma_pw" title="' . __('Password') . '" onchange="pred_password.value = \'userdefined\';" />' . "\n" . '</div>' . "\n" - . '<div class="item">' . "\n" + . '<div class="item" id="div_element_before_generate_password">' . "\n" . '<label for="text_pma_pw2">' . "\n" . ' ' . __('Re-type') . ':' . "\n" . '</label>' . "\n" . '<span class="options"> </span>' . "\n" . '<input type="password" name="pma_pw2" id="text_pma_pw2" title="' . __('Re-type') . '" onchange="pred_password.value = \'userdefined\';" />' . "\n" . '</div>' . "\n" - . '<div class="item">' . "\n" - . '<label for="button_generate_password">' . "\n" - . ' ' . __('Generate Password') . ':' . "\n" - . '</label>' . "\n" - . '<span class="options">' . "\n" - . ' <input type="button" id="button_generate_password" value="' . __('Generate') . '" onclick="suggestPassword(this.form)" />' . "\n" - . '</span>' . "\n" - . '<input type="text" name="generated_pw" id="generated_pw" />' . "\n" - . '</div>' . "\n" + // Generate password added here via jQuery . '</fieldset>' . "\n"; } // end of the 'PMA_displayUserAndHostFields()' function diff --git a/user_password.php b/user_password.php index 9bfa280..91cfde0 100644 --- a/user_password.php +++ b/user_password.php @@ -42,6 +42,9 @@ if (! defined('PMA_NO_VARIABLES_IMPORT')) { */ require_once './libraries/common.inc.php'; +$GLOBALS['js_include'][] = 'server_privileges.js'; +$GLOBALS['js_include'][] = 'password_generation.js'; + /** * Displays an error message and exits if the user isn't allowed to use this * script @@ -124,8 +127,8 @@ if (isset($_REQUEST['nopass'])) { * aren't valid -> displays the form */ // Loads the headers -$GLOBALS['js_include'][] = 'server_privileges.js'; require_once './libraries/header.inc.php'; + echo '<h1>' . __('Change password') . '</h1>' . "\n\n"; // Displays an error message if required hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5644-ge0d1e92
by Michal Čihař 19 Jul '10

19 Jul '10

The branch, master has been updated via e0d1e92336a43b0b2997ff11f15957156cbb35f4 (commit) via d447fe654bf57f0d478cbe1e659320704c6fe918 (commit) via 45297a32f6d63426eda1d875f22ae8a967c6d9a4 (commit) via 82fc4dad1a50d9077883f55503344066c8d0448a (commit) via b36dcabd044035c61a91c87ba3753d3331b3f92d (commit) via f96c6a1f88b439c325dfd9434f2d649cc80c4fca (commit) via 68123e8a7d1b1c93047b84190db4fdd9dc13f74a (commit) via 6dfcd6bd0c34a977dc25205537f981c6870a0a34 (commit) via 788faad76584a2e176fa3e04197405c9235c5343 (commit) via c146836c6ca66589e91560ba1bf5428f358c8623 (commit) via 9f05341bb1fd7759b148a802c1a477ebb4f3d850 (commit) via 267ba261a9de9b306b75356b93a7cd83614661e6 (commit) via 8478e602bb55dc91fa6d756172980b5983be30c8 (commit) via c6fe49a031817815c572ab6a816370ae1c294e61 (commit) via d5f9da594b549f6b8ee5960a28997a553b4b4994 (commit) via 316f137ca17001ab71497d4e142caf46b381eb78 (commit) via a4decd8f1edfa1a196f5f2edce10365e8730c2ce (commit) via 953083512a37f874f1021f7ea8ad40f40c3b4520 (commit) via 1c019fc722eb065cdd845cd824f1c04576c45258 (commit) via 134a892bcc74b59e7b97e0c92bcb0ba8a7c03f56 (commit) via 10feba1bed6fb1abbaf593d7966041920b3fbcc3 (commit) via 1ed6ed5b019d82938dc4867dd57c0eda6f67416e (commit) via 5eff781b0a24d87feffd6a0c70eba2be0fffc6a3 (commit) via babd117900ea56695ab2eace9c7151aaeeae9986 (commit) via 378e4dbba07f1dab00cf7c8695163026c5e57275 (commit) via 4f4cd41a463078a553e4083b11cdf16ff4a33255 (commit) via fb81404178a5331e4a8c3e8b5fe3435a314587cb (commit) via 829e533f3c2e0c654d3318110554f35ee04365f3 (commit) via 615a91c5a496b92b11947ebef3f5154947be8b09 (commit) via 253f9bd078788224e9dff9eec30efe4419670cab (commit) via 16b2aa477db2b4ec3f5b2afefc6a0cef1a2fe08f (commit) via c3e00a7653531f5cd61dc107b74d8f03f71bc0ee (commit) via 0cce84af739bb21ea6a0feb7e0df523f6ce36392 (commit) via b8a4857e6fff566299ab04cf680fcbb2e0d6db57 (commit) via ae7d1255ea18096cfbb85af00cb758e54b3fbe5c (commit) via 1a358ff1225d76ce1863ae5557dde7b5917371c2 (commit) via 45e2ec149a66e3c2ccd2d1cefa34ce1519f93d2b (commit) via 64475b8caedb8f1e5520098f3b856489660dd8e3 (commit) via fd0e078433d5043a38f26d87dc648861018f0216 (commit) via 0b9295378ea09863fc5a073a1d7447bdcaf608a8 (commit) via 36ec9365c7c5c39cdb56ff538339317669bd5ff2 (commit) via 1a07171c1f76f1a0ce561aa1e1061191cc1d33b6 (commit) via 5e6613fe47d7cc84f540bc0ceaa3d1ea62ad82e3 (commit) via c0a37239489de76554ef2fb10e8adb653eaaa435 (commit) via f726e4a3a46b2e61b8a5597018c9ace562ba669a (commit) via c27355b40b90d537325eabfae89be4c77fb95453 (commit) via 92a143e428c42150694ccf2e66217fba13c17a0d (commit) via b6042e3a2b5c01506ad3c9572e902254caeb9dc2 (commit) via 44c2b3a03c74d01271102967f3eed344fad0ed8f (commit) via aca8e402dc3b7c3709ee305cb2ba63dbdd092586 (commit) via f987edca1f07571d8aabe55759ee54510276379f (commit) via f7197f29dc31fd3773ca29e4768a8aa6d2641d6b (commit) via 879a9315fd7ab490eb7f232fdffb97d18c75a834 (commit) via 6d06d2b78fc33fd246973d91c02732815b9bbb90 (commit) via 123606c34c711e47b03e65488254c75b5448a1a5 (commit) via 5275895f5343279932c6d7a99795316d4f31ccf3 (commit) via 491ec24b0bdf9df44f5105452b2939e9319e730a (commit) via ec2142a7d85f516729355d021a6ebdb0b2c66a3b (commit) via 68bd8f20f0dd8d8a0aa9da8b8532b8fd0c01dc77 (commit) via 09a17e4429ac6e9f53d5b3c3fe4d96aa77cb3571 (commit) via 499c353246dab31a3731f8055fbb332acd828e18 (commit) via d3d7f14203fd7a1482251e06d7b307d37974b315 (commit) via 602354d3f1b8bfc8432f4c390a6d567afb3003f3 (commit) via 681a5bcc929d77010a05111fa0a793d3d1c39760 (commit) via 52bca2dd62fa07b479aee7e8ffd6dd00fd8de5f2 (commit) via 7cd05101c4c5eb97a42629cdac94a896093c3b6d (commit) via 016b39a1d1cf26096717be207f732188e9eb050c (commit) via 2aa59975abb35b6dc1fe3781d840a6b806f5e548 (commit) via 166ac3f6b8beae8815f234d5639a9f8ffd574630 (commit) via a745ae8ae2be29c2370858d4d4eba0a5d1949425 (commit) via 7c667779d6bc00f5012fa0901a10c369029b5ff8 (commit) via 024a447faf77dd6c81309f8c1390143a2434e5ee (commit) via 0dc24dff7f537e68f6e5a4e90702e7bc56da756b (commit) via 63120bd10e1fc210ebead2dbe6270ca79fbb05b1 (commit) via a891096c88d531bf2c5d3a40a285851c2a8cfe29 (commit) via 4e2b0e3890978ffb4101f92df405f9995a6c0335 (commit) via 186477e32e49fd70c4b2dad4472afb27f8bb60de (commit) via 595f592f2d59d3d1e862b831e0e1cf07b73c98a1 (commit) via 27abf5e2e55f3eca0e68c14722ce7481f8ee4939 (commit) via e430a01711c33a473324f29fc3d36a301e3e4f53 (commit) via 095b11197f334b58e283440cccced0bce731527f (commit) via 28982ff17219bb02fe0f4f89cd970e04f2b60460 (commit) from 0c9cbf6c6ee5d83c670725a903867eeac5a0bd2b (commit) - Log ----------------------------------------------------------------- commit e0d1e92336a43b0b2997ff11f15957156cbb35f4 Merge: d447fe654bf57f0d478cbe1e659320704c6fe918 0c9cbf6c6ee5d83c670725a903867eeac5a0bd2b Author: Pootle server <pootle(a)cihar.com> Date: Sun Jul 18 20:40:15 2010 +0200 Merge remote branch 'origin/master' commit d447fe654bf57f0d478cbe1e659320704c6fe918 Merge: 45297a32f6d63426eda1d875f22ae8a967c6d9a4 04fc2f62b0d9ab10db4f82465ca23a1f7e7f48d7 Author: Pootle server <pootle(a)cihar.com> Date: Sat Jul 17 16:40:16 2010 +0200 Merge remote branch 'origin/master' commit 45297a32f6d63426eda1d875f22ae8a967c6d9a4 Author: Domen <dbc334(a)gmail.com> Date: Fri Jul 16 17:14:39 2010 +0200 Translation update done using Pootle. commit 82fc4dad1a50d9077883f55503344066c8d0448a Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 14:00:25 2010 +0200 Translation update done using Pootle. commit b36dcabd044035c61a91c87ba3753d3331b3f92d Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:59:16 2010 +0200 Translation update done using Pootle. commit f96c6a1f88b439c325dfd9434f2d649cc80c4fca Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:58:43 2010 +0200 Translation update done using Pootle. commit 68123e8a7d1b1c93047b84190db4fdd9dc13f74a Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:57:26 2010 +0200 Translation update done using Pootle. commit 6dfcd6bd0c34a977dc25205537f981c6870a0a34 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:55:18 2010 +0200 Translation update done using Pootle. commit 788faad76584a2e176fa3e04197405c9235c5343 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:54:12 2010 +0200 Translation update done using Pootle. commit c146836c6ca66589e91560ba1bf5428f358c8623 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:53:40 2010 +0200 Translation update done using Pootle. commit 9f05341bb1fd7759b148a802c1a477ebb4f3d850 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:52:23 2010 +0200 Translation update done using Pootle. commit 267ba261a9de9b306b75356b93a7cd83614661e6 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:52:09 2010 +0200 Translation update done using Pootle. commit 8478e602bb55dc91fa6d756172980b5983be30c8 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:51:53 2010 +0200 Translation update done using Pootle. commit c6fe49a031817815c572ab6a816370ae1c294e61 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:51:04 2010 +0200 Translation update done using Pootle. commit d5f9da594b549f6b8ee5960a28997a553b4b4994 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:50:03 2010 +0200 Translation update done using Pootle. commit 316f137ca17001ab71497d4e142caf46b381eb78 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:48:43 2010 +0200 Translation update done using Pootle. commit a4decd8f1edfa1a196f5f2edce10365e8730c2ce Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:47:55 2010 +0200 Translation update done using Pootle. commit 953083512a37f874f1021f7ea8ad40f40c3b4520 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:46:23 2010 +0200 Translation update done using Pootle. commit 1c019fc722eb065cdd845cd824f1c04576c45258 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:45:30 2010 +0200 Translation update done using Pootle. commit 134a892bcc74b59e7b97e0c92bcb0ba8a7c03f56 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:45:09 2010 +0200 Translation update done using Pootle. commit 10feba1bed6fb1abbaf593d7966041920b3fbcc3 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:45:01 2010 +0200 Translation update done using Pootle. commit 1ed6ed5b019d82938dc4867dd57c0eda6f67416e Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:44:53 2010 +0200 Translation update done using Pootle. commit 5eff781b0a24d87feffd6a0c70eba2be0fffc6a3 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:44:35 2010 +0200 Translation update done using Pootle. commit babd117900ea56695ab2eace9c7151aaeeae9986 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:44:22 2010 +0200 Translation update done using Pootle. commit 378e4dbba07f1dab00cf7c8695163026c5e57275 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:44:17 2010 +0200 Translation update done using Pootle. commit 4f4cd41a463078a553e4083b11cdf16ff4a33255 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:44:01 2010 +0200 Translation update done using Pootle. commit fb81404178a5331e4a8c3e8b5fe3435a314587cb Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:43:48 2010 +0200 Translation update done using Pootle. commit 829e533f3c2e0c654d3318110554f35ee04365f3 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:43:32 2010 +0200 Translation update done using Pootle. commit 615a91c5a496b92b11947ebef3f5154947be8b09 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:43:20 2010 +0200 Translation update done using Pootle. commit 253f9bd078788224e9dff9eec30efe4419670cab Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:43:06 2010 +0200 Translation update done using Pootle. commit 16b2aa477db2b4ec3f5b2afefc6a0cef1a2fe08f Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:42:51 2010 +0200 Translation update done using Pootle. commit c3e00a7653531f5cd61dc107b74d8f03f71bc0ee Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:42:43 2010 +0200 Translation update done using Pootle. commit 0cce84af739bb21ea6a0feb7e0df523f6ce36392 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:42:29 2010 +0200 Translation update done using Pootle. commit b8a4857e6fff566299ab04cf680fcbb2e0d6db57 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:42:08 2010 +0200 Translation update done using Pootle. commit ae7d1255ea18096cfbb85af00cb758e54b3fbe5c Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:41:39 2010 +0200 Translation update done using Pootle. commit 1a358ff1225d76ce1863ae5557dde7b5917371c2 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:41:30 2010 +0200 Translation update done using Pootle. commit 45e2ec149a66e3c2ccd2d1cefa34ce1519f93d2b Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:40:48 2010 +0200 Translation update done using Pootle. commit 64475b8caedb8f1e5520098f3b856489660dd8e3 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:38:55 2010 +0200 Translation update done using Pootle. commit fd0e078433d5043a38f26d87dc648861018f0216 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:38:33 2010 +0200 Translation update done using Pootle. commit 0b9295378ea09863fc5a073a1d7447bdcaf608a8 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:36:26 2010 +0200 Translation update done using Pootle. commit 36ec9365c7c5c39cdb56ff538339317669bd5ff2 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:34:38 2010 +0200 Translation update done using Pootle. commit 1a07171c1f76f1a0ce561aa1e1061191cc1d33b6 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:31:12 2010 +0200 Translation update done using Pootle. commit 5e6613fe47d7cc84f540bc0ceaa3d1ea62ad82e3 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:28:04 2010 +0200 Translation update done using Pootle. commit c0a37239489de76554ef2fb10e8adb653eaaa435 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:27:12 2010 +0200 Translation update done using Pootle. commit f726e4a3a46b2e61b8a5597018c9ace562ba669a Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:26:54 2010 +0200 Translation update done using Pootle. commit c27355b40b90d537325eabfae89be4c77fb95453 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:26:06 2010 +0200 Translation update done using Pootle. commit 92a143e428c42150694ccf2e66217fba13c17a0d Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:25:09 2010 +0200 Translation update done using Pootle. commit b6042e3a2b5c01506ad3c9572e902254caeb9dc2 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:24:30 2010 +0200 Translation update done using Pootle. commit 44c2b3a03c74d01271102967f3eed344fad0ed8f Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:22:12 2010 +0200 Translation update done using Pootle. commit aca8e402dc3b7c3709ee305cb2ba63dbdd092586 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:21:56 2010 +0200 Translation update done using Pootle. commit f987edca1f07571d8aabe55759ee54510276379f Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:20:40 2010 +0200 Translation update done using Pootle. commit f7197f29dc31fd3773ca29e4768a8aa6d2641d6b Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:20:03 2010 +0200 Translation update done using Pootle. commit 879a9315fd7ab490eb7f232fdffb97d18c75a834 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:19:02 2010 +0200 Translation update done using Pootle. commit 6d06d2b78fc33fd246973d91c02732815b9bbb90 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:18:31 2010 +0200 Translation update done using Pootle. commit 123606c34c711e47b03e65488254c75b5448a1a5 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:18:07 2010 +0200 Translation update done using Pootle. commit 5275895f5343279932c6d7a99795316d4f31ccf3 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:17:56 2010 +0200 Translation update done using Pootle. commit 491ec24b0bdf9df44f5105452b2939e9319e730a Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:17:11 2010 +0200 Translation update done using Pootle. commit ec2142a7d85f516729355d021a6ebdb0b2c66a3b Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:16:11 2010 +0200 Translation update done using Pootle. commit 68bd8f20f0dd8d8a0aa9da8b8532b8fd0c01dc77 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:15:53 2010 +0200 Translation update done using Pootle. commit 09a17e4429ac6e9f53d5b3c3fe4d96aa77cb3571 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:09:45 2010 +0200 Translation update done using Pootle. commit 499c353246dab31a3731f8055fbb332acd828e18 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:05:55 2010 +0200 Translation update done using Pootle. commit d3d7f14203fd7a1482251e06d7b307d37974b315 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 13:01:25 2010 +0200 Translation update done using Pootle. commit 602354d3f1b8bfc8432f4c390a6d567afb3003f3 Author: gheni <gheni(a)yahoo.cn> Date: Fri Jul 16 12:53:34 2010 +0200 Translation update done using Pootle. commit 681a5bcc929d77010a05111fa0a793d3d1c39760 Author: ablat7ihlim <ablat7ihlim(a)yahoo.com.cn> Date: Fri Jul 16 12:17:25 2010 +0200 Translation update done using Pootle. commit 52bca2dd62fa07b479aee7e8ffd6dd00fd8de5f2 Author: ablat7ihlim <ablat7ihlim(a)yahoo.com.cn> Date: Fri Jul 16 12:17:09 2010 +0200 Translation update done using Pootle. commit 7cd05101c4c5eb97a42629cdac94a896093c3b6d Author: ablat7ihlim <ablat7ihlim(a)yahoo.com.cn> Date: Fri Jul 16 12:16:23 2010 +0200 Translation update done using Pootle. commit 016b39a1d1cf26096717be207f732188e9eb050c Author: ablat7ihlim <ablat7ihlim(a)yahoo.com.cn> Date: Fri Jul 16 12:16:14 2010 +0200 Translation update done using Pootle. commit 2aa59975abb35b6dc1fe3781d840a6b806f5e548 Author: ablat7ihlim <ablat7ihlim(a)yahoo.com.cn> Date: Fri Jul 16 12:16:06 2010 +0200 Translation update done using Pootle. commit 166ac3f6b8beae8815f234d5639a9f8ffd574630 Author: ablat7ihlim <ablat7ihlim(a)yahoo.com.cn> Date: Fri Jul 16 12:15:24 2010 +0200 Translation update done using Pootle. commit a745ae8ae2be29c2370858d4d4eba0a5d1949425 Author: ablat7ihlim <ablat7ihlim(a)yahoo.com.cn> Date: Fri Jul 16 12:15:06 2010 +0200 Translation update done using Pootle. commit 7c667779d6bc00f5012fa0901a10c369029b5ff8 Author: ablat7ihlim <ablat7ihlim(a)yahoo.com.cn> Date: Fri Jul 16 12:14:52 2010 +0200 Translation update done using Pootle. commit 024a447faf77dd6c81309f8c1390143a2434e5ee Author: ablat7ihlim <ablat7ihlim(a)yahoo.com.cn> Date: Fri Jul 16 12:14:43 2010 +0200 Translation update done using Pootle. commit 0dc24dff7f537e68f6e5a4e90702e7bc56da756b Author: ablat7ihlim <ablat7ihlim(a)yahoo.com.cn> Date: Fri Jul 16 12:11:18 2010 +0200 Translation update done using Pootle. commit 63120bd10e1fc210ebead2dbe6270ca79fbb05b1 Author: ablat7ihlim <ablat7ihlim(a)yahoo.com.cn> Date: Fri Jul 16 12:11:08 2010 +0200 Translation update done using Pootle. commit a891096c88d531bf2c5d3a40a285851c2a8cfe29 Author: ablat7ihlim <ablat7ihlim(a)yahoo.com.cn> Date: Fri Jul 16 12:10:54 2010 +0200 Translation update done using Pootle. commit 4e2b0e3890978ffb4101f92df405f9995a6c0335 Author: ablat7ihlim <ablat7ihlim(a)yahoo.com.cn> Date: Fri Jul 16 12:09:52 2010 +0200 Translation update done using Pootle. commit 186477e32e49fd70c4b2dad4472afb27f8bb60de Author: ablat7ihlim <ablat7ihlim(a)yahoo.com.cn> Date: Fri Jul 16 10:55:58 2010 +0200 Translation update done using Pootle. commit 595f592f2d59d3d1e862b831e0e1cf07b73c98a1 Author: ablat7ihlim <ablat7ihlim(a)yahoo.com.cn> Date: Fri Jul 16 10:55:47 2010 +0200 Translation update done using Pootle. commit 27abf5e2e55f3eca0e68c14722ce7481f8ee4939 Author: ablat7ihlim <ablat7ihlim(a)yahoo.com.cn> Date: Fri Jul 16 10:54:39 2010 +0200 Translation update done using Pootle. commit e430a01711c33a473324f29fc3d36a301e3e4f53 Author: ablat7ihlim <ablat7ihlim(a)yahoo.com.cn> Date: Fri Jul 16 10:53:56 2010 +0200 Translation update done using Pootle. commit 095b11197f334b58e283440cccced0bce731527f Author: ablat7ihlim <ablat7ihlim(a)yahoo.com.cn> Date: Fri Jul 16 10:53:18 2010 +0200 Translation update done using Pootle. commit 28982ff17219bb02fe0f4f89cd970e04f2b60460 Author: ablat7ihlim <ablat7ihlim(a)yahoo.com.cn> Date: Fri Jul 16 10:51:30 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/sl.po | 8 ++-- po/ug.po | 137 ++++++++++++++++++++++++++++++++------------------------------ 2 files changed, 75 insertions(+), 70 deletions(-) diff --git a/po/sl.po b/po/sl.po index 60a66d7..5a84e0c 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-07-14 11:36+0200\n" -"PO-Revision-Date: 2010-06-29 22:42+0200\n" +"PO-Revision-Date: 2010-07-16 17:14+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.1\n" #: browse_foreigners.php:38 browse_foreigners.php:59 @@ -2102,7 +2102,7 @@ msgid "" "Please be patient, the file is being uploaded. Details about the upload are " "not available." msgstr "" -"Prosim, bodite potrpežljivi, datoteka za nalaga. Podrobnosti o nalaganju " +"Prosim, bodite potrpežljivi, datoteka se nalaga. Podrobnosti o nalaganju " "niso na voljo." #: libraries/display_import.lib.php:125 diff --git a/po/ug.po b/po/ug.po index 5635d4f..aee6177 100644 --- a/po/ug.po +++ b/po/ug.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-07-14 11:36+0200\n" -"PO-Revision-Date: 2010-07-16 08:52+0200\n" +"PO-Revision-Date: 2010-07-16 14:00+0200\n" "Last-Translator: <gheni(a)yahoo.cn>\n" "Language-Team: Uyghur <ug(a)li.org>\n" "Language: ug\n" @@ -27,7 +27,7 @@ msgstr "ھەممىسىنى كۆرسىتىش" #: libraries/export/pdf.php:147 pdf_schema.php:283 pdf_schema.php:1123 #: pdf_schema.php:1139 msgid "Page number:" -msgstr "بەت نومۇرى" +msgstr "بەت نومۇرى:" #: browse_foreigners.php:132 msgid "" @@ -94,16 +94,16 @@ msgstr "مۇشۇ قىممەتنى ئىشلىتىش" #: db_create.php:46 #, php-format msgid "Database %1$s has been created." -msgstr "%1$s ساندان غەلبىلىك قۇرۇلدى" +msgstr "%1$s ساندان غەلبىلىك قۇرۇلدى" #: db_datadict.php:49 db_operations.php:378 msgid "Database comment: " -msgstr "ساندان ئىزاھاتى" +msgstr "ساندان ئىزاھاتى:" #: db_datadict.php:165 libraries/tbl_properties.inc.php:724 #: pdf_schema.php:1236 tbl_operations.php:347 tbl_printview.php:129 msgid "Table comments" -msgstr "جەدۋەل ئىزاھاتى" +msgstr "جەدۋەل ئىزاھى" #: db_datadict.php:174 db_qbe.php:174 libraries/Index.class.php:446 #: libraries/export/htmlword.php:244 libraries/export/latex.php:360 @@ -217,12 +217,12 @@ msgstr "ساندان ئىسمىنى بوش قويماڭ!" #: db_operations.php:236 #, php-format msgid "Database %s has been renamed to %s" -msgstr "%s ساندان ئىسمى %s غا ئۆزگەرتىلدى." +msgstr "ساندان ئىسمى %s غا ئۆزگەرتىلدى %s" #: db_operations.php:240 #, php-format msgid "Database %s has been copied to %s" -msgstr "%s ساندان %s غا كۆچۈرۈلدى" +msgstr "ساندان %s غا كۆچۈرۈلدى %s" #: db_operations.php:412 msgid "Rename database to" @@ -328,6 +328,8 @@ msgid "" "The additional features for working with linked tables have been " "deactivated. To find out why click %shere%s." msgstr "" +"ئالاقىدار جەدۋەللەرنىڭ قوشۇمچە ئىقتىدارى پائالسىز. سەۋەبىنى ئېنىقلاش ئۈچۈن %" +"sبۇ يەرنى كۆرۈڭ%s." #: db_operations.php:648 msgid "Edit PDF Pages" @@ -347,7 +349,7 @@ msgstr "جەدۋەل" #: navigation.php:638 navigation.php:660 server_databases.php:122 #: tbl_printview.php:393 tbl_structure.php:365 tbl_structure.php:777 msgid "Rows" -msgstr "قاتار سانى" +msgstr "سەپ سانى" #: db_printview.php:109 libraries/db_structure.lib.php:67 tbl_indexes.php:190 msgid "Size" @@ -611,7 +613,7 @@ msgstr "ئىزلاش ئاكتىپ ئەمەس" msgid "" "This view has at least this number of rows. Please refer to %sdocumentation" "%s." -msgstr "" +msgstr "بۇ كۆرسەتمە كامىدا ئىگە بولغان سەپ، %sھۆججەت%s." #: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/tbl_info.inc.php:66 tbl_structure.php:185 test/theme.php:74 @@ -784,11 +786,13 @@ msgstr "ھۆججەتنى ساقلاشقا يىتەرلىك بوشلۇق يوق % msgid "" "File %s already exists on server, change filename or check overwrite option." msgstr "" +"%s بۇ ھۆججەت مۇلازىمىتېردا باركەن، ھۆججەت ئىسمىنى ئۆزگەرتىڭ ياكى قاپلاپ " +"كۆچۈرۈش تۈرىنى تالالڭ." #: export.php:298 export.php:302 #, php-format msgid "The web server does not have permission to save the file %s." -msgstr "" +msgstr "بۇ %s ھۆججەتنى مۇلازىمىتېردا ساقلاش ھوقۇقىڭىز يېتەرسىز." #: export.php:629 #, php-format @@ -825,7 +829,7 @@ msgstr "" #: import.php:372 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" -msgstr "" +msgstr "قىستۇرمىلار كىرگۈزىشكە ئامالسىز، قاچىلانمىنى تەكشۈرۈپ بىقىڭ!" #: import.php:397 msgid "The bookmark has been deleted." @@ -843,7 +847,7 @@ msgstr "قۇرۇلغان خەتكۈچ %s" #: import.php:409 import.php:415 #, php-format msgid "Import has been successfully finished, %d queries executed." -msgstr "" +msgstr "%d كىرگۈزىش غەلبىىك بولدى" #: import.php:424 msgid "" @@ -957,38 +961,39 @@ msgstr "" #: js/messages.php:59 libraries/relation.lib.php:107 #: libraries/relation.lib.php:119 msgid "General relation features" -msgstr "" +msgstr "ئاساسىي ئالاقە ۋاريانتلىرى" #: js/messages.php:59 libraries/relation.lib.php:101 #: libraries/relation.lib.php:108 msgid "Disabled" -msgstr "" +msgstr "تاقالدى" #: js/messages.php:60 msgid "Select referenced key" -msgstr "" +msgstr "سېرتقى ئۇلىنىشنى تاللاش" #: js/messages.php:61 msgid "Select Foreign Key" -msgstr "" +msgstr "تاشقى ئاچقۇق قىممىتى" #: js/messages.php:62 msgid "Please select the primary key or a unique key" msgstr "" +# column نى سۆزلەم دەپ ئالساق مۇۋاپىق بولغىدەك #: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 msgid "Choose column to display" -msgstr "" +msgstr "سۆزلەمنى كۆرسەتمەسلىك" #. l10n: Display text for calendar close link #: js/messages.php:73 msgid "Done" -msgstr "" +msgstr "تامام" #. l10n: Display text for previous month link in calendar #: js/messages.php:75 msgid "Prev" -msgstr "" +msgstr "ئالدىنقى ئاي" #. l10n: Display text for next month link in calendar #: js/messages.php:77 libraries/common.lib.php:2353 @@ -996,32 +1001,32 @@ msgstr "" #: server_binlog.php:205 server_binlog.php:207 tbl_printview.php:423 #: tbl_structure.php:801 msgid "Next" -msgstr "" +msgstr "كىيىنكى ئاي" #. l10n: Display text for current month link in calendar #: js/messages.php:79 msgid "Today" -msgstr "" +msgstr "بۈگۈن" #: js/messages.php:82 msgid "January" -msgstr "" +msgstr "قەھرىتان" #: js/messages.php:83 msgid "February" -msgstr "" +msgstr "ھۇت" #: js/messages.php:84 msgid "March" -msgstr "" +msgstr "نورۇز" #: js/messages.php:85 msgid "April" -msgstr "" +msgstr "ئۈمىد" #: js/messages.php:86 msgid "May" -msgstr "" +msgstr "باھار" #: js/messages.php:87 msgid "June" @@ -1085,48 +1090,48 @@ msgstr "6-ئاي" #. l10n: Short month name #: js/messages.php:109 libraries/common.lib.php:1569 msgid "Jul" -msgstr "" +msgstr "چىللە" #. l10n: Short month name #: js/messages.php:111 libraries/common.lib.php:1571 msgid "Aug" -msgstr "" +msgstr "تومۇز" #. l10n: Short month name #: js/messages.php:113 libraries/common.lib.php:1573 msgid "Sep" -msgstr "" +msgstr "مىزان" #. l10n: Short month name #: js/messages.php:115 libraries/common.lib.php:1575 msgid "Oct" -msgstr "" +msgstr "ئوغۇز" #. l10n: Short month name #: js/messages.php:117 libraries/common.lib.php:1577 msgid "Nov" -msgstr "" +msgstr "ئوغلاق" #. l10n: Short month name #: js/messages.php:119 libraries/common.lib.php:1579 msgid "Dec" -msgstr "" +msgstr "كۆنەك" #: js/messages.php:122 msgid "Sunday" -msgstr "" +msgstr "يەكشەنبە" #: js/messages.php:123 msgid "Monday" -msgstr "" +msgstr "دۈشەنبە" #: js/messages.php:124 msgid "Tuesday" -msgstr "" +msgstr "سەيشەنبە" #: js/messages.php:125 msgid "Wednesday" -msgstr "" +msgstr "چارشەنبە" #: js/messages.php:126 msgid "Thursday" @@ -1163,52 +1168,52 @@ msgstr "چارشەنبە" #. l10n: Short week day name #: js/messages.php:140 libraries/common.lib.php:1590 msgid "Thu" -msgstr "" +msgstr "پەيشەنبە" #. l10n: Short week day name #: js/messages.php:142 libraries/common.lib.php:1592 msgid "Fri" -msgstr "" +msgstr "جۈمە" #. l10n: Short week day name #: js/messages.php:144 libraries/common.lib.php:1594 msgid "Sat" -msgstr "" +msgstr "شەنبە" #. l10n: Minimal week day name #: js/messages.php:148 msgid "Su" -msgstr "" +msgstr "يەكشەنبە" #. l10n: Minimal week day name #: js/messages.php:150 msgid "Mo" -msgstr "" +msgstr "دۈشەنبە" #. l10n: Minimal week day name #: js/messages.php:152 msgid "Tu" -msgstr "" +msgstr "سەيشەنبە" #. l10n: Minimal week day name #: js/messages.php:154 msgid "We" -msgstr "" +msgstr "چارشەنبە" #. l10n: Minimal week day name #: js/messages.php:156 msgid "Th" -msgstr "" +msgstr "پەيشەنبە" #. l10n: Minimal week day name #: js/messages.php:158 msgid "Fr" -msgstr "" +msgstr "جۈمە" #. l10n: Minimal week day name #: js/messages.php:160 msgid "Sa" -msgstr "" +msgstr "شەنبە" #. l10n: Column header for week of the year in calendar #: js/messages.php:162 @@ -1234,7 +1239,7 @@ msgstr "خەتنىڭ چوڭ-كىچىكلىكى" #: libraries/File.class.php:344 libraries/File.class.php:432 #: libraries/File.class.php:569 libraries/File.class.php:708 msgid "Unknown error in file upload." -msgstr "" +msgstr "ھۆججەت يۈكلەشتە ئېنىقسىز خاتالىق كۆرۈلدى." #: libraries/File.class.php:414 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." @@ -1252,11 +1257,11 @@ msgstr "" #: libraries/File.class.php:423 msgid "Missing a temporary folder." -msgstr "" +msgstr "ۋاقىتلىق ھۆججەت ساقلاش مۇندەرىجىسى تىپىلمىدى." #: libraries/File.class.php:426 msgid "Failed to write file to disk." -msgstr "" +msgstr "ھۆججەتنى دېسكىغا يىزىشتا خاتالىق كۆرۈلدى." #: libraries/File.class.php:429 msgid "File upload stopped by extension." @@ -1270,11 +1275,11 @@ msgstr "" #: libraries/Index.class.php:428 tbl_relation.php:529 msgid "No index defined!" -msgstr "" +msgstr "index قىممىتى بەلگىلەنمىگەن!" #: libraries/Index.class.php:433 server_databases.php:132 tbl_tracking.php:316 msgid "Indexes" -msgstr "" +msgstr "تېزىسلار" #: libraries/Index.class.php:444 libraries/mult_submits.inc.php:103 #: libraries/tbl_properties.inc.php:519 tbl_structure.php:33 @@ -1310,7 +1315,7 @@ msgstr "" #: libraries/Index.class.php:476 #, php-format msgid "Index %s has been dropped" -msgstr "" +msgstr "ئۆچۈرۈلگەن تېزىسلار %s" #: libraries/Index.class.php:576 #, php-format @@ -1323,14 +1328,14 @@ msgstr "" #: server_databases.php:88 server_privileges.php:1660 #: setup/lib/messages.inc.php:110 test/theme.php:93 msgid "Databases" -msgstr "" +msgstr "ساندان" #: libraries/Message.class.php:211 libraries/common.lib.php:581 #: libraries/core.lib.php:261 libraries/import.lib.php:135 pdf_schema.php:32 #: pdf_schema.php:232 tbl_change.php:1024 tbl_operations.php:213 #: tbl_relation.php:290 view_operations.php:62 msgid "Error" -msgstr "" +msgstr "خاتالىق" #: libraries/Message.class.php:282 #, php-format @@ -1375,11 +1380,11 @@ msgstr "" #: libraries/Table.class.php:1019 msgid "Invalid database" -msgstr "" +msgstr "ئۈنۈمسىز ساندان" #: libraries/Table.class.php:1033 tbl_get_field.php:26 msgid "Invalid table name" -msgstr "" +msgstr "ئۈنۈمسىز جەدۋەل ئىسمى" #: libraries/Table.class.php:1048 #, php-format @@ -1402,17 +1407,17 @@ msgstr "" #: libraries/Theme.class.php:387 msgid "take it" -msgstr "" +msgstr "ئېلىش" #: libraries/Theme_Manager.class.php:115 #, php-format msgid "Default theme %s not found!" -msgstr "" +msgstr "ئۇسلۇپ ئەندىزسى %s تېپىلمىدى!" #: libraries/Theme_Manager.class.php:153 #, php-format msgid "Theme %s not found!" -msgstr "" +msgstr "تېما %s تېپىلمىدى!" #: libraries/Theme_Manager.class.php:221 #, php-format @@ -1422,7 +1427,7 @@ msgstr "" #: libraries/Theme_Manager.class.php:297 test/theme.php:161 themes.php:21 #: themes.php:41 msgid "Theme / Style" -msgstr "" +msgstr "تېما \\ ئۇسلۇب" #: libraries/auth/config.auth.lib.php:77 msgid "Cannot connect: invalid settings." @@ -1433,7 +1438,7 @@ msgstr "" #: test/theme.php:152 #, php-format msgid "Welcome to %s" -msgstr "" +msgstr "%s خۇش كەلدىڭىز" #: libraries/auth/config.auth.lib.php:107 #, php-format @@ -7711,7 +7716,7 @@ msgstr "" #: tbl_tracking.php:642 msgid "Deactivate now" -msgstr "" +msgstr "دەرھال ئىشلىتىشنى توختۇتۇڭ" #: tbl_tracking.php:653 #, php-format @@ -7737,22 +7742,22 @@ msgstr "" #: tbl_tracking.php:688 msgid "Create version" -msgstr "" +msgstr "نەشىرنى قۇىماق" #: themes.php:32 #, php-format msgid "" "No themes support; please check your configuration and/or your themes in " "directory %s." -msgstr "" +msgstr " %sتېمىنى قوللىمايدۇ،تەڭشەك ۋە تېما ھۆججەت قىسقۇچنى تەكشۈرۈڭ" #: themes.php:42 msgid "Get more themes!" -msgstr "" +msgstr "تېخىمۇ كۆپ تېمىغا ئىرىشىش !" #: transformation_overview.php:25 msgid "Available MIME types" -msgstr "" +msgstr "MIMEشەكلىنى ئىشلىتەلەيسىز" #: transformation_overview.php:38 msgid "" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_3_5RC1, created. RELEASE_3_3_5RC1
by Marc Delisle 18 Jul '10

18 Jul '10

The annotated tag, RELEASE_3_3_5RC1 has been created at dacbcf98ed7f40a55ed154b9eb1e21b1374e6aa2 (tag) tagging 31c18cbe11c929b8ff7b95d2bcf478c8c6212d65 (commit) replaces RELEASE_3_3_4 tagged by Marc Delisle on Sun Jul 18 14:37:13 2010 -0400 - Log ----------------------------------------------------------------- Released 3.3.5-rc1 Dieter Adriaenssens (8): upgrade to PHPExcel 1.7.0 upgrade to PHPExcel 1.7.2 Update library PHPExcel to version 1.7.3 Update library PHPExcel to version 1.7.3c cleanup (re)moved files Convert Excel column name correctly remove todo, after upgrade PHPExcel Converting number of Excel column names no longer limited Marc Delisle (23): 3.3.4-rc1 3.3.5-dev 3.3.4 release bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible bug [replication] Do not offer information_schema in the list of databases clarify what is meant by "put the table name" bug: avoid loading twice a js file typo new FAQ 6.26, selecting a range of rows clarify code behavior bug #3024344 [setup] Setup forces numeric MemoryLimit document MemoryLimit as being a string value bug #3025975 [auth] Odd LoginCookieValidity default value revert to previous value and add a comment in default configuration file improve English remove reference to some old stuff bug #3026400 [PHP] ereg functions are deprecated bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from master, todo: update PHP excel?) bug #3023507 [core] No result set display from stored procedure SELECT bug [export] CSV for MS Excel (Windows) should have semi-colon as separator typo typo 3.3.5-rc1 Michal Čihař (2): Merge branch 'MAINT_3_3_4' into QA_3_3 Merge remote branch 'origin/MAINT_3_3_4' into QA_3_3 Stéphane Pontier (1): patch #2932113 Slow export when having lots of databases ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5562-g0c9cbf6
by Marc Delisle 18 Jul '10

18 Jul '10

The branch, master has been updated via 0c9cbf6c6ee5d83c670725a903867eeac5a0bd2b (commit) from 04fc2f62b0d9ab10db4f82465ca23a1f7e7f48d7 (commit) - Log ----------------------------------------------------------------- commit 0c9cbf6c6ee5d83c670725a903867eeac5a0bd2b Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 18 14:35:21 2010 -0400 3.3.6-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83c2860..43d3184 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,6 +86,8 @@ $Id$ - patch #3025161 [core] Prevent sending of unnecessary cookies, thanks to Piotr Przybylski - crackpl +3.3.6.0 (not yet released) + 3.3.5.0 (not yet released) - patch #2932113 [information_schema] Slow export when having lots of databases, thanks to Stéphane Pontier - shadow_walker hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-34-g828d008
by Marc Delisle 18 Jul '10

18 Jul '10

The branch, QA_3_3 has been updated via 828d008838565b1980c67e82ff48eb087a0bcb9a (commit) from 0b9cf14f754935696b6068b238ecc5ed3d3749fd (commit) - Log ----------------------------------------------------------------- commit 828d008838565b1980c67e82ff48eb087a0bcb9a Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 18 14:34:32 2010 -0400 3.3.6-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b0c93f..3f1afa7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +3.3.6.0 (not yet released) + 3.3.5.0 (not yet released) - patch #2932113 [information_schema] Slow export when having lots of databases, thanks to Stéphane Pontier - shadow_walker diff --git a/Documentation.html b/Documentation.html index 1968285..8d001e2 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.5-dev - Documentation</title> + <title>phpMyAdmin 3.3.6-dev - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.5-dev + 3.3.6-dev Documentation </h1> </div> diff --git a/README b/README index 2df920b..8be673e 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.5-dev + Version 3.3.6-dev ----------------- http://www.phpmyadmin.net/ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index a7b448b..a6b1d8c 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.5-dev'); + $this->set('PMA_VERSION', '3.3.6-dev'); /** * @deprecated */ diff --git a/translators.html b/translators.html index ec250a8..d78b68b 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.5-dev - Official translators</title> + <title>phpMyAdmin 3.3.6-dev - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.5-dev + 3.3.6-dev official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_5, updated. RELEASE_3_3_4-34-g31c18cb
by Marc Delisle 18 Jul '10

18 Jul '10

The branch, MAINT_3_3_5 has been updated via 31c18cbe11c929b8ff7b95d2bcf478c8c6212d65 (commit) from 0b9cf14f754935696b6068b238ecc5ed3d3749fd (commit) - Log ----------------------------------------------------------------- commit 31c18cbe11c929b8ff7b95d2bcf478c8c6212d65 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 18 14:31:53 2010 -0400 3.3.5-rc1 ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation.html b/Documentation.html index 1968285..9053c48 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.5-dev - Documentation</title> + <title>phpMyAdmin 3.3.5-rc1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.5-dev + 3.3.5-rc1 Documentation </h1> </div> diff --git a/README b/README index 2df920b..18a6bef 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.5-dev + Version 3.3.5-rc1 ----------------- http://www.phpmyadmin.net/ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index a7b448b..4931858 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.5-dev'); + $this->set('PMA_VERSION', '3.3.5-rc1'); /** * @deprecated */ diff --git a/translators.html b/translators.html index ec250a8..407c759 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.5-dev - Official translators</title> + <title>phpMyAdmin 3.3.5-rc1 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.5-dev + 3.3.5-rc1 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0