i18n en-US (#4519)

4 files changed, 16 insertions, 14 deletions

diff --git a/.gitignore b/.gitignore
index 00005eeff..32dd22ae6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@
 /vendor/
 /constants.local.php
 
+.vscode/
+
 # Temp files
 *~
 *.bak
diff --git a/app/i18n/en-us/conf.php b/app/i18n/en-us/conf.php
index 04f7a203b..8073605f5 100644
--- a/app/i18n/en-us/conf.php
+++ b/app/i18n/en-us/conf.php
@@ -68,9 +68,9 @@ return array(
 	),
 	'logs' => array(
 		'loglist' => array(
-			'level' => 'Log Level',	// TODO
-			'message' => 'Log Message',	// TODO
-			'timestamp' => 'Timestamp',	// TODO
+			'level' => 'Log Level',	// IGNORE
+			'message' => 'Log Message',	// IGNORE
+			'timestamp' => 'Timestamp',	// IGNORE
 		),
 		'pagination' => array(
 			'first' => 'First',	// IGNORE
@@ -171,7 +171,7 @@ return array(
 		'display_categories_unfolded' => 'Categories to unfold',	// IGNORE
 		'headline' => array(
 			'articles' => 'Articles: Open/Close',	// IGNORE
-			'articles_header_footer' => 'Articles: header/footer',	// TODO
+			'articles_header_footer' => 'Articles: header/footer',	// IGNORE
 			'categories' => 'Left navigation: Categories',	// IGNORE
 			'mark_as_read' => 'Mark article as read',	// IGNORE
 			'misc' => 'Miscellaneous',	// IGNORE
@@ -187,7 +187,7 @@ return array(
 			'article_viewed' => 'when the article is viewed',	// IGNORE
 			'keep_max_n_unread' => 'Max number of articles to keep unread',	// IGNORE
 			'scroll' => 'while scrolling',	// IGNORE
-			'upon_gone' => 'when it is no longer in the upstream news feed',	// TODO
+			'upon_gone' => 'when it is no longer in the upstream news feed',	// IGNORE
 			'upon_reception' => 'upon receiving the article',	// IGNORE
 			'when' => 'Mark an article as read…',	// IGNORE
 			'when_same_title' => 'if an identical title already exists in the top <i>n</i> newest articles',	// IGNORE
@@ -222,7 +222,7 @@ return array(
 		'_' => 'Sharing',	// IGNORE
 		'add' => 'Add a sharing method',	// IGNORE
 		'blogotext' => 'Blogotext',	// IGNORE
-		'deprecated' => 'This service is deprecated and will be removed from FreshRSS in a <a href="https://freshrss.github.io/FreshRSS/en/users/08_sharing_services.html" title="Open documentation for more information" target="_blank">future release</a>.',	// TODO
+		'deprecated' => 'This service is deprecated and will be removed from FreshRSS in a <a href="https://freshrss.github.io/FreshRSS/en/users/08_sharing_services.html" title="Open documentation for more information" target="_blank">future release</a>.',	// IGNORE
 		'diaspora' => 'Diaspora*',	// IGNORE
 		'email' => 'Email',	// IGNORE
 		'facebook' => 'Facebook',	// IGNORE
diff --git a/app/i18n/en-us/gen.php b/app/i18n/en-us/gen.php
index aedf7bd50..1fdfef994 100644
--- a/app/i18n/en-us/gen.php
+++ b/app/i18n/en-us/gen.php
@@ -18,7 +18,7 @@ return array(
 		'back_to_rss_feeds' => '← Go back to your RSS feeds',	// IGNORE
 		'cancel' => 'Cancel',	// IGNORE
 		'create' => 'Create',	// IGNORE
-		'delete_muted_feeds' => 'Delete muted feeds',	// TODO
+		'delete_muted_feeds' => 'Delete muted feeds',	// IGNORE
 		'demote' => 'Demote',	// IGNORE
 		'disable' => 'Disable',	// IGNORE
 		'empty' => 'Empty',	// IGNORE
@@ -32,7 +32,7 @@ return array(
 		'open_url' => 'Open URL',	// IGNORE
 		'promote' => 'Promote',	// IGNORE
 		'purge' => 'Purge',	// IGNORE
-		'refresh_opml' => 'Refresh OPML',	// TODO
+		'refresh_opml' => 'Refresh OPML',	// IGNORE
 		'remove' => 'Remove',	// IGNORE
 		'rename' => 'Rename',	// IGNORE
 		'see_website' => 'See website',	// IGNORE
@@ -209,7 +209,7 @@ return array(
 		'twitter' => 'Twitter',	// IGNORE
 		'wallabag' => 'wallabag v1',	// IGNORE
 		'wallabagv2' => 'wallabag v2',	// IGNORE
-		'web-sharing-api' => 'System sharing',	// TODO
+		'web-sharing-api' => 'System sharing',	// IGNORE
 		'whatsapp' => 'Whatsapp',	// IGNORE
 		'xing' => 'Xing',	// IGNORE
 	),
diff --git a/app/i18n/en-us/sub.php b/app/i18n/en-us/sub.php
index df727041a..b0c6c8a1b 100644
--- a/app/i18n/en-us/sub.php
+++ b/app/i18n/en-us/sub.php
@@ -25,12 +25,12 @@ return array(
 		'add' => 'Add a category',	// IGNORE
 		'archiving' => 'Archiving',	// IGNORE
 		'dynamic_opml' => array(
-			'_' => 'Dynamic OPML',	// TODO
-			'help' => 'Provide the URL to an <a href=http://opml.org/ target=_blank>OPML file</a> to dynamically populate this category with feeds',	// TODO
+			'_' => 'Dynamic OPML',	// IGNORE
+			'help' => 'Provide the URL to an <a href=http://opml.org/ target=_blank>OPML file</a> to dynamically populate this category with feeds',	// IGNORE
 		),
 		'empty' => 'Empty category',	// IGNORE
 		'information' => 'Information',	// IGNORE
-		'opml_url' => 'OPML URL',	// TODO
+		'opml_url' => 'OPML URL',	// IGNORE
 		'position' => 'Display position',	// IGNORE
 		'position_help' => 'To control category sort order',	// IGNORE
 		'title' => 'Title',	// IGNORE
@@ -108,7 +108,7 @@ return array(
 				),
 				'item_uid' => array(
 					'_' => 'item unique ID',	// IGNORE
-					'help' => 'Optional. Example: <code>descendant::div/@data-uri</code>',	// TODO
+					'help' => 'Optional. Example: <code>descendant::div/@data-uri</code>',	// IGNORE
 				),
 				'item_uri' => array(
 					'_' => 'item link (URL)',	// IGNORE
@@ -198,7 +198,7 @@ return array(
 		'_' => 'Subscription management',	// IGNORE
 		'add' => 'Add a feed or category',	// IGNORE
 		'add_category' => 'Add a category',	// IGNORE
-		'add_dynamic_opml' => 'Add dynamic OPML',	// TODO
+		'add_dynamic_opml' => 'Add dynamic OPML',	// IGNORE
 		'add_feed' => 'Add a feed',	// IGNORE
 		'add_label' => 'Add a label',	// IGNORE
 		'delete_label' => 'Delete a label',	// IGNORE