diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
35 files changed, 187 insertions, 180 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index e09b0f18..8d4e39aa 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -22,10 +22,10 @@ services: | |||
22 | tags: | 22 | tags: |
23 | - { name: form.type } | 23 | - { name: form.type } |
24 | 24 | ||
25 | wallabag_core.param_converter.username_rsstoken_converter: | 25 | wallabag_core.param_converter.username_feed_token_converter: |
26 | class: Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter | 26 | class: Wallabag\CoreBundle\ParamConverter\UsernameFeedTokenConverter |
27 | tags: | 27 | tags: |
28 | - { name: request.param_converter, converter: username_rsstoken_converter } | 28 | - { name: request.param_converter, converter: username_feed_token_converter } |
29 | arguments: | 29 | arguments: |
30 | - "@doctrine" | 30 | - "@doctrine" |
31 | 31 | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 5229ac73..7a46450e 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -53,7 +53,7 @@ config: | |||
53 | page_title: 'Opsætning' | 53 | page_title: 'Opsætning' |
54 | tab_menu: | 54 | tab_menu: |
55 | settings: 'Indstillinger' | 55 | settings: 'Indstillinger' |
56 | rss: 'RSS' | 56 | feed: 'RSS' |
57 | user_info: 'Brugeroplysninger' | 57 | user_info: 'Brugeroplysninger' |
58 | password: 'Adgangskode' | 58 | password: 'Adgangskode' |
59 | # rules: 'Tagging rules' | 59 | # rules: 'Tagging rules' |
@@ -83,19 +83,19 @@ config: | |||
83 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." | 83 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
84 | # help_language: "You can change the language of wallabag interface." | 84 | # help_language: "You can change the language of wallabag interface." |
85 | # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." | 85 | # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." |
86 | form_rss: | 86 | form_feed: |
87 | description: 'RSS-feeds fra wallabag gør det muligt at læse de artikler, der gemmes i wallabag, med din RSS-læser. Det kræver, at du genererer et token først.' | 87 | description: 'RSS-feeds fra wallabag gør det muligt at læse de artikler, der gemmes i wallabag, med din RSS-læser. Det kræver, at du genererer et token først.' |
88 | token_label: 'RSS-Token' | 88 | token_label: 'RSS-Token' |
89 | no_token: 'Intet token' | 89 | no_token: 'Intet token' |
90 | token_create: 'Opret token' | 90 | token_create: 'Opret token' |
91 | token_reset: 'Nulstil token' | 91 | token_reset: 'Nulstil token' |
92 | rss_links: 'RSS-Links' | 92 | feed_links: 'RSS-Links' |
93 | rss_link: | 93 | feed_link: |
94 | unread: 'Ulæst' | 94 | unread: 'Ulæst' |
95 | starred: 'Favoritter' | 95 | starred: 'Favoritter' |
96 | archive: 'Arkiv' | 96 | archive: 'Arkiv' |
97 | # all: 'All' | 97 | # all: 'All' |
98 | # rss_limit: 'Number of items in the feed' | 98 | # feed_limit: 'Number of items in the feed' |
99 | form_user: | 99 | form_user: |
100 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion" | 100 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion" |
101 | name_label: 'Navn' | 101 | name_label: 'Navn' |
@@ -344,7 +344,7 @@ quickstart: | |||
344 | # title: 'Configure the application' | 344 | # title: 'Configure the application' |
345 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | 345 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' |
346 | # language: 'Change language and design' | 346 | # language: 'Change language and design' |
347 | # rss: 'Enable RSS feeds' | 347 | # feed: 'Enable RSS feeds' |
348 | # tagging_rules: 'Write rules to automatically tag your articles' | 348 | # tagging_rules: 'Write rules to automatically tag your articles' |
349 | # admin: | 349 | # admin: |
350 | # title: 'Administration' | 350 | # title: 'Administration' |
@@ -554,10 +554,10 @@ flashes: | |||
554 | password_updated: 'Adgangskode opdateret' | 554 | password_updated: 'Adgangskode opdateret' |
555 | # password_not_updated_demo: "In demonstration mode, you can't change password for this user." | 555 | # password_not_updated_demo: "In demonstration mode, you can't change password for this user." |
556 | user_updated: 'Oplysninger opdateret' | 556 | user_updated: 'Oplysninger opdateret' |
557 | rss_updated: 'RSS-oplysninger opdateret' | 557 | feed_updated: 'RSS-oplysninger opdateret' |
558 | # tagging_rules_updated: 'Tagging rules updated' | 558 | # tagging_rules_updated: 'Tagging rules updated' |
559 | # tagging_rules_deleted: 'Tagging rule deleted' | 559 | # tagging_rules_deleted: 'Tagging rule deleted' |
560 | # rss_token_updated: 'RSS token updated' | 560 | # feed_token_updated: 'RSS token updated' |
561 | # annotations_reset: Annotations reset | 561 | # annotations_reset: Annotations reset |
562 | # tags_reset: Tags reset | 562 | # tags_reset: Tags reset |
563 | # entries_reset: Entries reset | 563 | # entries_reset: Entries reset |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 996f173a..3b882ea5 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -53,7 +53,7 @@ config: | |||
53 | page_title: 'Einstellungen' | 53 | page_title: 'Einstellungen' |
54 | tab_menu: | 54 | tab_menu: |
55 | settings: 'Einstellungen' | 55 | settings: 'Einstellungen' |
56 | rss: 'RSS' | 56 | feed: 'RSS' |
57 | user_info: 'Benutzerinformation' | 57 | user_info: 'Benutzerinformation' |
58 | password: 'Kennwort' | 58 | password: 'Kennwort' |
59 | rules: 'Tagging-Regeln' | 59 | rules: 'Tagging-Regeln' |
@@ -83,19 +83,19 @@ config: | |||
83 | help_reading_speed: "wallabag berechnet eine Lesezeit pro Artikel. Hier kannst du definieren, ob du ein schneller oder langsamer Leser bist. wallabag wird die Lesezeiten danach neu berechnen." | 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." |
84 | help_language: "Du kannst die Sprache der wallabag-Oberfläche ändern." | 84 | help_language: "Du kannst die Sprache der wallabag-Oberfläche ändern." |
85 | help_pocket_consumer_key: "Nötig für den Pocket-Import. Du kannst ihn in deinem Pocket account einrichten." | 85 | help_pocket_consumer_key: "Nötig für den Pocket-Import. Du kannst ihn in deinem Pocket account einrichten." |
86 | form_rss: | 86 | form_feed: |
87 | description: 'Die RSS-Feeds von wallabag erlauben es dir, deine gespeicherten Artikel mit deinem bevorzugten RSS-Reader zu lesen. Vorher musst du jedoch einen Token erstellen.' | 87 | description: 'Die RSS-Feeds von wallabag erlauben es dir, deine gespeicherten Artikel mit deinem bevorzugten RSS-Reader zu lesen. Vorher musst du jedoch einen Token erstellen.' |
88 | token_label: 'RSS-Token' | 88 | token_label: 'RSS-Token' |
89 | no_token: 'Kein Token' | 89 | no_token: 'Kein Token' |
90 | token_create: 'Token erstellen' | 90 | token_create: 'Token erstellen' |
91 | token_reset: 'Token zurücksetzen' | 91 | token_reset: 'Token zurücksetzen' |
92 | rss_links: 'RSS-Links' | 92 | feed_links: 'RSS-Links' |
93 | rss_link: | 93 | feed_link: |
94 | unread: 'Ungelesene' | 94 | unread: 'Ungelesene' |
95 | starred: 'Favoriten' | 95 | starred: 'Favoriten' |
96 | archive: 'Archivierte' | 96 | archive: 'Archivierte' |
97 | # all: 'All' | 97 | # all: 'All' |
98 | rss_limit: 'Anzahl der Einträge pro Feed' | 98 | feed_limit: 'Anzahl der Einträge pro Feed' |
99 | form_user: | 99 | form_user: |
100 | two_factor_description: "Wenn du die Zwei-Faktor-Authentifizierung aktivierst, erhältst du eine E-Mail mit einem Code bei jeder nicht vertrauenswürdigen Verbindung" | 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" |
101 | name_label: 'Name' | 101 | name_label: 'Name' |
@@ -344,7 +344,7 @@ quickstart: | |||
344 | title: 'Anwendung konfigurieren' | 344 | title: 'Anwendung konfigurieren' |
345 | description: 'Um die Applikation für dich anzupassen, schau in die Konfiguration von wallabag.' | 345 | description: 'Um die Applikation für dich anzupassen, schau in die Konfiguration von wallabag.' |
346 | language: 'Sprache und Design ändern' | 346 | language: 'Sprache und Design ändern' |
347 | rss: 'RSS-Feeds aktivieren' | 347 | feed: 'RSS-Feeds aktivieren' |
348 | tagging_rules: 'Schreibe Regeln, um deine Beiträge automatisch zu taggen (verschlagworten)' | 348 | tagging_rules: 'Schreibe Regeln, um deine Beiträge automatisch zu taggen (verschlagworten)' |
349 | admin: | 349 | admin: |
350 | title: 'Administration' | 350 | title: 'Administration' |
@@ -554,10 +554,10 @@ flashes: | |||
554 | password_updated: 'Kennwort aktualisiert' | 554 | password_updated: 'Kennwort aktualisiert' |
555 | password_not_updated_demo: "Im Testmodus kannst du das Kennwort nicht ändern." | 555 | password_not_updated_demo: "Im Testmodus kannst du das Kennwort nicht ändern." |
556 | user_updated: 'Information aktualisiert' | 556 | user_updated: 'Information aktualisiert' |
557 | rss_updated: 'RSS-Informationen aktualisiert' | 557 | feed_updated: 'RSS-Informationen aktualisiert' |
558 | tagging_rules_updated: 'Tagging-Regeln aktualisiert' | 558 | tagging_rules_updated: 'Tagging-Regeln aktualisiert' |
559 | tagging_rules_deleted: 'Tagging-Regel gelöscht' | 559 | tagging_rules_deleted: 'Tagging-Regel gelöscht' |
560 | rss_token_updated: 'RSS-Token aktualisiert' | 560 | feed_token_updated: 'RSS-Token aktualisiert' |
561 | annotations_reset: Anmerkungen zurücksetzen | 561 | annotations_reset: Anmerkungen zurücksetzen |
562 | tags_reset: Tags zurücksetzen | 562 | tags_reset: Tags zurücksetzen |
563 | entries_reset: Einträge zurücksetzen | 563 | entries_reset: Einträge zurücksetzen |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index aa1cd1a9..9491aee9 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -53,7 +53,7 @@ config: | |||
53 | page_title: 'Config' | 53 | page_title: 'Config' |
54 | tab_menu: | 54 | tab_menu: |
55 | settings: 'Settings' | 55 | settings: 'Settings' |
56 | rss: 'RSS' | 56 | feed: 'Feeds' |
57 | user_info: 'User information' | 57 | user_info: 'User information' |
58 | password: 'Password' | 58 | password: 'Password' |
59 | rules: 'Tagging rules' | 59 | rules: 'Tagging rules' |
@@ -83,19 +83,19 @@ config: | |||
83 | help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." | 83 | help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
84 | help_language: "You can change the language of wallabag interface." | 84 | help_language: "You can change the language of wallabag interface." |
85 | help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." | 85 | help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." |
86 | form_rss: | 86 | form_feed: |
87 | description: 'RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.' | 87 | description: 'Atom feeds provided by wallabag allow you to read your saved articles with your favourite Atom reader. You need to generate a token first.' |
88 | token_label: 'RSS token' | 88 | token_label: 'Feed token' |
89 | no_token: 'No token' | 89 | no_token: 'No token' |
90 | token_create: 'Create your token' | 90 | token_create: 'Create your token' |
91 | token_reset: 'Regenerate your token' | 91 | token_reset: 'Regenerate your token' |
92 | rss_links: 'RSS links' | 92 | feed_links: 'Feed links' |
93 | rss_link: | 93 | feed_link: |
94 | unread: 'Unread' | 94 | unread: 'Unread' |
95 | starred: 'Starred' | 95 | starred: 'Starred' |
96 | archive: 'Archived' | 96 | archive: 'Archived' |
97 | all: 'All' | 97 | all: 'All' |
98 | rss_limit: 'Number of items in the feed' | 98 | feed_limit: 'Number of items in the feed' |
99 | form_user: | 99 | form_user: |
100 | two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connection." | 100 | two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connection." |
101 | name_label: 'Name' | 101 | name_label: 'Name' |
@@ -344,7 +344,7 @@ quickstart: | |||
344 | title: 'Configure the application' | 344 | title: 'Configure the application' |
345 | description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | 345 | description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' |
346 | language: 'Change language and design' | 346 | language: 'Change language and design' |
347 | rss: 'Enable RSS feeds' | 347 | feed: 'Enable feeds' |
348 | tagging_rules: 'Write rules to automatically tag your articles' | 348 | tagging_rules: 'Write rules to automatically tag your articles' |
349 | admin: | 349 | admin: |
350 | title: 'Administration' | 350 | title: 'Administration' |
@@ -554,10 +554,10 @@ flashes: | |||
554 | password_updated: 'Password updated' | 554 | password_updated: 'Password updated' |
555 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." | 555 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." |
556 | user_updated: 'Information updated' | 556 | user_updated: 'Information updated' |
557 | rss_updated: 'RSS information updated' | 557 | feed_updated: 'Feed information updated' |
558 | tagging_rules_updated: 'Tagging rules updated' | 558 | tagging_rules_updated: 'Tagging rules updated' |
559 | tagging_rules_deleted: 'Tagging rule deleted' | 559 | tagging_rules_deleted: 'Tagging rule deleted' |
560 | rss_token_updated: 'RSS token updated' | 560 | feed_token_updated: 'Feed token updated' |
561 | annotations_reset: Annotations reset | 561 | annotations_reset: Annotations reset |
562 | tags_reset: Tags reset | 562 | tags_reset: Tags reset |
563 | entries_reset: Entries reset | 563 | entries_reset: Entries reset |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 96998f53..027cb187 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -53,7 +53,7 @@ config: | |||
53 | page_title: 'Configuración' | 53 | page_title: 'Configuración' |
54 | tab_menu: | 54 | tab_menu: |
55 | settings: 'Configuración' | 55 | settings: 'Configuración' |
56 | rss: 'RSS' | 56 | feed: 'RSS' |
57 | user_info: 'Información de usuario' | 57 | user_info: 'Información de usuario' |
58 | password: 'Contraseña' | 58 | password: 'Contraseña' |
59 | rules: 'Reglas de etiquetado automáticas' | 59 | rules: 'Reglas de etiquetado automáticas' |
@@ -83,19 +83,19 @@ config: | |||
83 | help_reading_speed: "wallabag calcula un tiempo de lectura para cada artículo. Puedes definir aquí, gracias a esta lista, si eres un lector rápido o lento. wallabag recalculará el tiempo de lectura para cada artículo." | 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." |
84 | help_language: "Puedes cambiar el idioma de la interfaz de wallabag." | 84 | help_language: "Puedes cambiar el idioma de la interfaz de wallabag." |
85 | help_pocket_consumer_key: "Requerido para la importación desde Pocket. Puedes crearla en tu cuenta de Pocket." | 85 | help_pocket_consumer_key: "Requerido para la importación desde Pocket. Puedes crearla en tu cuenta de Pocket." |
86 | form_rss: | 86 | form_feed: |
87 | description: 'Los feeds RSS de wallabag permiten leer los artículos guardados con su lector RSS favorito. Primero necesitas generar un token.' | 87 | description: 'Los feeds RSS de wallabag permiten leer los artículos guardados con su lector RSS favorito. Primero necesitas generar un token.' |
88 | token_label: 'Token RSS' | 88 | token_label: 'Token RSS' |
89 | no_token: 'Sin token' | 89 | no_token: 'Sin token' |
90 | token_create: 'Crear token' | 90 | token_create: 'Crear token' |
91 | token_reset: 'Reiniciar token' | 91 | token_reset: 'Reiniciar token' |
92 | rss_links: 'URLs de feeds RSS' | 92 | feed_links: 'URLs de feeds RSS' |
93 | rss_link: | 93 | feed_link: |
94 | unread: 'sin leer' | 94 | unread: 'sin leer' |
95 | starred: 'favoritos' | 95 | starred: 'favoritos' |
96 | archive: 'archivados' | 96 | archive: 'archivados' |
97 | # all: 'All' | 97 | # all: 'All' |
98 | rss_limit: 'Límite de artículos en feed RSS' | 98 | feed_limit: 'Límite de artículos en feed RSS' |
99 | form_user: | 99 | form_user: |
100 | two_factor_description: "Con la autenticación en dos pasos recibirá código por e-mail en cada nueva conexión que no sea de confianza." | 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." |
101 | name_label: 'Nombre' | 101 | name_label: 'Nombre' |
@@ -344,7 +344,7 @@ quickstart: | |||
344 | title: 'Configure la aplicación' | 344 | title: 'Configure la aplicación' |
345 | description: 'Para que la aplicación se ajuste a tus necesidades, echa un vistazo a la configuración de wallabag.' | 345 | description: 'Para que la aplicación se ajuste a tus necesidades, echa un vistazo a la configuración de wallabag.' |
346 | language: 'Cambie el idioma y el diseño' | 346 | language: 'Cambie el idioma y el diseño' |
347 | rss: 'Activar los feeds RSS' | 347 | feed: 'Activar los feeds RSS' |
348 | tagging_rules: 'Escribe reglas para etiquetar automáticamente tus artículos' | 348 | tagging_rules: 'Escribe reglas para etiquetar automáticamente tus artículos' |
349 | admin: | 349 | admin: |
350 | title: 'Administración' | 350 | title: 'Administración' |
@@ -554,10 +554,10 @@ flashes: | |||
554 | password_updated: 'Contraseña actualizada' | 554 | password_updated: 'Contraseña actualizada' |
555 | password_not_updated_demo: "En el modo demo, no puede cambiar la contraseña del usuario." | 555 | password_not_updated_demo: "En el modo demo, no puede cambiar la contraseña del usuario." |
556 | user_updated: 'Información actualizada' | 556 | user_updated: 'Información actualizada' |
557 | rss_updated: 'Configuración RSS actualizada' | 557 | feed_updated: 'Configuración RSS actualizada' |
558 | tagging_rules_updated: 'Regla de etiquetado actualizada' | 558 | tagging_rules_updated: 'Regla de etiquetado actualizada' |
559 | tagging_rules_deleted: 'Regla de etiquetado eliminada' | 559 | tagging_rules_deleted: 'Regla de etiquetado eliminada' |
560 | rss_token_updated: 'Token RSS actualizado' | 560 | feed_token_updated: 'Token RSS actualizado' |
561 | annotations_reset: Anotaciones reiniciadas | 561 | annotations_reset: Anotaciones reiniciadas |
562 | tags_reset: Etiquetas reiniciadas | 562 | tags_reset: Etiquetas reiniciadas |
563 | entries_reset: Artículos reiniciados | 563 | entries_reset: Artículos reiniciados |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 57e6c029..9400b125 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -53,7 +53,7 @@ config: | |||
53 | page_title: 'پیکربندی' | 53 | page_title: 'پیکربندی' |
54 | tab_menu: | 54 | tab_menu: |
55 | settings: 'تنظیمات' | 55 | settings: 'تنظیمات' |
56 | rss: 'آر-اس-اس' | 56 | feed: 'آر-اس-اس' |
57 | user_info: 'اطلاعات کاربر' | 57 | user_info: 'اطلاعات کاربر' |
58 | password: 'رمز' | 58 | password: 'رمز' |
59 | rules: 'برچسبگذاری خودکار' | 59 | rules: 'برچسبگذاری خودکار' |
@@ -83,19 +83,19 @@ config: | |||
83 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." | 83 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
84 | # help_language: "You can change the language of wallabag interface." | 84 | # help_language: "You can change the language of wallabag interface." |
85 | # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." | 85 | # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." |
86 | form_rss: | 86 | form_feed: |
87 | description: 'با خوراک آر-اس-اس که wallabag در اختیارتان میگذارد، میتوانید مقالههای ذخیرهشده را در نرمافزار آر-اس-اس دلخواه خود بخوانید. برای این کار نخست باید یک کد بسازید.' | 87 | description: 'با خوراک آر-اس-اس که wallabag در اختیارتان میگذارد، میتوانید مقالههای ذخیرهشده را در نرمافزار آر-اس-اس دلخواه خود بخوانید. برای این کار نخست باید یک کد بسازید.' |
88 | token_label: 'کد آر-اس-اس' | 88 | token_label: 'کد آر-اس-اس' |
89 | no_token: 'بدون کد' | 89 | no_token: 'بدون کد' |
90 | token_create: 'کد خود را بسازید' | 90 | token_create: 'کد خود را بسازید' |
91 | token_reset: 'بازنشانی کد' | 91 | token_reset: 'بازنشانی کد' |
92 | rss_links: 'پیوند آر-اس-اس' | 92 | feed_links: 'پیوند آر-اس-اس' |
93 | rss_link: | 93 | feed_link: |
94 | unread: 'خواندهنشده' | 94 | unread: 'خواندهنشده' |
95 | starred: 'برگزیده' | 95 | starred: 'برگزیده' |
96 | archive: 'بایگانی' | 96 | archive: 'بایگانی' |
97 | # all: 'All' | 97 | # all: 'All' |
98 | rss_limit: 'محدودیت آر-اس-اس' | 98 | feed_limit: 'محدودیت آر-اس-اس' |
99 | form_user: | 99 | form_user: |
100 | two_factor_description: "با فعالکردن تأیید ۲مرحلهای هر بار که اتصال تأییدنشدهای برقرار شد، به شما یک کد از راه ایمیل فرستاده میشود" | 100 | two_factor_description: "با فعالکردن تأیید ۲مرحلهای هر بار که اتصال تأییدنشدهای برقرار شد، به شما یک کد از راه ایمیل فرستاده میشود" |
101 | name_label: 'نام' | 101 | name_label: 'نام' |
@@ -344,7 +344,7 @@ quickstart: | |||
344 | title: 'برنامه را تنظیم کنید' | 344 | title: 'برنامه را تنظیم کنید' |
345 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | 345 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' |
346 | language: 'زبان و نمای برنامه را تغییر دهید' | 346 | language: 'زبان و نمای برنامه را تغییر دهید' |
347 | rss: 'خوراک آر-اس-اس را فعال کنید' | 347 | feed: 'خوراک آر-اس-اس را فعال کنید' |
348 | tagging_rules: 'قانونهای برچسبگذاری خودکار مقالههایتان را تعریف کنید' | 348 | tagging_rules: 'قانونهای برچسبگذاری خودکار مقالههایتان را تعریف کنید' |
349 | admin: | 349 | admin: |
350 | title: 'مدیریت' | 350 | title: 'مدیریت' |
@@ -554,10 +554,10 @@ flashes: | |||
554 | password_updated: 'رمز بهروز شد' | 554 | password_updated: 'رمز بهروز شد' |
555 | password_not_updated_demo: "در حالت نمایشی نمیتوانید رمز کاربر را عوض کنید." | 555 | password_not_updated_demo: "در حالت نمایشی نمیتوانید رمز کاربر را عوض کنید." |
556 | user_updated: 'اطلاعات بهروز شد' | 556 | user_updated: 'اطلاعات بهروز شد' |
557 | rss_updated: 'اطلاعات آر-اس-اس بهروز شد' | 557 | feed_updated: 'اطلاعات آر-اس-اس بهروز شد' |
558 | tagging_rules_updated: 'برچسبگذاری خودکار بهروز شد' | 558 | tagging_rules_updated: 'برچسبگذاری خودکار بهروز شد' |
559 | tagging_rules_deleted: 'قانون برچسبگذاری پاک شد' | 559 | tagging_rules_deleted: 'قانون برچسبگذاری پاک شد' |
560 | rss_token_updated: 'کد آر-اس-اس بهروز شد' | 560 | feed_token_updated: 'کد آر-اس-اس بهروز شد' |
561 | # annotations_reset: Annotations reset | 561 | # annotations_reset: Annotations reset |
562 | # tags_reset: Tags reset | 562 | # tags_reset: Tags reset |
563 | # entries_reset: Entries reset | 563 | # entries_reset: Entries reset |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 6eac4c36..c67677fd 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -53,7 +53,7 @@ config: | |||
53 | page_title: "Configuration" | 53 | page_title: "Configuration" |
54 | tab_menu: | 54 | tab_menu: |
55 | settings: "Paramètres" | 55 | settings: "Paramètres" |
56 | rss: "RSS" | 56 | feed: "Flux" |
57 | user_info: "Mon compte" | 57 | user_info: "Mon compte" |
58 | password: "Mot de passe" | 58 | password: "Mot de passe" |
59 | rules: "Règles de tag automatiques" | 59 | rules: "Règles de tag automatiques" |
@@ -83,19 +83,19 @@ config: | |||
83 | help_reading_speed: "wallabag calcule une durée de lecture pour chaque article. Vous pouvez définir ici, grâce à cette liste déroulante, si vous lisez plus ou moins vite. wallabag recalculera la durée de lecture de chaque article." | 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." |
84 | 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." |
85 | 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." |
86 | form_rss: | 86 | form_feed: |
87 | description: "Les flux RSS fournis par wallabag vous permettent de lire vos articles sauvegardés dans votre lecteur de flux préféré. Pour pouvoir les utiliser, vous devez d’abord créer un jeton." | 87 | description: "Les flux Atom fournis par wallabag vous permettent de lire vos articles sauvegardés dans votre lecteur de flux préféré. Pour pouvoir les utiliser, vous devez d’abord créer un jeton." |
88 | token_label: "Jeton RSS" | 88 | token_label: "Jeton de flux" |
89 | no_token: "Aucun jeton généré" | 89 | no_token: "Aucun jeton généré" |
90 | token_create: "Créez votre jeton" | 90 | token_create: "Créez votre jeton" |
91 | token_reset: "Réinitialisez votre jeton" | 91 | token_reset: "Réinitialisez votre jeton" |
92 | rss_links: "Adresses de vos flux RSS" | 92 | feed_links: "Adresses de vos flux" |
93 | rss_link: | 93 | feed_link: |
94 | unread: "Non lus" | 94 | unread: "Non lus" |
95 | starred: "Favoris" | 95 | starred: "Favoris" |
96 | archive: "Lus" | 96 | archive: "Lus" |
97 | all: "Tous" | 97 | all: "Tous" |
98 | rss_limit: "Nombre d’articles dans le flux" | 98 | feed_limit: "Nombre d’articles dans le flux" |
99 | form_user: | 99 | form_user: |
100 | two_factor_description: "Activer l’authentification double-facteur veut dire que vous allez recevoir un code par courriel à chaque nouvelle connexion non approuvée." | 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." |
101 | name_label: "Nom" | 101 | name_label: "Nom" |
@@ -344,7 +344,7 @@ quickstart: | |||
344 | title: "Configurez l’application" | 344 | title: "Configurez l’application" |
345 | description: "Pour voir une application qui vous correspond, allez voir du côté de la configuration de wallabag." | 345 | description: "Pour voir une application qui vous correspond, allez voir du côté de la configuration de wallabag." |
346 | language: "Changez la langue et le design de l’application" | 346 | language: "Changez la langue et le design de l’application" |
347 | rss: "Activez les flux RSS" | 347 | feed: "Activez les flux Atom" |
348 | tagging_rules: "Écrivez des règles pour classer automatiquement vos articles" | 348 | tagging_rules: "Écrivez des règles pour classer automatiquement vos articles" |
349 | admin: | 349 | admin: |
350 | title: "Administration" | 350 | title: "Administration" |
@@ -554,10 +554,10 @@ flashes: | |||
554 | password_updated: "Votre mot de passe a bien été mis à jour" | 554 | password_updated: "Votre mot de passe a bien été mis à jour" |
555 | password_not_updated_demo: "En démo, vous ne pouvez pas changer le mot de passe de cet utilisateur." | 555 | password_not_updated_demo: "En démo, vous ne pouvez pas changer le mot de passe de cet utilisateur." |
556 | user_updated: "Vos informations personnelles ont bien été mises à jour" | 556 | user_updated: "Vos informations personnelles ont bien été mises à jour" |
557 | rss_updated: "La configuration des flux RSS a bien été mise à jour" | 557 | feed_updated: "La configuration des flux a bien été mise à jour" |
558 | tagging_rules_updated: "Règles mises à jour" | 558 | tagging_rules_updated: "Règles mises à jour" |
559 | tagging_rules_deleted: "Règle supprimée" | 559 | tagging_rules_deleted: "Règle supprimée" |
560 | rss_token_updated: "Jeton RSS mis à jour" | 560 | feed_token_updated: "Jeton des flux mis à jour" |
561 | annotations_reset: "Annotations supprimées" | 561 | annotations_reset: "Annotations supprimées" |
562 | tags_reset: "Tags supprimés" | 562 | tags_reset: "Tags supprimés" |
563 | entries_reset: "Articles supprimés" | 563 | entries_reset: "Articles supprimés" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index fa7ae0b2..223b47c8 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -53,7 +53,7 @@ config: | |||
53 | page_title: 'Configurazione' | 53 | page_title: 'Configurazione' |
54 | tab_menu: | 54 | tab_menu: |
55 | settings: 'Impostazioni' | 55 | settings: 'Impostazioni' |
56 | rss: 'RSS' | 56 | feed: 'RSS' |
57 | user_info: 'Informazioni utente' | 57 | user_info: 'Informazioni utente' |
58 | password: 'Password' | 58 | password: 'Password' |
59 | rules: 'Regole di etichettatura' | 59 | rules: 'Regole di etichettatura' |
@@ -83,19 +83,19 @@ config: | |||
83 | help_reading_speed: "wallabag calcola un tempo di lettura per ogni articolo. Puoi definire qui, grazie a questa lista, se sei un lettore lento o veloce. wallabag ricalcolerà la velocità di lettura per ogni articolo." | 83 | help_reading_speed: "wallabag calcola un tempo di lettura per ogni articolo. Puoi definire qui, grazie a questa lista, se sei un lettore lento o veloce. wallabag ricalcolerà la velocità di lettura per ogni articolo." |
84 | help_language: "Puoi cambiare la lingua dell'interfaccia di wallabag." | 84 | help_language: "Puoi cambiare la lingua dell'interfaccia di wallabag." |
85 | help_pocket_consumer_key: "Richiesta per importare da Pocket. La puoi creare nel tuo account Pocket." | 85 | help_pocket_consumer_key: "Richiesta per importare da Pocket. La puoi creare nel tuo account Pocket." |
86 | form_rss: | 86 | form_feed: |
87 | description: 'I feed RSS generati da wallabag ti permettono di leggere i tuoi contenuti salvati con il tuo lettore di RSS preferito. Prima, devi generare un token.' | 87 | description: 'I feed RSS generati da wallabag ti permettono di leggere i tuoi contenuti salvati con il tuo lettore di RSS preferito. Prima, devi generare un token.' |
88 | token_label: 'Token RSS' | 88 | token_label: 'Token RSS' |
89 | no_token: 'Nessun token' | 89 | no_token: 'Nessun token' |
90 | token_create: 'Crea il tuo token' | 90 | token_create: 'Crea il tuo token' |
91 | token_reset: 'Rigenera il tuo token' | 91 | token_reset: 'Rigenera il tuo token' |
92 | rss_links: 'Collegamenti RSS' | 92 | feed_links: 'Collegamenti RSS' |
93 | rss_link: | 93 | feed_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 | # all: 'All' |
98 | rss_limit: 'Numero di elementi nel feed' | 98 | feed_limit: 'Numero di elementi nel feed' |
99 | form_user: | 99 | form_user: |
100 | two_factor_description: "Abilitando l'autenticazione a due fattori riceverai una e-mail con un codice per ogni nuova connesione non verificata" | 100 | two_factor_description: "Abilitando l'autenticazione a due fattori riceverai una e-mail con un codice per ogni nuova connesione non verificata" |
101 | name_label: 'Nome' | 101 | name_label: 'Nome' |
@@ -344,7 +344,7 @@ quickstart: | |||
344 | title: "Configura l'applicazione" | 344 | title: "Configura l'applicazione" |
345 | description: "Per avere un'applicazione che ti soddisfi, dai un'occhiata alla configurazione di wallabag." | 345 | description: "Per avere un'applicazione che ti soddisfi, dai un'occhiata alla configurazione di wallabag." |
346 | language: 'Cambia lingua e design' | 346 | language: 'Cambia lingua e design' |
347 | rss: 'Abilita i feed RSS' | 347 | feed: 'Abilita i feed RSS' |
348 | tagging_rules: 'Scrivi delle regole per taggare automaticamente i contenuti' | 348 | tagging_rules: 'Scrivi delle regole per taggare automaticamente i contenuti' |
349 | admin: | 349 | admin: |
350 | title: 'Amministrazione' | 350 | title: 'Amministrazione' |
@@ -554,10 +554,10 @@ flashes: | |||
554 | password_updated: 'Password aggiornata' | 554 | password_updated: 'Password aggiornata' |
555 | password_not_updated_demo: "In modalità demo, non puoi cambiare la password dell'utente." | 555 | password_not_updated_demo: "In modalità demo, non puoi cambiare la password dell'utente." |
556 | user_updated: 'Informazioni aggiornate' | 556 | user_updated: 'Informazioni aggiornate' |
557 | rss_updated: 'Informazioni RSS aggiornate' | 557 | feed_updated: 'Informazioni RSS aggiornate' |
558 | tagging_rules_updated: 'Regole di etichettatura aggiornate' | 558 | tagging_rules_updated: 'Regole di etichettatura aggiornate' |
559 | tagging_rules_deleted: 'Regola di etichettatura eliminate' | 559 | tagging_rules_deleted: 'Regola di etichettatura eliminate' |
560 | rss_token_updated: 'RSS token aggiornato' | 560 | feed_token_updated: 'RSS token aggiornato' |
561 | annotations_reset: Reset annotazioni | 561 | annotations_reset: Reset annotazioni |
562 | tags_reset: Reset etichette | 562 | tags_reset: Reset etichette |
563 | entries_reset: Reset articoli | 563 | entries_reset: Reset articoli |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index be57e903..5a52cf7b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -53,7 +53,7 @@ config: | |||
53 | page_title: 'Configuracion' | 53 | page_title: 'Configuracion' |
54 | tab_menu: | 54 | tab_menu: |
55 | settings: 'Paramètres' | 55 | settings: 'Paramètres' |
56 | rss: 'RSS' | 56 | feed: 'RSS' |
57 | user_info: 'Mon compte' | 57 | user_info: 'Mon compte' |
58 | password: 'Senhal' | 58 | password: 'Senhal' |
59 | rules: "Règlas d'etiquetas automaticas" | 59 | rules: "Règlas d'etiquetas automaticas" |
@@ -83,19 +83,19 @@ config: | |||
83 | help_reading_speed: "wallabag calcula lo temps de lectura per cada article. Podètz lo definir aquí, gràcias a aquesta lista, se sètz un legeire rapid o lent. wallabag tornarà calcular lo temps de lectura per cada article." | 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." |
84 | help_language: "Podètz cambiar la lenga de l'interfàcia de wallabag." | 84 | help_language: "Podètz cambiar la lenga de l'interfàcia de wallabag." |
85 | help_pocket_consumer_key: "Requesida per l'importacion de Pocket. Podètz la crear dins vòstre compte Pocket." | 85 | help_pocket_consumer_key: "Requesida per l'importacion de Pocket. Podètz la crear dins vòstre compte Pocket." |
86 | form_rss: | 86 | form_feed: |
87 | description: "Los fluxes RSS fornits per wallabag vos permeton de legir vòstres articles salvagardats dins vòstre lector de fluxes preferit. Per los poder emplegar, vos cal, d'en primièr crear un geton." | 87 | description: "Los fluxes RSS fornits per wallabag vos permeton de legir vòstres articles salvagardats dins vòstre lector de fluxes preferit. Per los poder emplegar, vos cal, d'en primièr crear un geton." |
88 | token_label: 'Geton RSS' | 88 | token_label: 'Geton RSS' |
89 | no_token: 'Pas cap de geton generat' | 89 | no_token: 'Pas cap de geton generat' |
90 | token_create: 'Creatz vòstre geton' | 90 | token_create: 'Creatz vòstre geton' |
91 | token_reset: 'Reïnicializatz vòstre geton' | 91 | token_reset: 'Reïnicializatz vòstre geton' |
92 | rss_links: 'URLs de vòstres fluxes RSS' | 92 | feed_links: 'URLs de vòstres fluxes RSS' |
93 | rss_link: | 93 | feed_link: |
94 | unread: 'Pas legits' | 94 | unread: 'Pas legits' |
95 | starred: 'Favorits' | 95 | starred: 'Favorits' |
96 | archive: 'Legits' | 96 | archive: 'Legits' |
97 | # all: 'All' | 97 | # all: 'All' |
98 | rss_limit: "Nombre d'articles dins un flux RSS" | 98 | feed_limit: "Nombre d'articles dins un flux RSS" |
99 | form_user: | 99 | form_user: |
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." | 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." |
101 | name_label: 'Nom' | 101 | name_label: 'Nom' |
@@ -344,7 +344,7 @@ quickstart: | |||
344 | title: "Configuratz l'aplicacion" | 344 | title: "Configuratz l'aplicacion" |
345 | description: "Per fin d'aver una aplicacion que vos va ben, anatz veire la configuracion de wallabag." | 345 | description: "Per fin d'aver una aplicacion que vos va ben, anatz veire la configuracion de wallabag." |
346 | language: "Cambiatz la lenga e l'estil de l'aplicacion" | 346 | language: "Cambiatz la lenga e l'estil de l'aplicacion" |
347 | rss: 'Activatz los fluxes RSS' | 347 | feed: 'Activatz los fluxes RSS' |
348 | tagging_rules: 'Escrivètz de règlas per classar automaticament vòstres articles' | 348 | tagging_rules: 'Escrivètz de règlas per classar automaticament vòstres articles' |
349 | admin: | 349 | admin: |
350 | title: 'Administracion' | 350 | title: 'Administracion' |
@@ -554,10 +554,10 @@ flashes: | |||
554 | password_updated: 'Vòstre senhal es ben estat mes a jorn' | 554 | password_updated: 'Vòstre senhal es ben estat mes a jorn' |
555 | password_not_updated_demo: "En demostration, podètz pas cambiar lo senhal d'aqueste utilizaire." | 555 | password_not_updated_demo: "En demostration, podètz pas cambiar lo senhal d'aqueste utilizaire." |
556 | user_updated: 'Vòstres informacions personnelas son ben estadas mesas a jorn' | 556 | user_updated: 'Vòstres informacions personnelas son ben estadas mesas a jorn' |
557 | rss_updated: 'La configuracion dels fluxes RSS es ben estada mesa a jorn' | 557 | feed_updated: 'La configuracion dels fluxes RSS es ben estada mesa a jorn' |
558 | tagging_rules_updated: 'Règlas misa a jorn' | 558 | tagging_rules_updated: 'Règlas misa a jorn' |
559 | tagging_rules_deleted: 'Règla suprimida' | 559 | tagging_rules_deleted: 'Règla suprimida' |
560 | rss_token_updated: 'Geton RSS mes a jorn' | 560 | feed_token_updated: 'Geton RSS mes a jorn' |
561 | annotations_reset: Anotacions levadas | 561 | annotations_reset: Anotacions levadas |
562 | tags_reset: Etiquetas levadas | 562 | tags_reset: Etiquetas levadas |
563 | entries_reset: Articles levats | 563 | entries_reset: Articles levats |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 00c559ed..9f4a7900 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -53,7 +53,7 @@ config: | |||
53 | page_title: 'Konfiguracja' | 53 | page_title: 'Konfiguracja' |
54 | tab_menu: | 54 | tab_menu: |
55 | settings: 'Ustawienia' | 55 | settings: 'Ustawienia' |
56 | rss: 'Kanał RSS' | 56 | feed: 'Kanał RSS' |
57 | user_info: 'Informacje o użytkowniku' | 57 | user_info: 'Informacje o użytkowniku' |
58 | password: 'Hasło' | 58 | password: 'Hasło' |
59 | rules: 'Zasady tagowania' | 59 | rules: 'Zasady tagowania' |
@@ -83,19 +83,19 @@ config: | |||
83 | help_reading_speed: "wallabag oblicza czas czytania każdego artykułu. Dzięki tej liście możesz określić swoje tempo. Wallabag przeliczy ponownie czas potrzebny, na przeczytanie każdego z artykułów." | 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." |
84 | help_language: "Możesz zmienić język interfejsu wallabag." | 84 | help_language: "Możesz zmienić język interfejsu wallabag." |
85 | help_pocket_consumer_key: "Wymagane dla importu z Pocket. Możesz go stworzyć na swoim koncie Pocket." | 85 | help_pocket_consumer_key: "Wymagane dla importu z Pocket. Możesz go stworzyć na swoim koncie Pocket." |
86 | form_rss: | 86 | form_feed: |
87 | description: 'Kanały RSS prowadzone przez wallabag pozwalają Ci na czytanie twoich zapisanych artykułów w twoim ulubionym czytniku RSS. Musisz najpierw wynegenerować tokena.' | 87 | description: 'Kanały RSS prowadzone przez wallabag pozwalają Ci na czytanie twoich zapisanych artykułów w twoim ulubionym czytniku RSS. Musisz najpierw wynegenerować tokena.' |
88 | token_label: 'Token RSS' | 88 | token_label: 'Token RSS' |
89 | no_token: 'Brak tokena' | 89 | no_token: 'Brak tokena' |
90 | token_create: 'Stwórz tokena' | 90 | token_create: 'Stwórz tokena' |
91 | token_reset: 'Zresetuj swojego tokena' | 91 | token_reset: 'Zresetuj swojego tokena' |
92 | rss_links: 'RSS links' | 92 | feed_links: 'RSS links' |
93 | rss_link: | 93 | feed_link: |
94 | unread: 'Nieprzeczytane' | 94 | unread: 'Nieprzeczytane' |
95 | starred: 'Oznaczone gwiazdką' | 95 | starred: 'Oznaczone gwiazdką' |
96 | archive: 'Archiwum' | 96 | archive: 'Archiwum' |
97 | # all: 'All' | 97 | # all: 'All' |
98 | rss_limit: 'Link do RSS' | 98 | feed_limit: 'Link do RSS' |
99 | form_user: | 99 | form_user: |
100 | two_factor_description: "Włączenie autoryzacji dwuetapowej oznacza, że będziesz otrzymywał maile z kodem przy każdym nowym, niezaufanym połączeniu" | 100 | two_factor_description: "Włączenie autoryzacji dwuetapowej oznacza, że będziesz otrzymywał maile z kodem przy każdym nowym, niezaufanym połączeniu" |
101 | name_label: 'Nazwa' | 101 | name_label: 'Nazwa' |
@@ -344,7 +344,7 @@ quickstart: | |||
344 | title: 'Konfiguruj aplikację' | 344 | title: 'Konfiguruj aplikację' |
345 | description: 'W celu dopasowania aplikacji do swoich upodobań, zobacz konfigurację aplikacji' | 345 | description: 'W celu dopasowania aplikacji do swoich upodobań, zobacz konfigurację aplikacji' |
346 | language: 'Zmień język i wygląd' | 346 | language: 'Zmień język i wygląd' |
347 | rss: 'Włącz kanały RSS' | 347 | feed: 'Włącz kanały RSS' |
348 | tagging_rules: 'Napisz reguły pozwalające na automatyczne otagowanie twoich artykułów' | 348 | tagging_rules: 'Napisz reguły pozwalające na automatyczne otagowanie twoich artykułów' |
349 | admin: | 349 | admin: |
350 | title: 'Administracja' | 350 | title: 'Administracja' |
@@ -554,10 +554,10 @@ flashes: | |||
554 | password_updated: 'Hasło zaktualizowane' | 554 | password_updated: 'Hasło zaktualizowane' |
555 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." | 555 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." |
556 | user_updated: 'Informacje zaktualizowane' | 556 | user_updated: 'Informacje zaktualizowane' |
557 | rss_updated: 'Informacje RSS zaktualizowane' | 557 | feed_updated: 'Informacje RSS zaktualizowane' |
558 | tagging_rules_updated: 'Reguły tagowania zaktualizowane' | 558 | tagging_rules_updated: 'Reguły tagowania zaktualizowane' |
559 | tagging_rules_deleted: 'Reguła tagowania usunięta' | 559 | tagging_rules_deleted: 'Reguła tagowania usunięta' |
560 | rss_token_updated: 'Token kanału RSS zaktualizowany' | 560 | feed_token_updated: 'Token kanału RSS zaktualizowany' |
561 | annotations_reset: Zresetuj adnotacje | 561 | annotations_reset: Zresetuj adnotacje |
562 | tags_reset: Zresetuj tagi | 562 | tags_reset: Zresetuj tagi |
563 | entries_reset: Zresetuj wpisy | 563 | entries_reset: Zresetuj wpisy |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 4ab5f144..d4855596 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -53,7 +53,7 @@ config: | |||
53 | page_title: 'Config' | 53 | page_title: 'Config' |
54 | tab_menu: | 54 | tab_menu: |
55 | settings: 'Configurações' | 55 | settings: 'Configurações' |
56 | rss: 'RSS' | 56 | feed: 'RSS' |
57 | user_info: 'Informação do Usuário' | 57 | user_info: 'Informação do Usuário' |
58 | password: 'Senha' | 58 | password: 'Senha' |
59 | rules: 'Regras de tags' | 59 | rules: 'Regras de tags' |
@@ -83,19 +83,19 @@ config: | |||
83 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." | 83 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
84 | # help_language: "You can change the language of wallabag interface." | 84 | # help_language: "You can change the language of wallabag interface." |
85 | # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." | 85 | # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." |
86 | form_rss: | 86 | form_feed: |
87 | description: 'Feeds RSS providos pelo wallabag permitem que você leia seus artigos salvos em seu leitor de RSS favorito. Você precisa gerar um token primeiro.' | 87 | description: 'Feeds RSS providos pelo wallabag permitem que você leia seus artigos salvos em seu leitor de RSS favorito. Você precisa gerar um token primeiro.' |
88 | token_label: 'Token RSS' | 88 | token_label: 'Token RSS' |
89 | no_token: 'Nenhum Token' | 89 | no_token: 'Nenhum Token' |
90 | token_create: 'Criar seu token' | 90 | token_create: 'Criar seu token' |
91 | token_reset: 'Gerar novamente seu token' | 91 | token_reset: 'Gerar novamente seu token' |
92 | rss_links: 'Links RSS' | 92 | feed_links: 'Links RSS' |
93 | rss_link: | 93 | feed_link: |
94 | unread: 'Não lido' | 94 | unread: 'Não lido' |
95 | starred: 'Destacado' | 95 | starred: 'Destacado' |
96 | archive: 'Arquivado' | 96 | archive: 'Arquivado' |
97 | # all: 'All' | 97 | # all: 'All' |
98 | rss_limit: 'Número de itens no feed' | 98 | feed_limit: 'Número de itens no feed' |
99 | form_user: | 99 | form_user: |
100 | two_factor_description: 'Habilitar autenticação de dois passos significa que você receberá um e-mail com um código a cada nova conexão desconhecida.' | 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.' |
101 | name_label: 'Nome' | 101 | name_label: 'Nome' |
@@ -344,7 +344,7 @@ quickstart: | |||
344 | title: 'Configurar a aplicação' | 344 | title: 'Configurar a aplicação' |
345 | description: 'Para ter uma aplicação que atende você, dê uma olhada na configuração do wallabag.' | 345 | description: 'Para ter uma aplicação que atende você, dê uma olhada na configuração do wallabag.' |
346 | language: 'Alterar idioma e design' | 346 | language: 'Alterar idioma e design' |
347 | rss: 'Habilitar feeds RSS' | 347 | feed: 'Habilitar feeds RSS' |
348 | tagging_rules: 'Escrever regras para acrescentar tags automaticamente em seus artigos' | 348 | tagging_rules: 'Escrever regras para acrescentar tags automaticamente em seus artigos' |
349 | admin: | 349 | admin: |
350 | title: 'Administração' | 350 | title: 'Administração' |
@@ -554,10 +554,10 @@ flashes: | |||
554 | password_updated: 'Senha atualizada' | 554 | password_updated: 'Senha atualizada' |
555 | password_not_updated_demo: 'Em modo de demonstração, você não pode alterar a senha deste usuário.' | 555 | password_not_updated_demo: 'Em modo de demonstração, você não pode alterar a senha deste usuário.' |
556 | # user_updated: 'Information updated' | 556 | # user_updated: 'Information updated' |
557 | rss_updated: 'Informação de RSS atualizada' | 557 | feed_updated: 'Informação de RSS atualizada' |
558 | tagging_rules_updated: 'Regras de tags atualizadas' | 558 | tagging_rules_updated: 'Regras de tags atualizadas' |
559 | tagging_rules_deleted: 'Regra de tag apagada' | 559 | tagging_rules_deleted: 'Regra de tag apagada' |
560 | rss_token_updated: 'Token RSS atualizado' | 560 | feed_token_updated: 'Token RSS atualizado' |
561 | # annotations_reset: Annotations reset | 561 | # annotations_reset: Annotations reset |
562 | # tags_reset: Tags reset | 562 | # tags_reset: Tags reset |
563 | # entries_reset: Entries reset | 563 | # entries_reset: Entries reset |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index f16504ed..cb808007 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -53,7 +53,7 @@ config: | |||
53 | page_title: 'Configurație' | 53 | page_title: 'Configurație' |
54 | tab_menu: | 54 | tab_menu: |
55 | settings: 'Setări' | 55 | settings: 'Setări' |
56 | rss: 'RSS' | 56 | feed: 'RSS' |
57 | user_info: 'Informații despre utilizator' | 57 | user_info: 'Informații despre utilizator' |
58 | password: 'Parolă' | 58 | password: 'Parolă' |
59 | # rules: 'Tagging rules' | 59 | # rules: 'Tagging rules' |
@@ -83,19 +83,19 @@ config: | |||
83 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." | 83 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
84 | # help_language: "You can change the language of wallabag interface." | 84 | # help_language: "You can change the language of wallabag interface." |
85 | # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." | 85 | # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." |
86 | form_rss: | 86 | form_feed: |
87 | description: 'Feed-urile RSS oferite de wallabag îți permit să-ți citești articolele salvate în reader-ul tău preferat RSS.' | 87 | description: 'Feed-urile RSS oferite de wallabag îți permit să-ți citești articolele salvate în reader-ul tău preferat RSS.' |
88 | token_label: 'RSS-Token' | 88 | token_label: 'RSS-Token' |
89 | no_token: 'Fără token' | 89 | no_token: 'Fără token' |
90 | token_create: 'Crează-ți token' | 90 | token_create: 'Crează-ți token' |
91 | token_reset: 'Resetează-ți token-ul' | 91 | token_reset: 'Resetează-ți token-ul' |
92 | rss_links: 'Link-uri RSS' | 92 | feed_links: 'Link-uri RSS' |
93 | rss_link: | 93 | feed_link: |
94 | unread: 'Unread' | 94 | unread: 'Unread' |
95 | starred: 'Starred' | 95 | starred: 'Starred' |
96 | archive: 'Archived' | 96 | archive: 'Archived' |
97 | # all: 'All' | 97 | # all: 'All' |
98 | rss_limit: 'Limită RSS' | 98 | feed_limit: 'Limită RSS' |
99 | form_user: | 99 | form_user: |
100 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion" | 100 | # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion" |
101 | name_label: 'Nume' | 101 | name_label: 'Nume' |
@@ -344,7 +344,7 @@ quickstart: | |||
344 | # title: 'Configure the application' | 344 | # title: 'Configure the application' |
345 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | 345 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' |
346 | # language: 'Change language and design' | 346 | # language: 'Change language and design' |
347 | # rss: 'Enable RSS feeds' | 347 | # feed: 'Enable RSS feeds' |
348 | # tagging_rules: 'Write rules to automatically tag your articles' | 348 | # tagging_rules: 'Write rules to automatically tag your articles' |
349 | # admin: | 349 | # admin: |
350 | # title: 'Administration' | 350 | # title: 'Administration' |
@@ -554,10 +554,10 @@ flashes: | |||
554 | password_updated: 'Parolă actualizată' | 554 | password_updated: 'Parolă actualizată' |
555 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." | 555 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." |
556 | user_updated: 'Informație actualizată' | 556 | user_updated: 'Informație actualizată' |
557 | rss_updated: 'Informație RSS actualizată' | 557 | feed_updated: 'Informație RSS actualizată' |
558 | # tagging_rules_updated: 'Tagging rules updated' | 558 | # tagging_rules_updated: 'Tagging rules updated' |
559 | # tagging_rules_deleted: 'Tagging rule deleted' | 559 | # tagging_rules_deleted: 'Tagging rule deleted' |
560 | # rss_token_updated: 'RSS token updated' | 560 | # feed_token_updated: 'RSS token updated' |
561 | # annotations_reset: Annotations reset | 561 | # annotations_reset: Annotations reset |
562 | # tags_reset: Tags reset | 562 | # tags_reset: Tags reset |
563 | # entries_reset: Entries reset | 563 | # entries_reset: Entries reset |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 90a140cd..7d2cf231 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -53,7 +53,7 @@ config: | |||
53 | page_title: 'Yapılandırma' | 53 | page_title: 'Yapılandırma' |
54 | tab_menu: | 54 | tab_menu: |
55 | settings: 'Ayarlar' | 55 | settings: 'Ayarlar' |
56 | rss: 'RSS' | 56 | feed: 'RSS' |
57 | user_info: 'Kullanıcı bilgileri' | 57 | user_info: 'Kullanıcı bilgileri' |
58 | password: 'Şifre' | 58 | password: 'Şifre' |
59 | rules: 'Etiketleme kuralları' | 59 | rules: 'Etiketleme kuralları' |
@@ -83,19 +83,19 @@ config: | |||
83 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." | 83 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
84 | # help_language: "You can change the language of wallabag interface." | 84 | # help_language: "You can change the language of wallabag interface." |
85 | # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." | 85 | # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." |
86 | form_rss: | 86 | form_feed: |
87 | description: 'wallabag RSS akışı kaydetmiş olduğunuz makalelerini favori RSS okuyucunuzda görüntülemenizi sağlar. Bunu yapabilmek için öncelikle belirteç (token) oluşturmalısınız.' | 87 | description: 'wallabag RSS akışı kaydetmiş olduğunuz makalelerini favori RSS okuyucunuzda görüntülemenizi sağlar. Bunu yapabilmek için öncelikle belirteç (token) oluşturmalısınız.' |
88 | token_label: 'RSS belirteci (token)' | 88 | token_label: 'RSS belirteci (token)' |
89 | no_token: 'Belirteç (token) yok' | 89 | no_token: 'Belirteç (token) yok' |
90 | token_create: 'Yeni belirteç (token) oluştur' | 90 | token_create: 'Yeni belirteç (token) oluştur' |
91 | token_reset: 'Belirteci (token) sıfırla' | 91 | token_reset: 'Belirteci (token) sıfırla' |
92 | rss_links: 'RSS akış bağlantıları' | 92 | feed_links: 'RSS akış bağlantıları' |
93 | rss_link: | 93 | feed_link: |
94 | unread: 'Okunmayan' | 94 | unread: 'Okunmayan' |
95 | starred: 'Favoriler' | 95 | starred: 'Favoriler' |
96 | archive: 'Arşiv' | 96 | archive: 'Arşiv' |
97 | # all: 'All' | 97 | # all: 'All' |
98 | rss_limit: 'RSS içeriğinden talep edilecek makale limiti' | 98 | feed_limit: 'RSS içeriğinden talep edilecek makale limiti' |
99 | form_user: | 99 | form_user: |
100 | two_factor_description: "İki adımlı doğrulamayı aktifleştirdiğinizde, her yeni güvenilmeyen bağlantılarda size e-posta ile bir kod alacaksınız." | 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." |
101 | name_label: 'İsim' | 101 | name_label: 'İsim' |
@@ -342,7 +342,7 @@ quickstart: | |||
342 | title: 'Uygulamayı Yapılandırma' | 342 | title: 'Uygulamayı Yapılandırma' |
343 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | 343 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' |
344 | language: 'Dili ve tasarımı değiştirme' | 344 | language: 'Dili ve tasarımı değiştirme' |
345 | rss: 'RSS akışını aktifleştirme' | 345 | feed: 'RSS akışını aktifleştirme' |
346 | # tagging_rules: 'Write rules to automatically tag your articles' | 346 | # tagging_rules: 'Write rules to automatically tag your articles' |
347 | admin: | 347 | admin: |
348 | # title: 'Administration' | 348 | # title: 'Administration' |
@@ -532,10 +532,10 @@ flashes: | |||
532 | password_updated: 'Şifre güncellendi' | 532 | password_updated: 'Şifre güncellendi' |
533 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." | 533 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." |
534 | user_updated: 'Bilgiler güncellendi' | 534 | user_updated: 'Bilgiler güncellendi' |
535 | rss_updated: 'RSS bilgiler güncellendi' | 535 | feed_updated: 'RSS bilgiler güncellendi' |
536 | tagging_rules_updated: 'Tagging rules updated' | 536 | tagging_rules_updated: 'Tagging rules updated' |
537 | tagging_rules_deleted: 'Tagging rule deleted' | 537 | tagging_rules_deleted: 'Tagging rule deleted' |
538 | rss_token_updated: 'RSS token updated' | 538 | feed_token_updated: 'RSS token updated' |
539 | # annotations_reset: Annotations reset | 539 | # annotations_reset: Annotations reset |
540 | # tags_reset: Tags reset | 540 | # tags_reset: Tags reset |
541 | # entries_reset: Entries reset | 541 | # entries_reset: Entries reset |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml index c6a84209..c0438978 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: 'Adgangskoden skal være mindst 8 tegn' | 3 | password_too_short: 'Adgangskoden skal være mindst 8 tegn' |
4 | # password_wrong_value: 'Wrong value for your current password' | 4 | # password_wrong_value: 'Wrong value for your current password' |
5 | # item_per_page_too_high: 'This will certainly kill the app' | 5 | # item_per_page_too_high: 'This will certainly kill the app' |
6 | # rss_limit_too_high: 'This will certainly kill the app' | 6 | # feed_limit_too_high: 'This will certainly kill the app' |
7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' | 7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml index c74c00ca..608f16c9 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: 'Kennwort-Mindestlänge von acht Zeichen nicht erfüllt' | 3 | password_too_short: 'Kennwort-Mindestlänge von acht Zeichen nicht erfüllt' |
4 | password_wrong_value: 'Falscher Wert für dein aktuelles Kennwort' | 4 | password_wrong_value: 'Falscher Wert für dein aktuelles Kennwort' |
5 | item_per_page_too_high: 'Dies wird die Anwendung möglicherweise beenden' | 5 | item_per_page_too_high: 'Dies wird die Anwendung möglicherweise beenden' |
6 | rss_limit_too_high: 'Dies wird die Anwendung möglicherweise beenden' | 6 | feed_limit_too_high: 'Dies wird die Anwendung möglicherweise beenden' |
7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' | 7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml index 8cc117fe..89d4c68a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: 'Password should by at least 8 chars long' | 3 | password_too_short: 'Password should by at least 8 chars long' |
4 | password_wrong_value: 'Wrong value for your current password' | 4 | password_wrong_value: 'Wrong value for your current password' |
5 | item_per_page_too_high: 'This will certainly kill the app' | 5 | item_per_page_too_high: 'This will certainly kill the app' |
6 | rss_limit_too_high: 'This will certainly kill the app' | 6 | feed_limit_too_high: 'This will certainly kill the app' |
7 | quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' | 7 | quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml index 97a8edfa..ba34ee76 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: 'La contraseña debe tener al menos 8 carácteres' | 3 | password_too_short: 'La contraseña debe tener al menos 8 carácteres' |
4 | password_wrong_value: 'Entrada equivocada para su contraseña actual' | 4 | password_wrong_value: 'Entrada equivocada para su contraseña actual' |
5 | item_per_page_too_high: 'Esto matará la aplicación' | 5 | item_per_page_too_high: 'Esto matará la aplicación' |
6 | rss_limit_too_high: 'Esto matará la aplicación' | 6 | feed_limit_too_high: 'Esto matará la aplicación' |
7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' | 7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml index ef677525..9b1a4af2 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: 'رمز شما باید ۸ حرف یا بیشتر باشد' | 3 | password_too_short: 'رمز شما باید ۸ حرف یا بیشتر باشد' |
4 | password_wrong_value: 'رمز فعلی را اشتباه وارد کردهاید' | 4 | password_wrong_value: 'رمز فعلی را اشتباه وارد کردهاید' |
5 | item_per_page_too_high: 'با این تعداد برنامه به فنا میرود' | 5 | item_per_page_too_high: 'با این تعداد برنامه به فنا میرود' |
6 | rss_limit_too_high: 'با این تعداد برنامه به فنا میرود' | 6 | feed_limit_too_high: 'با این تعداد برنامه به فنا میرود' |
7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' | 7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml index f31b4ed2..92f69aa0 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: "Le mot de passe doit contenir au moins 8 caractères" | 3 | password_too_short: "Le mot de passe doit contenir au moins 8 caractères" |
4 | password_wrong_value: "Votre mot de passe actuel est faux" | 4 | password_wrong_value: "Votre mot de passe actuel est faux" |
5 | item_per_page_too_high: "Ça ne va pas plaire à l’application" | 5 | item_per_page_too_high: "Ça ne va pas plaire à l’application" |
6 | rss_limit_too_high: "Ça ne va pas plaire à l’application" | 6 | feed_limit_too_high: "Ça ne va pas plaire à l’application" |
7 | quote_length_too_high: "La citation est trop longue. Elle doit avoir au maximum {{ limit }} caractères." | 7 | quote_length_too_high: "La citation est trop longue. Elle doit avoir au maximum {{ limit }} caractères." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml index d949cc3b..b20d6f51 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: 'La password deve essere lunga almeno 8 caratteri' | 3 | password_too_short: 'La password deve essere lunga almeno 8 caratteri' |
4 | password_wrong_value: 'Valore inserito per la password corrente errato' | 4 | password_wrong_value: 'Valore inserito per la password corrente errato' |
5 | item_per_page_too_high: 'Questo valore è troppo alto' | 5 | item_per_page_too_high: 'Questo valore è troppo alto' |
6 | rss_limit_too_high: 'Questo valore è troppo alto' | 6 | feed_limit_too_high: 'Questo valore è troppo alto' |
7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' | 7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml index fb4aa592..3856ca69 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: 'Lo senhal deu aver almens 8 caractèrs' | 3 | password_too_short: 'Lo senhal deu aver almens 8 caractèrs' |
4 | password_wrong_value: 'Vòstre senhal actual es pas bon' | 4 | password_wrong_value: 'Vòstre senhal actual es pas bon' |
5 | item_per_page_too_high: "Aquò li agradarà pas a l'aplicacion" | 5 | item_per_page_too_high: "Aquò li agradarà pas a l'aplicacion" |
6 | rss_limit_too_high: "Aquò li agradarà pas a l'aplicacion" | 6 | feed_limit_too_high: "Aquò li agradarà pas a l'aplicacion" |
7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' | 7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml index e4165c14..94757cc5 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: 'Hasło powinno mieć minimum 8 znaków długości' | 3 | password_too_short: 'Hasło powinno mieć minimum 8 znaków długości' |
4 | password_wrong_value: 'Twoje obecne hasło jest błędne' | 4 | password_wrong_value: 'Twoje obecne hasło jest błędne' |
5 | item_per_page_too_high: 'To może spowodować problemy z aplikacją' | 5 | item_per_page_too_high: 'To może spowodować problemy z aplikacją' |
6 | rss_limit_too_high: 'To może spowodować problemy z aplikacją' | 6 | feed_limit_too_high: 'To może spowodować problemy z aplikacją' |
7 | quote_length_too_high: 'Cytat jest zbyt długi. powinien mieć {{ limit }} znaków lub mniej.' | 7 | quote_length_too_high: 'Cytat jest zbyt długi. powinien mieć {{ limit }} znaków lub mniej.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml index a8c1f9de..df2f3f35 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: 'A senha deve ter pelo menos 8 caracteres' | 3 | password_too_short: 'A senha deve ter pelo menos 8 caracteres' |
4 | password_wrong_value: 'A senha atual informada está errada' | 4 | password_wrong_value: 'A senha atual informada está errada' |
5 | item_per_page_too_high: 'Certamente isso pode matar a aplicação' | 5 | item_per_page_too_high: 'Certamente isso pode matar a aplicação' |
6 | rss_limit_too_high: 'Certamente isso pode matar a aplicação' | 6 | feed_limit_too_high: 'Certamente isso pode matar a aplicação' |
7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' | 7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml index 6840cf11..e5c8a72f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | password_too_short: 'Parola ar trebui să conțină cel puțin 8 caractere' | 3 | password_too_short: 'Parola ar trebui să conțină cel puțin 8 caractere' |
4 | # password_wrong_value: 'Wrong value for your current password' | 4 | # password_wrong_value: 'Wrong value for your current password' |
5 | # item_per_page_too_high: 'This will certainly kill the app' | 5 | # item_per_page_too_high: 'This will certainly kill the app' |
6 | # rss_limit_too_high: 'This will certainly kill the app' | 6 | # feed_limit_too_high: 'This will certainly kill the app' |
7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' | 7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml index e1e7317f..881ffd3b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml | |||
@@ -3,5 +3,5 @@ validator: | |||
3 | # password_too_short: 'Password should by at least 8 chars long' | 3 | # password_too_short: 'Password should by at least 8 chars long' |
4 | # password_wrong_value: 'Wrong value for your current password' | 4 | # password_wrong_value: 'Wrong value for your current password' |
5 | # item_per_page_too_high: 'This will certainly kill the app' | 5 | # item_per_page_too_high: 'This will certainly kill the app' |
6 | # rss_limit_too_high: 'This will certainly kill the app' | 6 | # feed_limit_too_high: 'This will certainly kill the app' |
7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' | 7 | # quote_length_too_high: 'The quote is too long. It should have {{ limit }} characters or less.' |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index bcc57dac..8fc42b0d 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 | |||
@@ -95,43 +95,43 @@ | |||
95 | {{ form_rest(form.config) }} | 95 | {{ form_rest(form.config) }} |
96 | </form> | 96 | </form> |
97 | 97 | ||
98 | <h2>{{ 'config.tab_menu.rss'|trans }}</h2> | 98 | <h2>{{ 'config.tab_menu.feed'|trans }}</h2> |
99 | 99 | ||
100 | {{ form_start(form.rss) }} | 100 | {{ form_start(form.feed) }} |
101 | {{ form_errors(form.rss) }} | 101 | {{ form_errors(form.feed) }} |
102 | 102 | ||
103 | <div class="row"> | 103 | <div class="row"> |
104 | {{ 'config.form_rss.description'|trans }} | 104 | {{ 'config.form_feed.description'|trans }} |
105 | </div> | 105 | </div> |
106 | 106 | ||
107 | <fieldset class="w500p inline"> | 107 | <fieldset class="w500p inline"> |
108 | <div class="row"> | 108 | <div class="row"> |
109 | <label>{{ 'config.form_rss.token_label'|trans }}</label> | 109 | <label>{{ 'config.form_feed.token_label'|trans }}</label> |
110 | {% if rss.token %} | 110 | {% if feed.token %} |
111 | {{ rss.token }} | 111 | {{ feed.token }} |
112 | {% else %} | 112 | {% else %} |
113 | <em>{{ 'config.form_rss.no_token'|trans }}</em> | 113 | <em>{{ 'config.form_feed.no_token'|trans }}</em> |
114 | {% endif %} | 114 | {% endif %} |
115 | – | 115 | – |
116 | <a href="{{ path('generate_token') }}"> | 116 | <a href="{{ path('generate_token') }}"> |
117 | {% if rss.token %} | 117 | {% if feed.token %} |
118 | {{ 'config.form_rss.token_reset'|trans }} | 118 | {{ 'config.form_feed.token_reset'|trans }} |
119 | {% else %} | 119 | {% else %} |
120 | {{ 'config.form_rss.token_create'|trans }} | 120 | {{ 'config.form_feed.token_create'|trans }} |
121 | {% endif %} | 121 | {% endif %} |
122 | </a> | 122 | </a> |
123 | </div> | 123 | </div> |
124 | </fieldset> | 124 | </fieldset> |
125 | 125 | ||
126 | {% if rss.token %} | 126 | {% if feed.token %} |
127 | <fieldset class="w500p inline"> | 127 | <fieldset class="w500p inline"> |
128 | <div class="row"> | 128 | <div class="row"> |
129 | <label>{{ 'config.form_rss.rss_links'|trans }}</label> | 129 | <label>{{ 'config.form_feed.feed_links'|trans }}</label> |
130 | <ul> | 130 | <ul> |
131 | <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.unread'|trans }}</a></li> | 131 | <li><a href="{{ path('unread_feed', {'username': feed.username, 'token': feed.token}) }}">{{ 'config.form_feed.feed_link.unread'|trans }}</a></li> |
132 | <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.starred'|trans }}</a></li> | 132 | <li><a href="{{ path('starred_feed', {'username': feed.username, 'token': feed.token}) }}">{{ 'config.form_feed.feed_link.starred'|trans }}</a></li> |
133 | <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.archive'|trans }}</a></li> | 133 | <li><a href="{{ path('archive_feed', {'username': feed.username, 'token': feed.token}) }}">{{ 'config.form_feed.feed_link.archive'|trans }}</a></li> |
134 | <li><a href="{{ path('all_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.all'|trans }}</a></li> | 134 | <li><a href="{{ path('all_feed', {'username': feed.username, 'token': feed.token}) }}">{{ 'config.form_feed.feed_link.all'|trans }}</a></li> |
135 | </ul> | 135 | </ul> |
136 | </div> | 136 | </div> |
137 | </fieldset> | 137 | </fieldset> |
@@ -139,13 +139,13 @@ | |||
139 | 139 | ||
140 | <fieldset class="w500p inline"> | 140 | <fieldset class="w500p inline"> |
141 | <div class="row"> | 141 | <div class="row"> |
142 | {{ form_label(form.rss.rss_limit) }} | 142 | {{ form_label(form.feed.feed_limit) }} |
143 | {{ form_errors(form.rss.rss_limit) }} | 143 | {{ form_errors(form.feed.feed_limit) }} |
144 | {{ form_widget(form.rss.rss_limit) }} | 144 | {{ form_widget(form.feed.feed_limit) }} |
145 | </div> | 145 | </div> |
146 | </fieldset> | 146 | </fieldset> |
147 | 147 | ||
148 | {{ form_rest(form.rss) }} | 148 | {{ form_rest(form.feed) }} |
149 | </form> | 149 | </form> |
150 | 150 | ||
151 | <h2>{{ 'config.tab_menu.user_info'|trans }}</h2> | 151 | <h2>{{ 'config.tab_menu.user_info'|trans }}</h2> |
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 6424df8d..61eeb021 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | {% block head %} | 3 | {% block head %} |
4 | {{ parent() }} | 4 | {{ parent() }} |
5 | {% if tag is defined and app.user.config.rssToken %} | 5 | {% if tag is defined and app.user.config.feedToken %} |
6 | <link rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" /> | 6 | <link rel="alternate" type="application/atom+xml" href="{{ path('tag_feed', {'username': app.user.username, 'token': app.user.config.feedToken, 'slug': tag.slug}) }}" /> |
7 | {% endif %} | 7 | {% endif %} |
8 | {% endblock %} | 8 | {% endblock %} |
9 | 9 | ||
@@ -25,8 +25,8 @@ | |||
25 | <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> |
26 | <div class="pagination"> | 26 | <div class="pagination"> |
27 | <a href="{{ path('switch_view_mode') }}"><i class="listMode-btn material-icons md-24">{% if listMode == 0 %}list{% else %}view_module{% endif %}</i></a> | 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> |
28 | {% if app.user.config.rssToken %} | 28 | {% if app.user.config.feedToken %} |
29 | {% include "@WallabagCore/themes/common/Entry/_rss_link.html.twig" %} | 29 | {% include "@WallabagCore/themes/common/Entry/_feed_link.html.twig" %} |
30 | {% endif %} | 30 | {% endif %} |
31 | <i class="btn-clickable download-btn material-icons md-24 js-export-action">file_download</i> | 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> | 32 | <i class="btn-clickable filter-btn material-icons md-24 js-filters-action">filter_list</i> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig index 070d5629..dd2915d3 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 | |||
@@ -11,7 +11,7 @@ | |||
11 | {% for tag in tags %} | 11 | {% for tag in tags %} |
12 | <li id="tag-{{ tag.id|e }}"> | 12 | <li id="tag-{{ tag.id|e }}"> |
13 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.nbEntries }})</a> | 13 | <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.nbEntries }})</a> |
14 | <a rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" class="right"> | 14 | <a rel="alternate" type="application/atom+xml" href="{{ path('tag_feed', {'username': app.user.username, 'token': app.user.config.feedToken, 'slug': tag.slug}) }}" class="right"> |
15 | <i class="material-icons md-24">rss_feed</i> | 15 | <i class="material-icons md-24">rss_feed</i> |
16 | </a> | 16 | </a> |
17 | </li> | 17 | </li> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_feed_link.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_feed_link.html.twig new file mode 100644 index 00000000..bbe9c89d --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_feed_link.html.twig | |||
@@ -0,0 +1,6 @@ | |||
1 | {% if tag is defined %} | ||
2 | <a rel="alternate" type="application/atom+xml" href="{{ path('tag_feed', {'username': app.user.username, 'token': app.user.config.feedToken, 'slug': tag.slug}) }}" class="right"><i class="material-icons md-24">rss_feed</i></a> | ||
3 | {% elseif currentRoute in ['unread', 'starred', 'archive', 'all'] %} | ||
4 | <a rel="alternate" type="application/atom+xml" href="{{ path(currentRoute ~ '_rss', {'username': app.user.username, 'token': app.user.config.feedToken}) }}" class="right"><i class="material-icons">rss_feed</i></a> | ||
5 | {% endif %} | ||
6 | |||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_rss_link.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_rss_link.html.twig deleted file mode 100644 index 2bf9b2bd..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_rss_link.html.twig +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | {% if tag is defined %} | ||
2 | <a rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" class="right"><i class="material-icons md-24">rss_feed</i></a> | ||
3 | {% elseif currentRoute in ['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 0a0131cd..f5b84355 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,12 +1,19 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <feed xmlns="http://www.w3.org/2005/Atom"> | 2 | <feed xmlns="http://www.w3.org/2005/Atom"> |
3 | <title>wallabag — {{type}} feed</title> | 3 | {% if type != 'tag' %} |
4 | <subtitle type="html">RSS feed for {{ type }} entries</subtitle> | 4 | <title>wallabag — {{type}} feed</title> |
5 | <subtitle type="html">Atom feed for {{ type }} entries</subtitle> | ||
6 | <id>wallabag:{{ domainName | removeScheme | removeWww }}:{{ user }}:{{ type }}</id> | ||
7 | <link rel="alternate" type="text/html" href="{{ url(type) }}"/> | ||
8 | {% else %} | ||
9 | <id>wallabag:{{ domainName | removeScheme | removeWww }}:{{ user }}:{{ type }}:{{ tag }}</id> | ||
10 | <link rel="alternate" type="text/html" href="{{ url('tag_entries', {'slug': tag}) }}"/> | ||
11 | <title>wallabag — {{type}} {{ tag }} feed</title> | ||
12 | <subtitle type="html">Atom feed for entries tagged with {{ tag }}</subtitle> | ||
13 | {% endif %} | ||
5 | {% if entries | length > 0 %} | 14 | {% if entries | length > 0 %} |
6 | <updated>{{ (entries | first).createdAt | date('c') }}</updated> {# Indicates the last time the feed was modified in a significant way. #} | 15 | <updated>{{ (entries | first).createdAt | date('c') }}</updated> {# Indicates the last time the feed was modified in a significant way. #} |
7 | {% endif %} | 16 | {% endif %} |
8 | <id>wallabag:{{ domainName | removeScheme | removeWww }}:{{ user }}:{{ type }}</id> | ||
9 | <link rel="alternate" type="text/html" href="{{ url(type) }}"/> | ||
10 | <link rel="self" type="application/atom+xml" href="{{ app.request.uri }}"/> | 17 | <link rel="self" type="application/atom+xml" href="{{ app.request.uri }}"/> |
11 | {% if entries.hasPreviousPage %} | 18 | {% if entries.hasPreviousPage %} |
12 | <link rel="previous" href="{{ url }}/{{ entries.previousPage }}"/> | 19 | <link rel="previous" href="{{ url }}/{{ entries.previousPage }}"/> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig index 4580813c..521b3eea 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig | |||
@@ -21,7 +21,7 @@ | |||
21 | <div class="card-action"> | 21 | <div class="card-action"> |
22 | <ul> | 22 | <ul> |
23 | <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li> | 23 | <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li> |
24 | <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.rss'|trans }}</a></li> | 24 | <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.feed'|trans }}</a></li> |
25 | <li><a href="{{ path('config') }}#set5">{{ 'quickstart.more'|trans }}</a></li> | 25 | <li><a href="{{ path('config') }}#set5">{{ 'quickstart.more'|trans }}</a></li> |
26 | </ul> | 26 | </ul> |
27 | </div> | 27 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index a8143315..7b9b4f58 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig | |||
@@ -12,7 +12,7 @@ | |||
12 | <div class="div_tabs col s12"> | 12 | <div class="div_tabs col s12"> |
13 | <ul class="tabs"> | 13 | <ul class="tabs"> |
14 | <li class="tab col s12 m6 l3"><a class="active" href="#set1">{{ 'config.tab_menu.settings'|trans }}</a></li> | 14 | <li class="tab col s12 m6 l3"><a class="active" href="#set1">{{ 'config.tab_menu.settings'|trans }}</a></li> |
15 | <li class="tab col s12 m6 l3"><a href="#set2">{{ 'config.tab_menu.rss'|trans }}</a></li> | 15 | <li class="tab col s12 m6 l3"><a href="#set2">{{ 'config.tab_menu.feed'|trans }}</a></li> |
16 | <li class="tab col s12 m6 l3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li> | 16 | <li class="tab col s12 m6 l3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li> |
17 | <li class="tab col s12 m6 l3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li> | 17 | <li class="tab col s12 m6 l3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li> |
18 | <li class="tab col s12 m6 l3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li> | 18 | <li class="tab col s12 m6 l3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li> |
@@ -122,42 +122,42 @@ | |||
122 | </div> | 122 | </div> |
123 | 123 | ||
124 | <div id="set2" class="col s12"> | 124 | <div id="set2" class="col s12"> |
125 | {{ form_start(form.rss) }} | 125 | {{ form_start(form.feed) }} |
126 | {{ form_errors(form.rss) }} | 126 | {{ form_errors(form.feed) }} |
127 | 127 | ||
128 | <div class="row"> | 128 | <div class="row"> |
129 | <div class="input-field col s12"> | 129 | <div class="input-field col s12"> |
130 | {{ 'config.form_rss.description'|trans }} | 130 | {{ 'config.form_feed.description'|trans }} |
131 | </div> | 131 | </div> |
132 | </div> | 132 | </div> |
133 | 133 | ||
134 | <div class="row"> | 134 | <div class="row"> |
135 | <div class="col s12"> | 135 | <div class="col s12"> |
136 | <h6 class="grey-text">{{ 'config.form_rss.token_label'|trans }}</h6> | 136 | <h6 class="grey-text">{{ 'config.form_feed.token_label'|trans }}</h6> |
137 | <div> | 137 | <div> |
138 | {% if rss.token %} | 138 | {% if feed.token %} |
139 | {{ rss.token }} | 139 | {{ feed.token }} |
140 | {% else %} | 140 | {% else %} |
141 | <em>{{ 'config.form_rss.no_token'|trans }}</em> | 141 | <em>{{ 'config.form_feed.no_token'|trans }}</em> |
142 | {% endif %} | 142 | {% endif %} |
143 | – <a href="{{ path('generate_token') }}"> | 143 | – <a href="{{ path('generate_token') }}"> |
144 | {% if rss.token %} | 144 | {% if feed.token %} |
145 | {{ 'config.form_rss.token_reset'|trans }} | 145 | {{ 'config.form_feed.token_reset'|trans }} |
146 | {% else %} | 146 | {% else %} |
147 | {{ 'config.form_rss.token_create'|trans }} | 147 | {{ 'config.form_feed.token_create'|trans }} |
148 | {% endif %}</a> | 148 | {% endif %}</a> |
149 | </div> | 149 | </div> |
150 | </div> | 150 | </div> |
151 | </div> | 151 | </div> |
152 | {% if rss.token %} | 152 | {% if feed.token %} |
153 | <div class="row"> | 153 | <div class="row"> |
154 | <div class="col s12"> | 154 | <div class="col s12"> |
155 | <h6 class="grey-text">{{ 'config.form_rss.rss_links'|trans }}</h6> | 155 | <h6 class="grey-text">{{ 'config.form_feed.feed_links'|trans }}</h6> |
156 | <ul> | 156 | <ul> |
157 | <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.unread'|trans }}</a></li> | 157 | <li><a href="{{ path('unread_feed', {'username': feed.username, 'token': feed.token}) }}">{{ 'config.form_feed.feed_link.unread'|trans }}</a></li> |
158 | <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.starred'|trans }}</a></li> | 158 | <li><a href="{{ path('starred_feed', {'username': feed.username, 'token': feed.token}) }}">{{ 'config.form_feed.feed_link.starred'|trans }}</a></li> |
159 | <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.archive'|trans }}</a></li> | 159 | <li><a href="{{ path('archive_feed', {'username': feed.username, 'token': feed.token}) }}">{{ 'config.form_feed.feed_link.archive'|trans }}</a></li> |
160 | <li><a href="{{ path('all_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.all'|trans }}</a></li> | 160 | <li><a href="{{ path('all_feed', {'username': feed.username, 'token': feed.token}) }}">{{ 'config.form_feed.feed_link.all'|trans }}</a></li> |
161 | </ul> | 161 | </ul> |
162 | </div> | 162 | </div> |
163 | </div> | 163 | </div> |
@@ -165,14 +165,14 @@ | |||
165 | 165 | ||
166 | <div class="row"> | 166 | <div class="row"> |
167 | <div class="input-field col s12"> | 167 | <div class="input-field col s12"> |
168 | {{ form_label(form.rss.rss_limit) }} | 168 | {{ form_label(form.feed.feed_limit) }} |
169 | {{ form_errors(form.rss.rss_limit) }} | 169 | {{ form_errors(form.feed.feed_limit) }} |
170 | {{ form_widget(form.rss.rss_limit) }} | 170 | {{ form_widget(form.feed.feed_limit) }} |
171 | </div> | 171 | </div> |
172 | </div> | 172 | </div> |
173 | 173 | ||
174 | {{ form_widget(form.rss.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | 174 | {{ form_widget(form.feed.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} |
175 | {{ form_rest(form.rss) }} | 175 | {{ form_rest(form.feed) }} |
176 | </form> | 176 | </form> |
177 | </div> | 177 | </div> |
178 | 178 | ||
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 0c4dc80b..dc0fca38 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | {% block head %} | 3 | {% block head %} |
4 | {{ parent() }} | 4 | {{ parent() }} |
5 | {% if tag is defined and app.user.config.rssToken %} | 5 | {% if tag is defined and app.user.config.feedToken %} |
6 | <link rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" /> | 6 | <link rel="alternate" type="application/atom+xml" href="{{ path('tag_feed', {'username': app.user.username, 'token': app.user.config.feedToken, 'slug': tag.slug}) }}" /> |
7 | {% endif %} | 7 | {% endif %} |
8 | {% endblock %} | 8 | {% endblock %} |
9 | 9 | ||
@@ -25,8 +25,8 @@ | |||
25 | <div class="nb-results left"> | 25 | <div class="nb-results left"> |
26 | {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} | 26 | {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} |
27 | <a href="{{ path('switch_view_mode') }}"><i class="material-icons">{% if listMode == 0 %}view_list{% else %}view_module{% endif %}</i></a> | 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 %} | 28 | {% if app.user.config.feedToken %} |
29 | {% include "@WallabagCore/themes/common/Entry/_rss_link.html.twig" %} | 29 | {% include "@WallabagCore/themes/common/Entry/_feed_link.html.twig" %} |
30 | {% endif %} | 30 | {% endif %} |
31 | </div> | 31 | </div> |
32 | {% if entries.getNbPages > 1 %} | 32 | {% if entries.getNbPages > 1 %} |
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 97ddedc9..8e93bdc8 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,8 +14,8 @@ | |||
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 %} | 17 | {% if app.user.config.feedToken %} |
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> | 18 | <a rel="alternate" type="application/atom+xml" href="{{ path('tag_feed', {'username': app.user.username, 'token': app.user.config.feedToken, 'slug': tag.slug}) }}" class="right"><i class="material-icons">rss_feed</i></a> |
19 | {% endif %} | 19 | {% endif %} |
20 | </li> | 20 | </li> |
21 | {% endfor %} | 21 | {% endfor %} |