From 324bfbde30d632bcd19009dbca1cb68cb160fbc1 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 18 Feb 2016 02:39:23 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 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