From 1aa01105803401d52d759d03eaabfefdb8184770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20Lo=CC=88sken?= <holger.loesken@codedge.de>
Date: Sun, 3 Jul 2016 11:06:34 +0200
Subject: [PATCH] Return $LANG array for Transifex

---
 resources/lang/de/texts.php | 12 ++++--------
 resources/lang/en/texts.php | 10 +++++++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php
index 9a16dcb427c5..d1c59fd47093 100644
--- a/resources/lang/de/texts.php
+++ b/resources/lang/de/texts.php
@@ -1,6 +1,8 @@
 <?php
 
 $LANG = array(
+
+    // client
     'organization' => 'Organisation',
     'name' => 'Name',
     'website' => 'Webseite',
@@ -1420,11 +1422,7 @@ $LANG = array(
     'industry_Travel & Luxury' => 'Reisen und Luxus',
     'industry_Other' => 'Andere',
     'industry_Photography' => 'Fotografie',
-<<<<<<< b13b9a2d7d8ac931c44189a9ef85c8aeaf165f52
 
-=======
-    
->>>>>>> - Fix #426, closes #426
     // Countries
     'country_Afghanistan' => '',
     'country_Albania' => 'Albanien',
@@ -1675,11 +1673,9 @@ $LANG = array(
     'country_Samoa' => '',
     'country_Yemen' => '',
     'country_Zambi' => '',
+
 );
-<<<<<<< b13b9a2d7d8ac931c44189a9ef85c8aeaf165f52
 
 return $LANG;
 
-?>
-=======
->>>>>>> - Fix #426, closes #426
+?>
\ No newline at end of file
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index f92aa0b7aa40..e6832e884714 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -1,6 +1,7 @@
 <?php
 
-return [
+$LANG = array(
+
     'organization' => 'Organization',
     'name' => 'Name',
     'website' => 'Website',
@@ -1672,7 +1673,10 @@ return [
     'country_Samoa' => 'Samoa',
     'country_Yemen' => 'Yemen',
     'country_Zambi' => 'Zambi',
-    
-];
 
+);
+
+return $LANG;
+
+?>