diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
49 files changed, 1186 insertions, 282 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 51d6ab47..e09b0f18 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -41,6 +41,7 @@ services: | |||
41 | arguments: | 41 | arguments: |
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 | - "@wallabag_core.guzzle.http_client" | 45 | - "@wallabag_core.guzzle.http_client" |
45 | - "@wallabag_core.graby.config_builder" | 46 | - "@wallabag_core.graby.config_builder" |
46 | calls: | 47 | calls: |
@@ -62,7 +63,11 @@ services: | |||
62 | class: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder | 63 | class: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder |
63 | arguments: | 64 | arguments: |
64 | - "@wallabag_core.graby.config_builder" | 65 | - "@wallabag_core.graby.config_builder" |
65 | - "%sites_credentials%" | 66 | - "@security.token_storage" |
67 | - "@wallabag_core.site_credential_repository" | ||
68 | - '@logger' | ||
69 | tags: | ||
70 | - { name: monolog.logger, channel: graby } | ||
66 | 71 | ||
67 | # service alias override | 72 | # service alias override |
68 | bd_guzzle_site_authenticator.site_config_builder: | 73 | bd_guzzle_site_authenticator.site_config_builder: |
@@ -71,10 +76,11 @@ services: | |||
71 | wallabag_core.guzzle.http_client_factory: | 76 | wallabag_core.guzzle.http_client_factory: |
72 | class: Wallabag\CoreBundle\Helper\HttpClientFactory | 77 | class: Wallabag\CoreBundle\Helper\HttpClientFactory |
73 | arguments: | 78 | arguments: |
74 | - "@bd_guzzle_site_authenticator.authenticator_subscriber" | ||
75 | - "@wallabag_core.guzzle.cookie_jar" | 79 | - "@wallabag_core.guzzle.cookie_jar" |
76 | - '@=service(''craue_config'').get(''restricted_access'')' | 80 | - '@=service(''craue_config'').get(''restricted_access'')' |
77 | - '@logger' | 81 | - '@logger' |
82 | calls: | ||
83 | - ["addSubscriber", ["@bd_guzzle_site_authenticator.authenticator_subscriber"]] | ||
78 | 84 | ||
79 | wallabag_core.guzzle.cookie_jar: | 85 | wallabag_core.guzzle.cookie_jar: |
80 | class: GuzzleHttp\Cookie\FileCookieJar | 86 | class: GuzzleHttp\Cookie\FileCookieJar |
@@ -85,16 +91,22 @@ services: | |||
85 | arguments: | 91 | arguments: |
86 | - "@wallabag_core.graby" | 92 | - "@wallabag_core.graby" |
87 | - "@wallabag_core.rule_based_tagger" | 93 | - "@wallabag_core.rule_based_tagger" |
88 | - "@wallabag_core.tag_repository" | 94 | - "@validator" |
89 | - "@logger" | 95 | - "@logger" |
90 | - '%wallabag_core.fetching_error_message%' | 96 | - '%wallabag_core.fetching_error_message%' |
91 | 97 | ||
98 | wallabag_core.tags_assigner: | ||
99 | class: Wallabag\CoreBundle\Helper\TagsAssigner | ||
100 | arguments: | ||
101 | - "@wallabag_core.tag_repository" | ||
102 | |||
92 | wallabag_core.rule_based_tagger: | 103 | wallabag_core.rule_based_tagger: |
93 | class: Wallabag\CoreBundle\Helper\RuleBasedTagger | 104 | class: Wallabag\CoreBundle\Helper\RuleBasedTagger |
94 | arguments: | 105 | arguments: |
95 | - "@rulerz" | 106 | - "@rulerz" |
96 | - "@wallabag_core.tag_repository" | 107 | - "@wallabag_core.tag_repository" |
97 | - "@wallabag_core.entry_repository" | 108 | - "@wallabag_core.entry_repository" |
109 | - "@logger" | ||
98 | 110 | ||
99 | # repository as a service | 111 | # repository as a service |
100 | wallabag_core.entry_repository: | 112 | wallabag_core.entry_repository: |
@@ -109,10 +121,18 @@ services: | |||
109 | arguments: | 121 | arguments: |
110 | - WallabagCoreBundle:Tag | 122 | - WallabagCoreBundle:Tag |
111 | 123 | ||
124 | wallabag_core.site_credential_repository: | ||
125 | class: Wallabag\CoreBundle\Repository\SiteCredentialRepository | ||
126 | factory: [ "@doctrine.orm.default_entity_manager", getRepository ] | ||
127 | arguments: | ||
128 | - WallabagCoreBundle:SiteCredential | ||
129 | calls: | ||
130 | - [ setCrypto, [ "@wallabag_core.helper.crypto_proxy" ] ] | ||
131 | |||
112 | wallabag_core.helper.entries_export: | 132 | wallabag_core.helper.entries_export: |
113 | class: Wallabag\CoreBundle\Helper\EntriesExport | 133 | class: Wallabag\CoreBundle\Helper\EntriesExport |
114 | arguments: | 134 | arguments: |
115 | - '@=service(''craue_config'').get(''wallabag_url'')' | 135 | - '%domain_name%' |
116 | - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png | 136 | - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png |
117 | 137 | ||
118 | wallabag.operator.array.matches: | 138 | wallabag.operator.array.matches: |
@@ -125,6 +145,16 @@ services: | |||
125 | tags: | 145 | tags: |
126 | - { name: rulerz.operator, target: doctrine, operator: matches, inline: true } | 146 | - { name: rulerz.operator, target: doctrine, operator: matches, inline: true } |
127 | 147 | ||
148 | wallabag.operator.array.notmatches: | ||
149 | class: Wallabag\CoreBundle\Operator\PHP\NotMatches | ||
150 | tags: | ||
151 | - { name: rulerz.operator, target: native, operator: notmatches } | ||
152 | |||
153 | wallabag.operator.doctrine.notmatches: | ||
154 | class: Wallabag\CoreBundle\Operator\Doctrine\NotMatches | ||
155 | tags: | ||
156 | - { name: rulerz.operator, target: doctrine, operator: notmatches, inline: true } | ||
157 | |||
128 | wallabag_core.helper.redirect: | 158 | wallabag_core.helper.redirect: |
129 | class: Wallabag\CoreBundle\Helper\Redirect | 159 | class: Wallabag\CoreBundle\Helper\Redirect |
130 | arguments: | 160 | arguments: |
@@ -175,8 +205,14 @@ services: | |||
175 | arguments: | 205 | arguments: |
176 | - "@wallabag_core.entry.download_images.client" | 206 | - "@wallabag_core.entry.download_images.client" |
177 | - "%kernel.root_dir%/../web/assets/images" | 207 | - "%kernel.root_dir%/../web/assets/images" |
178 | - '@=service(''craue_config'').get(''wallabag_url'')' | 208 | - '%domain_name%' |
179 | - "@logger" | 209 | - "@logger" |
180 | 210 | ||
181 | wallabag_core.entry.download_images.client: | 211 | wallabag_core.entry.download_images.client: |
182 | class: GuzzleHttp\Client | 212 | class: GuzzleHttp\Client |
213 | |||
214 | wallabag_core.helper.crypto_proxy: | ||
215 | class: Wallabag\CoreBundle\Helper\CryptoProxy | ||
216 | arguments: | ||
217 | - "%wallabag_core.site_credentials.encryption_key_path%" | ||
218 | - "@logger" | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index a52b579a..5229ac73 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -32,6 +32,7 @@ menu: | |||
32 | # save_link: 'Save a link' | 32 | # save_link: 'Save a link' |
33 | back_to_unread: 'Tilbage til de ulæste artikler' | 33 | back_to_unread: 'Tilbage til de ulæste artikler' |
34 | # users_management: 'Users management' | 34 | # users_management: 'Users management' |
35 | # site_credentials: 'Site credentials' | ||
35 | top: | 36 | top: |
36 | add_new_entry: 'Tilføj ny artikel' | 37 | add_new_entry: 'Tilføj ny artikel' |
37 | search: 'Søg' | 38 | search: 'Søg' |
@@ -76,6 +77,7 @@ config: | |||
76 | # redirect_current_page: 'To the current page' | 77 | # redirect_current_page: 'To the current page' |
77 | pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer | 78 | pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer |
78 | # android_configuration: Configure your Android application | 79 | # android_configuration: Configure your Android application |
80 | # android_instruction: "Touch here to prefill your Android application" | ||
79 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 81 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
80 | # help_items_per_page: "You can change the number of articles displayed on each page." | 82 | # help_items_per_page: "You can change the number of articles displayed on each page." |
81 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." | 83 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
@@ -89,9 +91,10 @@ config: | |||
89 | token_reset: 'Nulstil token' | 91 | token_reset: 'Nulstil token' |
90 | rss_links: 'RSS-Links' | 92 | rss_links: 'RSS-Links' |
91 | rss_link: | 93 | rss_link: |
92 | unread: 'ulæst' | 94 | unread: 'Ulæst' |
93 | starred: 'favoritter' | 95 | starred: 'Favoritter' |
94 | archive: 'arkiv' | 96 | archive: 'Arkiv' |
97 | # all: 'All' | ||
95 | # rss_limit: 'Number of items in the feed' | 98 | # rss_limit: 'Number of items in the feed' |
96 | form_user: | 99 | form_user: |
97 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion" | 100 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion" |
@@ -110,6 +113,7 @@ config: | |||
110 | # annotations: Remove ALL annotations | 113 | # annotations: Remove ALL annotations |
111 | # tags: Remove ALL tags | 114 | # tags: Remove ALL tags |
112 | # entries: Remove ALL entries | 115 | # entries: Remove ALL entries |
116 | # archived: Remove ALL archived entries | ||
113 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | 117 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) |
114 | form_password: | 118 | form_password: |
115 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 119 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
@@ -154,6 +158,7 @@ config: | |||
154 | # or: 'One rule OR another' | 158 | # or: 'One rule OR another' |
155 | # and: 'One rule AND another' | 159 | # and: 'One rule AND another' |
156 | # matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' | 160 | # matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' |
161 | # notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | ||
157 | 162 | ||
158 | entry: | 163 | entry: |
159 | page_titles: | 164 | page_titles: |
@@ -185,6 +190,8 @@ entry: | |||
185 | unread_label: 'Ulæst' | 190 | unread_label: 'Ulæst' |
186 | preview_picture_label: 'Har et vist billede' | 191 | preview_picture_label: 'Har et vist billede' |
187 | preview_picture_help: 'Forhåndsvis billede' | 192 | preview_picture_help: 'Forhåndsvis billede' |
193 | # is_public_label: 'Has a public link' | ||
194 | # is_public_help: 'Public link' | ||
188 | language_label: 'Sprog' | 195 | language_label: 'Sprog' |
189 | # http_status_label: 'HTTP status' | 196 | # http_status_label: 'HTTP status' |
190 | reading_time: | 197 | reading_time: |
@@ -223,6 +230,8 @@ entry: | |||
223 | original_article: 'original' | 230 | original_article: 'original' |
224 | # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' | 231 | # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' |
225 | created_at: 'Oprettelsesdato' | 232 | created_at: 'Oprettelsesdato' |
233 | # published_at: 'Publication date' | ||
234 | # published_by: 'Published by' | ||
226 | new: | 235 | new: |
227 | page_title: 'Gem ny artikel' | 236 | page_title: 'Gem ny artikel' |
228 | placeholder: 'http://website.com' | 237 | placeholder: 'http://website.com' |
@@ -234,10 +243,12 @@ entry: | |||
234 | # page_title: 'Edit an entry' | 243 | # page_title: 'Edit an entry' |
235 | # title_label: 'Title' | 244 | # title_label: 'Title' |
236 | url_label: 'Url' | 245 | url_label: 'Url' |
237 | # is_public_label: 'Public' | ||
238 | save_label: 'Gem' | 246 | save_label: 'Gem' |
239 | public: | 247 | public: |
240 | # shared_by_wallabag: "This article has been shared by <a href=%wallabag_instance%'>wallabag</a>" | 248 | # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" |
249 | confirm: | ||
250 | # delete: "Are you sure you want to remove that article?" | ||
251 | # delete_tag: "Are you sure you want to remove that tag from that article?" | ||
241 | 252 | ||
242 | about: | 253 | about: |
243 | page_title: 'Om' | 254 | page_title: 'Om' |
@@ -510,6 +521,28 @@ user: | |||
510 | # delete: Delete | 521 | # delete: Delete |
511 | # delete_confirm: Are you sure? | 522 | # delete_confirm: Are you sure? |
512 | # back_to_list: Back to list | 523 | # back_to_list: Back to list |
524 | search: | ||
525 | # placeholder: Filter by username or email | ||
526 | |||
527 | site_credential: | ||
528 | # page_title: Site credentials management | ||
529 | # new_site_credential: Create a credential | ||
530 | # edit_site_credential: Edit an existing credential | ||
531 | # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." | ||
532 | # list: | ||
533 | # actions: Actions | ||
534 | # edit_action: Edit | ||
535 | # yes: Yes | ||
536 | # no: No | ||
537 | # create_new_one: Create a new credential | ||
538 | # form: | ||
539 | # username_label: 'Username' | ||
540 | # host_label: 'Host' | ||
541 | # password_label: 'Password' | ||
542 | # save: Save | ||
543 | # delete: Delete | ||
544 | # delete_confirm: Are you sure? | ||
545 | # back_to_list: Back to list | ||
513 | 546 | ||
514 | error: | 547 | error: |
515 | # page_title: An error occurred | 548 | # page_title: An error occurred |
@@ -528,6 +561,7 @@ flashes: | |||
528 | # annotations_reset: Annotations reset | 561 | # annotations_reset: Annotations reset |
529 | # tags_reset: Tags reset | 562 | # tags_reset: Tags reset |
530 | # entries_reset: Entries reset | 563 | # entries_reset: Entries reset |
564 | # archived_reset: Archived entries deleted | ||
531 | entry: | 565 | entry: |
532 | notice: | 566 | notice: |
533 | # entry_already_saved: 'Entry already saved on %date%' | 567 | # entry_already_saved: 'Entry already saved on %date%' |
@@ -562,3 +596,8 @@ flashes: | |||
562 | # added: 'User "%username%" added' | 596 | # added: 'User "%username%" added' |
563 | # updated: 'User "%username%" updated' | 597 | # updated: 'User "%username%" updated' |
564 | # deleted: 'User "%username%" deleted' | 598 | # deleted: 'User "%username%" deleted' |
599 | site_credential: | ||
600 | notice: | ||
601 | # added: 'Site credential for "%host%" added' | ||
602 | # updated: 'Site credential for "%host%" updated' | ||
603 | # deleted: 'Site credential for "%host%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 35cb4b5b..996f173a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -32,6 +32,7 @@ menu: | |||
32 | save_link: 'Link speichern' | 32 | save_link: 'Link speichern' |
33 | back_to_unread: 'Zurück zu ungelesenen Artikeln' | 33 | back_to_unread: 'Zurück zu ungelesenen Artikeln' |
34 | users_management: 'Benutzerverwaltung' | 34 | users_management: 'Benutzerverwaltung' |
35 | # site_credentials: 'Site credentials' | ||
35 | top: | 36 | top: |
36 | add_new_entry: 'Neuen Artikel hinzufügen' | 37 | add_new_entry: 'Neuen Artikel hinzufügen' |
37 | search: 'Suche' | 38 | search: 'Suche' |
@@ -76,6 +77,7 @@ config: | |||
76 | redirect_current_page: 'Zur aktuellen Seite' | 77 | redirect_current_page: 'Zur aktuellen Seite' |
77 | pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren | 78 | pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren |
78 | android_configuration: Konfiguriere deine Android Application | 79 | android_configuration: Konfiguriere deine Android Application |
80 | # android_instruction: "Touch here to prefill your Android application" | ||
79 | help_theme: "wallabag ist anpassbar. Du kannst dein bevorzugtes Theme hier auswählen." | 81 | help_theme: "wallabag ist anpassbar. Du kannst dein bevorzugtes Theme hier auswählen." |
80 | help_items_per_page: "Du kannst die Nummer von Artikeln pro Seite anpassen." | 82 | help_items_per_page: "Du kannst die Nummer von Artikeln pro Seite anpassen." |
81 | 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." | 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." |
@@ -92,6 +94,7 @@ config: | |||
92 | unread: 'Ungelesene' | 94 | unread: 'Ungelesene' |
93 | starred: 'Favoriten' | 95 | starred: 'Favoriten' |
94 | archive: 'Archivierte' | 96 | archive: 'Archivierte' |
97 | # all: 'All' | ||
95 | rss_limit: 'Anzahl der Einträge pro Feed' | 98 | rss_limit: 'Anzahl der Einträge pro Feed' |
96 | form_user: | 99 | form_user: |
97 | 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" | 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" |
@@ -110,6 +113,7 @@ config: | |||
110 | annotations: Entferne ALLE Annotationen | 113 | annotations: Entferne ALLE Annotationen |
111 | tags: Entferne ALLE Tags | 114 | tags: Entferne ALLE Tags |
112 | entries: Entferne ALLE Einträge | 115 | entries: Entferne ALLE Einträge |
116 | archived: Entferne ALLE archivierten Einträge | ||
113 | confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN) | 117 | confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN) |
114 | form_password: | 118 | form_password: |
115 | description: "Hier kannst du dein Kennwort ändern. Dieses sollte mindestens acht Zeichen enthalten." | 119 | description: "Hier kannst du dein Kennwort ändern. Dieses sollte mindestens acht Zeichen enthalten." |
@@ -154,6 +158,7 @@ config: | |||
154 | or: 'Eine Regel ODER die andere' | 158 | or: 'Eine Regel ODER die andere' |
155 | and: 'Eine Regel UND eine andere' | 159 | and: 'Eine Regel UND eine andere' |
156 | matches: 'Testet, ob eine <i>Variable</i> auf eine <i>Suche</i> zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).<br />Beispiel: <code>title matches "Fußball"</code>' | 160 | matches: 'Testet, ob eine <i>Variable</i> auf eine <i>Suche</i> zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).<br />Beispiel: <code>title matches "Fußball"</code>' |
161 | notmatches: 'Testet, ob ein <i>Titel</i> nicht auf eine <i>Suche</i> zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).<br />Beispiel: <code>title notmatches "Fußball"</code>' | ||
157 | 162 | ||
158 | entry: | 163 | entry: |
159 | page_titles: | 164 | page_titles: |
@@ -185,6 +190,8 @@ entry: | |||
185 | unread_label: 'Ungelesene' | 190 | unread_label: 'Ungelesene' |
186 | preview_picture_label: 'Vorschaubild vorhanden' | 191 | preview_picture_label: 'Vorschaubild vorhanden' |
187 | preview_picture_help: 'Vorschaubild' | 192 | preview_picture_help: 'Vorschaubild' |
193 | # is_public_label: 'Has a public link' | ||
194 | # is_public_help: 'Public link' | ||
188 | language_label: 'Sprache' | 195 | language_label: 'Sprache' |
189 | http_status_label: 'HTTP-Status' | 196 | http_status_label: 'HTTP-Status' |
190 | reading_time: | 197 | reading_time: |
@@ -223,6 +230,8 @@ entry: | |||
223 | original_article: 'original' | 230 | original_article: 'original' |
224 | annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %count% Anmerkungen' | 231 | annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %count% Anmerkungen' |
225 | created_at: 'Erstellungsdatum' | 232 | created_at: 'Erstellungsdatum' |
233 | published_at: 'Erscheinungsdatum' | ||
234 | published_by: 'Veröffentlicht von' | ||
226 | new: | 235 | new: |
227 | page_title: 'Neuen Artikel speichern' | 236 | page_title: 'Neuen Artikel speichern' |
228 | placeholder: 'https://website.de' | 237 | placeholder: 'https://website.de' |
@@ -234,10 +243,12 @@ entry: | |||
234 | page_title: 'Eintrag bearbeiten' | 243 | page_title: 'Eintrag bearbeiten' |
235 | title_label: 'Titel' | 244 | title_label: 'Titel' |
236 | url_label: 'URL' | 245 | url_label: 'URL' |
237 | is_public_label: 'Öffentlich' | ||
238 | save_label: 'Speichern' | 246 | save_label: 'Speichern' |
239 | public: | 247 | public: |
240 | shared_by_wallabag: "Dieser Artikel wurde mittels <a href='%wallabag_instance%'>wallabag</a> geteilt" | 248 | shared_by_wallabag: "Dieser Artikel wurde von %username% mittels <a href='%wallabag_instance%'>wallabag</a> geteilt" |
249 | confirm: | ||
250 | delete: "Bist du sicher, dass du diesen Artikel löschen möchtest?" | ||
251 | delete_tag: "Bist du sicher, dass du diesen Tag vom Artikel entfernen möchtest?" | ||
241 | 252 | ||
242 | about: | 253 | about: |
243 | page_title: 'Über' | 254 | page_title: 'Über' |
@@ -510,6 +521,28 @@ user: | |||
510 | delete: Löschen | 521 | delete: Löschen |
511 | delete_confirm: Bist du sicher? | 522 | delete_confirm: Bist du sicher? |
512 | back_to_list: Zurück zur Liste | 523 | back_to_list: Zurück zur Liste |
524 | search: | ||
525 | placeholder: Filtere nach Benutzer oder E-Mail-Adresse | ||
526 | |||
527 | site_credential: | ||
528 | # page_title: Site credentials management | ||
529 | # new_site_credential: Create a credential | ||
530 | # edit_site_credential: Edit an existing credential | ||
531 | # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." | ||
532 | list: | ||
533 | actions: Aktionen | ||
534 | edit_action: Bearbeiten | ||
535 | yes: Ja | ||
536 | no: Nein | ||
537 | # create_new_one: Create a new credential | ||
538 | form: | ||
539 | # username_label: 'Username' | ||
540 | # host_label: 'Host' | ||
541 | # password_label: 'Password' | ||
542 | save: Speichern | ||
543 | delete: Löschen | ||
544 | delete_confirm: Bist du sicher? | ||
545 | back_to_list: Zurück zur Liste | ||
513 | 546 | ||
514 | error: | 547 | error: |
515 | page_title: Ein Fehler ist aufgetreten | 548 | page_title: Ein Fehler ist aufgetreten |
@@ -528,6 +561,7 @@ flashes: | |||
528 | annotations_reset: Anmerkungen zurücksetzen | 561 | annotations_reset: Anmerkungen zurücksetzen |
529 | tags_reset: Tags zurücksetzen | 562 | tags_reset: Tags zurücksetzen |
530 | entries_reset: Einträge zurücksetzen | 563 | entries_reset: Einträge zurücksetzen |
564 | archived_reset: Archiverte Einträge zurücksetzen | ||
531 | entry: | 565 | entry: |
532 | notice: | 566 | notice: |
533 | entry_already_saved: 'Eintrag bereits am %date% gespeichert' | 567 | entry_already_saved: 'Eintrag bereits am %date% gespeichert' |
@@ -562,3 +596,8 @@ flashes: | |||
562 | added: 'Benutzer "%username%" hinzugefügt' | 596 | added: 'Benutzer "%username%" hinzugefügt' |
563 | updated: 'Benutzer "%username%" aktualisiert' | 597 | updated: 'Benutzer "%username%" aktualisiert' |
564 | deleted: 'Benutzer "%username%" gelöscht' | 598 | deleted: 'Benutzer "%username%" gelöscht' |
599 | site_credential: | ||
600 | notice: | ||
601 | # added: 'Site credential for "%host%" added' | ||
602 | # updated: 'Site credential for "%host%" updated' | ||
603 | # deleted: 'Site credential for "%host%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index c72e5958..aa1cd1a9 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -32,6 +32,7 @@ menu: | |||
32 | save_link: 'Save a link' | 32 | save_link: 'Save a link' |
33 | back_to_unread: 'Back to unread articles' | 33 | back_to_unread: 'Back to unread articles' |
34 | users_management: 'Users management' | 34 | users_management: 'Users management' |
35 | site_credentials: 'Site credentials' | ||
35 | top: | 36 | top: |
36 | add_new_entry: 'Add a new entry' | 37 | add_new_entry: 'Add a new entry' |
37 | search: 'Search' | 38 | search: 'Search' |
@@ -76,6 +77,7 @@ config: | |||
76 | redirect_current_page: 'To the current page' | 77 | redirect_current_page: 'To the current page' |
77 | pocket_consumer_key_label: Consumer key for Pocket to import contents | 78 | pocket_consumer_key_label: Consumer key for Pocket to import contents |
78 | android_configuration: Configure your Android application | 79 | android_configuration: Configure your Android application |
80 | android_instruction: "Touch here to prefill your Android application" | ||
79 | help_theme: "wallabag is customizable. You can choose your prefered theme here." | 81 | help_theme: "wallabag is customizable. You can choose your prefered theme here." |
80 | help_items_per_page: "You can change the number of articles displayed on each page." | 82 | help_items_per_page: "You can change the number of articles displayed on each page." |
81 | help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." | 83 | help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
@@ -89,9 +91,10 @@ config: | |||
89 | token_reset: 'Regenerate your token' | 91 | token_reset: 'Regenerate your token' |
90 | rss_links: 'RSS links' | 92 | rss_links: 'RSS links' |
91 | rss_link: | 93 | rss_link: |
92 | unread: 'unread' | 94 | unread: 'Unread' |
93 | starred: 'starred' | 95 | starred: 'Starred' |
94 | archive: 'archived' | 96 | archive: 'Archived' |
97 | all: 'All' | ||
95 | rss_limit: 'Number of items in the feed' | 98 | rss_limit: 'Number of items in the feed' |
96 | form_user: | 99 | form_user: |
97 | two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connection." | 100 | two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connection." |
@@ -110,6 +113,7 @@ config: | |||
110 | annotations: Remove ALL annotations | 113 | annotations: Remove ALL annotations |
111 | tags: Remove ALL tags | 114 | tags: Remove ALL tags |
112 | entries: Remove ALL entries | 115 | entries: Remove ALL entries |
116 | archived: Remove ALL archived entries | ||
113 | confirm: Are you really sure? (THIS CAN'T BE UNDONE) | 117 | confirm: Are you really sure? (THIS CAN'T BE UNDONE) |
114 | form_password: | 118 | form_password: |
115 | description: "You can change your password here. Your new password should by at least 8 characters long." | 119 | description: "You can change your password here. Your new password should by at least 8 characters long." |
@@ -154,6 +158,7 @@ config: | |||
154 | or: 'One rule OR another' | 158 | or: 'One rule OR another' |
155 | and: 'One rule AND another' | 159 | and: 'One rule AND another' |
156 | matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' | 160 | matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' |
161 | notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | ||
157 | 162 | ||
158 | entry: | 163 | entry: |
159 | page_titles: | 164 | page_titles: |
@@ -185,6 +190,8 @@ entry: | |||
185 | unread_label: 'Unread' | 190 | unread_label: 'Unread' |
186 | preview_picture_label: 'Has a preview picture' | 191 | preview_picture_label: 'Has a preview picture' |
187 | preview_picture_help: 'Preview picture' | 192 | preview_picture_help: 'Preview picture' |
193 | is_public_label: 'Has a public link' | ||
194 | is_public_help: 'Public link' | ||
188 | language_label: 'Language' | 195 | language_label: 'Language' |
189 | http_status_label: 'HTTP status' | 196 | http_status_label: 'HTTP status' |
190 | reading_time: | 197 | reading_time: |
@@ -223,6 +230,8 @@ entry: | |||
223 | original_article: 'original' | 230 | original_article: 'original' |
224 | annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' | 231 | annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' |
225 | created_at: 'Creation date' | 232 | created_at: 'Creation date' |
233 | published_at: 'Publication date' | ||
234 | published_by: 'Published by' | ||
226 | new: | 235 | new: |
227 | page_title: 'Save new entry' | 236 | page_title: 'Save new entry' |
228 | placeholder: 'http://website.com' | 237 | placeholder: 'http://website.com' |
@@ -234,10 +243,12 @@ entry: | |||
234 | page_title: 'Edit an entry' | 243 | page_title: 'Edit an entry' |
235 | title_label: 'Title' | 244 | title_label: 'Title' |
236 | url_label: 'Url' | 245 | url_label: 'Url' |
237 | is_public_label: 'Public' | ||
238 | save_label: 'Save' | 246 | save_label: 'Save' |
239 | public: | 247 | public: |
240 | shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" | 248 | shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" |
249 | confirm: | ||
250 | delete: "Are you sure you want to remove that article?" | ||
251 | delete_tag: "Are you sure you want to remove that tag from that article?" | ||
241 | 252 | ||
242 | about: | 253 | about: |
243 | page_title: 'About' | 254 | page_title: 'About' |
@@ -510,6 +521,28 @@ user: | |||
510 | delete: Delete | 521 | delete: Delete |
511 | delete_confirm: Are you sure? | 522 | delete_confirm: Are you sure? |
512 | back_to_list: Back to list | 523 | back_to_list: Back to list |
524 | search: | ||
525 | placeholder: Filter by username or email | ||
526 | |||
527 | site_credential: | ||
528 | page_title: Site credentials management | ||
529 | new_site_credential: Create a credential | ||
530 | edit_site_credential: Edit an existing credential | ||
531 | description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." | ||
532 | list: | ||
533 | actions: Actions | ||
534 | edit_action: Edit | ||
535 | yes: Yes | ||
536 | no: No | ||
537 | create_new_one: Create a new credential | ||
538 | form: | ||
539 | username_label: 'Username' | ||
540 | host_label: 'Host' | ||
541 | password_label: 'Password' | ||
542 | save: Save | ||
543 | delete: Delete | ||
544 | delete_confirm: Are you sure? | ||
545 | back_to_list: Back to list | ||
513 | 546 | ||
514 | error: | 547 | error: |
515 | page_title: An error occurred | 548 | page_title: An error occurred |
@@ -528,6 +561,7 @@ flashes: | |||
528 | annotations_reset: Annotations reset | 561 | annotations_reset: Annotations reset |
529 | tags_reset: Tags reset | 562 | tags_reset: Tags reset |
530 | entries_reset: Entries reset | 563 | entries_reset: Entries reset |
564 | archived_reset: Archived entries deleted | ||
531 | entry: | 565 | entry: |
532 | notice: | 566 | notice: |
533 | entry_already_saved: 'Entry already saved on %date%' | 567 | entry_already_saved: 'Entry already saved on %date%' |
@@ -562,3 +596,8 @@ flashes: | |||
562 | added: 'User "%username%" added' | 596 | added: 'User "%username%" added' |
563 | updated: 'User "%username%" updated' | 597 | updated: 'User "%username%" updated' |
564 | deleted: 'User "%username%" deleted' | 598 | deleted: 'User "%username%" deleted' |
599 | site_credential: | ||
600 | notice: | ||
601 | added: 'Site credential for "%host%" added' | ||
602 | updated: 'Site credential for "%host%" updated' | ||
603 | deleted: 'Site credential for "%host%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 2f769b7e..96998f53 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -32,6 +32,7 @@ menu: | |||
32 | save_link: 'Guardar un enlace' | 32 | save_link: 'Guardar un enlace' |
33 | back_to_unread: 'Volver a los artículos sin leer' | 33 | back_to_unread: 'Volver a los artículos sin leer' |
34 | users_management: 'Configuración de usuarios' | 34 | users_management: 'Configuración de usuarios' |
35 | # site_credentials: 'Site credentials' | ||
35 | top: | 36 | top: |
36 | add_new_entry: 'Añadir un nuevo artículo' | 37 | add_new_entry: 'Añadir un nuevo artículo' |
37 | search: 'Buscar' | 38 | search: 'Buscar' |
@@ -76,6 +77,7 @@ config: | |||
76 | redirect_current_page: 'A la página actual' | 77 | redirect_current_page: 'A la página actual' |
77 | pocket_consumer_key_label: Clave de consumidor para importar contenidos de Pocket | 78 | pocket_consumer_key_label: Clave de consumidor para importar contenidos de Pocket |
78 | android_configuration: Configura tu aplicación Android | 79 | android_configuration: Configura tu aplicación Android |
80 | # android_instruction: "Touch here to prefill your Android application" | ||
79 | help_theme: "wallabag es personalizable. Puedes elegir tu tema preferido aquí." | 81 | help_theme: "wallabag es personalizable. Puedes elegir tu tema preferido aquí." |
80 | help_items_per_page: "Puedes cambiar el número de artículos mostrados en cada página." | 82 | help_items_per_page: "Puedes cambiar el número de artículos mostrados en cada página." |
81 | 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." | 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." |
@@ -92,6 +94,7 @@ config: | |||
92 | unread: 'sin leer' | 94 | unread: 'sin leer' |
93 | starred: 'favoritos' | 95 | starred: 'favoritos' |
94 | archive: 'archivados' | 96 | archive: 'archivados' |
97 | # all: 'All' | ||
95 | rss_limit: 'Límite de artículos en feed RSS' | 98 | rss_limit: 'Límite de artículos en feed RSS' |
96 | form_user: | 99 | form_user: |
97 | 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." | 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." |
@@ -110,6 +113,7 @@ config: | |||
110 | annotations: Eliminar TODAS las anotaciones | 113 | annotations: Eliminar TODAS las anotaciones |
111 | tags: Eliminar TODAS las etiquetas | 114 | tags: Eliminar TODAS las etiquetas |
112 | entries: Eliminar TODOS los artículos | 115 | entries: Eliminar TODOS los artículos |
116 | # archived: Remove ALL archived entries | ||
113 | confirm: ¿Estás completamente seguro? (NO SE PUEDE DESHACER) | 117 | confirm: ¿Estás completamente seguro? (NO SE PUEDE DESHACER) |
114 | form_password: | 118 | form_password: |
115 | description: "Puedes cambiar la contraseña aquí. Tu nueva contraseña debe tener al menos 8 caracteres." | 119 | description: "Puedes cambiar la contraseña aquí. Tu nueva contraseña debe tener al menos 8 caracteres." |
@@ -154,6 +158,7 @@ config: | |||
154 | or: 'Una regla U otra' | 158 | or: 'Una regla U otra' |
155 | and: 'Una regla Y la otra' | 159 | and: 'Una regla Y la otra' |
156 | 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>' | 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>' |
161 | # notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | ||
157 | 162 | ||
158 | entry: | 163 | entry: |
159 | page_titles: | 164 | page_titles: |
@@ -185,6 +190,8 @@ entry: | |||
185 | unread_label: 'Sin leer' | 190 | unread_label: 'Sin leer' |
186 | preview_picture_label: 'Tiene imagen de previsualización' | 191 | preview_picture_label: 'Tiene imagen de previsualización' |
187 | preview_picture_help: 'Imagen de previsualización' | 192 | preview_picture_help: 'Imagen de previsualización' |
193 | # is_public_label: 'Has a public link' | ||
194 | # is_public_help: 'Public link' | ||
188 | language_label: 'Idioma' | 195 | language_label: 'Idioma' |
189 | http_status_label: 'Código de estado HTTP' | 196 | http_status_label: 'Código de estado HTTP' |
190 | reading_time: | 197 | reading_time: |
@@ -223,6 +230,8 @@ entry: | |||
223 | original_article: 'original' | 230 | original_article: 'original' |
224 | annotations_on_the_entry: '{0} Sin anotaciones|{1} Una anotación|]1,Inf[ %count% anotaciones' | 231 | annotations_on_the_entry: '{0} Sin anotaciones|{1} Una anotación|]1,Inf[ %count% anotaciones' |
225 | created_at: 'Fecha de creación' | 232 | created_at: 'Fecha de creación' |
233 | # published_at: 'Publication date' | ||
234 | # published_by: 'Published by' | ||
226 | new: | 235 | new: |
227 | page_title: 'Guardar un nuevo artículo' | 236 | page_title: 'Guardar un nuevo artículo' |
228 | placeholder: 'http://sitioweb.com' | 237 | placeholder: 'http://sitioweb.com' |
@@ -234,10 +243,12 @@ entry: | |||
234 | page_title: 'Editar un artículo' | 243 | page_title: 'Editar un artículo' |
235 | title_label: 'Título' | 244 | title_label: 'Título' |
236 | url_label: 'URL' | 245 | url_label: 'URL' |
237 | is_public_label: 'Es público' | ||
238 | save_label: 'Guardar' | 246 | save_label: 'Guardar' |
239 | public: | 247 | public: |
240 | shared_by_wallabag: "Este artículo se ha compartido con <a href='%wallabag_instance%'>wallabag</a>" | 248 | shared_by_wallabag: "Este artículo se ha compartido con <a href='%wallabag_instance%'>wallabag</a>" |
249 | confirm: | ||
250 | # delete: "Are you sure you want to remove that article?" | ||
251 | # delete_tag: "Are you sure you want to remove that tag from that article?" | ||
241 | 252 | ||
242 | about: | 253 | about: |
243 | page_title: 'Acerca de' | 254 | page_title: 'Acerca de' |
@@ -510,6 +521,28 @@ user: | |||
510 | delete: Eliminar | 521 | delete: Eliminar |
511 | delete_confirm: ¿Estás seguro? | 522 | delete_confirm: ¿Estás seguro? |
512 | back_to_list: Volver a la lista | 523 | back_to_list: Volver a la lista |
524 | search: | ||
525 | # placeholder: Filter by username or email | ||
526 | |||
527 | site_credential: | ||
528 | # page_title: Site credentials management | ||
529 | # new_site_credential: Create a credential | ||
530 | # edit_site_credential: Edit an existing credential | ||
531 | # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." | ||
532 | # list: | ||
533 | # actions: Actions | ||
534 | # edit_action: Edit | ||
535 | # yes: Yes | ||
536 | # no: No | ||
537 | # create_new_one: Create a new credential | ||
538 | # form: | ||
539 | # username_label: 'Username' | ||
540 | # host_label: 'Host' | ||
541 | # password_label: 'Password' | ||
542 | # save: Save | ||
543 | # delete: Delete | ||
544 | # delete_confirm: Are you sure? | ||
545 | # back_to_list: Back to list | ||
513 | 546 | ||
514 | error: | 547 | error: |
515 | page_title: Ha ocurrido un error | 548 | page_title: Ha ocurrido un error |
@@ -528,6 +561,7 @@ flashes: | |||
528 | annotations_reset: Anotaciones reiniciadas | 561 | annotations_reset: Anotaciones reiniciadas |
529 | tags_reset: Etiquetas reiniciadas | 562 | tags_reset: Etiquetas reiniciadas |
530 | entries_reset: Artículos reiniciados | 563 | entries_reset: Artículos reiniciados |
564 | # archived_reset: Archived entries deleted | ||
531 | entry: | 565 | entry: |
532 | notice: | 566 | notice: |
533 | entry_already_saved: 'Artículo ya guardado el %fecha%' | 567 | entry_already_saved: 'Artículo ya guardado el %fecha%' |
@@ -562,3 +596,8 @@ flashes: | |||
562 | added: 'Añadido el usuario "%username%"' | 596 | added: 'Añadido el usuario "%username%"' |
563 | updated: 'Actualizado el usuario "%username%"' | 597 | updated: 'Actualizado el usuario "%username%"' |
564 | deleted: 'Eliminado el usuario "%username%"' | 598 | deleted: 'Eliminado el usuario "%username%"' |
599 | site_credential: | ||
600 | notice: | ||
601 | # added: 'Site credential for "%host%" added' | ||
602 | # updated: 'Site credential for "%host%" updated' | ||
603 | # deleted: 'Site credential for "%host%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 647f12ad..57e6c029 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -32,6 +32,7 @@ menu: | |||
32 | save_link: 'ذخیرهٔ یک پیوند' | 32 | save_link: 'ذخیرهٔ یک پیوند' |
33 | back_to_unread: 'بازگشت به خواندهنشدهها' | 33 | back_to_unread: 'بازگشت به خواندهنشدهها' |
34 | # users_management: 'Users management' | 34 | # users_management: 'Users management' |
35 | # site_credentials: 'Site credentials' | ||
35 | top: | 36 | top: |
36 | add_new_entry: 'افزودن مقالهٔ تازه' | 37 | add_new_entry: 'افزودن مقالهٔ تازه' |
37 | search: 'جستجو' | 38 | search: 'جستجو' |
@@ -77,6 +78,7 @@ config: | |||
77 | pocket_consumer_key_label: کلید کاربری Pocket برای درونریزی مطالب | 78 | pocket_consumer_key_label: کلید کاربری Pocket برای درونریزی مطالب |
78 | # android_configuration: Configure your Android application | 79 | # android_configuration: Configure your Android application |
79 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 80 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
81 | # android_instruction: "Touch here to prefill your Android application" | ||
80 | # help_items_per_page: "You can change the number of articles displayed on each page." | 82 | # help_items_per_page: "You can change the number of articles displayed on each page." |
81 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." | 83 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
82 | # help_language: "You can change the language of wallabag interface." | 84 | # help_language: "You can change the language of wallabag interface." |
@@ -92,6 +94,7 @@ config: | |||
92 | unread: 'خواندهنشده' | 94 | unread: 'خواندهنشده' |
93 | starred: 'برگزیده' | 95 | starred: 'برگزیده' |
94 | archive: 'بایگانی' | 96 | archive: 'بایگانی' |
97 | # all: 'All' | ||
95 | rss_limit: 'محدودیت آر-اس-اس' | 98 | rss_limit: 'محدودیت آر-اس-اس' |
96 | form_user: | 99 | form_user: |
97 | two_factor_description: "با فعالکردن تأیید ۲مرحلهای هر بار که اتصال تأییدنشدهای برقرار شد، به شما یک کد از راه ایمیل فرستاده میشود" | 100 | two_factor_description: "با فعالکردن تأیید ۲مرحلهای هر بار که اتصال تأییدنشدهای برقرار شد، به شما یک کد از راه ایمیل فرستاده میشود" |
@@ -110,6 +113,7 @@ config: | |||
110 | # annotations: Remove ALL annotations | 113 | # annotations: Remove ALL annotations |
111 | # tags: Remove ALL tags | 114 | # tags: Remove ALL tags |
112 | # entries: Remove ALL entries | 115 | # entries: Remove ALL entries |
116 | # archived: Remove ALL archived entries | ||
113 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | 117 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) |
114 | form_password: | 118 | form_password: |
115 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 119 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
@@ -154,6 +158,7 @@ config: | |||
154 | # or: 'One rule OR another' | 158 | # or: 'One rule OR another' |
155 | # and: 'One rule AND another' | 159 | # and: 'One rule AND another' |
156 | # matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' | 160 | # matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' |
161 | # notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | ||
157 | 162 | ||
158 | entry: | 163 | entry: |
159 | page_titles: | 164 | page_titles: |
@@ -185,6 +190,8 @@ entry: | |||
185 | unread_label: 'خواندهنشده' | 190 | unread_label: 'خواندهنشده' |
186 | preview_picture_label: 'دارای عکس پیشنمایش' | 191 | preview_picture_label: 'دارای عکس پیشنمایش' |
187 | preview_picture_help: 'پیشنمایش عکس' | 192 | preview_picture_help: 'پیشنمایش عکس' |
193 | # is_public_label: 'Has a public link' | ||
194 | # is_public_help: 'Public link' | ||
188 | language_label: 'زبان' | 195 | language_label: 'زبان' |
189 | # http_status_label: 'HTTP status' | 196 | # http_status_label: 'HTTP status' |
190 | reading_time: | 197 | reading_time: |
@@ -223,6 +230,8 @@ entry: | |||
223 | original_article: 'اصلی' | 230 | original_article: 'اصلی' |
224 | annotations_on_the_entry: '{0} بدون حاشیه|{1} یک حاشیه|]1,Inf[ %nbحاشیه% annotations' | 231 | annotations_on_the_entry: '{0} بدون حاشیه|{1} یک حاشیه|]1,Inf[ %nbحاشیه% annotations' |
225 | created_at: 'زمان ساخت' | 232 | created_at: 'زمان ساخت' |
233 | # published_at: 'Publication date' | ||
234 | # published_by: 'Published by' | ||
226 | new: | 235 | new: |
227 | page_title: 'ذخیرهٔ مقالهٔ تازه' | 236 | page_title: 'ذخیرهٔ مقالهٔ تازه' |
228 | placeholder: 'http://website.com' | 237 | placeholder: 'http://website.com' |
@@ -234,10 +243,12 @@ entry: | |||
234 | page_title: 'ویرایش مقاله' | 243 | page_title: 'ویرایش مقاله' |
235 | title_label: 'عنوان' | 244 | title_label: 'عنوان' |
236 | url_label: 'نشانی' | 245 | url_label: 'نشانی' |
237 | is_public_label: 'عمومی' | ||
238 | save_label: 'ذخیره' | 246 | save_label: 'ذخیره' |
239 | public: | 247 | public: |
240 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" | 248 | # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" |
249 | confirm: | ||
250 | # delete: "Are you sure you want to remove that article?" | ||
251 | # delete_tag: "Are you sure you want to remove that tag from that article?" | ||
241 | 252 | ||
242 | about: | 253 | about: |
243 | page_title: 'درباره' | 254 | page_title: 'درباره' |
@@ -510,6 +521,28 @@ user: | |||
510 | # delete: Delete | 521 | # delete: Delete |
511 | # delete_confirm: Are you sure? | 522 | # delete_confirm: Are you sure? |
512 | # back_to_list: Back to list | 523 | # back_to_list: Back to list |
524 | search: | ||
525 | # placeholder: Filter by username or email | ||
526 | |||
527 | site_credential: | ||
528 | # page_title: Site credentials management | ||
529 | # new_site_credential: Create a credential | ||
530 | # edit_site_credential: Edit an existing credential | ||
531 | # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." | ||
532 | # list: | ||
533 | # actions: Actions | ||
534 | # edit_action: Edit | ||
535 | # yes: Yes | ||
536 | # no: No | ||
537 | # create_new_one: Create a new credential | ||
538 | # form: | ||
539 | # username_label: 'Username' | ||
540 | # host_label: 'Host' | ||
541 | # password_label: 'Password' | ||
542 | # save: Save | ||
543 | # delete: Delete | ||
544 | # delete_confirm: Are you sure? | ||
545 | # back_to_list: Back to list | ||
513 | 546 | ||
514 | error: | 547 | error: |
515 | # page_title: An error occurred | 548 | # page_title: An error occurred |
@@ -528,6 +561,7 @@ flashes: | |||
528 | # annotations_reset: Annotations reset | 561 | # annotations_reset: Annotations reset |
529 | # tags_reset: Tags reset | 562 | # tags_reset: Tags reset |
530 | # entries_reset: Entries reset | 563 | # entries_reset: Entries reset |
564 | # archived_reset: Archived entries deleted | ||
531 | entry: | 565 | entry: |
532 | notice: | 566 | notice: |
533 | entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود' | 567 | entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود' |
@@ -562,3 +596,8 @@ flashes: | |||
562 | # added: 'User "%username%" added' | 596 | # added: 'User "%username%" added' |
563 | # updated: 'User "%username%" updated' | 597 | # updated: 'User "%username%" updated' |
564 | # deleted: 'User "%username%" deleted' | 598 | # deleted: 'User "%username%" deleted' |
599 | site_credential: | ||
600 | notice: | ||
601 | # added: 'Site credential for "%host%" added' | ||
602 | # updated: 'Site credential for "%host%" updated' | ||
603 | # deleted: 'Site credential for "%host%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index efddc46a..6eac4c36 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -32,6 +32,7 @@ menu: | |||
32 | save_link: "Sauvegarder un nouvel article" | 32 | save_link: "Sauvegarder un nouvel article" |
33 | back_to_unread: "Retour aux articles non lus" | 33 | back_to_unread: "Retour aux articles non lus" |
34 | users_management: "Gestion des utilisateurs" | 34 | users_management: "Gestion des utilisateurs" |
35 | site_credentials: 'Accès aux sites' | ||
35 | top: | 36 | top: |
36 | add_new_entry: "Sauvegarder un nouvel article" | 37 | add_new_entry: "Sauvegarder un nouvel article" |
37 | search: "Rechercher" | 38 | search: "Rechercher" |
@@ -46,7 +47,7 @@ footer: | |||
46 | social: "Social" | 47 | social: "Social" |
47 | powered_by: "propulsé par" | 48 | powered_by: "propulsé par" |
48 | about: "À propos" | 49 | about: "À propos" |
49 | stats: Depuis le %user_creation%, vous avez lu %nb_archives% articles. Ce qui fait %per_day% par jour ! | 50 | stats: "Depuis le %user_creation%, vous avez lu %nb_archives% articles. Ce qui fait %per_day% par jour !" |
50 | 51 | ||
51 | config: | 52 | config: |
52 | page_title: "Configuration" | 53 | page_title: "Configuration" |
@@ -71,27 +72,29 @@ config: | |||
71 | 300_word: "Je lis environ 300 mots par minute" | 72 | 300_word: "Je lis environ 300 mots par minute" |
72 | 400_word: "Je lis environ 400 mots par minute" | 73 | 400_word: "Je lis environ 400 mots par minute" |
73 | action_mark_as_read: | 74 | action_mark_as_read: |
74 | label: 'Où souhaitez-vous être redirigé après avoir marqué un article comme lu ?' | 75 | label: "Où souhaitez-vous être redirigé après avoir marqué un article comme lu ?" |
75 | redirect_homepage: "À la page d'accueil" | 76 | redirect_homepage: "À la page d’accueil" |
76 | redirect_current_page: 'À la page courante' | 77 | redirect_current_page: "À la page courante" |
77 | pocket_consumer_key_label: Clé d’authentification Pocket pour importer les données | 78 | pocket_consumer_key_label: "Clé d’authentification Pocket pour importer les données" |
78 | android_configuration: Configurez votre application Android | 79 | android_configuration: "Configurez votre application Android" |
79 | help_theme: "L'affichage de wallabag est personnalisable. C'est ici que vous choisissez le thème que vous préférez." | 80 | android_instruction: "Appuyez ici pour préremplir votre application Android" |
80 | help_items_per_page: "Vous pouvez définir le nombre d'articles affichés sur chaque page." | 81 | help_theme: "L’affichage de wallabag est personnalisable. C’est ici que vous choisissez le thème que vous préférez." |
82 | help_items_per_page: "Vous pouvez définir le nombre d’articles affichés sur chaque page." | ||
81 | 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." | 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." |
82 | help_language: "Vous pouvez définir la langue de l'interface de wallabag." | 84 | help_language: "Vous pouvez définir la langue de l’interface de wallabag." |
83 | help_pocket_consumer_key: "Nécessaire pour l'import depuis Pocket. Vous pouvez le créer depuis votre compte Pocket." | 85 | help_pocket_consumer_key: "Nécessaire pour l’import depuis Pocket. Vous pouvez le créer depuis votre compte Pocket." |
84 | form_rss: | 86 | form_rss: |
85 | 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." | 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." |
86 | token_label: "Jeton RSS" | 88 | token_label: "Jeton RSS" |
87 | no_token: "Aucun jeton généré" | 89 | no_token: "Aucun jeton généré" |
88 | token_create: "Créez votre jeton" | 90 | token_create: "Créez votre jeton" |
89 | token_reset: "Réinitialisez votre jeton" | 91 | token_reset: "Réinitialisez votre jeton" |
90 | rss_links: "Adresse de vos flux RSS" | 92 | rss_links: "Adresses de vos flux RSS" |
91 | rss_link: | 93 | rss_link: |
92 | unread: "non lus" | 94 | unread: "Non lus" |
93 | starred: "favoris" | 95 | starred: "Favoris" |
94 | archive: "lus" | 96 | archive: "Lus" |
97 | all: "Tous" | ||
95 | rss_limit: "Nombre d’articles dans le flux" | 98 | rss_limit: "Nombre d’articles dans le flux" |
96 | form_user: | 99 | form_user: |
97 | two_factor_description: "Activer l’authentification double-facteur veut dire que vous allez recevoir un code par courriel à chaque nouvelle connexion non approuvée." | 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." |
@@ -100,17 +103,18 @@ config: | |||
100 | twoFactorAuthentication_label: "Double authentification" | 103 | twoFactorAuthentication_label: "Double authentification" |
101 | help_twoFactorAuthentication: "Si vous activez 2FA, à chaque tentative de connexion à wallabag, vous recevrez un code par email." | 104 | help_twoFactorAuthentication: "Si vous activez 2FA, à chaque tentative de connexion à wallabag, vous recevrez un code par email." |
102 | delete: | 105 | delete: |
103 | title: Supprimer mon compte (attention danger !) | 106 | title: "Supprimer mon compte (attention danger !)" |
104 | 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é. | 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é." |
105 | confirm: Vous êtes vraiment sûr ? (C'EST IRRÉVERSIBLE) | 108 | confirm: "Vous êtes vraiment sûr ? (C’EST IRRÉVERSIBLE)" |
106 | button: 'Supprimer mon compte' | 109 | button: "Supprimer mon compte" |
107 | reset: | 110 | reset: |
108 | title: Réinitialisation (attention danger !) | 111 | title: "Réinitialisation (attention danger !)" |
109 | description: En cliquant sur les boutons ci-dessous vous avez la possibilité de supprimer certaines informations de votre compte. Attention, ces actions sont IRRÉVERSIBLES ! | 112 | description: "En cliquant sur les boutons ci-dessous vous avez la possibilité de supprimer certaines informations de votre compte. Attention, ces actions sont IRRÉVERSIBLES !" |
110 | annotations: Supprimer TOUTES les annotations | 113 | annotations: "Supprimer TOUTES les annotations" |
111 | tags: Supprimer TOUS les tags | 114 | tags: "Supprimer TOUS les tags" |
112 | entries: Supprimer TOUS les articles | 115 | entries: "Supprimer TOUS les articles" |
113 | confirm: Êtes-vous vraiment vraiment sûr ? (C'EST IRRÉVERSIBLE) | 116 | archived: "Supprimer TOUS les articles archivés" |
117 | confirm: "Êtes-vous vraiment vraiment sûr ? (C’EST IRRÉVERSIBLE)" | ||
114 | form_password: | 118 | form_password: |
115 | description: "Vous pouvez changer ici votre mot de passe. Le mot de passe doit contenir au moins 8 caractères." | 119 | description: "Vous pouvez changer ici votre mot de passe. Le mot de passe doit contenir au moins 8 caractères." |
116 | old_password_label: "Mot de passe actuel" | 120 | old_password_label: "Mot de passe actuel" |
@@ -154,6 +158,7 @@ config: | |||
154 | or: "Une règle OU l’autre" | 158 | or: "Une règle OU l’autre" |
155 | and: "Une règle ET l’autre" | 159 | and: "Une règle ET l’autre" |
156 | matches: "Teste si un <i>sujet</i> correspond à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>title matches \"football\"</code>" | 160 | 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>" | ||
157 | 162 | ||
158 | entry: | 163 | entry: |
159 | page_titles: | 164 | page_titles: |
@@ -162,7 +167,7 @@ entry: | |||
162 | archived: "Articles lus" | 167 | archived: "Articles lus" |
163 | filtered: "Articles filtrés" | 168 | filtered: "Articles filtrés" |
164 | filtered_tags: "Articles filtrés par tags :" | 169 | filtered_tags: "Articles filtrés par tags :" |
165 | filtered_search: 'Articles filtrés par recherche :' | 170 | filtered_search: "Articles filtrés par recherche :" |
166 | untagged: "Article sans tag" | 171 | untagged: "Article sans tag" |
167 | list: | 172 | list: |
168 | number_on_the_page: "{0} Il n’y a pas d’article.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles." | 173 | number_on_the_page: "{0} Il n’y a pas d’article.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles." |
@@ -185,8 +190,10 @@ entry: | |||
185 | unread_label: "Non lus" | 190 | unread_label: "Non lus" |
186 | preview_picture_label: "A une photo" | 191 | preview_picture_label: "A une photo" |
187 | preview_picture_help: "Photo" | 192 | preview_picture_help: "Photo" |
193 | is_public_label: 'A un lien public' | ||
194 | is_public_help: 'Lien public' | ||
188 | language_label: "Langue" | 195 | language_label: "Langue" |
189 | http_status_label: 'Statut HTTP' | 196 | http_status_label: "Statut HTTP" |
190 | reading_time: | 197 | reading_time: |
191 | label: "Durée de lecture en minutes" | 198 | label: "Durée de lecture en minutes" |
192 | from: "de" | 199 | from: "de" |
@@ -223,6 +230,8 @@ entry: | |||
223 | original_article: "original" | 230 | original_article: "original" |
224 | annotations_on_the_entry: "{0} Aucune annotation|{1} Une annotation|]1,Inf[ %count% annotations" | 231 | annotations_on_the_entry: "{0} Aucune annotation|{1} Une annotation|]1,Inf[ %count% annotations" |
225 | created_at: "Date de création" | 232 | created_at: "Date de création" |
233 | published_at: "Date de publication" | ||
234 | published_by: "Publié par" | ||
226 | new: | 235 | new: |
227 | page_title: "Sauvegarder un nouvel article" | 236 | page_title: "Sauvegarder un nouvel article" |
228 | placeholder: "http://website.com" | 237 | placeholder: "http://website.com" |
@@ -234,10 +243,12 @@ entry: | |||
234 | page_title: "Éditer un article" | 243 | page_title: "Éditer un article" |
235 | title_label: "Titre" | 244 | title_label: "Titre" |
236 | url_label: "Adresse" | 245 | url_label: "Adresse" |
237 | is_public_label: "Public" | ||
238 | save_label: "Enregistrer" | 246 | save_label: "Enregistrer" |
239 | public: | 247 | public: |
240 | shared_by_wallabag: "Cet article a été partagé par <a href=\"%wallabag_instance%\">wallabag</a>" | 248 | shared_by_wallabag: "Cet article a été partagé par %username% avec <a href=\"%wallabag_instance%\">wallabag</a>" |
249 | confirm: | ||
250 | delete: "Voulez-vous vraiment supprimer cet article ?" | ||
251 | delete_tag: "Voulez-vous vraiment supprimer ce tag de cet article ?" | ||
241 | 252 | ||
242 | about: | 253 | about: |
243 | page_title: "À propos" | 254 | page_title: "À propos" |
@@ -295,32 +306,32 @@ howto: | |||
295 | bookmarklet: | 306 | bookmarklet: |
296 | description: "Glissez et déposez ce lien dans votre barre de favoris :" | 307 | description: "Glissez et déposez ce lien dans votre barre de favoris :" |
297 | shortcuts: | 308 | shortcuts: |
298 | page_description: Voici les raccourcis disponibles dans wallabag. | 309 | page_description: "Voici les raccourcis disponibles dans wallabag." |
299 | shortcut: Raccourci | 310 | shortcut: "Raccourci" |
300 | action: Action | 311 | action: "Action" |
301 | all_pages_title: Raccourcis disponibles dans toutes les pages | 312 | all_pages_title: "Raccourcis disponibles dans toutes les pages" |
302 | go_unread: Afficher les articles non lus | 313 | go_unread: "Afficher les articles non lus" |
303 | go_starred: Afficher les articles favoris | 314 | go_starred: "Afficher les articles favoris" |
304 | go_archive: Afficher les articles lus | 315 | go_archive: "Afficher les articles lus" |
305 | go_all: Afficher tous les articles | 316 | go_all: "Afficher tous les articles" |
306 | go_tags: Afficher les tags | 317 | go_tags: "Afficher les tags" |
307 | go_config: Aller à la configuration | 318 | go_config: "Aller à la configuration" |
308 | go_import: Aller aux imports | 319 | go_import: "Aller aux imports" |
309 | go_developers: Aller à la section Développeurs | 320 | go_developers: "Aller à la section Développeurs" |
310 | go_howto: Afficher l'aide (cette page !) | 321 | go_howto: "Afficher l’aide (cette page !)" |
311 | go_logout: Se déconnecter | 322 | go_logout: "Se déconnecter" |
312 | list_title: Raccourcis disponibles dans les pages de liste | 323 | list_title: "Raccourcis disponibles dans les pages de liste" |
313 | search: Afficher le formulaire de recherche | 324 | search: "Afficher le formulaire de recherche" |
314 | article_title: Raccourcis disponibles quand on affiche un article | 325 | article_title: "Raccourcis disponibles quand on affiche un article" |
315 | open_original: Ouvrir l'URL originale de l'article | 326 | open_original: "Ouvrir l’URL originale de l’article" |
316 | toggle_favorite: Changer le statut Favori de l'article | 327 | toggle_favorite: "Changer le statut Favori de l’article" |
317 | toggle_archive: Changer le status Lu de l'article | 328 | toggle_archive: "Changer le status Lu de l’article" |
318 | delete: Supprimer l'article | 329 | delete: "Supprimer l’article" |
319 | material_title: Raccourcis disponibles avec le thème Material uniquement | 330 | material_title: "Raccourcis disponibles avec le thème Material uniquement" |
320 | add_link: Ajouter un nouvel article | 331 | add_link: "Ajouter un nouvel article" |
321 | hide_form: Masquer le formulaire courant (recherche ou nouvel article) | 332 | hide_form: "Masquer le formulaire courant (recherche ou nouvel article)" |
322 | arrows_navigation: Naviguer à travers les articles | 333 | arrows_navigation: "Naviguer à travers les articles" |
323 | open_article: Afficher l'article sélectionné | 334 | open_article: "Afficher l’article sélectionné" |
324 | 335 | ||
325 | quickstart: | 336 | quickstart: |
326 | page_title: "Pour bien débuter" | 337 | page_title: "Pour bien débuter" |
@@ -382,8 +393,8 @@ tag: | |||
382 | number_on_the_page: "{0} Il n’y a pas de tag.|{1} Il y a un tag.|]1,Inf[ Il y a %count% tags." | 393 | number_on_the_page: "{0} Il n’y a pas de tag.|{1} Il y a un tag.|]1,Inf[ Il y a %count% tags." |
383 | see_untagged_entries: "Voir les articles sans tag" | 394 | see_untagged_entries: "Voir les articles sans tag" |
384 | new: | 395 | new: |
385 | add: 'Ajouter' | 396 | add: "Ajouter" |
386 | placeholder: 'Vous pouvez ajouter plusieurs tags, séparés par une virgule.' | 397 | placeholder: "Vous pouvez ajouter plusieurs tags, séparés par une virgule." |
387 | 398 | ||
388 | import: | 399 | import: |
389 | page_title: "Importer" | 400 | page_title: "Importer" |
@@ -417,7 +428,7 @@ import: | |||
417 | how_to: "Choisissez le fichier de votre export Readability et cliquez sur le bouton ci-dessous pour l’importer." | 428 | how_to: "Choisissez le fichier de votre export Readability et cliquez sur le bouton ci-dessous pour l’importer." |
418 | worker: | 429 | worker: |
419 | enabled: "Les imports sont asynchrones. Une fois l’import commencé un worker externe traitera les messages un par un. Le service activé est :" | 430 | enabled: "Les imports sont asynchrones. Une fois l’import commencé un worker externe traitera les messages un par un. Le service activé est :" |
420 | download_images_warning: "Vous avez configuré le téléchagement des images pour vos articles. Combiné à l'import classique, cette opération peut être très très longue (voire échouer). Nous vous conseillons <strong>vivement</strong> d'activer les imports asynchrones." | 431 | download_images_warning: "Vous avez configuré le téléchagement des images pour vos articles. Combiné à l’import classique, cette opération peut être très très longue (voire échouer). Nous vous conseillons <strong>vivement</strong> d’activer les imports asynchrones." |
421 | firefox: | 432 | firefox: |
422 | page_title: "Import > Firefox" | 433 | page_title: "Import > Firefox" |
423 | description: "Cet outil va vous permettre d’importer tous vos marques-pages de Firefox. Ouvrez le panneau des marques-pages (Ctrl+Maj+O), puis dans « Importation et sauvegarde », choisissez « Sauvegarde… ». Vous allez récupérer un fichier .json. </p>" | 434 | description: "Cet outil va vous permettre d’importer tous vos marques-pages de Firefox. Ouvrez le panneau des marques-pages (Ctrl+Maj+O), puis dans « Importation et sauvegarde », choisissez « Sauvegarde… ». Vous allez récupérer un fichier .json. </p>" |
@@ -486,16 +497,16 @@ developer: | |||
486 | back: "Retour" | 497 | back: "Retour" |
487 | 498 | ||
488 | user: | 499 | user: |
489 | page_title: Gestion des utilisateurs | 500 | page_title: "Gestion des utilisateurs" |
490 | new_user: Créer un nouvel utilisateur | 501 | new_user: "Créer un nouvel utilisateur" |
491 | edit_user: Éditer un utilisateur existant | 502 | edit_user: "Éditer un utilisateur existant" |
492 | description: Ici vous pouvez gérer vos utilisateurs (création, mise à jour et suppression) | 503 | description: "Ici vous pouvez gérer vos utilisateurs (création, mise à jour et suppression)" |
493 | list: | 504 | list: |
494 | actions: Actions | 505 | actions: "Actions" |
495 | edit_action: Éditer | 506 | edit_action: "Éditer" |
496 | yes: Oui | 507 | yes: "Oui" |
497 | no: Non | 508 | no: "Non" |
498 | create_new_one: Créer un nouvel utilisateur | 509 | create_new_one: "Créer un nouvel utilisateur" |
499 | form: | 510 | form: |
500 | username_label: "Nom d’utilisateur" | 511 | username_label: "Nom d’utilisateur" |
501 | name_label: "Nom" | 512 | name_label: "Nom" |
@@ -508,11 +519,33 @@ user: | |||
508 | twofactor_label: "Double authentification" | 519 | twofactor_label: "Double authentification" |
509 | save: "Sauvegarder" | 520 | save: "Sauvegarder" |
510 | delete: "Supprimer" | 521 | delete: "Supprimer" |
511 | delete_confirm: "Voulez-vous vraiment ?" | 522 | delete_confirm: "Êtes-vous sûr ?" |
523 | back_to_list: "Revenir à la liste" | ||
524 | search: | ||
525 | placeholder: "Filtrer par nom d’utilisateur ou email" | ||
526 | |||
527 | site_credential: | ||
528 | page_title: Gestion des accès aux sites | ||
529 | new_site_credential: Créer un accès à un site | ||
530 | edit_site_credential: Éditer l'accès d'un site | ||
531 | description: "Ici vous pouvez gérer les accès aux différents sites. Ces accès permettent de récupérer des contenus sur des sites qui requièrent une authentification ou un paywall" | ||
532 | list: | ||
533 | actions: Actions | ||
534 | edit_action: Éditer | ||
535 | yes: Oui | ||
536 | no: Non | ||
537 | create_new_one: Créer un nouvel accès à un site | ||
538 | form: | ||
539 | username_label: 'Identifiant' | ||
540 | host_label: 'Domaine' | ||
541 | password_label: 'Mot de passe' | ||
542 | save: "Sauvegarder" | ||
543 | delete: "Supprimer" | ||
544 | delete_confirm: "Êtes-vous sûr ?" | ||
512 | back_to_list: "Revenir à la liste" | 545 | back_to_list: "Revenir à la liste" |
513 | 546 | ||
514 | error: | 547 | error: |
515 | page_title: Une erreur est survenue | 548 | page_title: "Une erreur est survenue" |
516 | 549 | ||
517 | flashes: | 550 | flashes: |
518 | config: | 551 | config: |
@@ -525,9 +558,10 @@ flashes: | |||
525 | tagging_rules_updated: "Règles mises à jour" | 558 | tagging_rules_updated: "Règles mises à jour" |
526 | tagging_rules_deleted: "Règle supprimée" | 559 | tagging_rules_deleted: "Règle supprimée" |
527 | rss_token_updated: "Jeton RSS mis à jour" | 560 | rss_token_updated: "Jeton RSS mis à jour" |
528 | annotations_reset: Annotations supprimées | 561 | annotations_reset: "Annotations supprimées" |
529 | tags_reset: Tags supprimés | 562 | tags_reset: "Tags supprimés" |
530 | entries_reset: Articles supprimés | 563 | entries_reset: "Articles supprimés" |
564 | archived_reset: "Articles archivés supprimés" | ||
531 | entry: | 565 | entry: |
532 | notice: | 566 | notice: |
533 | entry_already_saved: "Article déjà sauvegardé le %date%" | 567 | entry_already_saved: "Article déjà sauvegardé le %date%" |
@@ -562,3 +596,8 @@ flashes: | |||
562 | added: 'Utilisateur "%username%" ajouté' | 596 | added: 'Utilisateur "%username%" ajouté' |
563 | updated: 'Utilisateur "%username%" mis à jour' | 597 | updated: 'Utilisateur "%username%" mis à jour' |
564 | deleted: 'Utilisateur "%username%" supprimé' | 598 | deleted: 'Utilisateur "%username%" supprimé' |
599 | site_credential: | ||
600 | notice: | ||
601 | added: 'Accès au site "%host%" ajouté' | ||
602 | updated: 'Accès au site "%host%" mis à jour' | ||
603 | deleted: 'Accès au site "%host%" supprimé' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 3cd3fd17..fa7ae0b2 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -91,9 +91,10 @@ config: | |||
91 | token_reset: 'Rigenera il tuo token' | 91 | token_reset: 'Rigenera il tuo token' |
92 | rss_links: 'Collegamenti RSS' | 92 | rss_links: 'Collegamenti RSS' |
93 | rss_link: | 93 | rss_link: |
94 | unread: 'non letti' | 94 | unread: 'Non letti' |
95 | starred: 'preferiti' | 95 | starred: 'Preferiti' |
96 | archive: 'archiviati' | 96 | archive: 'Archiviati' |
97 | # all: 'All' | ||
97 | rss_limit: 'Numero di elementi nel feed' | 98 | rss_limit: 'Numero di elementi nel feed' |
98 | form_user: | 99 | form_user: |
99 | two_factor_description: "Abilitando l'autenticazione a due fattori riceverai una e-mail con un codice per ogni nuova connesione non verificata" | 100 | two_factor_description: "Abilitando l'autenticazione a due fattori riceverai una e-mail con un codice per ogni nuova connesione non verificata" |
@@ -112,6 +113,7 @@ config: | |||
112 | annotations: Rimuovi TUTTE le annotazioni | 113 | annotations: Rimuovi TUTTE le annotazioni |
113 | tags: Rimuovi TUTTE le etichette | 114 | tags: Rimuovi TUTTE le etichette |
114 | entries: Rimuovi TUTTI gli articoli | 115 | entries: Rimuovi TUTTI gli articoli |
116 | # archived: Remove ALL archived entries | ||
115 | confirm: Sei veramente sicuro? (NON PUOI TORNARE INDIETRO) | 117 | confirm: Sei veramente sicuro? (NON PUOI TORNARE INDIETRO) |
116 | form_password: | 118 | form_password: |
117 | description: "Qui puoi cambiare la tua password. La tua nuova password dovrebbe essere composta da almeno 8 caratteri." | 119 | description: "Qui puoi cambiare la tua password. La tua nuova password dovrebbe essere composta da almeno 8 caratteri." |
@@ -156,6 +158,7 @@ config: | |||
156 | or: "Una regola O un'altra" | 158 | or: "Una regola O un'altra" |
157 | and: "Una regola E un'altra" | 159 | and: "Una regola E un'altra" |
158 | matches: 'Verifica che un <i>oggetto</i> risulti in una <i>ricerca</i> (case-insensitive).<br />Esempio: <code>titolo contiene "football"</code>' | 160 | 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> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | ||
159 | 162 | ||
160 | entry: | 163 | entry: |
161 | page_titles: | 164 | page_titles: |
@@ -187,6 +190,8 @@ entry: | |||
187 | unread_label: 'Non letti' | 190 | unread_label: 'Non letti' |
188 | preview_picture_label: "Ha un'immagine di anteprima" | 191 | preview_picture_label: "Ha un'immagine di anteprima" |
189 | preview_picture_help: 'Immagine di anteprima' | 192 | preview_picture_help: 'Immagine di anteprima' |
193 | # is_public_label: 'Has a public link' | ||
194 | # is_public_help: 'Public link' | ||
190 | language_label: 'Lingua' | 195 | language_label: 'Lingua' |
191 | http_status_label: 'Stato HTTP' | 196 | http_status_label: 'Stato HTTP' |
192 | reading_time: | 197 | reading_time: |
@@ -211,7 +216,7 @@ entry: | |||
211 | view_original_article: 'Contenuto originale' | 216 | view_original_article: 'Contenuto originale' |
212 | re_fetch_content: 'Ri-ottieni pagina' | 217 | re_fetch_content: 'Ri-ottieni pagina' |
213 | delete: 'Elimina' | 218 | delete: 'Elimina' |
214 | add_a_tag: 'Aggiungi un tag' | 219 | add_a_tag: 'Aggiungi un''etichetta' |
215 | share_content: 'Condividi' | 220 | share_content: 'Condividi' |
216 | share_email_label: 'E-mail' | 221 | share_email_label: 'E-mail' |
217 | public_link: 'Link pubblico' | 222 | public_link: 'Link pubblico' |
@@ -222,7 +227,7 @@ entry: | |||
222 | label: 'Problemi?' | 227 | label: 'Problemi?' |
223 | description: 'Questo contenuto viene visualizzato male?' | 228 | description: 'Questo contenuto viene visualizzato male?' |
224 | edit_title: 'Modifica titolo' | 229 | edit_title: 'Modifica titolo' |
225 | original_article: 'originale' | 230 | original_article: 'Originale' |
226 | annotations_on_the_entry: '{0} Nessuna annotazione|{1} Una annotazione|]1,Inf[ %count% annotazioni' | 231 | annotations_on_the_entry: '{0} Nessuna annotazione|{1} Una annotazione|]1,Inf[ %count% annotazioni' |
227 | created_at: 'Data di creazione' | 232 | created_at: 'Data di creazione' |
228 | published_at: 'Data di pubblicazione' | 233 | published_at: 'Data di pubblicazione' |
@@ -238,13 +243,15 @@ entry: | |||
238 | page_title: 'Modifica voce' | 243 | page_title: 'Modifica voce' |
239 | title_label: 'Titolo' | 244 | title_label: 'Titolo' |
240 | url_label: 'Url' | 245 | url_label: 'Url' |
241 | is_public_label: 'Pubblico' | ||
242 | save_label: 'Salva' | 246 | save_label: 'Salva' |
243 | public: | 247 | public: |
244 | shared_by_wallabag: "Questo articolo è stato condiviso da %username% con <a href='%wallabag_instance%'>wallabag</a>" | 248 | shared_by_wallabag: "Questo articolo è stato condiviso da %username% con <a href='%wallabag_instance%'>wallabag</a>" |
249 | confirm: | ||
250 | delete: "Vuoi veramente rimuovere quell'articolo?" | ||
251 | delete_tag: "Vuoi veramente rimuovere quell'etichetta da quell'articolo?" | ||
245 | 252 | ||
246 | about: | 253 | about: |
247 | page_title: 'About' | 254 | page_title: 'A proposito' |
248 | top_menu: | 255 | top_menu: |
249 | who_behind_wallabag: "Chi c'è dietro a wallabag" | 256 | who_behind_wallabag: "Chi c'è dietro a wallabag" |
250 | getting_help: 'Ottieni aiuto' | 257 | getting_help: 'Ottieni aiuto' |
@@ -263,7 +270,7 @@ about: | |||
263 | bug_reports: 'Bug reports' | 270 | bug_reports: 'Bug reports' |
264 | support: '<a href="https://github.com/wallabag/wallabag/issues">su GitHub</a>' | 271 | support: '<a href="https://github.com/wallabag/wallabag/issues">su GitHub</a>' |
265 | helping: | 272 | helping: |
266 | description: 'wallabag è gratuito opensource. Puoi aiutarci:' | 273 | description: 'wallabag è gratuito ed OpenSource. Puoi aiutarci:' |
267 | by_contributing: 'per contribuire al progetto:' | 274 | by_contributing: 'per contribuire al progetto:' |
268 | by_contributing_2: 'un elenco delle attività richieste' | 275 | by_contributing_2: 'un elenco delle attività richieste' |
269 | by_paypal: 'via Paypal' | 276 | by_paypal: 'via Paypal' |
@@ -331,7 +338,7 @@ quickstart: | |||
331 | more: 'Più…' | 338 | more: 'Più…' |
332 | intro: | 339 | intro: |
333 | title: 'Benvenuto su wallabag!' | 340 | title: 'Benvenuto su wallabag!' |
334 | paragraph_1: "Un tour in cui ti guideremo per scoprire e che ti mostrerà delle funzionalità che potrebbero interessarti." | 341 | paragraph_1: "Ti accompagneremo alla scoperta di wallabag e ti mostreremo delle funzionalità che potrebbero interessarti." |
335 | paragraph_2: 'Seguici!' | 342 | paragraph_2: 'Seguici!' |
336 | configure: | 343 | configure: |
337 | title: "Configura l'applicazione" | 344 | title: "Configura l'applicazione" |
@@ -401,20 +408,20 @@ import: | |||
401 | save_label: 'Carica file' | 408 | save_label: 'Carica file' |
402 | pocket: | 409 | pocket: |
403 | page_title: 'Importa da > Pocket' | 410 | page_title: 'Importa da > Pocket' |
404 | description: "Questo importatore copierà tutti i tuoi dati da Pocket. Pocket non ci consente di ottenere contenuti dal loro servzio, così il contenuto leggibile di ogni articolo verrà ri-ottenuto da wallabag." | 411 | description: "Questo importatore copierà tutti i tuoi dati da Pocket. Pocket non ci consente di ottenere contenuti dal loro servizio, così il contenuto leggibile di ogni articolo verrà ri-ottenuto da wallabag." |
405 | config_missing: | 412 | config_missing: |
406 | description: "Importazione da Pocket non configurata." | 413 | description: "Importazione da Pocket non configurata." |
407 | admin_message: 'Devi definire %keyurls% una pocket_consumer_key %keyurle%.' | 414 | admin_message: 'Devi definire %keyurls% una pocket_consumer_key %keyurle%.' |
408 | user_message: 'Il tuo amministratore di server deve define una API Key per Pocket.' | 415 | user_message: 'Il tuo amministratore del server deve definire una API Key per Pocket.' |
409 | authorize_message: 'Puoi importare dati dal tuo account Pocket. Devi solo cliccare sul pulsante sottostante e autorizzare la connessione a getpocket.com.' | 416 | authorize_message: 'Puoi importare dati dal tuo account Pocket. Devi solo cliccare sul pulsante sottostante e autorizzare la connessione a getpocket.com.' |
410 | connect_to_pocket: 'Connetti a Pocket and importa i dati' | 417 | connect_to_pocket: 'Connetti a Pocket and importa i dati' |
411 | wallabag_v1: | 418 | wallabag_v1: |
412 | page_title: 'Importa da > Wallabag v1' | 419 | page_title: 'Importa da > Wallabag v1' |
413 | description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v1. Nella tua pagina di configurazione, clicca su "JSON export" nella sezione "Esport i tuoi dati di wallabag". Otterrai un file "wallabag-export-1-xxxx-xx-xx.json".' | 420 | description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v1. Nella tua pagina di configurazione, clicca su "JSON export" nella sezione "Esporta i tuoi dati di wallabag". Otterrai un file "wallabag-export-1-xxxx-xx-xx.json".' |
414 | how_to: 'Seleziona la tua esportazione di wallabag e clicca sul pulsante sottostante caricare il file e importare i dati.' | 421 | how_to: 'Seleziona la tua esportazione di wallabag e clicca sul pulsante sottostante caricare il file e importare i dati.' |
415 | wallabag_v2: | 422 | wallabag_v2: |
416 | page_title: 'Importa da > Wallabag v2' | 423 | page_title: 'Importa da > Wallabag v2' |
417 | description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v2. Vai in "Tutti i contenuti", e, nella sidebar di esportazione, clicca su "JSON". Otterrai un file "Tutti i contenuti.json".' | 424 | description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v2. Vai in "Tutti i contenuti", e, nella barra laterale di esportazione, clicca su "JSON". Otterrai un file "Tutti i contenuti.json' |
418 | readability: | 425 | readability: |
419 | page_title: 'Importa da > Readability' | 426 | page_title: 'Importa da > Readability' |
420 | description: 'Questo importatore copierà tutti i tuoi articoli da Readability. Nella pagina strumenti (https://www.readability.com/tools/), clicca su "Export your data" nella sezione "Data Export". Riceverai una E-mail per scaricare un file json (che tuttavia non termina con .json).' | 427 | description: 'Questo importatore copierà tutti i tuoi articoli da Readability. Nella pagina strumenti (https://www.readability.com/tools/), clicca su "Export your data" nella sezione "Data Export". Riceverai una E-mail per scaricare un file json (che tuttavia non termina con .json).' |
@@ -514,6 +521,28 @@ user: | |||
514 | delete: Cancella | 521 | delete: Cancella |
515 | delete_confirm: Sei sicuro? | 522 | delete_confirm: Sei sicuro? |
516 | back_to_list: Torna alla lista | 523 | back_to_list: Torna alla lista |
524 | search: | ||
525 | # placeholder: Filter by username or email | ||
526 | |||
527 | site_credential: | ||
528 | # page_title: Site credentials management | ||
529 | # new_site_credential: Create a credential | ||
530 | # edit_site_credential: Edit an existing credential | ||
531 | # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." | ||
532 | # list: | ||
533 | # actions: Actions | ||
534 | # edit_action: Edit | ||
535 | # yes: Yes | ||
536 | # no: No | ||
537 | # create_new_one: Create a new credential | ||
538 | # form: | ||
539 | # username_label: 'Username' | ||
540 | # host_label: 'Host' | ||
541 | # password_label: 'Password' | ||
542 | # save: Save | ||
543 | # delete: Delete | ||
544 | # delete_confirm: Are you sure? | ||
545 | # back_to_list: Back to list | ||
517 | 546 | ||
518 | error: | 547 | error: |
519 | page_title: Si è verificato un errore | 548 | page_title: Si è verificato un errore |
@@ -532,6 +561,7 @@ flashes: | |||
532 | annotations_reset: Reset annotazioni | 561 | annotations_reset: Reset annotazioni |
533 | tags_reset: Reset etichette | 562 | tags_reset: Reset etichette |
534 | entries_reset: Reset articoli | 563 | entries_reset: Reset articoli |
564 | # archived_reset: Archived entries deleted | ||
535 | entry: | 565 | entry: |
536 | notice: | 566 | notice: |
537 | entry_already_saved: 'Contenuto già salvato in data %date%' | 567 | entry_already_saved: 'Contenuto già salvato in data %date%' |
@@ -566,3 +596,8 @@ flashes: | |||
566 | added: 'Utente "%username%" aggiunto' | 596 | added: 'Utente "%username%" aggiunto' |
567 | updated: 'Utente "%username%" aggiornato' | 597 | updated: 'Utente "%username%" aggiornato' |
568 | deleted: 'Utente "%username%" eliminato' | 598 | deleted: 'Utente "%username%" eliminato' |
599 | site_credential: | ||
600 | notice: | ||
601 | # added: 'Site credential for "%host%" added' | ||
602 | # updated: 'Site credential for "%host%" updated' | ||
603 | # deleted: 'Site credential for "%host%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 913e3bcb..be57e903 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -32,6 +32,7 @@ menu: | |||
32 | save_link: 'Enregistrar un novèl article' | 32 | save_link: 'Enregistrar un novèl article' |
33 | back_to_unread: 'Tornar als articles pas legits' | 33 | back_to_unread: 'Tornar als articles pas legits' |
34 | users_management: 'Gestion dels utilizaires' | 34 | users_management: 'Gestion dels utilizaires' |
35 | # site_credentials: 'Site credentials' | ||
35 | top: | 36 | top: |
36 | add_new_entry: 'Enregistrar un novèl article' | 37 | add_new_entry: 'Enregistrar un novèl article' |
37 | search: 'Cercar' | 38 | search: 'Cercar' |
@@ -76,6 +77,7 @@ config: | |||
76 | redirect_current_page: 'A la pagina actuala' | 77 | redirect_current_page: 'A la pagina actuala' |
77 | pocket_consumer_key_label: Clau d'autentificacion Pocket per importar las donadas | 78 | pocket_consumer_key_label: Clau d'autentificacion Pocket per importar las donadas |
78 | android_configuration: Configuratz vòstra aplicacion Android | 79 | android_configuration: Configuratz vòstra aplicacion Android |
80 | # android_instruction: "Touch here to prefill your Android application" | ||
79 | help_theme: "wallabag es personalizable. Podètz causir vòstre tèma preferit aquí." | 81 | help_theme: "wallabag es personalizable. Podètz causir vòstre tèma preferit aquí." |
80 | help_items_per_page: "Podètz cambiar lo nombre d'articles afichats per pagina." | 82 | help_items_per_page: "Podètz cambiar lo nombre d'articles afichats per pagina." |
81 | 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." | 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." |
@@ -87,11 +89,12 @@ config: | |||
87 | no_token: 'Pas cap de geton generat' | 89 | no_token: 'Pas cap de geton generat' |
88 | token_create: 'Creatz vòstre geton' | 90 | token_create: 'Creatz vòstre geton' |
89 | token_reset: 'Reïnicializatz vòstre geton' | 91 | token_reset: 'Reïnicializatz vòstre geton' |
90 | rss_links: 'URL de vòstres fluxes RSS' | 92 | rss_links: 'URLs de vòstres fluxes RSS' |
91 | rss_link: | 93 | rss_link: |
92 | unread: 'pas legits' | 94 | unread: 'Pas legits' |
93 | starred: 'favorits' | 95 | starred: 'Favorits' |
94 | archive: 'legits' | 96 | archive: 'Legits' |
97 | # all: 'All' | ||
95 | rss_limit: "Nombre d'articles dins un flux RSS" | 98 | rss_limit: "Nombre d'articles dins un flux RSS" |
96 | form_user: | 99 | form_user: |
97 | two_factor_description: "Activar l'autentificacion doble-factor vòl dire que recebretz un còdi per corrièl per cada novèla connexion pas aprovada." | 100 | two_factor_description: "Activar l'autentificacion doble-factor vòl dire que recebretz un còdi per corrièl per cada novèla connexion pas aprovada." |
@@ -110,6 +113,7 @@ config: | |||
110 | annotations: Levar TOTAS las anotacions | 113 | annotations: Levar TOTAS las anotacions |
111 | tags: Levar TOTAS las etiquetas | 114 | tags: Levar TOTAS las etiquetas |
112 | entries: Levar TOTES los articles | 115 | entries: Levar TOTES los articles |
116 | archived: Levar TOTES los articles archivats | ||
113 | confirm: Sètz vertadièrament segur ? (ES IRREVERSIBLE) | 117 | confirm: Sètz vertadièrament segur ? (ES IRREVERSIBLE) |
114 | form_password: | 118 | form_password: |
115 | description: "Podètz cambiar vòstre senhal aquí. Vòstre senhal deu èsser long d'almens 8 caractèrs." | 119 | description: "Podètz cambiar vòstre senhal aquí. Vòstre senhal deu èsser long d'almens 8 caractèrs." |
@@ -153,7 +157,8 @@ config: | |||
153 | not_equal_to: 'Diferent de…' | 157 | not_equal_to: 'Diferent de…' |
154 | or: "Una règla O l'autra" | 158 | or: "Una règla O l'autra" |
155 | and: "Una règla E l'autra" | 159 | and: "Una règla E l'autra" |
156 | matches: 'Teste se un <i>subjècte</i> correspond a una <i>recerca</i> (non sensibla a la cassa).<br />Exemple : <code>title matches \"football\"</code>' | 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>' |
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>' | ||
157 | 162 | ||
158 | entry: | 163 | entry: |
159 | page_titles: | 164 | page_titles: |
@@ -183,8 +188,10 @@ entry: | |||
183 | archived_label: 'Legits' | 188 | archived_label: 'Legits' |
184 | starred_label: 'Favorits' | 189 | starred_label: 'Favorits' |
185 | unread_label: 'Pas legits' | 190 | unread_label: 'Pas legits' |
186 | preview_picture_label: 'A una fotò' | 191 | preview_picture_label: 'A un imatge' |
187 | preview_picture_help: 'Fotò' | 192 | preview_picture_help: 'Imatge' |
193 | # is_public_label: 'Has a public link' | ||
194 | # is_public_help: 'Public link' | ||
188 | language_label: 'Lenga' | 195 | language_label: 'Lenga' |
189 | http_status_label: 'Estatut HTTP' | 196 | http_status_label: 'Estatut HTTP' |
190 | reading_time: | 197 | reading_time: |
@@ -223,6 +230,8 @@ entry: | |||
223 | original_article: 'original' | 230 | original_article: 'original' |
224 | annotations_on_the_entry: "{0} Pas cap d'anotacion|{1} Una anotacion|]1,Inf[ %count% anotacions" | 231 | annotations_on_the_entry: "{0} Pas cap d'anotacion|{1} Una anotacion|]1,Inf[ %count% anotacions" |
225 | created_at: 'Data de creacion' | 232 | created_at: 'Data de creacion' |
233 | published_at: 'Data de publicacion' | ||
234 | published_by: 'Publicat per' | ||
226 | new: | 235 | new: |
227 | page_title: 'Enregistrar un novèl article' | 236 | page_title: 'Enregistrar un novèl article' |
228 | placeholder: 'http://website.com' | 237 | placeholder: 'http://website.com' |
@@ -234,10 +243,12 @@ entry: | |||
234 | page_title: 'Modificar un article' | 243 | page_title: 'Modificar un article' |
235 | title_label: 'Títol' | 244 | title_label: 'Títol' |
236 | url_label: 'Url' | 245 | url_label: 'Url' |
237 | is_public_label: 'Public' | ||
238 | save_label: 'Enregistrar' | 246 | save_label: 'Enregistrar' |
239 | public: | 247 | public: |
240 | shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>" | 248 | shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>" |
249 | confirm: | ||
250 | # delete: "Are you sure you want to remove that article?" | ||
251 | # delete_tag: "Are you sure you want to remove that tag from that article?" | ||
241 | 252 | ||
242 | about: | 253 | about: |
243 | page_title: 'A prepaus' | 254 | page_title: 'A prepaus' |
@@ -341,8 +352,8 @@ quickstart: | |||
341 | new_user: 'Crear un novèl utilizaire' | 352 | new_user: 'Crear un novèl utilizaire' |
342 | analytics: 'Configurar las estadisticas' | 353 | analytics: 'Configurar las estadisticas' |
343 | sharing: 'Activar de paramètres de partatge' | 354 | sharing: 'Activar de paramètres de partatge' |
344 | export: 'Configurar los expòrt' | 355 | export: 'Configurar los expòrts' |
345 | import: 'Configurar los impòrt' | 356 | import: 'Configurar los impòrts' |
346 | first_steps: | 357 | first_steps: |
347 | title: 'Primièrs passes' | 358 | title: 'Primièrs passes' |
348 | description: "Ara wallabag es ben configurat, es lo moment d'archivar lo web. Podètz clicar sul signe + a man drecha amont per ajustar un ligam." | 359 | description: "Ara wallabag es ben configurat, es lo moment d'archivar lo web. Podètz clicar sul signe + a man drecha amont per ajustar un ligam." |
@@ -458,7 +469,7 @@ developer: | |||
458 | action: 'Suprimir aqueste client' | 469 | action: 'Suprimir aqueste client' |
459 | client: | 470 | client: |
460 | page_title: 'Gestion dels clients API > Novèl client' | 471 | page_title: 'Gestion dels clients API > Novèl client' |
461 | page_description: "Anatz crear un novèl client. Mercés de cumplir l'url de redireccion cap a vòstra aplicacion." | 472 | page_description: "Anatz crear un novèl client. Mercés de garnir l'url de redireccion cap a vòstra aplicacion." |
462 | form: | 473 | form: |
463 | name_label: "Nom del client" | 474 | name_label: "Nom del client" |
464 | redirect_uris_label: 'URLs de redireccion' | 475 | redirect_uris_label: 'URLs de redireccion' |
@@ -469,7 +480,7 @@ developer: | |||
469 | page_description: 'Vaquí los paramètres de vòstre client.' | 480 | page_description: 'Vaquí los paramètres de vòstre client.' |
470 | field_name: 'Nom del client' | 481 | field_name: 'Nom del client' |
471 | field_id: 'ID Client' | 482 | field_id: 'ID Client' |
472 | field_secret: 'Clau secreta' | 483 | field_secret: 'Clau secrèta' |
473 | back: 'Retour' | 484 | back: 'Retour' |
474 | read_howto: 'Legir "cossí crear ma primièra aplicacion"' | 485 | read_howto: 'Legir "cossí crear ma primièra aplicacion"' |
475 | howto: | 486 | howto: |
@@ -510,6 +521,28 @@ user: | |||
510 | delete: 'Suprimir' | 521 | delete: 'Suprimir' |
511 | delete_confirm: 'Sètz segur ?' | 522 | delete_confirm: 'Sètz segur ?' |
512 | back_to_list: 'Tornar a la lista' | 523 | back_to_list: 'Tornar a la lista' |
524 | search: | ||
525 | placeholder: "Filtrar per nom d'utilizaire o corrièl" | ||
526 | |||
527 | site_credential: | ||
528 | # page_title: Site credentials management | ||
529 | # new_site_credential: Create a credential | ||
530 | # edit_site_credential: Edit an existing credential | ||
531 | # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." | ||
532 | list: | ||
533 | actions: 'Accions' | ||
534 | edit_action: 'Modificar' | ||
535 | yes: 'Òc' | ||
536 | no: 'Non' | ||
537 | # create_new_one: Create a new credential | ||
538 | form: | ||
539 | # username_label: 'Username' | ||
540 | # host_label: 'Host' | ||
541 | # password_label: 'Password' | ||
542 | save: 'Enregistrar' | ||
543 | delete: 'Suprimir' | ||
544 | delete_confirm: 'Sètz segur ?' | ||
545 | back_to_list: 'Tornar a la lista' | ||
513 | 546 | ||
514 | error: | 547 | error: |
515 | page_title: Una error s'es produsida | 548 | page_title: Una error s'es produsida |
@@ -528,6 +561,7 @@ flashes: | |||
528 | annotations_reset: Anotacions levadas | 561 | annotations_reset: Anotacions levadas |
529 | tags_reset: Etiquetas levadas | 562 | tags_reset: Etiquetas levadas |
530 | entries_reset: Articles levats | 563 | entries_reset: Articles levats |
564 | archived_reset: Articles archivat suprimits | ||
531 | entry: | 565 | entry: |
532 | notice: | 566 | notice: |
533 | entry_already_saved: 'Article ja salvargardat lo %date%' | 567 | entry_already_saved: 'Article ja salvargardat lo %date%' |
@@ -562,3 +596,8 @@ flashes: | |||
562 | added: 'Utilizaire "%username%" ajustat' | 596 | added: 'Utilizaire "%username%" ajustat' |
563 | updated: 'Utilizaire "%username%" mes a jorn' | 597 | updated: 'Utilizaire "%username%" mes a jorn' |
564 | deleted: 'Utilizaire "%username%" suprimit' | 598 | deleted: 'Utilizaire "%username%" suprimit' |
599 | site_credential: | ||
600 | notice: | ||
601 | # added: 'Site credential for "%host%" added' | ||
602 | # updated: 'Site credential for "%host%" updated' | ||
603 | # deleted: 'Site credential for "%host%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index b990a6b9..00c559ed 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -32,6 +32,7 @@ menu: | |||
32 | save_link: 'Zapisz link' | 32 | save_link: 'Zapisz link' |
33 | back_to_unread: 'Powrót do nieprzeczytanych artykułów' | 33 | back_to_unread: 'Powrót do nieprzeczytanych artykułów' |
34 | users_management: 'Zarządzanie użytkownikami' | 34 | users_management: 'Zarządzanie użytkownikami' |
35 | # site_credentials: 'Site credentials' | ||
35 | top: | 36 | top: |
36 | add_new_entry: 'Dodaj nowy wpis' | 37 | add_new_entry: 'Dodaj nowy wpis' |
37 | search: 'Szukaj' | 38 | search: 'Szukaj' |
@@ -76,6 +77,7 @@ config: | |||
76 | redirect_current_page: 'do bieżącej strony' | 77 | redirect_current_page: 'do bieżącej strony' |
77 | pocket_consumer_key_label: 'Klucz klienta Pocket do importu zawartości' | 78 | pocket_consumer_key_label: 'Klucz klienta Pocket do importu zawartości' |
78 | android_configuration: Skonfiguruj swoją androidową aplikację | 79 | android_configuration: Skonfiguruj swoją androidową aplikację |
80 | android_instruction: "Dotknij tutaj, aby wstępnie uzupełnij androidową aplikację" | ||
79 | help_theme: "Dopasuj wallabag do swoich potrzeb. Tutaj możesz wybrać preferowany przez ciebie motyw." | 81 | help_theme: "Dopasuj wallabag do swoich potrzeb. Tutaj możesz wybrać preferowany przez ciebie motyw." |
80 | help_items_per_page: "Możesz zmienić ilość artykułów wyświetlanych na każdej stronie." | 82 | help_items_per_page: "Możesz zmienić ilość artykułów wyświetlanych na każdej stronie." |
81 | 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." | 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." |
@@ -89,9 +91,10 @@ config: | |||
89 | token_reset: 'Zresetuj swojego tokena' | 91 | token_reset: 'Zresetuj swojego tokena' |
90 | rss_links: 'RSS links' | 92 | rss_links: 'RSS links' |
91 | rss_link: | 93 | rss_link: |
92 | unread: 'nieprzeczytane' | 94 | unread: 'Nieprzeczytane' |
93 | starred: 'oznaczone gwiazdką' | 95 | starred: 'Oznaczone gwiazdką' |
94 | archive: 'archiwum' | 96 | archive: 'Archiwum' |
97 | # all: 'All' | ||
95 | rss_limit: 'Link do RSS' | 98 | rss_limit: 'Link do RSS' |
96 | form_user: | 99 | form_user: |
97 | two_factor_description: "Włączenie autoryzacji dwuetapowej oznacza, że będziesz otrzymywał maile z kodem przy każdym nowym, niezaufanym połączeniu" | 100 | two_factor_description: "Włączenie autoryzacji dwuetapowej oznacza, że będziesz otrzymywał maile z kodem przy każdym nowym, niezaufanym połączeniu" |
@@ -110,6 +113,7 @@ config: | |||
110 | annotations: Usuń WSZYSTKIE adnotacje | 113 | annotations: Usuń WSZYSTKIE adnotacje |
111 | tags: Usuń WSZYSTKIE tagi | 114 | tags: Usuń WSZYSTKIE tagi |
112 | entries: usuń WSZYTSTKIE wpisy | 115 | entries: usuń WSZYTSTKIE wpisy |
116 | archived: usuń WSZYSTKIE zarchiwizowane wpisy | ||
113 | confirm: Jesteś pewien? (tej operacji NIE MOŻNA cofnąć) | 117 | confirm: Jesteś pewien? (tej operacji NIE MOŻNA cofnąć) |
114 | form_password: | 118 | form_password: |
115 | description: "Tutaj możesz zmienić swoje hasło. Twoje nowe hasło powinno mieć conajmniej 8 znaków." | 119 | description: "Tutaj możesz zmienić swoje hasło. Twoje nowe hasło powinno mieć conajmniej 8 znaków." |
@@ -154,6 +158,7 @@ config: | |||
154 | or: 'Jedna reguła LUB inna' | 158 | or: 'Jedna reguła LUB inna' |
155 | and: 'Jedna reguła I inna' | 159 | and: 'Jedna reguła I inna' |
156 | 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>' | 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>' |
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>' | ||
157 | 162 | ||
158 | entry: | 163 | entry: |
159 | page_titles: | 164 | page_titles: |
@@ -185,6 +190,8 @@ entry: | |||
185 | unread_label: 'Nieprzeczytane' | 190 | unread_label: 'Nieprzeczytane' |
186 | preview_picture_label: 'Posiada podgląd obrazu' | 191 | preview_picture_label: 'Posiada podgląd obrazu' |
187 | preview_picture_help: 'Podgląd obrazu' | 192 | preview_picture_help: 'Podgląd obrazu' |
193 | is_public_label: 'Posiada publiczny link' | ||
194 | is_public_help: 'Publiczny link' | ||
188 | language_label: 'Język' | 195 | language_label: 'Język' |
189 | http_status_label: 'Status HTTP' | 196 | http_status_label: 'Status HTTP' |
190 | reading_time: | 197 | reading_time: |
@@ -223,6 +230,8 @@ entry: | |||
223 | original_article: 'oryginalny' | 230 | original_article: 'oryginalny' |
224 | annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %count% adnotacji' | 231 | annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %count% adnotacji' |
225 | created_at: 'Czas stworzenia' | 232 | created_at: 'Czas stworzenia' |
233 | published_at: 'Data publikacji' | ||
234 | published_by: 'Opublikowane przez' | ||
226 | new: | 235 | new: |
227 | page_title: 'Zapisz nowy wpis' | 236 | page_title: 'Zapisz nowy wpis' |
228 | placeholder: 'http://website.com' | 237 | placeholder: 'http://website.com' |
@@ -234,10 +243,12 @@ entry: | |||
234 | page_title: 'Edytuj wpis' | 243 | page_title: 'Edytuj wpis' |
235 | title_label: 'Tytuł' | 244 | title_label: 'Tytuł' |
236 | url_label: 'Adres URL' | 245 | url_label: 'Adres URL' |
237 | is_public_label: 'Publiczny' | ||
238 | save_label: 'Zapisz' | 246 | save_label: 'Zapisz' |
239 | public: | 247 | public: |
240 | shared_by_wallabag: "Ten artykuł został udostępniony przez <a href='%wallabag_instance%'>wallabag</a>" | 248 | shared_by_wallabag: "Ten artykuł został udostępniony przez <a href='%wallabag_instance%'>wallabag</a>" |
249 | confirm: | ||
250 | delete: "Czy jesteś pewien, że chcesz usunąć ten artykuł?" | ||
251 | delete_tag: "Czy jesteś pewien, że chcesz usunąć ten tag, z tego artykułu?" | ||
241 | 252 | ||
242 | about: | 253 | about: |
243 | page_title: 'O nas' | 254 | page_title: 'O nas' |
@@ -510,6 +521,28 @@ user: | |||
510 | delete: Usuń | 521 | delete: Usuń |
511 | delete_confirm: Jesteś pewien? | 522 | delete_confirm: Jesteś pewien? |
512 | back_to_list: Powrót do listy | 523 | back_to_list: Powrót do listy |
524 | search: | ||
525 | placeholder: Filtruj po nazwie użytkownika lub adresie e-mail | ||
526 | |||
527 | site_credential: | ||
528 | # page_title: Site credentials management | ||
529 | # new_site_credential: Create a credential | ||
530 | # edit_site_credential: Edit an existing credential | ||
531 | # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." | ||
532 | list: | ||
533 | actions: Akcje | ||
534 | edit_action: Edytuj | ||
535 | yes: Tak | ||
536 | no: Nie | ||
537 | # create_new_one: Create a new credential | ||
538 | form: | ||
539 | # username_label: 'Username' | ||
540 | # host_label: 'Host' | ||
541 | # password_label: 'Password' | ||
542 | save: Zapisz | ||
543 | delete: Usuń | ||
544 | delete_confirm: Jesteś pewien? | ||
545 | back_to_list: Powrót do listy | ||
513 | 546 | ||
514 | error: | 547 | error: |
515 | page_title: Wystąpił błąd | 548 | page_title: Wystąpił błąd |
@@ -528,6 +561,7 @@ flashes: | |||
528 | annotations_reset: Zresetuj adnotacje | 561 | annotations_reset: Zresetuj adnotacje |
529 | tags_reset: Zresetuj tagi | 562 | tags_reset: Zresetuj tagi |
530 | entries_reset: Zresetuj wpisy | 563 | entries_reset: Zresetuj wpisy |
564 | archived_reset: Zarchiwizowane wpisy usunięte | ||
531 | entry: | 565 | entry: |
532 | notice: | 566 | notice: |
533 | entry_already_saved: 'Wpis już został dodany %date%' | 567 | entry_already_saved: 'Wpis już został dodany %date%' |
@@ -562,3 +596,8 @@ flashes: | |||
562 | added: 'Użytkownik "%username%" dodany' | 596 | added: 'Użytkownik "%username%" dodany' |
563 | updated: 'Użytkownik "%username%" zaktualizowany' | 597 | updated: 'Użytkownik "%username%" zaktualizowany' |
564 | deleted: 'Użytkownik "%username%" usunięty' | 598 | deleted: 'Użytkownik "%username%" usunięty' |
599 | site_credential: | ||
600 | notice: | ||
601 | # added: 'Site credential for "%host%" added' | ||
602 | # updated: 'Site credential for "%host%" updated' | ||
603 | # deleted: 'Site credential for "%host%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 3b1f9cb6..4ab5f144 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -32,6 +32,7 @@ menu: | |||
32 | save_link: 'Salvar um link' | 32 | save_link: 'Salvar um link' |
33 | back_to_unread: 'Voltar para os artigos não lidos' | 33 | back_to_unread: 'Voltar para os artigos não lidos' |
34 | users_management: 'Gestão de Usuários' | 34 | users_management: 'Gestão de Usuários' |
35 | # site_credentials: 'Site credentials' | ||
35 | top: | 36 | top: |
36 | add_new_entry: 'Adicionar uma nova entrada' | 37 | add_new_entry: 'Adicionar uma nova entrada' |
37 | search: 'Pesquisa' | 38 | search: 'Pesquisa' |
@@ -76,6 +77,7 @@ config: | |||
76 | # redirect_current_page: 'To the current page' | 77 | # redirect_current_page: 'To the current page' |
77 | pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo' | 78 | pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo' |
78 | # android_configuration: Configure your Android application | 79 | # android_configuration: Configure your Android application |
80 | # android_instruction: "Touch here to prefill your Android application" | ||
79 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 81 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
80 | # help_items_per_page: "You can change the number of articles displayed on each page." | 82 | # help_items_per_page: "You can change the number of articles displayed on each page." |
81 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." | 83 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
@@ -89,9 +91,10 @@ config: | |||
89 | token_reset: 'Gerar novamente seu token' | 91 | token_reset: 'Gerar novamente seu token' |
90 | rss_links: 'Links RSS' | 92 | rss_links: 'Links RSS' |
91 | rss_link: | 93 | rss_link: |
92 | unread: 'não lido' | 94 | unread: 'Não lido' |
93 | starred: 'destacado' | 95 | starred: 'Destacado' |
94 | archive: 'arquivado' | 96 | archive: 'Arquivado' |
97 | # all: 'All' | ||
95 | rss_limit: 'Número de itens no feed' | 98 | rss_limit: 'Número de itens no feed' |
96 | form_user: | 99 | form_user: |
97 | 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.' | 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.' |
@@ -110,6 +113,7 @@ config: | |||
110 | # annotations: Remove ALL annotations | 113 | # annotations: Remove ALL annotations |
111 | # tags: Remove ALL tags | 114 | # tags: Remove ALL tags |
112 | # entries: Remove ALL entries | 115 | # entries: Remove ALL entries |
116 | # archived: Remove ALL archived entries | ||
113 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | 117 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) |
114 | form_password: | 118 | form_password: |
115 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 119 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
@@ -154,6 +158,7 @@ config: | |||
154 | or: 'Uma regra OU outra' | 158 | or: 'Uma regra OU outra' |
155 | and: 'Uma regra E outra' | 159 | and: 'Uma regra E outra' |
156 | 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>' | 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>' |
161 | # notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | ||
157 | 162 | ||
158 | entry: | 163 | entry: |
159 | page_titles: | 164 | page_titles: |
@@ -185,6 +190,8 @@ entry: | |||
185 | unread_label: 'Não Lido' | 190 | unread_label: 'Não Lido' |
186 | preview_picture_label: 'Possui uma imagem de preview' | 191 | preview_picture_label: 'Possui uma imagem de preview' |
187 | preview_picture_help: 'Imagem de preview' | 192 | preview_picture_help: 'Imagem de preview' |
193 | # is_public_label: 'Has a public link' | ||
194 | # is_public_help: 'Public link' | ||
188 | language_label: 'Idioma' | 195 | language_label: 'Idioma' |
189 | # http_status_label: 'HTTP status' | 196 | # http_status_label: 'HTTP status' |
190 | reading_time: | 197 | reading_time: |
@@ -223,6 +230,8 @@ entry: | |||
223 | original_article: 'original' | 230 | original_article: 'original' |
224 | annotations_on_the_entry: '{0} Sem anotações|{1} Uma anotação|]1,Inf[ %nbAnnotations% anotações' | 231 | annotations_on_the_entry: '{0} Sem anotações|{1} Uma anotação|]1,Inf[ %nbAnnotations% anotações' |
225 | created_at: 'Data de criação' | 232 | created_at: 'Data de criação' |
233 | # published_at: 'Publication date' | ||
234 | # published_by: 'Published by' | ||
226 | new: | 235 | new: |
227 | page_title: 'Salvar nova entrada' | 236 | page_title: 'Salvar nova entrada' |
228 | placeholder: 'http://website.com' | 237 | placeholder: 'http://website.com' |
@@ -234,10 +243,12 @@ entry: | |||
234 | page_title: 'Editar uma entrada' | 243 | page_title: 'Editar uma entrada' |
235 | title_label: 'Título' | 244 | title_label: 'Título' |
236 | url_label: 'Url' | 245 | url_label: 'Url' |
237 | is_public_label: 'Público' | ||
238 | save_label: 'Salvar' | 246 | save_label: 'Salvar' |
239 | public: | 247 | public: |
240 | shared_by_wallabag: "Este artigo foi compartilhado pelo <a href='%wallabag_instance%'>wallabag</a>" | 248 | shared_by_wallabag: "Este artigo foi compartilhado pelo <a href='%wallabag_instance%'>wallabag</a>" |
249 | confirm: | ||
250 | # delete: "Are you sure you want to remove that article?" | ||
251 | # delete_tag: "Are you sure you want to remove that tag from that article?" | ||
241 | 252 | ||
242 | about: | 253 | about: |
243 | page_title: 'Sobre' | 254 | page_title: 'Sobre' |
@@ -510,6 +521,28 @@ user: | |||
510 | delete: 'Apagar' | 521 | delete: 'Apagar' |
511 | delete_confirm: 'Tem certeza?' | 522 | delete_confirm: 'Tem certeza?' |
512 | back_to_list: 'Voltar para a lista' | 523 | back_to_list: 'Voltar para a lista' |
524 | search: | ||
525 | # placeholder: Filter by username or email | ||
526 | |||
527 | site_credential: | ||
528 | # page_title: Site credentials management | ||
529 | # new_site_credential: Create a credential | ||
530 | # edit_site_credential: Edit an existing credential | ||
531 | # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." | ||
532 | list: | ||
533 | actions: 'Ações' | ||
534 | edit_action: 'Editar' | ||
535 | yes: 'Sim' | ||
536 | no: 'Não' | ||
537 | # create_new_one: Create a new credential | ||
538 | form: | ||
539 | # username_label: 'Username' | ||
540 | # host_label: 'Host' | ||
541 | # password_label: 'Password' | ||
542 | save: 'Salvar' | ||
543 | delete: 'Apagar' | ||
544 | delete_confirm: 'Tem certeza?' | ||
545 | back_to_list: 'Voltar para a lista' | ||
513 | 546 | ||
514 | error: | 547 | error: |
515 | # page_title: An error occurred | 548 | # page_title: An error occurred |
@@ -528,6 +561,7 @@ flashes: | |||
528 | # annotations_reset: Annotations reset | 561 | # annotations_reset: Annotations reset |
529 | # tags_reset: Tags reset | 562 | # tags_reset: Tags reset |
530 | # entries_reset: Entries reset | 563 | # entries_reset: Entries reset |
564 | # archived_reset: Archived entries deleted | ||
531 | entry: | 565 | entry: |
532 | notice: | 566 | notice: |
533 | entry_already_saved: 'Entrada já foi salva em %date%' | 567 | entry_already_saved: 'Entrada já foi salva em %date%' |
@@ -562,3 +596,8 @@ flashes: | |||
562 | added: 'Usuário "%username%" adicionado' | 596 | added: 'Usuário "%username%" adicionado' |
563 | updated: 'Usuário "%username%" atualizado' | 597 | updated: 'Usuário "%username%" atualizado' |
564 | deleted: 'Usuário "%username%" removido' | 598 | deleted: 'Usuário "%username%" removido' |
599 | site_credential: | ||
600 | notice: | ||
601 | # added: 'Site credential for "%host%" added' | ||
602 | # updated: 'Site credential for "%host%" updated' | ||
603 | # deleted: 'Site credential for "%host%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 728eed58..f16504ed 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -32,6 +32,7 @@ menu: | |||
32 | # save_link: 'Save a link' | 32 | # save_link: 'Save a link' |
33 | back_to_unread: 'Înapoi la articolele necitite' | 33 | back_to_unread: 'Înapoi la articolele necitite' |
34 | # users_management: 'Users management' | 34 | # users_management: 'Users management' |
35 | # site_credentials: 'Site credentials' | ||
35 | top: | 36 | top: |
36 | add_new_entry: 'Introdu un nou articol' | 37 | add_new_entry: 'Introdu un nou articol' |
37 | search: 'Căutare' | 38 | search: 'Căutare' |
@@ -76,6 +77,7 @@ config: | |||
76 | # redirect_current_page: 'To the current page' | 77 | # redirect_current_page: 'To the current page' |
77 | pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket | 78 | pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket |
78 | # android_configuration: Configure your Android application | 79 | # android_configuration: Configure your Android application |
80 | # android_instruction: "Touch here to prefill your Android application" | ||
79 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 81 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
80 | # help_items_per_page: "You can change the number of articles displayed on each page." | 82 | # help_items_per_page: "You can change the number of articles displayed on each page." |
81 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." | 83 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
@@ -89,9 +91,10 @@ config: | |||
89 | token_reset: 'Resetează-ți token-ul' | 91 | token_reset: 'Resetează-ți token-ul' |
90 | rss_links: 'Link-uri RSS' | 92 | rss_links: 'Link-uri RSS' |
91 | rss_link: | 93 | rss_link: |
92 | unread: 'unread' | 94 | unread: 'Unread' |
93 | starred: 'starred' | 95 | starred: 'Starred' |
94 | archive: 'archived' | 96 | archive: 'Archived' |
97 | # all: 'All' | ||
95 | rss_limit: 'Limită RSS' | 98 | rss_limit: 'Limită RSS' |
96 | form_user: | 99 | form_user: |
97 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion" | 100 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion" |
@@ -110,6 +113,7 @@ config: | |||
110 | # annotations: Remove ALL annotations | 113 | # annotations: Remove ALL annotations |
111 | # tags: Remove ALL tags | 114 | # tags: Remove ALL tags |
112 | # entries: Remove ALL entries | 115 | # entries: Remove ALL entries |
116 | # archived: Remove ALL archived entries | ||
113 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | 117 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) |
114 | form_password: | 118 | form_password: |
115 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 119 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
@@ -154,6 +158,7 @@ config: | |||
154 | # or: 'One rule OR another' | 158 | # or: 'One rule OR another' |
155 | # and: 'One rule AND another' | 159 | # and: 'One rule AND another' |
156 | # matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' | 160 | # matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' |
161 | # notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | ||
157 | 162 | ||
158 | entry: | 163 | entry: |
159 | page_titles: | 164 | page_titles: |
@@ -185,6 +190,8 @@ entry: | |||
185 | unread_label: 'Necitite' | 190 | unread_label: 'Necitite' |
186 | preview_picture_label: 'Are o imagine de previzualizare' | 191 | preview_picture_label: 'Are o imagine de previzualizare' |
187 | preview_picture_help: 'Previzualizare imagine' | 192 | preview_picture_help: 'Previzualizare imagine' |
193 | # is_public_label: 'Has a public link' | ||
194 | # is_public_help: 'Public link' | ||
188 | language_label: 'Limbă' | 195 | language_label: 'Limbă' |
189 | # http_status_label: 'HTTP status' | 196 | # http_status_label: 'HTTP status' |
190 | reading_time: | 197 | reading_time: |
@@ -223,6 +230,8 @@ entry: | |||
223 | original_article: 'original' | 230 | original_article: 'original' |
224 | # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' | 231 | # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' |
225 | created_at: 'Data creării' | 232 | created_at: 'Data creării' |
233 | # published_at: 'Publication date' | ||
234 | # published_by: 'Published by' | ||
226 | new: | 235 | new: |
227 | page_title: 'Salvează un nou articol' | 236 | page_title: 'Salvează un nou articol' |
228 | placeholder: 'http://website.com' | 237 | placeholder: 'http://website.com' |
@@ -234,10 +243,12 @@ entry: | |||
234 | # page_title: 'Edit an entry' | 243 | # page_title: 'Edit an entry' |
235 | # title_label: 'Title' | 244 | # title_label: 'Title' |
236 | url_label: 'Url' | 245 | url_label: 'Url' |
237 | # is_public_label: 'Public' | ||
238 | save_label: 'Salvează' | 246 | save_label: 'Salvează' |
239 | public: | 247 | public: |
240 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" | 248 | # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" |
249 | confirm: | ||
250 | # delete: "Are you sure you want to remove that article?" | ||
251 | # delete_tag: "Are you sure you want to remove that tag from that article?" | ||
241 | 252 | ||
242 | about: | 253 | about: |
243 | page_title: 'Despre' | 254 | page_title: 'Despre' |
@@ -510,6 +521,28 @@ user: | |||
510 | # delete: Delete | 521 | # delete: Delete |
511 | # delete_confirm: Are you sure? | 522 | # delete_confirm: Are you sure? |
512 | # back_to_list: Back to list | 523 | # back_to_list: Back to list |
524 | search: | ||
525 | # placeholder: Filter by username or email | ||
526 | |||
527 | site_credential: | ||
528 | # page_title: Site credentials management | ||
529 | # new_site_credential: Create a credential | ||
530 | # edit_site_credential: Edit an existing credential | ||
531 | # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc." | ||
532 | # list: | ||
533 | # actions: Actions | ||
534 | # edit_action: Edit | ||
535 | # yes: Yes | ||
536 | # no: No | ||
537 | # create_new_one: Create a new credential | ||
538 | # form: | ||
539 | # username_label: 'Username' | ||
540 | # host_label: 'Host' | ||
541 | # password_label: 'Password' | ||
542 | # save: Save | ||
543 | # delete: Delete | ||
544 | # delete_confirm: Are you sure? | ||
545 | # back_to_list: Back to list | ||
513 | 546 | ||
514 | error: | 547 | error: |
515 | # page_title: An error occurred | 548 | # page_title: An error occurred |
@@ -528,6 +561,7 @@ flashes: | |||
528 | # annotations_reset: Annotations reset | 561 | # annotations_reset: Annotations reset |
529 | # tags_reset: Tags reset | 562 | # tags_reset: Tags reset |
530 | # entries_reset: Entries reset | 563 | # entries_reset: Entries reset |
564 | # archived_reset: Archived entries deleted | ||
531 | entry: | 565 | entry: |
532 | notice: | 566 | notice: |
533 | # entry_already_saved: 'Entry already saved on %date%' | 567 | # entry_already_saved: 'Entry already saved on %date%' |
@@ -562,3 +596,8 @@ flashes: | |||
562 | # added: 'User "%username%" added' | 596 | # added: 'User "%username%" added' |
563 | # updated: 'User "%username%" updated' | 597 | # updated: 'User "%username%" updated' |
564 | # deleted: 'User "%username%" deleted' | 598 | # deleted: 'User "%username%" deleted' |
599 | site_credential: | ||
600 | notice: | ||
601 | # added: 'Site credential for "%host%" added' | ||
602 | # updated: 'Site credential for "%host%" updated' | ||
603 | # deleted: 'Site credential for "%host%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index d3180f42..90a140cd 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -32,6 +32,7 @@ menu: | |||
32 | # save_link: 'Save a link' | 32 | # save_link: 'Save a link' |
33 | back_to_unread: 'Okunmayan makalelere geri dön' | 33 | back_to_unread: 'Okunmayan makalelere geri dön' |
34 | # users_management: 'Users management' | 34 | # users_management: 'Users management' |
35 | # site_credentials: 'Site credentials' | ||
35 | top: | 36 | top: |
36 | add_new_entry: 'Yeni bir makale ekle' | 37 | add_new_entry: 'Yeni bir makale ekle' |
37 | search: 'Ara' | 38 | search: 'Ara' |
@@ -76,6 +77,7 @@ config: | |||
76 | # redirect_current_page: 'To the current page' | 77 | # redirect_current_page: 'To the current page' |
77 | # pocket_consumer_key_label: Consumer key for Pocket to import contents | 78 | # pocket_consumer_key_label: Consumer key for Pocket to import contents |
78 | # android_configuration: Configure your Android application | 79 | # android_configuration: Configure your Android application |
80 | # android_instruction: "Touch here to prefill your Android application" | ||
79 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 81 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
80 | # help_items_per_page: "You can change the number of articles displayed on each page." | 82 | # help_items_per_page: "You can change the number of articles displayed on each page." |
81 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." | 83 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
@@ -89,9 +91,10 @@ config: | |||
89 | token_reset: 'Belirteci (token) sıfırla' | 91 | token_reset: 'Belirteci (token) sıfırla' |
90 | rss_links: 'RSS akış bağlantıları' | 92 | rss_links: 'RSS akış bağlantıları' |
91 | rss_link: | 93 | rss_link: |
92 | unread: 'okunmayan' | 94 | unread: 'Okunmayan' |
93 | starred: 'favoriler' | 95 | starred: 'Favoriler' |
94 | archive: 'arşiv' | 96 | archive: 'Arşiv' |
97 | # all: 'All' | ||
95 | rss_limit: 'RSS içeriğinden talep edilecek makale limiti' | 98 | rss_limit: 'RSS içeriğinden talep edilecek makale limiti' |
96 | form_user: | 99 | form_user: |
97 | 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." | 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." |
@@ -110,6 +113,7 @@ config: | |||
110 | # annotations: Remove ALL annotations | 113 | # annotations: Remove ALL annotations |
111 | # tags: Remove ALL tags | 114 | # tags: Remove ALL tags |
112 | # entries: Remove ALL entries | 115 | # entries: Remove ALL entries |
116 | # archived: Remove ALL archived entries | ||
113 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | 117 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) |
114 | form_password: | 118 | form_password: |
115 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 119 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
@@ -154,6 +158,7 @@ config: | |||
154 | or: 'Bir kural veya birbaşkası' | 158 | or: 'Bir kural veya birbaşkası' |
155 | and: 'Bir kural ve diğeri' | 159 | and: 'Bir kural ve diğeri' |
156 | # matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' | 160 | # matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' |
161 | # notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | ||
157 | 162 | ||
158 | entry: | 163 | entry: |
159 | page_titles: | 164 | page_titles: |
@@ -223,6 +228,8 @@ entry: | |||
223 | original_article: 'orijinal' | 228 | original_article: 'orijinal' |
224 | # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' | 229 | # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations' |
225 | created_at: 'Oluşturulma tarihi' | 230 | created_at: 'Oluşturulma tarihi' |
231 | # published_at: 'Publication date' | ||
232 | # published_by: 'Published by' | ||
226 | new: | 233 | new: |
227 | page_title: 'Yeni makaleyi kaydet' | 234 | page_title: 'Yeni makaleyi kaydet' |
228 | placeholder: 'http://website.com' | 235 | placeholder: 'http://website.com' |
@@ -234,10 +241,12 @@ entry: | |||
234 | page_title: 'Makaleyi düzenle' | 241 | page_title: 'Makaleyi düzenle' |
235 | title_label: 'Başlık' | 242 | title_label: 'Başlık' |
236 | url_label: 'Url' | 243 | url_label: 'Url' |
237 | is_public_label: 'Herkes tarafından erişime açık olsun mu?' | ||
238 | save_label: 'Kaydet' | 244 | save_label: 'Kaydet' |
239 | public: | 245 | public: |
240 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" | 246 | # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>" |
247 | confirm: | ||
248 | # delete: "Are you sure you want to remove that article?" | ||
249 | # delete_tag: "Are you sure you want to remove that tag from that article?" | ||
241 | 250 | ||
242 | about: | 251 | about: |
243 | page_title: 'Hakkımızda' | 252 | page_title: 'Hakkımızda' |
@@ -510,6 +519,8 @@ user: | |||
510 | # delete: Delete | 519 | # delete: Delete |
511 | # delete_confirm: Are you sure? | 520 | # delete_confirm: Are you sure? |
512 | # back_to_list: Back to list | 521 | # back_to_list: Back to list |
522 | search: | ||
523 | # placeholder: Filter by username or email | ||
513 | 524 | ||
514 | error: | 525 | error: |
515 | # page_title: An error occurred | 526 | # page_title: An error occurred |
@@ -528,6 +539,7 @@ flashes: | |||
528 | # annotations_reset: Annotations reset | 539 | # annotations_reset: Annotations reset |
529 | # tags_reset: Tags reset | 540 | # tags_reset: Tags reset |
530 | # entries_reset: Entries reset | 541 | # entries_reset: Entries reset |
542 | # archived_reset: Archived entries deleted | ||
531 | entry: | 543 | entry: |
532 | notice: | 544 | notice: |
533 | entry_already_saved: 'Entry already saved on %date%' | 545 | entry_already_saved: 'Entry already saved on %date%' |
@@ -562,3 +574,8 @@ flashes: | |||
562 | # added: 'User "%username%" added' | 574 | # added: 'User "%username%" added' |
563 | # updated: 'User "%username%" updated' | 575 | # updated: 'User "%username%" updated' |
564 | # deleted: 'User "%username%" deleted' | 576 | # deleted: 'User "%username%" deleted' |
577 | site_credential: | ||
578 | notice: | ||
579 | # added: 'Site credential for "%host%" added' | ||
580 | # updated: 'Site credential for "%host%" updated' | ||
581 | # deleted: 'Site credential for "%host%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml index 32a8b4a8..c6a84209 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml | |||
@@ -4,3 +4,4 @@ validator: | |||
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 | # rss_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.' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml index 37b9888f..c74c00ca 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml | |||
@@ -4,3 +4,4 @@ validator: | |||
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 | rss_limit_too_high: 'Dies wird die Anwendung möglicherweise beenden' |
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.en.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml index 29217497..8cc117fe 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml | |||
@@ -4,3 +4,4 @@ validator: | |||
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 | rss_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.' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml index 57ddaa5a..97a8edfa 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml | |||
@@ -4,3 +4,4 @@ validator: | |||
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 | rss_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.' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml index e0536d18..ef677525 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml | |||
@@ -4,3 +4,4 @@ validator: | |||
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 | rss_limit_too_high: 'با این تعداد برنامه به فنا میرود' |
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 64574709..f31b4ed2 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml | |||
@@ -4,3 +4,4 @@ validator: | |||
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 | rss_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." | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml index d9beb54f..d949cc3b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml | |||
@@ -4,3 +4,4 @@ validator: | |||
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 | rss_limit_too_high: 'Questo valore è troppo alto' |
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 f92c2708..fb4aa592 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml | |||
@@ -4,3 +4,4 @@ validator: | |||
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 | rss_limit_too_high: "Aquò li agradarà pas a l'aplicacion" |
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.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml index ffcd5e7f..e4165c14 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml | |||
@@ -4,3 +4,4 @@ validator: | |||
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 | rss_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.' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml index 4eddff10..a8c1f9de 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml | |||
@@ -4,3 +4,4 @@ validator: | |||
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 | rss_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.' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml index 59a8cdd8..6840cf11 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml | |||
@@ -4,3 +4,4 @@ validator: | |||
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 | # rss_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.' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml index 01388771..e1e7317f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml | |||
@@ -4,3 +4,4 @@ validator: | |||
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 | # rss_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.' | ||
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 3548f590..bcc57dac 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 | |||
@@ -82,7 +82,7 @@ | |||
82 | <fieldset class="w500p inline"> | 82 | <fieldset class="w500p inline"> |
83 | <div class="row"> | 83 | <div class="row"> |
84 | <h3>{{ 'config.form_settings.android_configuration'|trans }}</h3> | 84 | <h3>{{ 'config.form_settings.android_configuration'|trans }}</h3> |
85 | <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" >Touch here to prefill your Android application</a> | 85 | <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}">{{ 'config.form_settings.android_instruction' | trans }}</a> |
86 | <br/> | 86 | <br/> |
87 | <img id="androidQrcode" /> | 87 | <img id="androidQrcode" /> |
88 | <script> | 88 | <script> |
@@ -106,7 +106,7 @@ | |||
106 | 106 | ||
107 | <fieldset class="w500p inline"> | 107 | <fieldset class="w500p inline"> |
108 | <div class="row"> | 108 | <div class="row"> |
109 | <label>Rss token</label> | 109 | <label>{{ 'config.form_rss.token_label'|trans }}</label> |
110 | {% if rss.token %} | 110 | {% if rss.token %} |
111 | {{ rss.token }} | 111 | {{ rss.token }} |
112 | {% else %} | 112 | {% else %} |
@@ -128,9 +128,10 @@ | |||
128 | <div class="row"> | 128 | <div class="row"> |
129 | <label>{{ 'config.form_rss.rss_links'|trans }}</label> | 129 | <label>{{ 'config.form_rss.rss_links'|trans }}</label> |
130 | <ul> | 130 | <ul> |
131 | <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">unread</a></li> | 131 | <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.unread'|trans }}</a></li> |
132 | <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">fav</a></li> | 132 | <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.starred'|trans }}</a></li> |
133 | <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">archives</a></li> | 133 | <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_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> | ||
134 | </ul> | 135 | </ul> |
135 | </div> | 136 | </div> |
136 | </fieldset> | 137 | </fieldset> |
@@ -200,6 +201,11 @@ | |||
200 | </a> | 201 | </a> |
201 | </li> | 202 | </li> |
202 | <li> | 203 | <li> |
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> | ||
203 | <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | 209 | <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> |
204 | {{ 'config.reset.entries'|trans }} | 210 | {{ 'config.reset.entries'|trans }} |
205 | </a> | 211 | </a> |
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 859b166b..6424df8d 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 | |||
@@ -1,5 +1,12 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block head %} | ||
4 | {{ parent() }} | ||
5 | {% if tag is defined and app.user.config.rssToken %} | ||
6 | <link rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" /> | ||
7 | {% endif %} | ||
8 | {% endblock %} | ||
9 | |||
3 | {% block title %} | 10 | {% block title %} |
4 | {% set filter = '' %} | 11 | {% set filter = '' %} |
5 | {% if tag is defined %} | 12 | {% if tag is defined %} |
@@ -12,14 +19,17 @@ | |||
12 | {% endblock %} | 19 | {% endblock %} |
13 | 20 | ||
14 | {% block content %} | 21 | {% block content %} |
15 | 22 | {% set currentRoute = app.request.attributes.get('_route') %} | |
16 | {% set listMode = app.user.config.listMode %} | 23 | {% set listMode = app.user.config.listMode %} |
17 | <div class="results"> | 24 | <div class="results"> |
18 | <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div> | 25 | <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div> |
19 | <div class="pagination"> | 26 | <div class="pagination"> |
20 | <a href="{{ path('switch_view_mode') }}"><i class="listMode-btn material-icons md-36">{% if listMode == 0 %}list{% else %}view_module{% endif %}</i></a> | 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> |
21 | <i class="btn-clickable download-btn material-icons md-36 js-export-action">file_download</i> | 28 | {% if app.user.config.rssToken %} |
22 | <i class="btn-clickable filter-btn material-icons md-36 js-filters-action">filter_list</i> | 29 | {% include "@WallabagCore/themes/common/Entry/_rss_link.html.twig" %} |
30 | {% endif %} | ||
31 | <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> | ||
23 | {% if entries.getNbPages > 1 %} | 33 | {% if entries.getNbPages > 1 %} |
24 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | 34 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} |
25 | {% endif %} | 35 | {% endif %} |
@@ -47,10 +57,10 @@ | |||
47 | </div> | 57 | </div> |
48 | 58 | ||
49 | <ul class="tools links"> | 59 | <ul class="tools links"> |
50 | <li><a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool icon-check icon {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ 'entry.list.toogle_as_read'|trans }}</span></a></li> | 60 | <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }} : {{ entry.title|e }}"><span>{{ entry.domainName|removeWww }}</span></a></li> |
51 | <li><a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool icon-star icon {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.list.toogle_as_star'|trans }}</span></a></li> | 61 | <li><a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool icon {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons md-24 vertical-align-middle">check</i><span>{{ 'entry.list.toogle_as_read'|trans }}</span></a></li> |
52 | <li><a title="{{ 'entry.list.delete'|trans }}" class="tool delete icon-trash icon" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.list.delete'|trans }}</span></a></li> | 62 | <li><a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool icon {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons md-24 vertical-align-middle">star_rate</i><span>{{ 'entry.list.toogle_as_star'|trans }}</span></a></li> |
53 | <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.domainName|removeWww }}</span></a></li> | 63 | <li><a title="{{ 'entry.list.delete'|trans }}" class="tool icon" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons md-24 vertical-align-middle">delete</i><span>{{ 'entry.list.delete'|trans }}</span></a></li> |
54 | </ul> | 64 | </ul> |
55 | {% if (entry.previewPicture is null or listMode == 1) %} | 65 | {% if (entry.previewPicture is null or listMode == 1) %} |
56 | <ul class="card-entry-tags"> | 66 | <ul class="card-entry-tags"> |
@@ -76,7 +86,6 @@ | |||
76 | 86 | ||
77 | <!-- Export --> | 87 | <!-- Export --> |
78 | <aside id="download-form"> | 88 | <aside id="download-form"> |
79 | {% set currentRoute = app.request.attributes.get('_route') %} | ||
80 | {% set currentTag = '' %} | 89 | {% set currentTag = '' %} |
81 | {% if tag is defined %} | 90 | {% if tag is defined %} |
82 | {% set currentTag = tag %} | 91 | {% set currentTag = tag %} |
@@ -127,6 +136,11 @@ | |||
127 | {{ form_widget(form.previewPicture) }} | 136 | {{ form_widget(form.previewPicture) }} |
128 | {{ form_label(form.previewPicture) }} | 137 | {{ form_label(form.previewPicture) }} |
129 | </div> | 138 | </div> |
139 | |||
140 | <div class="input-field"> | ||
141 | {{ form_widget(form.isPublic) }} | ||
142 | {{ form_label(form.isPublic) }} | ||
143 | </div> | ||
130 | </div> | 144 | </div> |
131 | 145 | ||
132 | <div id="filter-language" class="filter-group"> | 146 | <div id="filter-language" class="filter-group"> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index a555691d..3d20a6bc 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | |||
@@ -22,7 +22,7 @@ | |||
22 | <li><a title="{{ markAsReadLabel|trans }}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %} markasread" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ markAsReadLabel|trans }}</span></a></li> | 22 | <li><a title="{{ markAsReadLabel|trans }}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %} markasread" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ markAsReadLabel|trans }}</span></a></li> |
23 | <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %} favorite" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li> | 23 | <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %} favorite" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li> |
24 | <li><a id="nav-btn-add-tag" class="tool icon icon-price-tags" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li> | 24 | <li><a id="nav-btn-add-tag" class="tool icon icon-price-tags" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li> |
25 | <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li> | 25 | <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li> |
26 | {% if craue_setting('share_public') %} | 26 | {% if craue_setting('share_public') %} |
27 | <li><a href="{{ path('share', {'id': entry.id }) }}" target="_blank" class="tool icon icon-eye" title="{{ 'entry.view.left_menu.public_link'|trans }}"><span>{{ 'entry.view.left_menu.public_link'|trans }}</span></a></li> | 27 | <li><a href="{{ path('share', {'id': entry.id }) }}" target="_blank" class="tool icon icon-eye" title="{{ 'entry.view.left_menu.public_link'|trans }}"><span>{{ 'entry.view.left_menu.public_link'|trans }}</span></a></li> |
28 | <li><a href="{{ path('delete_share', {'id': entry.id }) }}" class="tool icon icon-no-eye" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}"><span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span></a></li> | 28 | <li><a href="{{ path('delete_share', {'id': entry.id }) }}" class="tool icon icon-no-eye" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}"><span>{{ 'entry.view.left_menu.delete_public_link'|trans }}</span></a></li> |
@@ -30,6 +30,7 @@ | |||
30 | {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %} | 30 | {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %} |
31 | {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="Email"><span>Email</span></a></li>{% endif %} | 31 | {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="Email"><span>Email</span></a></li>{% endif %} |
32 | {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&tags={{ entry.tags|join(',')|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %} | 32 | {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&tags={{ entry.tags|join(',')|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %} |
33 | {% if craue_setting('share_scuttle') %}<li><a href="{{ craue_setting('scuttle_url') }}/bookmarks.php?action=add&address={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&tags={{ entry.tags|join(',')|url_encode }}" target="_blank" class="tool icon-image icon-image--scuttle" title="scuttle"><span>scuttle</span></a></li>{% endif %} | ||
33 | {% if craue_setting('share_diaspora') %}<li><a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}¬es=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora"><span>diaspora</span></a></li>{% endif %} | 34 | {% if craue_setting('share_diaspora') %}<li><a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}¬es=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora"><span>diaspora</span></a></li>{% endif %} |
34 | {% if craue_setting('share_unmark') %}<li><a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&title={{entry.title|url_encode}}&v=6" target="_blank" class="tool unmark icon-image icon-image--unmark" title="unmark"><span>unmark.it</span></a></li>{% endif %} | 35 | {% if craue_setting('share_unmark') %}<li><a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&title={{entry.title|url_encode}}&v=6" target="_blank" class="tool unmark icon-image icon-image--unmark" title="unmark"><span>unmark.it</span></a></li>{% endif %} |
35 | {% if craue_setting('carrot') %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot"><span>Carrot</span></a></li>{% endif %} | 36 | {% if craue_setting('carrot') %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot"><span>Carrot</span></a></li>{% endif %} |
@@ -43,9 +44,23 @@ | |||
43 | 44 | ||
44 | <div id="article-informations"> | 45 | <div id="article-informations"> |
45 | <i class="tool icon icon-calendar" title="{{ 'entry.view.created_at'|trans }}"> | 46 | <i class="tool icon icon-calendar" title="{{ 'entry.view.created_at'|trans }}"> |
46 | {{ entry.createdAt|date('Y-m-d') }} | 47 | {{ entry.createdAt|date('Y-m-d H:i') }} |
47 | </i> | 48 | </i> |
48 | 49 | ||
50 | {% if entry.publishedAt is not null %} | ||
51 | <i class="tool icon icon-pencil2" title="{{ 'entry.view.published_at'|trans }}"> | ||
52 | {{ entry.publishedAt|date('Y-m-d H:i') }} | ||
53 | </i> | ||
54 | {% endif %} | ||
55 | |||
56 | {% if entry.publishedBy is not empty %} | ||
57 | <i class="tool icon icon-users" title="{{ 'entry.view.published_by'|trans }}"> | ||
58 | {% for author in entry.publishedBy %} | ||
59 | {{ author }}{% if not loop.last %}, {% endif %} | ||
60 | {% endfor %} | ||
61 | </i> | ||
62 | {% endif %} | ||
63 | |||
49 | <i class="tool icon icon-time"> | 64 | <i class="tool icon icon-time"> |
50 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | 65 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} |
51 | {% if readingTime > 0 %} | 66 | {% if readingTime > 0 %} |
@@ -59,10 +74,16 @@ | |||
59 | <aside class="tags"> | 74 | <aside class="tags"> |
60 | <div class="card-entry-tags"> | 75 | <div class="card-entry-tags"> |
61 | {% for tag in entry.tags %} | 76 | {% for tag in entry.tags %} |
62 | <span class="label-outline"><i class="material-icons">label_outline</i> <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}" class="nostyle"><i>✘</i></a></span> | 77 | <span class="label-outline"> |
78 | <i class="material-icons">label_outline</i> | ||
79 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> | ||
80 | <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}" onclick="return confirm('{{ 'entry.confirm.delete_tag'|trans|escape('js') }}')" class="nostyle"> | ||
81 | <i>✘</i> | ||
82 | </a> | ||
83 | </span> | ||
63 | {% endfor %} | 84 | {% endfor %} |
64 | </div> | 85 | </div> |
65 | <div class="input-field nav-panel-add-tag" style="display: none"> | 86 | <div class="input-field baggy-add-tag" style="display: none"> |
66 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} | 87 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} |
67 | </div> | 88 | </div> |
68 | </aside> | 89 | </aside> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/edit.html.twig new file mode 100644 index 00000000..882be430 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/edit.html.twig | |||
@@ -0,0 +1,60 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | |||
7 | <div class="row"> | ||
8 | <div class="col s12"> | ||
9 | <div class="card-panel"> | ||
10 | <div class="row"> | ||
11 | <div class="input-field col s12"> | ||
12 | <h4>{{ 'site_credential.edit_site_credential'|trans }}</h4> | ||
13 | |||
14 | <div id="set6" class="col s12"> | ||
15 | {{ form_start(edit_form) }} | ||
16 | {{ form_errors(edit_form) }} | ||
17 | |||
18 | <div class="row"> | ||
19 | <div class="input-field col s12"> | ||
20 | {{ form_label(edit_form.host) }} | ||
21 | {{ form_errors(edit_form.host) }} | ||
22 | {{ form_widget(edit_form.host) }} | ||
23 | </div> | ||
24 | </div> | ||
25 | |||
26 | <div class="row"> | ||
27 | <div class="input-field col s12"> | ||
28 | {{ form_label(edit_form.username) }} | ||
29 | {{ form_errors(edit_form.username) }} | ||
30 | {{ form_widget(edit_form.username) }} | ||
31 | </div> | ||
32 | </div> | ||
33 | |||
34 | <div class="row"> | ||
35 | <div class="input-field col s12"> | ||
36 | {{ form_label(edit_form.password) }} | ||
37 | {{ form_errors(edit_form.password) }} | ||
38 | {{ form_widget(edit_form.password) }} | ||
39 | </div> | ||
40 | </div> | ||
41 | |||
42 | <br/> | ||
43 | |||
44 | {{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | ||
45 | {{ form_widget(edit_form._token) }} | ||
46 | </form> | ||
47 | <p> | ||
48 | {{ form_start(delete_form) }} | ||
49 | <button onclick="return confirm('{{ 'site_credential.form.delete_confirm'|trans|escape('js') }}')" type="submit" class="btn waves-effect waves-light red">{{ 'site_credential.form.delete'|trans }}</button> | ||
50 | {{ form_end(delete_form) }} | ||
51 | </p> | ||
52 | <p><a class="waves-effect waves-light btn blue-grey" href="{{ path('site_credentials_index') }}">{{ 'site_credential.form.back_to_list'|trans }}</a></p> | ||
53 | </div> | ||
54 | </div> | ||
55 | </div> | ||
56 | </div> | ||
57 | </div> | ||
58 | </div> | ||
59 | |||
60 | {% endblock %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig new file mode 100644 index 00000000..324854ad --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/index.html.twig | |||
@@ -0,0 +1,42 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | |||
7 | <div class="row"> | ||
8 | <div class="col s12"> | ||
9 | <div class="card-panel"> | ||
10 | <div class="row"> | ||
11 | <div class="input-field col s12"> | ||
12 | <p class="help">{{ 'site_credential.description'|trans|raw }}</p> | ||
13 | |||
14 | <table class="bordered"> | ||
15 | <thead> | ||
16 | <tr> | ||
17 | <th>{{ 'site_credential.form.host_label'|trans }}</th> | ||
18 | <th>{{ 'site_credential.list.actions'|trans }}</th> | ||
19 | </tr> | ||
20 | </thead> | ||
21 | <tbody> | ||
22 | {% for credential in credentials %} | ||
23 | <tr> | ||
24 | <td>{{ credential.host }}</td> | ||
25 | <td> | ||
26 | <a href="{{ path('site_credentials_edit', { 'id': credential.id }) }}">{{ 'site_credential.list.edit_action'|trans }}</a> | ||
27 | </td> | ||
28 | </tr> | ||
29 | {% endfor %} | ||
30 | </tbody> | ||
31 | </table> | ||
32 | <br /> | ||
33 | <p> | ||
34 | <a href="{{ path('site_credentials_new') }}" class="waves-effect waves-light btn">{{ 'site_credential.list.create_new_one'|trans }}</a> | ||
35 | </p> | ||
36 | </div> | ||
37 | </div> | ||
38 | </div> | ||
39 | </div> | ||
40 | </div> | ||
41 | |||
42 | {% endblock %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/new.html.twig new file mode 100644 index 00000000..3c008cde --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/SiteCredential/new.html.twig | |||
@@ -0,0 +1,53 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | |||
7 | <div class="row"> | ||
8 | <div class="col s12"> | ||
9 | <div class="card-panel"> | ||
10 | <div class="row"> | ||
11 | <div class="input-field col s12"> | ||
12 | <h4>{{ 'site_credential.new_site_credential'|trans }}</h4> | ||
13 | |||
14 | <div id="set6" class="col s12"> | ||
15 | {{ form_start(form) }} | ||
16 | {{ form_errors(form) }} | ||
17 | |||
18 | <div class="row"> | ||
19 | <div class="input-field col s12"> | ||
20 | {{ form_label(form.host) }} | ||
21 | {{ form_errors(form.host) }} | ||
22 | {{ form_widget(form.host) }} | ||
23 | </div> | ||
24 | </div> | ||
25 | |||
26 | <div class="row"> | ||
27 | <div class="input-field col s12"> | ||
28 | {{ form_label(form.username) }} | ||
29 | {{ form_errors(form.username) }} | ||
30 | {{ form_widget(form.username) }} | ||
31 | </div> | ||
32 | </div> | ||
33 | |||
34 | <div class="row"> | ||
35 | <div class="input-field col s12"> | ||
36 | {{ form_label(form.password) }} | ||
37 | {{ form_errors(form.password) }} | ||
38 | {{ form_widget(form.password) }} | ||
39 | </div> | ||
40 | </div> | ||
41 | |||
42 | {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | ||
43 | {{ form_rest(form) }} | ||
44 | </form> | ||
45 | <p><a class="waves-effect waves-light btn blue-grey" href="{{ path('site_credentials_index') }}">{{ 'site_credential.form.back_to_list'|trans }}</a></p> | ||
46 | </div> | ||
47 | </div> | ||
48 | </div> | ||
49 | </div> | ||
50 | </div> | ||
51 | </div> | ||
52 | |||
53 | {% endblock %} | ||
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 1e2c6b42..070d5629 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 | |||
@@ -9,7 +9,12 @@ | |||
9 | 9 | ||
10 | <ul> | 10 | <ul> |
11 | {% for tag in tags %} | 11 | {% for tag in tags %} |
12 | <li id="tag-{{ tag.id|e }}"><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.nbEntries | length }})</a></li> | 12 | <li id="tag-{{ tag.id|e }}"> |
13 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{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"> | ||
15 | <i class="material-icons md-24">rss_feed</i> | ||
16 | </a> | ||
17 | </li> | ||
13 | {% endfor %} | 18 | {% endfor %} |
14 | </ul> | 19 | </ul> |
15 | 20 | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig index 07ff8e14..17fa13bb 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig | |||
@@ -2,12 +2,14 @@ | |||
2 | 2 | ||
3 | {% block css %} | 3 | {% block css %} |
4 | {{ parent() }} | 4 | {{ parent() }} |
5 | <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/style.min.css') }}" media="screen,projection,print"/> | 5 | {% if not app.debug %} |
6 | <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/baggy.css') }}"> | ||
7 | {% endif %} | ||
6 | {% endblock %} | 8 | {% endblock %} |
7 | 9 | ||
8 | {% block scripts %} | 10 | {% block scripts %} |
9 | {{ parent() }} | 11 | {{ parent() }} |
10 | <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/baggy.min.js') }}"></script> | 12 | <script src="{{ asset('bundles/wallabagcore/baggy' ~ (app.debug ? '.dev' : '') ~ '.js') }}"></script> |
11 | {% endblock %} | 13 | {% endblock %} |
12 | 14 | ||
13 | {% block header %} | 15 | {% block header %} |
@@ -36,6 +38,9 @@ | |||
36 | {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }} | 38 | {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }} |
37 | </div> | 39 | </div> |
38 | </li> | 40 | </li> |
41 | {% if craue_setting('restricted_access') %} | ||
42 | <li class="menu site_credentials"><a href="{{ path('site_credentials_index') }}">{{ 'menu.left.site_credentials'|trans }}</a></li> | ||
43 | {% endif %} | ||
39 | <li class="menu config"><a href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a></li> | 44 | <li class="menu config"><a href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a></li> |
40 | {% if is_granted('ROLE_SUPER_ADMIN') %} | 45 | {% if is_granted('ROLE_SUPER_ADMIN') %} |
41 | <li class="menu users"><a href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a></li> | 46 | <li class="menu users"><a href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a></li> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig index b3f0affb..528b055c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig | |||
@@ -33,7 +33,7 @@ | |||
33 | <table class="striped"> | 33 | <table class="striped"> |
34 | <tr> | 34 | <tr> |
35 | <td>{{ 'developer.existing_clients.field_id'|trans }}</td> | 35 | <td>{{ 'developer.existing_clients.field_id'|trans }}</td> |
36 | <td><strong><code>{{ client.id }}_{{ client.randomId }}</code></strong></td> | 36 | <td><strong><code>{{ client.clientId }}</code></strong></td> |
37 | </tr> | 37 | </tr> |
38 | <tr> | 38 | <tr> |
39 | <td>{{ 'developer.existing_clients.field_secret'|trans }}</td> | 39 | <td>{{ 'developer.existing_clients.field_secret'|trans }}</td> |
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 new file mode 100644 index 00000000..2bf9b2bd --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_rss_link.html.twig | |||
@@ -0,0 +1,6 @@ | |||
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 ['unread', 'starred', 'archive', 'all'] %} | ||
4 | <a rel="alternate" type="application/rss+xml" href="{{ path(currentRoute ~ '_rss', {'username': app.user.username, 'token': app.user.config.rssToken}) }}" class="right"><i class="material-icons">rss_feed</i></a> | ||
5 | {% endif %} | ||
6 | |||
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 12e8c79f..d70aa5dc 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,8 +1,8 @@ | |||
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 | <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/"> |
3 | <channel> | 3 | <channel> |
4 | <title>wallabag — {{type}} feed</title> | 4 | <title>wallabag - {{ type }} feed</title> |
5 | <link>{{ url(type) }}</link> | 5 | <link>{{ url_html }}</link> |
6 | <link rel="self" href="{{ app.request.uri }}"/> | 6 | <link rel="self" href="{{ app.request.uri }}"/> |
7 | {% if entries.hasPreviousPage -%} | 7 | {% if entries.hasPreviousPage -%} |
8 | <link rel="previous" href="{{ url }}?page={{ entries.previousPage }}"/> | 8 | <link rel="previous" href="{{ url }}?page={{ entries.previousPage }}"/> |
@@ -13,7 +13,7 @@ | |||
13 | <link rel="last" href="{{ url }}?page={{ entries.nbPages }}"/> | 13 | <link rel="last" href="{{ url }}?page={{ entries.nbPages }}"/> |
14 | <pubDate>{{ "now"|date('D, d M Y H:i:s') }}</pubDate> | 14 | <pubDate>{{ "now"|date('D, d M Y H:i:s') }}</pubDate> |
15 | <generator>wallabag</generator> | 15 | <generator>wallabag</generator> |
16 | <description>wallabag {{type}} elements</description> | 16 | <description>wallabag {{ type }} elements</description> |
17 | 17 | ||
18 | {% for entry in entries %} | 18 | {% for entry in entries %} |
19 | 19 | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig index 623cf1c4..a67807f9 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig | |||
@@ -1,32 +1,6 @@ | |||
1 | <html> | 1 | <html> |
2 | <head> | 2 | <head> |
3 | <title>{{ entry.title|e|raw }}</title> | 3 | <title>{{ entry.title|e|raw }}</title> |
4 | <style> | ||
5 | body { | ||
6 | margin: 10px; | ||
7 | font-family: 'Roboto',Verdana,Geneva,sans-serif; | ||
8 | font-size: 16px; | ||
9 | color: #000; | ||
10 | } | ||
11 | header { | ||
12 | text-align: center; | ||
13 | } | ||
14 | |||
15 | header h1 { | ||
16 | font-size: 1.3em; | ||
17 | } | ||
18 | |||
19 | a, | ||
20 | a:hover, | ||
21 | a:visited { | ||
22 | color: #000; | ||
23 | } | ||
24 | |||
25 | article { | ||
26 | margin: 0 auto; | ||
27 | width: 600px; | ||
28 | } | ||
29 | </style> | ||
30 | <meta property="og:title" content="{{ entry.title|e|raw }}" /> | 4 | <meta property="og:title" content="{{ entry.title|e|raw }}" /> |
31 | <meta property="og:type" content="article" /> | 5 | <meta property="og:type" content="article" /> |
32 | <meta property="og:url" content="{{ app.request.uri }}" /> | 6 | <meta property="og:url" content="{{ app.request.uri }}" /> |
@@ -40,12 +14,22 @@ | |||
40 | <meta name="twitter:site" content="@wallabagapp" /> | 14 | <meta name="twitter:site" content="@wallabagapp" /> |
41 | <meta name="twitter:title" content="{{ entry.title|e|raw }}" /> | 15 | <meta name="twitter:title" content="{{ entry.title|e|raw }}" /> |
42 | <meta name="twitter:description" content="{{ entry.content|striptags|slice(0, 300)|raw }}…" /> | 16 | <meta name="twitter:description" content="{{ entry.content|striptags|slice(0, 300)|raw }}…" /> |
17 | {% if app.debug %} | ||
18 | <script src="{{ asset('bundles/wallabagcore/public.dev.js') }}"></script> | ||
19 | {% else %} | ||
20 | <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/public.css') }}"> | ||
21 | {% endif %} | ||
22 | |||
43 | </head> | 23 | </head> |
44 | <body> | 24 | <body> |
45 | <header> | 25 | <header> |
46 | <h1>{{ entry.title|e|raw }}</h1> | 26 | <h1>{{ entry.title|e|raw }}</h1> |
47 | <div><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e|raw }}" class="tool">{{ entry.domainName|removeWww }}</a></div> | 27 | <div><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e|raw }}" class="tool">{{ entry.domainName|removeWww }}</a></div> |
48 | <div>{{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage')})|raw }}</div> | 28 | <div>{{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage'), '%username%': entry.user.username})|raw }}.</div> |
29 | |||
30 | {% if entry.previewPicture is not null %} | ||
31 | <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|striptags|e('html_attr') }}" /></div> | ||
32 | {% endif %} | ||
49 | </header> | 33 | </header> |
50 | <article> | 34 | <article> |
51 | {{ entry.content | raw }} | 35 | {{ entry.content | raw }} |
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 5d411fdd..a8143315 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 | |||
@@ -25,9 +25,9 @@ | |||
25 | 25 | ||
26 | <div class="row"> | 26 | <div class="row"> |
27 | <div class="input-field col s11"> | 27 | <div class="input-field col s11"> |
28 | {{ form_label(form.config.theme) }} | ||
29 | {{ form_errors(form.config.theme) }} | 28 | {{ form_errors(form.config.theme) }} |
30 | {{ form_widget(form.config.theme) }} | 29 | {{ form_widget(form.config.theme) }} |
30 | {{ form_label(form.config.theme) }} | ||
31 | </div> | 31 | </div> |
32 | <div class="input-field col s1"> | 32 | <div class="input-field col s1"> |
33 | <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_theme'|trans }}"> | 33 | <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_theme'|trans }}"> |
@@ -38,9 +38,9 @@ | |||
38 | 38 | ||
39 | <div class="row"> | 39 | <div class="row"> |
40 | <div class="input-field col s11"> | 40 | <div class="input-field col s11"> |
41 | {{ form_label(form.config.items_per_page) }} | ||
42 | {{ form_errors(form.config.items_per_page) }} | 41 | {{ form_errors(form.config.items_per_page) }} |
43 | {{ form_widget(form.config.items_per_page) }} | 42 | {{ form_widget(form.config.items_per_page) }} |
43 | {{ form_label(form.config.items_per_page) }} | ||
44 | </div> | 44 | </div> |
45 | <div class="input-field col s1"> | 45 | <div class="input-field col s1"> |
46 | <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_items_per_page'|trans }}"> | 46 | <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_items_per_page'|trans }}"> |
@@ -51,9 +51,9 @@ | |||
51 | 51 | ||
52 | <div class="row"> | 52 | <div class="row"> |
53 | <div class="input-field col s11"> | 53 | <div class="input-field col s11"> |
54 | {{ form_label(form.config.reading_speed) }} | ||
55 | {{ form_errors(form.config.reading_speed) }} | 54 | {{ form_errors(form.config.reading_speed) }} |
56 | {{ form_widget(form.config.reading_speed) }} | 55 | {{ form_widget(form.config.reading_speed) }} |
56 | {{ form_label(form.config.reading_speed) }} | ||
57 | <p> | 57 | <p> |
58 | {{ 'config.form_settings.reading_speed.help_message'|trans }} | 58 | {{ 'config.form_settings.reading_speed.help_message'|trans }} |
59 | <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a> | 59 | <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a> |
@@ -66,19 +66,19 @@ | |||
66 | </div> | 66 | </div> |
67 | </div> | 67 | </div> |
68 | 68 | ||
69 | <div class="row"> | 69 | <div class="row"> |
70 | <div class="input-field col s12"> | 70 | <div class="input-field col s12"> |
71 | {{ form_label(form.config.action_mark_as_read) }} | 71 | {{ form_label(form.config.action_mark_as_read) }} |
72 | {{ form_errors(form.config.action_mark_as_read) }} | 72 | {{ form_errors(form.config.action_mark_as_read) }} |
73 | {{ form_widget(form.config.action_mark_as_read) }} | 73 | {{ form_widget(form.config.action_mark_as_read) }} |
74 | </div> | ||
74 | </div> | 75 | </div> |
75 | </div> | ||
76 | 76 | ||
77 | <div class="row"> | 77 | <div class="row"> |
78 | <div class="input-field col s11"> | 78 | <div class="input-field col s11"> |
79 | {{ form_label(form.config.language) }} | ||
80 | {{ form_errors(form.config.language) }} | 79 | {{ form_errors(form.config.language) }} |
81 | {{ form_widget(form.config.language) }} | 80 | {{ form_widget(form.config.language) }} |
81 | {{ form_label(form.config.language) }} | ||
82 | </div> | 82 | </div> |
83 | <div class="input-field col s1"> | 83 | <div class="input-field col s1"> |
84 | <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_language'|trans }}"> | 84 | <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_language'|trans }}"> |
@@ -89,9 +89,9 @@ | |||
89 | 89 | ||
90 | <div class="row"> | 90 | <div class="row"> |
91 | <div class="input-field col s11"> | 91 | <div class="input-field col s11"> |
92 | {{ form_label(form.config.pocket_consumer_key) }} | ||
93 | {{ form_errors(form.config.pocket_consumer_key) }} | 92 | {{ form_errors(form.config.pocket_consumer_key) }} |
94 | {{ form_widget(form.config.pocket_consumer_key) }} | 93 | {{ form_widget(form.config.pocket_consumer_key) }} |
94 | {{ form_label(form.config.pocket_consumer_key) }} | ||
95 | <p> | 95 | <p> |
96 | » | 96 | » |
97 | <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> | 97 | <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> |
@@ -107,7 +107,7 @@ | |||
107 | <div class="row"> | 107 | <div class="row"> |
108 | <div class="input-field col s12"> | 108 | <div class="input-field col s12"> |
109 | <h5>{{ 'config.form_settings.android_configuration'|trans }}</h5> | 109 | <h5>{{ 'config.form_settings.android_configuration'|trans }}</h5> |
110 | <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" class="waves-effect waves-light btn hide-on-large-only">Touch here to prefill your Android application</a> | 110 | <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" class="waves-effect waves-light btn hide-on-large-only">{{ 'config.form_settings.android_instruction' | trans }}</a> |
111 | <img id="androidQrcode" class="hide-on-med-and-down" /> | 111 | <img id="androidQrcode" class="hide-on-med-and-down" /> |
112 | </div> | 112 | </div> |
113 | <script> | 113 | <script> |
@@ -132,8 +132,8 @@ | |||
132 | </div> | 132 | </div> |
133 | 133 | ||
134 | <div class="row"> | 134 | <div class="row"> |
135 | <div class="input-field col s12"> | 135 | <div class="col s12"> |
136 | <label>{{ 'config.form_rss.token_label'|trans }}</label> | 136 | <h6 class="grey-text">{{ 'config.form_rss.token_label'|trans }}</h6> |
137 | <div> | 137 | <div> |
138 | {% if rss.token %} | 138 | {% if rss.token %} |
139 | {{ rss.token }} | 139 | {{ rss.token }} |
@@ -151,12 +151,13 @@ | |||
151 | </div> | 151 | </div> |
152 | {% if rss.token %} | 152 | {% if rss.token %} |
153 | <div class="row"> | 153 | <div class="row"> |
154 | <div class="input-field col s12"> | 154 | <div class="col s12"> |
155 | <label>{{ 'config.form_rss.rss_links'|trans }}</label> | 155 | <h6 class="grey-text">{{ 'config.form_rss.rss_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_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_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_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_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_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_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 | </ul> | 161 | </ul> |
161 | </div> | 162 | </div> |
162 | </div> | 163 | </div> |
@@ -229,6 +230,9 @@ | |||
229 | <a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | 230 | <a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> |
230 | {{ 'config.reset.tags'|trans }} | 231 | {{ 'config.reset.tags'|trans }} |
231 | </a> | 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> | ||
232 | <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | 236 | <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> |
233 | {{ 'config.reset.entries'|trans }} | 237 | {{ 'config.reset.entries'|trans }} |
234 | </a> | 238 | </a> |
@@ -251,11 +255,11 @@ | |||
251 | {{ form_start(form.pwd) }} | 255 | {{ form_start(form.pwd) }} |
252 | {{ form_errors(form.pwd) }} | 256 | {{ form_errors(form.pwd) }} |
253 | 257 | ||
254 | <div class="row"> | 258 | <div class="row"> |
255 | <div class="input-field col s12"> | 259 | <div class="input-field col s12"> |
256 | {{ 'config.form_password.description'|trans }} | 260 | {{ 'config.form_password.description'|trans }} |
261 | </div> | ||
257 | </div> | 262 | </div> |
258 | </div> | ||
259 | 263 | ||
260 | <div class="row"> | 264 | <div class="row"> |
261 | <div class="input-field col s12"> | 265 | <div class="input-field col s12"> |
@@ -410,8 +414,8 @@ | |||
410 | <tr> | 414 | <tr> |
411 | <td>domainName</td> | 415 | <td>domainName</td> |
412 | <td>{{ 'config.form_rules.faq.variable_description.domainName'|trans }}</td> | 416 | <td>{{ 'config.form_rules.faq.variable_description.domainName'|trans }}</td> |
413 | <td>matches</td> | 417 | <td>matches<br />notmaches</td> |
414 | <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}</td> | 418 | <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}<br />{{ 'config.form_rules.faq.operator_description.notmatches'|trans|raw }}</td> |
415 | </tr> | 419 | </tr> |
416 | </tbody> | 420 | </tbody> |
417 | </table> | 421 | </table> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig index d278da1b..468338ac 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig | |||
@@ -9,7 +9,7 @@ | |||
9 | <li> | 9 | <li> |
10 | <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a> | 10 | <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a> |
11 | <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a> | 11 | <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a> |
12 | <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a> | 12 | <a title="{{ 'entry.list.delete'|trans }}" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a> |
13 | </li> | 13 | </li> |
14 | </ul> | 14 | </ul> |
15 | </div> | 15 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig index 3ba6253a..b64e1436 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig | |||
@@ -1,18 +1,28 @@ | |||
1 | <div class="card"> | 1 | <div class="card-stacked"> |
2 | <div class="card-stacked"> | 2 | <div class="preview">{% if entry.previewPicture is not null %}<img src="{{ entry.previewPicture }}" />{% endif %}</div> |
3 | <div class="card-content"> | 3 | <div class="card-content"> |
4 | <span class="card-title dot-ellipsis dot-resize-update"> | 4 | <span class="card-title dot-ellipsis dot-resize-update"> |
5 | <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | striptags | e('html_attr') }}"> | 5 | <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | striptags | e('html_attr') }}"> |
6 | {{ entry.title| striptags | truncate(120, true, '…') | raw }} | 6 | {{ entry.title| striptags | truncate(120, true, '…') | raw }} |
7 | </a> | 7 | </a> |
8 | </span> | 8 | </span> |
9 | <ul class="tools-list right"> | 9 | |
10 | <li> | 10 | <div class="metadata"> |
11 | <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a> | 11 | <a href="{{ entry.url|e }}" class="grey-text domain" target="_blank" title="{{ entry.domainName|removeWww }}"> |
12 | <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a> | 12 | <span>{{ entry.domainName|removeWww }}</span> |
13 | <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a> | 13 | </a> |
14 | </li> | 14 | {% for tag in entry.tags | slice(0, 3) %} |
15 | </ul> | 15 | <span class="chip hide-on-med-and-down"> |
16 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> | ||
17 | </span> | ||
18 | {% endfor %} | ||
16 | </div> | 19 | </div> |
17 | </div> | 20 | </div> |
21 | <ul class="tools-list hide-on-small-only"> | ||
22 | <li> | ||
23 | <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a> | ||
24 | <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a> | ||
25 | <a title="{{ 'entry.list.delete'|trans }}" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a> | ||
26 | </li> | ||
27 | </ul> | ||
18 | </div> | 28 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig index 1a932a9f..6ba18768 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig | |||
@@ -1,7 +1,7 @@ | |||
1 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | 1 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} |
2 | <i class="material-icons">timer</i> | 2 | <i class="material-icons">timer</i> |
3 | {% if readingTime > 0 %} | 3 | {% if readingTime > 0 %} |
4 | {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} | 4 | <span>{{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }}</span> |
5 | {% else %} | 5 | {% else %} |
6 | {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} | 6 | <span>{{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }}</span> |
7 | {% endif %} | 7 | {% endif %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig index 1c5e2aab..b9537975 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig | |||
@@ -27,11 +27,6 @@ | |||
27 | {{ form_label(form.url) }} | 27 | {{ form_label(form.url) }} |
28 | {{ form_widget(form.url) }} | 28 | {{ form_widget(form.url) }} |
29 | </div> | 29 | </div> |
30 | |||
31 | <div class="input-field s12"> | ||
32 | {{ form_widget(form.is_public) }} | ||
33 | {{ form_label(form.is_public) }} | ||
34 | </div> | ||
35 | <br> | 30 | <br> |
36 | 31 | ||
37 | {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | 32 | {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} |
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 5fca53ae..0c4dc80b 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 | |||
@@ -1,9 +1,16 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block head %} | ||
4 | {{ parent() }} | ||
5 | {% if tag is defined and app.user.config.rssToken %} | ||
6 | <link rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" /> | ||
7 | {% endif %} | ||
8 | {% endblock %} | ||
9 | |||
3 | {% block title %} | 10 | {% block title %} |
4 | {% set filter = '' %} | 11 | {% set filter = '' %} |
5 | {% if tag is defined %} | 12 | {% if tag is defined %} |
6 | {% set filter = tag %} | 13 | {% set filter = tag.slug %} |
7 | {% endif %} | 14 | {% endif %} |
8 | {% if searchTerm is defined and searchTerm is not empty %} | 15 | {% if searchTerm is defined and searchTerm is not empty %} |
9 | {% set filter = searchTerm %} | 16 | {% set filter = searchTerm %} |
@@ -13,10 +20,14 @@ | |||
13 | 20 | ||
14 | {% block content %} | 21 | {% block content %} |
15 | {% set listMode = app.user.config.listMode %} | 22 | {% set listMode = app.user.config.listMode %} |
23 | {% set currentRoute = app.request.attributes.get('_route') %} | ||
16 | <div class="results clearfix"> | 24 | <div class="results clearfix"> |
17 | <div class="nb-results left"> | 25 | <div class="nb-results left"> |
18 | {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} | 26 | {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} |
19 | <a href="{{ path('switch_view_mode') }}"><i class="material-icons">{% if listMode == 0 %}view_list{% else %}view_module{% endif %}</i></a> | 27 | <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 %} | ||
29 | {% include "@WallabagCore/themes/common/Entry/_rss_link.html.twig" %} | ||
30 | {% endif %} | ||
20 | </div> | 31 | </div> |
21 | {% if entries.getNbPages > 1 %} | 32 | {% if entries.getNbPages > 1 %} |
22 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | 33 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} |
@@ -24,9 +35,9 @@ | |||
24 | </div> | 35 | </div> |
25 | 36 | ||
26 | <br /> | 37 | <br /> |
27 | <ul class="row data"> | 38 | <ul class="{% if listMode == 1 %}collection{% else %}row data{% endif %}"> |
28 | {% for entry in entries %} | 39 | {% for entry in entries %} |
29 | <li id="entry-{{ entry.id|e }}" class="col {% if listMode == 0 %}l3 m6{% endif %} s12"> | 40 | <li id="entry-{{ entry.id|e }}" class="col {% if listMode == 0 %}l3 m6{% else %}collection-item{% endif %} s12"> |
30 | {% if listMode == 1 %} | 41 | {% if listMode == 1 %} |
31 | {% include "@WallabagCore/themes/material/Entry/_card_list.html.twig" with {'entry': entry} only %} | 42 | {% include "@WallabagCore/themes/material/Entry/_card_list.html.twig" with {'entry': entry} only %} |
32 | {% elseif entry.previewPicture is null %} | 43 | {% elseif entry.previewPicture is null %} |
@@ -45,11 +56,10 @@ | |||
45 | {% endif %} | 56 | {% endif %} |
46 | 57 | ||
47 | <!-- Export --> | 58 | <!-- Export --> |
48 | <div id="export" class="side-nav fixed right-aligned"> | 59 | <div id="export" class="side-nav right-aligned"> |
49 | {% set currentRoute = app.request.attributes.get('_route') %} | ||
50 | {% set currentTag = '' %} | 60 | {% set currentTag = '' %} |
51 | {% if tag is defined %} | 61 | {% if tag is defined %} |
52 | {% set currentTag = tag %} | 62 | {% set currentTag = tag.slug %} |
53 | {% endif %} | 63 | {% endif %} |
54 | {% if currentRoute == 'homepage' %} | 64 | {% if currentRoute == 'homepage' %} |
55 | {% set currentRoute = 'unread' %} | 65 | {% set currentRoute = 'unread' %} |
@@ -68,7 +78,7 @@ | |||
68 | 78 | ||
69 | <!-- Filters --> | 79 | <!-- Filters --> |
70 | {% if form is not null %} | 80 | {% if form is not null %} |
71 | <div id="filters" class="side-nav fixed right-aligned"> | 81 | <div id="filters" class="side-nav right-aligned"> |
72 | <form action="{{ path('all') }}"> | 82 | <form action="{{ path('all') }}"> |
73 | 83 | ||
74 | <h4 class="center">{{ 'entry.filters.title'|trans }}</h4> | 84 | <h4 class="center">{{ 'entry.filters.title'|trans }}</h4> |
@@ -103,6 +113,15 @@ | |||
103 | </div> | 113 | </div> |
104 | 114 | ||
105 | <div class="col s12"> | 115 | <div class="col s12"> |
116 | <label>{{ 'entry.filters.is_public_help'|trans }}</label> | ||
117 | </div> | ||
118 | |||
119 | <div class="input-field col s12 with-checkbox"> | ||
120 | {{ form_widget(form.isPublic) }} | ||
121 | {{ form_label(form.isPublic) }} | ||
122 | </div> | ||
123 | |||
124 | <div class="col s12"> | ||
106 | {{ form_label(form.language) }} | 125 | {{ form_label(form.language) }} |
107 | </div> | 126 | </div> |
108 | 127 | ||
@@ -121,10 +140,12 @@ | |||
121 | <div class="col s12"> | 140 | <div class="col s12"> |
122 | {{ form_label(form.readingTime) }} | 141 | {{ form_label(form.readingTime) }} |
123 | </div> | 142 | </div> |
143 | |||
124 | <div class="input-field col s6"> | 144 | <div class="input-field col s6"> |
125 | {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }} | 145 | {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }} |
126 | <label for="entry_filter_readingTime_left_number">{{ 'entry.filters.reading_time.from'|trans }}</label> | 146 | <label for="entry_filter_readingTime_left_number">{{ 'entry.filters.reading_time.from'|trans }}</label> |
127 | </div> | 147 | </div> |
148 | |||
128 | <div class="input-field col s6"> | 149 | <div class="input-field col s6"> |
129 | {{ form_widget(form.readingTime.right_number, {'type': 'number'}) }} | 150 | {{ form_widget(form.readingTime.right_number, {'type': 'number'}) }} |
130 | <label for="entry_filter_readingTime_right_number">{{ 'entry.filters.reading_time.to'|trans }}</label> | 151 | <label for="entry_filter_readingTime_right_number">{{ 'entry.filters.reading_time.to'|trans }}</label> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index af53084f..4cff7bf2 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | |||
@@ -12,6 +12,11 @@ | |||
12 | <div class="nav-wrapper cyan darken-1"> | 12 | <div class="nav-wrapper cyan darken-1"> |
13 | <ul> | 13 | <ul> |
14 | <li> | 14 | <li> |
15 | <a href="#" data-activates="slide-out" class="button-collapse"> | ||
16 | <i class="material-icons">menu</i> | ||
17 | </a> | ||
18 | </li> | ||
19 | <li> | ||
15 | <a class="waves-effect" href="{{ path('homepage') }}"> | 20 | <a class="waves-effect" href="{{ path('homepage') }}"> |
16 | <i class="material-icons">exit_to_app</i> | 21 | <i class="material-icons">exit_to_app</i> |
17 | </a> | 22 | </a> |
@@ -28,11 +33,6 @@ | |||
28 | <i class="material-icons small">{% if entry.isStarred == 0 %}star_outline{% else %}star{% endif %}</i> | 33 | <i class="material-icons small">{% if entry.isStarred == 0 %}star_outline{% else %}star{% endif %}</i> |
29 | </a> | 34 | </a> |
30 | </li> | 35 | </li> |
31 | <li> | ||
32 | <a href="#" data-activates="slide-out" class="button-collapse right"> | ||
33 | <i class="material-icons">menu</i> | ||
34 | </a> | ||
35 | </li> | ||
36 | </ul> | 36 | </ul> |
37 | </div> | 37 | </div> |
38 | </nav> | 38 | </nav> |
@@ -82,7 +82,7 @@ | |||
82 | <div class="collapsible-body"></div> | 82 | <div class="collapsible-body"></div> |
83 | </li> | 83 | </li> |
84 | <li class="bold border-bottom"> | 84 | <li class="bold border-bottom"> |
85 | <a class="waves-effect collapsible-header delete" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> | 85 | <a class="waves-effect collapsible-header delete" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> |
86 | <i class="material-icons small">delete</i> | 86 | <i class="material-icons small">delete</i> |
87 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> | 87 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> |
88 | </a> | 88 | </a> |
@@ -125,39 +125,43 @@ | |||
125 | {% endif %} | 125 | {% endif %} |
126 | {% if craue_setting('share_shaarli') %} | 126 | {% if craue_setting('share_shaarli') %} |
127 | <li> | 127 | <li> |
128 | <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&tags={{ entry.tags|join(',')|striptags|url_encode }}" target="_blank"> | 128 | <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&tags={{ entry.tags|join(',')|striptags|url_encode }}" target="_blank" title="shaarli" class="tool icon-image shaarli"> |
129 | <i class="tool icon-image icon-image--shaarli" title="shaarli"></i> | ||
130 | <span>shaarli</span> | 129 | <span>shaarli</span> |
131 | </a> | 130 | </a> |
132 | </li> | 131 | </li> |
133 | {% endif %} | 132 | {% endif %} |
133 | {% if craue_setting('share_scuttle') %} | ||
134 | <li> | ||
135 | <a href="{{ craue_setting('scuttle_url') }}/bookmarks.php?action=add&address={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&tags={{ entry.tags|join(',')|striptags|url_encode }}" target="_blank" title="scuttle" class="tool icon-image scuttle"> | ||
136 | <span>scuttle</span> | ||
137 | </a> | ||
138 | </li> | ||
139 | {% endif %} | ||
134 | {% if craue_setting('share_diaspora') %} | 140 | {% if craue_setting('share_diaspora') %} |
135 | <li> | 141 | <li> |
136 | <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank"> | 142 | <a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool icon-image diaspora" title="diaspora"> |
137 | <i class="tool icon-image icon-image--diaspora" title="diaspora"></i> | ||
138 | <span>diaspora*</span> | 143 | <span>diaspora*</span> |
139 | </a> | 144 | </a> |
140 | </li> | 145 | </li> |
141 | {% endif %} | 146 | {% endif %} |
142 | {% if craue_setting('share_unmark') %} | 147 | {% if craue_setting('share_unmark') %} |
143 | <li> | 148 | <li> |
144 | <a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&title={{entry.title|striptags|url_encode}}&v=6" target="_blank"> | 149 | <a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&title={{entry.title|striptags|url_encode}}&v=6" target="_blank" class="tool icon-image unmark" title="unmark"> |
145 | <i class="tool icon-image icon-image--unmark" title="unmark"></i> | ||
146 | <span>unmark.it</span> | 150 | <span>unmark.it</span> |
147 | </a> | 151 | </a> |
148 | </li> | 152 | </li> |
149 | {% endif %} | 153 | {% endif %} |
150 | {% if craue_setting('carrot') %} | 154 | {% if craue_setting('carrot') %} |
151 | <li> | 155 | <li> |
152 | <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}" target="_blank" title="carrot"> | 156 | <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}" target="_blank" title="carrot" class="tool icon-image carrot"> |
153 | <i class="tool icon-image icon-image--carrot"></i> | ||
154 | <span>Carrot</span> | 157 | <span>Carrot</span> |
155 | </a> | 158 | </a> |
156 | </li> | 159 | </li> |
157 | {% endif %} | 160 | {% endif %} |
158 | {% if craue_setting('share_mail') %} | 161 | {% if craue_setting('share_mail') %} |
159 | <li> | 162 | <li> |
160 | <a href="mailto:?subject={{ entry.title|striptags|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" title="{{ 'entry.view.left_menu.share_email_label'|trans }}" class="tool email icon icon-mail"> | 163 | <a href="mailto:?subject={{ entry.title|striptags|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" title="{{ 'entry.view.left_menu.share_email_label'|trans }}" class="tool icon"> |
164 | <i class="material-icons vertical-align-middle">mail</i> | ||
161 | <span>{{ 'entry.view.left_menu.share_email_label'|trans }}</span> | 165 | <span>{{ 'entry.view.left_menu.share_email_label'|trans }}</span> |
162 | </a> | 166 | </a> |
163 | </li> | 167 | </li> |
@@ -212,32 +216,51 @@ | |||
212 | <h1>{{ entry.title|striptags|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> | 216 | <h1>{{ entry.title|striptags|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> |
213 | </header> | 217 | </header> |
214 | <aside> | 218 | <aside> |
215 | <ul class="tools"> | 219 | <div class="tools"> |
216 | <li> | 220 | <ul class="stats"> |
217 | {% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %} | 221 | <li> |
218 | </li> | 222 | {% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %} |
219 | <li> | 223 | </li> |
220 | <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i> | 224 | <li> |
221 | {{ entry.createdAt|date('Y-m-d') }} | 225 | <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i> |
222 | </li> | 226 | {{ entry.createdAt|date('Y-m-d H:i') }} |
223 | <li> | 227 | </li> |
224 | <i class="material-icons link">link</i> | 228 | {% if entry.publishedAt is not null %} |
225 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|striptags }}" class="tool"> | 229 | <li> |
226 | {{ entry.domainName|removeWww }} | 230 | <i class="material-icons" title="{{ 'entry.view.published_at'|trans }}">create</i> |
227 | </a> | 231 | {{ entry.publishedAt|date('Y-m-d H:i') }} |
228 | </li> | 232 | </li> |
229 | <li> | 233 | {% endif %} |
230 | <i class="material-icons link">comment</i> | 234 | {% if entry.publishedBy is not empty %} |
231 | {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} | 235 | <li> |
232 | </li> | 236 | <i class="material-icons" title="{{ 'entry.view.published_by'|trans }}">person</i> |
233 | <li id="list"> | 237 | {% for author in entry.publishedBy %} |
238 | {{ author }}{% if not loop.last %}, {% endif %} | ||
239 | {% endfor %} | ||
240 | </li> | ||
241 | {% endif %} | ||
242 | <li> | ||
243 | <i class="material-icons link">link</i> | ||
244 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|striptags }}" class="tool"> | ||
245 | {{ entry.domainName|removeWww }} | ||
246 | </a> | ||
247 | </li> | ||
248 | <li> | ||
249 | <i class="material-icons link">comment</i> | ||
250 | {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} | ||
251 | </li> | ||
252 | </ul> | ||
253 | <ul class="tags"> | ||
234 | {% for tag in entry.tags %} | 254 | {% for tag in entry.tags %} |
235 | <div class="chip"> | 255 | <li class="chip"> |
236 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="material-icons">delete</i></a> | 256 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> |
237 | </div> | 257 | <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}" onclick="return confirm('{{ 'entry.confirm.delete_tag'|trans|escape('js') }}')"> |
258 | <i class="material-icons vertical-align-middle">delete</i> | ||
259 | </a> | ||
260 | </li> | ||
238 | {% endfor %} | 261 | {% endfor %} |
239 | </li> | 262 | </ul> |
240 | </ul> | 263 | </div> |
241 | 264 | ||
242 | <div class="input-field nav-panel-add-tag" style="display: none"> | 265 | <div class="input-field nav-panel-add-tag" style="display: none"> |
243 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} | 266 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} |
@@ -259,7 +282,7 @@ | |||
259 | <ul> | 282 | <ul> |
260 | <li><a class="btn-floating" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">done</i></a></li> | 283 | <li><a class="btn-floating" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">done</i></a></li> |
261 | <li><a class="btn-floating" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">star_outline</i></a></li> | 284 | <li><a class="btn-floating" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">star_outline</i></a></li> |
262 | <li><a class="btn-floating" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a></li> | 285 | <li><a class="btn-floating" href="{{ path('delete_entry', { 'id': entry.id }) }}" onclick="return confirm('{{ 'entry.confirm.delete'|trans|escape('js') }}')"><i class="material-icons">delete</i></a></li> |
263 | </ul> | 286 | </ul> |
264 | </div> | 287 | </div> |
265 | </div> | 288 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/edit.html.twig new file mode 100644 index 00000000..882be430 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/edit.html.twig | |||
@@ -0,0 +1,60 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | |||
7 | <div class="row"> | ||
8 | <div class="col s12"> | ||
9 | <div class="card-panel"> | ||
10 | <div class="row"> | ||
11 | <div class="input-field col s12"> | ||
12 | <h4>{{ 'site_credential.edit_site_credential'|trans }}</h4> | ||
13 | |||
14 | <div id="set6" class="col s12"> | ||
15 | {{ form_start(edit_form) }} | ||
16 | {{ form_errors(edit_form) }} | ||
17 | |||
18 | <div class="row"> | ||
19 | <div class="input-field col s12"> | ||
20 | {{ form_label(edit_form.host) }} | ||
21 | {{ form_errors(edit_form.host) }} | ||
22 | {{ form_widget(edit_form.host) }} | ||
23 | </div> | ||
24 | </div> | ||
25 | |||
26 | <div class="row"> | ||
27 | <div class="input-field col s12"> | ||
28 | {{ form_label(edit_form.username) }} | ||
29 | {{ form_errors(edit_form.username) }} | ||
30 | {{ form_widget(edit_form.username) }} | ||
31 | </div> | ||
32 | </div> | ||
33 | |||
34 | <div class="row"> | ||
35 | <div class="input-field col s12"> | ||
36 | {{ form_label(edit_form.password) }} | ||
37 | {{ form_errors(edit_form.password) }} | ||
38 | {{ form_widget(edit_form.password) }} | ||
39 | </div> | ||
40 | </div> | ||
41 | |||
42 | <br/> | ||
43 | |||
44 | {{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | ||
45 | {{ form_widget(edit_form._token) }} | ||
46 | </form> | ||
47 | <p> | ||
48 | {{ form_start(delete_form) }} | ||
49 | <button onclick="return confirm('{{ 'site_credential.form.delete_confirm'|trans|escape('js') }}')" type="submit" class="btn waves-effect waves-light red">{{ 'site_credential.form.delete'|trans }}</button> | ||
50 | {{ form_end(delete_form) }} | ||
51 | </p> | ||
52 | <p><a class="waves-effect waves-light btn blue-grey" href="{{ path('site_credentials_index') }}">{{ 'site_credential.form.back_to_list'|trans }}</a></p> | ||
53 | </div> | ||
54 | </div> | ||
55 | </div> | ||
56 | </div> | ||
57 | </div> | ||
58 | </div> | ||
59 | |||
60 | {% endblock %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig new file mode 100644 index 00000000..324854ad --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/index.html.twig | |||
@@ -0,0 +1,42 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | |||
7 | <div class="row"> | ||
8 | <div class="col s12"> | ||
9 | <div class="card-panel"> | ||
10 | <div class="row"> | ||
11 | <div class="input-field col s12"> | ||
12 | <p class="help">{{ 'site_credential.description'|trans|raw }}</p> | ||
13 | |||
14 | <table class="bordered"> | ||
15 | <thead> | ||
16 | <tr> | ||
17 | <th>{{ 'site_credential.form.host_label'|trans }}</th> | ||
18 | <th>{{ 'site_credential.list.actions'|trans }}</th> | ||
19 | </tr> | ||
20 | </thead> | ||
21 | <tbody> | ||
22 | {% for credential in credentials %} | ||
23 | <tr> | ||
24 | <td>{{ credential.host }}</td> | ||
25 | <td> | ||
26 | <a href="{{ path('site_credentials_edit', { 'id': credential.id }) }}">{{ 'site_credential.list.edit_action'|trans }}</a> | ||
27 | </td> | ||
28 | </tr> | ||
29 | {% endfor %} | ||
30 | </tbody> | ||
31 | </table> | ||
32 | <br /> | ||
33 | <p> | ||
34 | <a href="{{ path('site_credentials_new') }}" class="waves-effect waves-light btn">{{ 'site_credential.list.create_new_one'|trans }}</a> | ||
35 | </p> | ||
36 | </div> | ||
37 | </div> | ||
38 | </div> | ||
39 | </div> | ||
40 | </div> | ||
41 | |||
42 | {% endblock %} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/new.html.twig new file mode 100644 index 00000000..3c008cde --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/SiteCredential/new.html.twig | |||
@@ -0,0 +1,53 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | |||
7 | <div class="row"> | ||
8 | <div class="col s12"> | ||
9 | <div class="card-panel"> | ||
10 | <div class="row"> | ||
11 | <div class="input-field col s12"> | ||
12 | <h4>{{ 'site_credential.new_site_credential'|trans }}</h4> | ||
13 | |||
14 | <div id="set6" class="col s12"> | ||
15 | {{ form_start(form) }} | ||
16 | {{ form_errors(form) }} | ||
17 | |||
18 | <div class="row"> | ||
19 | <div class="input-field col s12"> | ||
20 | {{ form_label(form.host) }} | ||
21 | {{ form_errors(form.host) }} | ||
22 | {{ form_widget(form.host) }} | ||
23 | </div> | ||
24 | </div> | ||
25 | |||
26 | <div class="row"> | ||
27 | <div class="input-field col s12"> | ||
28 | {{ form_label(form.username) }} | ||
29 | {{ form_errors(form.username) }} | ||
30 | {{ form_widget(form.username) }} | ||
31 | </div> | ||
32 | </div> | ||
33 | |||
34 | <div class="row"> | ||
35 | <div class="input-field col s12"> | ||
36 | {{ form_label(form.password) }} | ||
37 | {{ form_errors(form.password) }} | ||
38 | {{ form_widget(form.password) }} | ||
39 | </div> | ||
40 | </div> | ||
41 | |||
42 | {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | ||
43 | {{ form_rest(form) }} | ||
44 | </form> | ||
45 | <p><a class="waves-effect waves-light btn blue-grey" href="{{ path('site_credentials_index') }}">{{ 'site_credential.form.back_to_list'|trans }}</a></p> | ||
46 | </div> | ||
47 | </div> | ||
48 | </div> | ||
49 | </div> | ||
50 | </div> | ||
51 | </div> | ||
52 | |||
53 | {% endblock %} | ||
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 c83543ac..97ddedc9 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 | |||
@@ -14,6 +14,9 @@ | |||
14 | {% for tag in tags %} | 14 | {% for tag in tags %} |
15 | <li title="{{tag.label}} ({{ tag.nbEntries }})" id="tag-{{ tag.id }}" class="col l2 m2 s5"> | 15 | <li title="{{tag.label}} ({{ tag.nbEntries }})" id="tag-{{ tag.id }}" class="col l2 m2 s5"> |
16 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.nbEntries }})</a> | 16 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.nbEntries }})</a> |
17 | {% if app.user.config.rssToken %} | ||
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="right"><i class="material-icons">rss_feed</i></a> | ||
19 | {% endif %} | ||
17 | </li> | 20 | </li> |
18 | {% endfor %} | 21 | {% endfor %} |
19 | </ul> | 22 | </ul> |
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 3c169c04..60907e11 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -2,12 +2,14 @@ | |||
2 | 2 | ||
3 | {% block css %} | 3 | {% block css %} |
4 | {{ parent() }} | 4 | {{ parent() }} |
5 | <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/material/css/style.min.css') }}" media="screen,projection,print"/> | 5 | {% if not app.debug %} |
6 | <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/material.css') }}"> | ||
7 | {% endif %} | ||
6 | {% endblock %} | 8 | {% endblock %} |
7 | 9 | ||
8 | {% block scripts %} | 10 | {% block scripts %} |
9 | {{ parent() }} | 11 | {{ parent() }} |
10 | <script src="{{ asset('bundles/wallabagcore/themes/material/js/material.min.js') }}"></script> | 12 | <script src="{{ asset('bundles/wallabagcore/material' ~ (app.debug ? '.dev' : '') ~ '.js') }}"></script> |
11 | {% endblock %} | 13 | {% endblock %} |
12 | 14 | ||
13 | {% block header %} | 15 | {% block header %} |
@@ -64,6 +66,11 @@ | |||
64 | <li class="bold {% if currentRoute == 'config' %}active{% endif %}"> | 66 | <li class="bold {% if currentRoute == 'config' %}active{% endif %}"> |
65 | <a class="waves-effect" href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a> | 67 | <a class="waves-effect" href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a> |
66 | </li> | 68 | </li> |
69 | {% if craue_setting('restricted_access') %} | ||
70 | <li class="bold {% if currentRoute starts with 'site_credentials_' %}active{% endif %}"> | ||
71 | <a class="waves-effect" href="{{ path('site_credentials_index') }}">{{ 'menu.left.site_credentials'|trans }}</a> | ||
72 | </li> | ||
73 | {% endif %} | ||
67 | {% if is_granted('ROLE_SUPER_ADMIN') %} | 74 | {% if is_granted('ROLE_SUPER_ADMIN') %} |
68 | <li class="bold {% if currentRoute starts with 'user_' %}active{% endif %}"> | 75 | <li class="bold {% if currentRoute starts with 'user_' %}active{% endif %}"> |
69 | <a class="waves-effect" href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a> | 76 | <a class="waves-effect" href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a> |
@@ -116,12 +123,12 @@ | |||
116 | </ul> | 123 | </ul> |
117 | <div class="input-field nav-panel-search" style="display: none"> | 124 | <div class="input-field nav-panel-search" style="display: none"> |
118 | {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }} | 125 | {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }} |
119 | <label for="search" class="active"><i class="material-icons search">search</i></label> | 126 | <label for="search"><i class="material-icons search">search</i></label> |
120 | <i class="material-icons close">clear</i> | 127 | <i class="material-icons close">clear</i> |
121 | </div> | 128 | </div> |
122 | <div class="input-field nav-panel-add" style="display: none"> | 129 | <div class="input-field nav-panel-add" style="display: none"> |
123 | {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }} | 130 | {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }} |
124 | <label for="add" class="active"><i class="material-icons add">add</i></label> | 131 | <label for="add"><i class="material-icons add">add</i></label> |
125 | <i class="material-icons close">clear</i> | 132 | <i class="material-icons close">clear</i> |
126 | </div> | 133 | </div> |
127 | </div> | 134 | </div> |