merge -c2923 from trunk to branch 2.0.

- Add a "Bound Template" column for template extensions.


git-svn-id: http://piwigo.org/svn/branches/2.0@2924 68402e56-0260-453c-a942-63ccdbb3a9ee

12 files changed, 26 insertions, 6 deletions

diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php
index 56cf48dc0..7a6a7849c 100644
--- a/language/de_DE/admin.lang.php
+++ b/language/de_DE/admin.lang.php
@@ -644,4 +644,5 @@ $lang['Note: Only deletes photos added with pLoader'] = 'Bitte beachten: Nur üb
 $lang['Delete selected photos'] = 'Fotos löschen';
 $lang['%d photo was deleted'] = '%d Foto wurde gelöscht';
 $lang['%d photos were deleted'] = '%d Fotos wurden gelöscht';
+/* TODO */ $lang['Bound template'] = 'Bound template';
 ?>
diff --git a/language/de_DE/help/extend_for_templates.html b/language/de_DE/help/extend_for_templates.html
index f0cb68bdb..c75842a0e 100644
--- a/language/de_DE/help/extend_for_templates.html
+++ b/language/de_DE/help/extend_for_templates.html
@@ -64,8 +64,10 @@ class="Dateiname">template-extension/my-extension/video.tpl</span>.</p>
 werden jeweils nur auf Seiten mit diesem Keyword. Zum Beispiel: <span 
 class="pwgScreen">index.php? /<strong> most_visited</strong></span></p>
   
-<p>Advanced-User nutzen werden Dauerlinks als <strong>optional URL
-   Keyword</strong>.</p>
+<p>Advanced-User nutzen werden Dauerlinks als <strong>optional URL Keyword</strong>.</p>
+
+<!-- TODO -->
+<p>If you select a <strong>Bound template</strong> then replacements will be operate only on this template.</p>
 
 <h3>Wie kann ich deaktivieren meine "replacers"?</h3>
 <ul>
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 9c45f1d63..276cb6111 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -644,4 +644,5 @@ $lang['Note: Only deletes photos added with pLoader'] = 'Note: Only deletes phot
 $lang['Delete selected photos'] = 'Delete selected photos';
 $lang['%d photo was deleted'] = '%d photo was deleted';
 $lang['%d photos were deleted'] = '%d photos were deleted';
+$lang['Bound template'] = 'Bound template';
 ?>
diff --git a/language/en_UK/help/extend_for_templates.html b/language/en_UK/help/extend_for_templates.html
index 8e2c7ac6b..dfe124615 100644
--- a/language/en_UK/help/extend_for_templates.html
+++ b/language/en_UK/help/extend_for_templates.html
@@ -64,8 +64,10 @@ class="filename">template-extension/my-extension/video.tpl</span>.</p>
 will be operate only on pages with this keyword. For example: <span
   class="pwgScreen">index.php?/<strong>most_visited</strong></span></p>
   
-<p>Advanced users will use permalinks as <strong>optional URL 
-  keyword</strong>. </p>
+<p>Advanced users will use permalinks as <strong>optional URL keyword</strong>. </p>
+
+<p>If you select a <strong>Bound template</strong> then replacements will be operate only on this template.</p>
+
 <h3>How can I deactivate my "replacers"?</h3>
 <ul>
 <li>Unselect related "Original templates".</li>
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index f6ac154de..660e6b1f6 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -641,4 +641,5 @@ $lang['Note: Only deletes photos added with pLoader'] = 'Nota: las únicas las f
 $lang['Delete selected photos'] = 'Suprimir las fotos';
 $lang['%d photo was deleted'] = '%d foto ha sido suprimida';
 $lang['%d photos were deleted'] = '%d fotos han sido suprimidas';
+/* TODO */ $lang['Bound template'] = 'Bound template';
 ?>
diff --git a/language/es_ES/help/extend_for_templates.html b/language/es_ES/help/extend_for_templates.html
index 54e306689..7cd4b7ff6 100644
--- a/language/es_ES/help/extend_for_templates.html
+++ b/language/es_ES/help/extend_for_templates.html
@@ -70,6 +70,9 @@ class="filename">template-extension/my-extension/video.tpl</span>.</p>
   
 <p>Los usuarios avanzados utilizarán el permalinks (permaliens, lazos permanentes) como strong> parámetro facultativo del URL </strong>. </p>
 
+<!-- TODO -->
+<p>If you select a <strong>Bound template</strong> then replacements will be operate only on this template.</p>
+
 <h3>¿ Cómo puedo desactivar mi "sustitutos"?</h3>
 <ul>
 <li>Deselectionner " template de origen ".</li>
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 6ef5eaf96..89417f588 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -643,4 +643,5 @@ $lang['Note: Only deletes photos added with pLoader'] = 'Note: seules les photos
 $lang['Delete selected photos'] = 'Supprimer les photos';
 $lang['%d photo was deleted'] = '%d photo a été supprimée';
 $lang['%d photos were deleted'] = '%d photos ont été supprimées';
+$lang['Bound template'] = 'Template rattaché';
 ?>
diff --git a/language/fr_FR/help/extend_for_templates.html b/language/fr_FR/help/extend_for_templates.html
index bbc8b4bf0..c173b3467 100644
--- a/language/fr_FR/help/extend_for_templates.html
+++ b/language/fr_FR/help/extend_for_templates.html
@@ -67,6 +67,8 @@ ne seront réalisés que sur les pages utilisant ce mot clé. Par exemple: <span
 <p>Les utilisateurs avancés utiliseront les permalinks (permaliens, liens permanents) en tant que 
 <strong>paramètre facultatif de l'URL</strong>. </p>
 
+<p>Si vous sélectionnez un <strong>Template rattaché</strong> alors les remplacements ne seront réalisés que sur ce template.</p>
+
 <h3>Comment puis-je désactiver mes "replacers"?</h3>
 <ul>
 <li>Déselectionner le "template d'origine".</li>
diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php
index c4e7f8c75..2ea0e92e8 100644
--- a/language/it_IT/admin.lang.php
+++ b/language/it_IT/admin.lang.php
@@ -643,4 +643,5 @@ $lang['Note: Only deletes photos added with pLoader'] = 'Nota: solo le foto agiu
 $lang['Delete selected photos'] = 'Cancellare le foto';

 $lang['%d photo was deleted'] = '%d foto cancellata';

 $lang['%d photos were deleted'] = '%d foto cancellate';

+/* TODO */ $lang['Bound template'] = 'Bound template';

 ?>

diff --git a/language/it_IT/help/extend_for_templates.html b/language/it_IT/help/extend_for_templates.html
index 71df2604b..38cde9ccb 100644
--- a/language/it_IT/help/extend_for_templates.html
+++ b/language/it_IT/help/extend_for_templates.html
@@ -65,6 +65,9 @@ unicamente sulle pagine con questa parola chiave. Per esempio: <span
   
 <p>Gli utenti esperti useranno i permalinks come <strong>parametro facoltativo del URL</strong>. </p>
 
+<!-- TODO -->
+<p>If you select a <strong>Bound template</strong> then replacements will be operate only on this template.</p>
+
 <h3>Come posso disattivare mio "rimpiazzante"?</h3>
 <ul>
 <li>Deselezzionare il "templete originale".</li>
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index 2f2f5e84f..b4856936d 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -639,4 +639,5 @@ $lang['edit category informations'] = 'bewerk categorie informatie';
 /* TODO */ $lang['Delete selected photos'] = 'Delete selected photos';
 /* TODO */ $lang['%d photo was deleted'] = '%d photo was deleted';
 /* TODO */ $lang['%d photos were deleted'] = '%d photos were deleted';
+/* TODO */ $lang['Bound template'] = 'Bound template';
 ?>
diff --git a/language/nl_NL/help/extend_for_templates.html b/language/nl_NL/help/extend_for_templates.html
index 8e2c7ac6b..dfe124615 100644
--- a/language/nl_NL/help/extend_for_templates.html
+++ b/language/nl_NL/help/extend_for_templates.html
@@ -64,8 +64,10 @@ class="filename">template-extension/my-extension/video.tpl</span>.</p>
 will be operate only on pages with this keyword. For example: <span
   class="pwgScreen">index.php?/<strong>most_visited</strong></span></p>
   
-<p>Advanced users will use permalinks as <strong>optional URL 
-  keyword</strong>. </p>
+<p>Advanced users will use permalinks as <strong>optional URL keyword</strong>. </p>
+
+<p>If you select a <strong>Bound template</strong> then replacements will be operate only on this template.</p>
+
 <h3>How can I deactivate my "replacers"?</h3>
 <ul>
 <li>Unselect related "Original templates".</li>