Änderungen gemerged

Merge branch '18-results-pm-uberfuhren' of http://gitlab.metager3.de:1234/dominik/MetaGer into 18-results-pm-uberfuhren

resources/lang/en/fokiNames.php

 <?php
 
 return [
+<<<<<<< HEAD
 	'web' 		=>	"web",
 	'news'		=>	"nachrichten",
 	'science'	=>	'wissenschaft',
 	'shopping'	=>	'produktsuche',
 	'picture'	=>	'bilder',
 	'custom'	=>	'angepasst'
+=======
+	'web' 			=>	"web",
+	'nachrichten'	=>	"news",
+	'wissenschaft'	=>	'science',
+	'produktsuche'	=>	'shopping',
+	'bilder'		=>	'picture',
+	'angepasst'		=>	'custom'
+>>>>>>> eeeca90b0d782d61bf3a095b6816645f862cd896
 ];
\ No newline at end of file