Merge pull request #2186 from FreshRSS/dev1.13.0

FreshRSS 1.13.0

7 files changed, 473 insertions, 448 deletions

diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php
index 91da8adcf..c9a7d6683 100644
--- a/app/i18n/ru/admin.php
+++ b/app/i18n/ru/admin.php
@@ -67,8 +67,8 @@ return array(
 			'ok' => 'У вас установлена библиотека для работы с JSON.',
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO
-			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO
+			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO - Translation
+			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO - Translation
 		),
 		'minz' => array(
 			'nok' => 'У вас не установлен фрейворк Minz.',
@@ -106,23 +106,23 @@ return array(
 		),
 	),
 	'extensions' => array(
+		'author' => 'Author',	//TODO - Translation
+		'community' => 'Available community extensions',	//TODO - Translation
+		'description' => 'Description',	//TODO - Translation
 		'disabled' => 'Отключены',
 		'empty_list' => 'Расширения не установлены',
 		'enabled' => 'Включены',
+		'latest' => 'Installed',	//TODO - Translation
+		'name' => 'Name',	//TODO - Translation
 		'no_configure_view' => 'Это расширение нельзя настроить.',
 		'system' => array(
 			'_' => 'Системные расширения',
 			'no_rights' => 'Системные расширения (у вас нет к ним доступа)',
 		),
 		'title' => 'Расширения',
+		'update' => 'Update available',	//TODO - Translation
 		'user' => 'Расширения пользователя',
-		'community' => 'Available community extensions', // @todo translate
-		'name' => 'Name', // @todo translate
-		'version' => 'Version', // @todo translate
-		'description' => 'Description', // @todo translate
-		'author' => 'Author', // @todo translate
-		'latest' => 'Installed', // @todo translate
-		'update' => 'Update available', // @todo translate
+		'version' => 'Version',	//TODO - Translation
 	),
 	'stats' => array(
 		'_' => 'Статистика',
@@ -162,6 +162,10 @@ return array(
 		'instance-name' => 'Название этого сервера',
 		'max-categories' => 'Количество категорий на пользователя',
 		'max-feeds' => 'Количество статей на пользователя',
+		'cookie-duration' => array(
+			'help' => 'in seconds', // @todo translate
+			'number' => 'Duration to keep logged in', // @todo translate
+		),
 		'registration' => array(
 			'help' => '0 означает неограниченное количество пользователей',
 			'number' => 'Максимальное количество пользователей',
@@ -179,15 +183,15 @@ return array(
 	'user' => array(
 		'articles_and_size' => '%s статей (%s)',
 		'create' => 'Создать нового пользователя',
-		'delete_users' => 'Delete user', // TODO
+		'delete_users' => 'Delete user',	//TODO - Translation
 		'language' => 'Язык',
 		'number' => 'На данный момент создан %d аккаунт',
 		'numbers' => 'На данный момент аккаунтов создано:  %d',
 		'password_form' => 'Пароль<br /><small>(для входа через Веб-форму)</small>',
 		'password_format' => 'Минимум 7 символов',
-		'selected' => 'Selected user', // TODO
+		'selected' => 'Selected user',	//TODO - Translation
 		'title' => 'Управление пользователями',
-		'update_users' => 'Update user', // TODO
+		'update_users' => 'Update user',	//TODO - Translation
 		'user_list' => 'Список пользователей',
 		'username' => 'Имя пользователя',
 		'users' => 'Пользователи',
diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.php
index b9d45fb20..59ac480bc 100644
--- a/app/i18n/ru/conf.php
+++ b/app/i18n/ru/conf.php
@@ -6,9 +6,9 @@ return array(
 		'advanced' => 'Продвинутые настройки',
 		'delete_after' => 'Удалять статьи после',
 		'help' => 'Каждую подписку можно настроить более гибко',
-		'keep_history_by_feed' => 'Minimum number of articles to keep by feed',
+		'keep_history_by_feed' => 'Minimum number of articles to keep by feed', 	//TODO - Translation
 		'optimize' => 'Оптимизировать базу данных',
-		'optimize_help' => 'To do occasionally to reduce the size of the database',
+		'optimize_help' => 'To do occasionally to reduce the size of the database', 	//TODO - Translation
 		'purge_now' => 'Очистить сейчас',
 		'title' => 'Архивация',
 		'ttl' => 'Не обновлять чаще чем',
@@ -16,169 +16,172 @@ return array(
 	'display' => array(
 		'_' => 'Display',
 		'icon' => array(
-			'bottom_line' => 'Bottom line',
-			'entry' => 'Article icons',
-			'publication_date' => 'Date of publication',
-			'related_tags' => 'Related tags',	//TODO
-			'sharing' => 'Sharing',
-			'top_line' => 'Top line',
+			'bottom_line' => 'Bottom line',	//TODO - Translation
+			'entry' => 'Article icons',	//TODO - Translation
+			'publication_date' => 'Date of publication',	//TODO - Translation
+			'related_tags' => 'Related tags',	//TODO - Translation
+			'sharing' => 'Sharing',	//TODO - Translation
+			'top_line' => 'Top line',	//TODO - Translation
 		),
 		'language' => 'Язык',
 		'notif_html5' => array(
-			'seconds' => 'seconds (0 means no timeout)',
-			'timeout' => 'HTML5 notification timeout',
+			'seconds' => 'seconds (0 means no timeout)',	//TODO - Translation
+			'timeout' => 'HTML5 notification timeout',	//TODO - Translation
 		),
+		'show_nav_buttons' => 'Show the navigation buttons',	//TODO - Translation
 		'theme' => 'Тема',
-		'title' => 'Display',
+		'title' => 'Display',	//TODO - Translation
 		'width' => array(
-			'content' => 'Content width',
-			'large' => 'Large',
-			'medium' => 'Medium',
-			'no_limit' => 'No limit',
-			'thin' => 'Thin',
+			'content' => 'Content width',	//TODO - Translation
+			'large' => 'Large',	//TODO - Translation
+			'medium' => 'Medium',	//TODO - Translation
+			'no_limit' => 'No limit',	//TODO - Translation
+			'thin' => 'Thin',	//TODO - Translation
 		),
-		'show_nav_buttons' => 'Show the navigation buttons',	//TODO
-	),
-	'query' => array(
-		'_' => 'User queries',
-		'deprecated' => 'This query is no longer valid. The referenced category or feed has been deleted.',
-		'display' => 'Display user query results', // TODO
-		'filter' => 'Filter applied:',
-		'get_all' => 'Display all articles',
-		'get_category' => 'Display "%s" category',
-		'get_favorite' => 'Display favorite articles',
-		'get_feed' => 'Display "%s" feed',
-		'no_filter' => 'No filter',
-		'none' => 'You haven’t created any user query yet.',
-		'number' => 'Query n°%d',
-		'order_asc' => 'Display oldest articles first',
-		'order_desc' => 'Display newest articles first',
-		'remove' => 'Remove user query', // TODO
-		'search' => 'Search for "%s"',
-		'state_0' => 'Display all articles',
-		'state_1' => 'Display read articles',
-		'state_2' => 'Display unread articles',
-		'state_3' => 'Display all articles',
-		'state_4' => 'Display favorite articles',
-		'state_5' => 'Display read favorite articles',
-		'state_6' => 'Display unread favorite articles',
-		'state_7' => 'Display favorite articles',
-		'state_8' => 'Display not favorite articles',
-		'state_9' => 'Display read not favorite articles',
-		'state_10' => 'Display unread not favorite articles',
-		'state_11' => 'Display not favorite articles',
-		'state_12' => 'Display all articles',
-		'state_13' => 'Display read articles',
-		'state_14' => 'Display unread articles',
-		'state_15' => 'Display all articles',
-		'title' => 'User queries',
 	),
 	'profile' => array(
-		'_' => 'Profile management',
+		'_' => 'Profile management',	//TODO - Translation
 		'delete' => array(
-			'_' => 'Account deletion',
-			'warn' => 'Your account and all the related data will be deleted.',
+			'_' => 'Account deletion',	//TODO - Translation
+			'warn' => 'Your account and all the related data will be deleted.',	//TODO - Translation
 		),
-		'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
-		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
-		'password_format' => 'At least 7 characters',
-		'title' => 'Profile',
+		'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',	//TODO - Translation
+		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',	//TODO - Translation
+		'password_format' => 'At least 7 characters',	//TODO - Translation
+		'title' => 'Profile',	//TODO - Translation
+	),
+	'query' => array(
+		'_' => 'User queries',
+		'deprecated' => 'This query is no longer valid. The referenced category or feed has been deleted.',	//TODO - Translation
+		'display' => 'Display user query results',	//TODO - Translation
+		'filter' => 'Filter applied:',	//TODO - Translation
+		'get_all' => 'Display all articles',	//TODO - Translation
+		'get_category' => 'Display "%s" category',	//TODO - Translation
+		'get_favorite' => 'Display favorite articles',	//TODO - Translation
+		'get_feed' => 'Display "%s" feed',	//TODO - Translation
+		'no_filter' => 'No filter',	//TODO - Translation
+		'none' => 'You haven’t created any user query yet.',	//TODO - Translation
+		'number' => 'Query n°%d',	//TODO - Translation
+		'order_asc' => 'Display oldest articles first',	//TODO - Translation
+		'order_desc' => 'Display newest articles first',	//TODO - Translation
+		'remove' => 'Remove user query',	//TODO - Translation
+		'search' => 'Search for "%s"',	//TODO - Translation
+		'state_0' => 'Display all articles',	//TODO - Translation
+		'state_1' => 'Display read articles',	//TODO - Translation
+		'state_2' => 'Display unread articles',	//TODO - Translation
+		'state_3' => 'Display all articles',	//TODO - Translation
+		'state_4' => 'Display favorite articles',	//TODO - Translation
+		'state_5' => 'Display read favorite articles',	//TODO - Translation
+		'state_6' => 'Display unread favorite articles',	//TODO - Translation
+		'state_7' => 'Display favorite articles',	//TODO - Translation
+		'state_8' => 'Display not favorite articles',	//TODO - Translation
+		'state_9' => 'Display read not favorite articles',	//TODO - Translation
+		'state_10' => 'Display unread not favorite articles',	//TODO - Translation
+		'state_11' => 'Display not favorite articles',	//TODO - Translation
+		'state_12' => 'Display all articles',	//TODO - Translation
+		'state_13' => 'Display read articles',	//TODO - Translation
+		'state_14' => 'Display unread articles',	//TODO - Translation
+		'state_15' => 'Display all articles',	//TODO - Translation
+		'title' => 'User queries',	//TODO - Translation
 	),
 	'reading' => array(
-		'_' => 'Reading',
-		'after_onread' => 'After “mark all as read”,',
-		'articles_per_page' => 'Number of articles per page',
-		'auto_load_more' => 'Load next articles at the page bottom',
-		'auto_remove_article' => 'Hide articles after reading',
-		'mark_updated_article_unread' => 'Mark updated articles as unread',
-		'confirm_enabled' => 'Display a confirmation dialog on “mark all as read” actions',
-		'display_articles_unfolded' => 'Show articles unfolded by default',
-		'display_categories_unfolded' => 'Show categories folded by default',
-		'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',
-		'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
-		'sides_close_article' => 'Clicking outside of article text area closes the article',	//TODO
-		'jump_next' => 'jump to next unread sibling (feed or category)',
-		'number_divided_when_reader' => 'Divided by 2 in the reading view.',
+		'_' => 'Reading',	//TODO - Translation
+		'after_onread' => 'After “mark all as read”,',	//TODO - Translation
+		'articles_per_page' => 'Number of articles per page',	//TODO - Translation
+		'auto_load_more' => 'Load next articles at the page bottom',	//TODO - Translation
+		'auto_remove_article' => 'Hide articles after reading',	//TODO - Translation
+		'confirm_enabled' => 'Display a confirmation dialog on “mark all as read” actions',	//TODO - Translation
+		'display_articles_unfolded' => 'Show articles unfolded by default',	//TODO - Translation
+		'display_categories_unfolded' => 'Show categories folded by default',	//TODO - Translation
+		'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',	//TODO - Translation
+		'img_with_lazyload' => 'Use "lazy load" mode to load pictures',	//TODO - Translation
+		'jump_next' => 'jump to next unread sibling (feed or category)',	//TODO - Translation
+		'mark_updated_article_unread' => 'Mark updated articles as unread',	//TODO - Translation
+		'number_divided_when_reader' => 'Divided by 2 in the reading view.',	//TODO - Translation
 		'read' => array(
-			'article_open_on_website' => 'when article is opened on its original website',
-			'article_viewed' => 'when article is viewed',
-			'scroll' => 'while scrolling',
-			'upon_reception' => 'upon reception of the article',
-			'when' => 'Mark article as read…',
+			'article_open_on_website' => 'when article is opened on its original website',	//TODO - Translation
+			'article_viewed' => 'when article is viewed',	//TODO - Translation
+			'scroll' => 'while scrolling',	//TODO - Translation
+			'upon_reception' => 'upon reception of the article',	//TODO - Translation
+			'when' => 'Mark article as read…',	//TODO - Translation
 		),
 		'show' => array(
-			'_' => 'Articles to display',
-			'adaptive' => 'Adjust showing',
-			'all_articles' => 'Show all articles',
-			'unread' => 'Show only unread',
+			'_' => 'Articles to display',	//TODO - Translation
+			'adaptive' => 'Adjust showing',	//TODO - Translation
+			'all_articles' => 'Show all articles',	//TODO - Translation
+			'unread' => 'Show only unread',	//TODO - Translation
 		),
+		'sides_close_article' => 'Clicking outside of article text area closes the article',	//TODO - Translation
 		'sort' => array(
-			'_' => 'Sort order',
-			'newer_first' => 'Newer first',
-			'older_first' => 'Oldest first',
+			'_' => 'Sort order',	//TODO - Translation
+			'newer_first' => 'Newer first',	//TODO - Translation
+			'older_first' => 'Oldest first',	//TODO - Translation
 		),
-		'sticky_post' => 'Stick the article to the top when opened',
-		'title' => 'Reading',
+		'sticky_post' => 'Stick the article to the top when opened',	//TODO - Translation
+		'title' => 'Reading',	//TODO - Translation
 		'view' => array(
-			'default' => 'Default view',
-			'global' => 'Global view',
-			'normal' => 'Normal view',
-			'reader' => 'Reading view',
+			'default' => 'Default view',	//TODO - Translation
+			'global' => 'Global view',	//TODO - Translation
+			'normal' => 'Normal view',	//TODO - Translation
+			'reader' => 'Reading view',	//TODO - Translation
 		),
 	),
 	'sharing' => array(
-		'_' => 'Sharing',
-		'add' => 'Add a sharing method', // TODO
+		'_' => 'Sharing',	//TODO - Translation
+		'add' => 'Add a sharing method',	//TODO - Translation
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
-		'email' => 'Email',
+		'email' => 'Email',	//TODO - Translation
 		'facebook' => 'Facebook',
 		'g+' => 'Google+',
-		'more_information' => 'More information',
-		'print' => 'Print',
-		'remove' => 'Remove sharing method', // TODO
+		'more_information' => 'More information',	//TODO - Translation
+		'print' => 'Print',	//TODO - Translation
+		'remove' => 'Remove sharing method',	//TODO - Translation
 		'shaarli' => 'Shaarli',
-		'share_name' => 'Share name to display',
-		'share_url' => 'Share URL to use',
+		'share_name' => 'Share name to display',	//TODO - Translation
+		'share_url' => 'Share URL to use',	//TODO - Translation
 		'title' => 'Sharing',
 		'twitter' => 'Twitter',
 		'wallabag' => 'wallabag',
 	),
 	'shortcut' => array(
-		'_' => 'Shortcuts',
-		'article_action' => 'Article actions',
-		'auto_share' => 'Share',
-		'auto_share_help' => 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
-		'close_dropdown' => 'Close menus',
-		'collapse_article' => 'Collapse',
-		'first_article' => 'Skip to the first article',
-		'focus_search' => 'Access search box',
-		'global_view' => 'Switch to global view',  // TODO
-		'help' => 'Display documentation',
-		'javascript' => 'JavaScript must be enabled in order to use shortcuts',
-		'last_article' => 'Skip to the last article',
-		'load_more' => 'Load more articles',
-		'mark_read' => 'Mark as read',
-		'mark_favorite' => 'Mark as favourite',
-		'navigation' => 'Navigation',
-		'navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.<br/>With the "Alt" modifier, navigation shortcuts apply on categories.',
-		'next_article' => 'Skip to the next article',
-		'normal_view' => 'Switch to normal view', // TODO
-		'other_action' => 'Other actions',
-		'previous_article' => 'Skip to the previous article',
-		'reading_view' => 'Switch to reading view', // TODO
-		'rss_view' => 'Open RSS view in a new tab', // TODO
-		'see_on_website' => 'See on original website',
-		'shift_for_all_read' => '+ <code>shift</code> to mark all articles as read',
-		'title' => 'Shortcuts',
-		'user_filter' => 'Access user filters',
-		'user_filter_help' => 'If there is only one user filter, it is used. Else filters are accessible by their number.',
-		'views' => 'Views', // TODO
+		'_' => 'Shortcuts',	//TODO - Translation
+		'article_action' => 'Article actions',	//TODO - Translation
+		'auto_share' => 'Share',	//TODO - Translation
+		'auto_share_help' => 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',	//TODO - Translation
+		'close_dropdown' => 'Close menus',	//TODO - Translation
+		'collapse_article' => 'Collapse',	//TODO - Translation
+		'first_article' => 'Skip to the first article',	//TODO - Translation
+		'focus_search' => 'Access search box',	//TODO - Translation
+		'global_view' => 'Switch to global view',	//TODO - Translation
+		'help' => 'Display documentation',	//TODO - Translation
+		'javascript' => 'JavaScript must be enabled in order to use shortcuts',	//TODO - Translation
+		'last_article' => 'Skip to the last article',	//TODO - Translation
+		'load_more' => 'Load more articles',	//TODO - Translation
+		'mark_read' => 'Mark as read',	//TODO - Translation
+		'mark_favorite' => 'Mark as favourite',	//TODO - Translation
+		'navigation' => 'Navigation',	//TODO - Translation
+		'navigation_help' => 'With the "Shift" modifier, navigation shortcuts apply on feeds.<br/>With the "Alt" modifier, navigation shortcuts apply on categories.',	//TODO - Translation
+		'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.',	//TODO - Translation
+		'next_article' => 'Skip to the next article',	//TODO - Translation
+		'normal_view' => 'Switch to normal view',	//TODO - Translation
+		'other_action' => 'Other actions',	//TODO - Translation
+		'previous_article' => 'Skip to the previous article',	//TODO - Translation
+		'reading_view' => 'Switch to reading view',	//TODO - Translation
+		'rss_view' => 'Open RSS view in a new tab',	//TODO - Translation
+		'see_on_website' => 'See on original website',	//TODO - Translation
+		'shift_for_all_read' => '+ <code>shift</code> to mark all articles as read',	//TODO - Translation
+		'skip_next_article' => 'Focus next without opening',	//TODO - Translation
+		'skip_previous_article' => 'Focus previous without opening',	//TODO - Translation
+		'title' => 'Shortcuts',	//TODO - Translation
+		'user_filter' => 'Access user filters',	//TODO - Translation
+		'user_filter_help' => 'If there is only one user filter, it is used. Else filters are accessible by their number.',	//TODO - Translation
+		'views' => 'Views',	//TODO - Translation
 	),
 	'user' => array(
-		'articles_and_size' => '%s articles (%s)',
-		'current' => 'Current user',
-		'is_admin' => 'is administrator',
-		'users' => 'Users',
+		'articles_and_size' => '%s articles (%s)',	//TODO - Translation
+		'current' => 'Current user',	//TODO - Translation
+		'is_admin' => 'is administrator',	//TODO - Translation
+		'users' => 'Users',	//TODO - Translation
 	),
 );
diff --git a/app/i18n/ru/feedback.php b/app/i18n/ru/feedback.php
index 693a40b34..7b859fcdd 100644
--- a/app/i18n/ru/feedback.php
+++ b/app/i18n/ru/feedback.php
@@ -2,115 +2,115 @@
 
 return array(
 	'admin' => array(
-		'optimization_complete' => 'Optimisation complete',	//TODO
+		'optimization_complete' => 'Optimisation complete',	//TODO - Translation
 	),
 	'access' => array(
-		'denied' => 'You don’t have permission to access this page',	//TODO
-		'not_found' => 'You are looking for a page which doesn’t exist',	//TODO
+		'denied' => 'You don’t have permission to access this page',	//TODO - Translation
+		'not_found' => 'You are looking for a page which doesn’t exist',	//TODO - Translation
 	),
 	'auth' => array(
 		'form' => array(
-			'not_set' => 'A problem occured during authentication system configuration. Please retry later.',	//TODO
-			'set' => 'Form is now your default authentication system.',	//TODO
+			'not_set' => 'A problem occured during authentication system configuration. Please retry later.',	//TODO - Translation
+			'set' => 'Form is now your default authentication system.',	//TODO - Translation
 		),
 		'login' => array(
-			'invalid' => 'Login is invalid',	//TODO
-			'success' => 'You are connected',	//TODO
+			'invalid' => 'Login is invalid',	//TODO - Translation
+			'success' => 'You are connected',	//TODO - Translation
 		),
 		'logout' => array(
-			'success' => 'You are disconnected',	//TODO
+			'success' => 'You are disconnected',	//TODO - Translation
 		),
-		'no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.',	//TODO
+		'no_password_set' => 'Administrator password hasn’t been set. This feature isn’t available.',	//TODO - Translation
 	),
 	'conf' => array(
-		'error' => 'An error occurred during configuration saving',	//TODO
-		'query_created' => 'Query "%s" has been created.',	//TODO
-		'shortcuts_updated' => 'Shortcuts have been updated',	//TODO
-		'updated' => 'Configuration has been updated',	//TODO
+		'error' => 'An error occurred during configuration saving',		//TODO - Translation
+		'query_created' => 'Query "%s" has been created.',	//TODO - Translation
+		'shortcuts_updated' => 'Shortcuts have been updated',	//TODO - Translation
+		'updated' => 'Configuration has been updated',	//TODO - Translation
 	),
 	'extensions' => array(
-		'already_enabled' => '%s is already enabled',	//TODO
+		'already_enabled' => '%s is already enabled',	//TODO - Translation
 		'disable' => array(
-			'ko' => '%s cannot be disabled. <a href="%s">Check FreshRSS logs</a> for details.',	//TODO
-			'ok' => '%s is now disabled',	//TODO
+			'ko' => '%s cannot be disabled. <a href="%s">Check FreshRSS logs</a> for details.',	//TODO - Translation
+			'ok' => '%s is now disabled',	//TODO - Translation
 		),
 		'enable' => array(
-			'ko' => '%s cannot be enabled. <a href="%s">Check FreshRSS logs</a> for details.',	//TODO
-			'ok' => '%s is now enabled',	//TODO
+			'ko' => '%s cannot be enabled. <a href="%s">Check FreshRSS logs</a> for details.',	//TODO - Translation
+			'ok' => '%s is now enabled',	//TODO - Translation
 		),
-		'no_access' => 'You have no access on %s',	//TODO
-		'not_enabled' => '%s is not enabled yet',	//TODO
-		'not_found' => '%s does not exist',	//TODO
+		'no_access' => 'You have no access on %s',	//TODO - Translation
+		'not_enabled' => '%s is not enabled yet',	//TODO - Translation
+		'not_found' => '%s does not exist',	//TODO - Translation
 	),
 	'import_export' => array(
-		'export_no_zip_extension' => 'ZIP extension is not present on your server. Please try to export files one by one.',	//TODO
-		'feeds_imported' => 'Your feeds have been imported and will now be updated',	//TODO
-		'feeds_imported_with_errors' => 'Your feeds have been imported but some errors occurred',	//TODO
-		'file_cannot_be_uploaded' => 'File cannot be uploaded!',	//TODO
-		'no_zip_extension' => 'ZIP extension is not present on your server.',	//TODO
-		'zip_error' => 'An error occured during ZIP import.',	//TODO
+		'export_no_zip_extension' => 'ZIP extension is not present on your server. Please try to export files one by one.',	//TODO - Translation
+		'feeds_imported' => 'Your feeds have been imported and will now be updated',	//TODO - Translation
+		'feeds_imported_with_errors' => 'Your feeds have been imported but some errors occurred',	//TODO - Translation
+		'file_cannot_be_uploaded' => 'File cannot be uploaded!',	//TODO - Translation
+		'no_zip_extension' => 'ZIP extension is not present on your server.',	//TODO - Translation
+		'zip_error' => 'An error occured during ZIP import.',	//TODO - Translation
+	),
+	'profile' => array(
+		'error' => 'Your profile cannot be modified',	//TODO - Translation
+		'updated' => 'Your profile has been modified',	//TODO - Translation
 	),
 	'sub' => array(
-		'actualize' => 'Actualise',	//TODO
+		'actualize' => 'Actualise',	//TODO - Translation
 		'articles' => array(
-			'marked_read' => 'The selected articles have been marked as read.',	//TODO
-			'marked_unread' => 'The articles have been marked as unread.',	//TODO
+			'marked_read' => 'The selected articles have been marked as read.',	//TODO - Translation
+			'marked_unread' => 'The articles have been marked as unread.',	//TODO - Translation
 		),
 		'category' => array(
-			'created' => 'Category %s has been created.',	//TODO
-			'deleted' => 'Category has been deleted.',	//TODO
-			'emptied' => 'Category has been emptied',	//TODO
-			'error' => 'Category cannot be updated',	//TODO
-			'name_exists' => 'Category name already exists.',	//TODO
-			'no_id' => 'You must precise the id of the category.',	//TODO
-			'no_name' => 'Category name cannot be empty.',	//TODO
-			'not_delete_default' => 'You cannot delete the default category!',	//TODO
-			'not_exist' => 'The category does not exist!',	//TODO
-			'over_max' => 'You have reached your limit of categories (%d)',	//TODO
-			'updated' => 'Category has been updated.',	//TODO
+			'created' => 'Category %s has been created.',	//TODO - Translation
+			'deleted' => 'Category has been deleted.',	//TODO - Translation
+			'emptied' => 'Category has been emptied',	//TODO - Translation
+			'error' => 'Category cannot be updated',	//TODO - Translation
+			'name_exists' => 'Category name already exists.',	//TODO - Translation
+			'no_id' => 'You must precise the id of the category.',	//TODO - Translation
+			'no_name' => 'Category name cannot be empty.',	//TODO - Translation
+			'not_delete_default' => 'You cannot delete the default category!',	//TODO - Translation
+			'not_exist' => 'The category does not exist!',	//TODO - Translation
+			'over_max' => 'You have reached your limit of categories (%d)',	//TODO - Translation
+			'updated' => 'Category has been updated.',	//TODO - Translation
 		),
 		'feed' => array(
-			'actualized' => '<em>%s</em> has been updated',	//TODO
-			'actualizeds' => 'RSS feeds have been updated',	//TODO
-			'added' => 'RSS feed <em>%s</em> has been added',	//TODO
-			'already_subscribed' => 'You have already subscribed to <em>%s</em>',	//TODO
-			'deleted' => 'Feed has been deleted',	//TODO
-			'error' => 'Feed cannot be updated',	//TODO
-			'internal_problem' => 'The newsfeed could not be added. <a href="%s">Check FreshRSS logs</a> for details. You can try force adding by appending <code>#force_feed</code> to the URL.',	//TODO
-			'invalid_url' => 'URL <em>%s</em> is invalid',	//TODO
-			'n_actualized' => '%d feeds have been updated',	//TODO
-			'n_entries_deleted' => '%d articles have been deleted',	//TODO
-			'no_refresh' => 'There is no feed to refresh…',	//TODO
-			'not_added' => '<em>%s</em> could not be added',	//TODO
-			'over_max' => 'You have reached your limit of feeds (%d)',	//TODO
-			'updated' => 'Feed has been updated',	//TODO
+			'actualized' => '<em>%s</em> has been updated',	//TODO - Translation
+			'actualizeds' => 'RSS feeds have been updated',	//TODO - Translation
+			'added' => 'RSS feed <em>%s</em> has been added',	//TODO - Translation
+			'already_subscribed' => 'You have already subscribed to <em>%s</em>',	//TODO - Translation
+			'deleted' => 'Feed has been deleted',	//TODO - Translation
+			'error' => 'Feed cannot be updated',	//TODO - Translation
+			'internal_problem' => 'The newsfeed could not be added. <a href="%s">Check FreshRSS logs</a> for details. You can try force adding by appending <code>#force_feed</code> to the URL.',	//TODO - Translation
+			'invalid_url' => 'URL <em>%s</em> is invalid',	//TODO - Translation
+			'n_actualized' => '%d feeds have been updated',	//TODO - Translation
+			'n_entries_deleted' => '%d articles have been deleted',	//TODO - Translation
+			'no_refresh' => 'There is no feed to refresh…',	//TODO - Translation
+			'not_added' => '<em>%s</em> could not be added',	//TODO - Translation
+			'over_max' => 'You have reached your limit of feeds (%d)',	//TODO - Translation
+			'updated' => 'Feed has been updated',	//TODO - Translation
 		),
-		'purge_completed' => 'Purge completed (%d articles deleted)',	//TODO
+		'purge_completed' => 'Purge completed (%d articles deleted)',	//TODO - Translation
 	),
 	'update' => array(
-		'can_apply' => 'FreshRSS will now be updated to the <strong>version %s</strong>.',	//TODO
-		'error' => 'The update process has encountered an error: %s',	//TODO
-		'file_is_nok' => 'New <strong>version %s</strong> available, but check permissions on <em>%s</em> directory. HTTP server must have rights to write into',	//TODO
-		'finished' => 'Update completed!',	//TODO
-		'none' => 'No update to apply',	//TODO
-		'server_not_found' => 'Update server cannot be found. [%s]',	//TODO
+		'can_apply' => 'FreshRSS will now be updated to the <strong>version %s</strong>.',	//TODO - Translation
+		'error' => 'The update process has encountered an error: %s',	//TODO - Translation
+		'file_is_nok' => 'New <strong>version %s</strong> available, but check permissions on <em>%s</em> directory. HTTP server must have rights to write into',	//TODO - Translation
+		'finished' => 'Update completed!',	//TODO - Translation
+		'none' => 'No update to apply',	//TODO - Translation
+		'server_not_found' => 'Update server cannot be found. [%s]',	//TODO - Translation
 	),
 	'user' => array(
 		'created' => array(
-			'_' => 'User %s has been created',	//TODO
-			'error' => 'User %s cannot be created',	//TODO
+			'_' => 'User %s has been created',	//TODO - Translation
+			'error' => 'User %s cannot be created',	//TODO - Translation
 		),
 		'deleted' => array(
-			'_' => 'User %s has been deleted',	//TODO
-			'error' => 'User %s cannot be deleted',	//TODO
+			'_' => 'User %s has been deleted',	//TODO - Translation
+			'error' => 'User %s cannot be deleted',	//TODO - Translation
 		),
 		'updated' => array(
-			'_' => 'User %s has been updated', // TODO
-			'error' => 'User %s has not been updated', // TODO
+			'_' => 'User %s has been updated',	//TODO - Translation
+			'error' => 'User %s has not been updated',	//TODO - Translation
 		),
 	),
-	'profile' => array(
-		'error' => 'Your profile cannot be modified',	//TODO
-		'updated' => 'Your profile has been modified',	//TODO
-	),
 );
diff --git a/app/i18n/ru/gen.php b/app/i18n/ru/gen.php
index 6c8dd2adf..b55c6b667 100644
--- a/app/i18n/ru/gen.php
+++ b/app/i18n/ru/gen.php
@@ -2,117 +2,117 @@
 
 return array(
 	'action' => array(
-		'actualize' => 'Actualize',
-		'back_to_rss_feeds' => '← Go back to your RSS feeds',
-		'cancel' => 'Cancel',
-		'create' => 'Create',
-		'disable' => 'Disable',
-		'empty' => 'Empty',
-		'enable' => 'Enable',
-		'export' => 'Export',
-		'filter' => 'Filter',
-		'import' => 'Import',
-		'manage' => 'Manage',
-		'mark_favorite' => 'Mark as favourite',
-		'mark_read' => 'Mark as read',
-		'remove' => 'Remove',
-		'see_website' => 'See website',
-		'submit' => 'Submit',
-		'truncate' => 'Delete all articles',
-		'update' => 'Update', // TODO
+		'actualize' => 'Actualize',	//TODO - Translation
+		'back_to_rss_feeds' => '← Go back to your RSS feeds',	//TODO - Translation
+		'cancel' => 'Cancel',	//TODO - Translation
+		'create' => 'Create',	//TODO - Translation
+		'disable' => 'Disable',	//TODO - Translation
+		'empty' => 'Empty',	//TODO - Translation
+		'enable' => 'Enable',	//TODO - Translation
+		'export' => 'Export',	//TODO - Translation
+		'filter' => 'Filter',	//TODO - Translation
+		'import' => 'Import',	//TODO - Translation
+		'manage' => 'Manage',	//TODO - Translation
+		'mark_favorite' => 'Mark as favourite',	//TODO - Translation
+		'mark_read' => 'Mark as read',	//TODO - Translation
+		'remove' => 'Remove',	//TODO - Translation
+		'see_website' => 'See website',	//TODO - Translation
+		'submit' => 'Submit',	//TODO - Translation
+		'truncate' => 'Delete all articles',	//TODO - Translation
+		'update' => 'Update',	//TODO - Translation
 	),
 	'auth' => array(
-		'email' => 'Email address',
-		'keep_logged_in' => 'Keep me logged in <small>(%s дней)</small>',
-		'login' => 'Login',
-		'logout' => 'Logout',
+		'email' => 'Email address',	//TODO - Translation
+		'keep_logged_in' => 'Keep me logged in <small>(%s дней)</small>',	//TODO - Translation
+		'login' => 'Login',	//TODO - Translation
+		'logout' => 'Logout',	//TODO - Translation
 		'password' => array(
-			'_' => 'Password',
-			'format' => '<small>At least 7 characters</small>',
+			'_' => 'Password',	//TODO - Translation
+			'format' => '<small>At least 7 characters</small>',	//TODO - Translation
 		),
 		'registration' => array(
-			'_' => 'New account',
-			'ask' => 'Create an account?',
-			'title' => 'Account creation',
+			'_' => 'New account',	//TODO - Translation
+			'ask' => 'Create an account?',	//TODO - Translation
+			'title' => 'Account creation',	//TODO - Translation
 		),
-		'reset' => 'Authentication reset',
+		'reset' => 'Authentication reset',	//TODO - Translation
 		'username' => array(
-			'_' => 'Username',
-			'admin' => 'Administrator username',
-			'format' => '<small>maximum 16 alphanumeric characters</small>',
+			'_' => 'Username',	//TODO - Translation
+			'admin' => 'Administrator username',	//TODO - Translation
+			'format' => '<small>maximum 16 alphanumeric characters</small>',	//TODO - Translation
 		),
 	),
 	'date' => array(
-		'Apr' => '\\A\\p\\r\\i\\l',
-		'Aug' => '\\A\\u\\g\\u\\s\\t',
-		'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',
-		'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y',
-		'Jan' => '\\J\\a\\n\\u\\a\\r\\y',
-		'Jul' => '\\J\\u\\l\\y',
-		'Jun' => '\\J\\u\\n\\e',
-		'Mar' => '\\M\\a\\r\\c\\h',
-		'May' => '\\M\\a\\y',
-		'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
-		'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
-		'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
-		'apr' => 'apr',
-		'april' => 'Apr',
-		'aug' => 'aug',
-		'august' => 'Aug',
-		'before_yesterday' => 'Before yesterday',
-		'dec' => 'dec',
-		'december' => 'Dec',
-		'feb' => 'feb',
-		'february' => 'Feb',
-		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',
-		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',
-		'fri' => 'Fri',
-		'jan' => 'jan',
-		'january' => 'Jan',
-		'jul' => 'jul',
-		'july' => 'Jul',
-		'jun' => 'jun',
-		'june' => 'Jun',
-		'last_3_month' => 'Last three months',
-		'last_6_month' => 'Last six months',
-		'last_month' => 'Last month',
-		'last_week' => 'Last week',
-		'last_year' => 'Last year',
-		'mar' => 'mar',
-		'march' => 'Mar',
-		'may' => 'May',
-		'may_' => 'May',
-		'mon' => 'Mon',
-		'month' => 'months',
-		'nov' => 'nov',
-		'november' => 'Nov',
-		'oct' => 'oct',
-		'october' => 'Oct',
-		'sat' => 'Sat',
-		'sep' => 'sep',
-		'september' => 'Sep',
-		'sun' => 'Sun',
-		'thu' => 'Thu',
-		'today' => 'Today',
-		'tue' => 'Tue',
-		'wed' => 'Wed',
-		'yesterday' => 'Yesterday',
+		'Apr' => '\\A\\p\\r\\i\\l',	//TODO - Translation
+		'apr' => 'apr',	//TODO - Translation
+		'april' => 'Apr',	//TODO - Translation
+		'Aug' => '\\A\\u\\g\\u\\s\\t',	//TODO - Translation
+		'aug' => 'aug',	//TODO - Translation
+		'august' => 'Aug',	//TODO - Translation
+		'before_yesterday' => 'Before yesterday',	//TODO - Translation
+		'Dec' => '\\D\\e\\c\\e\\m\\b\\e\\r',	//TODO - Translation
+		'dec' => 'dec',	//TODO - Translation
+		'december' => 'Dec',	//TODO - Translation
+		'Feb' => '\\F\\e\\b\\r\\u\\a\\r\\y',	//TODO - Translation
+		'feb' => 'feb',	//TODO - Translation
+		'february' => 'Feb',	//TODO - Translation
+		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',	//TODO - Translation
+		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',	//TODO - Translation
+		'fri' => 'Fri',	//TODO - Translation
+		'Jan' => '\\J\\a\\n\\u\\a\\r\\y',	//TODO - Translation
+		'jan' => 'jan',	//TODO - Translation
+		'january' => 'Jan',	//TODO - Translation
+		'Jul' => '\\J\\u\\l\\y',	//TODO - Translation
+		'jul' => 'jul',	//TODO - Translation
+		'july' => 'Jul',	//TODO - Translation
+		'Jun' => '\\J\\u\\n\\e',	//TODO - Translation
+		'jun' => 'jun',	//TODO - Translation
+		'june' => 'Jun',	//TODO - Translation
+		'last_3_month' => 'Last three months',	//TODO - Translation
+		'last_6_month' => 'Last six months',	//TODO - Translation
+		'last_month' => 'Last month',	//TODO - Translation
+		'last_week' => 'Last week',	//TODO - Translation
+		'last_year' => 'Last year',	//TODO - Translation
+		'Mar' => '\\M\\a\\r\\c\\h',	//TODO - Translation
+		'mar' => 'mar',	//TODO - Translation
+		'march' => 'Mar',	//TODO - Translation
+		'May' => '\\M\\a\\y',	//TODO - Translation
+		'may' => 'May',	//TODO - Translation
+		'may_' => 'May',	//TODO - Translation
+		'mon' => 'Mon',	//TODO - Translation
+		'month' => 'months',	//TODO - Translation
+		'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',	//TODO - Translation
+		'nov' => 'nov',	//TODO - Translation
+		'november' => 'Nov',	//TODO - Translation
+		'Oct' => '\\O\\c\\t\\o\\b\\e\\r',	//TODO - Translation
+		'oct' => 'oct',	//TODO - Translation
+		'october' => 'Oct',	//TODO - Translation
+		'sat' => 'Sat',	//TODO - Translation
+		'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',	//TODO - Translation
+		'sep' => 'sep',	//TODO - Translation
+		'september' => 'Sep',	//TODO - Translation
+		'sun' => 'Sun',	//TODO - Translation
+		'thu' => 'Thu',	//TODO - Translation
+		'today' => 'Today',	//TODO - Translation
+		'tue' => 'Tue',	//TODO - Translation
+		'wed' => 'Wed',	//TODO - Translation
+		'yesterday' => 'Yesterday',	//TODO - Translation
 	),
 	'freshrss' => array(
-		'_' => 'FreshRSS',
-		'about' => 'About FreshRSS',
+		'_' => 'FreshRSS',	//TODO - Translation
+		'about' => 'About FreshRSS',	//TODO - Translation
 	),
 	'js' => array(
-		'category_empty' => 'Empty category',
-		'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',
-		'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',
+		'category_empty' => 'Empty category',	//TODO - Translation
+		'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!',	//TODO - Translation
+		'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be cancelled!',	//TODO - Translation
 		'feedback' => array(
-			'body_new_articles' => 'There are %%d new articles to read on FreshRSS.',
-			'request_failed' => 'A request has failed, it may have been caused by Internet connection problems.',
-			'title_new_articles' => 'FreshRSS: new articles!',
+			'body_new_articles' => 'There are %%d new articles to read on FreshRSS.',	//TODO - Translation
+			'request_failed' => 'A request has failed, it may have been caused by Internet connection problems.',	//TODO - Translation
+			'title_new_articles' => 'FreshRSS: new articles!',	//TODO - Translation
 		),
-		'new_article' => 'There are new available articles, click to refresh the page.',
-		'should_be_activated' => 'JavaScript must be enabled',
+		'new_article' => 'There are new available articles, click to refresh the page.',	//TODO - Translation
+		'should_be_activated' => 'JavaScript must be enabled',	//TODO - Translation
 	),
 	'lang' => array(
 		'cz' => 'Čeština',
@@ -124,43 +124,43 @@ return array(
 		'it' => 'Italiano',
 		'kr' => '한국어',
 		'nl' => 'Nederlands',
+		'oc' => 'Occitan',
 		'pt-br' => 'Português (Brasil)',
 		'ru' => 'Русский',
 		'tr' => 'Türkçe',
 		'zh-cn' => '简体中文',
 	),
 	'menu' => array(
-		'about' => 'About',
-		'admin' => 'Administration',
-		'archiving' => 'Archiving',
-		'authentication' => 'Authentication',
-		'check_install' => 'Installation checking',
-		'configuration' => 'Configuration',
-		'display' => 'Display',
-		'extensions' => 'Extensions',
-		'logs' => 'Logs',
-		'queries' => 'User queries',
-		'reading' => 'Reading',
-		'search' => 'Search words or #tags',
-		'sharing' => 'Sharing',
-		'shortcuts' => 'Shortcuts',
-		'stats' => 'Statistics',
-		'system' => 'System configuration',
-		'update' => 'Update',
-		'user_management' => 'Manage users',
-		'user_profile' => 'Profile',
+		'about' => 'About',	//TODO - Translation
+		'admin' => 'Administration',	//TODO - Translation
+		'archiving' => 'Archiving',	//TODO - Translation
+		'authentication' => 'Authentication',	//TODO - Translation
+		'check_install' => 'Installation checking',	//TODO - Translation
+		'configuration' => 'Configuration',	//TODO - Translation
+		'display' => 'Display',	//TODO - Translation
+		'extensions' => 'Extensions',	//TODO - Translation
+		'logs' => 'Logs',	//TODO - Translation
+		'queries' => 'User queries',	//TODO - Translation
+		'reading' => 'Reading',	//TODO - Translation
+		'search' => 'Search words or #tags',	//TODO - Translation
+		'sharing' => 'Sharing',	//TODO - Translation
+		'shortcuts' => 'Shortcuts',	//TODO - Translation
+		'stats' => 'Statistics',	//TODO - Translation
+		'system' => 'System configuration',	//TODO - Translation
+		'update' => 'Update',	//TODO - Translation
+		'user_management' => 'Manage users',	//TODO - Translation
+		'user_profile' => 'Profile',	//TODO - Translation
 	),
 	'pagination' => array(
-		'first' => 'First',
-		'last' => 'Last',
-		'load_more' => 'Load more articles',
-		'mark_all_read' => 'Mark all as read',
-		'next' => 'Next',
-		'nothing_to_load' => 'There are no more articles',
-		'previous' => 'Previous',
+		'first' => 'First',	//TODO - Translation
+		'last' => 'Last',	//TODO - Translation
+		'load_more' => 'Load more articles',	//TODO - Translation
+		'mark_all_read' => 'Mark all as read',	//TODO - Translation
+		'next' => 'Next',	//TODO - Translation
+		'nothing_to_load' => 'There are no more articles',	//TODO - Translation
+		'previous' => 'Previous',	//TODO - Translation
 	),
 	'share' => array(
-		'Known' => 'Known based sites',
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
@@ -168,9 +168,11 @@ return array(
 		'g+' => 'Google+',
 		'gnusocial' => 'GNU social',
 		'jdh' => 'Journal du hacker',
+		'Known' => 'Known based sites',
 		'linkedin' => 'LinkedIn',
 		'mastodon' => 'Mastodon',
 		'movim' => 'Movim',
+		'pinboard' => 'Pinboard',
 		'pocket' => 'Pocket',
 		'print' => 'Print',
 		'shaarli' => 'Shaarli',
@@ -179,16 +181,16 @@ return array(
 		'wallabagv2' => 'wallabag v2',
 	),
 	'short' => array(
-		'attention' => 'Warning!',
-		'blank_to_disable' => 'Leave blank to disable',
-		'by_author' => 'By:',
-		'by_default' => 'By default',
-		'damn' => 'Damn!',
-		'default_category' => 'Uncategorized',
-		'no' => 'No',
-		'not_applicable' => 'Not available',
-		'ok' => 'Ok!',
-		'or' => 'or',
-		'yes' => 'Yes',
+		'attention' => 'Warning!',	//TODO - Translation
+		'blank_to_disable' => 'Leave blank to disable',	//TODO - Translation
+		'by_author' => 'By:',	//TODO - Translation
+		'by_default' => 'By default',	//TODO - Translation
+		'damn' => 'Damn!',	//TODO - Translation
+		'default_category' => 'Uncategorized',	//TODO - Translation
+		'no' => 'No',	//TODO - Translation
+		'not_applicable' => 'Not available',	//TODO - Translation
+		'ok' => 'Ok!',	//TODO - Translation
+		'or' => 'or',	//TODO - Translation
+		'yes' => 'Yes',	//TODO - Translation
 	),
 );
diff --git a/app/i18n/ru/index.php b/app/i18n/ru/index.php
index aaf25a3ab..977777178 100644
--- a/app/i18n/ru/index.php
+++ b/app/i18n/ru/index.php
@@ -2,32 +2,32 @@
 
 return array(
 	'about' => array(
-		'_' => 'About',
-		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',
-		'bugs_reports' => 'Bugs reports',
-		'credits' => 'Credits',
-		'credits_content' => 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> come from <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS is based on <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, a PHP framework.',
-		'freshrss_description' => 'FreshRSS is a RSS feeds aggregator to self-host like <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> or <a href="http://leed.idleman.fr/">Leed</a>. It is light and easy to take in hand while being powerful and configurable tool.',
-		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',
-		'license' => 'License',
-		'project_website' => 'Project website',
-		'title' => 'About',
-		'version' => 'Version',
-		'website' => 'Website',
+		'_' => 'About',	//TODO - Translation
+		'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>',	//TODO - Translation
+		'bugs_reports' => 'Bugs reports',	//TODO - Translation
+		'credits' => 'Credits',	//TODO - Translation
+		'credits_content' => 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> come from <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS is based on <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, a PHP framework.',	//TODO - Translation
+		'freshrss_description' => 'FreshRSS is a RSS feeds aggregator to self-host like <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> or <a href="http://leed.idleman.fr/">Leed</a>. It is light and easy to take in hand while being powerful and configurable tool.',	//TODO - Translation
+		'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">on Github</a>',	//TODO - Translation
+		'license' => 'License',	//TODO - Translation
+		'project_website' => 'Project website',	//TODO - Translation
+		'title' => 'About',	//TODO - Translation
+		'version' => 'Version',	//TODO - Translation
+		'website' => 'Website',	//TODO - Translation
 	),
 	'feed' => array(
-		'add' => 'You may add some feeds.',
-		'empty' => 'There is no article to show.',
-		'rss_of' => 'RSS feed of %s',
-		'title' => 'Your RSS feeds',
-		'title_global' => 'Global view',
-		'title_fav' => 'Your favourites',
+		'add' => 'You may add some feeds.',	//TODO - Translation
+		'empty' => 'There is no article to show.',	//TODO - Translation
+		'rss_of' => 'RSS feed of %s',	//TODO - Translation
+		'title' => 'Your RSS feeds',	//TODO - Translation
+		'title_global' => 'Global view',	//TODO - Translation
+		'title_fav' => 'Your favourites',	//TODO - Translation
 	),
 	'log' => array(
 		'_' => 'Logs',
-		'clear' => 'Clear the logs',
-		'empty' => 'Log file is empty',
-		'title' => 'Logs',
+		'clear' => 'Clear the logs',	//TODO - Translation
+		'empty' => 'Log file is empty',	//TODO - Translation
+		'title' => 'Logs',	//TODO - Translation
 	),
 	'menu' => array(
 		'about' => 'About FreshRSS',
@@ -40,23 +40,24 @@ return array(
 		'mark_all_read' => 'Mark all as read',
 		'mark_cat_read' => 'Mark category as read',
 		'mark_feed_read' => 'Mark feed as read',
-		'mark_selection_unread' => 'Mark selection as unread',	//TODO
-		'newer_first' => 'Newer first',
-		'non-starred' => 'Show all but favorites',
-		'normal_view' => 'Normal view',
-		'older_first' => 'Oldest first',
-		'queries' => 'User queries',
-		'read' => 'Show only read',
-		'reader_view' => 'Reading view',
-		'rss_view' => 'RSS feed',
-		'search_short' => 'Search',
-		'starred' => 'Show only favorites',
-		'stats' => 'Statistics',
+		'mark_selection_unread' => 'Mark selection as unread',	//TODO - Translation
+		'newer_first' => 'Newer first',	//TODO - Translation
+		'non-starred' => 'Show all but favorites',	//TODO - Translation
+		'normal_view' => 'Normal view',	//TODO - Translation
+		'older_first' => 'Oldest first',	//TODO - Translation
+		'queries' => 'User queries',	//TODO - Translation
+		'read' => 'Show only read',	//TODO - Translation
+		'reader_view' => 'Reading view',	//TODO - Translation
+		'rss_view' => 'RSS feed',	//TODO - Translation
+		'search_short' => 'Search',	//TODO - Translation
+		'starred' => 'Show only favorites',	//TODO - Translation
+		'stats' => 'Statistics',	//TODO - Translation
 		'subscription' => 'Subscriptions management',
-		'unread' => 'Show only unread',
+		'tags' => 'My labels',	//TODO - Translation
+		'unread' => 'Show only unread',	//TODO - Translation
 	),
 	'share' => 'Share',
 	'tag' => array(
-		'related' => 'Article tags',	//TODO
+		'related' => 'Article tags',	//TODO - Translation
 	),
 );
diff --git a/app/i18n/ru/install.php b/app/i18n/ru/install.php
index c1d0e81e8..fd1e5c962 100644
--- a/app/i18n/ru/install.php
+++ b/app/i18n/ru/install.php
@@ -24,8 +24,8 @@ return array(
 			'ok' => 'Конфигурация базы данных сохранена.',
 		),
 		'host' => 'Хост',
-		'prefix' => 'Префикс таблицы',
 		'password' => 'Пароль базы данных',
+		'prefix' => 'Префикс таблицы',
 		'type' => 'Тип базы данных',
 		'username' => 'Имя пользователя базы данных',
 	),
@@ -64,9 +64,13 @@ return array(
 			'nok' => 'Убедитесь, что вы не изменяете ваш HTTP REFERER.',
 			'ok' => 'Ваш HTTP REFERER известен и соотвествует вашему серверу.',
 		),
+		'json' => array(
+			'nok' => 'Cannot find a recommended library to parse JSON.',	//TODO - Translation
+			'ok' => 'You have a recommended library to parse JSON.',	//TODO - Translation
+		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO
-			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO
+			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO - Translation
+			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO - Translation
 		),
 		'minz' => array(
 			'nok' => 'У вас не установлен фрейворк Minz.',
@@ -88,6 +92,10 @@ return array(
 			'nok' => 'Проверьте права доступа к папке <em>./data/users</em> . Сервер HTTP должен иметь права на запись в эту папку.',
 			'ok' => 'Права на папку users  в порядке.',
 		),
+		'xml' => array(
+			'nok' => 'Cannot find the required library to parse XML.',
+			'ok' => 'You have the required library to parse XML.',
+		),
 	),
 	'conf' => array(
 		'_' => 'Общие настройки',
diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php
index 12901998d..7de80586b 100644
--- a/app/i18n/ru/sub.php
+++ b/app/i18n/ru/sub.php
@@ -2,85 +2,92 @@
 
 return array(
 	'api' => array(
-		'documentation' => 'Copy the following URL to use it within an external tool.',// TODO
-		'title' => 'API',// TODO
+		'documentation' => 'Copy the following URL to use it within an external tool.',	//TODO - Translation
+		'title' => 'API',	//TODO - Translation
 	),
 	'bookmarklet' => array(
-		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',// TODO
-		'label' => 'Subscribe',// TODO
-		'title' => 'Bookmarklet',// TODO
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',	//TODO - Translation
+		'label' => 'Subscribe',	//TODO - Translation
+		'title' => 'Bookmarklet',	//TODO - Translation
 	),
 	'category' => array(
-		'_' => 'Category',// TODO
-		'add' => 'Add a category',// TODO
-		'empty' => 'Empty category',// TODO
-		'new' => 'New category',// TODO
+		'_' => 'Category',	//TODO - Translation
+		'add' => 'Add a category',	//TODO - Translation
+		'empty' => 'Empty category',	//TODO - Translation
+		'new' => 'New category',	//TODO - Translation
 	),
 	'feed' => array(
-		'add' => 'Add a RSS feed',// TODO
-		'advanced' => 'Advanced',// TODO
-		'archiving' => 'Archivage',// TODO
+		'add' => 'Add a RSS feed',	//TODO - Translation
+		'advanced' => 'Advanced',	//TODO - Translation
+		'archiving' => 'Archivage',	//TODO - Translation
 		'auth' => array(
-			'configuration' => 'Login',// TODO
-			'help' => 'Connection allows to access HTTP protected RSS feeds',// TODO
-			'http' => 'HTTP Authentication',// TODO
-			'password' => 'HTTP password',// TODO
-			'username' => 'HTTP username',// TODO
+			'configuration' => 'Login',	//TODO - Translation
+			'help' => 'Connection allows to access HTTP protected RSS feeds',	//TODO - Translation
+			'http' => 'HTTP Authentication',	//TODO - Translation
+			'password' => 'HTTP password',	//TODO - Translation
+			'username' => 'HTTP username',	//TODO - Translation
 		),
-		'clear_cache' => 'Always clear cache',	//TODO
-		'css_help' => 'Retrieves truncated RSS feeds (caution, requires more time!)',// TODO
-		'css_path' => 'Articles CSS path on original website',// TODO
-		'description' => 'Description',// TODO
-		'empty' => 'This feed is empty. Please verify that it is still maintained.',// TODO
-		'error' => 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',// TODO
-		'informations' => 'Information',// TODO
-		'keep_history' => 'Minimum number of articles to keep',// TODO
-		'moved_category_deleted' => 'When you delete a category, its feeds are automatically classified under <em>%s</em>.',// TODO
-		'mute' => 'mute', // TODO
-		'no_selected' => 'No feed selected.',// TODO
-		'number_entries' => '%d articles',// TODO
+		'clear_cache' => 'Always clear cache',	//TODO - Translation
+		'css_help' => 'Retrieves truncated RSS feeds (caution, requires more time!)',	//TODO - Translation
+		'css_path' => 'Articles CSS path on original website',	//TODO - Translation
+		'description' => 'Description',	//TODO - Translation
+		'empty' => 'This feed is empty. Please verify that it is still maintained.',	//TODO - Translation
+		'error' => 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',	//TODO - Translation
+		'informations' => 'Information',	//TODO - Translation
+		'keep_history' => 'Minimum number of articles to keep',	//TODO - Translation
+		'moved_category_deleted' => 'When you delete a category, its feeds are automatically classified under <em>%s</em>.',	//TODO - Translation
+		'mute' => 'mute',	//TODO - Translation
+		'no_selected' => 'No feed selected.',	//TODO - Translation
+		'number_entries' => '%d articles',	//TODO - Translation
 		'priority' => array(
-			'_' => 'Visibility', // TODO
-			'archived' => 'Do not show (archived)', // TODO
-			'main_stream' => 'Show in main stream', // TODO
-			'normal' => 'Show in its category', // TODO
+			'_' => 'Visibility',	//TODO - Translation
+			'archived' => 'Do not show (archived)',	//TODO - Translation
+			'main_stream' => 'Show in main stream',	//TODO - Translation
+			'normal' => 'Show in its category',	//TODO - Translation
 		),
-		'ssl_verify' => 'Verify SSL security',	//TODO
-		'stats' => 'Statistics',// TODO
-		'think_to_add' => 'You may add some feeds.',// TODO
-		'timeout' => 'Timeout in seconds',	//TODO
-		'title' => 'Title',// TODO
-		'title_add' => 'Add a RSS feed',// TODO
-		'ttl' => 'Do not automatically refresh more often than',// TODO
-		'url' => 'Feed URL',// TODO
-		'validator' => 'Check the validity of the feed',// TODO
-		'website' => 'Website URL',// TODO
-		'pubsubhubbub' => 'Instant notification with PubSubHubbub',// TODO
+		'websub' => 'Instant notification with WebSub',	//TODO - Translation
+		'show' => array(
+			'all' => 'Show all feeds',	//TODO - Translation
+			'error' => 'Show only feeds with error',	//TODO - Translation
+		),
+		'showing' => array(
+			'error' => 'Showing only feeds with error',	//TODO - Translation
+		),
+		'ssl_verify' => 'Verify SSL security',	//TODO - Translation
+		'stats' => 'Statistics',	//TODO - Translation
+		'think_to_add' => 'You may add some feeds.',	//TODO - Translation
+		'timeout' => 'Timeout in seconds',	//TODO - Translation
+		'title' => 'Title',	//TODO - Translation
+		'title_add' => 'Add a RSS feed',	//TODO - Translation
+		'ttl' => 'Do not automatically refresh more often than',	//TODO - Translation
+		'url' => 'Feed URL',	//TODO - Translation
+		'validator' => 'Check the validity of the feed',	//TODO - Translation
+		'website' => 'Website URL',	//TODO - Translation
 	),
 	'firefox' => array(
-		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',// TODO
-		'title' => 'Firefox feed reader',// TODO
+		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',	//TODO - Translation
+		'title' => 'Firefox feed reader',	//TODO - Translation
 	),
 	'import_export' => array(
-		'export' => 'Export',// TODO
-		'export_opml' => 'Export list of feeds (OPML)',// TODO
-		'export_starred' => 'Export your favourites',// TODO
-		'feed_list' => 'List of %s articles',// TODO
-		'file_to_import' => 'File to import<br />(OPML, JSON or ZIP)',// TODO
-		'file_to_import_no_zip' => 'File to import<br />(OPML or JSON)',// TODO
-		'import' => 'Import',// TODO
-		'starred_list' => 'List of favourite articles',// TODO
-		'title' => 'Import / export',// TODO
+		'export' => 'Export',	//TODO - Translation
+		'export_opml' => 'Export list of feeds (OPML)',	//TODO - Translation
+		'export_starred' => 'Export your favourites',	//TODO - Translation
+		'feed_list' => 'List of %s articles',	//TODO - Translation
+		'file_to_import' => 'File to import<br />(OPML, JSON or ZIP)',	//TODO - Translation
+		'file_to_import_no_zip' => 'File to import<br />(OPML or JSON)',	//TODO - Translation
+		'import' => 'Import',	//TODO - Translation
+		'starred_list' => 'List of favourite articles',	//TODO - Translation
+		'title' => 'Import / export',	//TODO - Translation
 	),
 	'menu' => array(
-		'bookmark' => 'Subscribe (FreshRSS bookmark)',// TODO
-		'import_export' => 'Import / export',// TODO
-		'subscription_management' => 'Subscriptions management',// TODO
-		'subscription_tools' => 'Subscription tools',// TODO
+		'bookmark' => 'Subscribe (FreshRSS bookmark)',	//TODO - Translation
+		'import_export' => 'Import / export',	//TODO - Translation
+		'subscription_management' => 'Subscriptions management',	//TODO - Translation
+		'subscription_tools' => 'Subscription tools',	//TODO - Translation
 	),
 	'title' => array(
-		'_' => 'Subscriptions management',// TODO
-		'feed_management' => 'RSS feeds management',// TODO
-		'subscription_tools' => 'Subscription tools',// TODO
+		'_' => 'Subscriptions management',	//TODO - Translation
+		'feed_management' => 'RSS feeds management',	//TODO - Translation
+		'subscription_tools' => 'Subscription tools',	//TODO - Translation
 	),
 );