diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 8b8f780c..72fc1e07 100644
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -75,22 +75,11 @@ function catavatar_addon_settings_post(App $a, &$s)
 	}
 
 	// delete the current cached cat avatar
-	$user = dba::selectFirst('user', ['email'],
-		[
-			'uid' => $uid,
-			'blocked' => 0,
-			'account_expired' => 0,
-			'account_removed' => 0,
-		]
-	);
-	$seed = PConfig::get(local_user(), 'catavatar', 'seed', md5(trim(strtolower($user['email']))));
-	$imageurl = preg_replace('/[^A-Za-z0-9\._-]/', '', $seed);
-	$imageurl = substr($imageurl, 0, 35) . '';
-	$cachefile = get_cachefile($imageurl);
-	if ($cachefile != "" && file_exists($cachefile)) {
-		unlink($cachefile);
-	}
+	$condition = ['uid' => local_user(), 'blocked' => false,
+			'account_expired' => false, 'account_removed' => false];
+	$user = dba::selectFirst('user', ['email'], $condition);
 
+	$seed = PConfig::get(local_user(), 'catavatar', 'seed', md5(trim(strtolower($user['email']))));
 
 	if (!empty($_POST['catavatar-usecat'])) {
 		$url = $a->get_baseurl() . '/catavatar/' . local_user() . '?ts=' . time();
@@ -131,8 +120,6 @@ function catavatar_addon_settings_post(App $a, &$s)
 		return;
 	}
 
-
-
 	if (!empty($_POST['catavatar-morecat'])) {
 		PConfig::set(local_user(), 'catavatar', 'seed', time());
 	}
@@ -142,7 +129,6 @@ function catavatar_addon_settings_post(App $a, &$s)
 	}
 }
 
-
 /**
  * Returns the URL to the cat avatar
  *
@@ -164,9 +150,7 @@ function catavatar_lookup(App $a, &$b)
 	$b['success'] = true;
 }
 
-
-function catavatar_module(){}
-
+function catavatar_module() {}
 
 /**
  * Returns image for user id
@@ -187,14 +171,9 @@ function catavatar_content(App $a)
 		$size = intval($a->argv[2]);
 	}
 
-	$user = dba::selectFirst('user', ['email'],
-		[
-			'uid' => $uid,
-			'blocked' => 0,
-			'account_expired' => 0,
-			'account_removed' => 0,
-		]
-	);
+	$condition = ['uid' => $uid, 'blocked' => false,
+			'account_expired' => false, 'account_removed' => false];
+	$user = dba::selectFirst('user', ['email'], $condition);
 
 	if ($user === false) {
 		throw new NotFoundException();
@@ -202,37 +181,12 @@ function catavatar_content(App $a)
 
 	$seed = PConfig::get($uid, "catavatar", "seed", md5(trim(strtolower($user['email']))));
 
-	// from cat-avatar-generator.php
-	$imageurl = $seed . "-" . $size;
-	$imageurl = preg_replace('/[^A-Za-z0-9\._-]/', '', $imageurl);
-	$imageurl = substr($imageurl, 0, 35) . '';
-	$cachefile = get_cachefile($imageurl);
-	$cachetime = 604800; # 1 week (1 day = 86400)
-
-	// Serve from the cache if it is younger than $cachetime
-	if ($cachefile != "" && file_exists($cachefile) && (time() - $cachetime) < filemtime($cachefile)) {
-		header('Pragma: public');
-		header('Cache-Control: max-age=86400');
-		header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 86400));
-		header('Content-Type: image/jpg');
-		readfile($cachefile);
-		exit();
-	}
-
 	// ...Or start generation
 	ob_start();
 
 	// render the picture:
 	build_cat($seed, $size);
 
-	// Save/cache the output to a file
-	if ($cachefile != "") {
-		$savedfile = fopen($cachefile, 'w+'); # w+ to be at start of the file, write mode, and attempt to create if not existing.
-		fwrite($savedfile, ob_get_contents());
-		fclose($savedfile);
-		chmod($cachefile, 0755);
-	}
-
 	ob_end_flush();
 
 	exit();
@@ -275,7 +229,7 @@ function build_cat($seed = '', $size = 0)
 	imagefill($cat, 0, 0, $white);
 
 	// add parts
-	foreach ($parts as $part => $num){
+	foreach ($parts as $part => $num) {
 		$file = dirname(__FILE__) . '/avatars/' . $part . '_' . $num . '.png';
 
 		$im = @imagecreatefrompng($file);
diff --git a/catavatar/lang/de/messages.po b/catavatar/lang/de/messages.po
index 192300c8..28ca9720 100644
--- a/catavatar/lang/de/messages.po
+++ b/catavatar/lang/de/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-13 09:35+0000\n"
+"POT-Creation-Date: 2018-04-06 18:26+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018\n"
 "Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n"
@@ -18,36 +18,26 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: catavatar.php:60
+#: catavatar.php:57
 msgid "Use Cat as Avatar"
 msgstr "Verwende diese Katze als Profilbild"
 
-#: catavatar.php:61
+#: catavatar.php:58
 msgid "More Random Cat!"
 msgstr "Weitere zufällige Katze"
 
-#: catavatar.php:62
+#: catavatar.php:59
 msgid "Reset to email Cat"
 msgstr "Zurück zu E-Mail Katze"
 
-#: catavatar.php:64
+#: catavatar.php:61
 msgid "Cat Avatar Settings"
 msgstr "Katzen Profilbild Einstellungen"
 
-#: catavatar.php:100
-msgid "The cat hadn't found itself."
-msgstr ""
-"Es ist ein Problem mit der Datenbank aufgetreten. Die Katze konnte sich "
-"nicht selbst finden."
-
-#: catavatar.php:109
+#: catavatar.php:103 catavatar.php:112 catavatar.php:121
 msgid "There was an error, the cat ran away."
 msgstr "Upps es gab einen Fehler und die Katze ist weggelaufen"
 
-#: catavatar.php:115
-msgid "Profile Photos"
-msgstr "Profilbilder"
-
-#: catavatar.php:130
+#: catavatar.php:134
 msgid "Meow!"
 msgstr "Miau!"
diff --git a/catavatar/lang/de/strings.php b/catavatar/lang/de/strings.php
index a92ff79d..6cefebf7 100644
--- a/catavatar/lang/de/strings.php
+++ b/catavatar/lang/de/strings.php
@@ -9,7 +9,5 @@ $a->strings["Use Cat as Avatar"] = "Verwende diese Katze als Profilbild";
 $a->strings["More Random Cat!"] = "Weitere zufällige Katze";
 $a->strings["Reset to email Cat"] = "Zurück zu E-Mail Katze";
 $a->strings["Cat Avatar Settings"] = "Katzen Profilbild Einstellungen";
-$a->strings["The cat hadn't found itself."] = "Es ist ein Problem mit der Datenbank aufgetreten. Die Katze konnte sich nicht selbst finden.";
 $a->strings["There was an error, the cat ran away."] = "Upps es gab einen Fehler und die Katze ist weggelaufen";
-$a->strings["Profile Photos"] = "Profilbilder";
 $a->strings["Meow!"] = "Miau!";
diff --git a/catavatar/lang/en-gb/messages.po b/catavatar/lang/en-gb/messages.po
index 0ace0c7c..7ea64a28 100644
--- a/catavatar/lang/en-gb/messages.po
+++ b/catavatar/lang/en-gb/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-13 09:35+0000\n"
+"POT-Creation-Date: 2018-04-06 18:26+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kris, 2018\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/Friendica/teams/12172/en_GB/)\n"
@@ -18,34 +18,26 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: catavatar.php:60
+#: catavatar.php:57
 msgid "Use Cat as Avatar"
-msgstr "Use Cat as Avatar"
+msgstr ""
+
+#: catavatar.php:58
+msgid "More Random Cat!"
+msgstr ""
+
+#: catavatar.php:59
+msgid "Reset to email Cat"
+msgstr ""
 
 #: catavatar.php:61
-msgid "More Random Cat!"
-msgstr "Another Random Cat!"
-
-#: catavatar.php:62
-msgid "Reset to email Cat"
-msgstr "Reset to email Cat"
-
-#: catavatar.php:64
 msgid "Cat Avatar Settings"
-msgstr "Cat Avatar Settings"
+msgstr ""
 
-#: catavatar.php:100
-msgid "The cat hadn't found itself."
-msgstr "There was a database error, the cat has got lost."
-
-#: catavatar.php:109
+#: catavatar.php:103 catavatar.php:112 catavatar.php:121
 msgid "There was an error, the cat ran away."
-msgstr "There was an error, the cat ran away."
+msgstr ""
 
-#: catavatar.php:115
-msgid "Profile Photos"
-msgstr "Profile Photos"
-
-#: catavatar.php:130
+#: catavatar.php:134
 msgid "Meow!"
 msgstr "Meow!"
diff --git a/catavatar/lang/en-gb/strings.php b/catavatar/lang/en-gb/strings.php
index f37ebd61..fed8ea70 100644
--- a/catavatar/lang/en-gb/strings.php
+++ b/catavatar/lang/en-gb/strings.php
@@ -5,11 +5,9 @@ function string_plural_select_en_gb($n){
 	return ($n != 1);;
 }}
 ;
-$a->strings["Use Cat as Avatar"] = "Use Cat as Avatar";
-$a->strings["More Random Cat!"] = "Another Random Cat!";
-$a->strings["Reset to email Cat"] = "Reset to email Cat";
-$a->strings["Cat Avatar Settings"] = "Cat Avatar Settings";
-$a->strings["The cat hadn't found itself."] = "There was a database error, the cat has got lost.";
-$a->strings["There was an error, the cat ran away."] = "There was an error, the cat ran away.";
-$a->strings["Profile Photos"] = "Profile Photos";
+$a->strings["Use Cat as Avatar"] = "";
+$a->strings["More Random Cat!"] = "";
+$a->strings["Reset to email Cat"] = "";
+$a->strings["Cat Avatar Settings"] = "";
+$a->strings["There was an error, the cat ran away."] = "";
 $a->strings["Meow!"] = "Meow!";
diff --git a/dav/lang/en-gb/messages.po b/dav/lang/en-gb/messages.po
deleted file mode 100644
index df0cbd49..00000000
--- a/dav/lang/en-gb/messages.po
+++ /dev/null
@@ -1,578 +0,0 @@
-# ADDON dav
-# Copyright (C)
-# This file is distributed under the same license as the Friendica dav addon package.
-# 
-# 
-# Translators:
-# Kris, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2018-04-13 17:41+0000\n"
-"Last-Translator: Kris\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/Friendica/friendica/language/en_GB/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: friendica/dav_caldav_backend_virtual_friendica.inc.php:36
-msgid "Friendica-Native events"
-msgstr "Friendica-native events"
-
-#: friendica/dav_carddav_backend_virtual_friendica.inc.php:36
-#: friendica/dav_carddav_backend_virtual_friendica.inc.php:59
-msgid "Friendica-Contacts"
-msgstr "Friendica contacts"
-
-#: friendica/dav_carddav_backend_virtual_friendica.inc.php:60
-msgid "Your Friendica-Contacts"
-msgstr "Your Friendica contacts"
-
-#: friendica/layout.fnk.php:99 friendica/layout.fnk.php:136
-msgid ""
-"Something went wrong when trying to import the file. Sorry. Maybe some "
-"events were imported anyway."
-msgstr "Something went wrong when trying to import the file. Some events may have been imported anyway."
-
-#: friendica/layout.fnk.php:131
-msgid "Something went wrong when trying to import the file. Sorry."
-msgstr "Something went wrong when trying to import the file."
-
-#: friendica/layout.fnk.php:134
-msgid "The ICS-File has been imported."
-msgstr "The ICS file has been imported."
-
-#: friendica/layout.fnk.php:138
-msgid "No file was uploaded."
-msgstr "No file was uploaded."
-
-#: friendica/layout.fnk.php:143 friendica/layout.fnk.php:422
-#: common/wdcal_edit.inc.php:140
-msgid "Go back to the calendar"
-msgstr "Go back to the calendar"
-
-#: friendica/layout.fnk.php:147
-msgid "Import a ICS-file"
-msgstr "Import an ICS file"
-
-#: friendica/layout.fnk.php:150
-msgid "ICS-File"
-msgstr "ICS file"
-
-#: friendica/layout.fnk.php:151
-msgid "Overwrite all #num# existing events"
-msgstr "Overwrite all #num# existing events"
-
-#: friendica/layout.fnk.php:152
-msgid "Upload"
-msgstr "Upload"
-
-#: friendica/layout.fnk.php:225
-msgid "Settings"
-msgstr "Settings"
-
-#: friendica/layout.fnk.php:225
-msgid "Help"
-msgstr "Help"
-
-#: friendica/layout.fnk.php:228
-msgid "New event"
-msgstr "New event"
-
-#: friendica/layout.fnk.php:232
-msgid "Today"
-msgstr "Today"
-
-#: friendica/layout.fnk.php:241
-msgid "Day"
-msgstr "Day"
-
-#: friendica/layout.fnk.php:248
-msgid "Week"
-msgstr "Week"
-
-#: friendica/layout.fnk.php:255 common/wdcal_edit.inc.php:372
-msgid "Month"
-msgstr "Month"
-
-#: friendica/layout.fnk.php:260
-msgid "Reload"
-msgstr "Reload"
-
-#: friendica/layout.fnk.php:263
-msgid "Previous"
-msgstr "Previous"
-
-#: friendica/layout.fnk.php:266
-msgid "Next"
-msgstr "Next"
-
-#: friendica/layout.fnk.php:271
-msgid "Date"
-msgstr "Date"
-
-#: friendica/layout.fnk.php:313
-msgid "Error"
-msgstr "Error"
-
-#: friendica/layout.fnk.php:354
-msgid "Permission denied."
-msgstr "Permission denied."
-
-#: friendica/layout.fnk.php:361
-msgid "The new values have been saved."
-msgstr "The new values have been saved."
-
-#: friendica/layout.fnk.php:380
-msgid "The calendar has been updated."
-msgstr "The calendar has been updated."
-
-#: friendica/layout.fnk.php:393
-msgid "The new calendar has been created."
-msgstr "The new calendar has been created."
-
-#: friendica/layout.fnk.php:417
-msgid "The calendar has been deleted."
-msgstr "The calendar has been deleted."
-
-#: friendica/layout.fnk.php:424
-msgid "Calendar Settings"
-msgstr "Calendar settings"
-
-#: friendica/layout.fnk.php:430
-msgid "Date format"
-msgstr "Date format"
-
-#: friendica/layout.fnk.php:439
-msgid "Time zone"
-msgstr "Time zone"
-
-#: friendica/layout.fnk.php:441 friendica/layout.fnk.php:488
-msgid "Save"
-msgstr "Save"
-
-#: friendica/layout.fnk.php:445
-msgid "Calendars"
-msgstr "Calendars"
-
-#: friendica/layout.fnk.php:487
-msgid "Create a new calendar"
-msgstr "Create a new calendar"
-
-#: friendica/layout.fnk.php:496
-msgid "Limitations"
-msgstr "Limitations"
-
-#: friendica/layout.fnk.php:500
-msgid "Warning"
-msgstr "Warning"
-
-#: friendica/layout.fnk.php:504
-msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)"
-msgstr "Synchronisation (iPhone, Thunderbird Lightning, Android etc.)"
-
-#: friendica/layout.fnk.php:511
-msgid "Synchronizing this calendar with the iPhone"
-msgstr "Synchronising this calendar with an iPhone"
-
-#: friendica/layout.fnk.php:522
-msgid "Synchronizing your Friendica-Contacts with the iPhone"
-msgstr "Synchronising your Friendica contacts with an iPhone"
-
-#: friendica/main.php:202
-msgid ""
-"The current version of this addon has not been set up correctly. Please "
-"contact the system administrator of your installation of friendica to fix "
-"this."
-msgstr "The current version of this addon has not been set up correctly. Please contact the administrator of your Friendica site to ask them to fix this."
-
-#: friendica/main.php:239 common/wdcal_edit.inc.php:146
-msgid "Calendar"
-msgstr "Calendar"
-
-#: friendica/main.php:242
-msgid "Extended calendar with CalDAV-support"
-msgstr "Extended calendar with CalDAV support"
-
-#: friendica/main.php:279 friendica/main.php:280
-msgid "noreply"
-msgstr "noreply"
-
-#: friendica/main.php:282
-msgid "Notification: "
-msgstr "Notification: "
-
-#: friendica/main.php:309
-msgid "The database tables have been installed."
-msgstr "The database tables have been installed."
-
-#: friendica/main.php:310
-msgid "An error occurred during the installation."
-msgstr "An error occurred during the installation."
-
-#: friendica/main.php:316
-msgid "The database tables have been updated."
-msgstr "The database tables have been updated."
-
-#: friendica/main.php:317
-msgid "An error occurred during the update."
-msgstr "An error occurred during the update."
-
-#: friendica/main.php:333
-msgid "No system-wide settings yet."
-msgstr "No system-wide settings yet."
-
-#: friendica/main.php:336
-msgid "Database status"
-msgstr "Database status"
-
-#: friendica/main.php:339
-msgid "Installed"
-msgstr "Installed"
-
-#: friendica/main.php:343
-msgid "Upgrade needed"
-msgstr "Upgrade needed"
-
-#: friendica/main.php:343
-msgid ""
-"Please back up all calendar data (the tables beginning with dav_*) before "
-"proceeding. While all calendar events <i>should</i> be converted to the new "
-"database structure, it's always safe to have a backup. Below, you can have a"
-" look at the database-queries that will be made when pressing the "
-"'update'-button."
-msgstr "Please back up all calendar data (tables beginning with dav_*) before proceeding. While all calendar events <i>should</i> be converted to the new database structure, it's recommended that you make a backup just to be on the safe side. You can see the database queries that will be made during the update below."
-
-#: friendica/main.php:343
-msgid "Upgrade"
-msgstr "Upgrade"
-
-#: friendica/main.php:346
-msgid "Not installed"
-msgstr "Not installed"
-
-#: friendica/main.php:346
-msgid "Install"
-msgstr "Install"
-
-#: friendica/main.php:350
-msgid "Unknown"
-msgstr "Unknown"
-
-#: friendica/main.php:350
-msgid ""
-"Something really went wrong. I cannot recover from this state automatically,"
-" sorry. Please go to the database backend, back up the data, and delete all "
-"tables beginning with 'dav_' manually. Afterwards, this installation routine"
-" should be able to reinitialize the tables automatically."
-msgstr "Something has gone wrong. It is impossible to recover from this state automatically. Please go to the database backend, back up the data, and manually delete all tables beginning with 'dav_'. When you have done this, the installation routine should be able to reinitialise the tables automatically."
-
-#: friendica/main.php:355
-msgid "Troubleshooting"
-msgstr "Troubleshooting"
-
-#: friendica/main.php:356
-msgid "Manual creation of the database tables:"
-msgstr "Manual creation of database tables:"
-
-#: friendica/main.php:357
-msgid "Show SQL-statements"
-msgstr "Show SQL statements"
-
-#: friendica/calendar.friendica.fnk.php:206
-msgid "Private Calendar"
-msgstr "Private calendar"
-
-#: friendica/calendar.friendica.fnk.php:207
-msgid "Friendica Events: Mine"
-msgstr "Friendica events: My events"
-
-#: friendica/calendar.friendica.fnk.php:208
-msgid "Friendica Events: Contacts"
-msgstr "Friendica events: Contacts' events"
-
-#: friendica/calendar.friendica.fnk.php:248
-msgid "Private Addresses"
-msgstr "Private addresses"
-
-#: friendica/calendar.friendica.fnk.php:249
-msgid "Friendica Contacts"
-msgstr "Friendica contacts"
-
-#: common/wdcal_edit.inc.php:30 common/wdcal_edit.inc.php:738
-msgid "Could not open component for editing"
-msgstr "Could not open component for editing"
-
-#: common/wdcal_edit.inc.php:144
-msgid "Event data"
-msgstr "Event data"
-
-#: common/wdcal_edit.inc.php:163
-msgid "Special color"
-msgstr "Special colour"
-
-#: common/wdcal_edit.inc.php:169
-msgid "Subject"
-msgstr "Subject"
-
-#: common/wdcal_edit.inc.php:173
-msgid "Starts"
-msgstr "Starts"
-
-#: common/wdcal_edit.inc.php:178
-msgid "Ends"
-msgstr "Ends"
-
-#: common/wdcal_edit.inc.php:183
-msgid "Location"
-msgstr "Location"
-
-#: common/wdcal_edit.inc.php:185
-msgid "Description"
-msgstr "Description"
-
-#: common/wdcal_edit.inc.php:188
-msgid "Recurrence"
-msgstr "Recurrence"
-
-#: common/wdcal_edit.inc.php:190
-msgid "Frequency"
-msgstr "Frequency"
-
-#: common/wdcal_edit.inc.php:191
-msgid "None"
-msgstr "None"
-
-#: common/wdcal_edit.inc.php:194
-msgid "Daily"
-msgstr "Daily"
-
-#: common/wdcal_edit.inc.php:197
-msgid "Weekly"
-msgstr "Weekly"
-
-#: common/wdcal_edit.inc.php:200
-msgid "Monthly"
-msgstr "Monthly"
-
-#: common/wdcal_edit.inc.php:203
-msgid "Yearly"
-msgstr "Yearly"
-
-#: common/wdcal_edit.inc.php:214
-msgid "days"
-msgstr "days"
-
-#: common/wdcal_edit.inc.php:215
-msgid "weeks"
-msgstr "weeks"
-
-#: common/wdcal_edit.inc.php:216
-msgid "months"
-msgstr "months"
-
-#: common/wdcal_edit.inc.php:217
-msgid "years"
-msgstr "years"
-
-#: common/wdcal_edit.inc.php:218
-msgid "Interval"
-msgstr "Interval"
-
-#: common/wdcal_edit.inc.php:218
-msgid "All %select% %time%"
-msgstr ""
-
-#: common/wdcal_edit.inc.php:222 common/wdcal_edit.inc.php:260
-#: common/wdcal_edit.inc.php:481
-msgid "Days"
-msgstr "Days"
-
-#: common/wdcal_edit.inc.php:231 common/wdcal_edit.inc.php:254
-#: common/wdcal_edit.inc.php:270 common/wdcal_edit.inc.php:293
-#: common/wdcal_edit.inc.php:305
-msgid "Sunday"
-msgstr "Sunday"
-
-#: common/wdcal_edit.inc.php:235 common/wdcal_edit.inc.php:274
-#: common/wdcal_edit.inc.php:308
-msgid "Monday"
-msgstr "Monday"
-
-#: common/wdcal_edit.inc.php:238 common/wdcal_edit.inc.php:277
-msgid "Tuesday"
-msgstr "Tuesday"
-
-#: common/wdcal_edit.inc.php:241 common/wdcal_edit.inc.php:280
-msgid "Wednesday"
-msgstr "Wednesday"
-
-#: common/wdcal_edit.inc.php:244 common/wdcal_edit.inc.php:283
-msgid "Thursday"
-msgstr "Thursday"
-
-#: common/wdcal_edit.inc.php:247 common/wdcal_edit.inc.php:286
-msgid "Friday"
-msgstr "Friday"
-
-#: common/wdcal_edit.inc.php:250 common/wdcal_edit.inc.php:289
-msgid "Saturday"
-msgstr "Saturday"
-
-#: common/wdcal_edit.inc.php:297
-msgid "First day of week:"
-msgstr "First day of the week:"
-
-#: common/wdcal_edit.inc.php:350 common/wdcal_edit.inc.php:373
-msgid "Day of month"
-msgstr ""
-
-#: common/wdcal_edit.inc.php:354
-msgid "#num#th of each month"
-msgstr ""
-
-#: common/wdcal_edit.inc.php:357
-msgid "#num#th-last of each month"
-msgstr ""
-
-#: common/wdcal_edit.inc.php:360
-msgid "#num#th #wkday# of each month"
-msgstr ""
-
-#: common/wdcal_edit.inc.php:363
-msgid "#num#th-last #wkday# of each month"
-msgstr ""
-
-#: common/wdcal_edit.inc.php:377
-msgid "#num#th of the given month"
-msgstr ""
-
-#: common/wdcal_edit.inc.php:380
-msgid "#num#th-last of the given month"
-msgstr ""
-
-#: common/wdcal_edit.inc.php:383
-msgid "#num#th #wkday# of the given month"
-msgstr ""
-
-#: common/wdcal_edit.inc.php:386
-msgid "#num#th-last #wkday# of the given month"
-msgstr ""
-
-#: common/wdcal_edit.inc.php:413
-msgid "Repeat until"
-msgstr "Repeat until"
-
-#: common/wdcal_edit.inc.php:417
-msgid "Infinite"
-msgstr "Indefinite"
-
-#: common/wdcal_edit.inc.php:420
-msgid "Until the following date"
-msgstr "Until the following date"
-
-#: common/wdcal_edit.inc.php:423
-msgid "Number of times"
-msgstr "Number of times"
-
-#: common/wdcal_edit.inc.php:429
-msgid "Exceptions"
-msgstr "Exceptions"
-
-#: common/wdcal_edit.inc.php:432
-msgid "none"
-msgstr "none"
-
-#: common/wdcal_edit.inc.php:449
-msgid "Notification"
-msgstr "Notification"
-
-#: common/wdcal_edit.inc.php:466
-msgid "Notify by"
-msgstr "Notify by"
-
-#: common/wdcal_edit.inc.php:468
-msgid "Remove"
-msgstr "Remove"
-
-#: common/wdcal_edit.inc.php:469
-msgid "E-Mail"
-msgstr "Email"
-
-#: common/wdcal_edit.inc.php:470
-msgid "On Friendica / Display"
-msgstr "On Friendica / Display"
-
-#: common/wdcal_edit.inc.php:474
-msgid "Time"
-msgstr "Time"
-
-#: common/wdcal_edit.inc.php:478
-msgid "Hours"
-msgstr "Hours"
-
-#: common/wdcal_edit.inc.php:479
-msgid "Minutes"
-msgstr "Minutes"
-
-#: common/wdcal_edit.inc.php:480
-msgid "Seconds"
-msgstr "Seconds"
-
-#: common/wdcal_edit.inc.php:482
-msgid "Weeks"
-msgstr "Weeks"
-
-#: common/wdcal_edit.inc.php:485
-msgid "before the"
-msgstr "before the"
-
-#: common/wdcal_edit.inc.php:486
-msgid "start of the event"
-msgstr "start of the event"
-
-#: common/wdcal_edit.inc.php:487
-msgid "end of the event"
-msgstr "end of the event"
-
-#: common/wdcal_edit.inc.php:492
-msgid "Add a notification"
-msgstr "Add a notification"
-
-#: common/wdcal_edit.inc.php:687
-msgid "The event #name# will start at #date"
-msgstr "The event #name# will start at #date"
-
-#: common/wdcal_edit.inc.php:696
-msgid "#name# is about to begin."
-msgstr "#name# is about to begin."
-
-#: common/wdcal_edit.inc.php:769
-msgid "Saved"
-msgstr "Saved"
-
-#: common/wdcal_configuration.php:148
-msgid "U.S. Time Format (mm/dd/YYYY)"
-msgstr "US time format (mm/dd/YYYY)"
-
-#: common/wdcal_configuration.php:243
-msgid "German Time Format (dd.mm.YYYY)"
-msgstr "UK time format (dd/mm/YYYY)"
-
-#: common/dav_caldav_backend_private.inc.php:39
-msgid "Private Events"
-msgstr "Private events"
-
-#: common/wdcal_backend.inc.php:92 common/wdcal_backend.inc.php:166
-#: common/wdcal_backend.inc.php:178 common/wdcal_backend.inc.php:206
-#: common/wdcal_backend.inc.php:214 common/wdcal_backend.inc.php:229
-msgid "No access"
-msgstr "No access"
-
-#: common/dav_carddav_backend_private.inc.php:46
-msgid "Private Addressbooks"
-msgstr "Private address books"
diff --git a/dav/lang/en-gb/strings.php b/dav/lang/en-gb/strings.php
deleted file mode 100644
index 257f1ea8..00000000
--- a/dav/lang/en-gb/strings.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_en_gb")) {
-function string_plural_select_en_gb($n){
-	return ($n != 1);;
-}}
-;
-$a->strings["Friendica-Native events"] = "Friendica-native events";
-$a->strings["Friendica-Contacts"] = "Friendica contacts";
-$a->strings["Your Friendica-Contacts"] = "Your Friendica contacts";
-$a->strings["Something went wrong when trying to import the file. Sorry. Maybe some events were imported anyway."] = "Something went wrong when trying to import the file. Some events may have been imported anyway.";
-$a->strings["Something went wrong when trying to import the file. Sorry."] = "Something went wrong when trying to import the file.";
-$a->strings["The ICS-File has been imported."] = "The ICS file has been imported.";
-$a->strings["No file was uploaded."] = "No file was uploaded.";
-$a->strings["Go back to the calendar"] = "Go back to the calendar";
-$a->strings["Import a ICS-file"] = "Import an ICS file";
-$a->strings["ICS-File"] = "ICS file";
-$a->strings["Overwrite all #num# existing events"] = "Overwrite all #num# existing events";
-$a->strings["Upload"] = "Upload";
-$a->strings["Settings"] = "Settings";
-$a->strings["Help"] = "Help";
-$a->strings["New event"] = "New event";
-$a->strings["Today"] = "Today";
-$a->strings["Day"] = "Day";
-$a->strings["Week"] = "Week";
-$a->strings["Month"] = "Month";
-$a->strings["Reload"] = "Reload";
-$a->strings["Previous"] = "Previous";
-$a->strings["Next"] = "Next";
-$a->strings["Date"] = "Date";
-$a->strings["Error"] = "Error";
-$a->strings["Permission denied."] = "Permission denied.";
-$a->strings["The new values have been saved."] = "The new values have been saved.";
-$a->strings["The calendar has been updated."] = "The calendar has been updated.";
-$a->strings["The new calendar has been created."] = "The new calendar has been created.";
-$a->strings["The calendar has been deleted."] = "The calendar has been deleted.";
-$a->strings["Calendar Settings"] = "Calendar settings";
-$a->strings["Date format"] = "Date format";
-$a->strings["Time zone"] = "Time zone";
-$a->strings["Save"] = "Save";
-$a->strings["Calendars"] = "Calendars";
-$a->strings["Create a new calendar"] = "Create a new calendar";
-$a->strings["Limitations"] = "Limitations";
-$a->strings["Warning"] = "Warning";
-$a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Synchronisation (iPhone, Thunderbird Lightning, Android etc.)";
-$a->strings["Synchronizing this calendar with the iPhone"] = "Synchronising this calendar with an iPhone";
-$a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Synchronising your Friendica contacts with an iPhone";
-$a->strings["The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "The current version of this addon has not been set up correctly. Please contact the administrator of your Friendica site to ask them to fix this.";
-$a->strings["Calendar"] = "Calendar";
-$a->strings["Extended calendar with CalDAV-support"] = "Extended calendar with CalDAV support";
-$a->strings["noreply"] = "noreply";
-$a->strings["Notification: "] = "Notification: ";
-$a->strings["The database tables have been installed."] = "The database tables have been installed.";
-$a->strings["An error occurred during the installation."] = "An error occurred during the installation.";
-$a->strings["The database tables have been updated."] = "The database tables have been updated.";
-$a->strings["An error occurred during the update."] = "An error occurred during the update.";
-$a->strings["No system-wide settings yet."] = "No system-wide settings yet.";
-$a->strings["Database status"] = "Database status";
-$a->strings["Installed"] = "Installed";
-$a->strings["Upgrade needed"] = "Upgrade needed";
-$a->strings["Please back up all calendar data (the tables beginning with dav_*) before proceeding. While all calendar events <i>should</i> be converted to the new database structure, it's always safe to have a backup. Below, you can have a look at the database-queries that will be made when pressing the 'update'-button."] = "Please back up all calendar data (tables beginning with dav_*) before proceeding. While all calendar events <i>should</i> be converted to the new database structure, it's recommended that you make a backup just to be on the safe side. You can see the database queries that will be made during the update below.";
-$a->strings["Upgrade"] = "Upgrade";
-$a->strings["Not installed"] = "Not installed";
-$a->strings["Install"] = "Install";
-$a->strings["Unknown"] = "Unknown";
-$a->strings["Something really went wrong. I cannot recover from this state automatically, sorry. Please go to the database backend, back up the data, and delete all tables beginning with 'dav_' manually. Afterwards, this installation routine should be able to reinitialize the tables automatically."] = "Something has gone wrong. It is impossible to recover from this state automatically. Please go to the database backend, back up the data, and manually delete all tables beginning with 'dav_'. When you have done this, the installation routine should be able to reinitialise the tables automatically.";
-$a->strings["Troubleshooting"] = "Troubleshooting";
-$a->strings["Manual creation of the database tables:"] = "Manual creation of database tables:";
-$a->strings["Show SQL-statements"] = "Show SQL statements";
-$a->strings["Private Calendar"] = "Private calendar";
-$a->strings["Friendica Events: Mine"] = "Friendica events: My events";
-$a->strings["Friendica Events: Contacts"] = "Friendica events: Contacts' events";
-$a->strings["Private Addresses"] = "Private addresses";
-$a->strings["Friendica Contacts"] = "Friendica contacts";
-$a->strings["Could not open component for editing"] = "Could not open component for editing";
-$a->strings["Event data"] = "Event data";
-$a->strings["Special color"] = "Special colour";
-$a->strings["Subject"] = "Subject";
-$a->strings["Starts"] = "Starts";
-$a->strings["Ends"] = "Ends";
-$a->strings["Location"] = "Location";
-$a->strings["Description"] = "Description";
-$a->strings["Recurrence"] = "Recurrence";
-$a->strings["Frequency"] = "Frequency";
-$a->strings["None"] = "None";
-$a->strings["Daily"] = "Daily";
-$a->strings["Weekly"] = "Weekly";
-$a->strings["Monthly"] = "Monthly";
-$a->strings["Yearly"] = "Yearly";
-$a->strings["days"] = "days";
-$a->strings["weeks"] = "weeks";
-$a->strings["months"] = "months";
-$a->strings["years"] = "years";
-$a->strings["Interval"] = "Interval";
-$a->strings["All %select% %time%"] = "";
-$a->strings["Days"] = "Days";
-$a->strings["Sunday"] = "Sunday";
-$a->strings["Monday"] = "Monday";
-$a->strings["Tuesday"] = "Tuesday";
-$a->strings["Wednesday"] = "Wednesday";
-$a->strings["Thursday"] = "Thursday";
-$a->strings["Friday"] = "Friday";
-$a->strings["Saturday"] = "Saturday";
-$a->strings["First day of week:"] = "First day of the week:";
-$a->strings["Day of month"] = "";
-$a->strings["#num#th of each month"] = "";
-$a->strings["#num#th-last of each month"] = "";
-$a->strings["#num#th #wkday# of each month"] = "";
-$a->strings["#num#th-last #wkday# of each month"] = "";
-$a->strings["#num#th of the given month"] = "";
-$a->strings["#num#th-last of the given month"] = "";
-$a->strings["#num#th #wkday# of the given month"] = "";
-$a->strings["#num#th-last #wkday# of the given month"] = "";
-$a->strings["Repeat until"] = "Repeat until";
-$a->strings["Infinite"] = "Indefinite";
-$a->strings["Until the following date"] = "Until the following date";
-$a->strings["Number of times"] = "Number of times";
-$a->strings["Exceptions"] = "Exceptions";
-$a->strings["none"] = "none";
-$a->strings["Notification"] = "Notification";
-$a->strings["Notify by"] = "Notify by";
-$a->strings["Remove"] = "Remove";
-$a->strings["E-Mail"] = "Email";
-$a->strings["On Friendica / Display"] = "On Friendica / Display";
-$a->strings["Time"] = "Time";
-$a->strings["Hours"] = "Hours";
-$a->strings["Minutes"] = "Minutes";
-$a->strings["Seconds"] = "Seconds";
-$a->strings["Weeks"] = "Weeks";
-$a->strings["before the"] = "before the";
-$a->strings["start of the event"] = "start of the event";
-$a->strings["end of the event"] = "end of the event";
-$a->strings["Add a notification"] = "Add a notification";
-$a->strings["The event #name# will start at #date"] = "The event #name# will start at #date";
-$a->strings["#name# is about to begin."] = "#name# is about to begin.";
-$a->strings["Saved"] = "Saved";
-$a->strings["U.S. Time Format (mm/dd/YYYY)"] = "US time format (mm/dd/YYYY)";
-$a->strings["German Time Format (dd.mm.YYYY)"] = "UK time format (dd/mm/YYYY)";
-$a->strings["Private Events"] = "Private events";
-$a->strings["No access"] = "No access";
-$a->strings["Private Addressbooks"] = "Private address books";
diff --git a/dwpost/lang/en-gb/messages.po b/dwpost/lang/en-gb/messages.po
index 08fc0c6b..19daaaac 100644
--- a/dwpost/lang/en-gb/messages.po
+++ b/dwpost/lang/en-gb/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2018-04-13 19:44+0000\n"
+"PO-Revision-Date: 2018-04-08 17:59+0000\n"
 "Last-Translator: Kris\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/Friendica/friendica/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr "Dreamwidth Post Settings"
 
 #: dwpost.php:72
 msgid "Enable dreamwidth Post Addon"
-msgstr "Enable Dreamwidth post addon"
+msgstr ""
 
 #: dwpost.php:77
 msgid "dreamwidth username"
diff --git a/dwpost/lang/en-gb/strings.php b/dwpost/lang/en-gb/strings.php
index 1f03e9b1..0b5fd71b 100644
--- a/dwpost/lang/en-gb/strings.php
+++ b/dwpost/lang/en-gb/strings.php
@@ -7,7 +7,7 @@ function string_plural_select_en_gb($n){
 ;
 $a->strings["Post to Dreamwidth"] = "Post to Dreamwidth";
 $a->strings["Dreamwidth Post Settings"] = "Dreamwidth Post Settings";
-$a->strings["Enable dreamwidth Post Addon"] = "Enable Dreamwidth post addon";
+$a->strings["Enable dreamwidth Post Addon"] = "";
 $a->strings["dreamwidth username"] = "Dreamwidth username";
 $a->strings["dreamwidth password"] = "Dreamwidth password";
 $a->strings["Post to dreamwidth by default"] = "Post to Dreamwidth by default";
diff --git a/fromgplus/lang/en-gb/messages.po b/fromgplus/lang/en-gb/messages.po
deleted file mode 100644
index 48126983..00000000
--- a/fromgplus/lang/en-gb/messages.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# ADDON fromgplus
-# Copyright (C)
-# This file is distributed under the same license as the Friendica fromgplus addon package.
-# 
-# 
-# Translators:
-# Kris, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-01 11:14-0400\n"
-"PO-Revision-Date: 2018-04-13 19:45+0000\n"
-"Last-Translator: Kris\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/Friendica/friendica/language/en_GB/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: fromgplus.php:55 fromgplus.php:59
-msgid "Google+ Mirror"
-msgstr "Google+ Mirror"
-
-#: fromgplus.php:64
-msgid "Enable Google+ Import"
-msgstr "Enable Google+ Import"
-
-#: fromgplus.php:67
-msgid "Google Account ID"
-msgstr "Google Account ID"
-
-#: fromgplus.php:70
-msgid "Add keywords to post"
-msgstr "Add keywords to post"
-
-#: fromgplus.php:75 fromgplus.php:105
-msgid "Save Settings"
-msgstr "Save Settings"
-
-#: fromgplus.php:96
-msgid "Google+ Import Settings saved."
-msgstr "Google+ Import Settings saved."
-
-#: fromgplus.php:106
-msgid "Key"
-msgstr "Key"
-
-#: fromgplus.php:114
-msgid "Settings updated."
-msgstr "Settings updated."
diff --git a/fromgplus/lang/en-gb/strings.php b/fromgplus/lang/en-gb/strings.php
deleted file mode 100644
index ba392c4a..00000000
--- a/fromgplus/lang/en-gb/strings.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_en_gb")) {
-function string_plural_select_en_gb($n){
-	return ($n != 1);;
-}}
-;
-$a->strings["Google+ Mirror"] = "Google+ Mirror";
-$a->strings["Enable Google+ Import"] = "Enable Google+ Import";
-$a->strings["Google Account ID"] = "Google Account ID";
-$a->strings["Add keywords to post"] = "Add keywords to post";
-$a->strings["Save Settings"] = "Save Settings";
-$a->strings["Google+ Import Settings saved."] = "Google+ Import Settings saved.";
-$a->strings["Key"] = "Key";
-$a->strings["Settings updated."] = "Settings updated.";
diff --git a/ifttt/lang/en-gb/messages.po b/ifttt/lang/en-gb/messages.po
deleted file mode 100644
index 13cabc13..00000000
--- a/ifttt/lang/en-gb/messages.po
+++ /dev/null
@@ -1,51 +0,0 @@
-# ADDON ifttt
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ifttt addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-27 09:30+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Kris, 2018\n"
-"Language-Team: English (United Kingdom) (https://www.transifex.com/Friendica/teams/12172/en_GB/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ifttt.php:53 ifttt.php:57
-msgid "IFTTT Mirror"
-msgstr "IFTTT Mirror"
-
-#: ifttt.php:61
-msgid ""
-"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
-"three Facebook recipes that are connected with <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
-"Maker\") with the following parameters:"
-msgstr ""
-
-#: ifttt.php:68
-msgid "Body for \"new status message\""
-msgstr ""
-
-#: ifttt.php:70
-msgid "Body for \"new photo upload\""
-msgstr ""
-
-#: ifttt.php:72
-msgid "Body for \"new link post\""
-msgstr ""
-
-#: ifttt.php:77
-msgid "Generate new key"
-msgstr "Generate new key"
-
-#: ifttt.php:81
-msgid "Save Settings"
-msgstr "Save settings"
diff --git a/ifttt/lang/en-gb/strings.php b/ifttt/lang/en-gb/strings.php
deleted file mode 100644
index 11d56fde..00000000
--- a/ifttt/lang/en-gb/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_en_gb")) {
-function string_plural_select_en_gb($n){
-	return ($n != 1);;
-}}
-;
-$a->strings["IFTTT Mirror"] = "IFTTT Mirror";
-$a->strings["Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create three Facebook recipes that are connected with <a href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then Maker\") with the following parameters:"] = "";
-$a->strings["Body for \"new status message\""] = "";
-$a->strings["Body for \"new photo upload\""] = "";
-$a->strings["Body for \"new link post\""] = "";
-$a->strings["Generate new key"] = "Generate new key";
-$a->strings["Save Settings"] = "Save settings";
diff --git a/libertree/lang/fr/strings.php b/libertree/lang/fr/strings.php
index e3e9ff7e..1e227914 100644
--- a/libertree/lang/fr/strings.php
+++ b/libertree/lang/fr/strings.php
@@ -7,7 +7,7 @@ function string_plural_select_fr($n){
 ;
 $a->strings["Post to libertree"] = "Publier sur libertree";
 $a->strings["libertree Post Settings"] = "Réglages des messages sur libertree";
-$a->strings["Enable Libertree Post Addon"] = "Activer leaddonde publication sur libertree";
+$a->strings["Enable Libertree Post Addon"] = "Activer le addon de publication sur libertree";
 $a->strings["Libertree API token"] = "Clé de l'API libertree";
 $a->strings["Libertree site URL"] = "URL du site libertree";
 $a->strings["Post to Libertree by default"] = "Publier sur libertree par défaut";
diff --git a/mailstream/lang/en-gb/messages.po b/mailstream/lang/en-gb/messages.po
deleted file mode 100644
index 7321ca72..00000000
--- a/mailstream/lang/en-gb/messages.po
+++ /dev/null
@@ -1,98 +0,0 @@
-# ADDON mailstream
-# Copyright (C)
-# This file is distributed under the same license as the Friendica mailstream addon package.
-# 
-# 
-# Translators:
-# Kris, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-11 19:13+0100\n"
-"PO-Revision-Date: 2018-04-13 17:46+0000\n"
-"Last-Translator: Kris\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/Friendica/friendica/language/en_GB/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: mailstream.php:77
-msgid "From Address"
-msgstr "From address"
-
-#: mailstream.php:79
-msgid "Email address that stream items will appear to be from."
-msgstr "Email address that stream items will appear to be from."
-
-#: mailstream.php:82 mailstream.php:380
-msgid "Save Settings"
-msgstr "Save settings"
-
-#: mailstream.php:223
-msgid "Re:"
-msgstr "Re:"
-
-#: mailstream.php:231
-msgid "Friendica post"
-msgstr "Friendica post"
-
-#: mailstream.php:234
-msgid "Diaspora post"
-msgstr "Diaspora post"
-
-#: mailstream.php:244
-msgid "Feed item"
-msgstr "Feed item"
-
-#: mailstream.php:247
-msgid "Email"
-msgstr "Email"
-
-#: mailstream.php:249
-msgid "Friendica Item"
-msgstr "Friendica Item"
-
-#: mailstream.php:293
-msgid "Upstream"
-msgstr "Upstream"
-
-#: mailstream.php:294
-msgid "Local"
-msgstr "Local"
-
-#: mailstream.php:362
-msgid "Enabled"
-msgstr "Enabled"
-
-#: mailstream.php:366
-msgid "Email Address"
-msgstr "Email address"
-
-#: mailstream.php:368
-msgid "Leave blank to use your account email address"
-msgstr "Leave blank if you want to use your account email address"
-
-#: mailstream.php:371
-msgid "Exclude Likes"
-msgstr "Exclude likes"
-
-#: mailstream.php:373
-msgid "Check this to omit mailing \"Like\" notifications"
-msgstr "Tick this to omit mailing \"Like\" notifications"
-
-#: mailstream.php:376
-msgid "Attach Images"
-msgstr "Attach images"
-
-#: mailstream.php:378
-msgid ""
-"Download images in posts and attach them to the email.  Useful for reading "
-"email while offline."
-msgstr "Download images in posts and attach them to the email. Useful for reading email while offline."
-
-#: mailstream.php:379
-msgid "Mail Stream Settings"
-msgstr "Mail Stream settings"
diff --git a/mailstream/lang/en-gb/strings.php b/mailstream/lang/en-gb/strings.php
deleted file mode 100644
index b42a42a1..00000000
--- a/mailstream/lang/en-gb/strings.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_en_gb")) {
-function string_plural_select_en_gb($n){
-	return ($n != 1);;
-}}
-;
-$a->strings["From Address"] = "From address";
-$a->strings["Email address that stream items will appear to be from."] = "Email address that stream items will appear to be from.";
-$a->strings["Save Settings"] = "Save settings";
-$a->strings["Re:"] = "Re:";
-$a->strings["Friendica post"] = "Friendica post";
-$a->strings["Diaspora post"] = "Diaspora post";
-$a->strings["Feed item"] = "Feed item";
-$a->strings["Email"] = "Email";
-$a->strings["Friendica Item"] = "Friendica Item";
-$a->strings["Upstream"] = "Upstream";
-$a->strings["Local"] = "Local";
-$a->strings["Enabled"] = "Enabled";
-$a->strings["Email Address"] = "Email address";
-$a->strings["Leave blank to use your account email address"] = "Leave blank if you want to use your account email address";
-$a->strings["Exclude Likes"] = "Exclude likes";
-$a->strings["Check this to omit mailing \"Like\" notifications"] = "Tick this to omit mailing \"Like\" notifications";
-$a->strings["Attach Images"] = "Attach images";
-$a->strings["Download images in posts and attach them to the email.  Useful for reading email while offline."] = "Download images in posts and attach them to the email. Useful for reading email while offline.";
-$a->strings["Mail Stream Settings"] = "Mail Stream settings";
diff --git a/pageheader/lang/en-gb/messages.po b/pageheader/lang/en-gb/messages.po
deleted file mode 100644
index 5f45ede2..00000000
--- a/pageheader/lang/en-gb/messages.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# ADDON pageheader
-# Copyright (C)
-# This file is distributed under the same license as the Friendica pageheader addon package.
-# 
-# 
-# Translators:
-# Kris, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-11 18:52+0100\n"
-"PO-Revision-Date: 2018-04-13 17:48+0000\n"
-"Last-Translator: Kris\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/Friendica/friendica/language/en_GB/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: pageheader.php:53
-msgid "\"pageheader\" Settings"
-msgstr "Pageheader settings"
-
-#: pageheader.php:54
-msgid "Message"
-msgstr "Message"
-
-#: pageheader.php:54
-msgid ""
-"Message to display on every page on this server (or put a pageheader.html "
-"file in your docroot)"
-msgstr "Message to display above every page on this server (alternatively, put a pageheader.html file in your docroot)"
-
-#: pageheader.php:55
-msgid "Save Settings"
-msgstr "Save settings"
-
-#: pageheader.php:69
-msgid "pageheader Settings saved."
-msgstr "Pageheader settings saved."
diff --git a/pageheader/lang/en-gb/strings.php b/pageheader/lang/en-gb/strings.php
deleted file mode 100644
index d81a110f..00000000
--- a/pageheader/lang/en-gb/strings.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_en_gb")) {
-function string_plural_select_en_gb($n){
-	return ($n != 1);;
-}}
-;
-$a->strings["\"pageheader\" Settings"] = "Pageheader settings";
-$a->strings["Message"] = "Message";
-$a->strings["Message to display on every page on this server (or put a pageheader.html file in your docroot)"] = "Message to display above every page on this server (alternatively, put a pageheader.html file in your docroot)";
-$a->strings["Save Settings"] = "Save settings";
-$a->strings["pageheader Settings saved."] = "Pageheader settings saved.";
diff --git a/piwik/lang/en-gb/messages.po b/piwik/lang/en-gb/messages.po
deleted file mode 100644
index 05736e6a..00000000
--- a/piwik/lang/en-gb/messages.po
+++ /dev/null
@@ -1,64 +0,0 @@
-# ADDON piwik
-# Copyright (C)
-# This file is distributed under the same license as the Friendica piwik addon package.
-# 
-# 
-# Translators:
-# Kris, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-26 12:49+0200\n"
-"PO-Revision-Date: 2018-04-13 17:51+0000\n"
-"Last-Translator: Kris\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/Friendica/friendica/language/en_GB/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: piwik.php:79
-msgid ""
-"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
-"analytics tool."
-msgstr "Traffic on this website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."
-
-#: piwik.php:82
-#, php-format
-msgid ""
-"If you do not want that your visits are logged in this way you <a "
-"href='%s'>can set a cookie to prevent Piwik from tracking further visits of "
-"the site</a> (opt-out)."
-msgstr "If you do not want your visits to be logged in this way, you <a href='%s'>can set a cookie to prevent Piwik from tracking your future visits to this site</a> (opt-out)."
-
-#: piwik.php:89
-msgid "Save Settings"
-msgstr "Save settings"
-
-#: piwik.php:90
-msgid "Piwik Base URL"
-msgstr "Piwik base URL"
-
-#: piwik.php:90
-msgid ""
-"Absolute path to your Piwik installation. (without protocol (http/s), with "
-"trailing slash)"
-msgstr "Absolute path to your Piwik installation. (without the protocol (http or https), but with the trailing slash(/) )"
-
-#: piwik.php:91
-msgid "Site ID"
-msgstr "Site ID"
-
-#: piwik.php:92
-msgid "Show opt-out cookie link?"
-msgstr "Show opt-out cookie link?"
-
-#: piwik.php:93
-msgid "Asynchronous tracking"
-msgstr "Asynchronous tracking"
-
-#: piwik.php:105
-msgid "Settings updated."
-msgstr "Settings updated."
diff --git a/piwik/lang/en-gb/strings.php b/piwik/lang/en-gb/strings.php
deleted file mode 100644
index cff092ca..00000000
--- a/piwik/lang/en-gb/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_en_gb")) {
-function string_plural_select_en_gb($n){
-	return ($n != 1);;
-}}
-;
-$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Traffic on this website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool.";
-$a->strings["If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "If you do not want your visits to be logged in this way, you <a href='%s'>can set a cookie to prevent Piwik from tracking your future visits to this site</a> (opt-out).";
-$a->strings["Save Settings"] = "Save settings";
-$a->strings["Piwik Base URL"] = "Piwik base URL";
-$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absolute path to your Piwik installation. (without the protocol (http or https), but with the trailing slash(/) )";
-$a->strings["Site ID"] = "Site ID";
-$a->strings["Show opt-out cookie link?"] = "Show opt-out cookie link?";
-$a->strings["Asynchronous tracking"] = "Asynchronous tracking";
-$a->strings["Settings updated."] = "Settings updated.";