Merge pull request #2186 from FreshRSS/dev1.13.0

FreshRSS 1.13.0

1 files changed, 134 insertions, 131 deletions

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
 	),
 );