Merge remote-tracking branch 'origin/QA_3_4' into QA_3_5

This commit is contained in:
Michal Čihař 2012-02-07 17:18:05 +01:00
commit 9ef7ad779b

View File

@ -4517,7 +4517,7 @@ chmod o+rwx tmp
Documentation is being translated using po4a and gettext (see
<a href="http://www.phpmyadmin.net/home_page/docs.php">documentation</a>
for existing translations). To start, checkout
<a href="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/localized_docs;a=tree;f=po"><code>localized_docs/po</code></a>
<a href="http://github.com/phpmyadmin/localized_docs/tree/master/po"><code>localized_docs/po</code></a>
from Git, or just go to the <a href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>
and translate it online. If your language is missing, just contact
<a href="mailto:michal@cihar.com">Michal &#268;iha&#345;</a>; he will add it. If
@ -4532,8 +4532,7 @@ chmod o+rwx tmp
<p> The following method is preferred for new developers:</p>
<ol><li>fetch the current git repository over anonymous git:<br />
<tt>git clone
git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin</tt><br />
<tt>git clone git://github.com/phpmyadmin/phpmyadmin.git</tt><br />
</li>
<li>add your stuff</li>
<li>generate patch with your changes: