From bd68aae78a5d696e4ccb9c0d267486c283a6d9d2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 08:49:59 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master

---
 interface/web/dashboard/lib/lang/de_dashlet_quota.lng |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/interface/web/dashboard/lib/lang/de_dashlet_quota.lng b/interface/web/dashboard/lib/lang/de_dashlet_quota.lng
index daed0db..c694f1e 100644
--- a/interface/web/dashboard/lib/lang/de_dashlet_quota.lng
+++ b/interface/web/dashboard/lib/lang/de_dashlet_quota.lng
@@ -1,9 +1,8 @@
 <?php
-$wb['quota_txt'] = 'Webseiten Speicherplatz';
-$wb['domain_txt'] = 'Domain';
+$wb['quota_txt'] = 'Webseiten-Speicherplatz';
+$wb['domain_txt'] = 'Domain / Webseite';
 $wb['used_txt'] = 'Verwendet';
 $wb['hard_txt'] = 'Hard Limit';
 $wb['soft_txt'] = 'Soft Limit';
 $wb['no_sites_txt'] = 'Keine Webseite gefunden.';
 ?>
-

--
Gitblit v1.9.1