18 files changed, 4 insertions, 18 deletions
diff --git a/admin/themes/default/template/extend_for_templates.tpl b/admin/themes/default/template/extend_for_templates.tpl
index 0d093c3bf..bbaa48b5c 100644
--- a/admin/themes/default/template/extend_for_templates.tpl
+++ b/admin/themes/default/template/extend_for_templates.tpl
@@ -8,7 +8,7 @@
       <th>{'Replacers (customized templates)'|@translate}</th>
       <th>{'Original templates'|@translate}</th>
       <th>{'Optional URL keyword'|@translate}</th>
-      <th>{'Bound template'|@translate}</th>
+      <th>{'Bound Theme'|@translate}</th>
     </tr>
     {foreach from=$extents item=tpl name=extent_loop}
     <tr class="{if $smarty.foreach.extent_loop.index is odd}row1{else}row2{/if}">
diff --git a/include/template.class.php b/include/template.class.php
index 7bb328ec2..2307d9fe2 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -223,7 +223,7 @@ class Template {
       }
 
       if ((stripos(implode('',array_keys($_GET)), '/'.$param) !== false or $param == 'N/A')
-        and ($thm == $theme)
+        and ($thm == $theme or $thm == 'N/A')
         and (!isset($this->extents[$handle]) or $overwrite)
         and file_exists($dir . $filename))
       {
diff --git a/language/ar_SA/admin.lang.php b/language/ar_SA/admin.lang.php
index 0b772453d..1492126f7 100644
--- a/language/ar_SA/admin.lang.php
+++ b/language/ar_SA/admin.lang.php
@@ -639,7 +639,6 @@ $lang['Note: Only deletes photos added with pLoader'] = 'pLoader ملاحظة :�
 $lang['Delete selected photos'] = 'حذف الصورالمختارة';
 $lang['%d photo was deleted'] = ' صورة محذوفة %d';
 $lang['%d photos were deleted'] = ' صور محذوفة %d';
-$lang['Bound template'] = 'قالب محدد';
 $lang['Downloads'] = 'تنزيل';
 $lang['Released on'] = 'Released on تمكين استخدام';
 $lang['Number of downloads'] = 'عدد التنزيلات';
diff --git a/language/cs_CZ/admin.lang.php b/language/cs_CZ/admin.lang.php
index bb7ccbbe2..43077e0c5 100644
--- a/language/cs_CZ/admin.lang.php
+++ b/language/cs_CZ/admin.lang.php
@@ -637,7 +637,6 @@ $lang['Note: Only deletes photos added with pLoader'] = 'Poznámka: odstraní po
 $lang['Delete selected photos'] = 'Vymazat vybrané fotografie';
 $lang['%d photo was deleted'] = '%d fotografie vymazána';
 $lang['%d photos were deleted'] = '%d fotografií vymazáno';
-$lang['Bound template'] = 'Hraniční šablona';
 $lang['Downloads'] = 'Staženo';
 $lang['Released on'] = 'Vydáno';
 $lang['Number of downloads'] = 'Počet stažení';
diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php
index 52f67c409..f7e9e2817 100644
--- a/language/de_DE/admin.lang.php
+++ b/language/de_DE/admin.lang.php
@@ -637,7 +637,6 @@ $lang['Note: Only deletes photos added with pLoader'] = 'Bitte beachten: Nur üb
 $lang['Delete selected photos'] = 'Lösche ausgewählte Fotos';
 $lang['%d photo was deleted'] = '%d Foto wurde gelöscht';
 $lang['%d photos were deleted'] = '%d Fotos wurden gelöscht';
-$lang['Bound template'] = 'Verbundenes Template';
 $lang['Downloads'] = 'Downloads';
 $lang['Released on'] = 'Veröffentlicht am';
 $lang['Number of downloads'] = 'Anzahl der Downloads';
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index f1c8356ce..7d5c65ca8 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -640,7 +640,6 @@ $lang['Note: Only deletes photos added with pLoader'] = "Note: Only photos added
 $lang['Delete selected photos'] = "Delete selected photos";
 $lang['%d photo was deleted'] = "%d photo deleted";
 $lang['%d photos were deleted'] = "%d photos deleted";
-$lang['Bound template'] = "Template attached";
 $lang['Downloads'] = "Downloads";
 $lang['Released on'] = "Released on";
 $lang['Number of downloads'] = "Number of downloads";
@@ -760,4 +759,5 @@ $lang['None'] = 'None';
 $lang['Invert'] = 'Invert';
 $lang['Impossible to deactivate this theme, you need at least one theme.'] = 'Impossible to deactivate this theme, you need at least one theme.';
 $lang['Webmaster status is required.'] = 'Webmaster status is required.';
+$lang['Bound Theme'] = 'Bound Theme';
 ?>
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index fb3ec9054..ac756229f 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -634,7 +634,6 @@ $lang['Note: Only deletes photos added with pLoader'] = 'Nota: Solo las fotos a�
 $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';
-$lang['Bound template'] = 'Template relacionado ';
 $lang['Downloads'] = 'Descargar';
 $lang['Released on'] = 'Añadido';
 $lang['Number of downloads'] = 'Número de descargas';
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index dc8f4c72b..a0eeabf56 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -640,7 +640,6 @@ $lang['Note: Only deletes photos added with pLoader'] = "Note : seules les photo
 $lang['Delete selected photos'] = "Supprimer les photos sélectionnées";
 $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é";
 $lang['Downloads'] = "Téléchargements";
 $lang['Released on'] = "Publié le";
 $lang['Number of downloads'] = "Nombre de téléchargements";
@@ -763,4 +762,5 @@ $lang['None'] = 'Rien';
 $lang['Invert'] = 'Inverser';
 $lang['Impossible to deactivate this theme, you need at least one theme.'] = 'Impossible de désactiver ce thème, il doit rester au moins un thème activé.';
 $lang['Webmaster status is required.'] = 'Vous devez avoir le status de "webmaster".';
+$lang['Bound Theme'] = 'Thème rattaché';
 ?>
diff --git a/language/hr_HR/admin.lang.php b/language/hr_HR/admin.lang.php
index 5fb25499f..c0b979171 100644
--- a/language/hr_HR/admin.lang.php
+++ b/language/hr_HR/admin.lang.php
@@ -638,7 +638,6 @@ $lang['Note: Only deletes photos added with pLoader'] = 'Obavjest: Briše samo s
 $lang['Delete selected photos'] = 'Briši odabrane slike';
 $lang['%d photo was deleted'] = '%d slika je izbrisana';
 $lang['%d photos were deleted'] = '%d slike su izbrisane';
-$lang['Bound template'] = 'Poveži predložak';
 $lang['Downloads'] = 'Preuzimanja';
 $lang['Released on'] = 'Objavljeno dana';
 $lang['Number of downloads'] = 'Broj preuzimanja';
diff --git a/language/hu_HU/admin.lang.php b/language/hu_HU/admin.lang.php
index 1e14f8334..38d1622ed 100644
--- a/language/hu_HU/admin.lang.php
+++ b/language/hu_HU/admin.lang.php
@@ -638,7 +638,6 @@ $lang['Note: Only deletes photos added with pLoader'] = 'Figyelem: Csak pLoader
 $lang['Delete selected photos'] = 'Kijelölt képek törlése';
 $lang['%d photo was deleted'] = '%d kép törölve';
 $lang['%d photos were deleted'] = '%d kép törölve';
-$lang['Bound template'] = 'Rögzített sablonok';
 $lang['Downloads'] = 'Letöltés';
 $lang['Released on'] = 'Released on';
 $lang['Number of downloads'] = 'Letöltések száma';
diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php
index cc0cc4d3a..1f00e153d 100644
--- a/language/it_IT/admin.lang.php
+++ b/language/it_IT/admin.lang.php
@@ -640,7 +640,6 @@ $lang['Note: Only deletes photos added with pLoader'] = 'Nota: solo le foto agiu
 $lang['Delete selected photos'] = 'Sopprimere le foto';
 $lang['%d photo was deleted'] = '%d foto cancellata';
 $lang['%d photos were deleted'] = '%d foto cancellate';
-$lang['Bound template'] = 'Template legato';
 $lang['Downloads'] = 'Downloads';
 $lang['Released on'] = 'Aggiunto il';
 $lang['Number of downloads'] = 'Totale dei downloads';
diff --git a/language/ja_JP/admin.lang.php b/language/ja_JP/admin.lang.php
index 744655ae0..a2ad35777 100644
--- a/language/ja_JP/admin.lang.php
+++ b/language/ja_JP/admin.lang.php
@@ -643,7 +643,6 @@ $lang['Categories sorted in descending order &uArr;'] = 'カテゴリは英数�
 $lang['Unable to check for upgrade.'] = 'アップグレードを確認できません。';
 $lang['Processing treatment.'] = '処理中';
 $lang['Please wait...'] = 'しばらくお待ち下さい...';
-$lang['Bound template'] = 'バインドしたテンプレート';
 $lang['Downloads'] = 'ダウンロード';
 $lang['Released on'] = '発行';
 $lang['Number of downloads'] = 'ダウンロードの件数';
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index 67d7c1cdb..3a3862289 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -628,7 +628,6 @@ $lang['Note: Only deletes photos added with pLoader'] = 'Noot: Kan alleen foto\'
 $lang['Delete selected photos'] = 'Verwijder geselecteerde foto\'s';
 $lang['%d photo was deleted'] = '%d foto is verwijderd';
 $lang['%d photos were deleted'] = '%d foto\'s zijn verwijderd';
-$lang['Bound template'] = 'Gebonden sjabloon';
 $lang['Downloads'] = 'Downloads';
 $lang['Released on'] = 'Uitgegeven op';
 $lang['Number of downloads'] = 'Aantal downloads';
diff --git a/language/pl_PL/admin.lang.php b/language/pl_PL/admin.lang.php
index 09f793dd7..f6da55420 100644
--- a/language/pl_PL/admin.lang.php
+++ b/language/pl_PL/admin.lang.php
@@ -638,7 +638,6 @@ $lang['Note: Only deletes photos added with pLoader'] = 'Info: Usuwa tylko zdję
 $lang['Delete selected photos'] = 'Usuń zaznaczone zdjęcie';
 $lang['%d photo was deleted'] = '%d zdjęcie zostało usunięte';
 $lang['%d photos were deleted'] = '%d zdjęć zostało usuniętych';
-$lang['Bound template'] = 'Przypisz Szablon';
 $lang['Downloads'] = 'Pobrania';
 $lang['Released on'] = 'Opublikowano';
 $lang['Number of downloads'] = 'Liczba pobrań';
diff --git a/language/pt_BR/admin.lang.php b/language/pt_BR/admin.lang.php
index ec343c602..41bb6c6e5 100644
--- a/language/pt_BR/admin.lang.php
+++ b/language/pt_BR/admin.lang.php
@@ -637,7 +637,6 @@ $lang['Note: Only deletes photos added with pLoader'] = 'Note: O sistema apenas
 $lang['Delete selected photos'] = 'Apagar as fotos selecionadas';
 $lang['%d photo was deleted'] = '%d foto foi apagada';
 $lang['%d photos were deleted'] = '%d fotos foram apagadas';
-$lang['Bound template'] = 'Restringir modelo';
 $lang['Downloads'] = 'Downloads';
 $lang['Released on'] = 'Lançado em';
 $lang['Number of downloads'] = 'Número de downloads';
diff --git a/language/templates/admin.lang.php b/language/templates/admin.lang.php
index 1e5efe85e..9003f7275 100644
--- a/language/templates/admin.lang.php
+++ b/language/templates/admin.lang.php
@@ -642,7 +642,6 @@ $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';
 $lang['Downloads'] = 'Downloads';
 $lang['Released on'] = 'Released on';
 $lang['Number of downloads'] = 'Number of downloads';
diff --git a/language/vi_VN/admin.lang.php b/language/vi_VN/admin.lang.php
index 030b842f0..b2e9e9838 100644
--- a/language/vi_VN/admin.lang.php
+++ b/language/vi_VN/admin.lang.php
@@ -637,7 +637,6 @@ $lang['Note: Only deletes photos added with pLoader'] = 'Chú ý: Chỉ xóa nh�
 $lang['Delete selected photos'] = 'Xóa các hình được chọn';
 $lang['%d photo was deleted'] = '%d hình đã được xóa';
 $lang['%d photos were deleted'] = 'Có %d hình đã được xóa';
-$lang['Bound template'] = 'Template biên';
 $lang['Downloads'] = 'Downloads';
 $lang['Released on'] = 'Phát hành vào';
 $lang['Number of downloads'] = 'Số lần download';
diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php
index 023771ca5..dcddc0c16 100644
--- a/language/zh_CN/admin.lang.php
+++ b/language/zh_CN/admin.lang.php
@@ -637,7 +637,6 @@ $lang['Note: Only deletes photos added with pLoader'] = '注意: 只有通过pLo
 $lang['Delete selected photos'] = '删除图片';
 $lang['%d photo was deleted'] = '%d 图片被删除';
 $lang['%d photos were deleted'] = '%d 图片被删除';
-$lang['Bound template'] = '模板绑定';
 $lang['Downloads'] = '下载';
 $lang['Released on'] = '发布于';
 $lang['Number of downloads'] = '下载次数';