1 files changed, 10 insertions, 10 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index aa1cd1a9..9491aee9 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -53,7 +53,7 @@ config:
    page_title: 'Config'
    tab_menu:
        settings: 'Settings'
-        rss: 'RSS'
+        feed: 'Feeds'
        user_info: 'User information'
        password: 'Password'
        rules: 'Tagging rules'
@@ -83,19 +83,19 @@ config:
        help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
        help_language: "You can change the language of wallabag interface."
        help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
-    form_rss:
+    form_feed:
-        description: 'RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.'
+        description: 'Atom feeds provided by wallabag allow you to read your saved articles with your favourite Atom reader. You need to generate a token first.'
-        token_label: 'RSS token'
+        token_label: 'Feed token'
        no_token: 'No token'
        token_create: 'Create your token'
        token_reset: 'Regenerate your token'
-        rss_links: 'RSS links'
+        feed_links: 'Feed links'
-        rss_link:
+        feed_link:
            unread: 'Unread'
            starred: 'Starred'
            archive: 'Archived'
            all: 'All'
-        rss_limit: 'Number of items in the feed'
+        feed_limit: 'Number of items in the feed'
    form_user:
        two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connection."
        name_label: 'Name'
@@ -344,7 +344,7 @@ quickstart:
        title: 'Configure the application'
        description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'
        language: 'Change language and design'
-        rss: 'Enable RSS feeds'
+        feed: 'Enable feeds'
        tagging_rules: 'Write rules to automatically tag your articles'
    admin:
        title: 'Administration'
@@ -554,10 +554,10 @@ flashes:
            password_updated: 'Password updated'
            password_not_updated_demo: "In demonstration mode, you can't change password for this user."
            user_updated: 'Information updated'
-            rss_updated: 'RSS information updated'
+            feed_updated: 'Feed information updated'
            tagging_rules_updated: 'Tagging rules updated'
            tagging_rules_deleted: 'Tagging rule deleted'
-            rss_token_updated: 'RSS token updated'
+            feed_token_updated: 'Feed token updated'
            annotations_reset: Annotations reset
            tags_reset: Tags reset
            entries_reset: Entries reset

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index aa1cd1a9..9491aee9 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -53,7 +53,7 @@ config:
53	page_title: 'Config'	53	page_title: 'Config'
54	tab_menu:	54	tab_menu:
55	settings: 'Settings'	55	settings: 'Settings'
56	rss: 'RSS'	56	feed: 'Feeds'
57	user_info: 'User information'	57	user_info: 'User information'
58	password: 'Password'	58	password: 'Password'
59	rules: 'Tagging rules'	59	rules: 'Tagging rules'
@@ -83,19 +83,19 @@ config:
83	help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."	83	help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
84	help_language: "You can change the language of wallabag interface."	84	help_language: "You can change the language of wallabag interface."
85	help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."	85	help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
86	form_rss:	86	form_feed:
87	description: 'RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.'	87	description: 'Atom feeds provided by wallabag allow you to read your saved articles with your favourite Atom reader. You need to generate a token first.'
88	token_label: 'RSS token'	88	token_label: 'Feed token'
89	no_token: 'No token'	89	no_token: 'No token'
90	token_create: 'Create your token'	90	token_create: 'Create your token'
91	token_reset: 'Regenerate your token'	91	token_reset: 'Regenerate your token'
92	rss_links: 'RSS links'	92	feed_links: 'Feed links'
93	rss_link:	93	feed_link:
94	unread: 'Unread'	94	unread: 'Unread'
95	starred: 'Starred'	95	starred: 'Starred'
96	archive: 'Archived'	96	archive: 'Archived'
97	all: 'All'	97	all: 'All'
98	rss_limit: 'Number of items in the feed'	98	feed_limit: 'Number of items in the feed'
99	form_user:	99	form_user:
100	two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connection."	100	two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connection."
101	name_label: 'Name'	101	name_label: 'Name'
@@ -344,7 +344,7 @@ quickstart:
344	title: 'Configure the application'	344	title: 'Configure the application'
345	description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'	345	description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'
346	language: 'Change language and design'	346	language: 'Change language and design'
347	rss: 'Enable RSS feeds'	347	feed: 'Enable feeds'
348	tagging_rules: 'Write rules to automatically tag your articles'	348	tagging_rules: 'Write rules to automatically tag your articles'
349	admin:	349	admin:
350	title: 'Administration'	350	title: 'Administration'
@@ -554,10 +554,10 @@ flashes:
554	password_updated: 'Password updated'	554	password_updated: 'Password updated'
555	password_not_updated_demo: "In demonstration mode, you can't change password for this user."	555	password_not_updated_demo: "In demonstration mode, you can't change password for this user."
556	user_updated: 'Information updated'	556	user_updated: 'Information updated'
557	rss_updated: 'RSS information updated'	557	feed_updated: 'Feed information updated'
558	tagging_rules_updated: 'Tagging rules updated'	558	tagging_rules_updated: 'Tagging rules updated'
559	tagging_rules_deleted: 'Tagging rule deleted'	559	tagging_rules_deleted: 'Tagging rule deleted'
560	rss_token_updated: 'RSS token updated'	560	feed_token_updated: 'Feed token updated'
561	annotations_reset: Annotations reset	561	annotations_reset: Annotations reset
562	tags_reset: Tags reset	562	tags_reset: Tags reset
563	entries_reset: Entries reset	563	entries_reset: Entries reset