diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2019-05-29 11:14:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-29 11:14:00 +0200 |
commit | 73ec68b1ffafb792265a3805833e5cd84c966aed (patch) | |
tree | 33c6040c050f85c537f8dbf5e91d8c281db092cd /src/Wallabag/CoreBundle/Resources | |
parent | 2ba365c7c49556cd23b444dc3bb8d4a8cf08809d (diff) | |
parent | 2cbee36a0184786644470a84fdd8c720cfcac58e (diff) | |
download | wallabag-73ec68b1ffafb792265a3805833e5cd84c966aed.tar.gz wallabag-73ec68b1ffafb792265a3805833e5cd84c966aed.tar.zst wallabag-73ec68b1ffafb792265a3805833e5cd84c966aed.zip |
Merge pull request #3984 from wallabag/2.4
Merge 2.4 into master
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
40 files changed, 947 insertions, 397 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 85306276..31986951 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -22,10 +22,10 @@ services: | |||
22 | tags: | 22 | tags: |
23 | - { name: form.type } | 23 | - { name: form.type } |
24 | 24 | ||
25 | wallabag_core.param_converter.username_rsstoken_converter: | 25 | wallabag_core.param_converter.username_feed_token_converter: |
26 | class: Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter | 26 | class: Wallabag\CoreBundle\ParamConverter\UsernameFeedTokenConverter |
27 | tags: | 27 | tags: |
28 | - { name: request.param_converter, converter: username_rsstoken_converter } | 28 | - { name: request.param_converter, converter: username_feed_token_converter } |
29 | arguments: | 29 | arguments: |
30 | - "@doctrine" | 30 | - "@doctrine" |
31 | 31 | ||
@@ -42,7 +42,7 @@ services: | |||
42 | - | 42 | - |
43 | error_message: '%wallabag_core.fetching_error_message%' | 43 | error_message: '%wallabag_core.fetching_error_message%' |
44 | error_message_title: '%wallabag_core.fetching_error_message_title%' | 44 | error_message_title: '%wallabag_core.fetching_error_message_title%' |
45 | - "@wallabag_core.guzzle.http_client" | 45 | - "@wallabag_core.http_client" |
46 | - "@wallabag_core.graby.config_builder" | 46 | - "@wallabag_core.graby.config_builder" |
47 | calls: | 47 | calls: |
48 | - [ setLogger, [ "@logger" ] ] | 48 | - [ setLogger, [ "@logger" ] ] |
@@ -55,9 +55,8 @@ services: | |||
55 | - {} | 55 | - {} |
56 | - "@logger" | 56 | - "@logger" |
57 | 57 | ||
58 | wallabag_core.guzzle.http_client: | 58 | wallabag_core.http_client: |
59 | class: GuzzleHttp\ClientInterface | 59 | alias: 'httplug.client.wallabag_core' |
60 | factory: ["@wallabag_core.guzzle.http_client_factory", buildHttpClient] | ||
61 | 60 | ||
62 | wallabag_core.guzzle_authenticator.config_builder: | 61 | wallabag_core.guzzle_authenticator.config_builder: |
63 | class: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder | 62 | class: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder |
@@ -73,7 +72,7 @@ services: | |||
73 | bd_guzzle_site_authenticator.site_config_builder: | 72 | bd_guzzle_site_authenticator.site_config_builder: |
74 | alias: wallabag_core.guzzle_authenticator.config_builder | 73 | alias: wallabag_core.guzzle_authenticator.config_builder |
75 | 74 | ||
76 | wallabag_core.guzzle.http_client_factory: | 75 | wallabag_core.http_client_factory: |
77 | class: Wallabag\CoreBundle\Helper\HttpClientFactory | 76 | class: Wallabag\CoreBundle\Helper\HttpClientFactory |
78 | arguments: | 77 | arguments: |
79 | - "@wallabag_core.guzzle.cookie_jar" | 78 | - "@wallabag_core.guzzle.cookie_jar" |
@@ -181,6 +180,7 @@ services: | |||
181 | 180 | ||
182 | wallabag_core.exception_controller: | 181 | wallabag_core.exception_controller: |
183 | class: Wallabag\CoreBundle\Controller\ExceptionController | 182 | class: Wallabag\CoreBundle\Controller\ExceptionController |
183 | public: true | ||
184 | arguments: | 184 | arguments: |
185 | - '@twig' | 185 | - '@twig' |
186 | - '%kernel.debug%' | 186 | - '%kernel.debug%' |
@@ -211,10 +211,38 @@ services: | |||
211 | - "@logger" | 211 | - "@logger" |
212 | 212 | ||
213 | wallabag_core.entry.download_images.client: | 213 | wallabag_core.entry.download_images.client: |
214 | class: GuzzleHttp\Client | 214 | alias: 'httplug.client.wallabag_core.entry.download_images' |
215 | 215 | ||
216 | wallabag_core.helper.crypto_proxy: | 216 | wallabag_core.helper.crypto_proxy: |
217 | class: Wallabag\CoreBundle\Helper\CryptoProxy | 217 | class: Wallabag\CoreBundle\Helper\CryptoProxy |
218 | arguments: | 218 | arguments: |
219 | - "%wallabag_core.site_credentials.encryption_key_path%" | 219 | - "%wallabag_core.site_credentials.encryption_key_path%" |
220 | - "@logger" | 220 | - "@logger" |
221 | |||
222 | wallabag_core.command.clean_duplicates: | ||
223 | class: Wallabag\CoreBundle\Command\CleanDuplicatesCommand | ||
224 | tags: ['console.command'] | ||
225 | |||
226 | wallabag_core.command.export: | ||
227 | class: Wallabag\CoreBundle\Command\ExportCommand | ||
228 | tags: ['console.command'] | ||
229 | |||
230 | wallabag_core.command.install: | ||
231 | class: Wallabag\CoreBundle\Command\InstallCommand | ||
232 | tags: ['console.command'] | ||
233 | |||
234 | wallabag_core.command.list_user: | ||
235 | class: Wallabag\CoreBundle\Command\ListUserCommand | ||
236 | tags: ['console.command'] | ||
237 | |||
238 | wallabag_core.command.reload_entry: | ||
239 | class: Wallabag\CoreBundle\Command\ReloadEntryCommand | ||
240 | tags: ['console.command'] | ||
241 | |||
242 | wallabag_core.command.show_user: | ||
243 | class: Wallabag\CoreBundle\Command\ShowUserCommand | ||
244 | tags: ['console.command'] | ||
245 | |||
246 | wallabag_core.command.tag_all: | ||
247 | class: Wallabag\CoreBundle\Command\TagAllCommand | ||
248 | tags: ['console.command'] | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 6f842534..e04c2ff1 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Tilføj ny artikel' | 37 | add_new_entry: 'Tilføj ny artikel' |
38 | search: 'Søg' | 38 | search: 'Søg' |
39 | filter_entries: 'Filtrer artikler' | 39 | filter_entries: 'Filtrer artikler' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | # export: 'Export' | 41 | # export: 'Export' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Indtast søgning' | 43 | input_label: 'Indtast søgning' |
@@ -53,11 +54,12 @@ config: | |||
53 | page_title: 'Opsætning' | 54 | page_title: 'Opsætning' |
54 | tab_menu: | 55 | tab_menu: |
55 | settings: 'Indstillinger' | 56 | settings: 'Indstillinger' |
56 | rss: 'RSS' | 57 | feed: 'RSS' |
57 | user_info: 'Brugeroplysninger' | 58 | user_info: 'Brugeroplysninger' |
58 | password: 'Adgangskode' | 59 | password: 'Adgangskode' |
59 | # rules: 'Tagging rules' | 60 | # rules: 'Tagging rules' |
60 | new_user: 'Tilføj bruger' | 61 | new_user: 'Tilføj bruger' |
62 | # reset: 'Reset area' | ||
61 | form: | 63 | form: |
62 | save: 'Gem' | 64 | save: 'Gem' |
63 | form_settings: | 65 | form_settings: |
@@ -83,25 +85,33 @@ 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." | 85 | # 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." | 86 | # 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." | 87 | # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." |
86 | form_rss: | 88 | form_feed: |
87 | description: 'RSS-feeds fra wallabag gør det muligt at læse de artikler, der gemmes i wallabag, med din RSS-læser. Det kræver, at du genererer et token først.' | 89 | description: 'RSS-feeds fra wallabag gør det muligt at læse de artikler, der gemmes i wallabag, med din RSS-læser. Det kræver, at du genererer et token først.' |
88 | token_label: 'RSS-Token' | 90 | token_label: 'RSS-Token' |
89 | no_token: 'Intet token' | 91 | no_token: 'Intet token' |
90 | token_create: 'Opret token' | 92 | token_create: 'Opret token' |
91 | token_reset: 'Nulstil token' | 93 | token_reset: 'Nulstil token' |
92 | rss_links: 'RSS-Links' | 94 | feed_links: 'RSS-Links' |
93 | rss_link: | 95 | feed_link: |
94 | unread: 'Ulæst' | 96 | unread: 'Ulæst' |
95 | starred: 'Favoritter' | 97 | starred: 'Favoritter' |
96 | archive: 'Arkiv' | 98 | archive: 'Arkiv' |
97 | # all: 'All' | 99 | # all: 'All' |
98 | # rss_limit: 'Number of items in the feed' | 100 | # feed_limit: 'Number of items in the feed' |
99 | form_user: | 101 | form_user: |
100 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion" | 102 | # 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." |
101 | name_label: 'Navn' | 103 | name_label: 'Navn' |
102 | email_label: 'Emailadresse' | 104 | email_label: 'Emailadresse' |
103 | # twoFactorAuthentication_label: 'Two factor authentication' | 105 | two_factor: |
104 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." | 106 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
107 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' | ||
108 | # table_method: Method | ||
109 | # table_state: State | ||
110 | # table_action: Action | ||
111 | # state_enabled: Enabled | ||
112 | # state_disabled: Disabled | ||
113 | # action_email: Use email | ||
114 | # action_app: Use OTP App | ||
105 | delete: | 115 | delete: |
106 | # title: Delete my account (a.k.a danger zone) | 116 | # title: Delete my account (a.k.a danger zone) |
107 | # 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. | 117 | # 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. |
@@ -159,6 +169,15 @@ config: | |||
159 | # and: 'One rule AND another' | 169 | # and: 'One rule AND another' |
160 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' | 170 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' |
161 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | 171 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' |
172 | otp: | ||
173 | # page_title: Two-factor authentication | ||
174 | # app: | ||
175 | # 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. | ||
176 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
177 | # 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:' | ||
178 | # two_factor_code_description_4: 'Test an OTP code from your configured app:' | ||
179 | # cancel: Cancel | ||
180 | # enable: Enable | ||
162 | 181 | ||
163 | entry: | 182 | entry: |
164 | # default_title: 'Title of the entry' | 183 | # default_title: 'Title of the entry' |
@@ -353,7 +372,7 @@ quickstart: | |||
353 | # title: 'Configure the application' | 372 | # title: 'Configure the application' |
354 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | 373 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' |
355 | # language: 'Change language and design' | 374 | # language: 'Change language and design' |
356 | # rss: 'Enable RSS feeds' | 375 | # feed: 'Enable RSS feeds' |
357 | # tagging_rules: 'Write rules to automatically tag your articles' | 376 | # tagging_rules: 'Write rules to automatically tag your articles' |
358 | # admin: | 377 | # admin: |
359 | # title: 'Administration' | 378 | # title: 'Administration' |
@@ -404,6 +423,8 @@ tag: | |||
404 | new: | 423 | new: |
405 | # add: 'Add' | 424 | # add: 'Add' |
406 | # placeholder: 'You can add several tags, separated by a comma.' | 425 | # placeholder: 'You can add several tags, separated by a comma.' |
426 | rename: | ||
427 | # placeholder: 'You can update tag name.' | ||
407 | 428 | ||
408 | # export: | 429 | # export: |
409 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | 430 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' |
@@ -529,7 +550,8 @@ user: | |||
529 | email_label: 'Emailadresse' | 550 | email_label: 'Emailadresse' |
530 | # enabled_label: 'Enabled' | 551 | # enabled_label: 'Enabled' |
531 | # last_login_label: 'Last login' | 552 | # last_login_label: 'Last login' |
532 | # twofactor_label: Two factor authentication | 553 | # twofactor_email_label: Two factor authentication by email |
554 | # twofactor_google_label: Two factor authentication by OTP app | ||
533 | # save: Save | 555 | # save: Save |
534 | # delete: Delete | 556 | # delete: Delete |
535 | # delete_confirm: Are you sure? | 557 | # delete_confirm: Are you sure? |
@@ -567,10 +589,10 @@ flashes: | |||
567 | password_updated: 'Adgangskode opdateret' | 589 | password_updated: 'Adgangskode opdateret' |
568 | # password_not_updated_demo: "In demonstration mode, you can't change password for this user." | 590 | # password_not_updated_demo: "In demonstration mode, you can't change password for this user." |
569 | user_updated: 'Oplysninger opdateret' | 591 | user_updated: 'Oplysninger opdateret' |
570 | rss_updated: 'RSS-oplysninger opdateret' | 592 | feed_updated: 'RSS-oplysninger opdateret' |
571 | # tagging_rules_updated: 'Tagging rules updated' | 593 | # tagging_rules_updated: 'Tagging rules updated' |
572 | # tagging_rules_deleted: 'Tagging rule deleted' | 594 | # tagging_rules_deleted: 'Tagging rule deleted' |
573 | # rss_token_updated: 'RSS token updated' | 595 | # feed_token_updated: 'RSS token updated' |
574 | # annotations_reset: Annotations reset | 596 | # annotations_reset: Annotations reset |
575 | # tags_reset: Tags reset | 597 | # tags_reset: Tags reset |
576 | # entries_reset: Entries reset | 598 | # entries_reset: Entries reset |
@@ -588,9 +610,11 @@ flashes: | |||
588 | entry_starred: 'Artikel markeret som favorit' | 610 | entry_starred: 'Artikel markeret som favorit' |
589 | entry_unstarred: 'Artikel ikke længere markeret som favorit' | 611 | entry_unstarred: 'Artikel ikke længere markeret som favorit' |
590 | entry_deleted: 'Artikel slettet' | 612 | entry_deleted: 'Artikel slettet' |
613 | # no_random_entry: 'No article with these criterias was found' | ||
591 | tag: | 614 | tag: |
592 | notice: | 615 | notice: |
593 | # tag_added: 'Tag added' | 616 | # tag_added: 'Tag added' |
617 | # tag_renamed: 'Tag renamed' | ||
594 | import: | 618 | import: |
595 | notice: | 619 | notice: |
596 | # failed: 'Import failed, please try again.' | 620 | # failed: 'Import failed, please try again.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 874908b9..5a9668a9 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Neuen Artikel hinzufügen' | 37 | add_new_entry: 'Neuen Artikel hinzufügen' |
38 | search: 'Suche' | 38 | search: 'Suche' |
39 | filter_entries: 'Artikel filtern' | 39 | filter_entries: 'Artikel filtern' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | export: 'Exportieren' | 41 | export: 'Exportieren' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Suchbegriff hier eingeben' | 43 | input_label: 'Suchbegriff hier eingeben' |
@@ -53,11 +54,12 @@ config: | |||
53 | page_title: 'Einstellungen' | 54 | page_title: 'Einstellungen' |
54 | tab_menu: | 55 | tab_menu: |
55 | settings: 'Einstellungen' | 56 | settings: 'Einstellungen' |
56 | rss: 'RSS' | 57 | feed: 'RSS' |
57 | user_info: 'Benutzerinformation' | 58 | user_info: 'Benutzerinformation' |
58 | password: 'Kennwort' | 59 | password: 'Kennwort' |
59 | rules: 'Tagging-Regeln' | 60 | rules: 'Tagging-Regeln' |
60 | new_user: 'Benutzer hinzufügen' | 61 | new_user: 'Benutzer hinzufügen' |
62 | reset: 'Zurücksetzen' | ||
61 | form: | 63 | form: |
62 | save: 'Speichern' | 64 | save: 'Speichern' |
63 | form_settings: | 65 | form_settings: |
@@ -83,25 +85,33 @@ config: | |||
83 | help_reading_speed: "wallabag berechnet eine Lesezeit pro Artikel. Hier kannst du definieren, ob du ein schneller oder langsamer Leser bist. wallabag wird die Lesezeiten danach neu berechnen." | 85 | help_reading_speed: "wallabag berechnet eine Lesezeit pro Artikel. Hier kannst du definieren, ob du ein schneller oder langsamer Leser bist. wallabag wird die Lesezeiten danach neu berechnen." |
84 | help_language: "Du kannst die Sprache der wallabag-Oberfläche ändern." | 86 | help_language: "Du kannst die Sprache der wallabag-Oberfläche ändern." |
85 | help_pocket_consumer_key: "Nötig für den Pocket-Import. Du kannst ihn in deinem Pocket account einrichten." | 87 | help_pocket_consumer_key: "Nötig für den Pocket-Import. Du kannst ihn in deinem Pocket account einrichten." |
86 | form_rss: | 88 | form_feed: |
87 | description: 'Die RSS-Feeds von wallabag erlauben es dir, deine gespeicherten Artikel mit deinem bevorzugten RSS-Reader zu lesen. Vorher musst du jedoch einen Token erstellen.' | 89 | description: 'Die RSS-Feeds von wallabag erlauben es dir, deine gespeicherten Artikel mit deinem bevorzugten RSS-Reader zu lesen. Vorher musst du jedoch einen Token erstellen.' |
88 | token_label: 'RSS-Token' | 90 | token_label: 'RSS-Token' |
89 | no_token: 'Kein Token' | 91 | no_token: 'Kein Token' |
90 | token_create: 'Token erstellen' | 92 | token_create: 'Token erstellen' |
91 | token_reset: 'Token zurücksetzen' | 93 | token_reset: 'Token zurücksetzen' |
92 | rss_links: 'RSS-Links' | 94 | feed_links: 'RSS-Links' |
93 | rss_link: | 95 | feed_link: |
94 | unread: 'Ungelesene' | 96 | unread: 'Ungelesene' |
95 | starred: 'Favoriten' | 97 | starred: 'Favoriten' |
96 | archive: 'Archivierte' | 98 | archive: 'Archivierte' |
97 | all: 'Alle' | 99 | all: 'Alle' |
98 | rss_limit: 'Anzahl der Einträge pro Feed' | 100 | feed_limit: 'Anzahl der Einträge pro Feed' |
99 | form_user: | 101 | form_user: |
100 | two_factor_description: "Wenn du die Zwei-Faktor-Authentifizierung aktivierst, erhältst du eine E-Mail mit einem Code bei jeder nicht vertrauenswürdigen Verbindung" | 102 | # 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." |
101 | name_label: 'Name' | 103 | name_label: 'Name' |
102 | email_label: 'E-Mail-Adresse' | 104 | email_label: 'E-Mail-Adresse' |
103 | twoFactorAuthentication_label: 'Zwei-Faktor-Authentifizierung' | 105 | two_factor: |
104 | help_twoFactorAuthentication: "Wenn du 2FA aktivierst, wirst du bei jedem Login einen Code per E-Mail bekommen." | 106 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
107 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' | ||
108 | # table_method: Method | ||
109 | # table_state: State | ||
110 | # table_action: Action | ||
111 | # state_enabled: Enabled | ||
112 | # state_disabled: Disabled | ||
113 | # action_email: Use email | ||
114 | # action_app: Use OTP App | ||
105 | delete: | 115 | delete: |
106 | title: 'Lösche mein Konto (a.k.a Gefahrenzone)' | 116 | title: 'Lösche mein Konto (a.k.a Gefahrenzone)' |
107 | description: 'Wenn du dein Konto löschst, werden ALL deine Artikel, ALL deine Tags, ALL deine Anmerkungen und dein Konto dauerhaft gelöscht (kann NICHT RÜCKGÄNGIG gemacht werden). Du wirst anschließend ausgeloggt.' | 117 | description: 'Wenn du dein Konto löschst, werden ALL deine Artikel, ALL deine Tags, ALL deine Anmerkungen und dein Konto dauerhaft gelöscht (kann NICHT RÜCKGÄNGIG gemacht werden). Du wirst anschließend ausgeloggt.' |
@@ -353,7 +363,7 @@ quickstart: | |||
353 | title: 'Anwendung konfigurieren' | 363 | title: 'Anwendung konfigurieren' |
354 | description: 'Um die Applikation für dich anzupassen, schau in die Konfiguration von wallabag.' | 364 | description: 'Um die Applikation für dich anzupassen, schau in die Konfiguration von wallabag.' |
355 | language: 'Sprache und Design ändern' | 365 | language: 'Sprache und Design ändern' |
356 | rss: 'RSS-Feeds aktivieren' | 366 | feed: 'RSS-Feeds aktivieren' |
357 | tagging_rules: 'Schreibe Regeln, um deine Beiträge automatisch zu taggen (verschlagworten)' | 367 | tagging_rules: 'Schreibe Regeln, um deine Beiträge automatisch zu taggen (verschlagworten)' |
358 | admin: | 368 | admin: |
359 | title: 'Administration' | 369 | title: 'Administration' |
@@ -404,6 +414,8 @@ tag: | |||
404 | new: | 414 | new: |
405 | add: 'Hinzufügen' | 415 | add: 'Hinzufügen' |
406 | placeholder: 'Du kannst verschiedene Tags, getrennt von einem Komma, hinzufügen.' | 416 | placeholder: 'Du kannst verschiedene Tags, getrennt von einem Komma, hinzufügen.' |
417 | rename: | ||
418 | # placeholder: 'You can update tag name.' | ||
407 | 419 | ||
408 | export: | 420 | export: |
409 | footer_template: '<div style="text-align:center;"><p>Generiert von wallabag mit Hilfe von %method%</p><p>Bitte öffne <a href="https://github.com/wallabag/wallabag/issues">ein Ticket</a> wenn du ein Problem mit der Darstellung von diesem E-Book auf deinem Gerät hast.</p></div>' | 421 | footer_template: '<div style="text-align:center;"><p>Generiert von wallabag mit Hilfe von %method%</p><p>Bitte öffne <a href="https://github.com/wallabag/wallabag/issues">ein Ticket</a> wenn du ein Problem mit der Darstellung von diesem E-Book auf deinem Gerät hast.</p></div>' |
@@ -529,7 +541,8 @@ user: | |||
529 | email_label: 'E-Mail-Adresse' | 541 | email_label: 'E-Mail-Adresse' |
530 | enabled_label: 'Aktiviert' | 542 | enabled_label: 'Aktiviert' |
531 | last_login_label: 'Letzter Login' | 543 | last_login_label: 'Letzter Login' |
532 | twofactor_label: 'Zwei-Faktor-Authentifizierung' | 544 | # twofactor_email_label: Two factor authentication by email |
545 | # twofactor_google_label: Two factor authentication by OTP app | ||
533 | save: 'Speichern' | 546 | save: 'Speichern' |
534 | delete: 'Löschen' | 547 | delete: 'Löschen' |
535 | delete_confirm: 'Bist du sicher?' | 548 | delete_confirm: 'Bist du sicher?' |
@@ -567,14 +580,14 @@ flashes: | |||
567 | password_updated: 'Kennwort aktualisiert' | 580 | password_updated: 'Kennwort aktualisiert' |
568 | password_not_updated_demo: 'Im Testmodus kannst du das Kennwort nicht ändern.' | 581 | password_not_updated_demo: 'Im Testmodus kannst du das Kennwort nicht ändern.' |
569 | user_updated: 'Information aktualisiert' | 582 | user_updated: 'Information aktualisiert' |
570 | rss_updated: 'RSS-Informationen aktualisiert' | 583 | feed_updated: 'RSS-Informationen aktualisiert' |
571 | tagging_rules_updated: 'Tagging-Regeln aktualisiert' | 584 | tagging_rules_updated: 'Tagging-Regeln aktualisiert' |
572 | tagging_rules_deleted: 'Tagging-Regel gelöscht' | 585 | tagging_rules_deleted: 'Tagging-Regel gelöscht' |
573 | rss_token_updated: 'RSS-Token aktualisiert' | 586 | feed_token_updated: 'RSS-Token aktualisiert' |
574 | annotations_reset: 'Anmerkungen zurücksetzen' | 587 | annotations_reset: Anmerkungen zurücksetzen |
575 | tags_reset: 'Tags zurücksetzen' | 588 | tags_reset: Tags zurücksetzen |
576 | entries_reset: 'Einträge zurücksetzen' | 589 | entries_reset: Einträge zurücksetzen |
577 | archived_reset: 'Archiverte Einträge zurücksetzen' | 590 | archived_reset: Archiverte Einträge zurücksetzen |
578 | entry: | 591 | entry: |
579 | notice: | 592 | notice: |
580 | entry_already_saved: 'Eintrag bereits am %date% gespeichert' | 593 | entry_already_saved: 'Eintrag bereits am %date% gespeichert' |
@@ -588,9 +601,11 @@ flashes: | |||
588 | entry_starred: 'Eintrag favorisiert' | 601 | entry_starred: 'Eintrag favorisiert' |
589 | entry_unstarred: 'Eintrag defavorisiert' | 602 | entry_unstarred: 'Eintrag defavorisiert' |
590 | entry_deleted: 'Eintrag gelöscht' | 603 | entry_deleted: 'Eintrag gelöscht' |
604 | # no_random_entry: 'No article with these criterias was found' | ||
591 | tag: | 605 | tag: |
592 | notice: | 606 | notice: |
593 | tag_added: 'Tag hinzugefügt' | 607 | tag_added: 'Tag hinzugefügt' |
608 | #tag_renamed: 'Tag renamed' | ||
594 | import: | 609 | import: |
595 | notice: | 610 | notice: |
596 | failed: 'Import fehlgeschlagen, bitte erneut probieren.' | 611 | failed: 'Import fehlgeschlagen, bitte erneut probieren.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 598ad58d..e2994f53 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Add a new entry' | 37 | add_new_entry: 'Add a new entry' |
38 | search: 'Search' | 38 | search: 'Search' |
39 | filter_entries: 'Filter entries' | 39 | filter_entries: 'Filter entries' |
40 | random_entry: Jump to a random entry from that list | ||
40 | export: 'Export' | 41 | export: 'Export' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Enter your search here' | 43 | input_label: 'Enter your search here' |
@@ -53,11 +54,12 @@ config: | |||
53 | page_title: 'Config' | 54 | page_title: 'Config' |
54 | tab_menu: | 55 | tab_menu: |
55 | settings: 'Settings' | 56 | settings: 'Settings' |
56 | rss: 'RSS' | 57 | feed: 'Feeds' |
57 | user_info: 'User information' | 58 | user_info: 'User information' |
58 | password: 'Password' | 59 | password: 'Password' |
59 | rules: 'Tagging rules' | 60 | rules: 'Tagging rules' |
60 | new_user: 'Add a user' | 61 | new_user: 'Add a user' |
62 | reset: 'Reset area' | ||
61 | form: | 63 | form: |
62 | save: 'Save' | 64 | save: 'Save' |
63 | form_settings: | 65 | form_settings: |
@@ -83,25 +85,33 @@ 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." | 85 | 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." | 86 | 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." | 87 | help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." |
86 | form_rss: | 88 | 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.' | 89 | 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' | 90 | token_label: 'Feed token' |
89 | no_token: 'No token' | 91 | no_token: 'No token' |
90 | token_create: 'Create your token' | 92 | token_create: 'Create your token' |
91 | token_reset: 'Regenerate your token' | 93 | token_reset: 'Regenerate your token' |
92 | rss_links: 'RSS links' | 94 | feed_links: 'Feed links' |
93 | rss_link: | 95 | feed_link: |
94 | unread: 'Unread' | 96 | unread: 'Unread' |
95 | starred: 'Starred' | 97 | starred: 'Starred' |
96 | archive: 'Archived' | 98 | archive: 'Archived' |
97 | all: 'All' | 99 | all: 'All' |
98 | rss_limit: 'Number of items in the feed' | 100 | feed_limit: 'Number of items in the feed' |
99 | form_user: | 101 | form_user: |
100 | two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connection." | 102 | 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." |
101 | name_label: 'Name' | 103 | name_label: 'Name' |
102 | email_label: 'Email' | 104 | email_label: 'Email' |
103 | twoFactorAuthentication_label: 'Two factor authentication' | 105 | two_factor: |
104 | help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." | 106 | emailTwoFactor_label: 'Using email (receive a code by email)' |
107 | googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' | ||
108 | table_method: Method | ||
109 | table_state: State | ||
110 | table_action: Action | ||
111 | state_enabled: Enabled | ||
112 | state_disabled: Disabled | ||
113 | action_email: Use email | ||
114 | action_app: Use OTP App | ||
105 | delete: | 115 | delete: |
106 | title: Delete my account (a.k.a danger zone) | 116 | title: Delete my account (a.k.a danger zone) |
107 | 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. | 117 | 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. |
@@ -159,6 +169,15 @@ config: | |||
159 | and: 'One rule AND another' | 169 | and: 'One rule AND another' |
160 | matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' | 170 | matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' |
161 | notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | 171 | notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' |
172 | otp: | ||
173 | page_title: Two-factor authentication | ||
174 | app: | ||
175 | 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. | ||
176 | two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
177 | 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:' | ||
178 | two_factor_code_description_4: 'Test an OTP code from your configured app:' | ||
179 | cancel: Cancel | ||
180 | enable: Enable | ||
162 | 181 | ||
163 | entry: | 182 | entry: |
164 | default_title: 'Title of the entry' | 183 | default_title: 'Title of the entry' |
@@ -353,7 +372,7 @@ quickstart: | |||
353 | title: 'Configure the application' | 372 | title: 'Configure the application' |
354 | description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | 373 | description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' |
355 | language: 'Change language and design' | 374 | language: 'Change language and design' |
356 | rss: 'Enable RSS feeds' | 375 | feed: 'Enable feeds' |
357 | tagging_rules: 'Write rules to automatically tag your articles' | 376 | tagging_rules: 'Write rules to automatically tag your articles' |
358 | admin: | 377 | admin: |
359 | title: 'Administration' | 378 | title: 'Administration' |
@@ -404,6 +423,8 @@ tag: | |||
404 | new: | 423 | new: |
405 | add: 'Add' | 424 | add: 'Add' |
406 | placeholder: 'You can add several tags, separated by a comma.' | 425 | placeholder: 'You can add several tags, separated by a comma.' |
426 | rename: | ||
427 | placeholder: 'You can update tag name.' | ||
407 | 428 | ||
408 | export: | 429 | export: |
409 | footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | 430 | footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' |
@@ -529,7 +550,8 @@ user: | |||
529 | email_label: 'Email' | 550 | email_label: 'Email' |
530 | enabled_label: 'Enabled' | 551 | enabled_label: 'Enabled' |
531 | last_login_label: 'Last login' | 552 | last_login_label: 'Last login' |
532 | twofactor_label: Two factor authentication | 553 | twofactor_email_label: Two factor authentication by email |
554 | twofactor_google_label: Two factor authentication by OTP app | ||
533 | save: Save | 555 | save: Save |
534 | delete: Delete | 556 | delete: Delete |
535 | delete_confirm: Are you sure? | 557 | delete_confirm: Are you sure? |
@@ -567,14 +589,15 @@ flashes: | |||
567 | password_updated: 'Password updated' | 589 | password_updated: 'Password updated' |
568 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." | 590 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." |
569 | user_updated: 'Information updated' | 591 | user_updated: 'Information updated' |
570 | rss_updated: 'RSS information updated' | 592 | feed_updated: 'Feed information updated' |
571 | tagging_rules_updated: 'Tagging rules updated' | 593 | tagging_rules_updated: 'Tagging rules updated' |
572 | tagging_rules_deleted: 'Tagging rule deleted' | 594 | tagging_rules_deleted: 'Tagging rule deleted' |
573 | rss_token_updated: 'RSS token updated' | 595 | feed_token_updated: 'Feed token updated' |
574 | annotations_reset: Annotations reset | 596 | annotations_reset: Annotations reset |
575 | tags_reset: Tags reset | 597 | tags_reset: Tags reset |
576 | entries_reset: Entries reset | 598 | entries_reset: Entries reset |
577 | archived_reset: Archived entries deleted | 599 | archived_reset: Archived entries deleted |
600 | otp_enabled: Two-factor authentication enabled | ||
578 | entry: | 601 | entry: |
579 | notice: | 602 | notice: |
580 | entry_already_saved: 'Entry already saved on %date%' | 603 | entry_already_saved: 'Entry already saved on %date%' |
@@ -588,9 +611,11 @@ flashes: | |||
588 | entry_starred: 'Entry starred' | 611 | entry_starred: 'Entry starred' |
589 | entry_unstarred: 'Entry unstarred' | 612 | entry_unstarred: 'Entry unstarred' |
590 | entry_deleted: 'Entry deleted' | 613 | entry_deleted: 'Entry deleted' |
614 | no_random_entry: 'No article with these criterias was found' | ||
591 | tag: | 615 | tag: |
592 | notice: | 616 | notice: |
593 | tag_added: 'Tag added' | 617 | tag_added: 'Tag added' |
618 | tag_renamed: 'Tag renamed' | ||
594 | import: | 619 | import: |
595 | notice: | 620 | notice: |
596 | failed: 'Import failed, please try again.' | 621 | failed: 'Import failed, please try again.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index f8aa4109..d1ccfc81 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Añadir un nuevo artículo' | 37 | add_new_entry: 'Añadir un nuevo artículo' |
38 | search: 'Buscar' | 38 | search: 'Buscar' |
39 | filter_entries: 'Filtrar los artículos' | 39 | filter_entries: 'Filtrar los artículos' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | export: 'Exportar' | 41 | export: 'Exportar' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Introduzca su búsqueda aquí' | 43 | input_label: 'Introduzca su búsqueda aquí' |
@@ -53,11 +54,12 @@ config: | |||
53 | page_title: 'Configuración' | 54 | page_title: 'Configuración' |
54 | tab_menu: | 55 | tab_menu: |
55 | settings: 'Configuración' | 56 | settings: 'Configuración' |
56 | rss: 'RSS' | 57 | feed: 'RSS' |
57 | user_info: 'Información de usuario' | 58 | user_info: 'Información de usuario' |
58 | password: 'Contraseña' | 59 | password: 'Contraseña' |
59 | rules: 'Reglas de etiquetado automáticas' | 60 | rules: 'Reglas de etiquetado automáticas' |
60 | new_user: 'Añadir un usuario' | 61 | new_user: 'Añadir un usuario' |
62 | reset: 'Reiniciar mi cuenta' | ||
61 | form: | 63 | form: |
62 | save: 'Guardar' | 64 | save: 'Guardar' |
63 | form_settings: | 65 | form_settings: |
@@ -83,25 +85,33 @@ config: | |||
83 | help_reading_speed: "wallabag calcula un tiempo de lectura para cada artículo. Puedes definir aquí, gracias a esta lista, si eres un lector rápido o lento. wallabag recalculará el tiempo de lectura para cada artículo." | 85 | help_reading_speed: "wallabag calcula un tiempo de lectura para cada artículo. Puedes definir aquí, gracias a esta lista, si eres un lector rápido o lento. wallabag recalculará el tiempo de lectura para cada artículo." |
84 | help_language: "Puedes cambiar el idioma de la interfaz de wallabag." | 86 | help_language: "Puedes cambiar el idioma de la interfaz de wallabag." |
85 | help_pocket_consumer_key: "Requerido para la importación desde Pocket. Puedes crearla en tu cuenta de Pocket." | 87 | help_pocket_consumer_key: "Requerido para la importación desde Pocket. Puedes crearla en tu cuenta de Pocket." |
86 | form_rss: | 88 | form_feed: |
87 | description: 'Los feeds RSS de wallabag permiten leer los artículos guardados con su lector RSS favorito. Primero necesitas generar un token.' | 89 | description: 'Los feeds RSS de wallabag permiten leer los artículos guardados con su lector RSS favorito. Primero necesitas generar un token.' |
88 | token_label: 'Token RSS' | 90 | token_label: 'Token RSS' |
89 | no_token: 'Sin token' | 91 | no_token: 'Sin token' |
90 | token_create: 'Crear token' | 92 | token_create: 'Crear token' |
91 | token_reset: 'Reiniciar token' | 93 | token_reset: 'Reiniciar token' |
92 | rss_links: 'URLs de feeds RSS' | 94 | feed_links: 'URLs de feeds RSS' |
93 | rss_link: | 95 | feed_link: |
94 | unread: 'sin leer' | 96 | unread: 'sin leer' |
95 | starred: 'favoritos' | 97 | starred: 'favoritos' |
96 | archive: 'archivados' | 98 | archive: 'archivados' |
97 | # all: 'All' | 99 | # all: 'All' |
98 | rss_limit: 'Límite de artículos en feed RSS' | 100 | feed_limit: 'Límite de artículos en feed RSS' |
99 | form_user: | 101 | form_user: |
100 | two_factor_description: "Con la autenticación en dos pasos recibirá código por e-mail en cada nueva conexión que no sea de confianza." | 102 | # 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." |
101 | name_label: 'Nombre' | 103 | name_label: 'Nombre' |
102 | email_label: 'Dirección de e-mail' | 104 | email_label: 'Dirección de e-mail' |
103 | twoFactorAuthentication_label: 'Autenticación en dos pasos' | 105 | two_factor: |
104 | help_twoFactorAuthentication: "Si activas la autenticación en dos pasos, cada vez que quieras iniciar sesión en wallabag recibirás un código por e-mail." | 106 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
107 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' | ||
108 | # table_method: Method | ||
109 | # table_state: State | ||
110 | # table_action: Action | ||
111 | # state_enabled: Enabled | ||
112 | # state_disabled: Disabled | ||
113 | # action_email: Use email | ||
114 | # action_app: Use OTP App | ||
105 | delete: | 115 | delete: |
106 | title: Eliminar mi cuenta (Zona peligrosa) | 116 | title: Eliminar mi cuenta (Zona peligrosa) |
107 | description: Si eliminas tu cuenta, TODOS tus artículos, TODAS tus etiquetas, TODAS tus anotaciones y tu cuenta serán eliminadas de forma PERMANENTE (no se puede deshacer). Después serás desconectado. | 117 | description: Si eliminas tu cuenta, TODOS tus artículos, TODAS tus etiquetas, TODAS tus anotaciones y tu cuenta serán eliminadas de forma PERMANENTE (no se puede deshacer). Después serás desconectado. |
@@ -159,6 +169,15 @@ config: | |||
159 | and: 'Una regla Y la otra' | 169 | and: 'Una regla Y la otra' |
160 | matches: 'Prueba si un <i>sujeto</i> corresponde a una <i>búsqueda</i> (insensible a mayusculas).<br />Ejemplo : <code>title matches "fútbol"</code>' | 170 | matches: 'Prueba si un <i>sujeto</i> corresponde a una <i>búsqueda</i> (insensible a mayusculas).<br />Ejemplo : <code>title matches "fútbol"</code>' |
161 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | 171 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' |
172 | otp: | ||
173 | # page_title: Two-factor authentication | ||
174 | # app: | ||
175 | # 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. | ||
176 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
177 | # 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:' | ||
178 | # two_factor_code_description_4: 'Test an OTP code from your configured app:' | ||
179 | # cancel: Cancel | ||
180 | # enable: Enable | ||
162 | 181 | ||
163 | entry: | 182 | entry: |
164 | default_title: 'Título del artículo' | 183 | default_title: 'Título del artículo' |
@@ -353,7 +372,7 @@ quickstart: | |||
353 | title: 'Configure la aplicación' | 372 | title: 'Configure la aplicación' |
354 | description: 'Para que la aplicación se ajuste a tus necesidades, echa un vistazo a la configuración de wallabag.' | 373 | description: 'Para que la aplicación se ajuste a tus necesidades, echa un vistazo a la configuración de wallabag.' |
355 | language: 'Cambie el idioma y el diseño' | 374 | language: 'Cambie el idioma y el diseño' |
356 | rss: 'Activar los feeds RSS' | 375 | feed: 'Activar los feeds RSS' |
357 | tagging_rules: 'Escribe reglas para etiquetar automáticamente tus artículos' | 376 | tagging_rules: 'Escribe reglas para etiquetar automáticamente tus artículos' |
358 | admin: | 377 | admin: |
359 | title: 'Administración' | 378 | title: 'Administración' |
@@ -404,6 +423,8 @@ tag: | |||
404 | new: | 423 | new: |
405 | add: 'Añadir' | 424 | add: 'Añadir' |
406 | placeholder: 'Puedes añadir varias etiquetas, separadas por una coma.' | 425 | placeholder: 'Puedes añadir varias etiquetas, separadas por una coma.' |
426 | rename: | ||
427 | # placeholder: 'You can update tag name.' | ||
407 | 428 | ||
408 | # export: | 429 | # export: |
409 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | 430 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' |
@@ -529,7 +550,8 @@ user: | |||
529 | email_label: 'E-mail' | 550 | email_label: 'E-mail' |
530 | enabled_label: 'Activado' | 551 | enabled_label: 'Activado' |
531 | last_login_label: 'Último inicio de sesión' | 552 | last_login_label: 'Último inicio de sesión' |
532 | twofactor_label: Autenticación en dos pasos | 553 | # twofactor_email_label: Two factor authentication by email |
554 | # twofactor_google_label: Two factor authentication by OTP app | ||
533 | save: Guardar | 555 | save: Guardar |
534 | delete: Eliminar | 556 | delete: Eliminar |
535 | delete_confirm: ¿Estás seguro? | 557 | delete_confirm: ¿Estás seguro? |
@@ -567,10 +589,10 @@ flashes: | |||
567 | password_updated: 'Contraseña actualizada' | 589 | password_updated: 'Contraseña actualizada' |
568 | password_not_updated_demo: "En el modo demo, no puede cambiar la contraseña del usuario." | 590 | password_not_updated_demo: "En el modo demo, no puede cambiar la contraseña del usuario." |
569 | user_updated: 'Información actualizada' | 591 | user_updated: 'Información actualizada' |
570 | rss_updated: 'Configuración RSS actualizada' | 592 | feed_updated: 'Configuración RSS actualizada' |
571 | tagging_rules_updated: 'Regla de etiquetado actualizada' | 593 | tagging_rules_updated: 'Regla de etiquetado actualizada' |
572 | tagging_rules_deleted: 'Regla de etiquetado eliminada' | 594 | tagging_rules_deleted: 'Regla de etiquetado eliminada' |
573 | rss_token_updated: 'Token RSS actualizado' | 595 | feed_token_updated: 'Token RSS actualizado' |
574 | annotations_reset: Anotaciones reiniciadas | 596 | annotations_reset: Anotaciones reiniciadas |
575 | tags_reset: Etiquetas reiniciadas | 597 | tags_reset: Etiquetas reiniciadas |
576 | entries_reset: Artículos reiniciados | 598 | entries_reset: Artículos reiniciados |
@@ -588,9 +610,11 @@ flashes: | |||
588 | entry_starred: 'Artículo marcado como favorito' | 610 | entry_starred: 'Artículo marcado como favorito' |
589 | entry_unstarred: 'Artículo desmarcado como favorito' | 611 | entry_unstarred: 'Artículo desmarcado como favorito' |
590 | entry_deleted: 'Artículo eliminado' | 612 | entry_deleted: 'Artículo eliminado' |
613 | # no_random_entry: 'No article with these criterias was found' | ||
591 | tag: | 614 | tag: |
592 | notice: | 615 | notice: |
593 | tag_added: 'Etiqueta añadida' | 616 | tag_added: 'Etiqueta añadida' |
617 | # tag_renamed: 'Tag renamed' | ||
594 | import: | 618 | import: |
595 | notice: | 619 | notice: |
596 | failed: 'Importación fallida, por favor, inténtelo de nuevo.' | 620 | failed: 'Importación fallida, por favor, inténtelo de nuevo.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 785e39ee..e5d36bd3 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'افزودن مقالهٔ تازه' | 37 | add_new_entry: 'افزودن مقالهٔ تازه' |
38 | search: 'جستجو' | 38 | search: 'جستجو' |
39 | filter_entries: 'فیلترکردن مقالهها' | 39 | filter_entries: 'فیلترکردن مقالهها' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | export: 'برونبری' | 41 | export: 'برونبری' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'جستجوی خود را اینجا بنویسید:' | 43 | input_label: 'جستجوی خود را اینجا بنویسید:' |
@@ -53,11 +54,12 @@ config: | |||
53 | page_title: 'پیکربندی' | 54 | page_title: 'پیکربندی' |
54 | tab_menu: | 55 | tab_menu: |
55 | settings: 'تنظیمات' | 56 | settings: 'تنظیمات' |
56 | rss: 'آر-اس-اس' | 57 | feed: 'آر-اس-اس' |
57 | user_info: 'اطلاعات کاربر' | 58 | user_info: 'اطلاعات کاربر' |
58 | password: 'رمز' | 59 | password: 'رمز' |
59 | rules: 'برچسبگذاری خودکار' | 60 | rules: 'برچسبگذاری خودکار' |
60 | new_user: 'افزودن کاربر' | 61 | new_user: 'افزودن کاربر' |
62 | # reset: 'Reset area' | ||
61 | form: | 63 | form: |
62 | save: 'ذخیره' | 64 | save: 'ذخیره' |
63 | form_settings: | 65 | form_settings: |
@@ -83,25 +85,33 @@ 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." | 85 | # 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." | 86 | # 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." | 87 | # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." |
86 | form_rss: | 88 | form_feed: |
87 | description: 'با خوراک آر-اس-اس که wallabag در اختیارتان میگذارد، میتوانید مقالههای ذخیرهشده را در نرمافزار آر-اس-اس دلخواه خود بخوانید. برای این کار نخست باید یک کد بسازید.' | 89 | description: 'با خوراک آر-اس-اس که wallabag در اختیارتان میگذارد، میتوانید مقالههای ذخیرهشده را در نرمافزار آر-اس-اس دلخواه خود بخوانید. برای این کار نخست باید یک کد بسازید.' |
88 | token_label: 'کد آر-اس-اس' | 90 | token_label: 'کد آر-اس-اس' |
89 | no_token: 'بدون کد' | 91 | no_token: 'بدون کد' |
90 | token_create: 'کد خود را بسازید' | 92 | token_create: 'کد خود را بسازید' |
91 | token_reset: 'بازنشانی کد' | 93 | token_reset: 'بازنشانی کد' |
92 | rss_links: 'پیوند آر-اس-اس' | 94 | feed_links: 'پیوند آر-اس-اس' |
93 | rss_link: | 95 | feed_link: |
94 | unread: 'خواندهنشده' | 96 | unread: 'خواندهنشده' |
95 | starred: 'برگزیده' | 97 | starred: 'برگزیده' |
96 | archive: 'بایگانی' | 98 | archive: 'بایگانی' |
97 | # all: 'All' | 99 | # all: 'All' |
98 | rss_limit: 'محدودیت آر-اس-اس' | 100 | feed_limit: 'محدودیت آر-اس-اس' |
99 | form_user: | 101 | form_user: |
100 | two_factor_description: "با فعالکردن تأیید ۲مرحلهای هر بار که اتصال تأییدنشدهای برقرار شد، به شما یک کد از راه ایمیل فرستاده میشود" | 102 | # 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." |
101 | name_label: 'نام' | 103 | name_label: 'نام' |
102 | email_label: 'نشانی ایمیل' | 104 | email_label: 'نشانی ایمیل' |
103 | twoFactorAuthentication_label: 'تأیید ۲مرحلهای' | 105 | two_factor: |
104 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." | 106 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
107 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' | ||
108 | # table_method: Method | ||
109 | # table_state: State | ||
110 | # table_action: Action | ||
111 | # state_enabled: Enabled | ||
112 | # state_disabled: Disabled | ||
113 | # action_email: Use email | ||
114 | # action_app: Use OTP App | ||
105 | delete: | 115 | delete: |
106 | # title: Delete my account (a.k.a danger zone) | 116 | # title: Delete my account (a.k.a danger zone) |
107 | # 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. | 117 | # 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. |
@@ -159,6 +169,15 @@ config: | |||
159 | # and: 'One rule AND another' | 169 | # and: 'One rule AND another' |
160 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' | 170 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' |
161 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | 171 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' |
172 | otp: | ||
173 | # page_title: Two-factor authentication | ||
174 | # app: | ||
175 | # 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. | ||
176 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
177 | # 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:' | ||
178 | # two_factor_code_description_4: 'Test an OTP code from your configured app:' | ||
179 | # cancel: Cancel | ||
180 | # enable: Enable | ||
162 | 181 | ||
163 | entry: | 182 | entry: |
164 | # default_title: 'Title of the entry' | 183 | # default_title: 'Title of the entry' |
@@ -353,7 +372,7 @@ quickstart: | |||
353 | title: 'برنامه را تنظیم کنید' | 372 | title: 'برنامه را تنظیم کنید' |
354 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | 373 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' |
355 | language: 'زبان و نمای برنامه را تغییر دهید' | 374 | language: 'زبان و نمای برنامه را تغییر دهید' |
356 | rss: 'خوراک آر-اس-اس را فعال کنید' | 375 | feed: 'خوراک آر-اس-اس را فعال کنید' |
357 | tagging_rules: 'قانونهای برچسبگذاری خودکار مقالههایتان را تعریف کنید' | 376 | tagging_rules: 'قانونهای برچسبگذاری خودکار مقالههایتان را تعریف کنید' |
358 | admin: | 377 | admin: |
359 | title: 'مدیریت' | 378 | title: 'مدیریت' |
@@ -404,6 +423,8 @@ tag: | |||
404 | new: | 423 | new: |
405 | # add: 'Add' | 424 | # add: 'Add' |
406 | # placeholder: 'You can add several tags, separated by a comma.' | 425 | # placeholder: 'You can add several tags, separated by a comma.' |
426 | rename: | ||
427 | # placeholder: 'You can update tag name.' | ||
407 | 428 | ||
408 | # export: | 429 | # export: |
409 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | 430 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' |
@@ -529,7 +550,8 @@ user: | |||
529 | email_label: 'نشانی ایمیل' | 550 | email_label: 'نشانی ایمیل' |
530 | # enabled_label: 'Enabled' | 551 | # enabled_label: 'Enabled' |
531 | # last_login_label: 'Last login' | 552 | # last_login_label: 'Last login' |
532 | # twofactor_label: Two factor authentication | 553 | # twofactor_email_label: Two factor authentication by email |
554 | # twofactor_google_label: Two factor authentication by OTP app | ||
533 | # save: Save | 555 | # save: Save |
534 | # delete: Delete | 556 | # delete: Delete |
535 | # delete_confirm: Are you sure? | 557 | # delete_confirm: Are you sure? |
@@ -567,10 +589,10 @@ flashes: | |||
567 | password_updated: 'رمز بهروز شد' | 589 | password_updated: 'رمز بهروز شد' |
568 | password_not_updated_demo: "در حالت نمایشی نمیتوانید رمز کاربر را عوض کنید." | 590 | password_not_updated_demo: "در حالت نمایشی نمیتوانید رمز کاربر را عوض کنید." |
569 | user_updated: 'اطلاعات بهروز شد' | 591 | user_updated: 'اطلاعات بهروز شد' |
570 | rss_updated: 'اطلاعات آر-اس-اس بهروز شد' | 592 | feed_updated: 'اطلاعات آر-اس-اس بهروز شد' |
571 | tagging_rules_updated: 'برچسبگذاری خودکار بهروز شد' | 593 | tagging_rules_updated: 'برچسبگذاری خودکار بهروز شد' |
572 | tagging_rules_deleted: 'قانون برچسبگذاری پاک شد' | 594 | tagging_rules_deleted: 'قانون برچسبگذاری پاک شد' |
573 | rss_token_updated: 'کد آر-اس-اس بهروز شد' | 595 | feed_token_updated: 'کد آر-اس-اس بهروز شد' |
574 | # annotations_reset: Annotations reset | 596 | # annotations_reset: Annotations reset |
575 | # tags_reset: Tags reset | 597 | # tags_reset: Tags reset |
576 | # entries_reset: Entries reset | 598 | # entries_reset: Entries reset |
@@ -588,9 +610,11 @@ flashes: | |||
588 | entry_starred: 'مقاله برگزیده شد' | 610 | entry_starred: 'مقاله برگزیده شد' |
589 | entry_unstarred: 'مقاله نابرگزیده شد' | 611 | entry_unstarred: 'مقاله نابرگزیده شد' |
590 | entry_deleted: 'مقاله پاک شد' | 612 | entry_deleted: 'مقاله پاک شد' |
613 | # no_random_entry: 'No article with these criterias was found' | ||
591 | tag: | 614 | tag: |
592 | notice: | 615 | notice: |
593 | tag_added: 'برچسب افزوده شد' | 616 | tag_added: 'برچسب افزوده شد' |
617 | # tag_renamed: 'Tag renamed' | ||
594 | import: | 618 | import: |
595 | notice: | 619 | notice: |
596 | failed: 'درونریزی شکست خورد. لطفاً دوباره تلاش کنید.' | 620 | failed: 'درونریزی شکست خورد. لطفاً دوباره تلاش کنید.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index b2fa1c50..0b1853a4 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: "Sauvegarder un nouvel article" | 37 | add_new_entry: "Sauvegarder un nouvel article" |
38 | search: "Rechercher" | 38 | search: "Rechercher" |
39 | filter_entries: "Filtrer les articles" | 39 | filter_entries: "Filtrer les articles" |
40 | random_entry: Aller à un article aléatoire de cette liste | ||
40 | export: "Exporter" | 41 | export: "Exporter" |
41 | search_form: | 42 | search_form: |
42 | input_label: "Saisissez votre terme de recherche" | 43 | input_label: "Saisissez votre terme de recherche" |
@@ -53,11 +54,12 @@ config: | |||
53 | page_title: "Configuration" | 54 | page_title: "Configuration" |
54 | tab_menu: | 55 | tab_menu: |
55 | settings: "Paramètres" | 56 | settings: "Paramètres" |
56 | rss: "RSS" | 57 | feed: "Flux" |
57 | user_info: "Mon compte" | 58 | user_info: "Mon compte" |
58 | password: "Mot de passe" | 59 | password: "Mot de passe" |
59 | rules: "Règles de tag automatiques" | 60 | rules: "Règles de tag automatiques" |
60 | new_user: "Créer un compte" | 61 | new_user: "Créer un compte" |
62 | reset: "Réinitialisation" | ||
61 | form: | 63 | form: |
62 | save: "Enregistrer" | 64 | save: "Enregistrer" |
63 | form_settings: | 65 | form_settings: |
@@ -83,25 +85,33 @@ config: | |||
83 | help_reading_speed: "wallabag calcule une durée de lecture pour chaque article. Vous pouvez définir ici, grâce à cette liste déroulante, si vous lisez plus ou moins vite. wallabag recalculera la durée de lecture de chaque article." | 85 | help_reading_speed: "wallabag calcule une durée de lecture pour chaque article. Vous pouvez définir ici, grâce à cette liste déroulante, si vous lisez plus ou moins vite. wallabag recalculera la durée de lecture de chaque article." |
84 | help_language: "Vous pouvez définir la langue de l’interface de wallabag." | 86 | help_language: "Vous pouvez définir la langue de l’interface de wallabag." |
85 | help_pocket_consumer_key: "Nécessaire pour l’import depuis Pocket. Vous pouvez le créer depuis votre compte Pocket." | 87 | help_pocket_consumer_key: "Nécessaire pour l’import depuis Pocket. Vous pouvez le créer depuis votre compte Pocket." |
86 | form_rss: | 88 | form_feed: |
87 | description: "Les flux RSS fournis par wallabag vous permettent de lire vos articles sauvegardés dans votre lecteur de flux préféré. Pour pouvoir les utiliser, vous devez d’abord créer un jeton." | 89 | description: "Les flux Atom fournis par wallabag vous permettent de lire vos articles sauvegardés dans votre lecteur de flux préféré. Pour pouvoir les utiliser, vous devez d’abord créer un jeton." |
88 | token_label: "Jeton RSS" | 90 | token_label: "Jeton de flux" |
89 | no_token: "Aucun jeton généré" | 91 | no_token: "Aucun jeton généré" |
90 | token_create: "Créez votre jeton" | 92 | token_create: "Créez votre jeton" |
91 | token_reset: "Réinitialisez votre jeton" | 93 | token_reset: "Réinitialisez votre jeton" |
92 | rss_links: "Adresses de vos flux RSS" | 94 | feed_links: "Adresses de vos flux" |
93 | rss_link: | 95 | feed_link: |
94 | unread: "Non lus" | 96 | unread: "Non lus" |
95 | starred: "Favoris" | 97 | starred: "Favoris" |
96 | archive: "Lus" | 98 | archive: "Lus" |
97 | all: "Tous" | 99 | all: "Tous" |
98 | rss_limit: "Nombre d’articles dans le flux" | 100 | feed_limit: "Nombre d’articles dans le flux" |
99 | form_user: | 101 | form_user: |
100 | two_factor_description: "Activer l’authentification double-facteur veut dire que vous allez recevoir un code par courriel à chaque nouvelle connexion non approuvée." | 102 | two_factor_description: "Activer l’authentification double-facteur veut dire que vous allez recevoir un code par courriel OU que vous devriez utiliser une application de mot de passe à usage unique (comme Google Authenticator, Authy or FreeOTP) pour obtenir un code temporaire à chaque nouvelle connexion non approuvée. Vous ne pouvez pas choisir les deux options." |
101 | name_label: "Nom" | 103 | name_label: "Nom" |
102 | email_label: "Adresse courriel" | 104 | email_label: "Adresse courriel" |
103 | twoFactorAuthentication_label: "Double authentification" | 105 | two_factor: |
104 | help_twoFactorAuthentication: "Si vous activez 2FA, à chaque tentative de connexion à wallabag, vous recevrez un code par email." | 106 | emailTwoFactor_label: 'En utlisant l’email (recevez un code par email)' |
107 | googleTwoFactor_label: 'En utilisant une application de mot de passe à usage unique (ouvrez l’app, comme Google Authenticator, Authy or FreeOTP, pour obtenir un mot de passe à usage unique)' | ||
108 | table_method: Méthode | ||
109 | table_state: État | ||
110 | table_action: Action | ||
111 | state_enabled: Activé | ||
112 | state_disabled: Désactivé | ||
113 | action_email: Utiliser l'email | ||
114 | action_app: Utiliser une app OTP | ||
105 | delete: | 115 | delete: |
106 | title: "Supprimer mon compte (attention danger !)" | 116 | title: "Supprimer mon compte (attention danger !)" |
107 | description: "Si vous confirmez la suppression de votre compte, TOUS les articles, TOUS les tags, TOUTES les annotations et votre compte seront DÉFINITIVEMENT supprimé (c’est IRRÉVERSIBLE). Vous serez ensuite déconnecté." | 117 | description: "Si vous confirmez la suppression de votre compte, TOUS les articles, TOUS les tags, TOUTES les annotations et votre compte seront DÉFINITIVEMENT supprimé (c’est IRRÉVERSIBLE). Vous serez ensuite déconnecté." |
@@ -159,6 +169,15 @@ config: | |||
159 | and: "Une règle ET l’autre" | 169 | and: "Une règle ET l’autre" |
160 | matches: "Teste si un <i>sujet</i> correspond à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>title matches \"football\"</code>" | 170 | matches: "Teste si un <i>sujet</i> correspond à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>title matches \"football\"</code>" |
161 | notmatches: "Teste si un <i>sujet</i> ne correspond pas à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>title notmatches \"football\"</code>" | 171 | notmatches: "Teste si un <i>sujet</i> ne correspond pas à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>title notmatches \"football\"</code>" |
172 | otp: | ||
173 | page_title: Authentification double-facteur | ||
174 | app: | ||
175 | two_factor_code_description_1: Vous venez d’activer l’authentification double-facteur, ouvrez votre application OTP pour configurer la génération du mot de passe à usage unique. Ces informations disparaîtront après un rechargement de la page. | ||
176 | two_factor_code_description_2: 'Vous pouvez scanner le QR code avec votre application :' | ||
177 | two_factor_code_description_3: 'N’oubliez pas de sauvegarder ces codes de secours dans un endroit sûr, vous pourrez les utiliser si vous ne pouvez plus accéder à votre application OTP :' | ||
178 | two_factor_code_description_4: 'Testez un code généré par votre application OTP :' | ||
179 | cancel: Annuler | ||
180 | enable: Activer | ||
162 | 181 | ||
163 | entry: | 182 | entry: |
164 | default_title: "Titre de l’article" | 183 | default_title: "Titre de l’article" |
@@ -353,7 +372,7 @@ quickstart: | |||
353 | title: "Configurez l’application" | 372 | title: "Configurez l’application" |
354 | description: "Pour voir une application qui vous correspond, allez voir du côté de la configuration de wallabag." | 373 | description: "Pour voir une application qui vous correspond, allez voir du côté de la configuration de wallabag." |
355 | language: "Changez la langue et le design de l’application" | 374 | language: "Changez la langue et le design de l’application" |
356 | rss: "Activez les flux RSS" | 375 | feed: "Activez les flux Atom" |
357 | tagging_rules: "Écrivez des règles pour classer automatiquement vos articles" | 376 | tagging_rules: "Écrivez des règles pour classer automatiquement vos articles" |
358 | admin: | 377 | admin: |
359 | title: "Administration" | 378 | title: "Administration" |
@@ -404,6 +423,8 @@ tag: | |||
404 | new: | 423 | new: |
405 | add: "Ajouter" | 424 | add: "Ajouter" |
406 | placeholder: "Vous pouvez ajouter plusieurs tags, séparés par une virgule." | 425 | placeholder: "Vous pouvez ajouter plusieurs tags, séparés par une virgule." |
426 | rename: | ||
427 | placeholder: 'Vous pouvez changer le nom de votre tag.' | ||
407 | 428 | ||
408 | export: | 429 | export: |
409 | footer_template: '<div style="text-align:center;"><p>Généré par wallabag with %method%</p><p>Merci d''ouvrir <a href="https://github.com/wallabag/wallabag/issues">un ticket</a> si vous rencontrez des soucis d''affichage avec ce document sur votre support.</p></div>' | 430 | footer_template: '<div style="text-align:center;"><p>Généré par wallabag with %method%</p><p>Merci d''ouvrir <a href="https://github.com/wallabag/wallabag/issues">un ticket</a> si vous rencontrez des soucis d''affichage avec ce document sur votre support.</p></div>' |
@@ -530,6 +551,8 @@ user: | |||
530 | enabled_label: "Activé" | 551 | enabled_label: "Activé" |
531 | last_login_label: "Dernière connexion" | 552 | last_login_label: "Dernière connexion" |
532 | twofactor_label: "Double authentification" | 553 | twofactor_label: "Double authentification" |
554 | twofactor_email_label: Double authentification par email | ||
555 | twofactor_google_label: Double authentification par OTP app | ||
533 | save: "Sauvegarder" | 556 | save: "Sauvegarder" |
534 | delete: "Supprimer" | 557 | delete: "Supprimer" |
535 | delete_confirm: "Êtes-vous sûr ?" | 558 | delete_confirm: "Êtes-vous sûr ?" |
@@ -567,14 +590,15 @@ flashes: | |||
567 | password_updated: "Votre mot de passe a bien été mis à jour" | 590 | password_updated: "Votre mot de passe a bien été mis à jour" |
568 | password_not_updated_demo: "En démo, vous ne pouvez pas changer le mot de passe de cet utilisateur." | 591 | password_not_updated_demo: "En démo, vous ne pouvez pas changer le mot de passe de cet utilisateur." |
569 | user_updated: "Vos informations personnelles ont bien été mises à jour" | 592 | user_updated: "Vos informations personnelles ont bien été mises à jour" |
570 | rss_updated: "La configuration des flux RSS a bien été mise à jour" | 593 | feed_updated: "La configuration des flux a bien été mise à jour" |
571 | tagging_rules_updated: "Règles mises à jour" | 594 | tagging_rules_updated: "Règles mises à jour" |
572 | tagging_rules_deleted: "Règle supprimée" | 595 | tagging_rules_deleted: "Règle supprimée" |
573 | rss_token_updated: "Jeton RSS mis à jour" | 596 | feed_token_updated: "Jeton des flux mis à jour" |
574 | annotations_reset: "Annotations supprimées" | 597 | annotations_reset: "Annotations supprimées" |
575 | tags_reset: "Tags supprimés" | 598 | tags_reset: "Tags supprimés" |
576 | entries_reset: "Articles supprimés" | 599 | entries_reset: "Articles supprimés" |
577 | archived_reset: "Articles archivés supprimés" | 600 | archived_reset: "Articles archivés supprimés" |
601 | otp_enabled: "Authentification à double-facteur activée" | ||
578 | entry: | 602 | entry: |
579 | notice: | 603 | notice: |
580 | entry_already_saved: "Article déjà sauvegardé le %date%" | 604 | entry_already_saved: "Article déjà sauvegardé le %date%" |
@@ -588,9 +612,11 @@ flashes: | |||
588 | entry_starred: "Article ajouté dans les favoris" | 612 | entry_starred: "Article ajouté dans les favoris" |
589 | entry_unstarred: "Article retiré des favoris" | 613 | entry_unstarred: "Article retiré des favoris" |
590 | entry_deleted: "Article supprimé" | 614 | entry_deleted: "Article supprimé" |
615 | no_random_entry: "Aucun article correspond aux critères n'a été trouvé" | ||
591 | tag: | 616 | tag: |
592 | notice: | 617 | notice: |
593 | tag_added: "Tag ajouté" | 618 | tag_added: "Tag ajouté" |
619 | tag_renamed: "Tag renommé" | ||
594 | import: | 620 | import: |
595 | notice: | 621 | notice: |
596 | failed: "L’import a échoué, veuillez ré-essayer" | 622 | failed: "L’import a échoué, veuillez ré-essayer" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index ecaa3b60..0474d2bc 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Aggiungi un nuovo contenuto' | 37 | add_new_entry: 'Aggiungi un nuovo contenuto' |
38 | search: 'Cerca' | 38 | search: 'Cerca' |
39 | filter_entries: 'Filtra contenuti' | 39 | filter_entries: 'Filtra contenuti' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | export: 'Esporta' | 41 | export: 'Esporta' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Inserisci qui la tua ricerca' | 43 | input_label: 'Inserisci qui la tua ricerca' |
@@ -53,11 +54,12 @@ config: | |||
53 | page_title: 'Configurazione' | 54 | page_title: 'Configurazione' |
54 | tab_menu: | 55 | tab_menu: |
55 | settings: 'Impostazioni' | 56 | settings: 'Impostazioni' |
56 | rss: 'RSS' | 57 | feed: 'RSS' |
57 | user_info: 'Informazioni utente' | 58 | user_info: 'Informazioni utente' |
58 | password: 'Password' | 59 | password: 'Password' |
59 | rules: 'Regole di etichettatura' | 60 | rules: 'Regole di etichettatura' |
60 | new_user: 'Aggiungi utente' | 61 | new_user: 'Aggiungi utente' |
62 | reset: 'Area di reset' | ||
61 | form: | 63 | form: |
62 | save: 'Salva' | 64 | save: 'Salva' |
63 | form_settings: | 65 | form_settings: |
@@ -83,25 +85,32 @@ config: | |||
83 | help_reading_speed: "wallabag calcola un tempo di lettura per ogni articolo. Puoi definire qui, grazie a questa lista, se sei un lettore lento o veloce. wallabag ricalcolerà la velocità di lettura per ogni articolo." | 85 | help_reading_speed: "wallabag calcola un tempo di lettura per ogni articolo. Puoi definire qui, grazie a questa lista, se sei un lettore lento o veloce. wallabag ricalcolerà la velocità di lettura per ogni articolo." |
84 | help_language: "Puoi cambiare la lingua dell'interfaccia di wallabag." | 86 | help_language: "Puoi cambiare la lingua dell'interfaccia di wallabag." |
85 | help_pocket_consumer_key: "Richiesta per importare da Pocket. La puoi creare nel tuo account Pocket." | 87 | help_pocket_consumer_key: "Richiesta per importare da Pocket. La puoi creare nel tuo account Pocket." |
86 | form_rss: | 88 | form_feed: |
87 | description: 'I feed RSS generati da wallabag ti permettono di leggere i tuoi contenuti salvati con il tuo lettore di RSS preferito. Prima, devi generare un token.' | 89 | description: 'I feed RSS generati da wallabag ti permettono di leggere i tuoi contenuti salvati con il tuo lettore di RSS preferito. Prima, devi generare un token.' |
88 | token_label: 'Token RSS' | 90 | token_label: 'Token RSS' |
89 | no_token: 'Nessun token' | 91 | no_token: 'Nessun token' |
90 | token_create: 'Crea il tuo token' | 92 | token_create: 'Crea il tuo token' |
91 | token_reset: 'Rigenera il tuo token' | 93 | token_reset: 'Rigenera il tuo token' |
92 | rss_links: 'Collegamenti RSS' | 94 | feed_links: 'Collegamenti RSS' |
93 | rss_link: | 95 | feed_link: |
94 | unread: 'Non letti' | 96 | unread: 'Non letti' |
95 | starred: 'Preferiti' | 97 | starred: 'Preferiti' |
96 | archive: 'Archiviati' | 98 | archive: 'Archiviati' |
97 | # all: 'All' | 99 | # all: 'All' |
98 | rss_limit: 'Numero di elementi nel feed' | 100 | feed_limit: 'Numero di elementi nel feed' |
99 | form_user: | 101 | form_user: |
100 | two_factor_description: "Abilitando l'autenticazione a due fattori riceverai una e-mail con un codice per ogni nuova connesione non verificata" | 102 | # 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." |
101 | name_label: 'Nome' | 103 | name_label: 'Nome' |
102 | email_label: 'E-mail' | 104 | email_label: 'E-mail' |
103 | twoFactorAuthentication_label: 'Autenticazione a due fattori' | 105 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
104 | help_twoFactorAuthentication: "Se abiliti l'autenticazione a due fattori, ogni volta che vorrai connetterti a wallabag, riceverai un codice via E-mail." | 106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
107 | # table_method: Method | ||
108 | # table_state: State | ||
109 | # table_action: Action | ||
110 | # state_enabled: Enabled | ||
111 | # state_disabled: Disabled | ||
112 | # action_email: Use email | ||
113 | # action_app: Use OTP App | ||
105 | delete: | 114 | delete: |
106 | title: Cancella il mio account (zona pericolosa) | 115 | title: Cancella il mio account (zona pericolosa) |
107 | description: Rimuovendo il tuo account, TUTTI i tuoi articoli, TUTTE le tue etichette, TUTTE le tue annotazioni ed il tuo account verranno rimossi PERMANENTEMENTE (impossibile da ANNULLARE). Verrai poi disconnesso. | 116 | description: Rimuovendo il tuo account, TUTTI i tuoi articoli, TUTTE le tue etichette, TUTTE le tue annotazioni ed il tuo account verranno rimossi PERMANENTEMENTE (impossibile da ANNULLARE). Verrai poi disconnesso. |
@@ -159,6 +168,15 @@ config: | |||
159 | and: "Una regola E un'altra" | 168 | and: "Una regola E un'altra" |
160 | matches: 'Verifica che un <i>oggetto</i> risulti in una <i>ricerca</i> (case-insensitive).<br />Esempio: <code>titolo contiene "football"</code>' | 169 | matches: 'Verifica che un <i>oggetto</i> risulti in una <i>ricerca</i> (case-insensitive).<br />Esempio: <code>titolo contiene "football"</code>' |
161 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | 170 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' |
171 | otp: | ||
172 | # page_title: Two-factor authentication | ||
173 | # app: | ||
174 | # 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. | ||
175 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
176 | # 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:' | ||
177 | # two_factor_code_description_4: 'Test an OTP code from your configured app:' | ||
178 | # cancel: Cancel | ||
179 | # enable: Enable | ||
162 | 180 | ||
163 | entry: | 181 | entry: |
164 | default_title: "Titolo del contenuto" | 182 | default_title: "Titolo del contenuto" |
@@ -353,7 +371,7 @@ quickstart: | |||
353 | title: "Configura l'applicazione" | 371 | title: "Configura l'applicazione" |
354 | description: "Per avere un'applicazione che ti soddisfi, dai un'occhiata alla configurazione di wallabag." | 372 | description: "Per avere un'applicazione che ti soddisfi, dai un'occhiata alla configurazione di wallabag." |
355 | language: 'Cambia lingua e design' | 373 | language: 'Cambia lingua e design' |
356 | rss: 'Abilita i feed RSS' | 374 | feed: 'Abilita i feed RSS' |
357 | tagging_rules: 'Scrivi delle regole per taggare automaticamente i contenuti' | 375 | tagging_rules: 'Scrivi delle regole per taggare automaticamente i contenuti' |
358 | admin: | 376 | admin: |
359 | title: 'Amministrazione' | 377 | title: 'Amministrazione' |
@@ -404,6 +422,8 @@ tag: | |||
404 | new: | 422 | new: |
405 | add: 'Aggiungi' | 423 | add: 'Aggiungi' |
406 | placeholder: 'Puoi aggiungere varie etichette, separate da una virgola.' | 424 | placeholder: 'Puoi aggiungere varie etichette, separate da una virgola.' |
425 | rename: | ||
426 | # placeholder: 'You can update tag name.' | ||
407 | 427 | ||
408 | # export: | 428 | # export: |
409 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | 429 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' |
@@ -529,7 +549,8 @@ user: | |||
529 | email_label: 'E-mail' | 549 | email_label: 'E-mail' |
530 | enabled_label: 'Abilitato' | 550 | enabled_label: 'Abilitato' |
531 | last_login_label: 'Ultima connessione' | 551 | last_login_label: 'Ultima connessione' |
532 | twofactor_label: Autenticazione a due fattori | 552 | # twofactor_email_label: Two factor authentication by email |
553 | # twofactor_google_label: Two factor authentication by OTP app | ||
533 | save: Salva | 554 | save: Salva |
534 | delete: Cancella | 555 | delete: Cancella |
535 | delete_confirm: Sei sicuro? | 556 | delete_confirm: Sei sicuro? |
@@ -567,10 +588,10 @@ flashes: | |||
567 | password_updated: 'Password aggiornata' | 588 | password_updated: 'Password aggiornata' |
568 | password_not_updated_demo: "In modalità demo, non puoi cambiare la password dell'utente." | 589 | password_not_updated_demo: "In modalità demo, non puoi cambiare la password dell'utente." |
569 | user_updated: 'Informazioni aggiornate' | 590 | user_updated: 'Informazioni aggiornate' |
570 | rss_updated: 'Informazioni RSS aggiornate' | 591 | feed_updated: 'Informazioni RSS aggiornate' |
571 | tagging_rules_updated: 'Regole di etichettatura aggiornate' | 592 | tagging_rules_updated: 'Regole di etichettatura aggiornate' |
572 | tagging_rules_deleted: 'Regola di etichettatura eliminate' | 593 | tagging_rules_deleted: 'Regola di etichettatura eliminate' |
573 | rss_token_updated: 'RSS token aggiornato' | 594 | feed_token_updated: 'RSS token aggiornato' |
574 | annotations_reset: Reset annotazioni | 595 | annotations_reset: Reset annotazioni |
575 | tags_reset: Reset etichette | 596 | tags_reset: Reset etichette |
576 | entries_reset: Reset articoli | 597 | entries_reset: Reset articoli |
@@ -588,9 +609,11 @@ flashes: | |||
588 | entry_starred: 'Contenuto segnato come preferito' | 609 | entry_starred: 'Contenuto segnato come preferito' |
589 | entry_unstarred: 'Contenuto rimosso dai preferiti' | 610 | entry_unstarred: 'Contenuto rimosso dai preferiti' |
590 | entry_deleted: 'Contenuto eliminato' | 611 | entry_deleted: 'Contenuto eliminato' |
612 | # no_random_entry: 'No article with these criterias was found' | ||
591 | tag: | 613 | tag: |
592 | notice: | 614 | notice: |
593 | tag_added: 'Etichetta aggiunta' | 615 | tag_added: 'Etichetta aggiunta' |
616 | # tag_renamed: 'Tag renamed' | ||
594 | import: | 617 | import: |
595 | notice: | 618 | notice: |
596 | failed: 'Importazione fallita, riprova.' | 619 | failed: 'Importazione fallita, riprova.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 848c88d2..e761832e 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Enregistrar un novèl article' | 37 | add_new_entry: 'Enregistrar un novèl article' |
38 | search: 'Cercar' | 38 | search: 'Cercar' |
39 | filter_entries: 'Filtrar los articles' | 39 | filter_entries: 'Filtrar los articles' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | export: 'Exportar' | 41 | export: 'Exportar' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Picatz vòstre mot-clau a cercar aquí' | 43 | input_label: 'Picatz vòstre mot-clau a cercar aquí' |
@@ -53,11 +54,12 @@ config: | |||
53 | page_title: 'Configuracion' | 54 | page_title: 'Configuracion' |
54 | tab_menu: | 55 | tab_menu: |
55 | settings: 'Paramètres' | 56 | settings: 'Paramètres' |
56 | rss: 'RSS' | 57 | feed: 'RSS' |
57 | user_info: 'Mon compte' | 58 | user_info: 'Mon compte' |
58 | password: 'Senhal' | 59 | password: 'Senhal' |
59 | rules: "Règlas d'etiquetas automaticas" | 60 | rules: "Règlas d'etiquetas automaticas" |
60 | new_user: 'Crear un compte' | 61 | new_user: 'Crear un compte' |
62 | reset: 'Zòna de reïnicializacion' | ||
61 | form: | 63 | form: |
62 | save: 'Enregistrar' | 64 | save: 'Enregistrar' |
63 | form_settings: | 65 | form_settings: |
@@ -83,25 +85,32 @@ config: | |||
83 | help_reading_speed: "wallabag calcula lo temps de lectura per cada article. Podètz lo definir aquí, gràcias a aquesta lista, se sètz un legeire rapid o lent. wallabag tornarà calcular lo temps de lectura per cada article." | 85 | help_reading_speed: "wallabag calcula lo temps de lectura per cada article. Podètz lo definir aquí, gràcias a aquesta lista, se sètz un legeire rapid o lent. wallabag tornarà calcular lo temps de lectura per cada article." |
84 | help_language: "Podètz cambiar la lenga de l'interfàcia de wallabag." | 86 | help_language: "Podètz cambiar la lenga de l'interfàcia de wallabag." |
85 | help_pocket_consumer_key: "Requesida per l'importacion de Pocket. Podètz la crear dins vòstre compte Pocket." | 87 | help_pocket_consumer_key: "Requesida per l'importacion de Pocket. Podètz la crear dins vòstre compte Pocket." |
86 | form_rss: | 88 | form_feed: |
87 | description: "Los fluxes RSS fornits per wallabag vos permeton de legir vòstres articles salvagardats dins vòstre lector de fluxes preferit. Per los poder emplegar, vos cal, d'en primièr crear un geton." | 89 | description: "Los fluxes RSS fornits per wallabag vos permeton de legir vòstres articles salvagardats dins vòstre lector de fluxes preferit. Per los poder emplegar, vos cal, d'en primièr crear un geton." |
88 | token_label: 'Geton RSS' | 90 | token_label: 'Geton RSS' |
89 | no_token: 'Pas cap de geton generat' | 91 | no_token: 'Pas cap de geton generat' |
90 | token_create: 'Creatz vòstre geton' | 92 | token_create: 'Creatz vòstre geton' |
91 | token_reset: 'Reïnicializatz vòstre geton' | 93 | token_reset: 'Reïnicializatz vòstre geton' |
92 | rss_links: 'URLs de vòstres fluxes RSS' | 94 | feed_links: 'URLs de vòstres fluxes RSS' |
93 | rss_link: | 95 | feed_link: |
94 | unread: 'Pas legits' | 96 | unread: 'Pas legits' |
95 | starred: 'Favorits' | 97 | starred: 'Favorits' |
96 | archive: 'Legits' | 98 | archive: 'Legits' |
97 | all: 'Totes' | 99 | all: 'Totes' |
98 | rss_limit: "Nombre d'articles dins un flux RSS" | 100 | feed_limit: "Nombre d'articles dins un flux" |
99 | form_user: | 101 | form_user: |
100 | two_factor_description: "Activar l'autentificacion en dos temps vòl dire que recebretz un còdi per corrièl per cada novèla connexion pas aprovada." | 102 | # 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." |
101 | name_label: 'Nom' | 103 | name_label: 'Nom' |
102 | email_label: 'Adreça de corrièl' | 104 | email_label: 'Adreça de corrièl' |
103 | twoFactorAuthentication_label: 'Dobla autentificacion' | 105 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
104 | help_twoFactorAuthentication: "S'avètz activat l'autentificacion en dos temps, cada còp que volètz vos connectar a wallabag, recebretz un còdi per corrièl." | 106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
107 | # table_method: Method | ||
108 | # table_state: State | ||
109 | # table_action: Action | ||
110 | # state_enabled: Enabled | ||
111 | # state_disabled: Disabled | ||
112 | # action_email: Use email | ||
113 | # action_app: Use OTP App | ||
105 | delete: | 114 | delete: |
106 | title: Suprimir mon compte (Mèfi zòna perilhosa) | 115 | title: Suprimir mon compte (Mèfi zòna perilhosa) |
107 | description: Se confirmatz la supression de vòstre compte, TOTES vòstres articles, TOTAS vòstras etiquetas, TOTAS vòstras anotacions e vòstre compte seràn suprimits per totjorn. E aquò es IRREVERSIBLE. Puèi seretz desconnectat. | 116 | description: Se confirmatz la supression de vòstre compte, TOTES vòstres articles, TOTAS vòstras etiquetas, TOTAS vòstras anotacions e vòstre compte seràn suprimits per totjorn. E aquò es IRREVERSIBLE. Puèi seretz desconnectat. |
@@ -159,6 +168,15 @@ config: | |||
159 | and: "Una règla E l'autra" | 168 | and: "Una règla E l'autra" |
160 | matches: 'Teste se un <i>subjècte</i> correspond a una <i>recèrca</i> (non sensibla a la cassa).<br />Exemple : <code>title matches \"football\"</code>' | 169 | matches: 'Teste se un <i>subjècte</i> correspond a una <i>recèrca</i> (non sensibla a la cassa).<br />Exemple : <code>title matches \"football\"</code>' |
161 | notmatches: 'Teste se <i>subjècte</i> correspond pas a una <i>recèrca</i> (sensibla a la cassa).<br />Example : <code>title notmatches "football"</code>' | 170 | notmatches: 'Teste se <i>subjècte</i> correspond pas a una <i>recèrca</i> (sensibla a la cassa).<br />Example : <code>title notmatches "football"</code>' |
171 | otp: | ||
172 | # page_title: Two-factor authentication | ||
173 | # app: | ||
174 | # 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. | ||
175 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
176 | # 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:' | ||
177 | # two_factor_code_description_4: 'Test an OTP code from your configured app:' | ||
178 | # cancel: Cancel | ||
179 | # enable: Enable | ||
162 | 180 | ||
163 | entry: | 181 | entry: |
164 | default_title: "Títol de l'article" | 182 | default_title: "Títol de l'article" |
@@ -353,7 +371,7 @@ quickstart: | |||
353 | title: "Configuratz l'aplicacion" | 371 | title: "Configuratz l'aplicacion" |
354 | description: "Per fin d'aver una aplicacion que vos va ben, anatz veire la configuracion de wallabag." | 372 | description: "Per fin d'aver una aplicacion que vos va ben, anatz veire la configuracion de wallabag." |
355 | language: "Cambiatz la lenga e l'estil de l'aplicacion" | 373 | language: "Cambiatz la lenga e l'estil de l'aplicacion" |
356 | rss: 'Activatz los fluxes RSS' | 374 | feed: 'Activatz los fluxes RSS' |
357 | tagging_rules: 'Escrivètz de règlas per classar automaticament vòstres articles' | 375 | tagging_rules: 'Escrivètz de règlas per classar automaticament vòstres articles' |
358 | admin: | 376 | admin: |
359 | title: 'Administracion' | 377 | title: 'Administracion' |
@@ -404,6 +422,8 @@ tag: | |||
404 | new: | 422 | new: |
405 | add: 'Ajustar' | 423 | add: 'Ajustar' |
406 | placeholder: "Podètz ajustar mai qu'una etiqueta, separadas per de virgula." | 424 | placeholder: "Podètz ajustar mai qu'una etiqueta, separadas per de virgula." |
425 | rename: | ||
426 | # placeholder: 'You can update tag name.' | ||
407 | 427 | ||
408 | export: | 428 | export: |
409 | footer_template: '<div style="text-align:center;"><p>Produch per wallabag amb %method%</p><p>Mercés de dobrir <a href="https://github.com/wallabag/wallabag/issues">una sollicitacion</a> s’avètz de problèmas amb l’afichatge d’aqueste E-Book sus vòstre periferic.</p></div>' | 429 | footer_template: '<div style="text-align:center;"><p>Produch per wallabag amb %method%</p><p>Mercés de dobrir <a href="https://github.com/wallabag/wallabag/issues">una sollicitacion</a> s’avètz de problèmas amb l’afichatge d’aqueste E-Book sus vòstre periferic.</p></div>' |
@@ -529,7 +549,8 @@ user: | |||
529 | email_label: 'Adreça de corrièl' | 549 | email_label: 'Adreça de corrièl' |
530 | enabled_label: 'Actiu' | 550 | enabled_label: 'Actiu' |
531 | last_login_label: 'Darrièra connexion' | 551 | last_login_label: 'Darrièra connexion' |
532 | twofactor_label: 'Autentificacion doble-factor' | 552 | # twofactor_email_label: Two factor authentication by email |
553 | # twofactor_google_label: Two factor authentication by OTP app | ||
533 | save: 'Enregistrar' | 554 | save: 'Enregistrar' |
534 | delete: 'Suprimir' | 555 | delete: 'Suprimir' |
535 | delete_confirm: 'Sètz segur ?' | 556 | delete_confirm: 'Sètz segur ?' |
@@ -567,10 +588,10 @@ flashes: | |||
567 | password_updated: 'Vòstre senhal es ben estat mes a jorn' | 588 | password_updated: 'Vòstre senhal es ben estat mes a jorn' |
568 | password_not_updated_demo: "En demostracion, podètz pas cambiar lo senhal d'aqueste utilizaire." | 589 | password_not_updated_demo: "En demostracion, podètz pas cambiar lo senhal d'aqueste utilizaire." |
569 | user_updated: 'Vòstres informacions personnelas son ben estadas mesas a jorn' | 590 | user_updated: 'Vòstres informacions personnelas son ben estadas mesas a jorn' |
570 | rss_updated: 'La configuracion dels fluxes RSS es ben estada mesa a jorn' | 591 | feed_updated: 'La configuracion dels fluxes RSS es ben estada mesa a jorn' |
571 | tagging_rules_updated: 'Règlas misa a jorn' | 592 | tagging_rules_updated: 'Règlas misa a jorn' |
572 | tagging_rules_deleted: 'Règla suprimida' | 593 | tagging_rules_deleted: 'Règla suprimida' |
573 | rss_token_updated: 'Geton RSS mes a jorn' | 594 | feed_token_updated: 'Geton RSS mes a jorn' |
574 | annotations_reset: Anotacions levadas | 595 | annotations_reset: Anotacions levadas |
575 | tags_reset: Etiquetas levadas | 596 | tags_reset: Etiquetas levadas |
576 | entries_reset: Articles levats | 597 | entries_reset: Articles levats |
@@ -588,9 +609,11 @@ flashes: | |||
588 | entry_starred: 'Article ajustat dins los favorits' | 609 | entry_starred: 'Article ajustat dins los favorits' |
589 | entry_unstarred: 'Article quitat dels favorits' | 610 | entry_unstarred: 'Article quitat dels favorits' |
590 | entry_deleted: 'Article suprimit' | 611 | entry_deleted: 'Article suprimit' |
612 | # no_random_entry: 'No article with these criterias was found' | ||
591 | tag: | 613 | tag: |
592 | notice: | 614 | notice: |
593 | tag_added: 'Etiqueta ajustada' | 615 | tag_added: 'Etiqueta ajustada' |
616 | # tag_renamed: 'Tag renamed' | ||
594 | import: | 617 | import: |
595 | notice: | 618 | notice: |
596 | failed: "L'importacion a fracassat, mercés de tornar ensajar." | 619 | failed: "L'importacion a fracassat, mercés de tornar ensajar." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index a0032fe8..f3d506e5 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Dodaj nowy wpis' | 37 | add_new_entry: 'Dodaj nowy wpis' |
38 | search: 'Szukaj' | 38 | search: 'Szukaj' |
39 | filter_entries: 'Filtruj wpisy' | 39 | filter_entries: 'Filtruj wpisy' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | export: 'Eksportuj' | 41 | export: 'Eksportuj' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Wpisz swoje zapytanie tutaj' | 43 | input_label: 'Wpisz swoje zapytanie tutaj' |
@@ -53,11 +54,12 @@ config: | |||
53 | page_title: 'Konfiguracja' | 54 | page_title: 'Konfiguracja' |
54 | tab_menu: | 55 | tab_menu: |
55 | settings: 'Ustawienia' | 56 | settings: 'Ustawienia' |
56 | rss: 'Kanał RSS' | 57 | feed: 'Kanał RSS' |
57 | user_info: 'Informacje o użytkowniku' | 58 | user_info: 'Informacje o użytkowniku' |
58 | password: 'Hasło' | 59 | password: 'Hasło' |
59 | rules: 'Zasady tagowania' | 60 | rules: 'Zasady tagowania' |
60 | new_user: 'Dodaj użytkownika' | 61 | new_user: 'Dodaj użytkownika' |
62 | reset: 'Reset' | ||
61 | form: | 63 | form: |
62 | save: 'Zapisz' | 64 | save: 'Zapisz' |
63 | form_settings: | 65 | form_settings: |
@@ -83,25 +85,32 @@ config: | |||
83 | help_reading_speed: "wallabag oblicza czas czytania każdego artykułu. Dzięki tej liście możesz określić swoje tempo. Wallabag przeliczy ponownie czas potrzebny, na przeczytanie każdego z artykułów." | 85 | help_reading_speed: "wallabag oblicza czas czytania każdego artykułu. Dzięki tej liście możesz określić swoje tempo. Wallabag przeliczy ponownie czas potrzebny, na przeczytanie każdego z artykułów." |
84 | help_language: "Możesz zmienić język interfejsu wallabag." | 86 | help_language: "Możesz zmienić język interfejsu wallabag." |
85 | help_pocket_consumer_key: "Wymagane dla importu z Pocket. Możesz go stworzyć na swoim koncie Pocket." | 87 | help_pocket_consumer_key: "Wymagane dla importu z Pocket. Możesz go stworzyć na swoim koncie Pocket." |
86 | form_rss: | 88 | form_feed: |
87 | description: 'Kanały RSS prowadzone przez wallabag pozwalają Ci na czytanie twoich zapisanych artykułów w twoim ulubionym czytniku RSS. Musisz najpierw wynegenerować tokena.' | 89 | description: 'Kanały RSS prowadzone przez wallabag pozwalają Ci na czytanie twoich zapisanych artykułów w twoim ulubionym czytniku RSS. Musisz najpierw wynegenerować tokena.' |
88 | token_label: 'Token RSS' | 90 | token_label: 'Token RSS' |
89 | no_token: 'Brak tokena' | 91 | no_token: 'Brak tokena' |
90 | token_create: 'Stwórz tokena' | 92 | token_create: 'Stwórz tokena' |
91 | token_reset: 'Zresetuj swojego tokena' | 93 | token_reset: 'Zresetuj swojego tokena' |
92 | rss_links: 'RSS links' | 94 | feed_links: 'RSS links' |
93 | rss_link: | 95 | feed_link: |
94 | unread: 'Nieprzeczytane' | 96 | unread: 'Nieprzeczytane' |
95 | starred: 'Oznaczone gwiazdką' | 97 | starred: 'Oznaczone gwiazdką' |
96 | archive: 'Archiwum' | 98 | archive: 'Archiwum' |
97 | all: 'Wszystkie' | 99 | all: 'Wszystkie' |
98 | rss_limit: 'Link do RSS' | 100 | feed_limit: 'Link do RSS' |
99 | form_user: | 101 | form_user: |
100 | two_factor_description: "Włączenie autoryzacji dwuetapowej oznacza, że będziesz otrzymywał maile z kodem przy każdym nowym, niezaufanym połączeniu" | 102 | # 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." |
101 | name_label: 'Nazwa' | 103 | name_label: 'Nazwa' |
102 | email_label: 'Adres email' | 104 | email_label: 'Adres email' |
103 | twoFactorAuthentication_label: 'Autoryzacja dwuetapowa' | 105 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
104 | help_twoFactorAuthentication: "Jeżeli włączysz autoryzację dwuetapową. Za każdym razem, kiedy będziesz chciał się zalogować, dostaniesz kod na swój e-mail." | 106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
107 | # table_method: Method | ||
108 | # table_state: State | ||
109 | # table_action: Action | ||
110 | # state_enabled: Enabled | ||
111 | # state_disabled: Disabled | ||
112 | # action_email: Use email | ||
113 | # action_app: Use OTP App | ||
105 | delete: | 114 | delete: |
106 | title: Usuń moje konto (niebezpieczna strefa !) | 115 | title: Usuń moje konto (niebezpieczna strefa !) |
107 | description: Jeżeli usuniesz swoje konto, wszystkie twoje artykuły, tagi, adnotacje, oraz konto zostaną trwale usunięte (operacja jest NIEODWRACALNA). Następnie zostaniesz wylogowany. | 116 | description: Jeżeli usuniesz swoje konto, wszystkie twoje artykuły, tagi, adnotacje, oraz konto zostaną trwale usunięte (operacja jest NIEODWRACALNA). Następnie zostaniesz wylogowany. |
@@ -159,6 +168,15 @@ config: | |||
159 | and: 'Jedna reguła I inna' | 168 | and: 'Jedna reguła I inna' |
160 | matches: 'Sprawdź czy <i>temat</i> pasuje <i>szukaj</i> (duże lub małe litery).<br />Przykład: <code>tytuł zawiera "piłka nożna"</code>' | 169 | matches: 'Sprawdź czy <i>temat</i> pasuje <i>szukaj</i> (duże lub małe litery).<br />Przykład: <code>tytuł zawiera "piłka nożna"</code>' |
161 | notmatches: 'Sprawdź czy <i>temat</i> nie zawiera <i>szukaj</i> (duże lub małe litery).<br />Przykład: <code>tytuł nie zawiera "piłka nożna"</code>' | 170 | notmatches: 'Sprawdź czy <i>temat</i> nie zawiera <i>szukaj</i> (duże lub małe litery).<br />Przykład: <code>tytuł nie zawiera "piłka nożna"</code>' |
171 | otp: | ||
172 | # page_title: Two-factor authentication | ||
173 | # app: | ||
174 | # 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. | ||
175 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
176 | # 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:' | ||
177 | # two_factor_code_description_4: 'Test an OTP code from your configured app:' | ||
178 | # cancel: Cancel | ||
179 | # enable: Enable | ||
162 | 180 | ||
163 | entry: | 181 | entry: |
164 | default_title: 'Tytuł wpisu' | 182 | default_title: 'Tytuł wpisu' |
@@ -353,7 +371,7 @@ quickstart: | |||
353 | title: 'Konfiguruj aplikację' | 371 | title: 'Konfiguruj aplikację' |
354 | description: 'W celu dopasowania aplikacji do swoich upodobań, zobacz konfigurację aplikacji' | 372 | description: 'W celu dopasowania aplikacji do swoich upodobań, zobacz konfigurację aplikacji' |
355 | language: 'Zmień język i wygląd' | 373 | language: 'Zmień język i wygląd' |
356 | rss: 'Włącz kanały RSS' | 374 | feed: 'Włącz kanały RSS' |
357 | tagging_rules: 'Napisz reguły pozwalające na automatyczne otagowanie twoich artykułów' | 375 | tagging_rules: 'Napisz reguły pozwalające na automatyczne otagowanie twoich artykułów' |
358 | admin: | 376 | admin: |
359 | title: 'Administracja' | 377 | title: 'Administracja' |
@@ -404,6 +422,8 @@ tag: | |||
404 | new: | 422 | new: |
405 | add: 'Dodaj' | 423 | add: 'Dodaj' |
406 | placeholder: 'Możesz dodać kilka tagów, oddzielając je przecinkami.' | 424 | placeholder: 'Możesz dodać kilka tagów, oddzielając je przecinkami.' |
425 | rename: | ||
426 | placeholder: 'Możesz zaktualizować nazwę taga.' | ||
407 | 427 | ||
408 | export: | 428 | export: |
409 | footer_template: '<div style="text-align:center;"><p>Stworzone przez wallabag z %method%</p><p>Proszę zgłoś <a href="https://github.com/wallabag/wallabag/issues">sprawę</a>, jeżeli masz problem z wyświetleniem tego e-booka na swoim urządzeniu.</p></div>' | 429 | footer_template: '<div style="text-align:center;"><p>Stworzone przez wallabag z %method%</p><p>Proszę zgłoś <a href="https://github.com/wallabag/wallabag/issues">sprawę</a>, jeżeli masz problem z wyświetleniem tego e-booka na swoim urządzeniu.</p></div>' |
@@ -529,7 +549,8 @@ user: | |||
529 | email_label: 'Adres email' | 549 | email_label: 'Adres email' |
530 | enabled_label: 'Włączony' | 550 | enabled_label: 'Włączony' |
531 | last_login_label: 'Ostatnie logowanie' | 551 | last_login_label: 'Ostatnie logowanie' |
532 | twofactor_label: Autoryzacja dwuetapowa | 552 | # twofactor_email_label: Two factor authentication by email |
553 | # twofactor_google_label: Two factor authentication by OTP app | ||
533 | save: Zapisz | 554 | save: Zapisz |
534 | delete: Usuń | 555 | delete: Usuń |
535 | delete_confirm: Jesteś pewien? | 556 | delete_confirm: Jesteś pewien? |
@@ -567,10 +588,10 @@ flashes: | |||
567 | password_updated: 'Hasło zaktualizowane' | 588 | password_updated: 'Hasło zaktualizowane' |
568 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." | 589 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." |
569 | user_updated: 'Informacje zaktualizowane' | 590 | user_updated: 'Informacje zaktualizowane' |
570 | rss_updated: 'Informacje RSS zaktualizowane' | 591 | feed_updated: 'Informacje RSS zaktualizowane' |
571 | tagging_rules_updated: 'Reguły tagowania zaktualizowane' | 592 | tagging_rules_updated: 'Reguły tagowania zaktualizowane' |
572 | tagging_rules_deleted: 'Reguła tagowania usunięta' | 593 | tagging_rules_deleted: 'Reguła tagowania usunięta' |
573 | rss_token_updated: 'Token kanału RSS zaktualizowany' | 594 | feed_token_updated: 'Token kanału RSS zaktualizowany' |
574 | annotations_reset: Zresetuj adnotacje | 595 | annotations_reset: Zresetuj adnotacje |
575 | tags_reset: Zresetuj tagi | 596 | tags_reset: Zresetuj tagi |
576 | entries_reset: Zresetuj wpisy | 597 | entries_reset: Zresetuj wpisy |
@@ -588,9 +609,11 @@ flashes: | |||
588 | entry_starred: 'Wpis oznaczony gwiazdką' | 609 | entry_starred: 'Wpis oznaczony gwiazdką' |
589 | entry_unstarred: 'Wpis odznaczony gwiazdką' | 610 | entry_unstarred: 'Wpis odznaczony gwiazdką' |
590 | entry_deleted: 'Wpis usunięty' | 611 | entry_deleted: 'Wpis usunięty' |
612 | # no_random_entry: 'No article with these criterias was found' | ||
591 | tag: | 613 | tag: |
592 | notice: | 614 | notice: |
593 | tag_added: 'Tag dodany' | 615 | tag_added: 'Tag dodany' |
616 | tag_renamed: 'Nazwa taga zmieniona' | ||
594 | import: | 617 | import: |
595 | notice: | 618 | notice: |
596 | failed: 'Nieudany import, prosimy spróbować ponownie.' | 619 | failed: 'Nieudany import, prosimy spróbować ponownie.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 292fad61..6ddc1fc1 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Adicionar uma nova entrada' | 37 | add_new_entry: 'Adicionar uma nova entrada' |
38 | search: 'Pesquisa' | 38 | search: 'Pesquisa' |
39 | filter_entries: 'Filtrar entradas' | 39 | filter_entries: 'Filtrar entradas' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | export: 'Exportar' | 41 | export: 'Exportar' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Digite aqui sua pesquisa' | 43 | input_label: 'Digite aqui sua pesquisa' |
@@ -53,11 +54,12 @@ config: | |||
53 | page_title: 'Config' | 54 | page_title: 'Config' |
54 | tab_menu: | 55 | tab_menu: |
55 | settings: 'Configurações' | 56 | settings: 'Configurações' |
56 | rss: 'RSS' | 57 | feed: 'RSS' |
57 | user_info: 'Informação do Usuário' | 58 | user_info: 'Informação do Usuário' |
58 | password: 'Senha' | 59 | password: 'Senha' |
59 | rules: 'Regras de tags' | 60 | rules: 'Regras de tags' |
60 | new_user: 'Adicionar um usuário' | 61 | new_user: 'Adicionar um usuário' |
62 | # reset: 'Reset area' | ||
61 | form: | 63 | form: |
62 | save: 'Salvar' | 64 | save: 'Salvar' |
63 | form_settings: | 65 | form_settings: |
@@ -83,25 +85,32 @@ 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." | 85 | # 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." | 86 | # 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." | 87 | # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." |
86 | form_rss: | 88 | form_feed: |
87 | description: 'Feeds RSS providos pelo wallabag permitem que você leia seus artigos salvos em seu leitor de RSS favorito. Você precisa gerar um token primeiro.' | 89 | description: 'Feeds RSS providos pelo wallabag permitem que você leia seus artigos salvos em seu leitor de RSS favorito. Você precisa gerar um token primeiro.' |
88 | token_label: 'Token RSS' | 90 | token_label: 'Token RSS' |
89 | no_token: 'Nenhum Token' | 91 | no_token: 'Nenhum Token' |
90 | token_create: 'Criar seu token' | 92 | token_create: 'Criar seu token' |
91 | token_reset: 'Gerar novamente seu token' | 93 | token_reset: 'Gerar novamente seu token' |
92 | rss_links: 'Links RSS' | 94 | feed_links: 'Links RSS' |
93 | rss_link: | 95 | feed_link: |
94 | unread: 'Não lido' | 96 | unread: 'Não lido' |
95 | starred: 'Destacado' | 97 | starred: 'Destacado' |
96 | archive: 'Arquivado' | 98 | archive: 'Arquivado' |
97 | # all: 'All' | 99 | # all: 'All' |
98 | rss_limit: 'Número de itens no feed' | 100 | feed_limit: 'Número de itens no feed' |
99 | form_user: | 101 | form_user: |
100 | two_factor_description: 'Habilitar autenticação de dois passos significa que você receberá um e-mail com um código a cada nova conexão desconhecida.' | 102 | # 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." |
101 | name_label: 'Nome' | 103 | name_label: 'Nome' |
102 | email_label: 'E-mail' | 104 | email_label: 'E-mail' |
103 | twoFactorAuthentication_label: 'Autenticação de dois passos' | 105 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
104 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." | 106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
107 | # table_method: Method | ||
108 | # table_state: State | ||
109 | # table_action: Action | ||
110 | # state_enabled: Enabled | ||
111 | # state_disabled: Disabled | ||
112 | # action_email: Use email | ||
113 | # action_app: Use OTP App | ||
105 | delete: | 114 | delete: |
106 | # title: Delete my account (a.k.a danger zone) | 115 | # title: Delete my account (a.k.a danger zone) |
107 | # 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. | 116 | # 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. |
@@ -159,6 +168,15 @@ config: | |||
159 | and: 'Uma regra E outra' | 168 | and: 'Uma regra E outra' |
160 | matches: 'Testa que um <i>assunto</i> corresponde a uma <i>pesquisa</i> (maiúscula ou minúscula).<br />Exemplo: <code>título corresponde a "futebol"</code>' | 169 | matches: 'Testa que um <i>assunto</i> corresponde a uma <i>pesquisa</i> (maiúscula ou minúscula).<br />Exemplo: <code>título corresponde a "futebol"</code>' |
161 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | 170 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' |
171 | otp: | ||
172 | # page_title: Two-factor authentication | ||
173 | # app: | ||
174 | # 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. | ||
175 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
176 | # 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:' | ||
177 | # two_factor_code_description_4: 'Test an OTP code from your configured app:' | ||
178 | # cancel: Cancel | ||
179 | # enable: Enable | ||
162 | 180 | ||
163 | entry: | 181 | entry: |
164 | default_title: 'Título da entrada' | 182 | default_title: 'Título da entrada' |
@@ -353,7 +371,7 @@ quickstart: | |||
353 | title: 'Configurar a aplicação' | 371 | title: 'Configurar a aplicação' |
354 | description: 'Para ter uma aplicação que atende você, dê uma olhada na configuração do wallabag.' | 372 | description: 'Para ter uma aplicação que atende você, dê uma olhada na configuração do wallabag.' |
355 | language: 'Alterar idioma e design' | 373 | language: 'Alterar idioma e design' |
356 | rss: 'Habilitar feeds RSS' | 374 | feed: 'Habilitar feeds RSS' |
357 | tagging_rules: 'Escrever regras para acrescentar tags automaticamente em seus artigos' | 375 | tagging_rules: 'Escrever regras para acrescentar tags automaticamente em seus artigos' |
358 | admin: | 376 | admin: |
359 | title: 'Administração' | 377 | title: 'Administração' |
@@ -404,6 +422,8 @@ tag: | |||
404 | new: | 422 | new: |
405 | # add: 'Add' | 423 | # add: 'Add' |
406 | # placeholder: 'You can add several tags, separated by a comma.' | 424 | # placeholder: 'You can add several tags, separated by a comma.' |
425 | rename: | ||
426 | # placeholder: 'You can update tag name.' | ||
407 | 427 | ||
408 | # export: | 428 | # export: |
409 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | 429 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' |
@@ -529,7 +549,8 @@ user: | |||
529 | email_label: 'E-mail' | 549 | email_label: 'E-mail' |
530 | enabled_label: 'Habilitado' | 550 | enabled_label: 'Habilitado' |
531 | last_login_label: 'Último login' | 551 | last_login_label: 'Último login' |
532 | twofactor_label: 'Autenticação de dois passos' | 552 | # twofactor_email_label: Two factor authentication by email |
553 | # twofactor_google_label: Two factor authentication by OTP app | ||
533 | save: 'Salvar' | 554 | save: 'Salvar' |
534 | delete: 'Apagar' | 555 | delete: 'Apagar' |
535 | delete_confirm: 'Tem certeza?' | 556 | delete_confirm: 'Tem certeza?' |
@@ -567,10 +588,10 @@ flashes: | |||
567 | password_updated: 'Senha atualizada' | 588 | password_updated: 'Senha atualizada' |
568 | password_not_updated_demo: 'Em modo de demonstração, você não pode alterar a senha deste usuário.' | 589 | password_not_updated_demo: 'Em modo de demonstração, você não pode alterar a senha deste usuário.' |
569 | # user_updated: 'Information updated' | 590 | # user_updated: 'Information updated' |
570 | rss_updated: 'Informação de RSS atualizada' | 591 | feed_updated: 'Informação de RSS atualizada' |
571 | tagging_rules_updated: 'Regras de tags atualizadas' | 592 | tagging_rules_updated: 'Regras de tags atualizadas' |
572 | tagging_rules_deleted: 'Regra de tag apagada' | 593 | tagging_rules_deleted: 'Regra de tag apagada' |
573 | rss_token_updated: 'Token RSS atualizado' | 594 | feed_token_updated: 'Token RSS atualizado' |
574 | # annotations_reset: Annotations reset | 595 | # annotations_reset: Annotations reset |
575 | # tags_reset: Tags reset | 596 | # tags_reset: Tags reset |
576 | # entries_reset: Entries reset | 597 | # entries_reset: Entries reset |
@@ -588,9 +609,11 @@ flashes: | |||
588 | entry_starred: 'Entrada destacada' | 609 | entry_starred: 'Entrada destacada' |
589 | entry_unstarred: 'Entrada não destacada' | 610 | entry_unstarred: 'Entrada não destacada' |
590 | entry_deleted: 'Entrada apagada' | 611 | entry_deleted: 'Entrada apagada' |
612 | # no_random_entry: 'No article with these criterias was found' | ||
591 | tag: | 613 | tag: |
592 | notice: | 614 | notice: |
593 | tag_added: 'Tag adicionada' | 615 | tag_added: 'Tag adicionada' |
616 | # tag_renamed: 'Tag renamed' | ||
594 | import: | 617 | import: |
595 | notice: | 618 | notice: |
596 | failed: 'Importação falhou, por favor tente novamente.' | 619 | failed: 'Importação falhou, por favor tente novamente.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 9e8d68b3..8c0791f0 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Introdu un nou articol' | 37 | add_new_entry: 'Introdu un nou articol' |
38 | search: 'Căutare' | 38 | search: 'Căutare' |
39 | filter_entries: 'Filtrează articolele' | 39 | filter_entries: 'Filtrează articolele' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | # export: 'Export' | 41 | # export: 'Export' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Introdu căutarea ta' | 43 | input_label: 'Introdu căutarea ta' |
@@ -53,11 +54,12 @@ config: | |||
53 | page_title: 'Configurație' | 54 | page_title: 'Configurație' |
54 | tab_menu: | 55 | tab_menu: |
55 | settings: 'Setări' | 56 | settings: 'Setări' |
56 | rss: 'RSS' | 57 | feed: 'RSS' |
57 | user_info: 'Informații despre utilizator' | 58 | user_info: 'Informații despre utilizator' |
58 | password: 'Parolă' | 59 | password: 'Parolă' |
59 | # rules: 'Tagging rules' | 60 | # rules: 'Tagging rules' |
60 | new_user: 'Crează un utilizator' | 61 | new_user: 'Crează un utilizator' |
62 | # reset: 'Reset area' | ||
61 | form: | 63 | form: |
62 | save: 'Salvează' | 64 | save: 'Salvează' |
63 | form_settings: | 65 | form_settings: |
@@ -83,25 +85,32 @@ 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." | 85 | # 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." | 86 | # 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." | 87 | # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." |
86 | form_rss: | 88 | form_feed: |
87 | description: 'Feed-urile RSS oferite de wallabag îți permit să-ți citești articolele salvate în reader-ul tău preferat RSS.' | 89 | description: 'Feed-urile RSS oferite de wallabag îți permit să-ți citești articolele salvate în reader-ul tău preferat RSS.' |
88 | token_label: 'RSS-Token' | 90 | token_label: 'RSS-Token' |
89 | no_token: 'Fără token' | 91 | no_token: 'Fără token' |
90 | token_create: 'Crează-ți token' | 92 | token_create: 'Crează-ți token' |
91 | token_reset: 'Resetează-ți token-ul' | 93 | token_reset: 'Resetează-ți token-ul' |
92 | rss_links: 'Link-uri RSS' | 94 | feed_links: 'Link-uri RSS' |
93 | rss_link: | 95 | feed_link: |
94 | unread: 'Unread' | 96 | unread: 'Unread' |
95 | starred: 'Starred' | 97 | starred: 'Starred' |
96 | archive: 'Archived' | 98 | archive: 'Archived' |
97 | # all: 'All' | 99 | # all: 'All' |
98 | rss_limit: 'Limită RSS' | 100 | feed_limit: 'Limită RSS' |
99 | form_user: | 101 | form_user: |
100 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion" | 102 | # 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." |
101 | name_label: 'Nume' | 103 | name_label: 'Nume' |
102 | email_label: 'E-mail' | 104 | email_label: 'E-mail' |
103 | # twoFactorAuthentication_label: 'Two factor authentication' | 105 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
104 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." | 106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
107 | # table_method: Method | ||
108 | # table_state: State | ||
109 | # table_action: Action | ||
110 | # state_enabled: Enabled | ||
111 | # state_disabled: Disabled | ||
112 | # action_email: Use email | ||
113 | # action_app: Use OTP App | ||
105 | delete: | 114 | delete: |
106 | # title: Delete my account (a.k.a danger zone) | 115 | # title: Delete my account (a.k.a danger zone) |
107 | # 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. | 116 | # 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. |
@@ -159,6 +168,15 @@ config: | |||
159 | # and: 'One rule AND another' | 168 | # and: 'One rule AND another' |
160 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' | 169 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' |
161 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | 170 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' |
171 | otp: | ||
172 | # page_title: Two-factor authentication | ||
173 | # app: | ||
174 | # 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. | ||
175 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
176 | # 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:' | ||
177 | # two_factor_code_description_4: 'Test an OTP code from your configured app:' | ||
178 | # cancel: Cancel | ||
179 | # enable: Enable | ||
162 | 180 | ||
163 | entry: | 181 | entry: |
164 | # default_title: 'Title of the entry' | 182 | # default_title: 'Title of the entry' |
@@ -353,7 +371,7 @@ quickstart: | |||
353 | # title: 'Configure the application' | 371 | # title: 'Configure the application' |
354 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | 372 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' |
355 | # language: 'Change language and design' | 373 | # language: 'Change language and design' |
356 | # rss: 'Enable RSS feeds' | 374 | # feed: 'Enable RSS feeds' |
357 | # tagging_rules: 'Write rules to automatically tag your articles' | 375 | # tagging_rules: 'Write rules to automatically tag your articles' |
358 | # admin: | 376 | # admin: |
359 | # title: 'Administration' | 377 | # title: 'Administration' |
@@ -404,6 +422,8 @@ tag: | |||
404 | new: | 422 | new: |
405 | # add: 'Add' | 423 | # add: 'Add' |
406 | # placeholder: 'You can add several tags, separated by a comma.' | 424 | # placeholder: 'You can add several tags, separated by a comma.' |
425 | rename: | ||
426 | # placeholder: 'You can update tag name.' | ||
407 | 427 | ||
408 | # export: | 428 | # export: |
409 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | 429 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' |
@@ -529,7 +549,8 @@ user: | |||
529 | email_label: 'E-mail' | 549 | email_label: 'E-mail' |
530 | # enabled_label: 'Enabled' | 550 | # enabled_label: 'Enabled' |
531 | # last_login_label: 'Last login' | 551 | # last_login_label: 'Last login' |
532 | # twofactor_label: Two factor authentication | 552 | # twofactor_email_label: Two factor authentication by email |
553 | # twofactor_google_label: Two factor authentication by OTP app | ||
533 | # save: Save | 554 | # save: Save |
534 | # delete: Delete | 555 | # delete: Delete |
535 | # delete_confirm: Are you sure? | 556 | # delete_confirm: Are you sure? |
@@ -567,10 +588,10 @@ flashes: | |||
567 | password_updated: 'Parolă actualizată' | 588 | password_updated: 'Parolă actualizată' |
568 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." | 589 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." |
569 | user_updated: 'Informație actualizată' | 590 | user_updated: 'Informație actualizată' |
570 | rss_updated: 'Informație RSS actualizată' | 591 | feed_updated: 'Informație RSS actualizată' |
571 | # tagging_rules_updated: 'Tagging rules updated' | 592 | # tagging_rules_updated: 'Tagging rules updated' |
572 | # tagging_rules_deleted: 'Tagging rule deleted' | 593 | # tagging_rules_deleted: 'Tagging rule deleted' |
573 | # rss_token_updated: 'RSS token updated' | 594 | # feed_token_updated: 'RSS token updated' |
574 | # annotations_reset: Annotations reset | 595 | # annotations_reset: Annotations reset |
575 | # tags_reset: Tags reset | 596 | # tags_reset: Tags reset |
576 | # entries_reset: Entries reset | 597 | # entries_reset: Entries reset |
@@ -588,9 +609,11 @@ flashes: | |||
588 | entry_starred: 'Articol adăugat la favorite' | 609 | entry_starred: 'Articol adăugat la favorite' |
589 | entry_unstarred: 'Articol șters de la favorite' | 610 | entry_unstarred: 'Articol șters de la favorite' |
590 | entry_deleted: 'Articol șters' | 611 | entry_deleted: 'Articol șters' |
612 | # no_random_entry: 'No article with these criterias was found' | ||
591 | tag: | 613 | tag: |
592 | notice: | 614 | notice: |
593 | # tag_added: 'Tag added' | 615 | # tag_added: 'Tag added' |
616 | # tag_renamed: 'Tag renamed' | ||
594 | import: | 617 | import: |
595 | notice: | 618 | notice: |
596 | # failed: 'Import failed, please try again.' | 619 | # failed: 'Import failed, please try again.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml index 48753b55..2ee2d83a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml | |||
@@ -36,6 +36,7 @@ menu: | |||
36 | add_new_entry: 'Добавить новую запись' | 36 | add_new_entry: 'Добавить новую запись' |
37 | search: 'Поиск' | 37 | search: 'Поиск' |
38 | filter_entries: 'Фильтр записей' | 38 | filter_entries: 'Фильтр записей' |
39 | # random_entry: Jump to a random entry from that list | ||
39 | export: 'Экспорт' | 40 | export: 'Экспорт' |
40 | search_form: | 41 | search_form: |
41 | input_label: 'Введите текст для поиска' | 42 | input_label: 'Введите текст для поиска' |
@@ -52,11 +53,12 @@ config: | |||
52 | page_title: 'Настройки' | 53 | page_title: 'Настройки' |
53 | tab_menu: | 54 | tab_menu: |
54 | settings: 'Настройки' | 55 | settings: 'Настройки' |
55 | rss: 'RSS' | 56 | feed: 'RSS' |
56 | user_info: 'Информация о пользователе' | 57 | user_info: 'Информация о пользователе' |
57 | password: 'Пароль' | 58 | password: 'Пароль' |
58 | rules: 'Правила настройки простановки тегов' | 59 | rules: 'Правила настройки простановки тегов' |
59 | new_user: 'Добавить пользователя' | 60 | new_user: 'Добавить пользователя' |
61 | reset: 'Сброс данных' | ||
60 | form: | 62 | form: |
61 | save: 'Сохранить' | 63 | save: 'Сохранить' |
62 | form_settings: | 64 | form_settings: |
@@ -81,24 +83,31 @@ config: | |||
81 | help_reading_speed: "wallabag посчитает сколько времени занимает чтение каждой записи. Вы можете определить здесь, как быстро вы читаете. wallabag пересчитает время чтения для каждой записи." | 83 | help_reading_speed: "wallabag посчитает сколько времени занимает чтение каждой записи. Вы можете определить здесь, как быстро вы читаете. wallabag пересчитает время чтения для каждой записи." |
82 | help_language: "Вы можете изменить язык интерфейса wallabag." | 84 | help_language: "Вы можете изменить язык интерфейса wallabag." |
83 | help_pocket_consumer_key: "Обязательно для импорта из Pocket. Вы можете создать это в Вашем аккаунте на Pocket." | 85 | help_pocket_consumer_key: "Обязательно для импорта из Pocket. Вы можете создать это в Вашем аккаунте на Pocket." |
84 | form_rss: | 86 | form_feed: |
85 | description: 'RSS фид созданный с помощью wallabag позволяет читать Ваши записи через Ваш любимый RSS агрегатор. Для начала Вам потребуется создать ключ.' | 87 | description: 'RSS фид созданный с помощью wallabag позволяет читать Ваши записи через Ваш любимый RSS агрегатор. Для начала Вам потребуется создать ключ.' |
86 | token_label: 'RSS ключ' | 88 | token_label: 'RSS ключ' |
87 | no_token: 'Ключ не задан' | 89 | no_token: 'Ключ не задан' |
88 | token_create: 'Создать ключ' | 90 | token_create: 'Создать ключ' |
89 | token_reset: 'Пересоздать ключ' | 91 | token_reset: 'Пересоздать ключ' |
90 | rss_links: 'ссылка на RSS' | 92 | feed_links: 'ссылка на RSS' |
91 | rss_link: | 93 | feed_link: |
92 | unread: 'непрочитанные' | 94 | unread: 'непрочитанные' |
93 | starred: 'помеченные' | 95 | starred: 'помеченные' |
94 | archive: 'архивные' | 96 | archive: 'архивные' |
95 | rss_limit: 'Количество записей в фиде' | 97 | feed_limit: 'Количество записей в фиде' |
96 | form_user: | 98 | form_user: |
97 | two_factor_description: "Включить двухфакторную аутентификацию, Вы получите сообщение на указанный email с кодом, при каждом новом непроверенном подключении." | 99 | # 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." |
98 | name_label: 'Имя' | 100 | name_label: 'Имя' |
99 | email_label: 'Email' | 101 | email_label: 'Email' |
100 | twoFactorAuthentication_label: 'Двухфакторная аутентификация' | 102 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
101 | help_twoFactorAuthentication: "Если Вы включите двухфакторную аутентификацию, то Вы будете получать код на указанный ранее email, каждый раз при входе в wallabag." | 103 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
104 | # table_method: Method | ||
105 | # table_state: State | ||
106 | # table_action: Action | ||
107 | # state_enabled: Enabled | ||
108 | # state_disabled: Disabled | ||
109 | # action_email: Use email | ||
110 | # action_app: Use OTP App | ||
102 | delete: | 111 | delete: |
103 | title: "Удалить мой аккаунт (или опасная зона)" | 112 | title: "Удалить мой аккаунт (или опасная зона)" |
104 | description: "Если Вы удалите ваш аккаунт, ВСЕ ваши записи, теги и другие данные, будут БЕЗВОЗВРАТНО удалены (операция не может быть отменена после). Затем Вы выйдете из системы." | 113 | description: "Если Вы удалите ваш аккаунт, ВСЕ ваши записи, теги и другие данные, будут БЕЗВОЗВРАТНО удалены (операция не может быть отменена после). Затем Вы выйдете из системы." |
@@ -154,6 +163,15 @@ config: | |||
154 | or: 'Одно правило ИЛИ другое' | 163 | or: 'Одно правило ИЛИ другое' |
155 | and: 'Одно правило И другое' | 164 | and: 'Одно правило И другое' |
156 | matches: 'Тесты, в которых <i> тема </i> соответствует <i> поиску </i> (без учета регистра). Пример: <code> title matches "футбол" </code>' | 165 | matches: 'Тесты, в которых <i> тема </i> соответствует <i> поиску </i> (без учета регистра). Пример: <code> title matches "футбол" </code>' |
166 | otp: | ||
167 | # page_title: Two-factor authentication | ||
168 | # app: | ||
169 | # 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. | ||
170 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
171 | # 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:' | ||
172 | # two_factor_code_description_4: 'Test an OTP code from your configured app:' | ||
173 | # cancel: Cancel | ||
174 | # enable: Enable | ||
157 | 175 | ||
158 | entry: | 176 | entry: |
159 | default_title: 'Название записи' | 177 | default_title: 'Название записи' |
@@ -341,7 +359,7 @@ quickstart: | |||
341 | title: 'Настроить приложение' | 359 | title: 'Настроить приложение' |
342 | description: 'Чтобы иметь приложение, которое вам подходит, ознакомьтесь с конфигурацией wallabag.' | 360 | description: 'Чтобы иметь приложение, которое вам подходит, ознакомьтесь с конфигурацией wallabag.' |
343 | language: 'Выбрать язык и дизайн' | 361 | language: 'Выбрать язык и дизайн' |
344 | rss: 'Включить RSS фид' | 362 | feed: 'Включить RSS фид' |
345 | tagging_rules: 'Создать правило для автоматической установки тегов' | 363 | tagging_rules: 'Создать правило для автоматической установки тегов' |
346 | admin: | 364 | admin: |
347 | title: 'Администрирование' | 365 | title: 'Администрирование' |
@@ -392,6 +410,8 @@ tag: | |||
392 | new: | 410 | new: |
393 | add: 'Добавить' | 411 | add: 'Добавить' |
394 | placeholder: 'Вы можете добавить несколько тегов, разделенных запятой.' | 412 | placeholder: 'Вы можете добавить несколько тегов, разделенных запятой.' |
413 | rename: | ||
414 | # placeholder: 'You can update tag name.' | ||
395 | 415 | ||
396 | # export: | 416 | # export: |
397 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | 417 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' |
@@ -517,7 +537,8 @@ user: | |||
517 | email_label: 'Email' | 537 | email_label: 'Email' |
518 | enabled_label: 'Включить' | 538 | enabled_label: 'Включить' |
519 | last_login_label: 'Последний вход' | 539 | last_login_label: 'Последний вход' |
520 | twofactor_label: "Двухфакторная аутентификация" | 540 | # twofactor_email_label: Two factor authentication by email |
541 | # twofactor_google_label: Two factor authentication by OTP app | ||
521 | save: "Сохранить" | 542 | save: "Сохранить" |
522 | delete: "Удалить" | 543 | delete: "Удалить" |
523 | delete_confirm: "Вы уверены?" | 544 | delete_confirm: "Вы уверены?" |
@@ -533,10 +554,10 @@ flashes: | |||
533 | password_updated: 'Пароль обновлен' | 554 | password_updated: 'Пароль обновлен' |
534 | password_not_updated_demo: "В режиме демонстрации нельзя изменять пароль для этого пользователя." | 555 | password_not_updated_demo: "В режиме демонстрации нельзя изменять пароль для этого пользователя." |
535 | user_updated: 'Информация обновлена' | 556 | user_updated: 'Информация обновлена' |
536 | rss_updated: 'RSS информация обновлена' | 557 | feed_updated: 'RSS информация обновлена' |
537 | tagging_rules_updated: 'Правила тегировния обновлены' | 558 | tagging_rules_updated: 'Правила тегировния обновлены' |
538 | tagging_rules_deleted: 'Правила тегировния удалены' | 559 | tagging_rules_deleted: 'Правила тегировния удалены' |
539 | rss_token_updated: 'RSS ключ обновлен' | 560 | feed_token_updated: 'RSS ключ обновлен' |
540 | annotations_reset: "Аннотации сброшены" | 561 | annotations_reset: "Аннотации сброшены" |
541 | tags_reset: "Теги сброшены" | 562 | tags_reset: "Теги сброшены" |
542 | entries_reset: "Записи сброшены" | 563 | entries_reset: "Записи сброшены" |
@@ -553,9 +574,11 @@ flashes: | |||
553 | entry_starred: 'Запись помечена звездочкой' | 574 | entry_starred: 'Запись помечена звездочкой' |
554 | entry_unstarred: 'Пометка звездочкой у записи убрана' | 575 | entry_unstarred: 'Пометка звездочкой у записи убрана' |
555 | entry_deleted: 'Запись удалена' | 576 | entry_deleted: 'Запись удалена' |
577 | # no_random_entry: 'No article with these criterias was found' | ||
556 | tag: | 578 | tag: |
557 | notice: | 579 | notice: |
558 | tag_added: 'Тег добавлен' | 580 | tag_added: 'Тег добавлен' |
581 | # tag_renamed: 'Tag renamed' | ||
559 | import: | 582 | import: |
560 | notice: | 583 | notice: |
561 | failed: 'Во время импорта произошла ошибка, повторите попытку.' | 584 | failed: 'Во время импорта произошла ошибка, повторите попытку.' |
@@ -573,4 +596,4 @@ flashes: | |||
573 | notice: | 596 | notice: |
574 | added: 'Пользователь "%username%" добавлен' | 597 | added: 'Пользователь "%username%" добавлен' |
575 | updated: 'Пользователь "%username%" обновлен' | 598 | updated: 'Пользователь "%username%" обновлен' |
576 | deleted: 'Пользователь "%username%" удален' \ No newline at end of file | 599 | deleted: 'Пользователь "%username%" удален' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml index cb3b0f23..967ae427 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'เพิ่มรายการใหม่' | 37 | add_new_entry: 'เพิ่มรายการใหม่' |
38 | search: 'ค้นหา' | 38 | search: 'ค้นหา' |
39 | filter_entries: 'ตัวกรองรายการ' | 39 | filter_entries: 'ตัวกรองรายการ' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | export: 'นำข้อมูลออก' | 41 | export: 'นำข้อมูลออก' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'ค้นหาที่นี้' | 43 | input_label: 'ค้นหาที่นี้' |
@@ -53,11 +54,12 @@ config: | |||
53 | page_title: 'กำหนดค่า' | 54 | page_title: 'กำหนดค่า' |
54 | tab_menu: | 55 | tab_menu: |
55 | settings: 'ตั้งค่า' | 56 | settings: 'ตั้งค่า' |
56 | rss: 'RSS' | 57 | feed: 'RSS' |
57 | user_info: 'ข้อมูลผู้ใช้' | 58 | user_info: 'ข้อมูลผู้ใช้' |
58 | password: 'รหัสผ่าน' | 59 | password: 'รหัสผ่าน' |
59 | rules: 'การแท็กข้อบังคับ' | 60 | rules: 'การแท็กข้อบังคับ' |
60 | new_user: 'เพิ่มผู้ใช้' | 61 | new_user: 'เพิ่มผู้ใช้' |
62 | reset: 'รีเซ็ตพื้นที่ ' | ||
61 | form: | 63 | form: |
62 | save: 'บันทึก' | 64 | save: 'บันทึก' |
63 | form_settings: | 65 | form_settings: |
@@ -83,25 +85,32 @@ config: | |||
83 | help_reading_speed: "wallabag จะคำนวณเวลาการอ่านในแต่ละรายการซึ่งคุณสามารถกำหนดได้ที่นี้,ต้องขอบคุณรายการนี้,หากคุณเป็นนักอ่านที่เร็วหรือช้า wallabag จะทำการคำนวณเวลาที่อ่านใหม่ในแต่ละรายการ" | 85 | help_reading_speed: "wallabag จะคำนวณเวลาการอ่านในแต่ละรายการซึ่งคุณสามารถกำหนดได้ที่นี้,ต้องขอบคุณรายการนี้,หากคุณเป็นนักอ่านที่เร็วหรือช้า wallabag จะทำการคำนวณเวลาที่อ่านใหม่ในแต่ละรายการ" |
84 | help_language: "คุณสามารถเปลี่ยภาษาของ wallabag interface ได้" | 86 | help_language: "คุณสามารถเปลี่ยภาษาของ wallabag interface ได้" |
85 | help_pocket_consumer_key: "การ้องขอการเก็บการนำข้อมูลเข้า คุณสามารถสร้างบัญชีการเก็บของคุณ" | 87 | help_pocket_consumer_key: "การ้องขอการเก็บการนำข้อมูลเข้า คุณสามารถสร้างบัญชีการเก็บของคุณ" |
86 | form_rss: | 88 | form_feed: |
87 | description: 'RSS จะเก็บเงื่อนไขโดย wallabag ต้องยอมรับการอ่านรายการของคุณกับผู้อ่านที่ชอบ RSS คุณต้องทำเครื่องหมายก่อน' | 89 | description: 'RSS จะเก็บเงื่อนไขโดย wallabag ต้องยอมรับการอ่านรายการของคุณกับผู้อ่านที่ชอบ RSS คุณต้องทำเครื่องหมายก่อน' |
88 | token_label: 'เครื่องหมาย RSS' | 90 | token_label: 'เครื่องหมาย RSS' |
89 | no_token: 'ไม่มีเครื่องหมาย' | 91 | no_token: 'ไม่มีเครื่องหมาย' |
90 | token_create: 'สร้างเครื่องหมาย' | 92 | token_create: 'สร้างเครื่องหมาย' |
91 | token_reset: 'ทำเครื่องหมาย' | 93 | token_reset: 'ทำเครื่องหมาย' |
92 | rss_links: 'ลิงค์ RSS' | 94 | feed_links: 'ลิงค์ RSS' |
93 | rss_link: | 95 | feed_link: |
94 | unread: 'ยังไมได้่อ่าน' | 96 | unread: 'ยังไมได้่อ่าน' |
95 | starred: 'ทำการแสดง' | 97 | starred: 'ทำการแสดง' |
96 | archive: 'เอกสาร' | 98 | archive: 'เอกสาร' |
97 | all: 'ทั้งหมด' | 99 | all: 'ทั้งหมด' |
98 | rss_limit: 'จำนวนไอเทมที่เก็บ' | 100 | feed_limit: 'จำนวนไอเทมที่เก็บ' |
99 | form_user: | 101 | form_user: |
100 | two_factor_description: "การเปิดใช้งาน two factor authentication คือคุณจะต้องได้รับอีเมลกับ code ที่ยังไม่ตรวจสอบในการเชื่อมต่อ" | 102 | # 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." |
101 | name_label: 'ชื่อ' | 103 | name_label: 'ชื่อ' |
102 | email_label: 'อีเมล' | 104 | email_label: 'อีเมล' |
103 | twoFactorAuthentication_label: 'Two factor authentication' | 105 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
104 | help_twoFactorAuthentication: "ถ้าคุณเปิด 2FA, ในแต่ละช่วงเวลาที่คุณต้องการลงชื่อเข้าใช wallabag, คุณจะต้องได้รับ code จากอีเมล" | 106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
107 | # table_method: Method | ||
108 | # table_state: State | ||
109 | # table_action: Action | ||
110 | # state_enabled: Enabled | ||
111 | # state_disabled: Disabled | ||
112 | # action_email: Use email | ||
113 | # action_app: Use OTP App | ||
105 | delete: | 114 | delete: |
106 | title: ลบบัญชีของฉัน (โซนที่เป็นภัย!) | 115 | title: ลบบัญชีของฉัน (โซนที่เป็นภัย!) |
107 | description: ถ้าคุณลบบัญชีของคุณIf , รายการทั้งหมดของคุณ, แท็กทั้งหมดของคุณ, หมายเหตุทั้งหมดของคุณและบัญชีของคุณจะถูกลบอย่างถาวร (มันไม่สามารถยกเลิกได้) คุณจะต้องลงชื่อออก | 116 | description: ถ้าคุณลบบัญชีของคุณIf , รายการทั้งหมดของคุณ, แท็กทั้งหมดของคุณ, หมายเหตุทั้งหมดของคุณและบัญชีของคุณจะถูกลบอย่างถาวร (มันไม่สามารถยกเลิกได้) คุณจะต้องลงชื่อออก |
@@ -159,6 +168,15 @@ config: | |||
159 | and: 'หนึ่งข้อบังคับและอื่นๆ' | 168 | and: 'หนึ่งข้อบังคับและอื่นๆ' |
160 | matches: 'ทดสอบว่า <i>เรื่อง</i> นี้ตรงกับ <i>การต้นหา</i> (กรณีไม่ทราบ).<br />ตัวอย่าง: <code>หัวข้อที่ตรงกับ "football"</code>' | 169 | matches: 'ทดสอบว่า <i>เรื่อง</i> นี้ตรงกับ <i>การต้นหา</i> (กรณีไม่ทราบ).<br />ตัวอย่าง: <code>หัวข้อที่ตรงกับ "football"</code>' |
161 | notmatches: 'ทดสอบว่า <i>เรื่อง</i> นี้ไม่ตรงกับ <i>การต้นหา</i> (กรณีไม่ทราบ).<br />ตัวอย่าง: <code>หัวข้อทีไม่ตรงกับ "football"</code>' | 170 | notmatches: 'ทดสอบว่า <i>เรื่อง</i> นี้ไม่ตรงกับ <i>การต้นหา</i> (กรณีไม่ทราบ).<br />ตัวอย่าง: <code>หัวข้อทีไม่ตรงกับ "football"</code>' |
171 | otp: | ||
172 | # page_title: Two-factor authentication | ||
173 | # app: | ||
174 | # 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. | ||
175 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
176 | # 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:' | ||
177 | # two_factor_code_description_4: 'Test an OTP code from your configured app:' | ||
178 | # cancel: Cancel | ||
179 | # enable: Enable | ||
162 | 180 | ||
163 | entry: | 181 | entry: |
164 | default_title: 'หัวข้อรายการ' | 182 | default_title: 'หัวข้อรายการ' |
@@ -351,7 +369,7 @@ quickstart: | |||
351 | title: 'กำหนดค่าแอพพลิเคชั่น' | 369 | title: 'กำหนดค่าแอพพลิเคชั่น' |
352 | description: 'ภายใน order จะมี application suit ของคุณ, จะมองหาองค์ประกอบของ wallabag' | 370 | description: 'ภายใน order จะมี application suit ของคุณ, จะมองหาองค์ประกอบของ wallabag' |
353 | language: 'เปลี่ยนภาษาและออกแบบ' | 371 | language: 'เปลี่ยนภาษาและออกแบบ' |
354 | rss: 'เปิดใช้ RSS' | 372 | feed: 'เปิดใช้ RSS' |
355 | tagging_rules: 'เขียนข้อบังคับการแท็กอัตโนมัติของบทความของคุณ' | 373 | tagging_rules: 'เขียนข้อบังคับการแท็กอัตโนมัติของบทความของคุณ' |
356 | admin: | 374 | admin: |
357 | title: 'ผู้ดูแลระบบ' | 375 | title: 'ผู้ดูแลระบบ' |
@@ -402,6 +420,8 @@ tag: | |||
402 | new: | 420 | new: |
403 | add: 'เพิ่ม' | 421 | add: 'เพิ่ม' |
404 | placeholder: 'คุณสามารถเพิ่มได้หลายแท็ก, จากการแบ่งโดย comma' | 422 | placeholder: 'คุณสามารถเพิ่มได้หลายแท็ก, จากการแบ่งโดย comma' |
423 | rename: | ||
424 | # placeholder: 'You can update tag name.' | ||
405 | 425 | ||
406 | export: | 426 | export: |
407 | footer_template: '<div style="text-align:center;"><p>ผลิตโดย wallabag กับ %method%</p><p>ให้ทำการเปิด <a href="https://github.com/wallabag/wallabag/issues">ฉบับนี้</a> ถ้าคุณมีข้อบกพร่องif you have trouble with the display of this E-Book on your device.</p></div>' | 427 | footer_template: '<div style="text-align:center;"><p>ผลิตโดย wallabag กับ %method%</p><p>ให้ทำการเปิด <a href="https://github.com/wallabag/wallabag/issues">ฉบับนี้</a> ถ้าคุณมีข้อบกพร่องif you have trouble with the display of this E-Book on your device.</p></div>' |
@@ -527,7 +547,8 @@ user: | |||
527 | email_label: 'อีเมล' | 547 | email_label: 'อีเมล' |
528 | enabled_label: 'เปิดใช้งาน' | 548 | enabled_label: 'เปิดใช้งาน' |
529 | last_login_label: 'ลงชื้อเข้าใช้ครั้งสุดท้าย' | 549 | last_login_label: 'ลงชื้อเข้าใช้ครั้งสุดท้าย' |
530 | twofactor_label: Two factor authentication | 550 | # twofactor_email_label: Two factor authentication by email |
551 | # twofactor_google_label: Two factor authentication by OTP app | ||
531 | save: บันทึก | 552 | save: บันทึก |
532 | delete: ลบ | 553 | delete: ลบ |
533 | delete_confirm: ตุณแน่ใจหรือไม่? | 554 | delete_confirm: ตุณแน่ใจหรือไม่? |
@@ -565,10 +586,10 @@ flashes: | |||
565 | password_updated: 'อัปเดตรหัสผ่าน' | 586 | password_updated: 'อัปเดตรหัสผ่าน' |
566 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." | 587 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." |
567 | user_updated: 'อัปเดตข้อมูล' | 588 | user_updated: 'อัปเดตข้อมูล' |
568 | rss_updated: 'อัปเดตข้อมูล RSS' | 589 | feed_updated: 'อัปเดตข้อมูล RSS' |
569 | tagging_rules_updated: 'อัปเดตการแท็กข้อบังคับ' | 590 | tagging_rules_updated: 'อัปเดตการแท็กข้อบังคับ' |
570 | tagging_rules_deleted: 'การลบข้อบังคับของแท็ก' | 591 | tagging_rules_deleted: 'การลบข้อบังคับของแท็ก' |
571 | rss_token_updated: 'อัปเดตเครื่องหมาย RSS ' | 592 | feed_token_updated: 'อัปเดตเครื่องหมาย RSS ' |
572 | annotations_reset: รีเซ็ตหมายเหตุ | 593 | annotations_reset: รีเซ็ตหมายเหตุ |
573 | tags_reset: รีเซ็ตแท็ก | 594 | tags_reset: รีเซ็ตแท็ก |
574 | entries_reset: รีเซ็ตรายการ | 595 | entries_reset: รีเซ็ตรายการ |
@@ -586,9 +607,11 @@ flashes: | |||
586 | entry_starred: 'รายการที่แสดง' | 607 | entry_starred: 'รายการที่แสดง' |
587 | entry_unstarred: 'รายการที่ไม่ได้แสดง' | 608 | entry_unstarred: 'รายการที่ไม่ได้แสดง' |
588 | entry_deleted: 'รายการที่ถูกลบ' | 609 | entry_deleted: 'รายการที่ถูกลบ' |
610 | # no_random_entry: 'No article with these criterias was found' | ||
589 | tag: | 611 | tag: |
590 | notice: | 612 | notice: |
591 | tag_added: 'แท็กที่เพิ่ม' | 613 | tag_added: 'แท็กที่เพิ่ม' |
614 | # tag_renamed: 'Tag renamed' | ||
592 | import: | 615 | import: |
593 | notice: | 616 | notice: |
594 | failed: 'นำข้อมูลเข้าล้มเหลว, ลองใหม่อีกครั้ง' | 617 | failed: 'นำข้อมูลเข้าล้มเหลว, ลองใหม่อีกครั้ง' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index e2156d47..2f86f25d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Yeni bir makale ekle' | 37 | add_new_entry: 'Yeni bir makale ekle' |
38 | search: 'Ara' | 38 | search: 'Ara' |
39 | filter_entries: 'Filtrele' | 39 | filter_entries: 'Filtrele' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | export: 'Dışa Aktar' | 41 | export: 'Dışa Aktar' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Aramak istediğiniz herhangi bir şey yazın' | 43 | input_label: 'Aramak istediğiniz herhangi bir şey yazın' |
@@ -53,11 +54,12 @@ config: | |||
53 | page_title: 'Yapılandırma' | 54 | page_title: 'Yapılandırma' |
54 | tab_menu: | 55 | tab_menu: |
55 | settings: 'Ayarlar' | 56 | settings: 'Ayarlar' |
56 | rss: 'RSS' | 57 | feed: 'RSS' |
57 | user_info: 'Kullanıcı bilgileri' | 58 | user_info: 'Kullanıcı bilgileri' |
58 | password: 'Şifre' | 59 | password: 'Şifre' |
59 | rules: 'Etiketleme kuralları' | 60 | rules: 'Etiketleme kuralları' |
60 | new_user: 'Bir kullanıcı ekle' | 61 | new_user: 'Bir kullanıcı ekle' |
62 | # reset: 'Reset area' | ||
61 | form: | 63 | form: |
62 | save: 'Kaydet' | 64 | save: 'Kaydet' |
63 | form_settings: | 65 | form_settings: |
@@ -83,25 +85,32 @@ 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." | 85 | # 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." | 86 | # 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." | 87 | # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." |
86 | form_rss: | 88 | form_feed: |
87 | description: 'wallabag RSS akışı kaydetmiş olduğunuz makalelerini favori RSS okuyucunuzda görüntülemenizi sağlar. Bunu yapabilmek için öncelikle belirteç (token) oluşturmalısınız.' | 89 | description: 'wallabag RSS akışı kaydetmiş olduğunuz makalelerini favori RSS okuyucunuzda görüntülemenizi sağlar. Bunu yapabilmek için öncelikle belirteç (token) oluşturmalısınız.' |
88 | token_label: 'RSS belirteci (token)' | 90 | token_label: 'RSS belirteci (token)' |
89 | no_token: 'Belirteç (token) yok' | 91 | no_token: 'Belirteç (token) yok' |
90 | token_create: 'Yeni belirteç (token) oluştur' | 92 | token_create: 'Yeni belirteç (token) oluştur' |
91 | token_reset: 'Belirteci (token) sıfırla' | 93 | token_reset: 'Belirteci (token) sıfırla' |
92 | rss_links: 'RSS akış bağlantıları' | 94 | feed_links: 'RSS akış bağlantıları' |
93 | rss_link: | 95 | feed_link: |
94 | unread: 'Okunmayan' | 96 | unread: 'Okunmayan' |
95 | starred: 'Favoriler' | 97 | starred: 'Favoriler' |
96 | archive: 'Arşiv' | 98 | archive: 'Arşiv' |
97 | # all: 'All' | 99 | # all: 'All' |
98 | rss_limit: 'RSS içeriğinden talep edilecek makale limiti' | 100 | feed_limit: 'RSS içeriğinden talep edilecek makale limiti' |
99 | form_user: | 101 | form_user: |
100 | two_factor_description: "İki adımlı doğrulamayı aktifleştirdiğinizde, her yeni güvenilmeyen bağlantılarda size e-posta ile bir kod alacaksınız." | 102 | # 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." |
101 | name_label: 'İsim' | 103 | name_label: 'İsim' |
102 | email_label: 'E-posta' | 104 | email_label: 'E-posta' |
103 | twoFactorAuthentication_label: 'İki adımlı doğrulama' | 105 | # emailTwoFactor_label: 'Using email (receive a code by email)' |
104 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." | 106 | # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)' |
107 | # table_method: Method | ||
108 | # table_state: State | ||
109 | # table_action: Action | ||
110 | # state_enabled: Enabled | ||
111 | # state_disabled: Disabled | ||
112 | # action_email: Use email | ||
113 | # action_app: Use OTP App | ||
105 | delete: | 114 | delete: |
106 | # title: Delete my account (a.k.a danger zone) | 115 | # title: Delete my account (a.k.a danger zone) |
107 | # 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. | 116 | # 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. |
@@ -159,6 +168,15 @@ config: | |||
159 | and: 'Bir kural ve diğeri' | 168 | and: 'Bir kural ve diğeri' |
160 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' | 169 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' |
161 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | 170 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' |
171 | otp: | ||
172 | # page_title: Two-factor authentication | ||
173 | # app: | ||
174 | # 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. | ||
175 | # two_factor_code_description_2: 'You can scan that QR Code with your app:' | ||
176 | # 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:' | ||
177 | # two_factor_code_description_4: 'Test an OTP code from your configured app:' | ||
178 | # cancel: Cancel | ||
179 | # enable: Enable | ||
162 | 180 | ||
163 | entry: | 181 | entry: |
164 | default_title: 'Makalenin başlığı' | 182 | default_title: 'Makalenin başlığı' |
@@ -351,7 +369,7 @@ quickstart: | |||
351 | title: 'Uygulamayı Yapılandırma' | 369 | title: 'Uygulamayı Yapılandırma' |
352 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | 370 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' |
353 | language: 'Dili ve tasarımı değiştirme' | 371 | language: 'Dili ve tasarımı değiştirme' |
354 | rss: 'RSS akışını aktifleştirme' | 372 | feed: 'RSS akışını aktifleştirme' |
355 | # tagging_rules: 'Write rules to automatically tag your articles' | 373 | # tagging_rules: 'Write rules to automatically tag your articles' |
356 | admin: | 374 | admin: |
357 | # title: 'Administration' | 375 | # title: 'Administration' |
@@ -402,6 +420,8 @@ tag: | |||
402 | new: | 420 | new: |
403 | # add: 'Add' | 421 | # add: 'Add' |
404 | # placeholder: 'You can add several tags, separated by a comma.' | 422 | # placeholder: 'You can add several tags, separated by a comma.' |
423 | rename: | ||
424 | # placeholder: 'You can update tag name.' | ||
405 | 425 | ||
406 | # export: | 426 | # export: |
407 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | 427 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' |
@@ -527,7 +547,8 @@ user: | |||
527 | email_label: 'E-posta' | 547 | email_label: 'E-posta' |
528 | # enabled_label: 'Enabled' | 548 | # enabled_label: 'Enabled' |
529 | # last_login_label: 'Last login' | 549 | # last_login_label: 'Last login' |
530 | # twofactor_label: Two factor authentication | 550 | # twofactor_email_label: Two factor authentication by email |
551 | # twofactor_google_label: Two factor authentication by OTP app | ||
531 | # save: Save | 552 | # save: Save |
532 | # delete: Delete | 553 | # delete: Delete |
533 | # delete_confirm: Are you sure? | 554 | # delete_confirm: Are you sure? |
@@ -545,10 +566,10 @@ flashes: | |||
545 | password_updated: 'Şifre güncellendi' | 566 | password_updated: 'Şifre güncellendi' |
546 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." | 567 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." |
547 | user_updated: 'Bilgiler güncellendi' | 568 | user_updated: 'Bilgiler güncellendi' |
548 | rss_updated: 'RSS bilgiler güncellendi' | 569 | feed_updated: 'RSS bilgiler güncellendi' |
549 | tagging_rules_updated: 'Tagging rules updated' | 570 | tagging_rules_updated: 'Tagging rules updated' |
550 | tagging_rules_deleted: 'Tagging rule deleted' | 571 | tagging_rules_deleted: 'Tagging rule deleted' |
551 | rss_token_updated: 'RSS token updated' | 572 | feed_token_updated: 'RSS token updated' |
552 | # annotations_reset: Annotations reset | 573 | # annotations_reset: Annotations reset |
553 | # tags_reset: Tags reset | 574 | # tags_reset: Tags reset |
554 | # entries_reset: Entries reset | 575 | # entries_reset: Entries reset |
@@ -566,9 +587,11 @@ flashes: | |||
566 | entry_starred: 'Makale favorilere eklendi' | 587 | entry_starred: 'Makale favorilere eklendi' |
567 | entry_unstarred: 'Makale favorilerden çıkartıldı' | 588 | entry_unstarred: 'Makale favorilerden çıkartıldı' |
568 | entry_deleted: 'Makale silindi' | 589 | entry_deleted: 'Makale silindi' |
590 | # no_random_entry: 'No article with these criterias was found' | ||
569 | tag: | 591 | tag: |
570 | notice: | 592 | notice: |
571 | tag_added: 'Etiket eklendi' | 593 | tag_added: 'Etiket eklendi' |
594 | # tag_renamed: 'Tag renamed' | ||
572 | import: | 595 | import: |
573 | notice: | 596 | notice: |
574 | # failed: 'Import failed, please try again.' | 597 | # failed: 'Import failed, please try again.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml index c6a84209..c0438978 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: 'Adgangskoden skal være mindst 8 tegn' | 3 | password_too_short: 'Adgangskoden skal være mindst 8 tegn' |
4 | # password_wrong_value: 'Wrong value for your current password' | 4 | # password_wrong_value: 'Wrong value for your current password' |
5 | # item_per_page_too_high: 'This will certainly kill the app' | 5 | # item_per_page_too_high: 'This will certainly kill the app' |
6 | # rss_limit_too_high: 'This will certainly kill the app' | 6 | # feed_limit_too_high: 'This will certainly kill the app' |
7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' | 7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml index 907b67a5..4c675ef4 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml | |||
@@ -3,6 +3,5 @@ validator: | |||
3 | password_too_short: 'Kennwort-Mindestlänge von acht Zeichen nicht erfüllt' | 3 | password_too_short: 'Kennwort-Mindestlänge von acht Zeichen nicht erfüllt' |
4 | password_wrong_value: 'Falscher Wert für dein aktuelles Kennwort' | 4 | password_wrong_value: 'Falscher Wert für dein aktuelles Kennwort' |
5 | item_per_page_too_high: 'Dies wird die Anwendung möglicherweise beenden' | 5 | item_per_page_too_high: 'Dies wird die Anwendung möglicherweise beenden' |
6 | rss_limit_too_high: 'Dies wird die Anwendung möglicherweise beenden' | 6 | feed_limit_too_high: 'Dies wird die Anwendung möglicherweise beenden' |
7 | quote_length_too_high: 'Das Zitat ist zu lang. Es sollte nicht mehr als {{ limit }} Zeichen enthalten.' | 7 | quote_length_too_high: 'Das Zitat ist zu lang. Es sollte nicht mehr als {{ limit }} Zeichen enthalten.' |
8 | |||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml index 8cc117fe..89d4c68a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: 'Password should by at least 8 chars long' | 3 | password_too_short: 'Password should by at least 8 chars long' |
4 | password_wrong_value: 'Wrong value for your current password' | 4 | password_wrong_value: 'Wrong value for your current password' |
5 | item_per_page_too_high: 'This will certainly kill the app' | 5 | item_per_page_too_high: 'This will certainly kill the app' |
6 | rss_limit_too_high: 'This will certainly kill the app' | 6 | feed_limit_too_high: 'This will certainly kill the app' |
7 | quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' | 7 | quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml index 97a8edfa..ba34ee76 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: 'La contraseña debe tener al menos 8 carácteres' | 3 | password_too_short: 'La contraseña debe tener al menos 8 carácteres' |
4 | password_wrong_value: 'Entrada equivocada para su contraseña actual' | 4 | password_wrong_value: 'Entrada equivocada para su contraseña actual' |
5 | item_per_page_too_high: 'Esto matará la aplicación' | 5 | item_per_page_too_high: 'Esto matará la aplicación' |
6 | rss_limit_too_high: 'Esto matará la aplicación' | 6 | feed_limit_too_high: 'Esto matará la aplicación' |
7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' | 7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml index ef677525..9b1a4af2 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: 'رمز شما باید ۸ حرف یا بیشتر باشد' | 3 | password_too_short: 'رمز شما باید ۸ حرف یا بیشتر باشد' |
4 | password_wrong_value: 'رمز فعلی را اشتباه وارد کردهاید' | 4 | password_wrong_value: 'رمز فعلی را اشتباه وارد کردهاید' |
5 | item_per_page_too_high: 'با این تعداد برنامه به فنا میرود' | 5 | item_per_page_too_high: 'با این تعداد برنامه به فنا میرود' |
6 | rss_limit_too_high: 'با این تعداد برنامه به فنا میرود' | 6 | feed_limit_too_high: 'با این تعداد برنامه به فنا میرود' |
7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' | 7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml index f31b4ed2..92f69aa0 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: "Le mot de passe doit contenir au moins 8 caractères" | 3 | password_too_short: "Le mot de passe doit contenir au moins 8 caractères" |
4 | password_wrong_value: "Votre mot de passe actuel est faux" | 4 | password_wrong_value: "Votre mot de passe actuel est faux" |
5 | item_per_page_too_high: "Ça ne va pas plaire à l’application" | 5 | item_per_page_too_high: "Ça ne va pas plaire à l’application" |
6 | rss_limit_too_high: "Ça ne va pas plaire à l’application" | 6 | feed_limit_too_high: "Ça ne va pas plaire à l’application" |
7 | quote_length_too_high: "La citation est trop longue. Elle doit avoir au maximum {{ limit }} caractères." | 7 | quote_length_too_high: "La citation est trop longue. Elle doit avoir au maximum {{ limit }} caractères." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml index d949cc3b..b20d6f51 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: 'La password deve essere lunga almeno 8 caratteri' | 3 | password_too_short: 'La password deve essere lunga almeno 8 caratteri' |
4 | password_wrong_value: 'Valore inserito per la password corrente errato' | 4 | password_wrong_value: 'Valore inserito per la password corrente errato' |
5 | item_per_page_too_high: 'Questo valore è troppo alto' | 5 | item_per_page_too_high: 'Questo valore è troppo alto' |
6 | rss_limit_too_high: 'Questo valore è troppo alto' | 6 | feed_limit_too_high: 'Questo valore è troppo alto' |
7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' | 7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml index 87f00f10..cb57844f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: 'Lo senhal deu aver almens 8 caractèrs' | 3 | password_too_short: 'Lo senhal deu aver almens 8 caractèrs' |
4 | password_wrong_value: 'Vòstre senhal actual es pas bon' | 4 | password_wrong_value: 'Vòstre senhal actual es pas bon' |
5 | item_per_page_too_high: "Aquò li agradarà pas a l'aplicacion" | 5 | item_per_page_too_high: "Aquò li agradarà pas a l'aplicacion" |
6 | rss_limit_too_high: "Aquò li agradarà pas a l'aplicacion" | 6 | feed_limit_too_high: "Aquò li agradarà pas a l'aplicacion" |
7 | quote_length_too_high: 'Aquesta citacion es tròpa longa. Cal que faga {{ limit }} caractèrs o mens.' | 7 | quote_length_too_high: 'Aquesta citacion es tròpa longa. Cal que faga {{ limit }} caractèrs o mens.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml index e4165c14..94757cc5 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: 'Hasło powinno mieć minimum 8 znaków długości' | 3 | password_too_short: 'Hasło powinno mieć minimum 8 znaków długości' |
4 | password_wrong_value: 'Twoje obecne hasło jest błędne' | 4 | password_wrong_value: 'Twoje obecne hasło jest błędne' |
5 | item_per_page_too_high: 'To może spowodować problemy z aplikacją' | 5 | item_per_page_too_high: 'To może spowodować problemy z aplikacją' |
6 | rss_limit_too_high: 'To może spowodować problemy z aplikacją' | 6 | feed_limit_too_high: 'To może spowodować problemy z aplikacją' |
7 | quote_length_too_high: 'Cytat jest zbyt długi. powinien mieć {{ limit }} znaków lub mniej.' | 7 | quote_length_too_high: 'Cytat jest zbyt długi. powinien mieć {{ limit }} znaków lub mniej.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml index a8c1f9de..df2f3f35 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: 'A senha deve ter pelo menos 8 caracteres' | 3 | password_too_short: 'A senha deve ter pelo menos 8 caracteres' |
4 | password_wrong_value: 'A senha atual informada está errada' | 4 | password_wrong_value: 'A senha atual informada está errada' |
5 | item_per_page_too_high: 'Certamente isso pode matar a aplicação' | 5 | item_per_page_too_high: 'Certamente isso pode matar a aplicação' |
6 | rss_limit_too_high: 'Certamente isso pode matar a aplicação' | 6 | feed_limit_too_high: 'Certamente isso pode matar a aplicação' |
7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' | 7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml index 6840cf11..e5c8a72f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: 'Parola ar trebui să conțină cel puțin 8 caractere' | 3 | password_too_short: 'Parola ar trebui să conțină cel puțin 8 caractere' |
4 | # password_wrong_value: 'Wrong value for your current password' | 4 | # password_wrong_value: 'Wrong value for your current password' |
5 | # item_per_page_too_high: 'This will certainly kill the app' | 5 | # item_per_page_too_high: 'This will certainly kill the app' |
6 | # rss_limit_too_high: 'This will certainly kill the app' | 6 | # feed_limit_too_high: 'This will certainly kill the app' |
7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' | 7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml index e1e7317f..881ffd3b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | # password_too_short: 'Password should by at least 8 chars long' | 3 | # password_too_short: 'Password should by at least 8 chars long' |
4 | # password_wrong_value: 'Wrong value for your current password' | 4 | # password_wrong_value: 'Wrong value for your current password' |
5 | # item_per_page_too_high: 'This will certainly kill the app' | 5 | # item_per_page_too_high: 'This will certainly kill the app' |
6 | # rss_limit_too_high: 'This will certainly kill the app' | 6 | # feed_limit_too_high: 'This will certainly kill the app' |
7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' | 7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index bcc57dac..4ef6ab3c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | |||
@@ -86,8 +86,7 @@ | |||
86 | <br/> | 86 | <br/> |
87 | <img id="androidQrcode" /> | 87 | <img id="androidQrcode" /> |
88 | <script> | 88 | <script> |
89 | const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}'); | 89 | document.getElementById('androidQrcode').src = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}'); |
90 | document.getElementById('androidQrcode').src = imgBase64; | ||
91 | </script> | 90 | </script> |
92 | </div> | 91 | </div> |
93 | </fieldset> | 92 | </fieldset> |
@@ -95,43 +94,43 @@ | |||
95 | {{ form_rest(form.config) }} | 94 | {{ form_rest(form.config) }} |
96 | </form> | 95 | </form> |
97 | 96 | ||
98 | <h2>{{ 'config.tab_menu.rss'|trans }}</h2> | 97 | <h2>{{ 'config.tab_menu.feed'|trans }}</h2> |
99 | 98 | ||
100 | {{ form_start(form.rss) }} | 99 | {{ form_start(form.feed) }} |
101 | {{ form_errors(form.rss) }} | 100 | {{ form_errors(form.feed) }} |
102 | 101 | ||
103 | <div class="row"> | 102 | <div class="row"> |
104 | {{ 'config.form_rss.description'|trans }} | 103 | {{ 'config.form_feed.description'|trans }} |
105 | </div> | 104 | </div> |
106 | 105 | ||
107 | <fieldset class="w500p inline"> | 106 | <fieldset class="w500p inline"> |
108 | <div class="row"> | 107 | <div class="row"> |
109 | <label>{{ 'config.form_rss.token_label'|trans }}</label> | 108 | <label>{{ 'config.form_feed.token_label'|trans }}</label> |
110 | {% if rss.token %} | 109 | {% if feed.token %} |
111 | {{ rss.token }} | 110 | {{ feed.token }} |
112 | {% else %} | 111 | {% else %} |
113 | <em>{{ 'config.form_rss.no_token'|trans }}</em> | 112 | <em>{{ 'config.form_feed.no_token'|trans }}</em> |
114 | {% endif %} | 113 | {% endif %} |
115 | – | 114 | – |
116 | <a href="{{ path('generate_token') }}"> | 115 | <a href="{{ path('generate_token') }}"> |
117 | {% if rss.token %} | 116 | {% if feed.token %} |
118 | {{ 'config.form_rss.token_reset'|trans }} | 117 | {{ 'config.form_feed.token_reset'|trans }} |
119 | {% else %} | 118 | {% else %} |
120 | {{ 'config.form_rss.token_create'|trans }} | 119 | {{ 'config.form_feed.token_create'|trans }} |
121 | {% endif %} | 120 | {% endif %} |
122 | </a> | 121 | </a> |
123 | </div> | 122 | </div> |
124 | </fieldset> | 123 | </fieldset> |
125 | 124 | ||
126 | {% if rss.token %} | 125 | {% if feed.token %} |
127 | <fieldset class="w500p inline"> | 126 | <fieldset class="w500p inline"> |
128 | <div class="row"> | 127 | <div class="row"> |
129 | <label>{{ 'config.form_rss.rss_links'|trans }}</label> | 128 | <label>{{ 'config.form_feed.feed_links'|trans }}</label> |
130 | <ul> | 129 | <ul> |
131 | <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.unread'|trans }}</a></li> | 130 | <li><a href="{{ path('unread_feed', {'username': feed.username, 'token': feed.token}) }}">{{ 'config.form_feed.feed_link.unread'|trans }}</a></li> |
132 | <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.starred'|trans }}</a></li> | 131 | <li><a href="{{ path('starred_feed', {'username': feed.username, 'token': feed.token}) }}">{{ 'config.form_feed.feed_link.starred'|trans }}</a></li> |
133 | <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.archive'|trans }}</a></li> | 132 | <li><a href="{{ path('archive_feed', {'username': feed.username, 'token': feed.token}) }}">{{ 'config.form_feed.feed_link.archive'|trans }}</a></li> |
134 | <li><a href="{{ path('all_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.all'|trans }}</a></li> | 133 | <li><a href="{{ path('all_feed', {'username': feed.username, 'token': feed.token}) }}">{{ 'config.form_feed.feed_link.all'|trans }}</a></li> |
135 | </ul> | 134 | </ul> |
136 | </div> | 135 | </div> |
137 | </fieldset> | 136 | </fieldset> |
@@ -139,13 +138,13 @@ | |||
139 | 138 | ||
140 | <fieldset class="w500p inline"> | 139 | <fieldset class="w500p inline"> |
141 | <div class="row"> | 140 | <div class="row"> |
142 | {{ form_label(form.rss.rss_limit) }} | 141 | {{ form_label(form.feed.feed_limit) }} |
143 | {{ form_errors(form.rss.rss_limit) }} | 142 | {{ form_errors(form.feed.feed_limit) }} |
144 | {{ form_widget(form.rss.rss_limit) }} | 143 | {{ form_widget(form.feed.feed_limit) }} |
145 | </div> | 144 | </div> |
146 | </fieldset> | 145 | </fieldset> |
147 | 146 | ||
148 | {{ form_rest(form.rss) }} | 147 | {{ form_rest(form.feed) }} |
149 | </form> | 148 | </form> |
150 | 149 | ||
151 | <h2>{{ 'config.tab_menu.user_info'|trans }}</h2> | 150 | <h2>{{ 'config.tab_menu.user_info'|trans }}</h2> |
@@ -169,52 +168,41 @@ | |||
169 | </div> | 168 | </div> |
170 | </fieldset> | 169 | </fieldset> |
171 | 170 | ||
171 | {{ form_widget(form.user.save) }} | ||
172 | |||
172 | {% if twofactor_auth %} | 173 | {% if twofactor_auth %} |
174 | <h5>{{ 'config.otp.page_title'|trans }}</h5> | ||
175 | |||
173 | <div class="row"> | 176 | <div class="row"> |
174 | {{ 'config.form_user.two_factor_description'|trans }} | 177 | {{ 'config.form_user.two_factor_description'|trans }} |
175 | </div> | 178 | </div> |
176 | 179 | ||
177 | <fieldset class="w500p inline"> | 180 | <table> |
178 | <div class="row"> | 181 | <thead> |
179 | {{ form_label(form.user.twoFactorAuthentication) }} | 182 | <tr> |
180 | {{ form_errors(form.user.twoFactorAuthentication) }} | 183 | <th>{{ 'config.form_user.two_factor.table_method'|trans }}</th> |
181 | {{ form_widget(form.user.twoFactorAuthentication) }} | 184 | <th>{{ 'config.form_user.two_factor.table_state'|trans }}</th> |
182 | </div> | 185 | <th>{{ 'config.form_user.two_factor.table_action'|trans }}</th> |
183 | <a href="#" title="{{ 'config.form_user.help_twoFactorAuthentication'|trans }}"> | 186 | </tr> |
184 | <i class="material-icons">live_help</i> | 187 | </thead> |
185 | </a> | ||
186 | </fieldset> | ||
187 | {% endif %} | ||
188 | 188 | ||
189 | <h2>{{ 'config.reset.title'|trans }}</h2> | 189 | <tbody> |
190 | <fieldset class="w500p inline"> | 190 | <tr> |
191 | <p>{{ 'config.reset.description'|trans }}</p> | 191 | <td>{{ 'config.form_user.two_factor.emailTwoFactor_label'|trans }}</td> |
192 | <ul> | 192 | <td>{% if app.user.isEmailTwoFactor %}<b>{{ 'config.form_user.two_factor.state_enabled'|trans }}</b>{% else %}{{ 'config.form_user.two_factor.state_disabled'|trans }}{% endif %}</td> |
193 | <li> | 193 | <td><a href="{{ path('config_otp_email') }}" class="waves-effect waves-light btn{% if app.user.isEmailTwoFactor %} disabled{% endif %}">{{ 'config.form_user.two_factor.action_email'|trans }}</a></td> |
194 | <a href="{{ path('config_reset', { type: 'annotations'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | 194 | </tr> |
195 | {{ 'config.reset.annotations'|trans }} | 195 | <tr> |
196 | </a> | 196 | <td>{{ 'config.form_user.two_factor.googleTwoFactor_label'|trans }}</td> |
197 | </li> | 197 | <td>{% if app.user.isGoogleTwoFactor %}<b>{{ 'config.form_user.two_factor.state_enabled'|trans }}</b>{% else %}{{ 'config.form_user.two_factor.state_disabled'|trans }}{% endif %}</td> |
198 | <li> | 198 | <td><a href="{{ path('config_otp_app') }}" class="waves-effect waves-light btn{% if app.user.isGoogleTwoFactor %} disabled{% endif %}">{{ 'config.form_user.two_factor.action_app'|trans }}</a></td> |
199 | <a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | 199 | </tr> |
200 | {{ 'config.reset.tags'|trans }} | 200 | </tbody> |
201 | </a> | 201 | </table> |
202 | </li> | 202 | |
203 | <li> | 203 | {% endif %} |
204 | <a href="{{ path('config_reset', { type: 'archived'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
205 | {{ 'config.reset.archived'|trans }} | ||
206 | </a> | ||
207 | </li> | ||
208 | <li> | ||
209 | <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
210 | {{ 'config.reset.entries'|trans }} | ||
211 | </a> | ||
212 | </li> | ||
213 | </ul> | ||
214 | </fieldset> | ||
215 | 204 | ||
216 | {{ form_widget(form.user._token) }} | 205 | {{ form_widget(form.user._token) }} |
217 | {{ form_widget(form.user.save) }} | ||
218 | </form> | 206 | </form> |
219 | 207 | ||
220 | {% if enabled_users > 1 %} | 208 | {% if enabled_users > 1 %} |
@@ -277,7 +265,7 @@ | |||
277 | {% endfor %} | 265 | {% endfor %} |
278 | </ul> | 266 | </ul> |
279 | 267 | ||
280 | {{ form_start(form.new_tagging_rule) }} | 268 | {{ form_start(form.new_tagging_rule) }} |
281 | {{ form_errors(form.new_tagging_rule) }} | 269 | {{ form_errors(form.new_tagging_rule) }} |
282 | 270 | ||
283 | <fieldset class="w500p inline"> | 271 | <fieldset class="w500p inline"> |
@@ -382,4 +370,31 @@ | |||
382 | </table> | 370 | </table> |
383 | </div> | 371 | </div> |
384 | </div> | 372 | </div> |
373 | |||
374 | <h2>{{ 'config.reset.title'|trans }}</h2> | ||
375 | <fieldset class="w500p inline"> | ||
376 | <p>{{ 'config.reset.description'|trans }}</p> | ||
377 | <ul> | ||
378 | <li> | ||
379 | <a href="{{ path('config_reset', { type: 'annotations'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
380 | {{ 'config.reset.annotations'|trans }} | ||
381 | </a> | ||
382 | </li> | ||
383 | <li> | ||
384 | <a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
385 | {{ 'config.reset.tags'|trans }} | ||
386 | </a> | ||
387 | </li> | ||
388 | <li> | ||
389 | <a href="{{ path('config_reset', { type: 'archived'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
390 | {{ 'config.reset.archived'|trans }} | ||
391 | </a> | ||
392 | </li> | ||
393 | <li> | ||
394 | <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
395 | {{ 'config.reset.entries'|trans }} | ||
396 | </a> | ||
397 | </li> | ||
398 | </ul> | ||
399 | </fieldset> | ||
385 | {% endblock %} | 400 | {% endblock %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig new file mode 100644 index 00000000..0919646e --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig | |||
@@ -0,0 +1,55 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'config.page_title'|trans }} > {{ 'config.otp.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | <h5>{{ 'config.otp.page_title'|trans }}</h5> | ||
7 | |||
8 | <ol> | ||
9 | <li> | ||
10 | <p>{{ 'config.otp.app.two_factor_code_description_1'|trans }}</p> | ||
11 | <p>{{ 'config.otp.app.two_factor_code_description_2'|trans }}</p> | ||
12 | |||
13 | <p> | ||
14 | <img id="2faQrcode" class="hide-on-med-and-down" /> | ||
15 | <script> | ||
16 | document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ qr_code }}'); | ||
17 | </script> | ||
18 | </p> | ||
19 | </li> | ||
20 | <li> | ||
21 | <p>{{ 'config.otp.app.two_factor_code_description_3'|trans }}</p> | ||
22 | |||
23 | <p><strong>{{ backupCodes|join("\n")|nl2br }}</strong></p> | ||
24 | </li> | ||
25 | <li> | ||
26 | <p>{{ 'config.otp.app.two_factor_code_description_4'|trans }}</p> | ||
27 | |||
28 | {% for flashMessage in app.session.flashbag.get("two_factor") %} | ||
29 | <div class="card-panel red darken-1 black-text"> | ||
30 | {{ flashMessage|trans }} | ||
31 | </div> | ||
32 | {% endfor %} | ||
33 | |||
34 | <form class="form" action="{{ path("config_otp_app_check") }}" method="post"> | ||
35 | <div class="card-content"> | ||
36 | <div class="row"> | ||
37 | <div class="input-field col s12"> | ||
38 | <label for="_auth_code">{{ "scheb_two_factor.auth_code"|trans }}</label> | ||
39 | <input id="_auth_code" type="text" autocomplete="off" name="_auth_code" /> | ||
40 | </div> | ||
41 | </div> | ||
42 | </div> | ||
43 | <div class="card-action"> | ||
44 | <a href="{{ path('config_otp_app_cancel') }}" class="waves-effect waves-light grey btn"> | ||
45 | {{ 'config.otp.app.cancel'|trans }} | ||
46 | </a> | ||
47 | <button class="btn waves-effect waves-light" type="submit" name="send"> | ||
48 | {{ 'config.otp.app.enable'|trans }} | ||
49 | <i class="material-icons right">send</i> | ||
50 | </button> | ||
51 | </div> | ||
52 | </form> | ||
53 | </li> | ||
54 | </ol> | ||
55 | {% endblock %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 832112be..6c5d2601 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | {% block head %} | 3 | {% block head %} |
4 | {{ parent() }} | 4 | {{ parent() }} |
5 | {% if tag is defined and app.user.config.rssToken %} | 5 | {% if tag is defined and app.user.config.feedToken %} |
6 | <link rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" /> | 6 | <link rel="alternate" type="application/atom+xml" href="{{ path('tag_feed', {'username': app.user.username, 'token': app.user.config.feedToken, 'slug': tag.slug}) }}" /> |
7 | {% endif %} | 7 | {% endif %} |
8 | {% endblock %} | 8 | {% endblock %} |
9 | 9 | ||
@@ -20,13 +20,19 @@ | |||
20 | 20 | ||
21 | {% block content %} | 21 | {% block content %} |
22 | {% set currentRoute = app.request.attributes.get('_route') %} | 22 | {% set currentRoute = app.request.attributes.get('_route') %} |
23 | {% if currentRoute == 'homepage' %} | ||
24 | {% set currentRoute = 'unread' %} | ||
25 | {% endif %} | ||
23 | {% set listMode = app.user.config.listMode %} | 26 | {% set listMode = app.user.config.listMode %} |
24 | <div class="results"> | 27 | <div class="results"> |
25 | <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div> | 28 | <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div> |
26 | <div class="pagination"> | 29 | <div class="pagination"> |
27 | <a href="{{ path('switch_view_mode') }}"><i class="listMode-btn material-icons md-24">{% if listMode == 0 %}list{% else %}view_module{% endif %}</i></a> | 30 | <a href="{{ path('switch_view_mode') }}"><i class="listMode-btn material-icons md-24">{% if listMode == 0 %}list{% else %}view_module{% endif %}</i></a> |
28 | {% if app.user.config.rssToken %} | 31 | {% if app.user.config.feedToken %} |
29 | {% include "@WallabagCore/themes/common/Entry/_rss_link.html.twig" %} | 32 | {% include "@WallabagCore/themes/common/Entry/_feed_link.html.twig" %} |
33 | {% endif %} | ||
34 | {% if currentRoute in ['unread', 'starred', 'archive', 'untagged', 'all'] %} | ||
35 | <a href="{{ path('random_entry', { 'type': currentRoute }) }}"><i class="btn-clickable material-icons md-24 js-random-action">casino</i></a> | ||
30 | {% endif %} | 36 | {% endif %} |
31 | <i class="btn-clickable download-btn material-icons md-24 js-export-action">file_download</i> | 37 | <i class="btn-clickable download-btn material-icons md-24 js-export-action">file_download</i> |
32 | <i class="btn-clickable filter-btn material-icons md-24 js-filters-action">filter_list</i> | 38 | <i class="btn-clickable filter-btn material-icons md-24 js-filters-action">filter_list</i> |
@@ -90,9 +96,6 @@ | |||
90 | {% if tag is defined %} | 96 | {% if tag is defined %} |
91 | {% set currentTag = tag %} | 97 | {% set currentTag = tag %} |
92 | {% endif %} | 98 | {% endif %} |
93 | {% if currentRoute == 'homepage' %} | ||
94 | {% set currentRoute = 'unread' %} | ||
95 | {% endif %} | ||
96 | <h2>{{ 'entry.list.export_title'|trans }}</h2> | 99 | <h2>{{ 'entry.list.export_title'|trans }}</h2> |
97 | <a href="javascript: void(null);" id="download-form-close" class="close-button--popup close-button">×</a> | 100 | <a href="javascript: void(null);" id="download-form-close" class="close-button--popup close-button">×</a> |
98 | <ul> | 101 | <ul> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig index 070d5629..ae8403bd 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig | |||
@@ -10,10 +10,22 @@ | |||
10 | <ul> | 10 | <ul> |
11 | {% for tag in tags %} | 11 | {% for tag in tags %} |
12 | <li id="tag-{{ tag.id|e }}"> | 12 | <li id="tag-{{ tag.id|e }}"> |
13 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.nbEntries }})</a> | 13 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}" data-handle="tag-link">{{ tag.label }} ({{ tag.nbEntries }})</a> |
14 | <a rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" class="right"> | 14 | |
15 | <i class="material-icons md-24">rss_feed</i> | 15 | {% if renameForms is defined and renameForms[tag.id] is defined %} |
16 | <form class="card-tag-form hidden" data-handle="tag-rename-form" action="{{ path('tag_rename', {'slug': tag.slug})}}" method="POST"> | ||
17 | {{ form_widget(renameForms[tag.id].label, {'attr': {'value': tag.label}}) }} | ||
18 | {{ form_rest(renameForms[tag.id]) }} | ||
19 | </form> | ||
20 | <a class="card-tag-rename" data-handler="tag-rename" href="javascript:void(0);"> | ||
21 | <i class="material-icons">mode_edit</i> | ||
16 | </a> | 22 | </a> |
23 | {% endif %} | ||
24 | {% if app.user.config.feedToken %} | ||
25 | <a rel="alternate" type="application/atom+xml" href="{{ path('tag_feed', {'username': app.user.username, 'token': app.user.config.feedToken, 'slug': tag.slug}) }}" class="right"> | ||
26 | <i class="material-icons md-24">rss_feed</i> | ||
27 | </a> | ||
28 | {% endif %} | ||
17 | </li> | 29 | </li> |
18 | {% endfor %} | 30 | {% endfor %} |
19 | </ul> | 31 | </ul> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_feed_link.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_feed_link.html.twig new file mode 100644 index 00000000..6df4c160 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_feed_link.html.twig | |||
@@ -0,0 +1,11 @@ | |||
1 | {% if tag is defined %} | ||
2 | <a rel="alternate" type="application/atom+xml" href="{{ path('tag_feed', {'username': app.user.username, 'token': app.user.config.feedToken, 'slug': tag.slug}) }}" class="right"><i class="material-icons md-24">rss_feed</i></a> | ||
3 | {% elseif currentRoute in ['homepage', 'unread', 'starred', 'archive', 'all'] %} | ||
4 | {% set feedRoute = currentRoute %} | ||
5 | {% if currentRoute == 'homepage' %} | ||
6 | {% set feedRoute = 'unread' %} | ||
7 | {% endif %} | ||
8 | {% set feedRoute = feedRoute ~ '_feed' %} | ||
9 | |||
10 | <a rel="alternate" type="application/atom+xml" href="{{ path(feedRoute, {'username': app.user.username, 'token': app.user.config.feedToken}) }}" class="right"><i class="material-icons">rss_feed</i></a> | ||
11 | {% endif %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_rss_link.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_rss_link.html.twig deleted file mode 100644 index eb26054c..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_rss_link.html.twig +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | {% if tag is defined %} | ||
2 | <a rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" class="right"><i class="material-icons md-24">rss_feed</i></a> | ||
3 | {% elseif currentRoute in ['homepage', 'unread', 'starred', 'archive', 'all'] %} | ||
4 | {% set rssRoute = currentRoute %} | ||
5 | {% if currentRoute == 'homepage' %} | ||
6 | {% set rssRoute = 'unread' %} | ||
7 | {% endif %} | ||
8 | {% set rssRoute = rssRoute ~ '_rss' %} | ||
9 | |||
10 | <a rel="alternate" type="application/rss+xml" href="{{ path(rssRoute, {'username': app.user.username, 'token': app.user.config.rssToken}) }}" class="right"><i class="material-icons">rss_feed</i></a> | ||
11 | {% endif %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig index 25d09ec3..cf6f6571 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig | |||
@@ -1,34 +1,53 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/"> | 2 | <feed xmlns="http://www.w3.org/2005/Atom"> |
3 | <channel> | 3 | {% if type != 'tag' %} |
4 | <title>wallabag - {{ type }} feed</title> | 4 | <title>wallabag — {{type}} feed</title> |
5 | <link>{{ url_html }}</link> | 5 | <subtitle type="html">Atom feed for {{ type }} entries</subtitle> |
6 | <link rel="self" href="{{ app.request.uri }}"/> | 6 | <id>wallabag:{{ domainName | removeScheme | removeWww }}:{{ user }}:{{ type }}</id> |
7 | {% if entries.hasPreviousPage -%} | 7 | <link rel="alternate" type="text/html" href="{{ url(type) }}"/> |
8 | <link rel="previous" href="{{ url }}?page={{ entries.previousPage }}"/> | 8 | {% else %} |
9 | {% endif -%} | 9 | <id>wallabag:{{ domainName | removeScheme | removeWww }}:{{ user }}:{{ type }}:{{ tag }}</id> |
10 | {% if entries.hasNextPage -%} | 10 | <link rel="alternate" type="text/html" href="{{ url('tag_entries', {'slug': tag}) }}"/> |
11 | <link rel="next" href="{{ url }}?page={{ entries.nextPage }}"/> | 11 | <title>wallabag — {{type}} {{ tag }} feed</title> |
12 | {% endif -%} | 12 | <subtitle type="html">Atom feed for entries tagged with {{ tag }}</subtitle> |
13 | <link rel="last" href="{{ url }}?page={{ entries.nbPages }}"/> | 13 | {% endif %} |
14 | <pubDate>{{ "now"|date(constant('DATE_RSS')) }}</pubDate> | 14 | {% if entries | length > 0 %} |
15 | <generator>wallabag</generator> | 15 | <updated>{{ (entries | first).createdAt | date('c') }}</updated> {# Indicates the last time the feed was modified in a significant way. #} |
16 | <description>wallabag {{ type }} elements</description> | 16 | {% endif %} |
17 | 17 | <link rel="self" type="application/atom+xml" href="{{ app.request.uri }}"/> | |
18 | {% for entry in entries %} | 18 | {% if entries.hasPreviousPage %} |
19 | 19 | <link rel="previous" href="{{ url }}/{{ entries.previousPage }}"/> | |
20 | <item> | 20 | {% endif -%} |
21 | <title><![CDATA[{{ entry.title|e }}]]></title> | 21 | {% if entries.hasNextPage %} |
22 | <source url="{{ url('view', { 'id': entry.id }) }}">wallabag</source> | 22 | <link rel="next" href="{{ url }}/{{ entries.nextPage }}"/> |
23 | <link>{{ entry.url }}</link> | 23 | {% endif -%} |
24 | <guid>{{ entry.url }}</guid> | 24 | <link rel="last" href="{{ url }}/{{ entries.nbPages }}"/> |
25 | <pubDate>{{ entry.createdAt|date(constant('DATE_RSS')) }}</pubDate> | 25 | <generator uri="https://wallabag.org" version="{{ version }}">wallabag</generator> |
26 | <description> | 26 | <author> |
27 | <![CDATA[{%- if entry.readingTime > 0 -%}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}{%- else -%}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{%- endif %}{{ entry.content|raw -}}]]> | 27 | <name>{{ user }}</name> |
28 | </description> | 28 | </author> |
29 | </item> | 29 | <icon>{{ asset('favicon.ico') }}</icon> |
30 | 30 | <logo>{{ asset('bundles/wallabagcore/themes/_global/img/logo-square.png') }}</logo> | |
31 | {% for entry in entries %} | ||
32 | <entry> | ||
33 | <title><![CDATA[{{ entry.title|e }}]]></title> | ||
34 | <link rel="alternate" type="text/html" | ||
35 | href="{{ url('view', {'id': entry.id}) }}"/> | ||
36 | <link rel="via">{{ entry.url }}</link> | ||
37 | <id>wallabag:{{ domainName | removeScheme | removeWww }}:{{ user }}:entry:{{ entry.id }}</id> | ||
38 | <updated>{{ entry.updatedAt|date('c') }}</updated> | ||
39 | <published>{{ entry.createdAt|date('c') }}</published> | ||
40 | {% for tag in entry.tags %} | ||
41 | <category term="{{ tag.slug }}" label="{{ tag.label }}" /> | ||
31 | {% endfor %} | 42 | {% endfor %} |
32 | 43 | {% for author in entry.publishedBy %} | |
33 | </channel> | 44 | <author> |
34 | </rss> | 45 | <name>{{ author }}</name> |
46 | </author> | ||
47 | {% endfor %} | ||
48 | <content type="html" {% if entry.language %}xml:lang="{{ entry.language[:2] }}"{% endif %}> | ||
49 | <![CDATA[{%- if entry.readingTime > 0 -%}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}{%- else -%}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{%- endif %}{{ entry.content|raw -}}]]> | ||
50 | </content> | ||
51 | </entry> | ||
52 | {% endfor %} | ||
53 | </feed> | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig index 4580813c..521b3eea 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig | |||
@@ -21,7 +21,7 @@ | |||
21 | <div class="card-action"> | 21 | <div class="card-action"> |
22 | <ul> | 22 | <ul> |
23 | <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li> | 23 | <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li> |
24 | <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.rss'|trans }}</a></li> | 24 | <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.feed'|trans }}</a></li> |
25 | <li><a href="{{ path('config') }}#set5">{{ 'quickstart.more'|trans }}</a></li> | 25 | <li><a href="{{ path('config') }}#set5">{{ 'quickstart.more'|trans }}</a></li> |
26 | </ul> | 26 | </ul> |
27 | </div> | 27 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index f896fe2d..818fc4e7 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig | |||
@@ -12,10 +12,11 @@ | |||
12 | <div class="div_tabs col s12"> | 12 | <div class="div_tabs col s12"> |
13 | <ul class="tabs"> | 13 | <ul class="tabs"> |
14 | <li class="tab col s12 m6 l3"><a class="active" href="#set1">{{ 'config.tab_menu.settings'|trans }}</a></li> | 14 | <li class="tab col s12 m6 l3"><a class="active" href="#set1">{{ 'config.tab_menu.settings'|trans }}</a></li> |
15 | <li class="tab col s12 m6 l3"><a href="#set2">{{ 'config.tab_menu.rss'|trans }}</a></li> | 15 | <li class="tab col s12 m6 l3"><a href="#set2">{{ 'config.tab_menu.feed'|trans }}</a></li> |
16 | <li class="tab col s12 m6 l3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li> | 16 | <li class="tab col s12 m6 l3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li> |
17 | <li class="tab col s12 m6 l3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li> | 17 | <li class="tab col s12 m6 l3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li> |
18 | <li class="tab col s12 m6 l3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li> | 18 | <li class="tab col s12 m6 l3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li> |
19 | <li class="tab col s12 m6 l3"><a href="#set6">{{ 'config.tab_menu.reset'|trans }}</a></li> | ||
19 | </ul> | 20 | </ul> |
20 | </div> | 21 | </div> |
21 | 22 | ||
@@ -111,8 +112,7 @@ | |||
111 | <img id="androidQrcode" class="hide-on-med-and-down" /> | 112 | <img id="androidQrcode" class="hide-on-med-and-down" /> |
112 | </div> | 113 | </div> |
113 | <script> | 114 | <script> |
114 | const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}'); | 115 | document.getElementById('androidQrcode').src = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}'); |
115 | document.getElementById('androidQrcode').src = imgBase64; | ||
116 | </script> | 116 | </script> |
117 | </div> | 117 | </div> |
118 | 118 | ||
@@ -122,42 +122,42 @@ | |||
122 | </div> | 122 | </div> |
123 | 123 | ||
124 | <div id="set2" class="col s12"> | 124 | <div id="set2" class="col s12"> |
125 | {{ form_start(form.rss) }} | 125 | {{ form_start(form.feed) }} |
126 | {{ form_errors(form.rss) }} | 126 | {{ form_errors(form.feed) }} |
127 | 127 | ||
128 | <div class="row"> | 128 | <div class="row"> |
129 | <div class="input-field col s12"> | 129 | <div class="input-field col s12"> |
130 | {{ 'config.form_rss.description'|trans }} | 130 | {{ 'config.form_feed.description'|trans }} |
131 | </div> | 131 | </div> |
132 | </div> | 132 | </div> |
133 | 133 | ||
134 | <div class="row"> | 134 | <div class="row"> |
135 | <div class="col s12"> | 135 | <div class="col s12"> |
136 | <h6 class="grey-text">{{ 'config.form_rss.token_label'|trans }}</h6> | 136 | <h6 class="grey-text">{{ 'config.form_feed.token_label'|trans }}</h6> |
137 | <div> | 137 | <div> |
138 | {% if rss.token %} | 138 | {% if feed.token %} |
139 | {{ rss.token }} | 139 | {{ feed.token }} |
140 | {% else %} | 140 | {% else %} |
141 | <em>{{ 'config.form_rss.no_token'|trans }}</em> | 141 | <em>{{ 'config.form_feed.no_token'|trans }}</em> |
142 | {% endif %} | 142 | {% endif %} |
143 | – <a href="{{ path('generate_token') }}"> | 143 | – <a href="{{ path('generate_token') }}"> |
144 | {% if rss.token %} | 144 | {% if feed.token %} |
145 | {{ 'config.form_rss.token_reset'|trans }} | 145 | {{ 'config.form_feed.token_reset'|trans }} |
146 | {% else %} | 146 | {% else %} |
147 | {{ 'config.form_rss.token_create'|trans }} | 147 | {{ 'config.form_feed.token_create'|trans }} |
148 | {% endif %}</a> | 148 | {% endif %}</a> |
149 | </div> | 149 | </div> |
150 | </div> | 150 | </div> |
151 | </div> | 151 | </div> |
152 | {% if rss.token %} | 152 | {% if feed.token %} |
153 | <div class="row"> | 153 | <div class="row"> |
154 | <div class="col s12"> | 154 | <div class="col s12"> |
155 | <h6 class="grey-text">{{ 'config.form_rss.rss_links'|trans }}</h6> | 155 | <h6 class="grey-text">{{ 'config.form_feed.feed_links'|trans }}</h6> |
156 | <ul> | 156 | <ul> |
157 | <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.unread'|trans }}</a></li> | 157 | <li><a href="{{ path('unread_feed', {'username': feed.username, 'token': feed.token}) }}">{{ 'config.form_feed.feed_link.unread'|trans }}</a></li> |
158 | <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.starred'|trans }}</a></li> | 158 | <li><a href="{{ path('starred_feed', {'username': feed.username, 'token': feed.token}) }}">{{ 'config.form_feed.feed_link.starred'|trans }}</a></li> |
159 | <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.archive'|trans }}</a></li> | 159 | <li><a href="{{ path('archive_feed', {'username': feed.username, 'token': feed.token}) }}">{{ 'config.form_feed.feed_link.archive'|trans }}</a></li> |
160 | <li><a href="{{ path('all_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.all'|trans }}</a></li> | 160 | <li><a href="{{ path('all_feed', {'username': feed.username, 'token': feed.token}) }}">{{ 'config.form_feed.feed_link.all'|trans }}</a></li> |
161 | </ul> | 161 | </ul> |
162 | </div> | 162 | </div> |
163 | </div> | 163 | </div> |
@@ -165,14 +165,14 @@ | |||
165 | 165 | ||
166 | <div class="row"> | 166 | <div class="row"> |
167 | <div class="input-field col s12"> | 167 | <div class="input-field col s12"> |
168 | {{ form_label(form.rss.rss_limit) }} | 168 | {{ form_label(form.feed.feed_limit) }} |
169 | {{ form_errors(form.rss.rss_limit) }} | 169 | {{ form_errors(form.feed.feed_limit) }} |
170 | {{ form_widget(form.rss.rss_limit) }} | 170 | {{ form_widget(form.feed.feed_limit) }} |
171 | </div> | 171 | </div> |
172 | </div> | 172 | </div> |
173 | 173 | ||
174 | {{ form_widget(form.rss.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | 174 | {{ form_widget(form.feed.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} |
175 | {{ form_rest(form.rss) }} | 175 | {{ form_rest(form.feed) }} |
176 | </form> | 176 | </form> |
177 | </div> | 177 | </div> |
178 | 178 | ||
@@ -196,59 +196,42 @@ | |||
196 | </div> | 196 | </div> |
197 | </div> | 197 | </div> |
198 | 198 | ||
199 | {% if twofactor_auth %} | 199 | {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} |
200 | <div class="row"> | ||
201 | <div class="input-field col s11"> | ||
202 | {{ 'config.form_user.two_factor_description'|trans }} | ||
203 | |||
204 | <br /> | ||
205 | 200 | ||
206 | {{ form_widget(form.user.twoFactorAuthentication) }} | 201 | {% if twofactor_auth %} |
207 | {{ form_label(form.user.twoFactorAuthentication) }} | 202 | <br/> |
208 | {{ form_errors(form.user.twoFactorAuthentication) }} | 203 | <br/> |
209 | </div> | 204 | <div class="row"> |
210 | <div class="input-field col s1"> | 205 | <h5>{{ 'config.otp.page_title'|trans }}</h5> |
211 | <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_user.help_twoFactorAuthentication'|trans }}"> | 206 | |
212 | <i class="material-icons">live_help</i> | 207 | <p>{{ 'config.form_user.two_factor_description'|trans }}</p> |
213 | </a> | 208 | |
209 | <table> | ||
210 | <thead> | ||
211 | <tr> | ||
212 | <th>{{ 'config.form_user.two_factor.table_method'|trans }}</th> | ||
213 | <th>{{ 'config.form_user.two_factor.table_state'|trans }}</th> | ||
214 | <th>{{ 'config.form_user.two_factor.table_action'|trans }}</th> | ||
215 | </tr> | ||
216 | </thead> | ||
217 | |||
218 | <tbody> | ||
219 | <tr> | ||
220 | <td>{{ 'config.form_user.two_factor.emailTwoFactor_label'|trans }}</td> | ||
221 | <td>{% if app.user.isEmailTwoFactor %}<b>{{ 'config.form_user.two_factor.state_enabled'|trans }}</b>{% else %}{{ 'config.form_user.two_factor.state_disabled'|trans }}{% endif %}</td> | ||
222 | <td><a href="{{ path('config_otp_email') }}" class="waves-effect waves-light btn{% if app.user.isEmailTwoFactor %} disabled{% endif %}">{{ 'config.form_user.two_factor.action_email'|trans }}</a></td> | ||
223 | </tr> | ||
224 | <tr> | ||
225 | <td>{{ 'config.form_user.two_factor.googleTwoFactor_label'|trans }}</td> | ||
226 | <td>{% if app.user.isGoogleTwoFactor %}<b>{{ 'config.form_user.two_factor.state_enabled'|trans }}</b>{% else %}{{ 'config.form_user.two_factor.state_disabled'|trans }}{% endif %}</td> | ||
227 | <td><a href="{{ path('config_otp_app') }}" class="waves-effect waves-light btn{% if app.user.isGoogleTwoFactor %} disabled{% endif %}">{{ 'config.form_user.two_factor.action_app'|trans }}</a></td> | ||
228 | </tr> | ||
229 | </tbody> | ||
230 | </table> | ||
214 | </div> | 231 | </div> |
215 | </div> | ||
216 | {% endif %} | 232 | {% endif %} |
217 | |||
218 | {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | ||
219 | {{ form_widget(form.user._token) }} | 233 | {{ form_widget(form.user._token) }} |
220 | </form> | 234 | </form> |
221 | |||
222 | <br /><hr /><br /> | ||
223 | |||
224 | <div class="row"> | ||
225 | <h5>{{ 'config.reset.title'|trans }}</h5> | ||
226 | <p>{{ 'config.reset.description'|trans }}</p> | ||
227 | <a href="{{ path('config_reset', { type: 'annotations'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
228 | {{ 'config.reset.annotations'|trans }} | ||
229 | </a> | ||
230 | <a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
231 | {{ 'config.reset.tags'|trans }} | ||
232 | </a> | ||
233 | <a href="{{ path('config_reset', { type: 'archived'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
234 | {{ 'config.reset.archived'|trans }} | ||
235 | </a> | ||
236 | <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
237 | {{ 'config.reset.entries'|trans }} | ||
238 | </a> | ||
239 | </div> | ||
240 | |||
241 | {% if enabled_users > 1 %} | ||
242 | <br /><hr /><br /> | ||
243 | |||
244 | <div class="row"> | ||
245 | <h5>{{ 'config.form_user.delete.title'|trans }}</h5> | ||
246 | <p>{{ 'config.form_user.delete.description'|trans }}</p> | ||
247 | <a href="{{ path('delete_account') }}" onclick="return confirm('{{ 'config.form_user.delete.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red delete-account"> | ||
248 | {{ 'config.form_user.delete.button'|trans }} | ||
249 | </a> | ||
250 | </div> | ||
251 | {% endif %} | ||
252 | </div> | 235 | </div> |
253 | 236 | ||
254 | <div id="set4" class="col s12"> | 237 | <div id="set4" class="col s12"> |
@@ -422,6 +405,37 @@ | |||
422 | </div> | 405 | </div> |
423 | </div> | 406 | </div> |
424 | </div> | 407 | </div> |
408 | |||
409 | <div id="set6" class="col s12"> | ||
410 | <div class="row"> | ||
411 | <h5>{{ 'config.reset.title'|trans }}</h5> | ||
412 | <p>{{ 'config.reset.description'|trans }}</p> | ||
413 | <a href="{{ path('config_reset', { type: 'annotations'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
414 | {{ 'config.reset.annotations'|trans }} | ||
415 | </a> | ||
416 | <a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
417 | {{ 'config.reset.tags'|trans }} | ||
418 | </a> | ||
419 | <a href="{{ path('config_reset', { type: 'archived'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
420 | {{ 'config.reset.archived'|trans }} | ||
421 | </a> | ||
422 | <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
423 | {{ 'config.reset.entries'|trans }} | ||
424 | </a> | ||
425 | </div> | ||
426 | |||
427 | {% if enabled_users > 1 %} | ||
428 | <br /><hr /><br /> | ||
429 | |||
430 | <div class="row"> | ||
431 | <h5>{{ 'config.form_user.delete.title'|trans }}</h5> | ||
432 | <p>{{ 'config.form_user.delete.description'|trans }}</p> | ||
433 | <a href="{{ path('delete_account') }}" onclick="return confirm('{{ 'config.form_user.delete.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red delete-account"> | ||
434 | {{ 'config.form_user.delete.button'|trans }} | ||
435 | </a> | ||
436 | </div> | ||
437 | {% endif %} | ||
438 | </div> | ||
425 | </div> | 439 | </div> |
426 | 440 | ||
427 | </div> | 441 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig new file mode 100644 index 00000000..7875d787 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig | |||
@@ -0,0 +1,63 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'config.page_title'|trans }} > {{ 'config.otp.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | <div class="row"> | ||
7 | <div class="col s12"> | ||
8 | <div class="card-panel settings"> | ||
9 | <div class="row"> | ||
10 | <h5>{{ 'config.otp.page_title'|trans }}</h5> | ||
11 | |||
12 | <ol> | ||
13 | <li> | ||
14 | <p>{{ 'config.otp.app.two_factor_code_description_1'|trans }}</p> | ||
15 | <p>{{ 'config.otp.app.two_factor_code_description_2'|trans }}</p> | ||
16 | |||
17 | <p> | ||
18 | <img id="2faQrcode" class="hide-on-med-and-down" /> | ||
19 | <script> | ||
20 | document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ qr_code }}'); | ||
21 | </script> | ||
22 | </p> | ||
23 | </li> | ||
24 | <li> | ||
25 | <p>{{ 'config.otp.app.two_factor_code_description_3'|trans }}</p> | ||
26 | |||
27 | <p><strong>{{ backupCodes|join("\n")|nl2br }}</strong></p> | ||
28 | </li> | ||
29 | <li> | ||
30 | <p>{{ 'config.otp.app.two_factor_code_description_4'|trans }}</p> | ||
31 | |||
32 | {% for flashMessage in app.session.flashbag.get("two_factor") %} | ||
33 | <div class="card-panel red darken-1 black-text"> | ||
34 | {{ flashMessage|trans }} | ||
35 | </div> | ||
36 | {% endfor %} | ||
37 | |||
38 | <form class="form" action="{{ path("config_otp_app_check") }}" method="post"> | ||
39 | <div class="card-content"> | ||
40 | <div class="row"> | ||
41 | <div class="input-field col s12"> | ||
42 | <label for="_auth_code">{{ "scheb_two_factor.auth_code"|trans }}</label> | ||
43 | <input id="_auth_code" type="text" autocomplete="off" name="_auth_code" /> | ||
44 | </div> | ||
45 | </div> | ||
46 | </div> | ||
47 | <div class="card-action"> | ||
48 | <a href="{{ path('config_otp_app_cancel') }}" class="waves-effect waves-light grey btn"> | ||
49 | {{ 'config.otp.app.cancel'|trans }} | ||
50 | </a> | ||
51 | <button class="btn waves-effect waves-light" type="submit" name="send"> | ||
52 | {{ 'config.otp.app.enable'|trans }} | ||
53 | <i class="material-icons right">send</i> | ||
54 | </button> | ||
55 | </div> | ||
56 | </form> | ||
57 | </li> | ||
58 | </ol> | ||
59 | </div> | ||
60 | </div> | ||
61 | </div> | ||
62 | </div> | ||
63 | {% endblock %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 742dd330..476d7403 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | {% block head %} | 3 | {% block head %} |
4 | {{ parent() }} | 4 | {{ parent() }} |
5 | {% if tag is defined and app.user.config.rssToken %} | 5 | {% if tag is defined and app.user.config.feedToken %} |
6 | <link rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" /> | 6 | <link rel="alternate" type="application/atom+xml" href="{{ path('tag_feed', {'username': app.user.username, 'token': app.user.config.feedToken, 'slug': tag.slug}) }}" /> |
7 | {% endif %} | 7 | {% endif %} |
8 | {% endblock %} | 8 | {% endblock %} |
9 | 9 | ||
@@ -21,12 +21,15 @@ | |||
21 | {% block content %} | 21 | {% block content %} |
22 | {% set listMode = app.user.config.listMode %} | 22 | {% set listMode = app.user.config.listMode %} |
23 | {% set currentRoute = app.request.attributes.get('_route') %} | 23 | {% set currentRoute = app.request.attributes.get('_route') %} |
24 | {% if currentRoute == 'homepage' %} | ||
25 | {% set currentRoute = 'unread' %} | ||
26 | {% endif %} | ||
24 | <div class="results"> | 27 | <div class="results"> |
25 | <div class="nb-results"> | 28 | <div class="nb-results"> |
26 | {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} | 29 | {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} |
27 | <a href="{{ path('switch_view_mode') }}"><i class="material-icons">{% if listMode == 0 %}view_list{% else %}view_module{% endif %}</i></a> | 30 | <a href="{{ path('switch_view_mode') }}"><i class="material-icons">{% if listMode == 0 %}view_list{% else %}view_module{% endif %}</i></a> |
28 | {% if app.user.config.rssToken %} | 31 | {% if app.user.config.feedToken %} |
29 | {% include "@WallabagCore/themes/common/Entry/_rss_link.html.twig" %} | 32 | {% include "@WallabagCore/themes/common/Entry/_feed_link.html.twig" %} |
30 | {% endif %} | 33 | {% endif %} |
31 | </div> | 34 | </div> |
32 | {% if entries.getNbPages > 1 %} | 35 | {% if entries.getNbPages > 1 %} |
@@ -60,9 +63,6 @@ | |||
60 | {% if tag is defined %} | 63 | {% if tag is defined %} |
61 | {% set currentTag = tag.slug %} | 64 | {% set currentTag = tag.slug %} |
62 | {% endif %} | 65 | {% endif %} |
63 | {% if currentRoute == 'homepage' %} | ||
64 | {% set currentRoute = 'unread' %} | ||
65 | {% endif %} | ||
66 | <h4 class="center">{{ 'entry.list.export_title'|trans }}</h4> | 66 | <h4 class="center">{{ 'entry.list.export_title'|trans }}</h4> |
67 | <ul> | 67 | <ul> |
68 | {% if craue_setting('export_epub') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'epub', 'tag' : currentTag }) }}">EPUB</a></li>{% endif %} | 68 | {% if craue_setting('export_epub') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'epub', 'tag' : currentTag }) }}">EPUB</a></li>{% endif %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig index c15b5146..79907bbb 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig | |||
@@ -13,9 +13,20 @@ | |||
13 | <ul class="card-tag-labels"> | 13 | <ul class="card-tag-labels"> |
14 | {% for tag in tags %} | 14 | {% for tag in tags %} |
15 | <li title="{{tag.label}} ({{ tag.nbEntries }})" id="tag-{{ tag.id }}"> | 15 | <li title="{{tag.label}} ({{ tag.nbEntries }})" id="tag-{{ tag.id }}"> |
16 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}" class="card-tag-link">{{tag.label}} ({{ tag.nbEntries }})</a> | 16 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}" class="card-tag-link" data-handle="tag-link"> |
17 | {% if app.user.config.rssToken %} | 17 | {{ tag.label }} ({{ tag.nbEntries }}) |
18 | <a rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" class="card-tag-rss"><i class="material-icons">rss_feed</i></a> | 18 | </a> |
19 | {% if renameForms is defined and renameForms[tag.id] is defined %} | ||
20 | <form class="card-tag-form hidden" data-handle="tag-rename-form" action="{{ path('tag_rename', {'slug': tag.slug})}}" method="POST"> | ||
21 | {{ form_widget(renameForms[tag.id].label, {'attr': {'value': tag.label}}) }} | ||
22 | {{ form_rest(renameForms[tag.id]) }} | ||
23 | </form> | ||
24 | <a class="card-tag-rename" data-handler="tag-rename" href="javascript:void(0);"> | ||
25 | <i class="material-icons">mode_edit</i> | ||
26 | </a> | ||
27 | {% endif %} | ||
28 | {% if app.user.config.feedToken %} | ||
29 | <a rel="alternate" type="application/atom+xml" href="{{ path('tag_feed', {'username': app.user.username, 'token': app.user.config.feedToken, 'slug': tag.slug}) }}" class="card-tag-rss"><i class="material-icons">rss_feed</i></a> | ||
19 | {% endif %} | 30 | {% endif %} |
20 | </li> | 31 | </li> |
21 | {% endfor %} | 32 | {% endfor %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 052a8c01..b9c45567 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -46,6 +46,8 @@ | |||
46 | {% set activeRoute = 'starred' %} | 46 | {% set activeRoute = 'starred' %} |
47 | {% elseif currentRoute == 'unread' or currentRoute == 'homepage' or currentRouteFromQueryParams == 'unread' %} | 47 | {% elseif currentRoute == 'unread' or currentRoute == 'homepage' or currentRouteFromQueryParams == 'unread' %} |
48 | {% set activeRoute = 'unread' %} | 48 | {% set activeRoute = 'unread' %} |
49 | {% elseif currentRoute == 'untagged' %} | ||
50 | {% set activeRoute = 'untagged' %} | ||
49 | {% endif %} | 51 | {% endif %} |
50 | 52 | ||
51 | <li class="bold {% if activeRoute == 'unread' %}active{% endif %}"> | 53 | <li class="bold {% if activeRoute == 'unread' %}active{% endif %}"> |
@@ -113,6 +115,13 @@ | |||
113 | <i class="material-icons">search</i> | 115 | <i class="material-icons">search</i> |
114 | </a> | 116 | </a> |
115 | </li> | 117 | </li> |
118 | {% if activeRoute %} | ||
119 | <li id="button_random"> | ||
120 | <a class="waves-effect tooltipped js-random-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.random_entry'|trans }}" href="{{ path('random_entry', { 'type': activeRoute }) }}"> | ||
121 | <i class="material-icons">casino</i> | ||
122 | </a> | ||
123 | </li> | ||
124 | {% endif %} | ||
116 | <li id="button_filters"> | 125 | <li id="button_filters"> |
117 | <a class="nav-panel-menu button-collapse-right tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters"> | 126 | <a class="nav-panel-menu button-collapse-right tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters"> |
118 | <i class="material-icons">filter_list</i> | 127 | <i class="material-icons">filter_list</i> |
@@ -125,7 +134,7 @@ | |||
125 | </li> | 134 | </li> |
126 | </ul> | 135 | </ul> |
127 | </div> | 136 | </div> |
128 | {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }} | 137 | {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': currentRoute})) }} |
129 | {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }} | 138 | {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }} |
130 | </div> | 139 | </div> |
131 | </nav> | 140 | </nav> |