- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1650-g83848da
by Michal Čihař 02 Dec '10

02 Dec '10

The branch, master has been updated via 83848da9eaeda858650536516a544691922be526 (commit) from 57265808b8e639bb06506851a74e3474521ccb70 (commit) - Log ----------------------------------------------------------------- commit 83848da9eaeda858650536516a544691922be526 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Dec 2 17:30:10 2010 +0100 Czech translation update. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 47 +++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 24 deletions(-) diff --git a/po/cs.po b/po/cs.po index be9b35c..145930b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-30 12:47-0500\n" -"PO-Revision-Date: 2010-11-21 10:10+0100\n" +"PO-Revision-Date: 2010-12-02 17:30+0100\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "MIME-Version: 1.0\n" @@ -551,10 +551,10 @@ msgid "Delete" msgstr "Odstranit" #: db_search.php:260 -#, fuzzy, php-format +#, php-format #| msgid "Delete tracking data for this table" msgid "Delete the matches for the %s table?" -msgstr "Odstranit všechny informace o sledování této tabulky" +msgstr "Odstranit nalezené záznamy z tabulky %s?" #: db_search.php:273 #, php-format @@ -618,8 +618,8 @@ msgstr "Sledování není zapnuté." #: db_structure.php:372 libraries/display_tbl.lib.php:1940 #, 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." @@ -841,8 +841,8 @@ msgstr "Výpis byl uložen do souboru %s." #: import.php:58 #, 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." @@ -1599,8 +1599,8 @@ msgstr "Vítejte v %s" #: libraries/auth/config.auth.lib.php:106 #, 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." @@ -1785,7 +1785,7 @@ msgstr "Zkontrolovat oprávnění" #: libraries/chart.lib.php:40 msgid "Query statistics" -msgstr "Statistika dotazu" +msgstr "Statistika dotazů" #: libraries/chart.lib.php:63 msgid "Query execution time comparison (in microseconds)" @@ -4517,8 +4517,8 @@ msgstr ", @TABLE@ bude nahrazen jménem 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. See the %4$sFAQ%5$s for details." +"formatting strings. Additionally the following transformations will happen: " +"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." 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 " @@ -6437,8 +6437,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:143 msgid "Transformation options" @@ -6479,8 +6479,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:725 server_engines.php:56 #: tbl_operations.php:352 @@ -6851,10 +6851,9 @@ msgid "Filter" msgstr "Filtr" #: navigation.php:292 -#, fuzzy #| msgid "table name" msgid "filter tables by name" -msgstr "jméno tabulky" +msgstr "filtrovat tabulky podle jména" #: navigation.php:293 setup/frames/index.inc.php:219 msgid "Clear" @@ -7088,8 +7087,8 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" -"Více věcí můžete nastavit úpravou config.inc.php, např. použitím %" -"sNastavovacího skriptu%s." +"Více věcí můžete nastavit úpravou config.inc.php, např. použitím " +"%sNastavovacího skriptu%s." #: prefs_manage.php:302 msgid "Save to browser's storage" @@ -7541,8 +7540,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 " @@ -9019,8 +9018,8 @@ msgid "" "protection may not be reliable if your IP belongs to an ISP where thousands " "of users, including you, are connected to." msgstr "" -"Pokud to považujete za nutné, použijte další možnosti zabezpečení - %" -"somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " +"Pokud to považujete za nutné, použijte další možnosti zabezpečení - " +"%somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " "založené na IP adresách nemusí být spolehlivé, pokud je vaše IP adresa " "dynamicky přidělována poskytovatelem spolu s mnoha dalšími uživateli." hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1649-g5726580
by Michal Čihař 02 Dec '10

02 Dec '10

The branch, master has been updated via 57265808b8e639bb06506851a74e3474521ccb70 (commit) via 89f03ef81b9705a15e3a173a316130e2acf9c4bb (commit) via 219f5a4fb913a5f748a0d871e751a0609dea5c17 (commit) via a480379baeddef4a7af43adc1504760179188164 (commit) from f60afa01e40fe259a1745adad26dda3bcef81ac0 (commit) - Log ----------------------------------------------------------------- commit 57265808b8e639bb06506851a74e3474521ccb70 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Dec 2 17:20:09 2010 +0100 Do not fail if transformations are not enabled for this table, but request asks to enable them. commit 89f03ef81b9705a15e3a173a316130e2acf9c4bb Author: Michal Čihař <michal(a)cihar.com> Date: Thu Dec 2 17:14:59 2010 +0100 bug #3123433 [interface] Avoid double escaping of MySQL errors. The PMA_DBI_getError function already does escaping, so there is no need to escape that string again on displaying. commit 219f5a4fb913a5f748a0d871e751a0609dea5c17 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Dec 2 17:06:05 2010 +0100 Whitespace cleanup. commit a480379baeddef4a7af43adc1504760179188164 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Dec 2 17:05:57 2010 +0100 Remove not used variable. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/common.lib.php | 9 +++------ sql.php | 24 ++++++++++++++---------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c791ac..5a44159 100644 --- a/ChangeLog +++ b/ChangeLog @@ -123,6 +123,7 @@ - bug #3115519 [interface] Prevent long queries from being shown in confirmation popup - patch #3112792 [navi] Left panel table grouping incorrect, thanks to garas - garas +- bug #3123433 [interface] Avoid double escaping of MySQL errors. 3.3.9.0 (not yet released) - bug [doc] Fix references to MySQL doc diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 4b194de..ca99014 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -616,10 +616,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', .' </p>' . "\n"; } // end if - $tmp_mysql_error = ''; // for saving the original $error_message if (!empty($error_message)) { - $tmp_mysql_error = strtolower($error_message); // save the original $error_message - $error_message = htmlspecialchars($error_message); $error_message = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $error_message); } // modified to show the help on error-returns @@ -2992,10 +2989,10 @@ function PMA_selectUploadFile($import_list, $uploaddir) { } /** - * Build titles and icons for action links + * Build titles and icons for action links * - * @return array the action titles - * @uses PMA_getIcon() + * @return array the action titles + * @uses PMA_getIcon() */ function PMA_buildActionTitles() { $titles = array(); diff --git a/sql.php b/sql.php index 351fb20..27a6c72 100644 --- a/sql.php +++ b/sql.php @@ -377,12 +377,12 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { $table = ''; } $active_page = $goto; - $message = PMA_Message::rawError(htmlspecialchars($error)); + $message = PMA_Message::rawError($error); if( $GLOBALS['is_ajax_request'] == true) { PMA_ajaxResponse($message, false); } - + /** * Go to target path. */ @@ -391,7 +391,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { /** * HTML header. */ - + if($GLOBALS['is_ajax_request'] != true) { require_once './libraries/header.inc.php'; } @@ -545,7 +545,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { require_once './libraries/relation_cleanup.lib.php'; PMA_relationsCleanupColumn($db, $table, $dropped_column); - } // end if column was dropped + } // end if column was dropped } // end else "didn't ask to see php code" // No rows returned -> move back to the calling page @@ -600,7 +600,7 @@ if (0 == $num_rows || $is_affected) { $message->addMessage($_querytime); $message->addMessage(')'); } - + if( $GLOBALS['is_ajax_request'] == true) { /** @@ -643,6 +643,10 @@ if (0 == $num_rows || $is_affected) { //if some posted fields need to be transformed, generate them here. $mime_map = PMA_getMIME($db, $table); + if ($mime_map === FALSE) { + $mime_map = array(); + } + $edited_values = array(); parse_str($_REQUEST['transform_fields_list'], $edited_values); @@ -680,7 +684,7 @@ if (0 == $num_rows || $is_affected) { if (isset($GLOBALS['reload']) && $GLOBALS['reload'] == 1) { $extra_data['reload'] = 1; $extra_data['db'] = $GLOBALS['db']; - } + } PMA_ajaxResponse($message, $message->isSuccess(), (isset($extra_data) ? $extra_data : '')); } @@ -691,7 +695,7 @@ if (0 == $num_rows || $is_affected) { if (isset($_REQUEST['purge'])) { $table = ''; unset($url_params['table']); - } + } include 'libraries/db_table_exists.lib.php'; if (strpos($goto, 'tbl_') === 0 && ! $is_table) { @@ -745,7 +749,7 @@ else { $GLOBALS['js_include'][] = 'sql.js'; unset($message); - + if( $GLOBALS['is_ajax_request'] != true) { if (strlen($table)) { require './libraries/tbl_common.php'; @@ -776,7 +780,7 @@ else { $fields_meta = PMA_DBI_get_fields_meta($result); $fields_cnt = count($fields_meta); } - + if( $GLOBALS['is_ajax_request'] != true ) { //begin the sqlqueryresults div here. container div echo '<div id="sqlqueryresults">'; @@ -786,7 +790,7 @@ else { if (isset($disp_query) && $cfg['ShowSQL'] == true) { PMA_showMessage($disp_message, $disp_query, 'success'); } - + if (isset($profiling_results)) { PMA_profilingResults($profiling_results, true); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1645-gf60afa0
by Michal Čihař 02 Dec '10

02 Dec '10

The branch, master has been updated via f60afa01e40fe259a1745adad26dda3bcef81ac0 (commit) via fd9187e8cc31b08c69d1c356dd4e2cced7a69694 (commit) from 267c8fe7353c10d7a308274cf69853b6bcc58ecf (commit) - Log ----------------------------------------------------------------- commit f60afa01e40fe259a1745adad26dda3bcef81ac0 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Dec 2 16:53:00 2010 +0100 Upload .tar.xz files as well commit fd9187e8cc31b08c69d1c356dd4e2cced7a69694 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Dec 2 16:52:45 2010 +0100 Enable generating of tar.xz ----------------------------------------------------------------------- Summary of changes: scripts/create-release.sh | 2 +- scripts/upload-release | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 8e1ca23..3e7c2c1 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -12,7 +12,7 @@ set -u set -e KITS="all-languages english" -COMPRESSIONS="zip-7z tbz tgz 7z" +COMPRESSIONS="zip-7z tbz txz tgz 7z" if [ $# -lt 2 ] then diff --git a/scripts/upload-release b/scripts/upload-release index 3fbaf5c..243281f 100755 --- a/scripts/upload-release +++ b/scripts/upload-release @@ -21,6 +21,8 @@ mkdir $REL cd $REL put phpMyAdmin-$REL-all-languages.tar.bz2 put phpMyAdmin-$REL-english.tar.bz2 +put phpMyAdmin-$REL-all-languages.tar.xz +put phpMyAdmin-$REL-english.tar.xz put phpMyAdmin-$REL-all-languages.tar.gz put phpMyAdmin-$REL-english.tar.gz put phpMyAdmin-$REL-all-languages.zip hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 5be088e904b8a768dd8fe4add3614c0f61190b4d
by Michal Čihař 02 Dec '10

02 Dec '10

The branch, master has been updated via 5be088e904b8a768dd8fe4add3614c0f61190b4d (commit) from eba8989fad267c75cf0921aab77bbb038dca3fc2 (commit) - Log ----------------------------------------------------------------- commit 5be088e904b8a768dd8fe4add3614c0f61190b4d Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Dec 2 16:41:54 2010 +0100 Do not filter out .xz. ----------------------------------------------------------------------- Summary of changes: render.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/render.py b/render.py index 9767d60..ae59587 100755 --- a/render.py +++ b/render.py @@ -382,7 +382,7 @@ class SFGenerator: if type != 'phpMyAdmin': continue path, ext = os.path.splitext(title) - if ext not in ['.html', '.txt', '.7z', '.gz', '.bz2', '.zip']: + if ext not in ['.html', '.txt', '.7z', '.gz', '.bz2', '.xz', '.zip']: continue release, file = self.dom2release(entry) if release is None: @@ -507,7 +507,7 @@ class SFGenerator: if type != 'themes': continue path, ext = os.path.splitext(title) - if ext not in ['.html', '.txt', '.7z', '.gz', '.bz2', '.zip']: + if ext not in ['.html', '.txt', '.7z', '.gz', '.bz2', '.xz', '.zip']: continue name = titleparts[1] version = titleparts[2] hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1643-g267c8fe
by Michal Čihař 02 Dec '10

02 Dec '10

The branch, master has been updated via 267c8fe7353c10d7a308274cf69853b6bcc58ecf (commit) from 8017a61253157ef618fe9d15900e64f0c1cc2d25 (commit) - Log ----------------------------------------------------------------- commit 267c8fe7353c10d7a308274cf69853b6bcc58ecf Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Dec 2 16:40:35 2010 +0100 Preprare for xz support. ----------------------------------------------------------------------- Summary of changes: scripts/create-release.sh | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 098ded4..8e1ca23 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -163,13 +163,17 @@ for kit in $KITS ; do # Prepare distributions for comp in $COMPRESSIONS ; do case $comp in - tbz|tgz) + tbz|tgz|txz) echo "* Creating $name.tar" tar cf $name.tar $name if [ $comp = tbz ] ; then echo "* Creating $name.tar.bz2" bzip2 -9k $name.tar fi + if [ $comp = txz ] ; then + echo "* Creating $name.tar.xz" + xz -9k $name.tar + fi if [ $comp = tgz ] ; then echo "* Creating $name.tar.gz" gzip -9c $name.tar > $name.tar.gz hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1642-g8017a61
by Herman van Rink 02 Dec '10

02 Dec '10

The branch, master has been updated via 8017a61253157ef618fe9d15900e64f0c1cc2d25 (commit) from 2081a44d23014f71e70b0e292094e67657621a6f (commit) - Log ----------------------------------------------------------------- commit 8017a61253157ef618fe9d15900e64f0c1cc2d25 Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Dec 2 16:31:49 2010 +0100 patch #3055886 [config] update, changed boolean to integer for more precise control ----------------------------------------------------------------------- Summary of changes: Documentation.html | 8 +++++--- libraries/config.default.php | 5 +++-- libraries/config/messages.inc.php | 2 +- libraries/config/setup.forms.php | 2 +- libraries/config/user_preferences.forms.php | 2 +- navigation.php | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Documentation.html b/Documentation.html index 2b57c7f..5669be5 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1485,10 +1485,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> or in a new one (<tt>new</tt>). Note: use <tt>new</tt> if you are linking to <tt>phpmyadmin.net</tt>.</dd> - <dt id="cfg_LeftDisplayTableFilter">$cfg['LeftDisplayTableFilter'] boolean</dt> - <dd>Defines whether or not to display a JavaScript filter box above the + <dt id="cfg_LeftDisplayTableFilterMinimum">$cfg['LeftDisplayTableFilterMinimum'] + integer</dt> + <dd>Defines the minimum number of tables to display a JavaScript filter box above the list of tables in the left frame. - Defaults to <tt>TRUE</tt>.</dd> + Defaults to <tt>30</tt>. To disable the filter completely some high number + can he used (e.g. 9999)</dd> <dt id="cfg_LeftDisplayServers">$cfg['LeftDisplayServers'] boolean</dt> <dd>Defines whether or not to display a server choice at the top of the left frame. diff --git a/libraries/config.default.php b/libraries/config.default.php index cc23cee..028c14b 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -775,10 +775,11 @@ $cfg['LeftLogoLinkWindow'] = 'main'; /** * display a JavaScript table filter in the left frame + * when more then x tables are present * - * @global boolean $cfg['LeftDisplayTableFilter'] + * @global boolean $cfg['LeftDisplayTableFilterMinimum'] */ -$cfg['LeftDisplayTableFilter'] = true; +$cfg['LeftDisplayTableFilterMinimum'] = 30; /** * display server choice at top of left frame diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 6f6a8ed..6f31207 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -264,7 +264,7 @@ $strConfigLeftDisplayLogo_desc = __('Show logo in left frame'); $strConfigLeftDisplayLogo_name = __('Display logo'); $strConfigLeftDisplayServers_desc = __('Display server choice at the top of the left frame'); $strConfigLeftDisplayServers_name = __('Display servers selection'); -$strConfigLeftDisplayTableFilter_name = __('Display table filter'); +$strConfigLeftDisplayTableFilterMinimum_name = __('Mimimum number of tables to display table filter'); $strConfigLeftFrameDBSeparator_desc = __('String that separates databases into different tree levels'); $strConfigLeftFrameDBSeparator_name = __('Database tree separator'); $strConfigLeftFrameDBTree_desc = __('Only light version; display databases in a tree (determined by the separator defined below)'); diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index ab654bd..79c8bb7 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -170,7 +170,7 @@ $forms['Left_frame']['Left_databases'] = array( 'LeftFrameDBSeparator', 'ShowTooltipAliasDB'); $forms['Left_frame']['Left_tables'] = array( - 'LeftDisplayTableFilter', + 'LeftDisplayTableFilterMinimum', 'LeftDefaultTabTable', 'LeftFrameTableSeparator', 'LeftFrameTableLevel', diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php index cd9e673..a027007 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -82,7 +82,7 @@ $forms['Left_frame']['Left_databases'] = array( 'LeftFrameDBSeparator', 'ShowTooltipAliasDB'); $forms['Left_frame']['Left_tables'] = array( - 'LeftDisplayTableFilter', + 'LeftDisplayTableFilterMinimum', 'LeftDefaultTabTable', 'LeftFrameTableSeparator', 'LeftFrameTableLevel', diff --git a/navigation.php b/navigation.php index 7991283..d312a0c 100644 --- a/navigation.php +++ b/navigation.php @@ -286,7 +286,7 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { $db_tooltip = $GLOBALS['db']; } - if ($table_count && $GLOBALS['cfg']['LeftDisplayTableFilter']) { + if ($table_count >= $GLOBALS['cfg']['LeftDisplayTableFilterMinimum']) { ?> <span id="NavFilter"> <input type="text" name="fast_filter" id="fast_filter" title="<?php echo __('Filter'); ?>" value="<?php echo __('filter tables by name'); ?>" /> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1641-g2081a44
by Michal Čihař 02 Dec '10

02 Dec '10

The branch, master has been updated via 2081a44d23014f71e70b0e292094e67657621a6f (commit) via 33ae46a5c67ff82e0759096c028f2adbcc1e4c01 (commit) via a0eb56f2abe1b4998bffc3aeaeae5ea59ec051fe (commit) via bfedb32f53398dc0402fc6d302035f603a842a89 (commit) via 651882570bec65b786dbcbb928461c296e41f2c4 (commit) from c71547ea3530c301d055e2c7652be3d6b7a91922 (commit) - Log ----------------------------------------------------------------- commit 2081a44d23014f71e70b0e292094e67657621a6f Merge: 33ae46a5c67ff82e0759096c028f2adbcc1e4c01 c71547ea3530c301d055e2c7652be3d6b7a91922 Author: Pootle server <pootle(a)cihar.com> Date: Thu Dec 2 14:40:25 2010 +0100 Merge remote branch 'origin/master' commit 33ae46a5c67ff82e0759096c028f2adbcc1e4c01 Author: Sasa Kostic <sasha.kostic(a)gmail.com> Date: Thu Dec 2 14:49:36 2010 +0200 Translation update done using Pootle. commit a0eb56f2abe1b4998bffc3aeaeae5ea59ec051fe Author: Sasa Kostic <sasha.kostic(a)gmail.com> Date: Thu Dec 2 14:49:27 2010 +0200 Translation update done using Pootle. commit bfedb32f53398dc0402fc6d302035f603a842a89 Author: Sasa Kostic <sasha.kostic(a)gmail.com> Date: Thu Dec 2 14:48:57 2010 +0200 Translation update done using Pootle. commit 651882570bec65b786dbcbb928461c296e41f2c4 Author: Sasa Kostic <sasha.kostic(a)gmail.com> Date: Thu Dec 2 14:47:50 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/sr(a)latin.po | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index 7996eb3..f23e303 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-30 12:47-0500\n" -"PO-Revision-Date: 2010-12-02 14:46+0200\n" +"PO-Revision-Date: 2010-12-02 14:49+0200\n" "Last-Translator: Sasa Kostic <sasha.kostic(a)gmail.com>\n" "Language-Team: serbian_latin <sr@latin@li.org>\n" "Language: sr@latin\n" @@ -478,16 +478,14 @@ msgid "Modify" msgstr "Promeni" #: db_qbe.php:603 -#, fuzzy #| msgid "Add/Delete Criteria Row" msgid "Add/Delete criteria rows" -msgstr "Dodaj/obriši polje za kriterijum" +msgstr "Dodaj/obriši kriterijum za polja" #: db_qbe.php:615 -#, fuzzy #| msgid "Add/Delete Field Columns" msgid "Add/Delete columns" -msgstr "Dodaj/obriši kolonu" +msgstr "Dodaj/obriši kolone" #: db_qbe.php:628 db_qbe.php:653 msgid "Update Query" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1636-gc71547e
by Michal Čihař 02 Dec '10

02 Dec '10

The branch, master has been updated via c71547ea3530c301d055e2c7652be3d6b7a91922 (commit) via 4434bb8b1176267c6d5f3234ca635b07f83d1317 (commit) via 30f4e8ca1ef4dd7327c4101f4275566999540f02 (commit) via 3a4e2c3a05bee2bf12d7f1828498220ed9796971 (commit) via fef83de8aaa2099e90a03082de111d46d1a3946a (commit) via 988f16ec726457324ed75ab44c7753b3ef0e8afc (commit) via d93b967f697e8e8465a69316c9befe3a30afed55 (commit) via c5b87277e310d51d114d2aedd8654097f92102a8 (commit) from a93399b8a43cec0eb4b25d4a7b759a32a9350a1e (commit) - Log ----------------------------------------------------------------- commit c71547ea3530c301d055e2c7652be3d6b7a91922 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Dec 2 13:48:29 2010 +0100 Fix format string. commit 4434bb8b1176267c6d5f3234ca635b07f83d1317 Merge: a93399b8a43cec0eb4b25d4a7b759a32a9350a1e 30f4e8ca1ef4dd7327c4101f4275566999540f02 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Dec 2 13:48:03 2010 +0100 Merge remote branch 'pootle/master' commit 30f4e8ca1ef4dd7327c4101f4275566999540f02 Author: Sasa Kostic <sasha.kostic(a)gmail.com> Date: Thu Dec 2 14:46:21 2010 +0200 Translation update done using Pootle. commit 3a4e2c3a05bee2bf12d7f1828498220ed9796971 Author: Sasa Kostic <sasha.kostic(a)gmail.com> Date: Thu Dec 2 14:40:06 2010 +0200 Translation update done using Pootle. commit fef83de8aaa2099e90a03082de111d46d1a3946a Author: Sasa Kostic <sasha.kostic(a)gmail.com> Date: Thu Dec 2 14:38:06 2010 +0200 Translation update done using Pootle. commit 988f16ec726457324ed75ab44c7753b3ef0e8afc Author: Sasa Kostic <sasha.kostic(a)gmail.com> Date: Thu Dec 2 14:37:11 2010 +0200 Translation update done using Pootle. commit d93b967f697e8e8465a69316c9befe3a30afed55 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 1 19:12:40 2010 +0200 Translation update done using Pootle. commit c5b87277e310d51d114d2aedd8654097f92102a8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 1 19:12:13 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/sr(a)latin.po | 79 +++++-------------------------------------------------- po/tr.po | 11 +++---- 2 files changed, 13 insertions(+), 77 deletions(-) diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index ff0ea62..7996eb3 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-30 12:47-0500\n" -"PO-Revision-Date: 2010-08-30 19:31+0200\n" -"Last-Translator: Vladimir Tošić <vtosic(a)gmail.com>\n" +"PO-Revision-Date: 2010-12-02 14:46+0200\n" +"Last-Translator: Sasa Kostic <sasha.kostic(a)gmail.com>\n" "Language-Team: serbian_latin <sr@latin@li.org>\n" +"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sr@latin\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.5\n" @@ -110,9 +110,9 @@ msgid "Failed to open remote URL" msgstr "Neuspelo otvaranje udaljene URL adrese" #: db_create.php:58 -#, fuzzy, php-format +#, php-format msgid "Database %1$s has been created." -msgstr "Baza %s je odbačena." +msgstr "Baza %1$s je kreirana." #: db_datadict.php:48 db_operations.php:360 msgid "Database comment: " @@ -133,10 +133,9 @@ msgstr "Komentari tabele" #: tbl_change.php:300 tbl_indexes.php:187 tbl_printview.php:139 #: tbl_relation.php:399 tbl_select.php:132 tbl_structure.php:197 #: tbl_tracking.php:267 tbl_tracking.php:318 -#, fuzzy #| msgid "Column names" msgid "Column" -msgstr "Imena kolona" +msgstr "Kolona" #: db_datadict.php:170 db_printview.php:104 libraries/Index.class.php:442 #: libraries/db_events.inc.php:25 libraries/db_routines.inc.php:36 @@ -401,12 +400,12 @@ msgid "Last check" msgstr "Poslednja provera" #: db_printview.php:220 db_structure.php:432 -#, fuzzy, php-format +#, php-format #| msgid "%s table(s)" msgid "%s table" msgid_plural "%s tables" msgstr[0] "%s tabela" -msgstr[1] "%s tabela" +msgstr[1] "%s tabele" msgstr[2] "%s tabela" #: db_qbe.php:25 import.php:452 libraries/Message.class.php:190 @@ -9979,65 +9978,3 @@ msgstr "Promeni ime tabele u " #~ msgid "No tables" #~ msgstr "Nema tabela" - -#, fuzzy -#~| msgid "CSV" -#~ msgid "SVG" -#~ msgstr "CSV" - -#, fuzzy -#~| msgid "" -#~| "Please enter the values for transformation options using this format: " -#~| "'a', 100, b,'c'...<br />If you ever need to put a backslash (\"\\\") or " -#~| "a single quote (\"'\") amongst those values, precede it with a backslash " -#~| "(for example '\\\\xyz' or 'a\\'b')." -#~ msgid "" -#~ "Enter each value in a separate field, enclosed in single quotes. If you " -#~ "ever need to put a backslash (\"\\\") or a single quote (\"'\") amongst " -#~ "those values, precede it with a backslash (for example '\\\\xyz' or 'a" -#~ "\\'b')." -#~ msgstr "" -#~ "Molimo unesite vrednosti za opcije transformacije koristeći ovaj oblik: " -#~ "'a', 100, b,'c'...<br />Ako treba da unesete obrnutu kosu crtu (\"\\\") " -#~ "ili apostrof (\"'\") u te vrednosti, stavite obrnutu kosu crtu ispred " -#~ "njih (na primer '\\\\xyz' ili 'a\\'b')." - -#, fuzzy -#~| msgid "" -#~| "Please enter the values for transformation options using this format: " -#~| "'a', 100, b,'c'...<br />If you ever need to put a backslash (\"\\\") or " -#~| "a single quote (\"'\") amongst those values, precede it with a backslash " -#~| "(for example '\\\\xyz' or 'a\\'b')." -#~ msgid "" -#~ "Enter each value in a separate field. If you ever need to put a backslash " -#~ "(\"\\\") or a single quote (\"'\") amongst those values, precede it with " -#~ "a backslash (for example '\\\\xyz' or 'a\\'b')." -#~ msgstr "" -#~ "Molimo unesite vrednosti za opcije transformacije koristeći ovaj oblik: " -#~ "'a', 100, b,'c'...<br />Ako treba da unesete obrnutu kosu crtu (\"\\\") " -#~ "ili apostrof (\"'\") u te vrednosti, stavite obrnutu kosu crtu ispred " -#~ "njih (na primer '\\\\xyz' ili 'a\\'b')." - -#, fuzzy -#~ msgid "New table" -#~ msgstr "Nema tabela" - -#~ msgid "server name" -#~ msgstr "naziv servera" - -#~ msgid "database name" -#~ msgstr "naziv baze" - -#~ msgid "Edit PDF Pages" -#~ msgstr "Uređivanje PDF strana" - -#~ msgid "Data Dictionary Format" -#~ msgstr "Format rečnika podataka" - -#, fuzzy -#~ msgid "PMA database" -#~ msgstr "Baza ne postoji" - -#, fuzzy -#~ msgid "yes" -#~ msgstr "Da" diff --git a/po/tr.po b/po/tr.po index 66c29ee..85a3042 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-30 12:47-0500\n" -"PO-Revision-Date: 2010-11-27 10:24+0200\n" +"PO-Revision-Date: 2010-12-01 19:12+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tr\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.5\n" @@ -544,10 +544,10 @@ msgid "Delete" msgstr "Sil" #: db_search.php:260 -#, fuzzy, php-format +#, php-format #| msgid "Delete tracking data for this table" msgid "Delete the matches for the %s table?" -msgstr "Bu tabloyu izleme verisini sil" +msgstr "%s tablosu için benzeşenler silinsin mi?" #: db_search.php:273 #, php-format @@ -6891,10 +6891,9 @@ msgid "Filter" msgstr "Süzgeç" #: navigation.php:292 -#, fuzzy #| msgid "table name" msgid "filter tables by name" -msgstr "tablo adı" +msgstr "tabloları ada göre süz" #: navigation.php:293 setup/frames/index.inc.php:219 msgid "Clear" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1628-ga93399b
by Marc Delisle 02 Dec '10

02 Dec '10

The branch, master has been updated via a93399b8a43cec0eb4b25d4a7b759a32a9350a1e (commit) from 40c48e0853c1188584962cc2acfca94968d0e9ac (commit) - Log ----------------------------------------------------------------- commit a93399b8a43cec0eb4b25d4a7b759a32a9350a1e Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 2 07:37:12 2010 -0500 the goal of master is currently to stabilize 3.4.0 ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 -- Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9e81a8..2c791ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,6 @@ phpMyAdmin - ChangeLog ====================== -3.5.0.0 (not yet released) - 3.4.0.0 (not yet released) + rfe #2890226 [view] Enable VIEW rename + rfe #838637 [privileges] Export a user's privileges diff --git a/Documentation.html b/Documentation.html index 3479ad2..2b57c7f 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,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.5.0-dev - Documentation</title> + <title>phpMyAdmin 3.4.0-alpha3-dev - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,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.5.0-dev + 3.4.0-alpha3-dev Documentation </h1> </div> diff --git a/README b/README index fccd68b..95f1741 100644 --- a/README +++ b/README @@ -3,8 +3,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. -Version 3.5.0-dev ------------------ +Version 3.4.0-alpha3-dev +------------------------ http://www.phpmyadmin.net/ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 4c2f281..a024a4d 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.5.0-dev'); + $this->set('PMA_VERSION', '3.4.0-alpha3-dev'); /** * @deprecated */ diff --git a/translators.html b/translators.html index c2ba840..47f23c7 100644 --- a/translators.html +++ b/translators.html @@ -10,7 +10,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.5.0-dev - Official translators</title> + <title>phpMyAdmin 3.4.0-alpha3-dev - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.5.0-dev + 3.4.0-alpha3-dev official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, deleted. RELEASE_3_4_0ALPHA2-47-gb1476d9
by Marc Delisle 02 Dec '10

02 Dec '10

The branch, MAINT_3_4_0 has been deleted was b1476d9d2c6c1e190a2385fce05d04c5403690ea ----------------------------------------------------------------------- b1476d9d2c6c1e190a2385fce05d04c5403690ea Translation update done using Pootle. ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0