merge r6361 from branch 2.1 to trunk

feature 1697: ability to deactivate the synchronization method to add photos.


git-svn-id: http://piwigo.org/svn/trunk@6365 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2010-05-26 00:20:07 +00:00
commit 5f597c2cba
24 changed files with 100 additions and 34 deletions

View file

@ -12,8 +12,10 @@
<p class="nextStepLink"><a href="admin.php?page=photos_add&section=ploader">使用 pLoader</a></p>
<div id="helpSynchro">
<ul>
<li><strong>FTP 上传</strong> 是非常推荐的方法,其可以一次性上传大批量的相片。以下向导将教您如何准备您的相片。使用 FTP 方式,您可以很精确地控制您服务器上的相片目录的物理结构。</li>
</ul>
<p class="nextStepLink"><a href="admin.php?page=photos_add&section=ftp">使用 FTP</a></p>
<p class="nextStepLink"><a href="admin.php?page=photos_add&section=ftp">使用 FTP</a></p>
</div>