gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server 2011-11-07 16:40:09 +01:00
commit b7ab34aa03
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/import/ods.php
View File

@ -73,8 +73,7 @@ unset($buffer);
if ($xml === false) {
$sheets = array();
/* TODO: this message should be improved later, used existing because of string freeze */
$message = PMA_Message::error(__('Error in Processing Request'));
$message = PMA_Message::error(__('The XML file specified was either malformed or incomplete. Please correct the issue and try again.'));
$error = true;
} else {
$sheets = $xml->children('office', true)->{'body'}->{'spreadsheet'}->children('table', true);

2
themes/pmahomme/css/theme_right.css.php
View File

@ -67,7 +67,7 @@ h2 a img{display:inline;}
}
#table_results td.data {
border-right: 1px solid #444444;
border-right: 1px solid #BBBBBB;
}
h3 {