From e4227394a86d486e1e52d34e0cd32b07139ec942 Mon Sep 17 00:00:00 2001
From: Diego Najar <dignajar@gmail.com>
Date: Sat, 9 Sep 2017 00:33:14 +0200
Subject: [PATCH] Updated language dictionary, improves on Admin panel, Title
 on each section

---
 bl-kernel/admin/controllers/about.php         | 26 +-----
 bl-kernel/admin/controllers/add-user.php      | 14 ++--
 bl-kernel/admin/controllers/categories.php    |  8 ++
 .../admin/controllers/configure-plugin.php    |  7 +-
 bl-kernel/admin/controllers/dashboard.php     | 10 +--
 bl-kernel/admin/controllers/developers.php    |  8 ++
 bl-kernel/admin/controllers/edit-category.php | 13 ++-
 bl-kernel/admin/controllers/edit-page.php     |  3 +-
 bl-kernel/admin/controllers/edit-user.php     |  3 +
 .../admin/controllers/install-plugin.php      | 29 +------
 bl-kernel/admin/controllers/install-theme.php |  4 +-
 bl-kernel/admin/controllers/new-category.php  |  9 ++-
 bl-kernel/admin/controllers/new-page.php      |  3 +
 bl-kernel/admin/controllers/pages.php         |  3 +
 bl-kernel/admin/controllers/plugins.php       |  7 +-
 .../admin/controllers/settings-advanced.php   | 71 +++--------------
 .../admin/controllers/settings-general.php    | 51 ++----------
 .../admin/controllers/settings-regional.php   | 18 ++---
 bl-kernel/admin/controllers/themes.php        |  7 +-
 .../admin/controllers/uninstall-plugin.php    | 13 ++-
 bl-kernel/admin/controllers/user-password.php |  3 +
 bl-kernel/admin/controllers/users.php         |  7 +-
 .../admin/themes/default/css/default.css      |  2 +
 bl-kernel/functions.php                       | 79 ++++++++++++++++++-
 bl-languages/en.json                          | 12 ++-
 bl-plugins/about/plugin.php                   |  2 +-
 bl-plugins/api/languages/en.json              |  6 +-
 bl-plugins/api/languages/es.json              |  7 --
 bl-plugins/api/languages/nl_NL.json           |  7 --
 bl-plugins/api/languages/ru_RU.json           |  7 --
 bl-plugins/api/languages/tr_TR.json           |  7 --
 bl-plugins/api/languages/uk_UA.json           |  7 --
 bl-plugins/api/plugin.php                     |  2 +-
 bl-plugins/categories/languages/en.json       |  4 +-
 bl-plugins/categories/plugin.php              |  2 +-
 bl-plugins/fixed-pages/languages/en.json      |  5 +-
 bl-plugins/fixed-pages/plugin.php             |  2 +-
 bl-plugins/links/languages/en.json            |  3 +-
 bl-plugins/links/plugin.php                   |  2 +-
 bl-plugins/menu/plugin.php                    |  2 +-
 bl-plugins/pages/plugin.php                   |  2 +-
 bl-plugins/rss/languages/ar_MA.json           |  7 --
 bl-plugins/rss/languages/en.json              |  3 +-
 bl-plugins/rss/languages/es.json              |  7 --
 bl-plugins/rss/languages/ja_JP.json           |  7 --
 bl-plugins/rss/languages/nl_NL.json           |  7 --
 bl-plugins/rss/languages/ru_RU.json           |  7 --
 bl-plugins/rss/languages/uk_UA.json           |  7 --
 bl-plugins/rss/plugin.php                     |  1 +
 bl-plugins/tags/languages/bg_BG.json          |  7 --
 bl-plugins/tags/languages/de_CH.json          |  7 --
 bl-plugins/tags/languages/de_DE.json          | 11 ---
 bl-plugins/tags/languages/es.json             |  7 --
 bl-plugins/tags/languages/fr_FR.json          |  7 --
 bl-plugins/tags/languages/ja_JP.json          | 11 ---
 bl-plugins/tags/languages/nl_NL.json          |  7 --
 bl-plugins/tags/languages/pl_PL.json          |  7 --
 bl-plugins/tags/languages/ru_RU.json          | 11 ---
 bl-plugins/tags/languages/tr_TR.json          |  7 --
 bl-plugins/tags/languages/uk_UA.json          |  7 --
 bl-plugins/tags/plugin.php                    |  2 +-
 61 files changed, 223 insertions(+), 391 deletions(-)
 delete mode 100644 bl-plugins/api/languages/es.json
 delete mode 100644 bl-plugins/api/languages/nl_NL.json
 delete mode 100644 bl-plugins/api/languages/ru_RU.json
 delete mode 100644 bl-plugins/api/languages/tr_TR.json
 delete mode 100644 bl-plugins/api/languages/uk_UA.json
 delete mode 100644 bl-plugins/rss/languages/ar_MA.json
 delete mode 100644 bl-plugins/rss/languages/es.json
 delete mode 100644 bl-plugins/rss/languages/ja_JP.json
 delete mode 100644 bl-plugins/rss/languages/nl_NL.json
 delete mode 100644 bl-plugins/rss/languages/ru_RU.json
 delete mode 100644 bl-plugins/rss/languages/uk_UA.json
 delete mode 100644 bl-plugins/tags/languages/bg_BG.json
 delete mode 100644 bl-plugins/tags/languages/de_CH.json
 delete mode 100644 bl-plugins/tags/languages/de_DE.json
 delete mode 100644 bl-plugins/tags/languages/es.json
 delete mode 100644 bl-plugins/tags/languages/fr_FR.json
 delete mode 100644 bl-plugins/tags/languages/ja_JP.json
 delete mode 100644 bl-plugins/tags/languages/nl_NL.json
 delete mode 100644 bl-plugins/tags/languages/pl_PL.json
 delete mode 100644 bl-plugins/tags/languages/ru_RU.json
 delete mode 100644 bl-plugins/tags/languages/tr_TR.json
 delete mode 100644 bl-plugins/tags/languages/uk_UA.json

diff --git a/bl-kernel/admin/controllers/about.php b/bl-kernel/admin/controllers/about.php
index 9297c685..6b0c40e0 100644
--- a/bl-kernel/admin/controllers/about.php
+++ b/bl-kernel/admin/controllers/about.php
@@ -1,26 +1,4 @@
 <?php defined('BLUDIT') or die('Bludit CMS.');
 
-// ============================================================================
-// Check role
-// ============================================================================
-
-if($Login->role()!=='admin') {
-	Alert::set($Language->g('you-do-not-have-sufficient-permissions'));
-	Redirect::page('admin', 'dashboard');
-}
-
-// ============================================================================
-// Functions
-// ============================================================================
-
-// ============================================================================
-// Main before POST
-// ============================================================================
-
-// ============================================================================
-// POST Method
-// ============================================================================
-
-// ============================================================================
-// Main after POST
-// ============================================================================
+// Title of the page
+$layout['title'] .= ' - '.$Language->g('About');
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/add-user.php b/bl-kernel/admin/controllers/add-user.php
index aa44caa0..159c8193 100644
--- a/bl-kernel/admin/controllers/add-user.php
+++ b/bl-kernel/admin/controllers/add-user.php
@@ -4,9 +4,9 @@
 // Check role
 // ============================================================================
 
-if($Login->role()!=='admin') {
-	Alert::set($Language->g('you-do-not-have-sufficient-permissions'));
-	Redirect::page('admin', 'dashboard');
+if ($Login->role()!=='admin') {
+	Alert::set($Language->g('You do not have sufficient permissions'));
+	Redirect::page('dashboard');
 }
 
 // ============================================================================
@@ -21,9 +21,8 @@ if($Login->role()!=='admin') {
 // POST Method
 // ============================================================================
 
-if( $_SERVER['REQUEST_METHOD'] == 'POST' )
-{
-	if( createUser($_POST) ) {
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+	if (createUser($_POST)) {
 		Redirect::page('users');
 	}
 }
@@ -31,3 +30,6 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' )
 // ============================================================================
 // Main after POST
 // ============================================================================
+
+// Title of the page
+$layout['title'] .= ' - '.$Language->g('Add a new user');
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/categories.php b/bl-kernel/admin/controllers/categories.php
index 37794c32..0071384c 100644
--- a/bl-kernel/admin/controllers/categories.php
+++ b/bl-kernel/admin/controllers/categories.php
@@ -4,6 +4,11 @@
 // Check role
 // ============================================================================
 
+if ($Login->role()!=='admin') {
+	Alert::set($Language->g('You do not have sufficient permissions'));
+	Redirect::page('dashboard');
+}
+
 // ============================================================================
 // Functions
 // ============================================================================
@@ -19,3 +24,6 @@
 // ============================================================================
 // Main after POST
 // ============================================================================
+
+// Title of the page
+$layout['title'] .= ' - '.$Language->g('Categories');
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/configure-plugin.php b/bl-kernel/admin/controllers/configure-plugin.php
index 8082c794..42c6d11b 100644
--- a/bl-kernel/admin/controllers/configure-plugin.php
+++ b/bl-kernel/admin/controllers/configure-plugin.php
@@ -4,8 +4,8 @@
 // Check role
 // ============================================================================
 
-if($Login->role()!=='admin') {
-	Alert::set($Language->g('you-do-not-have-sufficient-permissions'));
+if ($Login->role()!=='admin') {
+	Alert::set($Language->g('You do not have sufficient permissions'));
 	Redirect::page('dashboard');
 }
 
@@ -59,3 +59,6 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' )
 // ============================================================================
 // Main after POST
 // ============================================================================
+
+// Title of the page
+$layout['title'] .= ' - '.$Language->g('Plugin').' - '.$plugin->name();
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/dashboard.php b/bl-kernel/admin/controllers/dashboard.php
index 6f0ba3f5..d8643075 100644
--- a/bl-kernel/admin/controllers/dashboard.php
+++ b/bl-kernel/admin/controllers/dashboard.php
@@ -101,11 +101,5 @@
 // Try update Bludit
 //updateBludit();
 
-// Get draft pages
-$_draftPages = array();
-foreach($pages as $Page)
-{
-	if(!$Page->published()) {
-		array_push($_draftPages, $Page);
-	}
-}
+// Title of the page
+$layout['title'] .= ' - '.$Language->g('Dashboard');
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/developers.php b/bl-kernel/admin/controllers/developers.php
index f00846a2..bdf3ebf5 100644
--- a/bl-kernel/admin/controllers/developers.php
+++ b/bl-kernel/admin/controllers/developers.php
@@ -4,10 +4,16 @@
 // Check role
 // ============================================================================
 
+if ($Login->role()!=='admin') {
+	Alert::set($Language->g('You do not have sufficient permissions'));
+	Redirect::page('dashboard');
+}
+
 // ============================================================================
 // Functions
 // ============================================================================
 
+// This function is used on the VIEW to show the tables
 function printTable($title, $array) {
 	echo '<h2>'.$title.'</h2>';
 	echo '
@@ -47,3 +53,5 @@ function printTable($title, $array) {
 // ============================================================================
 // Main after POST
 // ============================================================================
+
+$layout['title'] .= ' - '.$Language->g('Developers');
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/edit-category.php b/bl-kernel/admin/controllers/edit-category.php
index a50e7453..f93e541c 100644
--- a/bl-kernel/admin/controllers/edit-category.php
+++ b/bl-kernel/admin/controllers/edit-category.php
@@ -4,8 +4,8 @@
 // Check role
 // ============================================================================
 
-if($Login->role()!=='admin') {
-	Alert::set($Language->g('you-do-not-have-sufficient-permissions'));
+if ($Login->role()!=='admin') {
+	Alert::set($Language->g('You do not have sufficient permissions'));
 	Redirect::page('dashboard');
 }
 
@@ -21,8 +21,7 @@ if($Login->role()!=='admin') {
 // POST Method
 // ============================================================================
 
-if ($_SERVER['REQUEST_METHOD']=='POST') {
-
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 	if (isset($_POST['delete'])) {
 		deleteCategory($_POST['categoryKey']);
 	}
@@ -36,14 +35,14 @@ if ($_SERVER['REQUEST_METHOD']=='POST') {
 // ============================================================================
 // Main after POST
 // ============================================================================
-
 $categoryKey = $layout['parameters'];
 
-if( !$dbCategories->exists($categoryKey) ) {
+if (!$dbCategories->exists($categoryKey)) {
 	Log::set(__METHOD__.LOG_SEP.'Error occurred when trying to get the category: '.$categoryKey);
 	Redirect::page('categories');
 }
 
 $category = $dbCategories->getName($layout['parameters']);
 
-$layout['title'] .= ' - '.$Language->g('Edit Category').' - '.$category;
+// Title of the page
+$layout['title'] .= ' - '.$Language->g('Edit Category').' - '.$category;
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/edit-page.php b/bl-kernel/admin/controllers/edit-page.php
index 856d9275..350bb2fc 100644
--- a/bl-kernel/admin/controllers/edit-page.php
+++ b/bl-kernel/admin/controllers/edit-page.php
@@ -46,4 +46,5 @@ if( !$dbPages->exists($layout['parameters']) ) {
 
 $page = $pagesByKey[$layout['parameters']];
 
-$layout['title'] .= ' - '.$Language->g('Edit Content');
\ No newline at end of file
+// Title of the page
+$layout['title'] .= ' - '.$Language->g('Edit Content').' - '.$page->title();
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/edit-user.php b/bl-kernel/admin/controllers/edit-user.php
index d9e53ef5..fa312712 100644
--- a/bl-kernel/admin/controllers/edit-user.php
+++ b/bl-kernel/admin/controllers/edit-user.php
@@ -51,3 +51,6 @@ $User = $dbUsers->getUser($layout['parameters']);
 if($User===false) {
 	Redirect::page('users');
 }
+
+// Title of the page
+$layout['title'] .= ' - '.$Language->g('Edit user');
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/install-plugin.php b/bl-kernel/admin/controllers/install-plugin.php
index cfabd262..92f3a643 100644
--- a/bl-kernel/admin/controllers/install-plugin.php
+++ b/bl-kernel/admin/controllers/install-plugin.php
@@ -4,8 +4,8 @@
 // Check role
 // ============================================================================
 
-if($Login->role()!=='admin') {
-	Alert::set($Language->g('you-do-not-have-sufficient-permissions'));
+if ($Login->role()!=='admin') {
+	Alert::set($Language->g('You do not have sufficient permissions'));
 	Redirect::page('dashboard');
 }
 
@@ -25,28 +25,5 @@ if($Login->role()!=='admin') {
 // Main after POST
 // ============================================================================
 $pluginClassName = $layout['parameters'];
-
-// Check if the plugin exists
-if( isset($plugins['all'][$pluginClassName]) ) {
-	$plugin = $plugins['all'][$pluginClassName];
-
-	// Plugins for Bludit PRO
-	$blackList = array('pluginTimeMachine', 'pluginRemoteContent');
-	if( in_array($pluginClassName, $blackList) && !defined('BLUDIT_PRO') ) {
-		Redirect::page('plugins');
-	}
-
-	// Install plugin
-	if( $plugin->install() ) {
-		// Add to syslog
-		$Syslog->add(array(
-			'dictionaryKey'=>'plugin-installed',
-			'notes'=>$plugin->name()
-		));
-
-		// Create an alert
-		Alert::set($Language->g('Plugin installed'));
-	}
-}
-
+activatePlugin($pluginClassName);
 Redirect::page('plugins');
diff --git a/bl-kernel/admin/controllers/install-theme.php b/bl-kernel/admin/controllers/install-theme.php
index b28e6b28..1c80c08a 100644
--- a/bl-kernel/admin/controllers/install-theme.php
+++ b/bl-kernel/admin/controllers/install-theme.php
@@ -4,8 +4,8 @@
 // Check role
 // ============================================================================
 
-if($Login->role()!=='admin') {
-	Alert::set($Language->g('you-do-not-have-sufficient-permissions'));
+if ($Login->role()!=='admin') {
+	Alert::set($Language->g('You do not have sufficient permissions'));
 	Redirect::page('dashboard');
 }
 
diff --git a/bl-kernel/admin/controllers/new-category.php b/bl-kernel/admin/controllers/new-category.php
index f26a1d61..52e50abf 100644
--- a/bl-kernel/admin/controllers/new-category.php
+++ b/bl-kernel/admin/controllers/new-category.php
@@ -4,9 +4,9 @@
 // Check role
 // ============================================================================
 
-if($Login->role()!=='admin') {
-	Alert::set($Language->g('you-do-not-have-sufficient-permissions'));
-	Redirect::page('admin', 'dashboard');
+if ($Login->role()!=='admin') {
+	Alert::set($Language->g('You do not have sufficient permissions'));
+	Redirect::page('dashboard');
 }
 
 // ============================================================================
@@ -59,3 +59,6 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' )
 // ============================================================================
 // Main after POST
 // ============================================================================
+
+// Title of the page
+$layout['title'] .= ' - '.$Language->g('New category');
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/new-page.php b/bl-kernel/admin/controllers/new-page.php
index e5395b93..7043e657 100644
--- a/bl-kernel/admin/controllers/new-page.php
+++ b/bl-kernel/admin/controllers/new-page.php
@@ -27,3 +27,6 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' ) {
 // ============================================================================
 // Main after POST
 // ============================================================================
+
+// Title of the page
+$layout['title'] .= ' - '.$Language->g('New content');
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/pages.php b/bl-kernel/admin/controllers/pages.php
index 37794c32..de09fb7b 100644
--- a/bl-kernel/admin/controllers/pages.php
+++ b/bl-kernel/admin/controllers/pages.php
@@ -19,3 +19,6 @@
 // ============================================================================
 // Main after POST
 // ============================================================================
+
+// Title of the page
+$layout['title'] .= ' - '.$Language->g('Manage Content');
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/plugins.php b/bl-kernel/admin/controllers/plugins.php
index 554fb3ea..75833f08 100644
--- a/bl-kernel/admin/controllers/plugins.php
+++ b/bl-kernel/admin/controllers/plugins.php
@@ -4,8 +4,8 @@
 // Check role
 // ============================================================================
 
-if($Login->role()!=='admin') {
-	Alert::set($Language->g('you-do-not-have-sufficient-permissions'));
+if ($Login->role()!=='admin') {
+	Alert::set($Language->g('You do not have sufficient permissions'));
 	Redirect::page('dashboard');
 }
 
@@ -24,3 +24,6 @@ if($Login->role()!=='admin') {
 // ============================================================================
 // Main after POST
 // ============================================================================
+
+// Title of the page
+$layout['title'] .= ' - '.$Language->g('Plugins');
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/settings-advanced.php b/bl-kernel/admin/controllers/settings-advanced.php
index 79433e9d..49d1b357 100644
--- a/bl-kernel/admin/controllers/settings-advanced.php
+++ b/bl-kernel/admin/controllers/settings-advanced.php
@@ -4,69 +4,15 @@
 // Check role
 // ============================================================================
 
-if($Login->role()!=='admin') {
-	Alert::set($Language->g('you-do-not-have-sufficient-permissions'));
-	Redirect::page('admin', 'dashboard');
+if ($Login->role()!=='admin') {
+	Alert::set($Language->g('You do not have sufficient permissions'));
+	Redirect::page('dashboard');
 }
 
 // ============================================================================
 // Functions
 // ============================================================================
 
-function setSettings($args)
-{
-	global $Site;
-	global $Language;
-	global $Syslog;
-	global $dbPages;
-
-	// Add slash at the begin and end
-	$args['uriPage'] 	= Text::addSlashes($args['uriPage']);
-	$args['uriTag'] 	= Text::addSlashes($args['uriTag']);
-	$args['uriCategory'] 	= Text::addSlashes($args['uriCategory']);
-
-	if(	($args['uriPage']==$args['uriTag']) ||
-		($args['uriPage']==$args['uriCategory']) ||
-		($args['uriTag']==$args['uriCategory'])
-	) {
-		$args = array();
-	}
-
-	if( $Site->set($args) ) {
-		// Add to syslog
-		$Syslog->add(array(
-			'dictionaryKey'=>'changes-on-settings',
-			'notes'=>''
-		));
-
-		// Check actual order by, if different than the new settings sort pages
-		if( $Site->orderBy()!=ORDER_BY ) {
-			if( $Site->orderBy()=='date' ) {
-				$dbPages->sortByDate();
-			}
-			else {
-				$dbPages->sortByPosition();
-			}
-
-			// Save database state
-			$dbPages->save();
-
-			// Re-index categories
-			reindexCategories();
-
-			// Re-index tags
-			reindextags();
-		}
-
-		// Create an alert
-		Alert::set( $Language->g('The changes have been saved') );
-	}
-
-	// Redirect
-	Redirect::page('settings-advanced');
-	return true;
-}
-
 // ============================================================================
 // Main after POST
 // ============================================================================
@@ -75,9 +21,9 @@ function setSettings($args)
 // POST Method
 // ============================================================================
 
-if( $_SERVER['REQUEST_METHOD'] == 'POST' )
-{
-	setSettings($_POST);
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+	editSettings($_POST);
+	Redirect::page('settings-advanced');
 }
 
 // ============================================================================
@@ -96,4 +42,7 @@ foreach($allPublishedPages as $key=>$page) {
 	}
 
 	ksort($homepageOptions);
-}
\ No newline at end of file
+}
+
+// Title of the page
+$layout['title'] .= ' - '.$Language->g('Advanced Settings');
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/settings-general.php b/bl-kernel/admin/controllers/settings-general.php
index 7193cf3a..6608286c 100644
--- a/bl-kernel/admin/controllers/settings-general.php
+++ b/bl-kernel/admin/controllers/settings-general.php
@@ -4,52 +4,15 @@
 // Check role
 // ============================================================================
 
-if($Login->role()!=='admin') {
-	Alert::set($Language->g('you-do-not-have-sufficient-permissions'));
-	Redirect::page('admin', 'dashboard');
+if ($Login->role()!=='admin') {
+	Alert::set($Language->g('You do not have sufficient permissions'));
+	Redirect::page('dashboard');
 }
 
 // ============================================================================
 // Functions
 // ============================================================================
 
-function setSettings($args)
-{
-	global $Site;
-	global $Language;
-	global $Syslog;
-
-	// Add slash at the begin and end.
-	// This fields are in the settings->advanced mode
-	if(isset($args['form-advanced'])) {
-		$args['url'] 		= Text::addSlashes($args['url'],false,true);
-		$args['uriPost'] 	= Text::addSlashes($args['uriPost']);
-		$args['uriPage'] 	= Text::addSlashes($args['uriPage']);
-		$args['uriTag'] 	= Text::addSlashes($args['uriTag']);
-
-		if(($args['uriPost']==$args['uriPage']) || ($args['uriPost']==$args['uriTag']) || ($args['uriPage']==$args['uriTag']) )
-		{
-			$args = array();
-		}
-	}
-
-	if( $Site->set($args) ) {
-		// Add to syslog
-		$Syslog->add(array(
-			'dictionaryKey'=>'changes-on-settings',
-			'notes'=>''
-		));
-
-		// Create an alert
-		Alert::set( $Language->g('The changes have been saved') );
-
-		// Redirect
-		Redirect::page('settings-general');
-	}
-
-	return true;
-}
-
 // ============================================================================
 // Main after POST
 // ============================================================================
@@ -58,12 +21,14 @@ function setSettings($args)
 // POST Method
 // ============================================================================
 
-if( $_SERVER['REQUEST_METHOD'] == 'POST' )
-{
-	setSettings($_POST);
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+	editSettings($_POST);
+	Redirect::page('settings-general');
 }
 
 // ============================================================================
 // Main after POST
 // ============================================================================
 
+// Title of the page
+$layout['title'] .= ' - '.$Language->g('General Settings');
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/settings-regional.php b/bl-kernel/admin/controllers/settings-regional.php
index 2e057564..2085e82f 100644
--- a/bl-kernel/admin/controllers/settings-regional.php
+++ b/bl-kernel/admin/controllers/settings-regional.php
@@ -4,9 +4,9 @@
 // Check role
 // ============================================================================
 
-if($Login->role()!=='admin') {
-	Alert::set($Language->g('you-do-not-have-sufficient-permissions'));
-	Redirect::page('admin', 'dashboard');
+if ($Login->role()!=='admin') {
+	Alert::set($Language->g('You do not have sufficient permissions'));
+	Redirect::page('dashboard');
 }
 
 // ============================================================================
@@ -21,14 +21,14 @@ if($Login->role()!=='admin') {
 // POST Method
 // ============================================================================
 
-if( $_SERVER['REQUEST_METHOD'] == 'POST' )
-{
-	if (editSettings($_POST)) {
-		Alert::set($Language->g('the-changes-have-been-saved'));
-		Redirect::page('settings-regional');
-	}
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+	editSettings($_POST);
+	Redirect::page('settings-regional');
 }
 
 // ============================================================================
 // Main after POST
 // ============================================================================
+
+// Title of the page
+$layout['title'] .= ' - '.$Language->g('Language and timezone');
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/themes.php b/bl-kernel/admin/controllers/themes.php
index 4c3291ba..ce4341fc 100644
--- a/bl-kernel/admin/controllers/themes.php
+++ b/bl-kernel/admin/controllers/themes.php
@@ -4,8 +4,8 @@
 // Check role
 // ============================================================================
 
-if($Login->role()!=='admin') {
-	Alert::set($Language->g('you-do-not-have-sufficient-permissions'));
+if ($Login->role()!=='admin') {
+	Alert::set($Language->g('You do not have sufficient permissions'));
 	Redirect::page('dashboard');
 }
 
@@ -22,3 +22,6 @@ if($Login->role()!=='admin') {
 // ============================================================================
 
 $themes = buildThemes();
+
+// Title of the page
+$layout['title'] .= ' - '.$Language->g('Themes');
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/uninstall-plugin.php b/bl-kernel/admin/controllers/uninstall-plugin.php
index 4052eb76..1a694a57 100644
--- a/bl-kernel/admin/controllers/uninstall-plugin.php
+++ b/bl-kernel/admin/controllers/uninstall-plugin.php
@@ -4,8 +4,8 @@
 // Check role
 // ============================================================================
 
-if($Login->role()!=='admin') {
-	Alert::set($Language->g('you-do-not-have-sufficient-permissions'));
+if ($Login->role()!=='admin') {
+	Alert::set($Language->g('You do not have sufficient permissions'));
 	Redirect::page('dashboard');
 }
 
@@ -14,7 +14,7 @@ if($Login->role()!=='admin') {
 // ============================================================================
 
 // ============================================================================
-// Main after POST
+// Main before POST
 // ============================================================================
 
 // ============================================================================
@@ -25,8 +25,5 @@ if($Login->role()!=='admin') {
 // Main after POST
 // ============================================================================
 $pluginClassName = $layout['parameters'];
-
-$Plugin = new $pluginClassName;
-$Plugin->uninstall();
-
-Redirect::page('plugins');
+deactivatePlugin($pluginClassName);
+Redirect::page('plugins');
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/user-password.php b/bl-kernel/admin/controllers/user-password.php
index a75b4e77..e498f307 100644
--- a/bl-kernel/admin/controllers/user-password.php
+++ b/bl-kernel/admin/controllers/user-password.php
@@ -77,3 +77,6 @@ if($_user===false) {
 }
 
 $_user['username'] = $layout['parameters'];
+
+// Title of the page
+$layout['title'] .= ' - '.$Language->g('Change password');
\ No newline at end of file
diff --git a/bl-kernel/admin/controllers/users.php b/bl-kernel/admin/controllers/users.php
index 9c4142d6..8fa9ab28 100644
--- a/bl-kernel/admin/controllers/users.php
+++ b/bl-kernel/admin/controllers/users.php
@@ -4,8 +4,8 @@
 // Check role
 // ============================================================================
 
-if($Login->role()!=='admin') {
-	Alert::set($Language->g('you-do-not-have-sufficient-permissions'));
+if ($Login->role()!=='admin') {
+	Alert::set($Language->g('You do not have sufficient permissions'));
 	Redirect::page('dashboard');
 }
 
@@ -29,3 +29,6 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' )
 // ============================================================================
 // Main after POST
 // ============================================================================
+
+// Title of the page
+$layout['title'] .= ' - '.$Language->g('Users');
\ No newline at end of file
diff --git a/bl-kernel/admin/themes/default/css/default.css b/bl-kernel/admin/themes/default/css/default.css
index 57d0baad..a62bfe5f 100644
--- a/bl-kernel/admin/themes/default/css/default.css
+++ b/bl-kernel/admin/themes/default/css/default.css
@@ -63,6 +63,7 @@
 .uk-button {
 	border-radius: 2px !important;
 	padding: 1px 20px !important;
+	margin-right: 5px;
 }
 
 .uk-button-primary {
@@ -701,6 +702,7 @@ div.plugin-links > span.separator {
 #jsformplugin button[type=submit].small {
 	font-size: 0.9em;
 	min-height: 20px;
+	background: #E6E6E6;
 }
 
 #jsformplugin > div > label,
diff --git a/bl-kernel/functions.php b/bl-kernel/functions.php
index 530f4f75..300af12e 100644
--- a/bl-kernel/functions.php
+++ b/bl-kernel/functions.php
@@ -248,6 +248,58 @@ function pluginEnabled($pluginName) {
 	return false;
 }
 
+function activatePlugin($pluginClassName) {
+	global $plugins;
+	global $Syslog;
+	global $Language;
+
+	// Check if the plugin exists
+	if (isset($plugins['all'][$pluginClassName])) {
+		$plugin = $plugins['all'][$pluginClassName];
+		$blackList = array('pluginTimeMachine', 'pluginRemoteContent');
+		if (in_array($pluginClassName, $blackList) && !defined('BLUDIT_PRO')) {
+			return false;
+		}
+
+		if ($plugin->install()) {
+			// Add to syslog
+			$Syslog->add(array(
+				'dictionaryKey'=>'plugin-activated',
+				'notes'=>$plugin->name()
+			));
+
+			// Create an alert
+			Alert::set($Language->g('plugin-activated'));
+			return true;
+		}
+	}
+	return false;
+}
+
+function deactivatePlugin($pluginClassName) {
+	global $plugins;
+	global $Syslog;
+	global $Language;
+
+	// Check if the plugin exists
+	if (isset($plugins['all'][$pluginClassName])) {
+		$plugin = $plugins['all'][$pluginClassName];
+
+		if ($plugin->uninstall()) {
+			// Add to syslog
+			$Syslog->add(array(
+				'dictionaryKey'=>'plugin-deactivated',
+				'notes'=>$plugin->name()
+			));
+
+			// Create an alert
+			Alert::set($Language->g('plugin-deactivated'));
+			return true;
+		}
+	}
+	return false;
+}
+
 function printDebug($array) {
 	echo '<pre>';
 	var_dump($array);
@@ -497,6 +549,7 @@ function createUser($args) {
 function editSettings($args) {
 	global $Site;
 	global $Syslog;
+	global $Language;
 
 	if (isset($args['language'])) {
 		if ($args['language']!=$Site->language()) {
@@ -509,13 +562,35 @@ function editSettings($args) {
 		}
 	}
 
-	if( $Site->set($args) ) {
-		// Add to syslog
+	if (isset($args['uriPage'])) {
+		$args['uriPage'] = Text::addSlashes($args['uriPage']);
+	}
+	if (isset($args['uriTag'])) {
+		$args['uriTag'] = Text::addSlashes($args['uriTag']);
+	}
+	if (isset($args['uriCategory'])) {
+		$args['uriCategory'] = Text::addSlashes($args['uriCategory']);
+	}
+
+	if ($Site->set($args)) {
+		// Check current order-by if changed it reorder the content
+		if ($Site->orderBy()!=ORDER_BY) {
+			if ($Site->orderBy()=='date') {
+				$dbPages->sortByDate();
+			} else {
+				$dbPages->sortByPosition();
+			}
+			$dbPages->save();
+		}
+
+		// Add syslog
 		$Syslog->add(array(
 			'dictionaryKey'=>'changes-on-settings',
 			'notes'=>''
 		));
 
+		// Create alert
+		Alert::set($Language->g('The changes have been saved'));
 		return true;
 	}
 
diff --git a/bl-languages/en.json b/bl-languages/en.json
index 34eebc7d..4d34aa2f 100644
--- a/bl-languages/en.json
+++ b/bl-languages/en.json
@@ -18,7 +18,9 @@
 	"thanks-for-support-bludit": "Thanks for support Bludit",
 	"upgrade-to-bludit-pro": "Upgrade to Bludit PRO",
 	"language": "Language",
+	"plugin": "Plugin",
 	"plugins": "Plugins",
+	"developers": "Developers",
 	"themes": "Themes",
 	"about": "About",
 	"url": "URL",
@@ -39,12 +41,14 @@
 	"manage-content": "Manage content",
 	"add-new-content": "Add new content",
 	"new-category": "New category",
+	"you-do-not-have-sufficient-permissions": "You do not have sufficient permissions",
 	"add-a-new-user": "Add a new user",
 	"url-associated-with-the-page": "URL associated with the page.",
 	"language-and-timezone": "Language and timezone",
 	"change-your-language-and-region-settings": "Change your language and region settings.",
 	"notifications": "Notifications",
-	"plugin-installed": "Plugin installed",
+	"plugin-activated": "Plugin activated",
+	"plugin-deactivated": "Plugin deactivated",
 	"new-theme-configured": "New theme configured",
 	"changes-on-settings": "Changes on settings",
 	"plugin-configured": "Plugin configured",
@@ -188,5 +192,9 @@
 	"token": "Token",
 	"current-status": "Current status",
 	"upload-image": "Upload image",
-	"this-token-is-similar-to-your-password-you-should-not-share-it": "This token is similar to your password, you should not share it."
+	"this-token-is-similar-to-your-password-you-should-not-share-it": "This token is similar to your password, you should not share it.",
+	"the-changes-have-been-saved": "The changes have been saved",
+	"label": "Label",
+	"links": "Links",
+	"this-title-is-almost-always-used-in-the-sidebar-of-the-site": "This title is almost always used in the sidebar of the site."
 }
\ No newline at end of file
diff --git a/bl-plugins/about/plugin.php b/bl-plugins/about/plugin.php
index dce9effa..30d4ecee 100644
--- a/bl-plugins/about/plugin.php
+++ b/bl-plugins/about/plugin.php
@@ -17,7 +17,7 @@ class pluginAbout extends Plugin {
 		$html  = '<div>';
 		$html .= '<label>'.$Language->get('Label').'</label>';
 		$html .= '<input id="jslabel" name="label" type="text" value="'.$this->getValue('label').'">';
-		$html .= '<span class="tip">'.$Language->get('Title of the plugin for the sidebar').'</span>';
+		$html .= '<span class="tip">'.$Language->get('This title is almost always used in the sidebar of the site').'</span>';
 		$html .= '</div>';
 
 		$html .= '<div>';
diff --git a/bl-plugins/api/languages/en.json b/bl-plugins/api/languages/en.json
index c7354f40..545bfa3e 100644
--- a/bl-plugins/api/languages/en.json
+++ b/bl-plugins/api/languages/en.json
@@ -3,5 +3,9 @@
 	{
 		"name": "API",
 		"description": "Interface to interact with Bludit using HTTP protocol. <br> Read more about this plugin on <a href=\"https://docs.bludit.com/en/api/introduction\">API Introduction</a>."
-	}
+	},
+	"api-token": "API Token",
+	"amount-of-pages": "Amount of pages",
+	"this-is-the-maximum-of-pages-to-return-when-you-call-to": "This is the maximum of pages to return when you call to /api/pages",
+	"this-token-is-for-read-only-and-is-regenerated-every-time-you-install-the-plugin": "This token is for read only and is regenerated every time you install the plugin"
 }
\ No newline at end of file
diff --git a/bl-plugins/api/languages/es.json b/bl-plugins/api/languages/es.json
deleted file mode 100644
index ec517d10..00000000
--- a/bl-plugins/api/languages/es.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "API",
-		"description": "Interfaz para interactuar con Bludit mediante el protocolo HTTP."
-	}
-}
\ No newline at end of file
diff --git a/bl-plugins/api/languages/nl_NL.json b/bl-plugins/api/languages/nl_NL.json
deleted file mode 100644
index 43dbcd54..00000000
--- a/bl-plugins/api/languages/nl_NL.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "API",
-		"description": "Interface om te communiceren met Bludit via het HTTP protocol."
-	}
-}
diff --git a/bl-plugins/api/languages/ru_RU.json b/bl-plugins/api/languages/ru_RU.json
deleted file mode 100644
index 83f36790..00000000
--- a/bl-plugins/api/languages/ru_RU.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "API",
-		"description": "Интерфейс для взаимодействия с Bludit через HTTP протокол."
-	}
-}
diff --git a/bl-plugins/api/languages/tr_TR.json b/bl-plugins/api/languages/tr_TR.json
deleted file mode 100644
index c5e9506b..00000000
--- a/bl-plugins/api/languages/tr_TR.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "API",
-		"description": "Bludit'e HTTP protokolü üzerinden erişmek için arayüz."
-	}
-}
diff --git a/bl-plugins/api/languages/uk_UA.json b/bl-plugins/api/languages/uk_UA.json
deleted file mode 100644
index 591254b8..00000000
--- a/bl-plugins/api/languages/uk_UA.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "API",
-		"description": "Інтерфейс для взаємодії з Bludit за допомогою протоколу HTTP."
-	}
-}
diff --git a/bl-plugins/api/plugin.php b/bl-plugins/api/plugin.php
index 5a060b53..eaafb566 100644
--- a/bl-plugins/api/plugin.php
+++ b/bl-plugins/api/plugin.php
@@ -28,7 +28,7 @@ class pluginAPI extends Plugin {
 		$html .= '<div>';
 		$html .= '<label>'.$Language->get('Amount of pages').'</label>';
 		$html .= '<input id="jsamountOfItems" name="amountOfItems" type="text" value="'.$this->getValue('amountOfItems').'">';
-		$html .= '<span class="tip">'.$Language->get('The amount of pages to return when you call to /api/pages').'</span>';
+		$html .= '<span class="tip">'.$Language->get('This is the maximum of pages to return when you call to').'</span>';
 		$html .= '</div>';
 
 		return $html;
diff --git a/bl-plugins/categories/languages/en.json b/bl-plugins/categories/languages/en.json
index 07598ae8..0b266caa 100644
--- a/bl-plugins/categories/languages/en.json
+++ b/bl-plugins/categories/languages/en.json
@@ -3,5 +3,7 @@
 	{
 		"name": "Categories",
 		"description": "Shows all categories on the system on the sidebar."
-	}
+	},
+	"categories-without-content": "Categories without content",
+	"show-the-categories-without-content": "Show the categories without content."
 }
diff --git a/bl-plugins/categories/plugin.php b/bl-plugins/categories/plugin.php
index 8ffae222..b545621f 100644
--- a/bl-plugins/categories/plugin.php
+++ b/bl-plugins/categories/plugin.php
@@ -19,7 +19,7 @@ class pluginCategories extends Plugin {
 		$html  = '<div>';
 		$html .= '<label>'.$Language->get('Label').'</label>';
 		$html .= '<input name="label" type="text" value="'.$this->getValue('label').'">';
-		$html .= '<span class="tip">'.$Language->get('Title of the plugin for the sidebar').'</span>';
+		$html .= '<span class="tip">'.$Language->get('This title is almost always used in the sidebar of the site').'</span>';
 		$html .= '</div>';
 
 		$html .= '<div>';
diff --git a/bl-plugins/fixed-pages/languages/en.json b/bl-plugins/fixed-pages/languages/en.json
index 275910e2..e2288666 100644
--- a/bl-plugins/fixed-pages/languages/en.json
+++ b/bl-plugins/fixed-pages/languages/en.json
@@ -4,7 +4,6 @@
 		"name": "Fixed pages",
 		"description": "Shows the fixed pages on the sidebar, this plugin is useful when you want to create a blog with static pages."
 	},
-	"home-page": "Home page",
-	"show-home-link": "Show home link",
-	"amount-of-items": "Amount of items"
+	"home-link": "Home link",
+	"show-the-home-link-on-the-sidebar": "Show the home link on the sidebar."
 }
\ No newline at end of file
diff --git a/bl-plugins/fixed-pages/plugin.php b/bl-plugins/fixed-pages/plugin.php
index bd14790b..bcfe8849 100644
--- a/bl-plugins/fixed-pages/plugin.php
+++ b/bl-plugins/fixed-pages/plugin.php
@@ -19,7 +19,7 @@ class pluginFixedPages extends Plugin {
 		$html  = '<div>';
 		$html .= '<label>'.$Language->get('Label').'</label>';
 		$html .= '<input id="jslabel" name="label" type="text" value="'.$this->getValue('label').'">';
-		$html .= '<span class="tip">'.$Language->get('Title of the plugin for the sidebar').'</span>';
+		$html .= '<span class="tip">'.$Language->get('This title is almost always used in the sidebar of the site').'</span>';
 		$html .= '</div>';
 
 		$html .= '<div>';
diff --git a/bl-plugins/links/languages/en.json b/bl-plugins/links/languages/en.json
index 571b443c..8b5278eb 100644
--- a/bl-plugins/links/languages/en.json
+++ b/bl-plugins/links/languages/en.json
@@ -3,5 +3,6 @@
 	{
 		"name": "Links",
 		"description": "Shows a link list in the sidebar, you can modify these links in settings."
-	}
+	},
+	"add-a-new-link": "Add a new link"
 }
diff --git a/bl-plugins/links/plugin.php b/bl-plugins/links/plugin.php
index e90b0d65..bd0b2e3f 100644
--- a/bl-plugins/links/plugin.php
+++ b/bl-plugins/links/plugin.php
@@ -67,7 +67,7 @@ class pluginLinks extends Plugin {
 		$html  = '<div>';
 		$html .= '<label>'.$Language->get('Label').'</label>';
 		$html .= '<input name="label" type="text" value="'.$this->getValue('label').'">';
-		$html .= '<span class="tip">'.$Language->get('Title of the plugin for the sidebar').'</span>';
+		$html .= '<span class="tip">'.$Language->get('This title is almost always used in the sidebar of the site').'</span>';
 		$html .= '</div>';
 
 		$html .= '<div>';
diff --git a/bl-plugins/menu/plugin.php b/bl-plugins/menu/plugin.php
index 1e443152..269a2f08 100644
--- a/bl-plugins/menu/plugin.php
+++ b/bl-plugins/menu/plugin.php
@@ -18,7 +18,7 @@ class pluginMenu extends Plugin {
 		$html  = '<div>';
 		$html .= '<label>'.$Language->get('Label').'</label>';
 		$html .= '<input id="jslabel" name="label" type="text" value="'.$this->getValue('label').'">';
-		$html .= '<span class="tip">'.$Language->get('Title of the plugin for the sidebar').'</span>';
+		$html .= '<span class="tip">'.$Language->get('This title is almost always used in the sidebar of the site').'</span>';
 		$html .= '</div>';
 
 		return $html;
diff --git a/bl-plugins/pages/plugin.php b/bl-plugins/pages/plugin.php
index fac35517..72da9ec3 100644
--- a/bl-plugins/pages/plugin.php
+++ b/bl-plugins/pages/plugin.php
@@ -20,7 +20,7 @@ class pluginPages extends Plugin {
 		$html  = '<div>';
 		$html .= '<label>'.$Language->get('Label').'</label>';
 		$html .= '<input id="jslabel" name="label" type="text" value="'.$this->getValue('label').'">';
-		$html .= '<span class="tip">'.$Language->get('Title of the plugin for the sidebar').'</span>';
+		$html .= '<span class="tip">'.$Language->get('This title is almost always used in the sidebar of the site').'</span>';
 		$html .= '</div>';
 
 		$html .= '<div>';
diff --git a/bl-plugins/rss/languages/ar_MA.json b/bl-plugins/rss/languages/ar_MA.json
deleted file mode 100644
index ca0383aa..00000000
--- a/bl-plugins/rss/languages/ar_MA.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "RSS Feed",
-		"description": "هذه الإضافة تساعد على توليد تغذية RSS لموقعك."
-	}
-}
\ No newline at end of file
diff --git a/bl-plugins/rss/languages/en.json b/bl-plugins/rss/languages/en.json
index a13078ca..d5e5bf0f 100644
--- a/bl-plugins/rss/languages/en.json
+++ b/bl-plugins/rss/languages/en.json
@@ -3,5 +3,6 @@
 	{
 		"name": "RSS Feed",
 		"description": "This plugin generates an RSS feed of your site."
-	}
+	},
+	"amount-of-items-to-show-on-the-feed": "Amount of items to show on the feed."
 }
\ No newline at end of file
diff --git a/bl-plugins/rss/languages/es.json b/bl-plugins/rss/languages/es.json
deleted file mode 100644
index a17b665f..00000000
--- a/bl-plugins/rss/languages/es.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "RSS Feed",
-		"description": "Este plugin genera contenido RSS Feed para su sitio."
-	}
-}
\ No newline at end of file
diff --git a/bl-plugins/rss/languages/ja_JP.json b/bl-plugins/rss/languages/ja_JP.json
deleted file mode 100644
index 16e3ac94..00000000
--- a/bl-plugins/rss/languages/ja_JP.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "RSS Feed",
-		"description": "サイトのRSSフィードを生成します。"
-	}
-}
\ No newline at end of file
diff --git a/bl-plugins/rss/languages/nl_NL.json b/bl-plugins/rss/languages/nl_NL.json
deleted file mode 100644
index e3e83ff7..00000000
--- a/bl-plugins/rss/languages/nl_NL.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "RSS Feed",
-		"description": "Deze plugin genereerd een RSS Feed voor je website."
-	}
-}
diff --git a/bl-plugins/rss/languages/ru_RU.json b/bl-plugins/rss/languages/ru_RU.json
deleted file mode 100644
index 12fd3c91..00000000
--- a/bl-plugins/rss/languages/ru_RU.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "RSS Feed",
-		"description": "Этот плагин генерирует RSS трансляцию на сайте."
-	}
-}
diff --git a/bl-plugins/rss/languages/uk_UA.json b/bl-plugins/rss/languages/uk_UA.json
deleted file mode 100644
index 49ec5882..00000000
--- a/bl-plugins/rss/languages/uk_UA.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "RSS-канал",
-		"description": "Цей плагін генерує RSS для вашого сайту."
-	}
-}
diff --git a/bl-plugins/rss/plugin.php b/bl-plugins/rss/plugin.php
index be868bb6..ce170375 100644
--- a/bl-plugins/rss/plugin.php
+++ b/bl-plugins/rss/plugin.php
@@ -18,6 +18,7 @@ class pluginRSS extends Plugin {
 		$html  = '<div>';
 		$html .= '<label>'.$Language->get('Amount of items').'</label>';
 		$html .= '<input id="jsamountOfItems" name="amountOfItems" type="text" value="'.$this->getValue('amountOfItems').'">';
+		$html .= '<span class="tip">'.$Language->get('Amount of items to show on the feed').'</span>';
 		$html .= '</div>';
 
 		return $html;
diff --git a/bl-plugins/tags/languages/bg_BG.json b/bl-plugins/tags/languages/bg_BG.json
deleted file mode 100644
index 29dda285..00000000
--- a/bl-plugins/tags/languages/bg_BG.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "Етикети",
-		"description": "Покажи всички етикети."
-	}
-}
\ No newline at end of file
diff --git a/bl-plugins/tags/languages/de_CH.json b/bl-plugins/tags/languages/de_CH.json
deleted file mode 100644
index 5149f12d..00000000
--- a/bl-plugins/tags/languages/de_CH.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "Anzeige aller Schlagwörter",
-		"description": "Anzeige aller Schlagwörter in der Seitenleiste (bei Themes mit Seitenleiste)."
-	}
-}
diff --git a/bl-plugins/tags/languages/de_DE.json b/bl-plugins/tags/languages/de_DE.json
deleted file mode 100644
index 47f11970..00000000
--- a/bl-plugins/tags/languages/de_DE.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "Anzeige aller Schlagwörter",
-		"description": "Anzeige aller Schlagwörter in der Seitenleiste (bei Themes mit Seitenleiste)."
-	},
-    "sort-the-tag-list-by": "Sortierung der Schlagwörter nach",
-	"alphabetical-order": "Alphabetische Reihenfolge",
-	"number-of-times-each-tag-has-been-used": "Anzahl der Verwendung",
-	"date-each-tag-was-first-used": "Datum der ersten Verwendung"
-}
\ No newline at end of file
diff --git a/bl-plugins/tags/languages/es.json b/bl-plugins/tags/languages/es.json
deleted file mode 100644
index b72d0e55..00000000
--- a/bl-plugins/tags/languages/es.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "Listado de tags",
-		"description": "Muestra los tags de forma ordenada y muestra la cantidad de posts asociados a un tag."
-	}
-}
\ No newline at end of file
diff --git a/bl-plugins/tags/languages/fr_FR.json b/bl-plugins/tags/languages/fr_FR.json
deleted file mode 100644
index 36575d23..00000000
--- a/bl-plugins/tags/languages/fr_FR.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "Liste de mots clés",
-		"description": "Affiche la lise de tous les mots clés."
-	}
-}
\ No newline at end of file
diff --git a/bl-plugins/tags/languages/ja_JP.json b/bl-plugins/tags/languages/ja_JP.json
deleted file mode 100644
index 07f7cf95..00000000
--- a/bl-plugins/tags/languages/ja_JP.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "Tags list",
-		"description": "すべてのタグを表示します。"
-	},
-	"tag-sort-order": "タグ・リストの順番",
-	"tag-sort-alphabetical": "アルファベット順",
-	"tag-sort-count": "タグの利用回数順",
-	"tag-sort-date": "最初に利用されたタグ順"
-}
diff --git a/bl-plugins/tags/languages/nl_NL.json b/bl-plugins/tags/languages/nl_NL.json
deleted file mode 100644
index 4c589af1..00000000
--- a/bl-plugins/tags/languages/nl_NL.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "Tag lijst",
-		"description": "Toon alle tags."
-	}
-}
diff --git a/bl-plugins/tags/languages/pl_PL.json b/bl-plugins/tags/languages/pl_PL.json
deleted file mode 100644
index ae5f30ad..00000000
--- a/bl-plugins/tags/languages/pl_PL.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "Lista tagów",
-		"description": "Wyświetla wszystkie tagi w postaci listy."
-	}
-}
\ No newline at end of file
diff --git a/bl-plugins/tags/languages/ru_RU.json b/bl-plugins/tags/languages/ru_RU.json
deleted file mode 100644
index 21a372de..00000000
--- a/bl-plugins/tags/languages/ru_RU.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "Список тегов",
-		"description": "Показывает все теги."
-	},
-	"tag-sort-order": "Сортировать по",
-	"tag-sort-alphabetical": "алфавиту",
-	"tag-sort-count": "количеству",
-	"tag-sort-date": "дате"
-}
diff --git a/bl-plugins/tags/languages/tr_TR.json b/bl-plugins/tags/languages/tr_TR.json
deleted file mode 100644
index 7e4d39b1..00000000
--- a/bl-plugins/tags/languages/tr_TR.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "Tag listesi",
-		"description": "Bütün tagları gösterir."
-	}
-}
diff --git a/bl-plugins/tags/languages/uk_UA.json b/bl-plugins/tags/languages/uk_UA.json
deleted file mode 100644
index 3d5a9861..00000000
--- a/bl-plugins/tags/languages/uk_UA.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"plugin-data":
-	{
-		"name": "Список тегів",
-		"description": "Показує всі теги."
-	}
-}
\ No newline at end of file
diff --git a/bl-plugins/tags/plugin.php b/bl-plugins/tags/plugin.php
index 03c4e5cc..5e51d2da 100644
--- a/bl-plugins/tags/plugin.php
+++ b/bl-plugins/tags/plugin.php
@@ -16,7 +16,7 @@ class pluginTags extends Plugin {
 		$html  = '<div>';
 		$html .= '<label>'.$Language->get('Label').'</label>';
 		$html .= '<input id="jslabel" name="label" type="text" value="'.$this->getValue('label').'">';
-		$html .= '<span class="tip">'.$Language->get('Title of the plugin for the sidebar').'</span>';
+		$html .= '<span class="tip">'.$Language->get('This title is almost always used in the sidebar of the site').'</span>';
 		$html .= '</div>';
 
 		return $html;