X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Ftranslations%2Fmessages.en.yml;h=e2994f539ba653cb97e79c94d39c63482e364b15;hb=9f0957b831622ee577fa7d8f92ec0df6f3a8e274;hp=d1d7415913c998dc983aa50bd87a5d15ec16f4be;hpb=50f35f0db2be9586205e793f315608eec59c9666;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index d1d74159..e2994f53 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -54,11 +54,12 @@ config:
page_title: 'Config'
tab_menu:
settings: 'Settings'
- rss: 'RSS'
+ feed: 'Feeds'
user_info: 'User information'
password: 'Password'
rules: 'Tagging rules'
new_user: 'Add a user'
+ reset: 'Reset area'
form:
save: 'Save'
form_settings:
@@ -84,25 +85,33 @@ 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:
- 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.'
- token_label: 'RSS token'
+ form_feed:
+ 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: 'Feed token'
no_token: 'No token'
token_create: 'Create your token'
token_reset: 'Regenerate your token'
- rss_links: 'RSS links'
- rss_link:
+ feed_links: 'Feed links'
+ 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."
+ two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option."
name_label: 'Name'
email_label: 'Email'
- twoFactorAuthentication_label: 'Two factor authentication'
- help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
+ two_factor:
+ emailTwoFactor_label: 'Using email (receive a code by email)'
+ googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)'
+ table_method: Method
+ table_state: State
+ table_action: Action
+ state_enabled: Enabled
+ state_disabled: Disabled
+ action_email: Use email
+ action_app: Use OTP App
delete:
title: Delete my account (a.k.a danger zone)
description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
@@ -160,6 +169,15 @@ config:
and: 'One rule AND another'
matches: 'Tests that a subject matches a search (case-insensitive).
Example: title matches "football"
'
notmatches: 'Tests that a subject doesn''t match match a search (case-insensitive).
Example: title notmatches "football"
'
+ otp:
+ page_title: Two-factor authentication
+ app:
+ two_factor_code_description_1: You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. It'll disapear after a page reload.
+ two_factor_code_description_2: 'You can scan that QR Code with your app:'
+ two_factor_code_description_3: 'Also, save these backup codes in a safe place, you can use them in case you lose access to your OTP app:'
+ two_factor_code_description_4: 'Test an OTP code from your configured app:'
+ cancel: Cancel
+ enable: Enable
entry:
default_title: 'Title of the entry'
@@ -354,7 +372,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'
@@ -532,7 +550,8 @@ user:
email_label: 'Email'
enabled_label: 'Enabled'
last_login_label: 'Last login'
- twofactor_label: Two factor authentication
+ twofactor_email_label: Two factor authentication by email
+ twofactor_google_label: Two factor authentication by OTP app
save: Save
delete: Delete
delete_confirm: Are you sure?
@@ -553,7 +572,7 @@ site_credential:
create_new_one: Create a new credential
form:
username_label: 'Username'
- host_label: 'Host'
+ host_label: 'Host (subdomain.example.org, .example.org, etc.)'
password_label: 'Password'
save: Save
delete: Delete
@@ -570,14 +589,15 @@ 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
archived_reset: Archived entries deleted
+ otp_enabled: Two-factor authentication enabled
entry:
notice:
entry_already_saved: 'Entry already saved on %date%'