aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml20
-rw-r--r--src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml2
2 files changed, 11 insertions, 11 deletions
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
index 1e4f4668..b53066b1 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@@ -1,7 +1,7 @@
1settings_changed: Configuration updated 1settings_changed: Configuration updated
2download_pictures: Download pictures on your server 2download_pictures: Download pictures on your server
3carrot: Enable share to Carrot 3carrot: Enable share to Carrot
4diaspora_url: Diaspora URL, if the service is enabled 4diaspora_url: diaspora* URL, if the service is enabled
5export_epub: Enable ePub export 5export_epub: Enable ePub export
6export_mobi: Enable .mobi export 6export_mobi: Enable .mobi export
7export_pdf: Enable PDF export 7export_pdf: Enable PDF export
@@ -12,12 +12,12 @@ export_xml: Enable XML export
12import_with_rabbitmq: Enable RabbitMQ to import data asynchronously 12import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
13import_with_redis: Enable Redis to import data asynchronously 13import_with_redis: Enable Redis to import data asynchronously
14shaarli_url: Shaarli URL, if the service is enabled 14shaarli_url: Shaarli URL, if the service is enabled
15share_diaspora: Enable share to Diaspora 15share_diaspora: Enable share to diaspora*
16share_mail: Enable share by email 16share_mail: Enable share by e-mail
17share_shaarli: Enable share to Shaarli 17share_shaarli: Enable sharing to Shaarli
18share_scuttle: Enable share to Scuttle 18share_scuttle: Enable sharing to Scuttle
19share_twitter: Enable share to Twitter 19share_twitter: Enable sharing to Twitter
20share_unmark: Enable share to Unmark.it 20share_unmark: Enable sharing to Unmark.it
21show_printlink: Display a link to print content 21show_printlink: Display a link to print content
22wallabag_support_url: Support URL for wallabag 22wallabag_support_url: Support URL for wallabag
23entry: "article" 23entry: "article"
@@ -28,9 +28,9 @@ modify_settings: "apply"
28piwik_host: Host of your website in Piwik (without http:// ou https://) 28piwik_host: Host of your website in Piwik (without http:// ou https://)
29piwik_site_id: ID of your website in Piwik 29piwik_site_id: ID of your website in Piwik
30piwik_enabled: Enable Piwik 30piwik_enabled: Enable Piwik
31demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" 31demo_mode_enabled: "Enable demo mode? (Only used for the public wallabag demo)"
32demo_mode_username: "Demo user" 32demo_mode_username: "Demo user"
33share_public: Allow public url for entries 33share_public: Allow public URL for entries
34download_images_enabled: Download images locally 34download_images_enabled: Download images locally
35restricted_access: Enable authentication for websites with paywall 35restricted_access: Enable authentication for paywalled websites
36api_user_registration: Enable user to be registered using the API 36api_user_registration: Enable user to be registered using the API
diff --git a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml
index ee0a27d5..5fc57617 100644
--- a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml
+++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml
@@ -5,7 +5,7 @@ auth_code:
5 subject: 'wallabag authentication code' 5 subject: 'wallabag authentication code'
6 body: 6 body:
7 hello: "Hi %user%," 7 hello: "Hi %user%,"
8 first_para: "Since you enable two factor authentication on your wallabag account and you just logged in from a new device (computer, phone, etc.), we send you a code to validate your connection." 8 first_para: "Since you require two factor authentication to log in on your wallabag account, and a new device just used it, we send you a code to validate its connection."
9 second_para: "Here is the code:" 9 second_para: "Here is the code:"
10 support: "Please don't hesitate to contact us if you have any problems:" 10 support: "Please don't hesitate to contact us if you have any problems:"
11 signature: "The wallabag team" 11 signature: "The wallabag team"