diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index ab66d9198..048ac1c69 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -5,7 +5,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 		if (!$this->view->loginOk) {
 			Minz_Error::error (
 				403,
-				array ('error' => array (Minz_Translate::t ('access_denied')))
+				array ('error' => array (_t('access_denied')))
 			);
 		}
 
@@ -75,7 +75,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 
 			$notif = array (
 				'type' => 'good',
-				'content' => Minz_Translate::t ('feeds_marked_read')
+				'content' => _t('feeds_marked_read')
 			);
 			Minz_Session::_param ('notification', $notif);
 		} else {
@@ -111,7 +111,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 
 			$notif = array (
 				'type' => 'good',
-				'content' => Minz_Translate::t ('optimization_complete')
+				'content' => _t('optimization_complete')
 			);
 			Minz_Session::_param ('notification', $notif);
 		}
@@ -155,7 +155,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 
 		$notif = array(
 			'type' => 'good',
-			'content' => Minz_Translate::t('purge_completed', $nbTotal)
+			'content' => _t('purge_completed', $nbTotal)
 		);
 		Minz_Session::_param('notification', $notif);
 
diff --git a/app/Controllers/errorController.php b/app/Controllers/errorController.php
index 922650b3d..64a5c06fd 100644
--- a/app/Controllers/errorController.php
+++ b/app/Controllers/errorController.php
@@ -24,11 +24,11 @@ class FreshRSS_error_Controller extends Minz_ActionController {
 		if ($this->view->errorMessage == '') {
 			switch(Minz_Request::param('code')) {
 				case 403:
-					$this->view->errorMessage = Minz_Translate::t('forbidden_access');
+					$this->view->errorMessage = _t('forbidden_access');
 					break;
 				case 404:
 				default:
-					$this->view->errorMessage = Minz_Translate::t('page_not_found');
+					$this->view->errorMessage = _t('page_not_found');
 					break;
 			}
 		}
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 92ce40634..029f9fa68 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -15,7 +15,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			) {
 				Minz_Error::error (
 					403,
-					array ('error' => array (Minz_Translate::t ('access_denied')))
+					array ('error' => array (_t('access_denied')))
 				);
 			}
 		}
@@ -84,7 +84,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 					// on est déjà abonné à ce flux
 					$notif = array (
 						'type' => 'bad',
-						'content' => Minz_Translate::t ('already_subscribed', $feed->name ())
+						'content' => _t('already_subscribed', $feed->name ())
 					);
 					Minz_Session::_param ('notification', $notif);
 				} else {
@@ -93,7 +93,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 						// problème au niveau de la base de données
 						$notif = array (
 							'type' => 'bad',
-							'content' => Minz_Translate::t ('feed_not_added', $feed->name ())
+							'content' => _t('feed_not_added', $feed->name ())
 						);
 						Minz_Session::_param ('notification', $notif);
 					} else {
@@ -131,7 +131,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 						// ok, ajout terminé
 						$notif = array (
 							'type' => 'good',
-							'content' => Minz_Translate::t ('feed_added', $feed->name ())
+							'content' => _t('feed_added', $feed->name ())
 						);
 						Minz_Session::_param ('notification', $notif);
 
@@ -143,14 +143,14 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				Minz_Log::record ($e->getMessage (), Minz_Log::WARNING);
 				$notif = array (
 					'type' => 'bad',
-					'content' => Minz_Translate::t ('invalid_url', $url)
+					'content' => _t('invalid_url', $url)
 				);
 				Minz_Session::_param ('notification', $notif);
 			} catch (FreshRSS_Feed_Exception $e) {
 				Minz_Log::record ($e->getMessage (), Minz_Log::WARNING);
 				$notif = array (
 					'type' => 'bad',
-					'content' => Minz_Translate::t ('internal_problem_feed', Minz_Url::display(array('a' => 'logs')))
+					'content' => _t('internal_problem_feed', Minz_Url::display(array('a' => 'logs')))
 				);
 				Minz_Session::_param ('notification', $notif);
 			} catch (Minz_FileNotExistException $e) {
@@ -158,7 +158,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				Minz_Log::record ($e->getMessage (), Minz_Log::ERROR);
 				$notif = array (
 					'type' => 'bad',
-					'content' => Minz_Translate::t ('internal_problem_feed', Minz_Url::display(array('a' => 'logs')))
+					'content' => _t('internal_problem_feed', Minz_Url::display(array('a' => 'logs')))
 				);
 				Minz_Session::_param ('notification', $notif);
 			}
@@ -170,7 +170,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		} else {
 
 			// GET request so we must ask confirmation to user
-			Minz_View::prependTitle(Minz_Translate::t('add_rss_feed') . ' · ');
+			Minz_View::prependTitle(_t('add_rss_feed') . ' · ');
 			$this->view->categories = $this->catDAO->listCategories(false);
 			$this->view->feed = new FreshRSS_Feed($url);
 			try {
@@ -186,9 +186,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				// Already subscribe so we redirect to the feed configuration page
 				$notif = array(
 					'type' => 'bad',
-					'content' => Minz_Translate::t(
-						'already_subscribed', $feed->name()
-					)
+					'content' => _t('already_subscribed', $feed->name())
 				);
 				Minz_Session::_param('notification', $notif);
 
@@ -210,7 +208,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$n = $feedDAO->truncate($id);
 			$notif = array(
 				'type' => $n === false ? 'bad' : 'good',
-				'content' => Minz_Translate::t ('n_entries_deleted', $n)
+				'content' => _t('n_entries_deleted', $n)
 			);
 			Minz_Session::_param ('notification', $notif);
 			invalidateHttpCache();
@@ -336,19 +334,19 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$feed = reset ($feeds);
 			$notif = array (
 				'type' => 'good',
-				'content' => Minz_Translate::t ('feed_actualized', $feed->name ())
+				'content' => _t('feed_actualized', $feed->name ())
 			);
 		} elseif ($flux_update > 1) {
 			// plusieurs flux on été mis à jour
 			$notif = array (
 				'type' => 'good',
-				'content' => Minz_Translate::t ('n_feeds_actualized', $flux_update)
+				'content' => _t('n_feeds_actualized', $flux_update)
 			);
 		} else {
 			// aucun flux n'a été mis à jour, oups
 			$notif = array (
 				'type' => 'good',
-				'content' => Minz_Translate::t ('no_feed_to_refresh')
+				'content' => _t('no_feed_to_refresh')
 			);
 		}
 
@@ -370,7 +368,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			// ressenti utilisateur
 			$notif = array (
 				'type' => 'good',
-				'content' => Minz_Translate::t ('feeds_actualized')
+				'content' => _t('feeds_actualized')
 			);
 			Minz_Session::_param ('notification', $notif);
 			// et on désactive le layout car ne sert à rien
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 1b6563bb3..346739523 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -14,7 +14,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			if ($output === 'rss' && !$token_is_ok) {
 				Minz_Error::error (
 					403,
-					array ('error' => array (Minz_Translate::t ('access_denied')))
+					array ('error' => array (_t('access_denied')))
 				);
 				return;
 			} elseif ($output !== 'rss') {
@@ -62,7 +62,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			Minz_Log::record ('Not found [' . $getType . '][' . $getId . ']', Minz_Log::DEBUG);
 			Minz_Error::error (
 				404,
-				array ('error' => array (Minz_Translate::t ('page_not_found')))
+				array ('error' => array (_t('page_not_found')))
 			);
 			return;
 		}
@@ -145,7 +145,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			Minz_Log::record ($e->getMessage (), Minz_Log::NOTICE);
 			Minz_Error::error (
 				404,
-				array ('error' => array (Minz_Translate::t ('page_not_found')))
+				array ('error' => array (_t('page_not_found')))
 			);
 		}
 	}
@@ -158,12 +158,12 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	private function checkAndProcessType ($getType, $getId) {
 		switch ($getType) {
 			case 'a':
-				$this->view->currentName = Minz_Translate::t ('your_rss_feeds');
+				$this->view->currentName = _t('your_rss_feeds');
 				$this->nb_not_read_cat = $this->view->nb_not_read;
 				$this->view->get_c = $getType;
 				return true;
 			case 's':
-				$this->view->currentName = Minz_Translate::t ('your_favorites');
+				$this->view->currentName = _t('your_favorites');
 				$this->nb_not_read_cat = $this->view->nb_favorites['unread'];
 				$this->view->get_c = $getType;
 				return true;
@@ -202,18 +202,18 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 	}
 	
 	public function aboutAction () {
-		Minz_View::prependTitle (Minz_Translate::t ('about') . ' · ');
+		Minz_View::prependTitle (_t('about') . ' · ');
 	}
 
 	public function logsAction () {
 		if (!$this->view->loginOk) {
 			Minz_Error::error (
 				403,
-				array ('error' => array (Minz_Translate::t ('access_denied')))
+				array ('error' => array (_t('access_denied')))
 			);
 		}
 
-		Minz_View::prependTitle (Minz_Translate::t ('logs') . ' · ');
+		Minz_View::prependTitle (_t('logs') . ' · ');
 
 		if (Minz_Request::isPost ()) {
 			FreshRSS_LogDAO::truncate();
@@ -279,7 +279,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		} else {
 			$res = array ();
 			$res['status'] = 'failure';
-			$res['reason'] = $reason == '' ? Minz_Translate::t ('invalid_login') : $reason;
+			$res['reason'] = $reason == '' ? _t('invalid_login') : $reason;
 			Minz_Log::record ('Persona: ' . $res['reason'], Minz_Log::WARNING);
 		}
 
@@ -368,7 +368,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 			if (!$ok) {
 				$notif = array(
 					'type' => 'bad',
-					'content' => Minz_Translate::t('invalid_login')
+					'content' => _t('invalid_login')
 				);
 				Minz_Session::_param('notification', $notif);
 			}
@@ -403,7 +403,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
 		} elseif (!Minz_Configuration::canLogIn()) {
 			Minz_Error::error (
 				403,
-				array ('error' => array (Minz_Translate::t ('access_denied')))
+				array ('error' => array (_t('access_denied')))
 			);
 		}
 		invalidateHttpCache();
diff --git a/app/Controllers/statsController.php b/app/Controllers/statsController.php
index 3069be34d..4adb5e75d 100644
--- a/app/Controllers/statsController.php
+++ b/app/Controllers/statsController.php
@@ -120,11 +120,11 @@ class FreshRSS_stats_Controller extends Minz_ActionController {
 	public function firstAction() {
 		if (!$this->view->loginOk) {
 			Minz_Error::error(
-			    403, array('error' => array(Minz_Translate::t('access_denied')))
+			    403, array('error' => array(_t('access_denied')))
 			);
 		}
 
-		Minz_View::prependTitle(Minz_Translate::t('stats') . ' · ');
+		Minz_View::prependTitle(_t('stats') . ' · ');
 	}
 
 }
diff --git a/app/Controllers/usersController.php b/app/Controllers/usersController.php
index a9e6c32bc..8eb82f5d5 100644
--- a/app/Controllers/usersController.php
+++ b/app/Controllers/usersController.php
@@ -8,7 +8,7 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 		if (!$this->view->loginOk) {
 			Minz_Error::error(
 				403,
-				array('error' => array(Minz_Translate::t('access_denied')))
+				array('error' => array(_t('access_denied')))
 			);
 		}
 	}
@@ -90,7 +90,7 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 
 			$notif = array(
 				'type' => $ok ? 'good' : 'bad',
-				'content' => Minz_Translate::t($ok ? 'configuration_updated' : 'error_occurred')
+				'content' => _t($ok ? 'configuration_updated' : 'error_occurred')
 			);
 			Minz_Session::_param('notification', $notif);
 		}
@@ -162,7 +162,7 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 
 			$notif = array(
 				'type' => $ok ? 'good' : 'bad',
-				'content' => Minz_Translate::t($ok ? 'user_created' : 'error_occurred', $new_user_name)
+				'content' => _t($ok ? 'user_created' : 'error_occurred', $new_user_name)
 			);
 			Minz_Session::_param('notification', $notif);
 		}
@@ -194,7 +194,7 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 
 			$notif = array(
 				'type' => $ok ? 'good' : 'bad',
-				'content' => Minz_Translate::t($ok ? 'user_deleted' : 'error_occurred', $username)
+				'content' => _t($ok ? 'user_deleted' : 'error_occurred', $username)
 			);
 			Minz_Session::_param('notification', $notif);
 		}
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 58aac4059..16f64fd8b 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -10,7 +10,7 @@ class FreshRSS extends Minz_FrontController {
 			$loginOk = false;	//Basic protection against XSRF attacks
 			Minz_Error::error(
 				403,
-				array('error' => array(Minz_Translate::t('access_denied') . ' [HTTP_REFERER=' .
+				array('error' => array(_t('access_denied') . ' [HTTP_REFERER=' .
 					htmlspecialchars(empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER']) . ']'))
 			);
 		}
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index f11f87f47..5def50a26 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -134,7 +134,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 		$def_cat = $this->searchById (1);
 
 		if ($def_cat == null) {
-			$cat = new FreshRSS_Category (Minz_Translate::t ('default_category'));
+			$cat = new FreshRSS_Category (_t('default_category'));
 			$cat->_id (1);
 
 			$values = array (
diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index 08dd4cd5c..113944508 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -416,7 +416,7 @@ SQL;
 	 */
 	private function convertToTranslatedJson($data = array()) {
 		$translated = array_map(function ($a) {
-			return Minz_Translate::t($a);
+			return _t($a);
 		}, $data);
 
 		return json_encode($translated);
diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php
index 9f64fb4a7..0c96d7175 100644
--- a/app/Models/UserDAO.php
+++ b/app/Models/UserDAO.php
@@ -9,7 +9,7 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
 
 		$ok = false;
 		if (defined('SQL_CREATE_TABLES')) {	//E.g. MySQL
-			$sql = sprintf(SQL_CREATE_TABLES, $db['prefix'] . $username . '_', Minz_Translate::t('default_category'));
+			$sql = sprintf(SQL_CREATE_TABLES, $db['prefix'] . $username . '_', _t('default_category'));
 			$stm = $userPDO->bd->prepare($sql);
 			$ok = $stm && $stm->execute();
 		} else {	//E.g. SQLite
@@ -17,7 +17,7 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
 			if (is_array($SQL_CREATE_TABLES)) {
 				$ok = true;
 				foreach ($SQL_CREATE_TABLES as $instruction) {
-					$sql = sprintf($instruction, '', Minz_Translate::t('default_category'));
+					$sql = sprintf($instruction, '', _t('default_category'));
 					$stm = $userPDO->bd->prepare($sql);
 					$ok &= ($stm && $stm->execute());
 				}
diff --git a/app/layout/aside_stats.phtml b/app/layout/aside_stats.phtml
index fbfb9d84d..1cd31a99c 100644
--- a/app/layout/aside_stats.phtml
+++ b/app/layout/aside_stats.phtml
@@ -1,12 +1,12 @@
 <ul class="nav nav-list aside">
-	<li class="nav-header"><?php echo Minz_Translate::t ('stats'); ?></li>
-	<li class="item<?php echo Minz_Request::actionName () == 'index' ? ' active' : ''; ?>">
-		<a href="<?php echo _url ('stats', 'index'); ?>"><?php echo Minz_Translate::t ('stats_main'); ?></a>
+	<li class="nav-header"><?php echo _t('stats'); ?></li>
+	<li class="item<?php echo Minz_Request::actionName() == 'index' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('stats_main'); ?></a>
 	</li>
-	<li class="item<?php echo Minz_Request::actionName () == 'idle' ? ' active' : ''; ?>">
-		<a href="<?php echo _url ('stats', 'idle'); ?>"><?php echo Minz_Translate::t ('stats_idle'); ?></a>
+	<li class="item<?php echo Minz_Request::actionName() == 'idle' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('stats', 'idle'); ?>"><?php echo _t('stats_idle'); ?></a>
 	</li>
-	<li class="item<?php echo Minz_Request::actionName () == 'repartition' ? ' active' : ''; ?>">
-		<a href="<?php echo _url ('stats', 'repartition'); ?>"><?php echo Minz_Translate::t ('stats_repartition'); ?></a>
+	<li class="item<?php echo Minz_Request::actionName() == 'repartition' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('stats', 'repartition'); ?>"><?php echo _t('stats_repartition'); ?></a>
 	</li>
 </ul>
diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml
index c9cc7fe02..3180fe933 100644
--- a/app/views/configure/archiving.phtml
+++ b/app/views/configure/archiving.phtml
@@ -1,31 +1,31 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo Minz_Translate::t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('configure', 'archiving'); ?>">
-		<legend><?php echo Minz_Translate::t('archiving_configuration'); ?></legend>
-		<p><?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t('archiving_configuration_help'); ?></p>
+		<legend><?php echo _t('archiving_configuration'); ?></legend>
+		<p><?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('archiving_configuration_help'); ?></p>
 
 		<div class="form-group">
-			<label class="group-name" for="old_entries"><?php echo Minz_Translate::t('delete_articles_every'); ?></label>
+			<label class="group-name" for="old_entries"><?php echo _t('delete_articles_every'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="old_entries" name="old_entries" min="1" max="1200" value="<?php echo $this->conf->old_entries; ?>" /> <?php echo Minz_Translate::t('month'); ?>
-				  <a class="btn confirm" href="<?php echo _url('entry', 'purge'); ?>"><?php echo Minz_Translate::t('purge_now'); ?></a>
+				<input type="number" id="old_entries" name="old_entries" min="1" max="1200" value="<?php echo $this->conf->old_entries; ?>" /> <?php echo _t('month'); ?>
+				  <a class="btn confirm" href="<?php echo _url('entry', 'purge'); ?>"><?php echo _t('purge_now'); ?></a>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="keep_history_default"><?php echo Minz_Translate::t('keep_history'), ' ', Minz_Translate::t('by_feed'); ?></label>
+			<label class="group-name" for="keep_history_default"><?php echo _t('keep_history'), ' ', _t('by_feed'); ?></label>
 			<div class="group-controls">
 				<select class="number" name="keep_history_default" id="keep_history_default" required="required"><?php
 					foreach (array('' => '', 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
 						echo '<option value="' . $v . ($this->conf->keep_history_default == $v ? '" selected="selected' : '') . '">' . $t . ' </option>';
 					}
-				?></select> (<?php echo Minz_Translate::t('by_default'); ?>)
+				?></select> (<?php echo _t('by_default'); ?>)
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="ttl_default"><?php echo Minz_Translate::t('ttl'); ?></label>
+			<label class="group-name" for="ttl_default"><?php echo _t('ttl'); ?></label>
 			<div class="group-controls">
 				<select class="number" name="ttl_default" id="ttl_default" required="required"><?php
 					$found = false;
@@ -42,34 +42,34 @@
 					if (!$found) {
 						echo '<option value="' . intval($this->conf->ttl_default) . '" selected="selected">' . intval($this->conf->ttl_default) . 's</option>';
 					}
-				?></select> (<?php echo Minz_Translate::t('by_default'); ?>)
+				?></select> (<?php echo _t('by_default'); ?>)
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo Minz_Translate::t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 	</form>
 
 	<form method="post" action="<?php echo _url('entry', 'optimize'); ?>">
-		<legend><?php echo Minz_Translate::t ('advanced'); ?></legend>
+		<legend><?php echo _t('advanced'); ?></legend>
 
 		<div class="form-group">
-		<p class="group-name"><?php echo Minz_Translate::t('current_user'); ?></p>
+		<p class="group-name"><?php echo _t('current_user'); ?></p>
 			<div class="group-controls">
-				<p><?php echo formatNumber($this->nb_total), ' ', Minz_Translate::t('articles'), ', ', formatBytes($this->size_user); ?></p>
+				<p><?php echo formatNumber($this->nb_total), ' ', _t('articles'), ', ', formatBytes($this->size_user); ?></p>
 				<input type="hidden" name="optimiseDatabase" value="1" />
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t('optimize_bdd'); ?></button>
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t('optimize_todo_sometimes'); ?>
+				<button type="submit" class="btn btn-important"><?php echo _t('optimize_bdd'); ?></button>
+				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('optimize_todo_sometimes'); ?>
 			</div>
 		</div>
 
 		<?php if (Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_'))) { ?>
 		<div class="form-group">
-			<p class="group-name"><?php echo Minz_Translate::t('users'); ?></p>
+			<p class="group-name"><?php echo _t('users'); ?></p>
 			<div class="group-controls">
 				<p><?php echo formatBytes($this->size_total); ?></p>
 			</div>
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 8eb3a156b..f1b80ab15 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -1,13 +1,13 @@
 <?php $this->partial ('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url ('configure', 'display'); ?>">
-		<legend><?php echo Minz_Translate::t ('display_configuration'); ?></legend>
+		<legend><?php echo _t('display_configuration'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="language"><?php echo Minz_Translate::t ('language'); ?></label>
+			<label class="group-name" for="language"><?php echo _t('language'); ?></label>
 			<div class="group-controls">
 				<select name="language" id="language">
 				<?php $languages = $this->conf->availableLanguages (); ?>
@@ -19,13 +19,13 @@
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="theme"><?php echo Minz_Translate::t ('theme'); ?></label>
+			<label class="group-name" for="theme"><?php echo _t('theme'); ?></label>
 			<div class="group-controls">
 				<select name="theme" id="theme" required=""><?php
 					$found = false;
 					foreach ($this->themes as $theme) {
 						?><option value="<?php echo $theme['id']; ?>"<?php if ($this->conf->theme === $theme['id']) { echo ' selected="selected"'; $found = true; } ?>><?php
-							echo $theme['name'] . ' — ' . Minz_Translate::t ('by') . ' ' . $theme['author'];
+							echo $theme['name'] . ' — ' . _t('by') . ' ' . $theme['author'];
 						?></option><?php
 					}
 					if (!$found) {
@@ -37,42 +37,42 @@
 
 		<?php $width = $this->conf->content_width; ?>
 		<div class="form-group">
-			<label class="group-name" for="content_width"><?php echo Minz_Translate::t('content_width'); ?></label>
+			<label class="group-name" for="content_width"><?php echo _t('content_width'); ?></label>
 			<div class="group-controls">
 				<select name="content_width" id="content_width" required="">
 					<option value="thin" <?php echo $width === 'thin'? 'selected="selected"' : ''; ?>>
-						<?php echo Minz_Translate::t('width_thin'); ?>
+						<?php echo _t('width_thin'); ?>
 					</option>
 					<option value="medium" <?php echo $width === 'medium'? 'selected="selected"' : ''; ?>>
-						<?php echo Minz_Translate::t('width_medium'); ?>
+						<?php echo _t('width_medium'); ?>
 					</option>
 					<option value="large" <?php echo $width === 'large'? 'selected="selected"' : ''; ?>>
-						<?php echo Minz_Translate::t('width_large'); ?>
+						<?php echo _t('width_large'); ?>
 					</option>
 					<option value="no_limit" <?php echo $width === 'no_limit'? 'selected="selected"' : ''; ?>>
-						<?php echo Minz_Translate::t('width_no_limit'); ?>
+						<?php echo _t('width_no_limit'); ?>
 					</option>
 				</select>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="theme"><?php echo Minz_Translate::t ('article_icons'); ?></label>
+			<label class="group-name" for="theme"><?php echo _t('article_icons'); ?></label>
 			<table>
 				<thead>
 					<tr>
 						<th> </th>
-						<th title="<?php echo Minz_Translate::t ('mark_read'); ?>"><?php echo FreshRSS_Themes::icon('read'); ?></th>
-						<th title="<?php echo Minz_Translate::t ('mark_favorite'); ?>"><?php echo FreshRSS_Themes::icon('bookmark'); ?></th>
-						<th><?php echo Minz_Translate::t ('sharing'); ?></th>
-						<th><?php echo Minz_Translate::t ('related_tags'); ?></th>
-						<th><?php echo Minz_Translate::t ('publication_date'); ?></th>
+						<th title="<?php echo _t('mark_read'); ?>"><?php echo FreshRSS_Themes::icon('read'); ?></th>
+						<th title="<?php echo _t('mark_favorite'); ?>"><?php echo FreshRSS_Themes::icon('bookmark'); ?></th>
+						<th><?php echo _t('sharing'); ?></th>
+						<th><?php echo _t('related_tags'); ?></th>
+						<th><?php echo _t('publication_date'); ?></th>
 						<th><?php echo FreshRSS_Themes::icon('link'); ?></th>
 					</tr>
 				</thead>
 				<tbody>
 					<tr>
-						<th><?php echo Minz_Translate::t ('top_line'); ?></th>
+						<th><?php echo _t('top_line'); ?></th>
 						<td><input type="checkbox" name="topline_read" value="1"<?php echo $this->conf->topline_read ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" name="topline_favorite" value="1"<?php echo $this->conf->topline_favorite ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" disabled="disabled" /></td>
@@ -80,7 +80,7 @@
 						<td><input type="checkbox" name="topline_date" value="1"<?php echo $this->conf->topline_date ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" name="topline_link" value="1"<?php echo $this->conf->topline_link ? ' checked="checked"' : ''; ?> /></td>
 					</tr><tr>
-						<th><?php echo Minz_Translate::t ('bottom_line'); ?></th>
+						<th><?php echo _t('bottom_line'); ?></th>
 						<td><input type="checkbox" name="bottomline_read" value="1"<?php echo $this->conf->bottomline_read ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" name="bottomline_favorite" value="1"<?php echo $this->conf->bottomline_favorite ? ' checked="checked"' : ''; ?> /></td>
 						<td><input type="checkbox" name="bottomline_sharing" value="1"<?php echo $this->conf->bottomline_sharing ? ' checked="checked"' : ''; ?> /></td>
@@ -93,16 +93,16 @@
 		</div>
 		
 		<div class="form-group">
-			<label class="group-name" for="posts_per_page"><?php echo Minz_Translate::t ('html5_notif_timeout'); ?></label>
+			<label class="group-name" for="posts_per_page"><?php echo _t('html5_notif_timeout'); ?></label>
 			<div class="group-controls">
-				<input type="number" id="html5_notif_timeout" name="html5_notif_timeout" value="<?php echo $this->conf->html5_notif_timeout; ?>" /> <?php echo Minz_Translate::t ('seconds_(0_means_no_timeout)'); ?>
+				<input type="number" id="html5_notif_timeout" name="html5_notif_timeout" value="<?php echo $this->conf->html5_notif_timeout; ?>" /> <?php echo _t('seconds_(0_means_no_timeout)'); ?>
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
-				<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 	</form>
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index 8b2da2a28..7e4efc264 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -1,13 +1,13 @@
 <?php $this->partial ('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url ('configure', 'reading'); ?>">
-		<legend><?php echo Minz_Translate::t ('reading_configuration'); ?></legend>
+		<legend><?php echo _t('reading_configuration'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="posts_per_page"><?php echo Minz_Translate::t ('articles_per_page'); ?></label>
+			<label class="group-name" for="posts_per_page"><?php echo _t('articles_per_page'); ?></label>
 			<div class="group-controls">
 				<input type="number" id="posts_per_page" name="posts_per_page" value="<?php echo $this->conf->posts_per_page; ?>" min="5" max="50" />
 				<?php echo _i('help'); ?> <?php echo _t('number_divided_when_reader'); ?>
@@ -15,22 +15,22 @@
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="sort_order"><?php echo Minz_Translate::t ('sort_order'); ?></label>
+			<label class="group-name" for="sort_order"><?php echo _t('sort_order'); ?></label>
 			<div class="group-controls">
 				<select name="sort_order" id="sort_order">
-					<option value="DESC"<?php echo $this->conf->sort_order === 'DESC' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('newer_first'); ?></option>
-					<option value="ASC"<?php echo $this->conf->sort_order === 'ASC' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('older_first'); ?></option>
+					<option value="DESC"<?php echo $this->conf->sort_order === 'DESC' ? ' selected="selected"' : ''; ?>><?php echo _t('newer_first'); ?></option>
+					<option value="ASC"<?php echo $this->conf->sort_order === 'ASC' ? ' selected="selected"' : ''; ?>><?php echo _t('older_first'); ?></option>
 				</select>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="view_mode"><?php echo Minz_Translate::t ('default_view'); ?></label>
+			<label class="group-name" for="view_mode"><?php echo _t('default_view'); ?></label>
 			<div class="group-controls">
 				<select name="view_mode" id="view_mode">
-					<option value="normal"<?php echo $this->conf->view_mode === 'normal' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('normal_view'); ?></option>
-					<option value="reader"<?php echo $this->conf->view_mode === 'reader' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('reader_view'); ?></option>
-					<option value="global"<?php echo $this->conf->view_mode === 'global' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('global_view'); ?></option>
+					<option value="normal"<?php echo $this->conf->view_mode === 'normal' ? ' selected="selected"' : ''; ?>><?php echo _t('normal_view'); ?></option>
+					<option value="reader"<?php echo $this->conf->view_mode === 'reader' ? ' selected="selected"' : ''; ?>><?php echo _t('reader_view'); ?></option>
+					<option value="global"<?php echo $this->conf->view_mode === 'global' ? ' selected="selected"' : ''; ?>><?php echo _t('global_view'); ?></option>
 				</select>
 			</div>
 		</div>
@@ -50,7 +50,7 @@
 			<div class="group-controls">
 				<label class="checkbox" for="hide_read_feeds">
 					<input type="checkbox" name="hide_read_feeds" id="hide_read_feeds" value="1"<?php echo $this->conf->hide_read_feeds ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t('hide_read_feeds'); ?>
+					<?php echo _t('hide_read_feeds'); ?>
 				</label>
 			</div>
 		</div>
@@ -59,8 +59,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="display_posts">
 					<input type="checkbox" name="display_posts" id="display_posts" value="1"<?php echo $this->conf->display_posts ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('display_articles_unfolded'); ?>
-					<noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('display_articles_unfolded'); ?>
+					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -69,8 +69,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="display_categories">
 					<input type="checkbox" name="display_categories" id="display_categories" value="1"<?php echo $this->conf->display_categories ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('display_categories_unfolded'); ?>
-					<noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('display_categories_unfolded'); ?>
+					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -79,8 +79,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="sticky_post">
 					<input type="checkbox" name="sticky_post" id="sticky_post" value="1"<?php echo $this->conf->sticky_post ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('sticky_post'); ?>
-					<noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('sticky_post'); ?>
+					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -89,8 +89,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="auto_load_more">
 					<input type="checkbox" name="auto_load_more" id="auto_load_more" value="1"<?php echo $this->conf->auto_load_more ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('auto_load_more'); ?>
-					<noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('auto_load_more'); ?>
+					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -99,8 +99,8 @@
 			<div class="group-controls">
 				<label class="checkbox" for="lazyload">
 					<input type="checkbox" name="lazyload" id="lazyload" value="1"<?php echo $this->conf->lazyload ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('img_with_lazyload'); ?>
-					<noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('img_with_lazyload'); ?>
+					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
@@ -109,48 +109,48 @@
 			<div class="group-controls">
 				<label class="checkbox" for="reading_confirm">
 					<input type="checkbox" name="reading_confirm" id="reading_confirm" value="1"<?php echo $this->conf->reading_confirm ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('reading_confirm'); ?>
-					<noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript>
+					<?php echo _t('reading_confirm'); ?>
+					<noscript> — <strong><?php echo _t('javascript_should_be_activated'); ?></strong></noscript>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name"><?php echo Minz_Translate::t ('auto_read_when'); ?></label>
+			<label class="group-name"><?php echo _t('auto_read_when'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="check_open_article">
 					<input type="checkbox" name="mark_open_article" id="check_open_article" value="1"<?php echo $this->conf->mark_when['article'] ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t('article_viewed'); ?>
+					<?php echo _t('article_viewed'); ?>
 				</label>
 				<label class="checkbox" for="check_open_site">
 					<input type="checkbox" name="mark_open_site" id="check_open_site" value="1"<?php echo $this->conf->mark_when['site'] ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('article_open_on_website'); ?>
+					<?php echo _t('article_open_on_website'); ?>
 				</label>
 				<label class="checkbox" for="check_scroll">
 					<input type="checkbox" name="mark_scroll" id="check_scroll" value="1"<?php echo $this->conf->mark_when['scroll'] ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('scroll'); ?>
+					<?php echo _t('scroll'); ?>
 				</label>
 				<label class="checkbox" for="check_reception">
 					<input type="checkbox" name="mark_upon_reception" id="check_reception" value="1"<?php echo $this->conf->mark_when['reception'] ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('upon_reception'); ?>
+					<?php echo _t('upon_reception'); ?>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name"><?php echo Minz_Translate::t ('after_onread'); ?></label>
+			<label class="group-name"><?php echo _t('after_onread'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="onread_jump_next">
 					<input type="checkbox" name="onread_jump_next" id="onread_jump_next" value="1"<?php echo $this->conf->onread_jump_next ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('jump_next'); ?>
+					<?php echo _t('jump_next'); ?>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
-				<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 
diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index 02ce331da..ee276a94e 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -1,7 +1,7 @@
 <?php $this->partial ('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url ('configure', 'sharing'); ?>"
 		data-simple='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls"><a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo FreshRSS_Themes::icon('close'); ?></a>
@@ -9,28 +9,28 @@
 		data-advanced='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls">
 			<input type="hidden" id="share_##key##_type" name="share[##key##][type]" value="##type##" />
 			<div class="stick">
-			<input type="text" id="share_##key##_name" name="share[##key##][name]" class="extend" value="" placeholder="<?php echo Minz_Translate::t ('share_name'); ?>" size="64" />
-			<input type="url" id="share_##key##_url" name="share[##key##][url]" class="extend" value="" placeholder="<?php echo Minz_Translate::t ('share_url'); ?>" size="64" />
+			<input type="text" id="share_##key##_name" name="share[##key##][name]" class="extend" value="" placeholder="<?php echo _t('share_name'); ?>" size="64" />
+			<input type="url" id="share_##key##_url" name="share[##key##][url]" class="extend" value="" placeholder="<?php echo _t('share_url'); ?>" size="64" />
 			<a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo FreshRSS_Themes::icon('close'); ?></a></div>
-			<a target="_blank" class="btn" title="<?php echo Minz_Translate::t('more_information'); ?>" href="##help##"><?php echo FreshRSS_Themes::icon('help'); ?></a>
+			<a target="_blank" class="btn" title="<?php echo _t('more_information'); ?>" href="##help##"><?php echo FreshRSS_Themes::icon('help'); ?></a>
 			</div></div>'>
-		<legend><?php echo Minz_Translate::t ('sharing'); ?></legend>
+		<legend><?php echo _t('sharing'); ?></legend>
 		<?php foreach ($this->conf->sharing as $key => $sharing): ?>
 			<?php $share = $this->conf->shares[$sharing['type']]; ?>
 			<div class="form-group" id="group-share-<?php echo $key; ?>">
 				<label class="group-name">
-					<?php echo Minz_Translate::t ($sharing['type']); ?>
+					<?php echo _t($sharing['type']); ?>
 				</label>
 				<div class="group-controls">
 					<input type='hidden' id='share_<?php echo $key;?>_type' name="share[<?php echo $key;?>][type]" value='<?php echo $sharing['type']?>' />
 					<?php if ($share['form'] === 'advanced') { ?>
 						<div class="stick">
-							<input type="text" id="share_<?php echo $key;?>_name" name="share[<?php echo $key;?>][name]" class="extend" value="<?php echo $sharing['name']?>" placeholder="<?php echo Minz_Translate::t ('share_name'); ?>" size="64" />
-							<input type="url" id="share_<?php echo $key;?>_url" name="share[<?php echo $key;?>][url]" class="extend" value="<?php echo $sharing['url']?>" placeholder="<?php echo Minz_Translate::t ('share_url'); ?>" size="64" />
+							<input type="text" id="share_<?php echo $key;?>_name" name="share[<?php echo $key;?>][name]" class="extend" value="<?php echo $sharing['name']?>" placeholder="<?php echo _t('share_name'); ?>" size="64" />
+							<input type="url" id="share_<?php echo $key;?>_url" name="share[<?php echo $key;?>][url]" class="extend" value="<?php echo $sharing['url']?>" placeholder="<?php echo _t('share_url'); ?>" size="64" />
 							<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo FreshRSS_Themes::icon('close'); ?></a>
 						</div>
 
-						<a target="_blank" class="btn" title="<?php echo Minz_Translate::t('more_information'); ?>" href="<?php echo $share['help']?>"><?php echo FreshRSS_Themes::icon('help'); ?></a>
+						<a target="_blank" class="btn" title="<?php echo _t('more_information'); ?>" href="<?php echo $share['help']?>"><?php echo FreshRSS_Themes::icon('help'); ?></a>
 					<?php } else { ?>
 					<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo FreshRSS_Themes::icon('close'); ?></a>
 					<?php } ?>
@@ -42,7 +42,7 @@
 			<div class="group-controls">
 				<select>
 					<?php foreach($this->conf->shares as $key => $params):?>
-						<option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php if (!empty($params['help'])) {echo $params['help'];}?>'><?php echo Minz_Translate::t($key) ?></option>
+						<option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php if (!empty($params['help'])) {echo $params['help'];}?>'><?php echo _t($key) ?></option>
 					<?php endforeach; ?>
 				</select>
 				<a href='#' class='share add btn'><?php echo FreshRSS_Themes::icon('add'); ?></a>
@@ -51,8 +51,8 @@
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
-				<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 	</form>
diff --git a/app/views/configure/users.phtml b/app/views/configure/users.phtml
index 272896fb2..04e662fa3 100644
--- a/app/views/configure/users.phtml
+++ b/app/views/configure/users.phtml
@@ -1,36 +1,36 @@
 <?php $this->partial('aside_configure'); ?>
 
 <div class="post">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo Minz_Translate::t('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url('users', 'auth'); ?>">
-		<legend><?php echo Minz_Translate::t('login_configuration'); ?></legend>
+		<legend><?php echo _t('login_configuration'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="current_user"><?php echo Minz_Translate::t('current_user'); ?></label>
+			<label class="group-name" for="current_user"><?php echo _t('current_user'); ?></label>
 			<div class="group-controls">
 				<input id="current_user" type="text" disabled="disabled" value="<?php echo Minz_Session::param('currentUser', '_'); ?>" />
 				<label class="checkbox" for="is_admin">
 					<input type="checkbox" id="is_admin" disabled="disabled" <?php echo Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_')) ? 'checked="checked" ' : ''; ?>/>
-					<?php echo Minz_Translate::t('is_admin'); ?>
+					<?php echo _t('is_admin'); ?>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="passwordPlain"><?php echo Minz_Translate::t('password_form'); ?></label>
+			<label class="group-name" for="passwordPlain"><?php echo _t('password_form'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="passwordPlain" name="passwordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
 					<a class="btn toggle-password"><?php echo FreshRSS_Themes::icon('key'); ?></a>
 				</div>
-				<noscript><b><?php echo Minz_Translate::t('javascript_should_be_activated'); ?></b></noscript>
+				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
 
 		<?php if (Minz_Configuration::apiEnabled()) { ?>
 		<div class="form-group">
-			<label class="group-name" for="apiPasswordPlain"><?php echo Minz_Translate::t('password_api'); ?></label>
+			<label class="group-name" for="apiPasswordPlain"><?php echo _t('password_api'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="apiPasswordPlain" name="apiPasswordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
@@ -41,36 +41,36 @@
 		<?php } ?>
 
 		<div class="form-group">
-			<label class="group-name" for="mail_login"><?php echo Minz_Translate::t('persona_connection_email'); ?></label>
+			<label class="group-name" for="mail_login"><?php echo _t('persona_connection_email'); ?></label>
 			<?php $mail = $this->conf->mail_login; ?>
 			<div class="group-controls">
 				<input type="email" id="mail_login" name="mail_login" class="extend" autocomplete="off" value="<?php echo $mail; ?>" <?php echo Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_')) ? '' : 'disabled="disabled"'; ?> placeholder="alice@example.net" />
-				<noscript><b><?php echo Minz_Translate::t('javascript_should_be_activated'); ?></b></noscript>
+				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo Minz_Translate::t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 
 	<?php if (Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_'))) { ?>
 
-		<legend><?php echo Minz_Translate::t('auth_type'); ?></legend>
+		<legend><?php echo _t('auth_type'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="auth_type"><?php echo Minz_Translate::t('auth_type'); ?></label>
+			<label class="group-name" for="auth_type"><?php echo _t('auth_type'); ?></label>
 			<div class="group-controls">
 				<select id="auth_type" name="auth_type" required="required">
 					<?php if (!in_array(Minz_Configuration::authType(), array('form', 'persona', 'http_auth', 'none'))) { ?>
 						<option selected="selected"></option>
 					<?php } ?>
-					<option value="form"<?php echo Minz_Configuration::authType() === 'form' ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo Minz_Translate::t('auth_form'); ?></option>
-					<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : '', $this->conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo Minz_Translate::t('auth_persona'); ?></option>
-					<option value="http_auth"<?php echo Minz_Configuration::authType() === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo Minz_Translate::t('http_auth'); ?> (REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
-					<option value="none"<?php echo Minz_Configuration::authType() === 'none' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t('auth_none'); ?></option>
+					<option value="form"<?php echo Minz_Configuration::authType() === 'form' ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('auth_form'); ?></option>
+					<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : '', $this->conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('auth_persona'); ?></option>
+					<option value="http_auth"<?php echo Minz_Configuration::authType() === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('http_auth'); ?> (REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
+					<option value="none"<?php echo Minz_Configuration::authType() === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('auth_none'); ?></option>
 				</select>
 			</div>
 		</div>
@@ -80,7 +80,7 @@
 				<label class="checkbox" for="anon_access">
 					<input type="checkbox" name="anon_access" id="anon_access" value="1"<?php echo Minz_Configuration::allowAnonymous() ? ' checked="checked"' : '',
 						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo Minz_Translate::t('allow_anonymous', Minz_Configuration::defaultUser()); ?>
+					<?php echo _t('allow_anonymous', Minz_Configuration::defaultUser()); ?>
 				</label>
 			</div>
 		</div>
@@ -90,7 +90,7 @@
 				<label class="checkbox" for="anon_refresh">
 					<input type="checkbox" name="anon_refresh" id="anon_refresh" value="1"<?php echo Minz_Configuration::allowAnonymousRefresh() ? ' checked="checked"' : '',
 						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo Minz_Translate::t('allow_anonymous_refresh'); ?>
+					<?php echo _t('allow_anonymous_refresh'); ?>
 				</label>
 			</div>
 		</div>
@@ -100,7 +100,7 @@
 				<label class="checkbox" for="unsafe_autologin">
 					<input type="checkbox" name="unsafe_autologin" id="unsafe_autologin" value="1"<?php echo Minz_Configuration::unsafeAutologinEnabled() ? ' checked="checked"' : '',
 						Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo Minz_Translate::t('unsafe_autologin'); ?>
+					<?php echo _t('unsafe_autologin'); ?>
 					<kbd>p/i/?a=formLogin&amp;u=Alice&amp;p=1234</kbd>
 				</label>
 			</div>
@@ -108,12 +108,12 @@
 
 		<?php if (Minz_Configuration::canLogIn()) { ?>
 		<div class="form-group">
-			<label class="group-name" for="token"><?php echo Minz_Translate::t('auth_token'); ?></label>
+			<label class="group-name" for="token"><?php echo _t('auth_token'); ?></label>
 			<?php $token = $this->conf->token; ?>
 			<div class="group-controls">
-				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo Minz_Translate::t('blank_to_disable'); ?>"<?php
+				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo _t('blank_to_disable'); ?>"<?php
 					echo Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t('explain_token', Minz_Url::display(null, 'html', true), $token); ?>
+				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('explain_token', Minz_Url::display(null, 'html', true), $token); ?>
 			</div>
 		</div>
 		<?php } ?>
@@ -123,24 +123,24 @@
 				<label class="checkbox" for="api_enabled">
 					<input type="checkbox" name="api_enabled" id="api_enabled" value="1"<?php echo Minz_Configuration::apiEnabled() ? ' checked="checked"' : '',
 						Minz_Configuration::needsLogin() ? '' : ' disabled="disabled"'; ?> />
-					<?php echo Minz_Translate::t('api_enabled'); ?>
+					<?php echo _t('api_enabled'); ?>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo Minz_Translate::t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 	</form>
 
 	<form method="post" action="<?php echo _url('users', 'delete'); ?>">
-		<legend><?php echo Minz_Translate::t('users'); ?></legend>
+		<legend><?php echo _t('users'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="users_list"><?php echo Minz_Translate::t('users_list'); ?></label>
+			<label class="group-name" for="users_list"><?php echo _t('users_list'); ?></label>
 			<div class="group-controls">
 				<select id="users_list" name="username"><?php
 					foreach (listUsers() as $user) {
@@ -152,16 +152,16 @@
 	
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-attention confirm"><?php echo Minz_Translate::t('delete'); ?></button>
+				<button type="submit" class="btn btn-attention confirm"><?php echo _t('delete'); ?></button>
 			</div>
 		</div>
 	</form>
 
 	<form method="post" action="<?php echo _url('users', 'create'); ?>">
-		<legend><?php echo Minz_Translate::t('create_user'); ?></legend>
+		<legend><?php echo _t('create_user'); ?></legend>
 
 		<div class="form-group">
-			<label class="group-name" for="new_user_language"><?php echo Minz_Translate::t ('language'); ?></label>
+			<label class="group-name" for="new_user_language"><?php echo _t('language'); ?></label>
 			<div class="group-controls">
 				<select name="new_user_language" id="new_user_language">
 				<?php $languages = $this->conf->availableLanguages (); ?>
@@ -173,25 +173,25 @@
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="new_user_name"><?php echo Minz_Translate::t('username'); ?></label>
+			<label class="group-name" for="new_user_name"><?php echo _t('username'); ?></label>
 			<div class="group-controls">
 				<input id="new_user_name" name="new_user_name" type="text" size="16" required="required" maxlength="16" autocomplete="off" pattern="[0-9a-zA-Z]{1,16}" placeholder="demo" />
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="new_user_passwordPlain"><?php echo Minz_Translate::t('password_form'); ?></label>
+			<label class="group-name" for="new_user_passwordPlain"><?php echo _t('password_form'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" autocomplete="off" pattern=".{7,}" />
 					<a class="btn toggle-password"><?php echo FreshRSS_Themes::icon('key'); ?></a>
 				</div>
-				<noscript><b><?php echo Minz_Translate::t('javascript_should_be_activated'); ?></b></noscript>
+				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="new_user_email"><?php echo Minz_Translate::t('persona_connection_email'); ?></label>
+			<label class="group-name" for="new_user_email"><?php echo _t('persona_connection_email'); ?></label>
 			<?php $mail = $this->conf->mail_login; ?>
 			<div class="group-controls">
 				<input type="email" id="new_user_email" name="new_user_email" class="extend" autocomplete="off" placeholder="alice@example.net" />
@@ -200,8 +200,8 @@
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t('create'); ?></button>
-				<button type="reset" class="btn"><?php echo Minz_Translate::t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('create'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 
diff --git a/app/views/error/index.phtml b/app/views/error/index.phtml
index ef4fbd39d..5e1949800 100644
--- a/app/views/error/index.phtml
+++ b/app/views/error/index.phtml
@@ -3,7 +3,7 @@
 		<h1 class="alert-head"><?php echo $this->code; ?></h1>
 		<p>
 			<?php echo $this->errorMessage; ?><br />
-			<a href="<?php echo _url('index', 'index'); ?>"><?php echo Minz_Translate::t('back_to_rss_feeds'); ?></a>
+			<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 		</p>
 	</div>
 </div>
diff --git a/app/views/feed/add.phtml b/app/views/feed/add.phtml
index 849dacac6..17e52a571 100644
--- a/app/views/feed/add.phtml
+++ b/app/views/feed/add.phtml
@@ -1,16 +1,16 @@
 <?php if ($this->feed) { ?>
 <div class="post">
-	<h1><?php echo Minz_Translate::t ('add_rss_feed'); ?></h1>
+	<h1><?php echo _t('add_rss_feed'); ?></h1>
 
 	<?php if (!$this->load_ok) { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo Minz_Translate::t('damn'); ?></span> <?php echo Minz_Translate::t('internal_problem_feed', _url('index', 'logs')); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('internal_problem_feed', _url('index', 'logs')); ?></p>
 	<?php } ?>
 
 	<form method="post" action="<?php echo _url('feed', 'add'); ?>" autocomplete="off">
-		<legend><?php echo Minz_Translate::t('informations'); ?></legend>
+		<legend><?php echo _t('informations'); ?></legend>
 		<?php if ($this->load_ok) { ?>
 		<div class="form-group">
-			<label class="group-name"><?php echo Minz_Translate::t('title'); ?></label>
+			<label class="group-name"><?php echo _t('title'); ?></label>
 			<div class="group-controls">
 				<label><?php echo $this->feed->name() ; ?></label>
 			</div>
@@ -18,7 +18,7 @@
 
 		<?php $desc = $this->feed->description(); if ($desc != '') { ?>
 		<div class="form-group">
-			<label class="group-name"><?php echo Minz_Translate::t('feed_description'); ?></label>
+			<label class="group-name"><?php echo _t('feed_description'); ?></label>
 			<div class="group-controls">
 				<label><?php echo htmlspecialchars($desc, ENT_NOQUOTES, 'UTF-8'); ?></label>
 			</div>
@@ -26,7 +26,7 @@
 		<?php } ?>
 
 		<div class="form-group">
-			<label class="group-name"><?php echo Minz_Translate::t('website_url'); ?></label>
+			<label class="group-name"><?php echo _t('website_url'); ?></label>
 			<div class="group-controls">
 				<?php echo $this->feed->website(); ?>
 				<a class="btn" target="_blank" href="<?php echo $this->feed->website(); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
@@ -35,17 +35,17 @@
 		<?php } ?>
 
 		<div class="form-group">
-			<label class="group-name" for="url"><?php echo Minz_Translate::t('feed_url'); ?></label>
+			<label class="group-name" for="url"><?php echo _t('feed_url'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="text" name="url_rss" id="url" class="extend" value="<?php echo $this->feed->url(); ?>" />
 					<a class="btn" target="_blank" href="<?php echo $this->feed->url(); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
 				</div>
-				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url(); ?>"><?php echo Minz_Translate::t('feed_validator'); ?></a>
+				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url(); ?>"><?php echo _t('feed_validator'); ?></a>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="category"><?php echo Minz_Translate::t('category'); ?></label>
+			<label class="group-name" for="category"><?php echo _t('category'); ?></label>
 			<div class="group-controls">
 				<select name="category" id="category">
 					<?php foreach ($this->categories as $cat) { ?>
@@ -53,37 +53,37 @@
 						<?php echo $cat->name(); ?>
 					</option>
 					<?php } ?>
-					<option value="nc"><?php echo Minz_Translate::t('new_category'); ?></option>
+					<option value="nc"><?php echo _t('new_category'); ?></option>
 				</select>
 
 				<span style="display: none;">
-					<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo Minz_Translate::t('new_category'); ?>" />
+					<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo _t('new_category'); ?>" />
 				</span>
 			</div>
 		</div>
 
-		<legend><?php echo Minz_Translate::t('http_authentication'); ?></legend>
+		<legend><?php echo _t('http_authentication'); ?></legend>
 		<?php $auth = $this->feed->httpAuth(false); ?>
 		<div class="form-group">
-			<label class="group-name" for="http_user"><?php echo Minz_Translate::t('http_username'); ?></label>
+			<label class="group-name" for="http_user"><?php echo _t('http_username'); ?></label>
 			<div class="group-controls">
 				<input type="text" name="http_user" id="http_user" class="extend" value="<?php echo $auth['username']; ?>" autocomplete="off" />
 			</div>
 
-			<label class="group-name" for="http_pass"><?php echo Minz_Translate::t('http_password'); ?></label>
+			<label class="group-name" for="http_pass"><?php echo _t('http_password'); ?></label>
 			<div class="group-controls">
 				<input type="password" name="http_pass" id="http_pass" class="extend" value="<?php echo $auth['password']; ?>" autocomplete="off" />
 			</div>
 
 			<div class="group-controls">
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t('access_protected_feeds'); ?>
+				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('access_protected_feeds'); ?>
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t('save'); ?></button>
-				<button type="reset" class="btn"><?php echo Minz_Translate::t('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 	</form>
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index 678c5f132..8bd645d11 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -12,27 +12,27 @@
 	<?php $nbEntries = $this->feed->nbEntries (); ?>
 
 	<?php if ($this->feed->inError ()) { ?>
-	<p class="alert alert-error"><span class="alert-head"><?php echo Minz_Translate::t ('damn'); ?></span> <?php echo Minz_Translate::t ('feed_in_error'); ?></p>
+	<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('feed_in_error'); ?></p>
 	<?php } elseif ($nbEntries === 0) { ?>
-	<p class="alert alert-warn"><?php echo Minz_Translate::t ('feed_empty'); ?></p>
+	<p class="alert alert-warn"><?php echo _t('feed_empty'); ?></p>
 	<?php } ?>
 
 	<form method="post" action="<?php echo _url ('subscription', 'feed', 'id', $this->feed->id ()); ?>" autocomplete="off">
-		<legend><?php echo Minz_Translate::t ('informations'); ?></legend>
+		<legend><?php echo _t('informations'); ?></legend>
 		<div class="form-group">
-			<label class="group-name" for="name"><?php echo Minz_Translate::t ('title'); ?></label>
+			<label class="group-name" for="name"><?php echo _t('title'); ?></label>
 			<div class="group-controls">
 				<input type="text" name="name" id="name" class="extend" value="<?php echo $this->feed->name () ; ?>" />
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="description"><?php echo Minz_Translate::t ('feed_description'); ?></label>
+			<label class="group-name" for="description"><?php echo _t('feed_description'); ?></label>
 			<div class="group-controls">
 				<textarea name="description" id="description"><?php echo htmlspecialchars($this->feed->description(), ENT_NOQUOTES, 'UTF-8'); ?></textarea>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="website"><?php echo Minz_Translate::t ('website_url'); ?></label>
+			<label class="group-name" for="website"><?php echo _t('website_url'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="text" name="website" id="website" class="extend" value="<?php echo $this->feed->website (); ?>" />
@@ -41,18 +41,18 @@
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="url"><?php echo Minz_Translate::t ('feed_url'); ?></label>
+			<label class="group-name" for="url"><?php echo _t('feed_url'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
 					<input type="text" name="url" id="url" class="extend" value="<?php echo $this->feed->url (); ?>" />
 					<a class="btn" target="_blank" href="<?php echo $this->feed->url (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
 				</div>
 
-				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url (); ?>"><?php echo Minz_Translate::t ('feed_validator'); ?></a>
+				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url (); ?>"><?php echo _t('feed_validator'); ?></a>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="category"><?php echo Minz_Translate::t ('category'); ?></label>
+			<label class="group-name" for="category"><?php echo _t('category'); ?></label>
 			<div class="group-controls">
 				<select name="category" id="category">
 				<?php foreach ($this->categories as $cat) { ?>
@@ -64,11 +64,11 @@
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="priority"><?php echo Minz_Translate::t ('show_in_all_flux'); ?></label>
+			<label class="group-name" for="priority"><?php echo _t('show_in_all_flux'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="priority">
 					<input type="checkbox" name="priority" id="priority" value="10"<?php echo $this->feed->priority () > 0 ? ' checked="checked"' : ''; ?> />
-					<?php echo Minz_Translate::t ('yes'); ?>
+					<?php echo _t('yes'); ?>
 				</label>
 			</div>
 		</div>
@@ -83,7 +83,7 @@
 			</div>
 		</div>
 
-		<legend><?php echo Minz_Translate::t ('archiving_configuration'); ?></legend>
+		<legend><?php echo _t('archiving_configuration'); ?></legend>
 
 		<div class="form-group">
 			<div class="group-controls">
@@ -96,21 +96,21 @@
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="keep_history"><?php echo Minz_Translate::t ('keep_history'); ?></label>
+			<label class="group-name" for="keep_history"><?php echo _t('keep_history'); ?></label>
 			<div class="group-controls">
 				<select class="number" name="keep_history" id="keep_history" required="required"><?php
-					foreach (array('' => '', -2 => Minz_Translate::t('by_default'), 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
+					foreach (array('' => '', -2 => _t('by_default'), 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
 						echo '<option value="' . $v . ($this->feed->keepHistory() === $v ? '" selected="selected' : '') . '">' . $t . '</option>';
 					}
 				?></select>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="group-name" for="ttl"><?php echo Minz_Translate::t('ttl'); ?></label>
+			<label class="group-name" for="ttl"><?php echo _t('ttl'); ?></label>
 			<div class="group-controls">
 				<select class="number" name="ttl" id="ttl" required="required"><?php
 					$found = false;
-					foreach (array(-2 => Minz_Translate::t('by_default'), 900 => '15min', 1200 => '20min', 1500 => '25min', 1800 => '30min', 2700 => '45min',
+					foreach (array(-2 => _t('by_default'), 900 => '15min', 1200 => '20min', 1500 => '25min', 1800 => '30min', 2700 => '45min',
 					                3600 => '1h', 5400 => '1.5h', 7200 => '2h', 10800 => '3h', 14400 => '4h', 18800 => '5h', 21600 => '6h', 25200 => '7h', 28800 => '8h',
 					                36000 => '10h', 43200 => '12h', 64800 => '18h',
 					                86400 => '1d', 129600 => '1.5d', 172800 => '2d', 259200 => '3d', 345600 => '4d', 432000 => '5d', 518400 => '6d',
@@ -128,21 +128,21 @@
 		</div>
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
-				<button class="btn btn-attention confirm" formmethod="post" formaction="<?php echo Minz_Url::display (array ('c' => 'feed', 'a' => 'truncate', 'params' => array ('id' => $this->feed->id ()))); ?>"><?php echo Minz_Translate::t ('truncate'); ?></button>
+				<button class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button class="btn btn-attention confirm" formmethod="post" formaction="<?php echo Minz_Url::display (array ('c' => 'feed', 'a' => 'truncate', 'params' => array ('id' => $this->feed->id ()))); ?>"><?php echo _t('truncate'); ?></button>
 			</div>
 		</div>
 
-		<legend><?php echo Minz_Translate::t ('login_configuration'); ?></legend>
+		<legend><?php echo _t('login_configuration'); ?></legend>
 		<?php $auth = $this->feed->httpAuth (false); ?>
 		<div class="form-group">
-			<label class="group-name" for="http_user"><?php echo Minz_Translate::t ('http_username'); ?></label>
+			<label class="group-name" for="http_user"><?php echo _t('http_username'); ?></label>
 			<div class="group-controls">
 				<input type="text" name="http_user" id="http_user" class="extend" value="<?php echo $auth['username']; ?>" autocomplete="off" />
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t ('access_protected_feeds'); ?>
+				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('access_protected_feeds'); ?>
 			</div>
 
-			<label class="group-name" for="http_pass"><?php echo Minz_Translate::t ('http_password'); ?></label>
+			<label class="group-name" for="http_pass"><?php echo _t('http_password'); ?></label>
 			<div class="group-controls">
 				<input type="password" name="http_pass" id="http_pass" class="extend" value="<?php echo $auth['password']; ?>" autocomplete="off" />
 			</div>
@@ -150,24 +150,24 @@
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
-				<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 
-		<legend><?php echo Minz_Translate::t ('advanced'); ?></legend>
+		<legend><?php echo _t('advanced'); ?></legend>
 		<div class="form-group">
-			<label class="group-name" for="path_entries"><?php echo Minz_Translate::t ('css_path_on_website'); ?></label>
+			<label class="group-name" for="path_entries"><?php echo _t('css_path_on_website'); ?></label>
 			<div class="group-controls">
-				<input type="text" name="path_entries" id="path_entries" class="extend" value="<?php echo $this->feed->pathEntries (); ?>" placeholder="<?php echo Minz_Translate::t ('blank_to_disable'); ?>" />
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t ('retrieve_truncated_feeds'); ?>
+				<input type="text" name="path_entries" id="path_entries" class="extend" value="<?php echo $this->feed->pathEntries (); ?>" placeholder="<?php echo _t('blank_to_disable'); ?>" />
+				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('retrieve_truncated_feeds'); ?>
 			</div>
 		</div>
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
-				<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
+				<button type="submit" class="btn btn-important"><?php echo _t('save'); ?></button>
+				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
 	</form>
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 4f7e3db0c..ba02b9fad 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -52,10 +52,10 @@ echo 'authType="', $authType, '",',
 	'url_login="', _url ('index', 'login'), '",',
 	'url_logout="', _url ('index', 'logout'), '",';
 
-echo 'str_confirmation_default="', Minz_Translate::t('confirm_action'), '"', ",\n";
-echo 'str_notif_title_articles="', Minz_Translate::t('notif_title_new_articles'), '"', ",\n";
-echo 'str_notif_body_articles="', Minz_Translate::t('notif_body_new_articles'), '"', ",\n";
-echo 'str_category_empty="', Minz_Translate::t('category_empty'), '"', ",\n";
+echo 'str_confirmation_default="', _t('confirm_action'), '"', ",\n";
+echo 'str_notif_title_articles="', _t('notif_title_new_articles'), '"', ",\n";
+echo 'str_notif_body_articles="', _t('notif_body_new_articles'), '"', ",\n";
+echo 'str_category_empty="', _t('category_empty'), '"', ",\n";
 echo 'html5_notif_timeout=', $this->conf->html5_notif_timeout,",\n";
 
 
diff --git a/app/views/helpers/logs_pagination.phtml b/app/views/helpers/logs_pagination.phtml
index e3d14810e..191cfa8de 100755
--- a/app/views/helpers/logs_pagination.phtml
+++ b/app/views/helpers/logs_pagination.phtml
@@ -9,14 +9,14 @@
 	<?php $params[$getteur] = 1; ?>
 	<li class="item pager-first">
 		<?php if ($this->currentPage > 1) { ?>
-		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>">« <?php echo Minz_Translate::t('first'); ?></a>
+		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>">« <?php echo _t('first'); ?></a>
 		<?php } ?>
 	</li>
 
 	<?php $params[$getteur] = $this->currentPage - 1; ?>
 	<li class="item pager-previous">
 		<?php if ($this->currentPage > 1) { ?>
-		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>">‹ <?php echo Minz_Translate::t('previous'); ?></a>
+		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>">‹ <?php echo _t('previous'); ?></a>
 		<?php } ?>
 	</li>
 
@@ -34,13 +34,13 @@
 	<?php $params[$getteur] = $this->currentPage + 1; ?>
 	<li class="item pager-next">
 		<?php if ($this->currentPage < $this->nbPage) { ?>
-		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo Minz_Translate::t('next'); ?> ›</a>
+		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo _t('next'); ?> ›</a>
 		<?php } ?>
 	</li>
 	<?php $params[$getteur] = $this->nbPage; ?>
 	<li class="item pager-last">
 		<?php if ($this->currentPage < $this->nbPage) { ?>
-		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo Minz_Translate::t('last'); ?> »</a>
+		<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo _t('last'); ?> »</a>
 		<?php } ?>
 	</li>
 </ul>
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index e469edf58..ee745144f 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -30,12 +30,12 @@ if (!empty($this->entries)) {
 
 <div id="stream" class="normal<?php echo $hidePosts ? ' hide_posts' : ''; ?>"><?php
 	?><div id="new-article">
-		<a href="<?php echo Minz_Url::display ($this->url); ?>"><?php echo Minz_Translate::t ('new_article'); ?></a>
+		<a href="<?php echo Minz_Url::display ($this->url); ?>"><?php echo _t('new_article'); ?></a>
 	</div><?php
 	foreach ($this->entries as $item) {
 		if ($display_today && $item->isDay (FreshRSS_Days::TODAY, $this->today)) {
 			?><div class="day" id="day_today"><?php
-				echo Minz_Translate::t ('today');
+				echo _t('today');
 				?><span class="date"> — <?php echo timestamptodate (time (), false); ?></span><?php
 				?><span class="name"><?php echo $this->currentName; ?></span><?php
 			?></div><?php
@@ -43,7 +43,7 @@ if (!empty($this->entries)) {
 		}
 		if ($display_yesterday && $item->isDay (FreshRSS_Days::YESTERDAY, $this->today)) {
 			?><div class="day" id="day_yesterday"><?php
-				echo Minz_Translate::t ('yesterday');
+				echo _t('yesterday');
 				?><span class="date"> — <?php echo timestamptodate (time () - 86400, false); ?></span><?php
 				?><span class="name"><?php echo $this->currentName; ?></span><?php
 			?></div><?php
@@ -51,7 +51,7 @@ if (!empty($this->entries)) {
 		}
 		if ($display_others && $item->isDay (FreshRSS_Days::BEFORE_YESTERDAY, $this->today)) {
 			?><div class="day" id="day_before_yesterday"><?php
-				echo Minz_Translate::t ('before_yesterday');
+				echo _t('before_yesterday');
 				?><span class="name"><?php echo $this->currentName; ?></span><?php
 			?></div><?php
 			$display_others = false;
@@ -98,7 +98,7 @@ if (!empty($this->entries)) {
 				<h1 class="title"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo $item->title (); ?></a></h1>
 				<?php
 					$author = $item->author();
-					echo $author != '' ? '<div class="author">' . Minz_Translate::t('by_author', $author) . '</div>' : '',
+					echo $author != '' ? '<div class="author">' . _t('by_author', $author) . '</div>' : '',
 						$lazyload && $hidePosts ? lazyimg($item->content()) : $item->content();
 				?>
 			</div>
@@ -133,7 +133,7 @@ if (!empty($this->entries)) {
 						<div id="dropdown-share-<?php echo $item->id ();?>" class="dropdown-target"></div>
 						<a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id ();?>">
 							<?php echo FreshRSS_Themes::icon('share'); ?>
-							<?php echo Minz_Translate::t ('share'); ?>
+							<?php echo _t('share'); ?>
 						</a>
 
 						<ul class="dropdown-menu">
@@ -141,7 +141,7 @@ if (!empty($this->entries)) {
 							<?php foreach ($sharing as $share) :?>
 								<li class="item share">
 									<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl($this->conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
-										<?php echo Minz_Translate::t ($share['name']);?>
+										<?php echo _t($share['name']);?>
 									</a>
 								</li>
 							<?php endforeach;?>
diff --git a/app/views/helpers/view/reader_view.phtml b/app/views/helpers/view/reader_view.phtml
index 413094239..368bf7fdc 100644
--- a/app/views/helpers/view/reader_view.phtml
+++ b/app/views/helpers/view/reader_view.phtml
@@ -23,7 +23,7 @@ if (!empty($this->entries)) {
 
 				<div class="author"><?php
 					$author = $item->author();
-					echo $author != '' ? Minz_Translate::t('by_author', $author) . ' — ' : '',
+					echo $author != '' ? _t('by_author', $author) . ' — ' : '',
 						$item->date();
 				?></div>
 
diff --git a/app/views/helpers/view/rss_view.phtml b/app/views/helpers/view/rss_view.phtml
index 2c6ca610b..fd8a8af63 100755
--- a/app/views/helpers/view/rss_view.phtml
+++ b/app/views/helpers/view/rss_view.phtml
@@ -3,7 +3,7 @@
 	<channel>
 		<title><?php echo $this->rss_title; ?></title>
 		<link><?php echo Minz_Url::display(null, 'html', true); ?></link>
-		<description><?php echo Minz_Translate::t ('rss_feeds_of', $this->rss_title); ?></description>
+		<description><?php echo _t('rss_feeds_of', $this->rss_title); ?></description>
 		<pubDate><?php echo date('D, d M Y H:i:s O'); ?></pubDate>
 		<lastBuildDate><?php echo gmdate('D, d M Y H:i:s'); ?> GMT</lastBuildDate>
 		<atom:link href="<?php echo Minz_Url::display ($this->url, 'html', true); ?>" rel="self" type="application/rss+xml" />
diff --git a/app/views/index/about.phtml b/app/views/index/about.phtml
index 76ff804d8..14c6455b6 100644
--- a/app/views/index/about.phtml
+++ b/app/views/index/about.phtml
@@ -1,27 +1,27 @@
 <div class="post content">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
-	<h1><?php echo Minz_Translate::t ('about_freshrss'); ?></h1>
+	<h1><?php echo _t('about_freshrss'); ?></h1>
 
 	<dl class="infos">
-		<dt><?php echo Minz_Translate::t ('project_website'); ?></dt>
+		<dt><?php echo _t('project_website'); ?></dt>
 		<dd><a href="<?php echo FRESHRSS_WEBSITE; ?>"><?php echo FRESHRSS_WEBSITE; ?></a></dd>
 
-		<dt><?php echo Minz_Translate::t ('lead_developer'); ?></dt>
-		<dd><a href="mailto:contact@marienfressinaud.fr">Marien Fressinaud</a> — <a href="http://marienfressinaud.fr"><?php echo Minz_Translate::t ('website'); ?></a></dd>
+		<dt><?php echo _t('lead_developer'); ?></dt>
+		<dd><a href="mailto:contact@marienfressinaud.fr">Marien Fressinaud</a> — <a href="http://marienfressinaud.fr"><?php echo _t('website'); ?></a></dd>
 
-		<dt><?php echo Minz_Translate::t ('bugs_reports'); ?></dt>
-		<dd><?php echo Minz_Translate::t ('github_or_email'); ?></dd>
+		<dt><?php echo _t('bugs_reports'); ?></dt>
+		<dd><?php echo _t('github_or_email'); ?></dd>
 
-		<dt><?php echo Minz_Translate::t ('license'); ?></dt>
-		<dd><?php echo Minz_Translate::t ('agpl3'); ?></dd>
+		<dt><?php echo _t('license'); ?></dt>
+		<dd><?php echo _t('agpl3'); ?></dd>
 
-		<dt><?php echo Minz_Translate::t ('version'); ?></dt>
+		<dt><?php echo _t('version'); ?></dt>
 		<dd><?php echo FRESHRSS_VERSION; ?></dd>
 	</dl>
 
-	<p><?php echo Minz_Translate::t ('freshrss_description'); ?></p>
+	<p><?php echo _t('freshrss_description'); ?></p>
 
-	<h1><?php echo Minz_Translate::t ('credits'); ?></h1>
-	<p><?php echo Minz_Translate::t ('credits_content'); ?></p>
+	<h1><?php echo _t('credits'); ?></h1>
+	<p><?php echo _t('credits_content'); ?></p>
 </div>
diff --git a/app/views/index/logs.phtml b/app/views/index/logs.phtml
index 1b77b39af..18629ed9e 100644
--- a/app/views/index/logs.phtml
+++ b/app/views/index/logs.phtml
@@ -1,10 +1,10 @@
 <div class="post content">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
+	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
-	<h1><?php echo Minz_Translate::t ('logs'); ?></h1>
+	<h1><?php echo _t('logs'); ?></h1>
 	<form method="post" action="<?php echo _url ('index', 'logs'); ?>"><p>
 		<input type="hidden" name="clearLogs" />
-		<button type="submit" class="btn"><?php echo Minz_Translate::t ('clear_logs'); ?></button>
+		<button type="submit" class="btn"><?php echo _t('clear_logs'); ?></button>
 	</p></form>
 
 	<?php $items = $this->logsPaginator->items (); ?>
@@ -20,6 +20,6 @@
 		<?php $this->logsPaginator->render ('logs_pagination.phtml','page'); ?>
 	</div>
 	<?php } else { ?>
-	<p class="alert alert-warn"><?php echo Minz_Translate::t ('logs_empty'); ?></p>
+	<p class="alert alert-warn"><?php echo _t('logs_empty'); ?></p>
 	<?php } ?>
 </div>
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 31c9cdbc1..4f6beb9fd 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -77,11 +77,11 @@ function formatBytes($bytes, $precision = 2, $system = 'IEC') {
 }
 
 function timestamptodate ($t, $hour = true) {
-	$month = Minz_Translate::t (date('M', $t));
+	$month = _t(date('M', $t));
 	if ($hour) {
-		$date = Minz_Translate::t ('format_date_hour', $month);
+		$date = _t('format_date_hour', $month);
 	} else {
-		$date = Minz_Translate::t ('format_date', $month);
+		$date = _t('format_date', $month);
 	}
 
 	return @date ($date, $t);
@@ -107,7 +107,7 @@ function html_only_entity_decode($text) {
 
 function customSimplePie() {
 	$simplePie = new SimplePie();
-	$simplePie->set_useragent(Minz_Translate::t('freshrss') . '/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ') ' . SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION);
+	$simplePie->set_useragent(_t('freshrss') . '/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ') ' . SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION);
 	$simplePie->set_cache_location(CACHE_PATH);
 	$simplePie->set_cache_duration(800);
 	$simplePie->strip_htmltags(array(