aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
-rw-r--r--src/Wallabag/CoreBundle/Resources/config/services.yml7
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml15
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml15
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml15
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml15
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml15
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml19
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml15
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml93
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml15
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml15
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml15
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig31
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig28
14 files changed, 272 insertions, 41 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 614488a6..cc5f9e9a 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -129,3 +129,10 @@ services:
129 arguments: 129 arguments:
130 - '@twig' 130 - '@twig'
131 - '%kernel.debug%' 131 - '%kernel.debug%'
132
133 wallabag_core.subscriber.sqlite_cascade_delete:
134 class: Wallabag\CoreBundle\Subscriber\SQLiteCascadeDeleteSubscriber
135 arguments:
136 - "@doctrine"
137 tags:
138 - { name: doctrine.event_subscriber }
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 714ced14..c0595583 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -88,6 +88,18 @@ config:
88 name_label: 'Navn' 88 name_label: 'Navn'
89 email_label: 'Emailadresse' 89 email_label: 'Emailadresse'
90 # twoFactorAuthentication_label: 'Two factor authentication' 90 # twoFactorAuthentication_label: 'Two factor authentication'
91 delete:
92 # title: Delete my account (a.k.a danger zone)
93 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
94 # confirm: Are you really sure? (THIS CAN'T BE UNDONE)
95 # button: Delete my account
96 reset:
97 # title: Reset area (a.k.a danger zone)
98 # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
99 # annotations: Remove ALL annotations
100 # tags: Remove ALL tags
101 # entries: Remove ALL entries
102 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
91 form_password: 103 form_password:
92 old_password_label: 'Gammel adgangskode' 104 old_password_label: 'Gammel adgangskode'
93 new_password_label: 'Ny adgangskode' 105 new_password_label: 'Ny adgangskode'
@@ -460,6 +472,9 @@ flashes:
460 # tagging_rules_deleted: 'Tagging rule deleted' 472 # tagging_rules_deleted: 'Tagging rule deleted'
461 # user_added: 'User "%username%" added' 473 # user_added: 'User "%username%" added'
462 # rss_token_updated: 'RSS token updated' 474 # rss_token_updated: 'RSS token updated'
475 # annotations_reset: Annotations reset
476 # tags_reset: Tags reset
477 # entries_reset: Entries reset
463 entry: 478 entry:
464 notice: 479 notice:
465 # entry_already_saved: 'Entry already saved on %date%' 480 # entry_already_saved: 'Entry already saved on %date%'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 57e49f84..0051da2f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -88,6 +88,18 @@ config:
88 name_label: 'Name' 88 name_label: 'Name'
89 email_label: 'E-Mail-Adresse' 89 email_label: 'E-Mail-Adresse'
90 twoFactorAuthentication_label: 'Zwei-Faktor-Authentifizierung' 90 twoFactorAuthentication_label: 'Zwei-Faktor-Authentifizierung'
91 delete:
92 # title: Delete my account (a.k.a danger zone)
93 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
94 # confirm: Are you really sure? (THIS CAN'T BE UNDONE)
95 # button: Delete my account
96 reset:
97 # title: Reset area (a.k.a danger zone)
98 # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
99 # annotations: Remove ALL annotations
100 # tags: Remove ALL tags
101 # entries: Remove ALL entries
102 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
91 form_password: 103 form_password:
92 old_password_label: 'Altes Kennwort' 104 old_password_label: 'Altes Kennwort'
93 new_password_label: 'Neues Kennwort' 105 new_password_label: 'Neues Kennwort'
@@ -460,6 +472,9 @@ flashes:
460 tagging_rules_deleted: 'Tagging-Regel gelöscht' 472 tagging_rules_deleted: 'Tagging-Regel gelöscht'
461 user_added: 'Benutzer "%username%" erstellt' 473 user_added: 'Benutzer "%username%" erstellt'
462 rss_token_updated: 'RSS-Token aktualisiert' 474 rss_token_updated: 'RSS-Token aktualisiert'
475 # annotations_reset: Annotations reset
476 # tags_reset: Tags reset
477 # entries_reset: Entries reset
463 entry: 478 entry:
464 notice: 479 notice:
465 entry_already_saved: 'Eintrag bereits am %date% gespeichert' 480 entry_already_saved: 'Eintrag bereits am %date% gespeichert'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 4a59c75e..462be556 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -88,6 +88,18 @@ config:
88 name_label: 'Name' 88 name_label: 'Name'
89 email_label: 'Email' 89 email_label: 'Email'
90 twoFactorAuthentication_label: 'Two factor authentication' 90 twoFactorAuthentication_label: 'Two factor authentication'
91 delete:
92 title: Delete my account (a.k.a danger zone)
93 description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
94 confirm: Are you really sure? (THIS CAN'T BE UNDONE)
95 button: Delete my account
96 reset:
97 title: Reset area (a.k.a danger zone)
98 description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
99 annotations: Remove ALL annotations
100 tags: Remove ALL tags
101 entries: Remove ALL entries
102 confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
91 form_password: 103 form_password:
92 old_password_label: 'Current password' 104 old_password_label: 'Current password'
93 new_password_label: 'New password' 105 new_password_label: 'New password'
@@ -459,6 +471,9 @@ flashes:
459 tagging_rules_updated: 'Tagging rules updated' 471 tagging_rules_updated: 'Tagging rules updated'
460 tagging_rules_deleted: 'Tagging rule deleted' 472 tagging_rules_deleted: 'Tagging rule deleted'
461 rss_token_updated: 'RSS token updated' 473 rss_token_updated: 'RSS token updated'
474 annotations_reset: Annotations reset
475 tags_reset: Tags reset
476 entries_reset: Entries reset
462 entry: 477 entry:
463 notice: 478 notice:
464 entry_already_saved: 'Entry already saved on %date%' 479 entry_already_saved: 'Entry already saved on %date%'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 1b1e0cb1..cfabe09f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -88,6 +88,18 @@ config:
88 name_label: 'Nombre' 88 name_label: 'Nombre'
89 email_label: 'Direccion e-mail' 89 email_label: 'Direccion e-mail'
90 twoFactorAuthentication_label: 'Autentificación de dos factores' 90 twoFactorAuthentication_label: 'Autentificación de dos factores'
91 delete:
92 # title: Delete my account (a.k.a danger zone)
93 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
94 # confirm: Are you really sure? (THIS CAN'T BE UNDONE)
95 # button: Delete my account
96 reset:
97 # title: Reset area (a.k.a danger zone)
98 # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
99 # annotations: Remove ALL annotations
100 # tags: Remove ALL tags
101 # entries: Remove ALL entries
102 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
91 form_password: 103 form_password:
92 old_password_label: 'Contraseña actual' 104 old_password_label: 'Contraseña actual'
93 new_password_label: 'Nueva contraseña' 105 new_password_label: 'Nueva contraseña'
@@ -460,6 +472,9 @@ flashes:
460 tagging_rules_deleted: 'Regla de etiquetado actualizada' 472 tagging_rules_deleted: 'Regla de etiquetado actualizada'
461 user_added: 'Usuario "%username%" añadido' 473 user_added: 'Usuario "%username%" añadido'
462 rss_token_updated: 'RSS token actualizado' 474 rss_token_updated: 'RSS token actualizado'
475 # annotations_reset: Annotations reset
476 # tags_reset: Tags reset
477 # entries_reset: Entries reset
463 entry: 478 entry:
464 notice: 479 notice:
465 entry_already_saved: 'Entrada ya guardada por %fecha%' 480 entry_already_saved: 'Entrada ya guardada por %fecha%'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 41dc8acf..07b5bee7 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -88,6 +88,18 @@ config:
88 name_label: 'نام' 88 name_label: 'نام'
89 email_label: 'نشانی ایمیل' 89 email_label: 'نشانی ایمیل'
90 twoFactorAuthentication_label: 'تأیید ۲مرحله‌ای' 90 twoFactorAuthentication_label: 'تأیید ۲مرحله‌ای'
91 delete:
92 # title: Delete my account (a.k.a danger zone)
93 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
94 # confirm: Are you really sure? (THIS CAN'T BE UNDONE)
95 # button: Delete my account
96 reset:
97 # title: Reset area (a.k.a danger zone)
98 # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
99 # annotations: Remove ALL annotations
100 # tags: Remove ALL tags
101 # entries: Remove ALL entries
102 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
91 form_password: 103 form_password:
92 old_password_label: 'رمز قدیمی' 104 old_password_label: 'رمز قدیمی'
93 new_password_label: 'رمز تازه' 105 new_password_label: 'رمز تازه'
@@ -459,6 +471,9 @@ flashes:
459 tagging_rules_deleted: 'قانون برچسب‌گذاری پاک شد' 471 tagging_rules_deleted: 'قانون برچسب‌گذاری پاک شد'
460 user_added: 'کابر "%username%" افزوده شد' 472 user_added: 'کابر "%username%" افزوده شد'
461 rss_token_updated: 'کد آر-اس-اس به‌روز شد' 473 rss_token_updated: 'کد آر-اس-اس به‌روز شد'
474 # annotations_reset: Annotations reset
475 # tags_reset: Tags reset
476 # entries_reset: Entries reset
462 entry: 477 entry:
463 notice: 478 notice:
464 entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود' 479 entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 7fb9681d..db6f9f7e 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -88,6 +88,18 @@ config:
88 name_label: 'Nom' 88 name_label: 'Nom'
89 email_label: 'Adresse e-mail' 89 email_label: 'Adresse e-mail'
90 twoFactorAuthentication_label: 'Double authentification' 90 twoFactorAuthentication_label: 'Double authentification'
91 delete:
92 title: Supprimer mon compte (attention danger !)
93 description: Si vous confirmez la suppression de votre compte, TOUS les articles, TOUS les tags, TOUTES les annotations et votre compte seront DÉFINITIVEMENT supprimé (c'est IRRÉVERSIBLE). Vous serez ensuite déconnecté.
94 confirm: Vous êtes vraiment sûr ? (C'EST IRRÉVERSIBLE)
95 button: 'Supprimer mon compte'
96 reset:
97 title: Réinitialisation (attention danger !)
98 description: En cliquant sur les boutons ci-dessous vous avez la possibilité de supprimer certaines informations de votre compte. Attention, ces actions sont IRRÉVERSIBLES !
99 annotations: Supprimer TOUTES les annotations
100 tags: Supprimer TOUS les tags
101 entries: Supprimer TOUS les articles
102 confirm: Êtes-vous vraiment vraiment sûr ? (C'EST IRRÉVERSIBLE)
91 form_password: 103 form_password:
92 old_password_label: 'Mot de passe actuel' 104 old_password_label: 'Mot de passe actuel'
93 new_password_label: 'Nouveau mot de passe' 105 new_password_label: 'Nouveau mot de passe'
@@ -386,7 +398,7 @@ developer:
386 field_grant_types: 'Type de privilège accordé' 398 field_grant_types: 'Type de privilège accordé'
387 no_client: 'Aucun client pour le moment' 399 no_client: 'Aucun client pour le moment'
388 remove: 400 remove:
389 warn_message_1: 'Vous avez la possibilité de supprimer le client %name%. Cette action est IRREVERSIBLE !' 401 warn_message_1: 'Vous avez la possibilité de supprimer le client %name%. Cette action est IRRÉVERSIBLE !'
390 warn_message_2: "Si vous supprimez le client %name%, toutes les applications qui l'utilisaient ne fonctionneront plus avec votre compte wallabag." 402 warn_message_2: "Si vous supprimez le client %name%, toutes les applications qui l'utilisaient ne fonctionneront plus avec votre compte wallabag."
391 action: 'Supprimer le client %name%' 403 action: 'Supprimer le client %name%'
392 client: 404 client:
@@ -460,9 +472,12 @@ flashes:
460 tagging_rules_deleted: 'Règle supprimée' 472 tagging_rules_deleted: 'Règle supprimée'
461 user_added: 'Utilisateur "%username%" ajouté' 473 user_added: 'Utilisateur "%username%" ajouté'
462 rss_token_updated: 'Jeton RSS mis à jour' 474 rss_token_updated: 'Jeton RSS mis à jour'
475 annotations_reset: Annotations supprimées
476 tags_reset: Tags supprimés
477 entries_reset: Articles supprimés
463 entry: 478 entry:
464 notice: 479 notice:
465 entry_already_saved: 'Article déjà sauvergardé le %date%' 480 entry_already_saved: 'Article déjà sauvegardé le %date%'
466 entry_saved: 'Article enregistré' 481 entry_saved: 'Article enregistré'
467 entry_saved_failed: 'Article enregistré mais impossible de récupérer le contenu' 482 entry_saved_failed: 'Article enregistré mais impossible de récupérer le contenu'
468 entry_updated: 'Article mis à jour' 483 entry_updated: 'Article mis à jour'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index b279ae40..f1aff51a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -88,6 +88,18 @@ config:
88 name_label: 'Nome' 88 name_label: 'Nome'
89 email_label: 'E-mail' 89 email_label: 'E-mail'
90 twoFactorAuthentication_label: 'Two factor authentication' 90 twoFactorAuthentication_label: 'Two factor authentication'
91 delete:
92 # title: Delete my account (a.k.a danger zone)
93 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
94 # confirm: Are you really sure? (THIS CAN'T BE UNDONE)
95 # button: Delete my account
96 reset:
97 # title: Reset area (a.k.a danger zone)
98 # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
99 # annotations: Remove ALL annotations
100 # tags: Remove ALL tags
101 # entries: Remove ALL entries
102 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
91 form_password: 103 form_password:
92 old_password_label: 'Password corrente' 104 old_password_label: 'Password corrente'
93 new_password_label: 'Nuova password' 105 new_password_label: 'Nuova password'
@@ -460,6 +472,9 @@ flashes:
460 tagging_rules_deleted: 'Regola di tagging aggiornate' 472 tagging_rules_deleted: 'Regola di tagging aggiornate'
461 user_added: 'Utente "%username%" aggiunto' 473 user_added: 'Utente "%username%" aggiunto'
462 rss_token_updated: 'RSS token aggiornato' 474 rss_token_updated: 'RSS token aggiornato'
475 # annotations_reset: Annotations reset
476 # tags_reset: Tags reset
477 # entries_reset: Entries reset
463 entry: 478 entry:
464 notice: 479 notice:
465 entry_already_saved: 'Contenuto già salvato in data %date%' 480 entry_already_saved: 'Contenuto già salvato in data %date%'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index a4659620..e0567d7e 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -25,13 +25,13 @@ menu:
25 internal_settings: 'Configuracion interna' 25 internal_settings: 'Configuracion interna'
26 import: 'Importar' 26 import: 'Importar'
27 howto: 'Ajuda' 27 howto: 'Ajuda'
28 developer: 'Desvolopador' 28 developer: 'Desvolopaire'
29 logout: 'Desconnexion' 29 logout: 'Desconnexion'
30 about: 'A prepaus' 30 about: 'A prepaus'
31 search: 'Cercar' 31 search: 'Cercar'
32 save_link: 'Enregistrar un novèl article' 32 save_link: 'Enregistrar un novèl article'
33 back_to_unread: 'Tornar als articles pas legits' 33 back_to_unread: 'Tornar als articles pas legits'
34 # users_management: 'Users management' 34 users_management: 'Gestion dels utilizaires'
35 top: 35 top:
36 add_new_entry: 'Enregistrar un novèl article' 36 add_new_entry: 'Enregistrar un novèl article'
37 search: 'Cercar' 37 search: 'Cercar'
@@ -46,7 +46,7 @@ footer:
46 social: 'Social' 46 social: 'Social'
47 powered_by: 'propulsat per' 47 powered_by: 'propulsat per'
48 about: 'A prepaus' 48 about: 'A prepaus'
49 # stats: Since %user_creation% you read %nb_archives% articles. That is about %per_day% a day! 49 stats: "Dempuèi %user_creation% avètz legit %nb_archives% articles. Es a l'entorn de %per_day% per jorn !"
50 50
51config: 51config:
52 page_title: 'Configuracion' 52 page_title: 'Configuracion'
@@ -88,6 +88,18 @@ config:
88 name_label: 'Nom' 88 name_label: 'Nom'
89 email_label: 'Adreça de corrièl' 89 email_label: 'Adreça de corrièl'
90 twoFactorAuthentication_label: 'Dobla autentificacion' 90 twoFactorAuthentication_label: 'Dobla autentificacion'
91 delete:
92 # title: Delete my account (a.k.a danger zone)
93 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
94 # confirm: Are you really sure? (THIS CAN'T BE UNDONE)
95 # button: Delete my account
96 reset:
97 # title: Reset area (a.k.a danger zone)
98 # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
99 # annotations: Remove ALL annotations
100 # tags: Remove ALL tags
101 # entries: Remove ALL entries
102 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
91 form_password: 103 form_password:
92 old_password_label: 'Senhal actual' 104 old_password_label: 'Senhal actual'
93 new_password_label: 'Senhal novèl' 105 new_password_label: 'Senhal novèl'
@@ -96,7 +108,7 @@ config:
96 if_label: 'se' 108 if_label: 'se'
97 then_tag_as_label: 'alara atribuir las etiquetas' 109 then_tag_as_label: 'alara atribuir las etiquetas'
98 delete_rule_label: 'suprimir' 110 delete_rule_label: 'suprimir'
99 # edit_rule_label: 'edit' 111 edit_rule_label: 'modificar'
100 rule_label: 'Règla' 112 rule_label: 'Règla'
101 tags_label: 'Etiquetas' 113 tags_label: 'Etiquetas'
102 faq: 114 faq:
@@ -209,7 +221,7 @@ entry:
209 is_public_label: 'Public' 221 is_public_label: 'Public'
210 save_label: 'Enregistrar' 222 save_label: 'Enregistrar'
211 public: 223 public:
212 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 224 shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>"
213 225
214about: 226about:
215 page_title: 'A prepaus' 227 page_title: 'A prepaus'
@@ -265,14 +277,14 @@ howto:
265 277
266quickstart: 278quickstart:
267 page_title: 'Per ben començar' 279 page_title: 'Per ben començar'
268 # more: 'More…' 280 more: 'Mai…'
269 intro: 281 intro:
270 title: 'Benvenguda sus wallabag !' 282 title: 'Benvenguda sus wallabag !'
271 paragraph_1: "Anem vos guidar per far lo torn de la proprietat e vos presentar unas fonccionalitats que vos poirián interessar per vos apropriar aquesta aisina." 283 paragraph_1: "Anem vos guidar per far lo torn de la proprietat e vos presentar unas fonccionalitats que vos poirián interessar per vos apropriar aquesta aisina."
272 paragraph_2: 'Seguètz-nos ' 284 paragraph_2: 'Seguètz-nos '
273 configure: 285 configure:
274 title: "Configuratz l'aplicacio" 286 title: "Configuratz l'aplicacion"
275 # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' 287 description: "Per fin d'aver una aplicacion que vos va ben, anatz veire la configuracion de wallabag."
276 language: "Cambiatz la lenga e l'estil de l'aplicacion" 288 language: "Cambiatz la lenga e l'estil de l'aplicacion"
277 rss: 'Activatz los fluxes RSS' 289 rss: 'Activatz los fluxes RSS'
278 tagging_rules: 'Escrivètz de règlas per classar automaticament vòstres articles' 290 tagging_rules: 'Escrivètz de règlas per classar automaticament vòstres articles'
@@ -286,7 +298,7 @@ quickstart:
286 import: 'Configurar los impòrt' 298 import: 'Configurar los impòrt'
287 first_steps: 299 first_steps:
288 title: 'Primièrs passes' 300 title: 'Primièrs passes'
289 # description: "Now wallabag is well configured, it's time to archive the web. You can click on the top right sign + to add a link." 301 description: "Ara wallabag es ben configurat, es lo moment d'archivar lo web. Podètz clicar sul signe + a man drecha amont per ajustar un ligam."
290 new_article: 'Ajustatz vòstre primièr article' 302 new_article: 'Ajustatz vòstre primièr article'
291 unread_articles: 'E racaptatz-lo !' 303 unread_articles: 'E racaptatz-lo !'
292 migrate: 304 migrate:
@@ -298,14 +310,14 @@ quickstart:
298 readability: 'Migrar dempuèi Readability' 310 readability: 'Migrar dempuèi Readability'
299 instapaper: 'Migrar dempuèi Instapaper' 311 instapaper: 'Migrar dempuèi Instapaper'
300 developer: 312 developer:
301 title: 'Pels desvolopadors' 313 title: 'Pels desvolopaires'
302 # description: 'We also thought to the developers: Docker, API, translations, etc.' 314 description: 'Avèm tanben pensat als desvolopaires : Docker, API, traduccions, etc.'
303 create_application: 'Crear vòstra aplicacion tèrça' 315 create_application: 'Crear vòstra aplicacion tèrça'
304 # use_docker: 'Use Docker to install wallabag' 316 use_docker: 'Utilizar Docker per installar wallabag'
305 docs: 317 docs:
306 title: 'Documentacion complèta' 318 title: 'Documentacion complèta'
307 # description: "There are so much features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them." 319 description: "I a un fum de fonccionalitats dins wallabag. Esitetz pas a legir lo manual per las conéisser e aprendre a las utilizar."
308 annotate: 'Anotatar vòstre article' 320 annotate: 'Anotar vòstre article'
309 export: 'Convertissètz vòstres articles en ePub o en PDF' 321 export: 'Convertissètz vòstres articles en ePub o en PDF'
310 search_filters: "Aprenètz a utilizar lo motor de recèrca e los filtres per retrobar l'article que vos interèssa" 322 search_filters: "Aprenètz a utilizar lo motor de recèrca e los filtres per retrobar l'article que vos interèssa"
311 fetching_errors: "Qué far se mon article es pas recuperat coma cal ?" 323 fetching_errors: "Qué far se mon article es pas recuperat coma cal ?"
@@ -390,7 +402,7 @@ developer:
390 warn_message_2: "Se suprimissètz un client, totas las aplicacions que l'emplegan foncionaràn pas mai amb vòstre compte wallabag." 402 warn_message_2: "Se suprimissètz un client, totas las aplicacions que l'emplegan foncionaràn pas mai amb vòstre compte wallabag."
391 action: 'Suprimir aqueste client' 403 action: 'Suprimir aqueste client'
392 client: 404 client:
393 page_title: 'Desvlopador > Novèl client' 405 page_title: 'Desvolopaire > Novèl client'
394 page_description: "Anatz crear un novèl client. Mercés de cumplir l'url de redireccion cap a vòstra aplicacion." 406 page_description: "Anatz crear un novèl client. Mercés de cumplir l'url de redireccion cap a vòstra aplicacion."
395 form: 407 form:
396 name_label: "Nom del client" 408 name_label: "Nom del client"
@@ -398,7 +410,7 @@ developer:
398 save_label: 'Crear un novèl client' 410 save_label: 'Crear un novèl client'
399 action_back: 'Retorn' 411 action_back: 'Retorn'
400 client_parameter: 412 client_parameter:
401 page_title: 'Desvolopador > Los paramètres de vòstre client' 413 page_title: 'Desvolopaire > Los paramètres de vòstre client'
402 page_description: 'Vaquí los paramètres de vòstre client' 414 page_description: 'Vaquí los paramètres de vòstre client'
403 field_name: 'Nom del client' 415 field_name: 'Nom del client'
404 field_id: 'ID Client' 416 field_id: 'ID Client'
@@ -406,7 +418,7 @@ developer:
406 back: 'Retour' 418 back: 'Retour'
407 read_howto: 'Legir "cossí crear ma primièra aplicacion"' 419 read_howto: 'Legir "cossí crear ma primièra aplicacion"'
408 howto: 420 howto:
409 page_title: 'Desvolopador > Cossí crear ma primièra aplicacion' 421 page_title: 'Desvolopaire > Cossí crear ma primièra aplicacion'
410 description: 422 description:
411 paragraph_1: "Las comandas seguentas utilizan la <a href=\"https://github.com/jkbrzt/httpie\">bibliotèca HTTPie</a>. Asseguratz-vos que siasqueòu installadas abans de l'utilizar." 423 paragraph_1: "Las comandas seguentas utilizan la <a href=\"https://github.com/jkbrzt/httpie\">bibliotèca HTTPie</a>. Asseguratz-vos que siasqueòu installadas abans de l'utilizar."
412 paragraph_2: "Vos cal un geton per escambiar entre vòstra aplicacion e l'API de wallabar." 424 paragraph_2: "Vos cal un geton per escambiar entre vòstra aplicacion e l'API de wallabar."
@@ -419,31 +431,31 @@ developer:
419 back: 'Retorn' 431 back: 'Retorn'
420 432
421user: 433user:
422 # page_title: Users management 434 page_title: 'Gestion dels utilizaires'
423 # new_user: Create a new user 435 new_user: 'Crear un novèl utilizaire'
424 # edit_user: Edit an existing user 436 edit_user: 'Modificar un utilizaire existent'
425 # description: "Here you can manage all users (create, edit and delete)" 437 description: "Aquí podètz gerir totes los utilizaires (crear, modificar e suprimir)"
426 # list: 438 list:
427 # actions: Actions 439 actions: 'Accions'
428 # edit_action: Edit 440 edit_action: 'Modificar'
429 # yes: Yes 441 yes: 'Òc'
430 # no: No 442 no: 'Non'
431 # create_new_one: Create a new user 443 create_new_one: 'Crear un novèl utilizaire'
432 form: 444 form:
433 username_label: "Nom d'utilizaire" 445 username_label: "Nom d'utilizaire"
434 # name_label: 'Name' 446 name_label: 'Nom'
435 password_label: 'Senhal' 447 password_label: 'Senhal'
436 repeat_new_password_label: 'Confirmatz vòstre novèl senhal' 448 repeat_new_password_label: 'Confirmatz vòstre novèl senhal'
437 plain_password_label: 'Senhal en clar' 449 plain_password_label: 'Senhal en clar'
438 email_label: 'Adreça de corrièl' 450 email_label: 'Adreça de corrièl'
439 # enabled_label: 'Enabled' 451 enabled_label: 'Actiu'
440 # locked_label: 'Locked' 452 locked_label: 'Varrolhat'
441 # last_login_label: 'Last login' 453 last_login_label: 'Darrièra connexion'
442 # twofactor_label: Two factor authentication 454 twofactor_label: 'Autentificacion doble-factor'
443 # save: Save 455 save: 'Enregistrar'
444 # delete: Delete 456 delete: 'Suprimir'
445 # delete_confirm: Are you sure? 457 delete_confirm: 'Sètz segur ?'
446 # back_to_list: Back to list 458 back_to_list: 'Tornar a la lista'
447 459
448error: 460error:
449 # page_title: An error occurred 461 # page_title: An error occurred
@@ -458,8 +470,11 @@ flashes:
458 rss_updated: 'La configuracion dels fluxes RSS es ben estada mesa a jorn' 470 rss_updated: 'La configuracion dels fluxes RSS es ben estada mesa a jorn'
459 tagging_rules_updated: 'Règlas misa a jorn' 471 tagging_rules_updated: 'Règlas misa a jorn'
460 tagging_rules_deleted: 'Règla suprimida' 472 tagging_rules_deleted: 'Règla suprimida'
461 user_added: 'Utilizaire "%username%" apondut' 473 user_added: 'Utilizaire "%username%" ajustat'
462 rss_token_updated: 'Geton RSS mes a jorn' 474 rss_token_updated: 'Geton RSS mes a jorn'
475 # annotations_reset: Annotations reset
476 # tags_reset: Tags reset
477 # entries_reset: Entries reset
463 entry: 478 entry:
464 notice: 479 notice:
465 entry_already_saved: 'Article ja salvargardat lo %date%' 480 entry_already_saved: 'Article ja salvargardat lo %date%'
@@ -470,12 +485,12 @@ flashes:
470 entry_reloaded_failed: "L'article es estat cargat de nòu mai la recuperacion del contengut a fracassat" 485 entry_reloaded_failed: "L'article es estat cargat de nòu mai la recuperacion del contengut a fracassat"
471 entry_archived: 'Article marcat coma legit' 486 entry_archived: 'Article marcat coma legit'
472 entry_unarchived: 'Article marcat coma pas legit' 487 entry_unarchived: 'Article marcat coma pas legit'
473 entry_starred: 'Article apondut dins los favorits' 488 entry_starred: 'Article ajustat dins los favorits'
474 entry_unstarred: 'Article quitat dels favorits' 489 entry_unstarred: 'Article quitat dels favorits'
475 entry_deleted: 'Article suprimit' 490 entry_deleted: 'Article suprimit'
476 tag: 491 tag:
477 notice: 492 notice:
478 tag_added: 'Etiqueta aponduda' 493 tag_added: 'Etiqueta ajustada'
479 import: 494 import:
480 notice: 495 notice:
481 failed: "L'importacion a fracassat, mercés de tornar ensajar" 496 failed: "L'importacion a fracassat, mercés de tornar ensajar"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 798b39c2..8eef998b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -88,6 +88,18 @@ config:
88 name_label: 'Nazwa' 88 name_label: 'Nazwa'
89 email_label: 'Adres email' 89 email_label: 'Adres email'
90 twoFactorAuthentication_label: 'Autoryzacja dwuetapowa' 90 twoFactorAuthentication_label: 'Autoryzacja dwuetapowa'
91 delete:
92 title: Usuń moje konto (niebezpieczna strefa !)
93 description: Jeżeli usuniesz swoje konto, wszystkie twoje artykuły, tagi, adnotacje, oraz konto zostaną trwale usunięte (operacja jest NIEODWRACALNA). Następnie zostaniesz wylogowany.
94 confirm: Jesteś pewien? (tej operacji NIE MOŻNA cofnąć)
95 button: Usuń moje konto
96 reset:
97 # title: Reset area (a.k.a danger zone)
98 # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
99 # annotations: Remove ALL annotations
100 # tags: Remove ALL tags
101 # entries: Remove ALL entries
102 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
91 form_password: 103 form_password:
92 old_password_label: 'Stare hasło' 104 old_password_label: 'Stare hasło'
93 new_password_label: 'Nowe hasło' 105 new_password_label: 'Nowe hasło'
@@ -460,6 +472,9 @@ flashes:
460 tagging_rules_deleted: 'Reguła tagowania usunięta' 472 tagging_rules_deleted: 'Reguła tagowania usunięta'
461 user_added: 'Użytkownik "%username%" dodany' 473 user_added: 'Użytkownik "%username%" dodany'
462 rss_token_updated: 'Token kanału RSS zaktualizowany' 474 rss_token_updated: 'Token kanału RSS zaktualizowany'
475 # annotations_reset: Annotations reset
476 # tags_reset: Tags reset
477 # entries_reset: Entries reset
463 entry: 478 entry:
464 notice: 479 notice:
465 entry_already_saved: 'Wpis już został dodany %date%' 480 entry_already_saved: 'Wpis już został dodany %date%'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 21f27e08..6e4813e5 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -88,6 +88,18 @@ config:
88 name_label: 'Nume' 88 name_label: 'Nume'
89 email_label: 'E-mail' 89 email_label: 'E-mail'
90 # twoFactorAuthentication_label: 'Two factor authentication' 90 # twoFactorAuthentication_label: 'Two factor authentication'
91 delete:
92 # title: Delete my account (a.k.a danger zone)
93 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
94 # confirm: Are you really sure? (THIS CAN'T BE UNDONE)
95 # button: Delete my account
96 reset:
97 # title: Reset area (a.k.a danger zone)
98 # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
99 # annotations: Remove ALL annotations
100 # tags: Remove ALL tags
101 # entries: Remove ALL entries
102 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
91 form_password: 103 form_password:
92 old_password_label: 'Parola veche' 104 old_password_label: 'Parola veche'
93 new_password_label: 'Parola nouă' 105 new_password_label: 'Parola nouă'
@@ -460,6 +472,9 @@ flashes:
460 # tagging_rules_deleted: 'Tagging rule deleted' 472 # tagging_rules_deleted: 'Tagging rule deleted'
461 # user_added: 'User "%username%" added' 473 # user_added: 'User "%username%" added'
462 # rss_token_updated: 'RSS token updated' 474 # rss_token_updated: 'RSS token updated'
475 # annotations_reset: Annotations reset
476 # tags_reset: Tags reset
477 # entries_reset: Entries reset
463 entry: 478 entry:
464 notice: 479 notice:
465 # entry_already_saved: 'Entry already saved on %date%' 480 # entry_already_saved: 'Entry already saved on %date%'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index f137ec99..76903102 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -88,6 +88,18 @@ config:
88 name_label: 'İsim' 88 name_label: 'İsim'
89 email_label: 'E-posta' 89 email_label: 'E-posta'
90 twoFactorAuthentication_label: 'İki adımlı doğrulama' 90 twoFactorAuthentication_label: 'İki adımlı doğrulama'
91 delete:
92 # title: Delete my account (a.k.a danger zone)
93 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
94 # confirm: Are you really sure? (THIS CAN'T BE UNDONE)
95 # button: Delete my account
96 reset:
97 # title: Reset area (a.k.a danger zone)
98 # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
99 # annotations: Remove ALL annotations
100 # tags: Remove ALL tags
101 # entries: Remove ALL entries
102 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
91 form_password: 103 form_password:
92 old_password_label: 'Eski şifre' 104 old_password_label: 'Eski şifre'
93 new_password_label: 'Yeni şifre' 105 new_password_label: 'Yeni şifre'
@@ -459,6 +471,9 @@ flashes:
459 tagging_rules_deleted: 'Tagging rule deleted' 471 tagging_rules_deleted: 'Tagging rule deleted'
460 user_added: 'User "%username%" added' 472 user_added: 'User "%username%" added'
461 rss_token_updated: 'RSS token updated' 473 rss_token_updated: 'RSS token updated'
474 # annotations_reset: Annotations reset
475 # tags_reset: Tags reset
476 # entries_reset: Entries reset
462 entry: 477 entry:
463 notice: 478 notice:
464 entry_already_saved: 'Entry already saved on %date%' 479 entry_already_saved: 'Entry already saved on %date%'
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 ff7ef73a..455d0295 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
@@ -146,10 +146,41 @@
146 </fieldset> 146 </fieldset>
147 {% endif %} 147 {% endif %}
148 148
149 <h2>{{ 'config.reset.title'|trans }}</h2>
150 <fieldset class="w500p inline">
151 <p>{{ 'config.reset.description'|trans }}</p>
152 <ul>
153 <li>
154 <a href="{{ path('config_reset', { type: 'annotations'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
155 {{ 'config.reset.annotations'|trans }}
156 </a>
157 </li>
158 <li>
159 <a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
160 {{ 'config.reset.tags'|trans }}
161 </a>
162 </li>
163 <li>
164 <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
165 {{ 'config.reset.entries'|trans }}
166 </a>
167 </li>
168 </ul>
169 </fieldset>
170
149 {{ form_widget(form.user._token) }} 171 {{ form_widget(form.user._token) }}
150 {{ form_widget(form.user.save) }} 172 {{ form_widget(form.user.save) }}
151 </form> 173 </form>
152 174
175 {% if enabled_users > 1 %}
176 <h2>{{ 'config.form_user.delete.title'|trans }}</h2>
177
178 <p>{{ 'config.form_user.delete.description'|trans }}</p>
179 <a href="{{ path('delete_account') }}" onclick="return confirm('{{ 'config.form_user.delete.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red delete-account">
180 {{ 'config.form_user.delete.button'|trans }}
181 </a>
182 {% endif %}
183
153 <h2>{{ 'config.tab_menu.password'|trans }}</h2> 184 <h2>{{ 'config.tab_menu.password'|trans }}</h2>
154 185
155 {{ form_start(form.pwd) }} 186 {{ form_start(form.pwd) }}
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 19faddc0..b53ae2fe 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
@@ -167,6 +167,34 @@
167 {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} 167 {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
168 {{ form_widget(form.user._token) }} 168 {{ form_widget(form.user._token) }}
169 </form> 169 </form>
170
171 <br /><hr /><br />
172
173 <div class="row">
174 <h5>{{ 'config.reset.title'|trans }}</h5>
175 <p>{{ 'config.reset.description'|trans }}</p>
176 <a href="{{ path('config_reset', { type: 'annotations'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
177 {{ 'config.reset.annotations'|trans }}
178 </a>
179 <a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
180 {{ 'config.reset.tags'|trans }}
181 </a>
182 <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
183 {{ 'config.reset.entries'|trans }}
184 </a>
185 </div>
186
187 {% if enabled_users > 1 %}
188 <br /><hr /><br />
189
190 <div class="row">
191 <h5>{{ 'config.form_user.delete.title'|trans }}</h5>
192 <p>{{ 'config.form_user.delete.description'|trans }}</p>
193 <a href="{{ path('delete_account') }}" onclick="return confirm('{{ 'config.form_user.delete.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red delete-account">
194 {{ 'config.form_user.delete.button'|trans }}
195 </a>
196 </div>
197 {% endif %}
170 </div> 198 </div>
171 199
172 <div id="set4" class="col s12"> 200 <div id="set4" class="col s12">