Merge branch 'MAINT_3_5_0' into QA_3_5

phpmyadmin · Apr 5, 2012 · e5466df · e5466df
2 parents 4ff9123 + 047c418
commit e5466df
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -86,7 +86,6 @@ phpMyAdmin - ChangeLog
 3.4.11.0 (not yet released)
 - bug #3486970 [import] Exception on XML import
 - bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names in navigation
-- bug #3512565 [navi] Fixed missing word "Rows" in table list tooltip after click
 
 3.4.10.2 (2012-03-28)
 - [security] Fixed local path disclosure vulnerability, see PMASA-2012-2

diff --git a/libraries/Table.class.php b/libraries/Table.class.php
@@ -288,7 +288,7 @@ static public function isMerge($db = null, $table = null)
     static public function sGetToolTip($db, $table)
     {
         return PMA_Table::sGetStatusInfo($db, $table, 'Comment')
-            . ' (' . PMA_Table::countRecords($db, $table) . ' ' . __('Rows') . ')';
+            . ' (' . PMA_Table::countRecords($db, $table) . ')';
     }
 
     /**

diff --git a/po/it.po b/po/it.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-rc2\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-03-29 10:07+0200\n"
-"PO-Revision-Date: 2012-03-23 15:39+0200\n"
+"PO-Revision-Date: 2012-04-04 14:40+0200\n"
 "Last-Translator: Rouslan Placella <rouslan@placella.com>\n"
 "Language-Team: italian <it@li.org>\n"
 "Language: it\n"
@@ -12691,6 +12691,13 @@ msgid ""
 "scans. Other than that full index scans can only be reduced by rewriting "
 "queries."
 msgstr ""
+"Questo indica solitamente frequenti scansioni complete dell'indice. "
+"Scansioni complete dell'indice sono più veloci delle scansioni di tabella, "
+"ma richiedono molto utilizzo della CPU in grandi tabelle, se tali tabelle "
+"hanno o hanno avuto un volume elevato di UPDATE e DELETE query, l'esecuzione "
+"di 'OPTIMIZE TABLE' potrebbe ridurre la quantità delle e/o velocizzare le "
+"scansioni complete dell'indice. Oltre a questo scansioni complete "
+"dell'indice possono essere ridotte solo riscrivendo le query."
 
 #: po/advisory_rules.php:133
 #, php-format

diff --git a/po/tr.po b/po/tr.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-rc2\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-03-29 10:07+0200\n"
-"PO-Revision-Date: 2012-04-03 18:33+0200\n"
+"PO-Revision-Date: 2012-04-04 19:57+0200\n"
 "Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
 "Language-Team: turkish <tr@li.org>\n"
 "Language: tr\n"
@@ -3546,7 +3546,7 @@ msgstr "İlk satır içine sütun adlarını koy"
 #: libraries/config/messages.inc.php:250 libraries/import/csv.php:76
 #: libraries/import/ldi.php:42
 msgid "Columns enclosed by"
-msgstr "Sütunu kapsayan:"
+msgstr "Sütunu kapatan:"
 
 #: libraries/config/messages.inc.php:78 libraries/config/messages.inc.php:244
 #: libraries/config/messages.inc.php:251 libraries/import/csv.php:81