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

---
 interface/web/admin/lib/lang/de_language_export.lng |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/admin/lib/lang/de_language_export.lng b/interface/web/admin/lib/lang/de_language_export.lng
index 70eb466..c8b4a86 100644
--- a/interface/web/admin/lib/lang/de_language_export.lng
+++ b/interface/web/admin/lib/lang/de_language_export.lng
@@ -2,5 +2,5 @@
 $wb['list_head_txt'] = 'Sprachdatei exportieren';
 $wb['language_select_txt'] = 'Sprache auswählen';
 $wb['btn_save_txt'] = 'Ausgewähltes Sprachdateiset exportieren';
-$wb['btn_cancel_txt'] = 'Zurück';
+$wb['btn_cancel_txt'] = 'Abbrechen';
 ?>

--
Gitblit v1.9.1