From f0d29d9134193be7fe708b6a2f54f80eeb9e77bf Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Tue, 3 May 2016 15:55:16 +0200
Subject: cherry-pick 50 commits from translation

git log --reverse --oneline  translation ^master --pretty=format:"git cherry-pick --no-commit %H" a452994..c7465d6 | bash
---
 language/tr_TR/help/photos_add_ftp.html | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'language/tr_TR/help/photos_add_ftp.html')

diff --git a/language/tr_TR/help/photos_add_ftp.html b/language/tr_TR/help/photos_add_ftp.html
index fdb96cdd8..78048e564 100755
--- a/language/tr_TR/help/photos_add_ftp.html
+++ b/language/tr_TR/help/photos_add_ftp.html
@@ -41,11 +41,20 @@ galleries
     |-- video-from-plane.avi
     +-- pwg_representative
         +-- video-from-plane.jpg
++-- photoshoot
+    |-- img0001.jpg
+    |-- img0002.jpg
+    +-- pwg_format
+        |-- img0001.cr2
+        |-- img0001.cmyk.jpg
+        |-- img0001.zip
+        |-- img0002.cr2
+        +-- img0002.cmyk.jpg
 </pre>
 
   </li>
 
-  <li>Except for "pwg_representative" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.</li>
+  <li>Except for "pwg_representative" and "pwg_format" (see explanations below), each directory under "galleries" produces a album. There is no limit on deepness.</li>
 
   <li>Basically, an element is represented by a file. A file can be a
   Piwigo element if its extension is among <code>file_ext</code>
@@ -54,10 +63,12 @@ galleries
   be a picture if its extension is among <code>picture_ext</code>
   configuration parameter possibilities.</li>
 
-  <li>No photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename
+  <li>Non photo elements (video, sounds, file texts, whatever you want...) are represented by default by an icon corresponding to the filename
   extension. Optionally, you can associate a thumbnail and a representative
   file (see video.avi in the example above).</li>
 
+  <li>Multiple formats: a photo can be available in several formats. In this example, we have 3 additional formats for img0001.jpg. You can activate this feature with <code>$conf['enable_formats'] = true;</code> in your local configuration and define a list of formats, like <code>$conf['format_ext'] = array('cmyk.jpg', 'cr2', 'zip');</code></li>
+
   <li><em>Warning</em>: the name of directories and files must contain only letters, figures, "-", "_" or ".". No blank space, nor accentuated characters.</li>
 
   <li>Once photos are correctly placed in the
@@ -65,4 +76,4 @@ galleries
   Synchronize</span></li>
 
 </ul>
-</fieldset>
\ No newline at end of file
+</fieldset>
-- 
cgit v1.2.3