nettika/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-03-29 10:40:15 +02:00
parent 59c0ecd889 fecfe761f9
commit a47d29221c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation.html
View File

@@ -4315,7 +4315,7 @@ chmod o+rwx tmp
<h4 id="faq6_29"> <h4 id="faq6_29">
<a href="#faq6_29">6.29 Why can't I get a chart from my query result table?</a></h4> <a href="#faq6_29">6.29 Why can't I get a chart from my query result table?</a></h4>
<p> Not every table can be put to the chart. Only tables with one, two or three columns can be visualised as a chart. Moreover the table must be in a special format for chart script to understand it. Currently supported formats can be found in the <a href="http://wiki.phpmyadmin.net/pma/Devel:Charts#Data_formats_for_query_results_chart">wiki</a>.</p> <p> Not every table can be put to the chart. Only tables with one, two or three columns can be visualised as a chart. Moreover the table must be in a special format for chart script to understand it. Currently supported formats can be found in the <a href="http://wiki.phpmyadmin.net/pma/Charts#Data_formats_for_query_results_chart">wiki</a>.</p>
<h3 id="faqproject">phpMyAdmin project</h3> <h3 id="faqproject">phpMyAdmin project</h3>
@@ -4343,7 +4343,7 @@ chmod o+rwx tmp
<code>po/LANG_CODE.po</code> for your language (you can use <code>po/LANG_CODE.po</code> for your language (you can use
<code>msginit -i po/phpmyadmin.pot -l LANG_CODE --no-translator -o po/LANG_CODE.po</code> <code>msginit -i po/phpmyadmin.pot -l LANG_CODE --no-translator -o po/LANG_CODE.po</code>
to do this) or ask on the mailing list to add the translation to the web to do this) or ask on the mailing list to add the translation to the web
interface. More details are available on <a href="http://wiki.phpmyadmin.net/pma/Devel:Gettext_for_translators">our wiki</a>. interface. More details are available on <a href="http://wiki.phpmyadmin.net/pma/Gettext_for_translators">our wiki</a>.
</p> </p>
<p> <p>
Please note that we try not to use HTML entities like &amp;eacute; in Please note that we try not to use HTML entities like &amp;eacute; in
@@ -4394,7 +4394,7 @@ chmod o+rwx tmp
</li> </li>
</ol> </ol>
<p>More details on git are available on <a href="http://wiki.phpmyadmin.net/pma/Devel:Git">our wiki</a>.</p> <p>More details on git are available on <a href="http://wiki.phpmyadmin.net/pma/Git">our wiki</a>.</p>
<p> Write access to the repository is granted only to experienced developers who <p> Write access to the repository is granted only to experienced developers who
have already contributed something useful to phpMyAdmin.<br /> have already contributed something useful to phpMyAdmin.<br />

4
libraries/import.lib.php
View File

@@ -773,7 +773,7 @@ function PMA_detectType($last_cumulative_type, &$cell) {
* Determines if the column types are int, decimal, or string * Determines if the column types are int, decimal, or string
* *
* *
* @link http://wiki.phpmyadmin.net/pma/Devel:Import * @link http://wiki.phpmyadmin.net/pma/Import
* *
* @todo Handle the error case more elegantly * @todo Handle the error case more elegantly
* *
@@ -881,7 +881,7 @@ $import_notice = NULL;
* as necessary, as well as insert all the data. * as necessary, as well as insert all the data.
* *
* *
* @link http://wiki.phpmyadmin.net/pma/Devel:Import * @link http://wiki.phpmyadmin.net/pma/Import
* *
* @access public * @access public
* *

2
scripts/create-release.sh
View File

@@ -4,7 +4,7 @@
# #
# More documentation about making a release is available at: # More documentation about making a release is available at:
# http://wiki.phpmyadmin.net/pma/Devel:Releasing # http://wiki.phpmyadmin.net/pma/Releasing
# Fail on undefined variables # Fail on undefined variables
set -u set -u