From b4945ae0c3f4e108090d05b34b3e7df8a753a2ec Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 07 Jul 2014 13:07:17 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/sites/lib/lang/en_database_list.lng |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/interface/web/sites/lib/lang/en_database_list.lng b/interface/web/sites/lib/lang/en_database_list.lng
index ac5a384..13bb304 100644
--- a/interface/web/sites/lib/lang/en_database_list.lng
+++ b/interface/web/sites/lib/lang/en_database_list.lng
@@ -2,13 +2,10 @@
 $wb["list_head_txt"] = 'Database';
 $wb["active_txt"] = 'Active';
 $wb["remote_access_txt"] = 'Remote Access';
+$wb['type_txt'] = 'Type';
 $wb["server_id_txt"] = 'Server';
+$wb["database_user_txt"] = 'Database user';
 $wb["database_name_txt"] = 'Database name';
-$wb["page_txt"] = 'Page';
-$wb["page_of_txt"] = 'of';
-$wb["page_next_txt"] = 'Next';
-$wb["page_back_txt"] = 'Back';
-$wb["delete_txt"] = 'Delete';
-$wb["filter_txt"] = 'Filter';
 $wb["add_new_record_txt"] = 'Add new Database';
+$wb["parent_domain_id_txt"] = 'Website';
 ?>
\ No newline at end of file

--
Gitblit v1.9.1