From da837c29d8a7dc5f5422c8e21bb83971079297c3 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 09 May 2014 07:58:39 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/dns/lib/lang/en_dns_soa_list.lng | 1 +
interface/web/dns/templates/dns_soa_list.htm | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/interface/web/dns/lib/lang/en_dns_soa_list.lng b/interface/web/dns/lib/lang/en_dns_soa_list.lng
index 9920382..95f9a9b 100644
--- a/interface/web/dns/lib/lang/en_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/en_dns_soa_list.lng
@@ -7,4 +7,5 @@
$wb["mbox_txt"] = 'Email';
$wb["add_new_record_wizard_txt"] = 'Add new DNS Zone with Wizard';
$wb["add_new_record_txt"] = 'Add new DNS Zone manually';
+$wb["import_zone_file_txt"] = 'Import Zone File';
?>
diff --git a/interface/web/dns/templates/dns_soa_list.htm b/interface/web/dns/templates/dns_soa_list.htm
index 5d4e772..0429407 100644
--- a/interface/web/dns/templates/dns_soa_list.htm
+++ b/interface/web/dns/templates/dns_soa_list.htm
@@ -24,7 +24,7 @@
<div class="buttons">
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_wizard.php');"><span>{tmpl_var name="add_new_record_wizard_txt"}</span></button>
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_soa_edit.php');"><span>{tmpl_var name="add_new_record_txt"}</span></button>
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_import.php');"><span>Import Zone File</span></button>
+ <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_import.php');"><span>{tmpl_var name="import_zone_file_txt"}</span></button>
</div>
</fieldset>
</div>
@@ -80,4 +80,4 @@
</fieldset>
</div>
-</div>
\ No newline at end of file
+</div>
--
Gitblit v1.9.1