diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
27 files changed, 716 insertions, 98 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index ed66d2be..0280bc18 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -30,7 +30,7 @@ services: | |||
30 | - "@doctrine" | 30 | - "@doctrine" |
31 | 31 | ||
32 | wallabag_core.subscriber.table_prefix: | 32 | wallabag_core.subscriber.table_prefix: |
33 | class: Wallabag\CoreBundle\Subscriber\TablePrefixSubscriber | 33 | class: Wallabag\CoreBundle\Event\Subscriber\TablePrefixSubscriber |
34 | arguments: | 34 | arguments: |
35 | - "%database_table_prefix%" | 35 | - "%database_table_prefix%" |
36 | tags: | 36 | tags: |
@@ -94,6 +94,7 @@ services: | |||
94 | class: Wallabag\CoreBundle\Helper\Redirect | 94 | class: Wallabag\CoreBundle\Helper\Redirect |
95 | arguments: | 95 | arguments: |
96 | - "@router" | 96 | - "@router" |
97 | - "@security.token_storage" | ||
97 | 98 | ||
98 | wallabag_core.helper.prepare_pager_for_entries: | 99 | wallabag_core.helper.prepare_pager_for_entries: |
99 | class: Wallabag\CoreBundle\Helper\PreparePagerForEntries | 100 | class: Wallabag\CoreBundle\Helper\PreparePagerForEntries |
@@ -109,9 +110,38 @@ services: | |||
109 | host: '%redis_host%' | 110 | host: '%redis_host%' |
110 | port: '%redis_port%' | 111 | port: '%redis_port%' |
111 | path: '%redis_path%' | 112 | path: '%redis_path%' |
113 | password: '%redis_password%' | ||
112 | 114 | ||
113 | wallabag_core.exception_controller: | 115 | wallabag_core.exception_controller: |
114 | class: Wallabag\CoreBundle\Controller\ExceptionController | 116 | class: Wallabag\CoreBundle\Controller\ExceptionController |
115 | arguments: | 117 | arguments: |
116 | - '@twig' | 118 | - '@twig' |
117 | - '%kernel.debug%' | 119 | - '%kernel.debug%' |
120 | |||
121 | wallabag_core.subscriber.sqlite_cascade_delete: | ||
122 | class: Wallabag\CoreBundle\Event\Subscriber\SQLiteCascadeDeleteSubscriber | ||
123 | arguments: | ||
124 | - "@doctrine" | ||
125 | tags: | ||
126 | - { name: doctrine.event_subscriber } | ||
127 | |||
128 | wallabag_core.subscriber.download_images: | ||
129 | class: Wallabag\CoreBundle\Event\Subscriber\DownloadImagesSubscriber | ||
130 | arguments: | ||
131 | - "@doctrine.orm.default_entity_manager" | ||
132 | - "@wallabag_core.entry.download_images" | ||
133 | - '@=service(''craue_config'').get(''download_images_enabled'')' | ||
134 | - "@logger" | ||
135 | tags: | ||
136 | - { name: kernel.event_subscriber } | ||
137 | |||
138 | wallabag_core.entry.download_images: | ||
139 | class: Wallabag\CoreBundle\Helper\DownloadImages | ||
140 | arguments: | ||
141 | - "@wallabag_core.entry.download_images.client" | ||
142 | - "%kernel.root_dir%/../web/assets/images" | ||
143 | - '@=service(''craue_config'').get(''wallabag_url'')' | ||
144 | - "@logger" | ||
145 | |||
146 | wallabag_core.entry.download_images.client: | ||
147 | class: GuzzleHttp\Client | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index a1bee173..d6c294a4 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -70,7 +70,12 @@ config: | |||
70 | # 200_word: 'I read ~200 words per minute' | 70 | # 200_word: 'I read ~200 words per minute' |
71 | # 300_word: 'I read ~300 words per minute' | 71 | # 300_word: 'I read ~300 words per minute' |
72 | # 400_word: 'I read ~400 words per minute' | 72 | # 400_word: 'I read ~400 words per minute' |
73 | action_mark_as_read: | ||
74 | # label: 'Where do you to be redirected after mark an article as read?' | ||
75 | # redirect_homepage: 'To the homepage' | ||
76 | # redirect_current_page: 'To the current page' | ||
73 | pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer | 77 | pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer |
78 | # android_configuration: Configure your Android application | ||
74 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 79 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
75 | # help_items_per_page: "You can change the number of articles displayed on each page." | 80 | # help_items_per_page: "You can change the number of articles displayed on each page." |
76 | # 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." | 81 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
@@ -94,6 +99,18 @@ config: | |||
94 | email_label: 'Emailadresse' | 99 | email_label: 'Emailadresse' |
95 | # twoFactorAuthentication_label: 'Two factor authentication' | 100 | # twoFactorAuthentication_label: 'Two factor authentication' |
96 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." | 101 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." |
102 | delete: | ||
103 | # title: Delete my account (a.k.a danger zone) | ||
104 | # 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. | ||
105 | # confirm: Are you really sure? (THIS CAN'T BE UNDONE) | ||
106 | # button: Delete my account | ||
107 | reset: | ||
108 | # title: Reset area (a.k.a danger zone) | ||
109 | # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE. | ||
110 | # annotations: Remove ALL annotations | ||
111 | # tags: Remove ALL tags | ||
112 | # entries: Remove ALL entries | ||
113 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | ||
97 | form_password: | 114 | form_password: |
98 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 115 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
99 | old_password_label: 'Gammel adgangskode' | 116 | old_password_label: 'Gammel adgangskode' |
@@ -145,6 +162,7 @@ entry: | |||
145 | # archived: 'Archived entries' | 162 | # archived: 'Archived entries' |
146 | # filtered: 'Filtered entries' | 163 | # filtered: 'Filtered entries' |
147 | # filtered_tags: 'Filtered by tags:' | 164 | # filtered_tags: 'Filtered by tags:' |
165 | # filtered_search: 'Filtered by search:' | ||
148 | # untagged: 'Untagged entries' | 166 | # untagged: 'Untagged entries' |
149 | list: | 167 | list: |
150 | # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.' | 168 | # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.' |
@@ -168,6 +186,7 @@ entry: | |||
168 | preview_picture_label: 'Har et vist billede' | 186 | preview_picture_label: 'Har et vist billede' |
169 | preview_picture_help: 'Forhåndsvis billede' | 187 | preview_picture_help: 'Forhåndsvis billede' |
170 | language_label: 'Sprog' | 188 | language_label: 'Sprog' |
189 | # http_status_label: 'HTTP status' | ||
171 | reading_time: | 190 | reading_time: |
172 | label: 'Læsetid i minutter' | 191 | label: 'Læsetid i minutter' |
173 | from: 'fra' | 192 | from: 'fra' |
@@ -209,6 +228,8 @@ entry: | |||
209 | placeholder: 'http://website.com' | 228 | placeholder: 'http://website.com' |
210 | form_new: | 229 | form_new: |
211 | url_label: Url | 230 | url_label: Url |
231 | search: | ||
232 | # placeholder: 'What are you looking for?' | ||
212 | edit: | 233 | edit: |
213 | # page_title: 'Edit an entry' | 234 | # page_title: 'Edit an entry' |
214 | # title_label: 'Title' | 235 | # title_label: 'Title' |
@@ -329,6 +350,9 @@ tag: | |||
329 | list: | 350 | list: |
330 | # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.' | 351 | # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.' |
331 | # see_untagged_entries: 'See untagged entries' | 352 | # see_untagged_entries: 'See untagged entries' |
353 | new: | ||
354 | # add: 'Add' | ||
355 | # placeholder: 'You can add several tags, separated by a comma.' | ||
332 | 356 | ||
333 | import: | 357 | import: |
334 | # page_title: 'Import' | 358 | # page_title: 'Import' |
@@ -362,6 +386,7 @@ import: | |||
362 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 386 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
363 | worker: | 387 | worker: |
364 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" | 388 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" |
389 | # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors." | ||
365 | # firefox: | 390 | # firefox: |
366 | # page_title: 'Import > Firefox' | 391 | # page_title: 'Import > Firefox' |
367 | # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." | 392 | # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." |
@@ -374,6 +399,10 @@ import: | |||
374 | # page_title: 'Import > Instapaper' | 399 | # page_title: 'Import > Instapaper' |
375 | # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").' | 400 | # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").' |
376 | # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.' | 401 | # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.' |
402 | pinboard: | ||
403 | # page_title: "Import > Pinboard" | ||
404 | # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").' | ||
405 | # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.' | ||
377 | 406 | ||
378 | developer: | 407 | developer: |
379 | # page_title: 'Developer' | 408 | # page_title: 'Developer' |
@@ -465,8 +494,10 @@ flashes: | |||
465 | rss_updated: 'RSS-oplysninger opdateret' | 494 | rss_updated: 'RSS-oplysninger opdateret' |
466 | # tagging_rules_updated: 'Tagging rules updated' | 495 | # tagging_rules_updated: 'Tagging rules updated' |
467 | # tagging_rules_deleted: 'Tagging rule deleted' | 496 | # tagging_rules_deleted: 'Tagging rule deleted' |
468 | # user_added: 'User "%username%" added' | ||
469 | # rss_token_updated: 'RSS token updated' | 497 | # rss_token_updated: 'RSS token updated' |
498 | # annotations_reset: Annotations reset | ||
499 | # tags_reset: Tags reset | ||
500 | # entries_reset: Entries reset | ||
470 | entry: | 501 | entry: |
471 | notice: | 502 | notice: |
472 | # entry_already_saved: 'Entry already saved on %date%' | 503 | # entry_already_saved: 'Entry already saved on %date%' |
@@ -496,3 +527,8 @@ flashes: | |||
496 | notice: | 527 | notice: |
497 | # client_created: 'New client created.' | 528 | # client_created: 'New client created.' |
498 | # client_deleted: 'Client deleted' | 529 | # client_deleted: 'Client deleted' |
530 | user: | ||
531 | notice: | ||
532 | # added: 'User "%username%" added' | ||
533 | # updated: 'User "%username%" updated' | ||
534 | # deleted: 'User "%username%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index c9625d06..8a67e0df 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -70,7 +70,12 @@ config: | |||
70 | 200_word: 'Ich lese ~200 Wörter pro Minute' | 70 | 200_word: 'Ich lese ~200 Wörter pro Minute' |
71 | 300_word: 'Ich lese ~300 Wörter pro Minute' | 71 | 300_word: 'Ich lese ~300 Wörter pro Minute' |
72 | 400_word: 'Ich lese ~400 Wörter pro Minute' | 72 | 400_word: 'Ich lese ~400 Wörter pro Minute' |
73 | action_mark_as_read: | ||
74 | label: 'Wohin soll nach dem Gelesenmarkieren eines Artikels weitergeleitet werden?' | ||
75 | redirect_homepage: 'Zur Homepage' | ||
76 | redirect_current_page: 'Zur aktuellen Seite' | ||
73 | pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren | 77 | pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren |
78 | android_configuration: Konfiguriere deine Android Application | ||
74 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 79 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
75 | # help_items_per_page: "You can change the number of articles displayed on each page." | 80 | # help_items_per_page: "You can change the number of articles displayed on each page." |
76 | # 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." | 81 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
@@ -94,6 +99,18 @@ config: | |||
94 | email_label: 'E-Mail-Adresse' | 99 | email_label: 'E-Mail-Adresse' |
95 | twoFactorAuthentication_label: 'Zwei-Faktor-Authentifizierung' | 100 | twoFactorAuthentication_label: 'Zwei-Faktor-Authentifizierung' |
96 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." | 101 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." |
102 | delete: | ||
103 | title: Lösche mein Konto (a.k.a Gefahrenzone) | ||
104 | description: Wenn du dein Konto löschst, werden ALL deine Artikel, ALL deine Tags, ALL deine Anmerkungen und dein Konto dauerhaft gelöscht (kann NICHT RÜCKGÄNGIG gemacht werden). Du wirst anschließend ausgeloggt. | ||
105 | confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN) | ||
106 | button: Lösche mein Konto | ||
107 | reset: | ||
108 | title: Zurücksetzen (a.k.a Gefahrenzone) | ||
109 | description: Beim Nutzen der folgenden Schaltflächenhast du die Möglichkeit, einige Informationen von deinem Konto zu entfernen. Sei dir bewusst, dass dies NICHT RÜCKGÄNGIG zu machen ist. | ||
110 | annotations: Entferne ALLE Annotationen | ||
111 | tags: Entferne ALLE Tags | ||
112 | entries: Entferne ALLE Einträge | ||
113 | confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN) | ||
97 | form_password: | 114 | form_password: |
98 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 115 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
99 | old_password_label: 'Altes Kennwort' | 116 | old_password_label: 'Altes Kennwort' |
@@ -145,6 +162,7 @@ entry: | |||
145 | archived: 'Archivierte Einträge' | 162 | archived: 'Archivierte Einträge' |
146 | filtered: 'Gefilterte Einträge' | 163 | filtered: 'Gefilterte Einträge' |
147 | filtered_tags: 'Gefiltert nach Tags:' | 164 | filtered_tags: 'Gefiltert nach Tags:' |
165 | # filtered_search: 'Filtered by search:' | ||
148 | untagged: 'Nicht getaggte Einträge' | 166 | untagged: 'Nicht getaggte Einträge' |
149 | list: | 167 | list: |
150 | number_on_the_page: '{0} Es gibt keine Einträge.|{1} Es gibt einen Eintrag.|]1,Inf[ Es gibt %count% Einträge.' | 168 | number_on_the_page: '{0} Es gibt keine Einträge.|{1} Es gibt einen Eintrag.|]1,Inf[ Es gibt %count% Einträge.' |
@@ -168,6 +186,7 @@ entry: | |||
168 | preview_picture_label: 'Vorschaubild vorhanden' | 186 | preview_picture_label: 'Vorschaubild vorhanden' |
169 | preview_picture_help: 'Vorschaubild' | 187 | preview_picture_help: 'Vorschaubild' |
170 | language_label: 'Sprache' | 188 | language_label: 'Sprache' |
189 | # http_status_label: 'HTTP status' | ||
171 | reading_time: | 190 | reading_time: |
172 | label: 'Lesezeit in Minuten' | 191 | label: 'Lesezeit in Minuten' |
173 | from: 'von' | 192 | from: 'von' |
@@ -209,6 +228,8 @@ entry: | |||
209 | placeholder: 'https://website.de' | 228 | placeholder: 'https://website.de' |
210 | form_new: | 229 | form_new: |
211 | url_label: URL | 230 | url_label: URL |
231 | search: | ||
232 | # placeholder: 'What are you looking for?' | ||
212 | edit: | 233 | edit: |
213 | page_title: 'Eintrag bearbeiten' | 234 | page_title: 'Eintrag bearbeiten' |
214 | title_label: 'Titel' | 235 | title_label: 'Titel' |
@@ -329,6 +350,9 @@ tag: | |||
329 | list: | 350 | list: |
330 | number_on_the_page: '{0} Es gibt keine Tags.|{1} Es gibt einen Tag.|]1,Inf[ Es gibt %count% Tags.' | 351 | number_on_the_page: '{0} Es gibt keine Tags.|{1} Es gibt einen Tag.|]1,Inf[ Es gibt %count% Tags.' |
331 | see_untagged_entries: 'Zeige nicht getaggte Einträge' | 352 | see_untagged_entries: 'Zeige nicht getaggte Einträge' |
353 | new: | ||
354 | # add: 'Add' | ||
355 | # placeholder: 'You can add several tags, separated by a comma.' | ||
332 | 356 | ||
333 | import: | 357 | import: |
334 | page_title: 'Importieren' | 358 | page_title: 'Importieren' |
@@ -362,6 +386,7 @@ import: | |||
362 | how_to: 'Bitte wähle deinen Readability Export aus und klicke den unteren Button für das Hochladen und Importieren dessen.' | 386 | how_to: 'Bitte wähle deinen Readability Export aus und klicke den unteren Button für das Hochladen und Importieren dessen.' |
363 | worker: | 387 | worker: |
364 | enabled: "Der Import erfolgt asynchron. Sobald der Import gestartet ist, wird diese Aufgabe extern abgearbeitet. Der aktuelle Service dafür ist:" | 388 | enabled: "Der Import erfolgt asynchron. Sobald der Import gestartet ist, wird diese Aufgabe extern abgearbeitet. Der aktuelle Service dafür ist:" |
389 | download_images_warning: "Du hast das Herunterladen von Bildern für deine Artikel aktiviert. Verbunden mit dem klassischen Import kann es ewig dauern fortzufahren (oder sogar fehlschlagen). Wir <strong>empfehlen</strong> den asynchronen Import zu aktivieren, um Fehler zu vermeiden." | ||
365 | firefox: | 390 | firefox: |
366 | page_title: 'Aus Firefox importieren' | 391 | page_title: 'Aus Firefox importieren' |
367 | description: "Dieser Import wird all deine Lesezeichen aus Firefox importieren. Gehe zu deinen Lesezeichen (Strg+Shift+O), dann auf \"Importen und Sichern\", wähle \"Sichern…\". Du erhälst eine .json Datei." | 392 | description: "Dieser Import wird all deine Lesezeichen aus Firefox importieren. Gehe zu deinen Lesezeichen (Strg+Shift+O), dann auf \"Importen und Sichern\", wähle \"Sichern…\". Du erhälst eine .json Datei." |
@@ -374,6 +399,10 @@ import: | |||
374 | page_title: 'Aus Instapaper importieren' | 399 | page_title: 'Aus Instapaper importieren' |
375 | description: 'Dieser Import wird all deine Instapaper Artikel importieren. Auf der Einstellungsseite (https://www.instapaper.com/user) klickst du auf "Download .CSV Datei" in dem Abschnitt "Export". Eine CSV Datei wird heruntergeladen (z.B. "instapaper-export.csv").' | 400 | description: 'Dieser Import wird all deine Instapaper Artikel importieren. Auf der Einstellungsseite (https://www.instapaper.com/user) klickst du auf "Download .CSV Datei" in dem Abschnitt "Export". Eine CSV Datei wird heruntergeladen (z.B. "instapaper-export.csv").' |
376 | how_to: "Bitte wähle deine Instapaper Sicherungsdatei aus und klicke den nachfolgenden Button zum Importieren." | 401 | how_to: "Bitte wähle deine Instapaper Sicherungsdatei aus und klicke den nachfolgenden Button zum Importieren." |
402 | pinboard: | ||
403 | page_title: "Aus Pinboard importieren" | ||
404 | description: 'Dieser Import wird all deine Pinboard Artikel importieren. Auf der Seite Backup (https://pinboard.in/settings/backup) klickst du auf "JSON" in dem Abschnitt "Lesezeichen". Eine JSON Datei wird dann heruntergeladen (z.B. "pinboard_export").' | ||
405 | how_to: 'Bitte wähle deinen Pinboard Export aus und klicke den nachfolgenden Button zum Importieren.' | ||
377 | 406 | ||
378 | developer: | 407 | developer: |
379 | page_title: 'Entwickler' | 408 | page_title: 'Entwickler' |
@@ -453,7 +482,7 @@ user: | |||
453 | back_to_list: Zurück zur Liste | 482 | back_to_list: Zurück zur Liste |
454 | 483 | ||
455 | error: | 484 | error: |
456 | # page_title: An error occurred | 485 | page_title: Ein Fehler ist aufgetreten |
457 | 486 | ||
458 | flashes: | 487 | flashes: |
459 | config: | 488 | config: |
@@ -465,8 +494,10 @@ flashes: | |||
465 | rss_updated: 'RSS-Informationen aktualisiert' | 494 | rss_updated: 'RSS-Informationen aktualisiert' |
466 | tagging_rules_updated: 'Tagging-Regeln aktualisiert' | 495 | tagging_rules_updated: 'Tagging-Regeln aktualisiert' |
467 | tagging_rules_deleted: 'Tagging-Regel gelöscht' | 496 | tagging_rules_deleted: 'Tagging-Regel gelöscht' |
468 | user_added: 'Benutzer "%username%" erstellt' | ||
469 | rss_token_updated: 'RSS-Token aktualisiert' | 497 | rss_token_updated: 'RSS-Token aktualisiert' |
498 | annotations_reset: Anmerkungen zurücksetzen | ||
499 | tags_reset: Tags zurücksetzen | ||
500 | entries_reset: Einträge zurücksetzen | ||
470 | entry: | 501 | entry: |
471 | notice: | 502 | notice: |
472 | entry_already_saved: 'Eintrag bereits am %date% gespeichert' | 503 | entry_already_saved: 'Eintrag bereits am %date% gespeichert' |
@@ -496,3 +527,8 @@ flashes: | |||
496 | notice: | 527 | notice: |
497 | client_created: 'Neuer Client erstellt.' | 528 | client_created: 'Neuer Client erstellt.' |
498 | client_deleted: 'Client gelöscht' | 529 | client_deleted: 'Client gelöscht' |
530 | user: | ||
531 | notice: | ||
532 | added: 'Benutzer "%username%" hinzugefügt' | ||
533 | updated: 'Benutzer "%username%" aktualisiert' | ||
534 | deleted: 'Benutzer "%username%" gelöscht' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 139cdc24..63216a0f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -70,7 +70,12 @@ config: | |||
70 | 200_word: 'I read ~200 words per minute' | 70 | 200_word: 'I read ~200 words per minute' |
71 | 300_word: 'I read ~300 words per minute' | 71 | 300_word: 'I read ~300 words per minute' |
72 | 400_word: 'I read ~400 words per minute' | 72 | 400_word: 'I read ~400 words per minute' |
73 | action_mark_as_read: | ||
74 | label: 'Where do you want to be redirected after mark an article as read?' | ||
75 | redirect_homepage: 'To the homepage' | ||
76 | redirect_current_page: 'To the current page' | ||
73 | pocket_consumer_key_label: Consumer key for Pocket to import contents | 77 | pocket_consumer_key_label: Consumer key for Pocket to import contents |
78 | android_configuration: Configure your Android application | ||
74 | help_theme: "wallabag is customizable. You can choose your prefered theme here." | 79 | help_theme: "wallabag is customizable. You can choose your prefered theme here." |
75 | help_items_per_page: "You can change the number of articles displayed on each page." | 80 | help_items_per_page: "You can change the number of articles displayed on each page." |
76 | 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." | 81 | help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
@@ -94,6 +99,18 @@ config: | |||
94 | email_label: 'Email' | 99 | email_label: 'Email' |
95 | twoFactorAuthentication_label: 'Two factor authentication' | 100 | twoFactorAuthentication_label: 'Two factor authentication' |
96 | help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." | 101 | help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." |
102 | delete: | ||
103 | title: Delete my account (a.k.a danger zone) | ||
104 | 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. | ||
105 | confirm: Are you really sure? (THIS CAN'T BE UNDONE) | ||
106 | button: Delete my account | ||
107 | reset: | ||
108 | title: Reset area (a.k.a danger zone) | ||
109 | description: By hitting buttons below you'll have ability to remove some information from your account. Be aware that these actions are IRREVERSIBLE. | ||
110 | annotations: Remove ALL annotations | ||
111 | tags: Remove ALL tags | ||
112 | entries: Remove ALL entries | ||
113 | confirm: Are you really sure? (THIS CAN'T BE UNDONE) | ||
97 | form_password: | 114 | form_password: |
98 | description: "You can change your password here. Your new password should by at least 8 characters long." | 115 | description: "You can change your password here. Your new password should by at least 8 characters long." |
99 | old_password_label: 'Current password' | 116 | old_password_label: 'Current password' |
@@ -145,6 +162,7 @@ entry: | |||
145 | archived: 'Archived entries' | 162 | archived: 'Archived entries' |
146 | filtered: 'Filtered entries' | 163 | filtered: 'Filtered entries' |
147 | filtered_tags: 'Filtered by tags:' | 164 | filtered_tags: 'Filtered by tags:' |
165 | filtered_search: 'Filtered by search:' | ||
148 | untagged: 'Untagged entries' | 166 | untagged: 'Untagged entries' |
149 | list: | 167 | list: |
150 | number_on_the_page: '{0} There are no entries.|{1} There is one entry.|]1,Inf[ There are %count% entries.' | 168 | number_on_the_page: '{0} There are no entries.|{1} There is one entry.|]1,Inf[ There are %count% entries.' |
@@ -168,6 +186,7 @@ entry: | |||
168 | preview_picture_label: 'Has a preview picture' | 186 | preview_picture_label: 'Has a preview picture' |
169 | preview_picture_help: 'Preview picture' | 187 | preview_picture_help: 'Preview picture' |
170 | language_label: 'Language' | 188 | language_label: 'Language' |
189 | http_status_label: 'HTTP status' | ||
171 | reading_time: | 190 | reading_time: |
172 | label: 'Reading time in minutes' | 191 | label: 'Reading time in minutes' |
173 | from: 'from' | 192 | from: 'from' |
@@ -209,6 +228,8 @@ entry: | |||
209 | placeholder: 'http://website.com' | 228 | placeholder: 'http://website.com' |
210 | form_new: | 229 | form_new: |
211 | url_label: Url | 230 | url_label: Url |
231 | search: | ||
232 | placeholder: 'What are you looking for?' | ||
212 | edit: | 233 | edit: |
213 | page_title: 'Edit an entry' | 234 | page_title: 'Edit an entry' |
214 | title_label: 'Title' | 235 | title_label: 'Title' |
@@ -329,6 +350,9 @@ tag: | |||
329 | list: | 350 | list: |
330 | number_on_the_page: '{0} There are no tags.|{1} There is one tag.|]1,Inf[ There are %count% tags.' | 351 | number_on_the_page: '{0} There are no tags.|{1} There is one tag.|]1,Inf[ There are %count% tags.' |
331 | see_untagged_entries: 'See untagged entries' | 352 | see_untagged_entries: 'See untagged entries' |
353 | new: | ||
354 | add: 'Add' | ||
355 | placeholder: 'You can add several tags, separated by a comma.' | ||
332 | 356 | ||
333 | import: | 357 | import: |
334 | page_title: 'Import' | 358 | page_title: 'Import' |
@@ -362,6 +386,7 @@ import: | |||
362 | how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 386 | how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
363 | worker: | 387 | worker: |
364 | enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" | 388 | enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" |
389 | download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors." | ||
365 | firefox: | 390 | firefox: |
366 | page_title: 'Import > Firefox' | 391 | page_title: 'Import > Firefox' |
367 | description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." | 392 | description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." |
@@ -374,6 +399,10 @@ import: | |||
374 | page_title: 'Import > Instapaper' | 399 | page_title: 'Import > Instapaper' |
375 | description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").' | 400 | description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").' |
376 | how_to: 'Please select your Instapaper export and click on the below button to upload and import it.' | 401 | how_to: 'Please select your Instapaper export and click on the below button to upload and import it.' |
402 | pinboard: | ||
403 | page_title: "Import > Pinboard" | ||
404 | description: 'This importer will import all your Pinboard articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").' | ||
405 | how_to: 'Please select your Pinboard export and click on the below button to upload and import it.' | ||
377 | 406 | ||
378 | developer: | 407 | developer: |
379 | page_title: 'Developer' | 408 | page_title: 'Developer' |
@@ -466,6 +495,9 @@ flashes: | |||
466 | tagging_rules_updated: 'Tagging rules updated' | 495 | tagging_rules_updated: 'Tagging rules updated' |
467 | tagging_rules_deleted: 'Tagging rule deleted' | 496 | tagging_rules_deleted: 'Tagging rule deleted' |
468 | rss_token_updated: 'RSS token updated' | 497 | rss_token_updated: 'RSS token updated' |
498 | annotations_reset: Annotations reset | ||
499 | tags_reset: Tags reset | ||
500 | entries_reset: Entries reset | ||
469 | entry: | 501 | entry: |
470 | notice: | 502 | notice: |
471 | entry_already_saved: 'Entry already saved on %date%' | 503 | 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 70e64bec..3876725e 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -70,7 +70,12 @@ config: | |||
70 | 200_word: 'Leo ~200 palabras por minuto' | 70 | 200_word: 'Leo ~200 palabras por minuto' |
71 | 300_word: 'Leo ~300 palabras por minuto' | 71 | 300_word: 'Leo ~300 palabras por minuto' |
72 | 400_word: 'Leo ~400 palabras por minuto' | 72 | 400_word: 'Leo ~400 palabras por minuto' |
73 | action_mark_as_read: | ||
74 | # label: 'Where do you to be redirected after mark an article as read?' | ||
75 | # redirect_homepage: 'To the homepage' | ||
76 | # redirect_current_page: 'To the current page' | ||
73 | # pocket_consumer_key_label: Consumer key for Pocket to import contents | 77 | # pocket_consumer_key_label: Consumer key for Pocket to import contents |
78 | # android_configuration: Configure your Android application | ||
74 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 79 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
75 | # help_items_per_page: "You can change the number of articles displayed on each page." | 80 | # help_items_per_page: "You can change the number of articles displayed on each page." |
76 | # 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." | 81 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
@@ -94,6 +99,18 @@ config: | |||
94 | email_label: 'Direccion e-mail' | 99 | email_label: 'Direccion e-mail' |
95 | twoFactorAuthentication_label: 'Autentificación de dos factores' | 100 | twoFactorAuthentication_label: 'Autentificación de dos factores' |
96 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." | 101 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." |
102 | delete: | ||
103 | # title: Delete my account (a.k.a danger zone) | ||
104 | # 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. | ||
105 | # confirm: Are you really sure? (THIS CAN'T BE UNDONE) | ||
106 | # button: Delete my account | ||
107 | reset: | ||
108 | # title: Reset area (a.k.a danger zone) | ||
109 | # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE. | ||
110 | # annotations: Remove ALL annotations | ||
111 | # tags: Remove ALL tags | ||
112 | # entries: Remove ALL entries | ||
113 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | ||
97 | form_password: | 114 | form_password: |
98 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 115 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
99 | old_password_label: 'Contraseña actual' | 116 | old_password_label: 'Contraseña actual' |
@@ -145,6 +162,7 @@ entry: | |||
145 | archived: 'Artículos archivados' | 162 | archived: 'Artículos archivados' |
146 | filtered: 'Artículos filtrados' | 163 | filtered: 'Artículos filtrados' |
147 | # filtered_tags: 'Filtered by tags:' | 164 | # filtered_tags: 'Filtered by tags:' |
165 | # filtered_search: 'Filtered by search:' | ||
148 | # untagged: 'Untagged entries' | 166 | # untagged: 'Untagged entries' |
149 | list: | 167 | list: |
150 | number_on_the_page: '{0} No hay artículos.|{1} Hay un artículo.|]1,Inf[ Hay %count% artículos.' | 168 | number_on_the_page: '{0} No hay artículos.|{1} Hay un artículo.|]1,Inf[ Hay %count% artículos.' |
@@ -168,6 +186,7 @@ entry: | |||
168 | preview_picture_label: 'Hay una foto' | 186 | preview_picture_label: 'Hay una foto' |
169 | preview_picture_help: 'Foto de preview' | 187 | preview_picture_help: 'Foto de preview' |
170 | language_label: 'Idioma' | 188 | language_label: 'Idioma' |
189 | # http_status_label: 'HTTP status' | ||
171 | reading_time: | 190 | reading_time: |
172 | label: 'Duración de lectura en minutos' | 191 | label: 'Duración de lectura en minutos' |
173 | from: 'de' | 192 | from: 'de' |
@@ -209,6 +228,8 @@ entry: | |||
209 | placeholder: 'http://website.com' | 228 | placeholder: 'http://website.com' |
210 | form_new: | 229 | form_new: |
211 | url_label: Url | 230 | url_label: Url |
231 | search: | ||
232 | # placeholder: 'What are you looking for?' | ||
212 | edit: | 233 | edit: |
213 | page_title: 'Editar un artículo' | 234 | page_title: 'Editar un artículo' |
214 | title_label: 'Título' | 235 | title_label: 'Título' |
@@ -329,6 +350,9 @@ tag: | |||
329 | list: | 350 | list: |
330 | number_on_the_page: '{0} No hay ninguna etiqueta.|{1} Hay una etiqueta.|]1,Inf[ Hay %count% etiquetas.' | 351 | number_on_the_page: '{0} No hay ninguna etiqueta.|{1} Hay una etiqueta.|]1,Inf[ Hay %count% etiquetas.' |
331 | # see_untagged_entries: 'See untagged entries' | 352 | # see_untagged_entries: 'See untagged entries' |
353 | new: | ||
354 | # add: 'Add' | ||
355 | # placeholder: 'You can add several tags, separated by a comma.' | ||
332 | 356 | ||
333 | import: | 357 | import: |
334 | page_title: 'Importar' | 358 | page_title: 'Importar' |
@@ -362,6 +386,7 @@ import: | |||
362 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 386 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
363 | worker: | 387 | worker: |
364 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" | 388 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" |
389 | # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors." | ||
365 | firefox: | 390 | firefox: |
366 | page_title: 'Importar > Firefox' | 391 | page_title: 'Importar > Firefox' |
367 | # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." | 392 | # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." |
@@ -374,6 +399,10 @@ import: | |||
374 | page_title: 'Importar > Instapaper' | 399 | page_title: 'Importar > Instapaper' |
375 | # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").' | 400 | # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").' |
376 | # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.' | 401 | # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.' |
402 | pinboard: | ||
403 | page_title: "Importar > Pinboard" | ||
404 | # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").' | ||
405 | # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.' | ||
377 | 406 | ||
378 | developer: | 407 | developer: |
379 | page_title: 'Promotor' | 408 | page_title: 'Promotor' |
@@ -465,8 +494,10 @@ flashes: | |||
465 | rss_updated: 'La configuración de los feeds RSS ha sido actualizada' | 494 | rss_updated: 'La configuración de los feeds RSS ha sido actualizada' |
466 | tagging_rules_updated: 'Regla de etiquetado borrada' | 495 | tagging_rules_updated: 'Regla de etiquetado borrada' |
467 | tagging_rules_deleted: 'Regla de etiquetado actualizada' | 496 | tagging_rules_deleted: 'Regla de etiquetado actualizada' |
468 | user_added: 'Usuario "%username%" añadido' | ||
469 | rss_token_updated: 'RSS token actualizado' | 497 | rss_token_updated: 'RSS token actualizado' |
498 | # annotations_reset: Annotations reset | ||
499 | # tags_reset: Tags reset | ||
500 | # entries_reset: Entries reset | ||
470 | entry: | 501 | entry: |
471 | notice: | 502 | notice: |
472 | entry_already_saved: 'Entrada ya guardada por %fecha%' | 503 | entry_already_saved: 'Entrada ya guardada por %fecha%' |
@@ -496,3 +527,8 @@ flashes: | |||
496 | notice: | 527 | notice: |
497 | client_created: 'Nuevo cliente creado.' | 528 | client_created: 'Nuevo cliente creado.' |
498 | client_deleted: 'Cliente suprimido' | 529 | client_deleted: 'Cliente suprimido' |
530 | user: | ||
531 | notice: | ||
532 | # added: 'User "%username%" added' | ||
533 | # updated: 'User "%username%" updated' | ||
534 | # deleted: 'User "%username%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 75359901..301668e3 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -70,7 +70,12 @@ config: | |||
70 | 200_word: 'من تقریباً ۲۰۰ واژه را در دقیقه میخوانم' | 70 | 200_word: 'من تقریباً ۲۰۰ واژه را در دقیقه میخوانم' |
71 | 300_word: 'من تقریباً ۳۰۰ واژه را در دقیقه میخوانم' | 71 | 300_word: 'من تقریباً ۳۰۰ واژه را در دقیقه میخوانم' |
72 | 400_word: 'من تقریباً ۴۰۰ واژه را در دقیقه میخوانم' | 72 | 400_word: 'من تقریباً ۴۰۰ واژه را در دقیقه میخوانم' |
73 | action_mark_as_read: | ||
74 | # label: 'Where do you to be redirected after mark an article as read?' | ||
75 | # redirect_homepage: 'To the homepage' | ||
76 | # redirect_current_page: 'To the current page' | ||
73 | pocket_consumer_key_label: کلید کاربری Pocket برای درونریزی مطالب | 77 | pocket_consumer_key_label: کلید کاربری Pocket برای درونریزی مطالب |
78 | # android_configuration: Configure your Android application | ||
74 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 79 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
75 | # help_items_per_page: "You can change the number of articles displayed on each page." | 80 | # help_items_per_page: "You can change the number of articles displayed on each page." |
76 | # 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." | 81 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
@@ -94,6 +99,18 @@ config: | |||
94 | email_label: 'نشانی ایمیل' | 99 | email_label: 'نشانی ایمیل' |
95 | twoFactorAuthentication_label: 'تأیید ۲مرحلهای' | 100 | twoFactorAuthentication_label: 'تأیید ۲مرحلهای' |
96 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." | 101 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." |
102 | delete: | ||
103 | # title: Delete my account (a.k.a danger zone) | ||
104 | # 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. | ||
105 | # confirm: Are you really sure? (THIS CAN'T BE UNDONE) | ||
106 | # button: Delete my account | ||
107 | reset: | ||
108 | # title: Reset area (a.k.a danger zone) | ||
109 | # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE. | ||
110 | # annotations: Remove ALL annotations | ||
111 | # tags: Remove ALL tags | ||
112 | # entries: Remove ALL entries | ||
113 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | ||
97 | form_password: | 114 | form_password: |
98 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 115 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
99 | old_password_label: 'رمز قدیمی' | 116 | old_password_label: 'رمز قدیمی' |
@@ -145,6 +162,7 @@ entry: | |||
145 | archived: 'مقالههای بایگانیشده' | 162 | archived: 'مقالههای بایگانیشده' |
146 | filtered: 'مقالههای فیلترشده' | 163 | filtered: 'مقالههای فیلترشده' |
147 | # filtered_tags: 'Filtered by tags:' | 164 | # filtered_tags: 'Filtered by tags:' |
165 | # filtered_search: 'Filtered by search:' | ||
148 | # untagged: 'Untagged entries' | 166 | # untagged: 'Untagged entries' |
149 | list: | 167 | list: |
150 | number_on_the_page: '{0} هیج مقالهای نیست.|{1} یک مقاله هست.|]1,Inf[ %count% مقاله هست.' | 168 | number_on_the_page: '{0} هیج مقالهای نیست.|{1} یک مقاله هست.|]1,Inf[ %count% مقاله هست.' |
@@ -168,6 +186,7 @@ entry: | |||
168 | preview_picture_label: 'دارای عکس پیشنمایش' | 186 | preview_picture_label: 'دارای عکس پیشنمایش' |
169 | preview_picture_help: 'پیشنمایش عکس' | 187 | preview_picture_help: 'پیشنمایش عکس' |
170 | language_label: 'زبان' | 188 | language_label: 'زبان' |
189 | # http_status_label: 'HTTP status' | ||
171 | reading_time: | 190 | reading_time: |
172 | label: 'زمان خواندن به دقیقه' | 191 | label: 'زمان خواندن به دقیقه' |
173 | from: 'از' | 192 | from: 'از' |
@@ -209,6 +228,8 @@ entry: | |||
209 | placeholder: 'http://website.com' | 228 | placeholder: 'http://website.com' |
210 | form_new: | 229 | form_new: |
211 | url_label: نشانی | 230 | url_label: نشانی |
231 | search: | ||
232 | # placeholder: 'What are you looking for?' | ||
212 | edit: | 233 | edit: |
213 | page_title: 'ویرایش مقاله' | 234 | page_title: 'ویرایش مقاله' |
214 | title_label: 'عنوان' | 235 | title_label: 'عنوان' |
@@ -279,6 +300,7 @@ quickstart: | |||
279 | paragraph_2: 'ادامه دهید!' | 300 | paragraph_2: 'ادامه دهید!' |
280 | configure: | 301 | configure: |
281 | title: 'برنامه را تنظیم کنید' | 302 | title: 'برنامه را تنظیم کنید' |
303 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | ||
282 | language: 'زبان و نمای برنامه را تغییر دهید' | 304 | language: 'زبان و نمای برنامه را تغییر دهید' |
283 | rss: 'خوراک آر-اس-اس را فعال کنید' | 305 | rss: 'خوراک آر-اس-اس را فعال کنید' |
284 | tagging_rules: 'قانونهای برچسبگذاری خودکار مقالههایتان را تعریف کنید' | 306 | tagging_rules: 'قانونهای برچسبگذاری خودکار مقالههایتان را تعریف کنید' |
@@ -328,6 +350,9 @@ tag: | |||
328 | list: | 350 | list: |
329 | number_on_the_page: '{0} هیچ برچسبی نیست.|{1} یک برچسب هست.|]1,Inf[ %count% برچسب هست.' | 351 | number_on_the_page: '{0} هیچ برچسبی نیست.|{1} یک برچسب هست.|]1,Inf[ %count% برچسب هست.' |
330 | # see_untagged_entries: 'See untagged entries' | 352 | # see_untagged_entries: 'See untagged entries' |
353 | new: | ||
354 | # add: 'Add' | ||
355 | # placeholder: 'You can add several tags, separated by a comma.' | ||
331 | 356 | ||
332 | import: | 357 | import: |
333 | page_title: 'درونریزی' | 358 | page_title: 'درونریزی' |
@@ -361,6 +386,7 @@ import: | |||
361 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 386 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
362 | worker: | 387 | worker: |
363 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" | 388 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" |
389 | # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors." | ||
364 | firefox: | 390 | firefox: |
365 | page_title: 'درونریزی > Firefox' | 391 | page_title: 'درونریزی > Firefox' |
366 | # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." | 392 | # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." |
@@ -373,6 +399,10 @@ import: | |||
373 | page_title: 'درونریزی > Instapaper' | 399 | page_title: 'درونریزی > Instapaper' |
374 | # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").' | 400 | # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").' |
375 | # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.' | 401 | # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.' |
402 | pinboard: | ||
403 | # page_title: "Import > Pinboard" | ||
404 | # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").' | ||
405 | # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.' | ||
376 | 406 | ||
377 | developer: | 407 | developer: |
378 | # page_title: 'Developer' | 408 | # page_title: 'Developer' |
@@ -464,8 +494,10 @@ flashes: | |||
464 | rss_updated: 'اطلاعات آر-اس-اس بهروز شد' | 494 | rss_updated: 'اطلاعات آر-اس-اس بهروز شد' |
465 | tagging_rules_updated: 'برچسبگذاری خودکار بهروز شد' | 495 | tagging_rules_updated: 'برچسبگذاری خودکار بهروز شد' |
466 | tagging_rules_deleted: 'قانون برچسبگذاری پاک شد' | 496 | tagging_rules_deleted: 'قانون برچسبگذاری پاک شد' |
467 | user_added: 'کابر "%username%" افزوده شد' | ||
468 | rss_token_updated: 'کد آر-اس-اس بهروز شد' | 497 | rss_token_updated: 'کد آر-اس-اس بهروز شد' |
498 | # annotations_reset: Annotations reset | ||
499 | # tags_reset: Tags reset | ||
500 | # entries_reset: Entries reset | ||
469 | entry: | 501 | entry: |
470 | notice: | 502 | notice: |
471 | entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود' | 503 | entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود' |
@@ -495,3 +527,8 @@ flashes: | |||
495 | notice: | 527 | notice: |
496 | # client_created: 'New client created.' | 528 | # client_created: 'New client created.' |
497 | # client_deleted: 'Client deleted' | 529 | # client_deleted: 'Client deleted' |
530 | user: | ||
531 | notice: | ||
532 | # added: 'User "%username%" added' | ||
533 | # updated: 'User "%username%" updated' | ||
534 | # deleted: 'User "%username%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index f2c9d8db..d97eab26 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -70,7 +70,12 @@ config: | |||
70 | 200_word: "Je lis environ 200 mots par minute" | 70 | 200_word: "Je lis environ 200 mots par minute" |
71 | 300_word: "Je lis environ 300 mots par minute" | 71 | 300_word: "Je lis environ 300 mots par minute" |
72 | 400_word: "Je lis environ 400 mots par minute" | 72 | 400_word: "Je lis environ 400 mots par minute" |
73 | action_mark_as_read: | ||
74 | label: 'Où souhaitez-vous être redirigé après avoir marqué un article comme lu ?' | ||
75 | redirect_homepage: "À la page d'accueil" | ||
76 | redirect_current_page: 'À la page courante' | ||
73 | pocket_consumer_key_label: Clé d’authentification Pocket pour importer les données | 77 | pocket_consumer_key_label: Clé d’authentification Pocket pour importer les données |
78 | android_configuration: Configurez votre application Android | ||
74 | help_theme: "L'affichage de wallabag est personnalisable. C'est ici que vous choisissez le thème que vous préférez." | 79 | help_theme: "L'affichage de wallabag est personnalisable. C'est ici que vous choisissez le thème que vous préférez." |
75 | help_items_per_page: "Vous pouvez définir le nombre d'articles affichés sur chaque page." | 80 | help_items_per_page: "Vous pouvez définir le nombre d'articles affichés sur chaque page." |
76 | 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." | 81 | help_reading_speed: "wallabag calcule une durée de lecture pour chaque article. Vous pouvez définir ici, grâce à cette liste déroulante, si vous lisez plus ou moins vite. wallabag recalculera la durée de lecture de chaque article." |
@@ -94,6 +99,18 @@ config: | |||
94 | email_label: "Adresse courriel" | 99 | email_label: "Adresse courriel" |
95 | twoFactorAuthentication_label: "Double authentification" | 100 | twoFactorAuthentication_label: "Double authentification" |
96 | help_twoFactorAuthentication: "Si vous activez 2FA, à chaque tentative de connexion à wallabag, vous recevrez un code par email." | 101 | help_twoFactorAuthentication: "Si vous activez 2FA, à chaque tentative de connexion à wallabag, vous recevrez un code par email." |
102 | delete: | ||
103 | title: Supprimer mon compte (attention danger !) | ||
104 | description: Si vous confirmez la suppression de votre compte, TOUS les articles, TOUS les tags, TOUTES les annotations et votre compte seront DÉFINITIVEMENT supprimé (c'est IRRÉVERSIBLE). Vous serez ensuite déconnecté. | ||
105 | confirm: Vous êtes vraiment sûr ? (C'EST IRRÉVERSIBLE) | ||
106 | button: 'Supprimer mon compte' | ||
107 | reset: | ||
108 | title: Réinitialisation (attention danger !) | ||
109 | description: En cliquant sur les boutons ci-dessous vous avez la possibilité de supprimer certaines informations de votre compte. Attention, ces actions sont IRRÉVERSIBLES ! | ||
110 | annotations: Supprimer TOUTES les annotations | ||
111 | tags: Supprimer TOUS les tags | ||
112 | entries: Supprimer TOUS les articles | ||
113 | confirm: Êtes-vous vraiment vraiment sûr ? (C'EST IRRÉVERSIBLE) | ||
97 | form_password: | 114 | form_password: |
98 | description: "Vous pouvez changer ici votre mot de passe. Le mot de passe doit contenir au moins 8 caractères." | 115 | description: "Vous pouvez changer ici votre mot de passe. Le mot de passe doit contenir au moins 8 caractères." |
99 | old_password_label: "Mot de passe actuel" | 116 | old_password_label: "Mot de passe actuel" |
@@ -145,6 +162,7 @@ entry: | |||
145 | archived: "Articles lus" | 162 | archived: "Articles lus" |
146 | filtered: "Articles filtrés" | 163 | filtered: "Articles filtrés" |
147 | filtered_tags: "Articles filtrés par tags :" | 164 | filtered_tags: "Articles filtrés par tags :" |
165 | filtered_search: 'Articles filtrés par recherche :' | ||
148 | untagged: "Article sans tag" | 166 | untagged: "Article sans tag" |
149 | list: | 167 | list: |
150 | number_on_the_page: "{0} Il n’y a pas d’articles.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles." | 168 | number_on_the_page: "{0} Il n’y a pas d’articles.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles." |
@@ -168,6 +186,7 @@ entry: | |||
168 | preview_picture_label: "A une photo" | 186 | preview_picture_label: "A une photo" |
169 | preview_picture_help: "Photo" | 187 | preview_picture_help: "Photo" |
170 | language_label: "Langue" | 188 | language_label: "Langue" |
189 | http_status_label: 'Statut HTTP' | ||
171 | reading_time: | 190 | reading_time: |
172 | label: "Durée de lecture en minutes" | 191 | label: "Durée de lecture en minutes" |
173 | from: "de" | 192 | from: "de" |
@@ -209,6 +228,8 @@ entry: | |||
209 | placeholder: "http://website.com" | 228 | placeholder: "http://website.com" |
210 | form_new: | 229 | form_new: |
211 | url_label: "Adresse" | 230 | url_label: "Adresse" |
231 | search: | ||
232 | placeholder: "Que recherchez-vous ?" | ||
212 | edit: | 233 | edit: |
213 | page_title: "Éditer un article" | 234 | page_title: "Éditer un article" |
214 | title_label: "Titre" | 235 | title_label: "Titre" |
@@ -329,6 +350,9 @@ tag: | |||
329 | list: | 350 | list: |
330 | number_on_the_page: "{0} Il n’y a pas de tag.|{1} Il y a un tag.|]1,Inf[ Il y a %count% tags." | 351 | number_on_the_page: "{0} Il n’y a pas de tag.|{1} Il y a un tag.|]1,Inf[ Il y a %count% tags." |
331 | see_untagged_entries: "Voir les articles sans tag" | 352 | see_untagged_entries: "Voir les articles sans tag" |
353 | new: | ||
354 | add: 'Ajouter' | ||
355 | placeholder: 'Vous pouvez ajouter plusieurs tags, séparés par une virgule.' | ||
332 | 356 | ||
333 | import: | 357 | import: |
334 | page_title: "Importer" | 358 | page_title: "Importer" |
@@ -362,6 +386,7 @@ import: | |||
362 | how_to: "Choisissez le fichier de votre export Readability et cliquez sur le bouton ci-dessous pour l’importer." | 386 | how_to: "Choisissez le fichier de votre export Readability et cliquez sur le bouton ci-dessous pour l’importer." |
363 | worker: | 387 | worker: |
364 | enabled: "Les imports sont asynchrones. Une fois l’import commencé un worker externe traitera les messages un par un. Le service activé est :" | 388 | enabled: "Les imports sont asynchrones. Une fois l’import commencé un worker externe traitera les messages un par un. Le service activé est :" |
389 | download_images_warning: "Vous avez configuré le téléchagement des images pour vos articles. Combiné à l'import classique, cette opération peut être très très longue (voire échouer). Nous vous conseillons <strong>vivement</strong> d'activer les imports asynchrones." | ||
365 | firefox: | 390 | firefox: |
366 | page_title: "Import > Firefox" | 391 | page_title: "Import > Firefox" |
367 | description: "Cet outil va vous permettre d’importer tous vos marques-pages de Firefox. Ouvrez le panneau des marques-pages (Ctrl+Maj+O), puis dans « Importation et sauvegarde », choisissez « Sauvegarde... ». Vous allez récupérer un fichier .json. </p>" | 392 | description: "Cet outil va vous permettre d’importer tous vos marques-pages de Firefox. Ouvrez le panneau des marques-pages (Ctrl+Maj+O), puis dans « Importation et sauvegarde », choisissez « Sauvegarde... ». Vous allez récupérer un fichier .json. </p>" |
@@ -374,6 +399,10 @@ import: | |||
374 | page_title: "Import > Instapaper" | 399 | page_title: "Import > Instapaper" |
375 | description: "Sur la page des paramètres (https://www.instapaper.com/user), cliquez sur « Download .CSV file » dans la section « Export ». Un fichier CSV sera téléchargé (« instapaper-export.csv »)." | 400 | description: "Sur la page des paramètres (https://www.instapaper.com/user), cliquez sur « Download .CSV file » dans la section « Export ». Un fichier CSV sera téléchargé (« instapaper-export.csv »)." |
376 | how_to: "Choisissez le fichier de votre export Instapaper et cliquez sur le bouton ci-dessous pour l’importer." | 401 | how_to: "Choisissez le fichier de votre export Instapaper et cliquez sur le bouton ci-dessous pour l’importer." |
402 | pinboard: | ||
403 | page_title: "Import > Pinboard" | ||
404 | description: "Sur la page « Backup » (https://pinboard.in/settings/backup), cliquez sur « JSON » dans la section « Bookmarks ». Un fichier json (sans extension) sera téléchargé (« pinboard_export »)." | ||
405 | how_to: "Choisissez le fichier de votre export Pinboard et cliquez sur le bouton ci-dessous pour l’importer." | ||
377 | 406 | ||
378 | developer: | 407 | developer: |
379 | page_title: "Développeur" | 408 | page_title: "Développeur" |
@@ -465,8 +494,10 @@ flashes: | |||
465 | rss_updated: "La configuration des flux RSS a bien été mise à jour" | 494 | rss_updated: "La configuration des flux RSS a bien été mise à jour" |
466 | tagging_rules_updated: "Règles mises à jour" | 495 | tagging_rules_updated: "Règles mises à jour" |
467 | tagging_rules_deleted: "Règle supprimée" | 496 | tagging_rules_deleted: "Règle supprimée" |
468 | user_added: "Utilisateur \"%username%\" ajouté" | ||
469 | rss_token_updated: "Jeton RSS mis à jour" | 497 | rss_token_updated: "Jeton RSS mis à jour" |
498 | annotations_reset: Annotations supprimées | ||
499 | tags_reset: Tags supprimés | ||
500 | entries_reset: Articles supprimés | ||
470 | entry: | 501 | entry: |
471 | notice: | 502 | notice: |
472 | entry_already_saved: "Article déjà sauvegardé le %date%" | 503 | entry_already_saved: "Article déjà sauvegardé le %date%" |
@@ -496,3 +527,8 @@ flashes: | |||
496 | notice: | 527 | notice: |
497 | client_created: "Nouveau client %name% créé" | 528 | client_created: "Nouveau client %name% créé" |
498 | client_deleted: "Client %name% supprimé" | 529 | client_deleted: "Client %name% supprimé" |
530 | user: | ||
531 | notice: | ||
532 | added: 'Utilisateur "%username%" ajouté' | ||
533 | updated: 'Utilisateur "%username%" mis à jour' | ||
534 | deleted: 'Utilisateur "%username%" supprimé' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index b7d066ab..4be99a27 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -70,7 +70,12 @@ config: | |||
70 | 200_word: 'Leggo ~200 parole al minuto' | 70 | 200_word: 'Leggo ~200 parole al minuto' |
71 | 300_word: 'Leggo ~300 parole al minuto' | 71 | 300_word: 'Leggo ~300 parole al minuto' |
72 | 400_word: 'Leggo ~400 parole al minuto' | 72 | 400_word: 'Leggo ~400 parole al minuto' |
73 | action_mark_as_read: | ||
74 | # label: 'Where do you to be redirected after mark an article as read?' | ||
75 | # redirect_homepage: 'To the homepage' | ||
76 | # redirect_current_page: 'To the current page' | ||
73 | pocket_consumer_key_label: Consumer key per Pocket per importare i contenuti | 77 | pocket_consumer_key_label: Consumer key per Pocket per importare i contenuti |
78 | # android_configuration: Configure your Android application | ||
74 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 79 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
75 | # help_items_per_page: "You can change the number of articles displayed on each page." | 80 | # help_items_per_page: "You can change the number of articles displayed on each page." |
76 | # 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." | 81 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
@@ -94,6 +99,18 @@ config: | |||
94 | email_label: 'E-mail' | 99 | email_label: 'E-mail' |
95 | twoFactorAuthentication_label: 'Two factor authentication' | 100 | twoFactorAuthentication_label: 'Two factor authentication' |
96 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." | 101 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." |
102 | delete: | ||
103 | # title: Delete my account (a.k.a danger zone) | ||
104 | # 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. | ||
105 | # confirm: Are you really sure? (THIS CAN'T BE UNDONE) | ||
106 | # button: Delete my account | ||
107 | reset: | ||
108 | # title: Reset area (a.k.a danger zone) | ||
109 | # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE. | ||
110 | # annotations: Remove ALL annotations | ||
111 | # tags: Remove ALL tags | ||
112 | # entries: Remove ALL entries | ||
113 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | ||
97 | form_password: | 114 | form_password: |
98 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 115 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
99 | old_password_label: 'Password corrente' | 116 | old_password_label: 'Password corrente' |
@@ -145,6 +162,7 @@ entry: | |||
145 | archived: 'Contenuti archiviati' | 162 | archived: 'Contenuti archiviati' |
146 | filtered: 'Contenuti filtrati' | 163 | filtered: 'Contenuti filtrati' |
147 | # filtered_tags: 'Filtered by tags:' | 164 | # filtered_tags: 'Filtered by tags:' |
165 | # filtered_search: 'Filtered by search:' | ||
148 | # untagged: 'Untagged entries' | 166 | # untagged: 'Untagged entries' |
149 | list: | 167 | list: |
150 | number_on_the_page: "{0} Non ci sono contenuti.|{1} C'è un contenuto.|]1,Inf[ Ci sono %count% contenuti." | 168 | number_on_the_page: "{0} Non ci sono contenuti.|{1} C'è un contenuto.|]1,Inf[ Ci sono %count% contenuti." |
@@ -168,6 +186,7 @@ entry: | |||
168 | preview_picture_label: "Ha un'immagine di anteprima" | 186 | preview_picture_label: "Ha un'immagine di anteprima" |
169 | preview_picture_help: 'Immagine di anteprima' | 187 | preview_picture_help: 'Immagine di anteprima' |
170 | language_label: 'Lingua' | 188 | language_label: 'Lingua' |
189 | # http_status_label: 'HTTP status' | ||
171 | reading_time: | 190 | reading_time: |
172 | label: 'Tempo di lettura in minuti' | 191 | label: 'Tempo di lettura in minuti' |
173 | from: 'da' | 192 | from: 'da' |
@@ -209,6 +228,8 @@ entry: | |||
209 | placeholder: 'http://website.com' | 228 | placeholder: 'http://website.com' |
210 | form_new: | 229 | form_new: |
211 | url_label: Url | 230 | url_label: Url |
231 | search: | ||
232 | # placeholder: 'What are you looking for?' | ||
212 | edit: | 233 | edit: |
213 | page_title: 'Modifica voce' | 234 | page_title: 'Modifica voce' |
214 | title_label: 'Titolo' | 235 | title_label: 'Titolo' |
@@ -329,6 +350,9 @@ tag: | |||
329 | list: | 350 | list: |
330 | number_on_the_page: "{0} Non ci sono tag.|{1} C'è un tag.|]1,Inf[ ci sono %count% tag." | 351 | number_on_the_page: "{0} Non ci sono tag.|{1} C'è un tag.|]1,Inf[ ci sono %count% tag." |
331 | # see_untagged_entries: 'See untagged entries' | 352 | # see_untagged_entries: 'See untagged entries' |
353 | new: | ||
354 | # add: 'Add' | ||
355 | # placeholder: 'You can add several tags, separated by a comma.' | ||
332 | 356 | ||
333 | import: | 357 | import: |
334 | page_title: 'Importa' | 358 | page_title: 'Importa' |
@@ -362,6 +386,7 @@ import: | |||
362 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 386 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
363 | worker: | 387 | worker: |
364 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" | 388 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" |
389 | # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors." | ||
365 | firefox: | 390 | firefox: |
366 | page_title: 'Importa da > Firefox' | 391 | page_title: 'Importa da > Firefox' |
367 | # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." | 392 | # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." |
@@ -374,6 +399,10 @@ import: | |||
374 | page_title: 'Importa da > Instapaper' | 399 | page_title: 'Importa da > Instapaper' |
375 | # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").' | 400 | # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").' |
376 | # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.' | 401 | # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.' |
402 | pinboard: | ||
403 | page_title: "Importa da > Pinboard" | ||
404 | # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").' | ||
405 | # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.' | ||
377 | 406 | ||
378 | developer: | 407 | developer: |
379 | page_title: 'Sviluppatori' | 408 | page_title: 'Sviluppatori' |
@@ -465,8 +494,10 @@ flashes: | |||
465 | rss_updated: 'Informazioni RSS aggiornate' | 494 | rss_updated: 'Informazioni RSS aggiornate' |
466 | tagging_rules_updated: 'Regole di tagging aggiornate' | 495 | tagging_rules_updated: 'Regole di tagging aggiornate' |
467 | tagging_rules_deleted: 'Regola di tagging aggiornate' | 496 | tagging_rules_deleted: 'Regola di tagging aggiornate' |
468 | user_added: 'Utente "%username%" aggiunto' | ||
469 | rss_token_updated: 'RSS token aggiornato' | 497 | rss_token_updated: 'RSS token aggiornato' |
498 | # annotations_reset: Annotations reset | ||
499 | # tags_reset: Tags reset | ||
500 | # entries_reset: Entries reset | ||
470 | entry: | 501 | entry: |
471 | notice: | 502 | notice: |
472 | entry_already_saved: 'Contenuto già salvato in data %date%' | 503 | entry_already_saved: 'Contenuto già salvato in data %date%' |
@@ -496,3 +527,8 @@ flashes: | |||
496 | notice: | 527 | notice: |
497 | client_created: 'Nuovo client creato.' | 528 | client_created: 'Nuovo client creato.' |
498 | client_deleted: 'Client eliminato' | 529 | client_deleted: 'Client eliminato' |
530 | user: | ||
531 | notice: | ||
532 | # added: 'User "%username%" added' | ||
533 | # updated: 'User "%username%" updated' | ||
534 | # deleted: 'User "%username%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 16ef1e5d..5ded91f9 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 | ||
51 | config: | 51 | config: |
52 | page_title: 'Configuracion' | 52 | page_title: 'Configuracion' |
@@ -70,7 +70,12 @@ config: | |||
70 | 200_word: "Legissi a l'entorn de 200 mots per minuta" | 70 | 200_word: "Legissi a l'entorn de 200 mots per minuta" |
71 | 300_word: "Legissi a l'entorn de 300 mots per minuta" | 71 | 300_word: "Legissi a l'entorn de 300 mots per minuta" |
72 | 400_word: "Legissi a l'entorn de 400 mots per minuta" | 72 | 400_word: "Legissi a l'entorn de 400 mots per minuta" |
73 | action_mark_as_read: | ||
74 | # label: 'Where do you to be redirected after mark an article as read?' | ||
75 | # redirect_homepage: 'To the homepage' | ||
76 | # redirect_current_page: 'To the current page' | ||
73 | pocket_consumer_key_label: Clau d'autentificacion Pocket per importar las donadas | 77 | pocket_consumer_key_label: Clau d'autentificacion Pocket per importar las donadas |
78 | android_configuration: Configuratz vòstra aplicacion Android | ||
74 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 79 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
75 | # help_items_per_page: "You can change the number of articles displayed on each page." | 80 | # help_items_per_page: "You can change the number of articles displayed on each page." |
76 | # 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." | 81 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
@@ -94,6 +99,18 @@ config: | |||
94 | email_label: 'Adreça de corrièl' | 99 | email_label: 'Adreça de corrièl' |
95 | twoFactorAuthentication_label: 'Dobla autentificacion' | 100 | twoFactorAuthentication_label: 'Dobla autentificacion' |
96 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." | 101 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." |
102 | delete: | ||
103 | title: Suprimir mon compte (Mèfi zòna perilhosa) | ||
104 | description: Se confirmatz la supression de vòstre compte, TOTES vòstres articles, TOTAS vòstras etiquetas, TOTAS vòstras anotacions e vòstre compte seràn suprimits per totjorn. E aquò es IRREVERSIBLE. Puèi seretz desconnectat. | ||
105 | confirm: Sètz vertadièrament segur ? (ES IRREVERSIBLE) | ||
106 | button: Suprimir mon compte | ||
107 | reset: | ||
108 | title: Zòna de reïnicializacion (Mèfi zòna perilhosa) | ||
109 | description: En clicant sul boton çai-jos auretz la possibilitat de levar qualques informacions de vòstre compte. Mèfi que totas aquelas accions son IRREVERSIBLAS. | ||
110 | annotations: Levar TOTAS las anotacions | ||
111 | tags: Levar TOTAS las etiquetas | ||
112 | entries: Levar TOTES los articles | ||
113 | confirm: Sètz vertadièrament segur ? (ES IRREVERSIBLE) | ||
97 | form_password: | 114 | form_password: |
98 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 115 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
99 | old_password_label: 'Senhal actual' | 116 | old_password_label: 'Senhal actual' |
@@ -103,7 +120,7 @@ config: | |||
103 | if_label: 'se' | 120 | if_label: 'se' |
104 | then_tag_as_label: 'alara atribuir las etiquetas' | 121 | then_tag_as_label: 'alara atribuir las etiquetas' |
105 | delete_rule_label: 'suprimir' | 122 | delete_rule_label: 'suprimir' |
106 | # edit_rule_label: 'edit' | 123 | edit_rule_label: 'modificar' |
107 | rule_label: 'Règla' | 124 | rule_label: 'Règla' |
108 | tags_label: 'Etiquetas' | 125 | tags_label: 'Etiquetas' |
109 | faq: | 126 | faq: |
@@ -145,6 +162,7 @@ entry: | |||
145 | archived: 'Articles legits' | 162 | archived: 'Articles legits' |
146 | filtered: 'Articles filtrats' | 163 | filtered: 'Articles filtrats' |
147 | filtered_tags: 'Filtats per etiquetas:' | 164 | filtered_tags: 'Filtats per etiquetas:' |
165 | # filtered_search: 'Filtered by search:' | ||
148 | untagged: 'Articles sens etiqueta' | 166 | untagged: 'Articles sens etiqueta' |
149 | list: | 167 | list: |
150 | number_on_the_page: "{0} I a pas cap d'article.|{1} I a un article.|]1,Inf[ I a %count% articles." | 168 | number_on_the_page: "{0} I a pas cap d'article.|{1} I a un article.|]1,Inf[ I a %count% articles." |
@@ -168,6 +186,7 @@ entry: | |||
168 | preview_picture_label: 'A una fotò' | 186 | preview_picture_label: 'A una fotò' |
169 | preview_picture_help: 'Fotò' | 187 | preview_picture_help: 'Fotò' |
170 | language_label: 'Lenga' | 188 | language_label: 'Lenga' |
189 | # http_status_label: 'HTTP status' | ||
171 | reading_time: | 190 | reading_time: |
172 | label: 'Durada de lectura en minutas' | 191 | label: 'Durada de lectura en minutas' |
173 | from: 'de' | 192 | from: 'de' |
@@ -209,6 +228,8 @@ entry: | |||
209 | placeholder: 'http://website.com' | 228 | placeholder: 'http://website.com' |
210 | form_new: | 229 | form_new: |
211 | url_label: Url | 230 | url_label: Url |
231 | search: | ||
232 | # placeholder: 'What are you looking for?' | ||
212 | edit: | 233 | edit: |
213 | page_title: 'Modificar un article' | 234 | page_title: 'Modificar un article' |
214 | title_label: 'Títol' | 235 | title_label: 'Títol' |
@@ -216,7 +237,7 @@ entry: | |||
216 | is_public_label: 'Public' | 237 | is_public_label: 'Public' |
217 | save_label: 'Enregistrar' | 238 | save_label: 'Enregistrar' |
218 | public: | 239 | public: |
219 | # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" | 240 | shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>" |
220 | 241 | ||
221 | about: | 242 | about: |
222 | page_title: 'A prepaus' | 243 | page_title: 'A prepaus' |
@@ -272,14 +293,14 @@ howto: | |||
272 | 293 | ||
273 | quickstart: | 294 | quickstart: |
274 | page_title: 'Per ben començar' | 295 | page_title: 'Per ben començar' |
275 | # more: 'More…' | 296 | more: 'Mai…' |
276 | intro: | 297 | intro: |
277 | title: 'Benvenguda sus wallabag !' | 298 | title: 'Benvenguda sus wallabag !' |
278 | 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." | 299 | 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." |
279 | paragraph_2: 'Seguètz-nos ' | 300 | paragraph_2: 'Seguètz-nos ' |
280 | configure: | 301 | configure: |
281 | title: "Configuratz l'aplicacio" | 302 | title: "Configuratz l'aplicacion" |
282 | # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.' | 303 | description: "Per fin d'aver una aplicacion que vos va ben, anatz veire la configuracion de wallabag." |
283 | language: "Cambiatz la lenga e l'estil de l'aplicacion" | 304 | language: "Cambiatz la lenga e l'estil de l'aplicacion" |
284 | rss: 'Activatz los fluxes RSS' | 305 | rss: 'Activatz los fluxes RSS' |
285 | tagging_rules: 'Escrivètz de règlas per classar automaticament vòstres articles' | 306 | tagging_rules: 'Escrivètz de règlas per classar automaticament vòstres articles' |
@@ -293,7 +314,7 @@ quickstart: | |||
293 | import: 'Configurar los impòrt' | 314 | import: 'Configurar los impòrt' |
294 | first_steps: | 315 | first_steps: |
295 | title: 'Primièrs passes' | 316 | title: 'Primièrs passes' |
296 | # 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." | 317 | 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." |
297 | new_article: 'Ajustatz vòstre primièr article' | 318 | new_article: 'Ajustatz vòstre primièr article' |
298 | unread_articles: 'E racaptatz-lo !' | 319 | unread_articles: 'E racaptatz-lo !' |
299 | migrate: | 320 | migrate: |
@@ -305,14 +326,14 @@ quickstart: | |||
305 | readability: 'Migrar dempuèi Readability' | 326 | readability: 'Migrar dempuèi Readability' |
306 | instapaper: 'Migrar dempuèi Instapaper' | 327 | instapaper: 'Migrar dempuèi Instapaper' |
307 | developer: | 328 | developer: |
308 | title: 'Pels desvolopadors' | 329 | title: 'Pels desvolopaires' |
309 | # description: 'We also thought to the developers: Docker, API, translations, etc.' | 330 | description: 'Avèm tanben pensat als desvolopaires : Docker, API, traduccions, etc.' |
310 | create_application: 'Crear vòstra aplicacion tèrça' | 331 | create_application: 'Crear vòstra aplicacion tèrça' |
311 | # use_docker: 'Use Docker to install wallabag' | 332 | use_docker: 'Utilizar Docker per installar wallabag' |
312 | docs: | 333 | docs: |
313 | title: 'Documentacion complèta' | 334 | title: 'Documentacion complèta' |
314 | # 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." | 335 | description: "I a un fum de fonccionalitats dins wallabag. Esitetz pas a legir lo manual per las conéisser e aprendre a las utilizar." |
315 | annotate: 'Anotatar vòstre article' | 336 | annotate: 'Anotar vòstre article' |
316 | export: 'Convertissètz vòstres articles en ePub o en PDF' | 337 | export: 'Convertissètz vòstres articles en ePub o en PDF' |
317 | search_filters: "Aprenètz a utilizar lo motor de recèrca e los filtres per retrobar l'article que vos interèssa" | 338 | search_filters: "Aprenètz a utilizar lo motor de recèrca e los filtres per retrobar l'article que vos interèssa" |
318 | fetching_errors: "Qué far se mon article es pas recuperat coma cal ?" | 339 | fetching_errors: "Qué far se mon article es pas recuperat coma cal ?" |
@@ -329,6 +350,9 @@ tag: | |||
329 | list: | 350 | list: |
330 | number_on_the_page: "{0} I a pas cap d'etiquetas.|{1} I a una etiqueta.|]1,Inf[ I a %count% etiquetas." | 351 | number_on_the_page: "{0} I a pas cap d'etiquetas.|{1} I a una etiqueta.|]1,Inf[ I a %count% etiquetas." |
331 | see_untagged_entries: "Afichar las entradas sens pas cap d'etiquetas" | 352 | see_untagged_entries: "Afichar las entradas sens pas cap d'etiquetas" |
353 | new: | ||
354 | # add: 'Add' | ||
355 | # placeholder: 'You can add several tags, separated by a comma.' | ||
332 | 356 | ||
333 | import: | 357 | import: |
334 | page_title: 'Importar' | 358 | page_title: 'Importar' |
@@ -362,6 +386,7 @@ import: | |||
362 | how_to: "Mercés de seleccionar vòstre Readability fichièr e de clicar sul boton dejós per lo telecargar e l'importar." | 386 | how_to: "Mercés de seleccionar vòstre Readability fichièr e de clicar sul boton dejós per lo telecargar e l'importar." |
363 | worker: | 387 | worker: |
364 | enabled: "L'importacion se fa de manièra asincròna. Un còp l'importacion lançada, una aisina externa s'ocuparà dels messatges un per un. Lo servici actual es : " | 388 | enabled: "L'importacion se fa de manièra asincròna. Un còp l'importacion lançada, una aisina externa s'ocuparà dels messatges un per un. Lo servici actual es : " |
389 | download_images_warning: "Avètz activat lo telecargament de los imatges de vòstres articles. Combinat amb l'importacion classica, aquò pòt tardar un long moment (o benlèu fracassar). <strong>Recomandem fòrtament</strong> l'activacion de l'importacion asincròna per evitar las errors." | ||
365 | firefox: | 390 | firefox: |
366 | page_title: 'Importar > Firefox' | 391 | page_title: 'Importar > Firefox' |
367 | description: "Aquesta aisina importarà totas vòstres favorits de Firefox. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." | 392 | description: "Aquesta aisina importarà totas vòstres favorits de Firefox. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." |
@@ -374,6 +399,10 @@ import: | |||
374 | page_title: 'Importar > Instapaper' | 399 | page_title: 'Importar > Instapaper' |
375 | description: "Aquesta aisina importarà totas vòstres articles d'Instapaper. Sus la pagina de paramètres (https://www.instapaper.com/user), clicatz sus \"Download .CSV file\" dins la seccion \"Export\". Un fichièr CSV serà telecargat (aital \"instapaper-export.csv\")." | 400 | description: "Aquesta aisina importarà totas vòstres articles d'Instapaper. Sus la pagina de paramètres (https://www.instapaper.com/user), clicatz sus \"Download .CSV file\" dins la seccion \"Export\". Un fichièr CSV serà telecargat (aital \"instapaper-export.csv\")." |
376 | how_to: "Mercés de causir vòstre fichièr Instapaper e de clicar sul boton dejós per lo telecargar e l'importar" | 401 | how_to: "Mercés de causir vòstre fichièr Instapaper e de clicar sul boton dejós per lo telecargar e l'importar" |
402 | pinboard: | ||
403 | # page_title: "Import > Pinboard" | ||
404 | # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").' | ||
405 | # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.' | ||
377 | 406 | ||
378 | developer: | 407 | developer: |
379 | page_title: 'Desvolopaire' | 408 | page_title: 'Desvolopaire' |
@@ -397,7 +426,7 @@ developer: | |||
397 | warn_message_2: "Se suprimissètz un client, totas las aplicacions que l'emplegan foncionaràn pas mai amb vòstre compte wallabag." | 426 | warn_message_2: "Se suprimissètz un client, totas las aplicacions que l'emplegan foncionaràn pas mai amb vòstre compte wallabag." |
398 | action: 'Suprimir aqueste client' | 427 | action: 'Suprimir aqueste client' |
399 | client: | 428 | client: |
400 | page_title: 'Desvlopador > Novèl client' | 429 | page_title: 'Desvolopaire > Novèl client' |
401 | page_description: "Anatz crear un novèl client. Mercés de cumplir l'url de redireccion cap a vòstra aplicacion." | 430 | page_description: "Anatz crear un novèl client. Mercés de cumplir l'url de redireccion cap a vòstra aplicacion." |
402 | form: | 431 | form: |
403 | name_label: "Nom del client" | 432 | name_label: "Nom del client" |
@@ -405,7 +434,7 @@ developer: | |||
405 | save_label: 'Crear un novèl client' | 434 | save_label: 'Crear un novèl client' |
406 | action_back: 'Retorn' | 435 | action_back: 'Retorn' |
407 | client_parameter: | 436 | client_parameter: |
408 | page_title: 'Desvolopador > Los paramètres de vòstre client' | 437 | page_title: 'Desvolopaire > Los paramètres de vòstre client' |
409 | page_description: 'Vaquí los paramètres de vòstre client' | 438 | page_description: 'Vaquí los paramètres de vòstre client' |
410 | field_name: 'Nom del client' | 439 | field_name: 'Nom del client' |
411 | field_id: 'ID Client' | 440 | field_id: 'ID Client' |
@@ -413,7 +442,7 @@ developer: | |||
413 | back: 'Retour' | 442 | back: 'Retour' |
414 | read_howto: 'Legir "cossí crear ma primièra aplicacion"' | 443 | read_howto: 'Legir "cossí crear ma primièra aplicacion"' |
415 | howto: | 444 | howto: |
416 | page_title: 'Desvolopador > Cossí crear ma primièra aplicacion' | 445 | page_title: 'Desvolopaire > Cossí crear ma primièra aplicacion' |
417 | description: | 446 | description: |
418 | 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." | 447 | 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." |
419 | paragraph_2: "Vos cal un geton per escambiar entre vòstra aplicacion e l'API de wallabar." | 448 | paragraph_2: "Vos cal un geton per escambiar entre vòstra aplicacion e l'API de wallabar." |
@@ -426,34 +455,34 @@ developer: | |||
426 | back: 'Retorn' | 455 | back: 'Retorn' |
427 | 456 | ||
428 | user: | 457 | user: |
429 | # page_title: Users management | 458 | page_title: 'Gestion dels utilizaires' |
430 | # new_user: Create a new user | 459 | new_user: 'Crear un novèl utilizaire' |
431 | # edit_user: Edit an existing user | 460 | edit_user: 'Modificar un utilizaire existent' |
432 | # description: "Here you can manage all users (create, edit and delete)" | 461 | description: "Aquí podètz gerir totes los utilizaires (crear, modificar e suprimir)" |
433 | # list: | 462 | list: |
434 | # actions: Actions | 463 | actions: 'Accions' |
435 | # edit_action: Edit | 464 | edit_action: 'Modificar' |
436 | # yes: Yes | 465 | yes: 'Òc' |
437 | # no: No | 466 | no: 'Non' |
438 | # create_new_one: Create a new user | 467 | create_new_one: 'Crear un novèl utilizaire' |
439 | form: | 468 | form: |
440 | username_label: "Nom d'utilizaire" | 469 | username_label: "Nom d'utilizaire" |
441 | # name_label: 'Name' | 470 | name_label: 'Nom' |
442 | password_label: 'Senhal' | 471 | password_label: 'Senhal' |
443 | repeat_new_password_label: 'Confirmatz vòstre novèl senhal' | 472 | repeat_new_password_label: 'Confirmatz vòstre novèl senhal' |
444 | plain_password_label: 'Senhal en clar' | 473 | plain_password_label: 'Senhal en clar' |
445 | email_label: 'Adreça de corrièl' | 474 | email_label: 'Adreça de corrièl' |
446 | # enabled_label: 'Enabled' | 475 | enabled_label: 'Actiu' |
447 | # locked_label: 'Locked' | 476 | locked_label: 'Varrolhat' |
448 | # last_login_label: 'Last login' | 477 | last_login_label: 'Darrièra connexion' |
449 | # twofactor_label: Two factor authentication | 478 | twofactor_label: 'Autentificacion doble-factor' |
450 | # save: Save | 479 | save: 'Enregistrar' |
451 | # delete: Delete | 480 | delete: 'Suprimir' |
452 | # delete_confirm: Are you sure? | 481 | delete_confirm: 'Sètz segur ?' |
453 | # back_to_list: Back to list | 482 | back_to_list: 'Tornar a la lista' |
454 | 483 | ||
455 | error: | 484 | error: |
456 | # page_title: An error occurred | 485 | page_title: Una error s'es produsida |
457 | 486 | ||
458 | flashes: | 487 | flashes: |
459 | config: | 488 | config: |
@@ -465,8 +494,10 @@ flashes: | |||
465 | rss_updated: 'La configuracion dels fluxes RSS es ben estada mesa a jorn' | 494 | rss_updated: 'La configuracion dels fluxes RSS es ben estada mesa a jorn' |
466 | tagging_rules_updated: 'Règlas misa a jorn' | 495 | tagging_rules_updated: 'Règlas misa a jorn' |
467 | tagging_rules_deleted: 'Règla suprimida' | 496 | tagging_rules_deleted: 'Règla suprimida' |
468 | user_added: 'Utilizaire "%username%" apondut' | ||
469 | rss_token_updated: 'Geton RSS mes a jorn' | 497 | rss_token_updated: 'Geton RSS mes a jorn' |
498 | annotations_reset: Anotacions levadas | ||
499 | tags_reset: Etiquetas levadas | ||
500 | entries_reset: Articles levats | ||
470 | entry: | 501 | entry: |
471 | notice: | 502 | notice: |
472 | entry_already_saved: 'Article ja salvargardat lo %date%' | 503 | entry_already_saved: 'Article ja salvargardat lo %date%' |
@@ -477,12 +508,12 @@ flashes: | |||
477 | entry_reloaded_failed: "L'article es estat cargat de nòu mai la recuperacion del contengut a fracassat" | 508 | entry_reloaded_failed: "L'article es estat cargat de nòu mai la recuperacion del contengut a fracassat" |
478 | entry_archived: 'Article marcat coma legit' | 509 | entry_archived: 'Article marcat coma legit' |
479 | entry_unarchived: 'Article marcat coma pas legit' | 510 | entry_unarchived: 'Article marcat coma pas legit' |
480 | entry_starred: 'Article apondut dins los favorits' | 511 | entry_starred: 'Article ajustat dins los favorits' |
481 | entry_unstarred: 'Article quitat dels favorits' | 512 | entry_unstarred: 'Article quitat dels favorits' |
482 | entry_deleted: 'Article suprimit' | 513 | entry_deleted: 'Article suprimit' |
483 | tag: | 514 | tag: |
484 | notice: | 515 | notice: |
485 | tag_added: 'Etiqueta aponduda' | 516 | tag_added: 'Etiqueta ajustada' |
486 | import: | 517 | import: |
487 | notice: | 518 | notice: |
488 | failed: "L'importacion a fracassat, mercés de tornar ensajar" | 519 | failed: "L'importacion a fracassat, mercés de tornar ensajar" |
@@ -496,3 +527,8 @@ flashes: | |||
496 | notice: | 527 | notice: |
497 | client_created: 'Novèl client creat' | 528 | client_created: 'Novèl client creat' |
498 | client_deleted: 'Client suprimit' | 529 | client_deleted: 'Client suprimit' |
530 | user: | ||
531 | notice: | ||
532 | added: 'Utilizaire "%username%" ajustat' | ||
533 | updated: 'Utilizaire "%username%" mes a jorn' | ||
534 | deleted: 'Utilizaire "%username%" suprimit' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 73250cc0..38fc4ceb 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -70,7 +70,12 @@ config: | |||
70 | 200_word: 'Czytam ~200 słów na minutę' | 70 | 200_word: 'Czytam ~200 słów na minutę' |
71 | 300_word: 'Czytam ~300 słów na minutę' | 71 | 300_word: 'Czytam ~300 słów na minutę' |
72 | 400_word: 'Czytam ~400 słów na minutę' | 72 | 400_word: 'Czytam ~400 słów na minutę' |
73 | action_mark_as_read: | ||
74 | label: 'Gdzie zostaniesz przekierowany po oznaczeniu artukuły jako przeczytanego' | ||
75 | redirect_homepage: 'do strony głównej' | ||
76 | redirect_current_page: 'do bieżącej strony' | ||
73 | pocket_consumer_key_label: 'Klucz klienta Pocket do importu zawartości' | 77 | pocket_consumer_key_label: 'Klucz klienta Pocket do importu zawartości' |
78 | android_configuration: Skonfiguruj swoją androidową aplikację | ||
74 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 79 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
75 | # help_items_per_page: "You can change the number of articles displayed on each page." | 80 | # help_items_per_page: "You can change the number of articles displayed on each page." |
76 | # 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." | 81 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
@@ -94,6 +99,18 @@ config: | |||
94 | email_label: 'Adres email' | 99 | email_label: 'Adres email' |
95 | twoFactorAuthentication_label: 'Autoryzacja dwuetapowa' | 100 | twoFactorAuthentication_label: 'Autoryzacja dwuetapowa' |
96 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." | 101 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." |
102 | delete: | ||
103 | title: Usuń moje konto (niebezpieczna strefa !) | ||
104 | 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. | ||
105 | confirm: Jesteś pewien? (tej operacji NIE MOŻNA cofnąć) | ||
106 | button: Usuń moje konto | ||
107 | reset: | ||
108 | title: Reset (niebezpieczna strefa) | ||
109 | description: Poniższe przyciski pozwalają usunąć pewne informacje z twojego konta. Uważaj te operacje są NIEODWRACALNE. | ||
110 | annotations: Usuń WSZYSTKIE adnotacje | ||
111 | tags: Usuń WSZYSTKIE tagi | ||
112 | entries: usuń WSZYTSTKIE wpisy | ||
113 | confirm: Jesteś pewien? (tej operacji NIE MOŻNA cofnąć) | ||
97 | form_password: | 114 | form_password: |
98 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 115 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
99 | old_password_label: 'Stare hasło' | 116 | old_password_label: 'Stare hasło' |
@@ -145,6 +162,7 @@ entry: | |||
145 | archived: 'Zarchiwizowane wpisy' | 162 | archived: 'Zarchiwizowane wpisy' |
146 | filtered: 'Odfiltrowane wpisy' | 163 | filtered: 'Odfiltrowane wpisy' |
147 | filtered_tags: 'Filtrowane po tagach:' | 164 | filtered_tags: 'Filtrowane po tagach:' |
165 | # filtered_search: 'Filtered by search:' | ||
148 | untagged: 'Odtaguj wpisy' | 166 | untagged: 'Odtaguj wpisy' |
149 | list: | 167 | list: |
150 | number_on_the_page: '{0} Nie ma wpisów.|{1} Jest jeden wpis.|]1,Inf[ Są %count% wpisy.' | 168 | number_on_the_page: '{0} Nie ma wpisów.|{1} Jest jeden wpis.|]1,Inf[ Są %count% wpisy.' |
@@ -168,6 +186,7 @@ entry: | |||
168 | preview_picture_label: 'Posiada podgląd obrazu' | 186 | preview_picture_label: 'Posiada podgląd obrazu' |
169 | preview_picture_help: 'Podgląd obrazu' | 187 | preview_picture_help: 'Podgląd obrazu' |
170 | language_label: 'Język' | 188 | language_label: 'Język' |
189 | # http_status_label: 'HTTP status' | ||
171 | reading_time: | 190 | reading_time: |
172 | label: 'Czas czytania w minutach' | 191 | label: 'Czas czytania w minutach' |
173 | from: 'od' | 192 | from: 'od' |
@@ -209,6 +228,8 @@ entry: | |||
209 | placeholder: 'http://website.com' | 228 | placeholder: 'http://website.com' |
210 | form_new: | 229 | form_new: |
211 | url_label: Url | 230 | url_label: Url |
231 | search: | ||
232 | # placeholder: 'What are you looking for?' | ||
212 | edit: | 233 | edit: |
213 | page_title: 'Edytuj wpis' | 234 | page_title: 'Edytuj wpis' |
214 | title_label: 'Tytuł' | 235 | title_label: 'Tytuł' |
@@ -329,6 +350,9 @@ tag: | |||
329 | list: | 350 | list: |
330 | number_on_the_page: '{0} Nie ma tagów.|{1} Jest jeden tag.|]1,Inf[ Są %count% tagi.' | 351 | number_on_the_page: '{0} Nie ma tagów.|{1} Jest jeden tag.|]1,Inf[ Są %count% tagi.' |
331 | see_untagged_entries: 'Zobacz nieotagowane wpisy' | 352 | see_untagged_entries: 'Zobacz nieotagowane wpisy' |
353 | new: | ||
354 | add: 'Dodaj' | ||
355 | placeholder: 'Możesz dodać kilka tagów, oddzielając je przecinkami.' | ||
332 | 356 | ||
333 | import: | 357 | import: |
334 | page_title: 'Import' | 358 | page_title: 'Import' |
@@ -362,6 +386,7 @@ import: | |||
362 | how_to: 'Wybierz swój plik eksportu z Readability i kliknij poniższy przycisk, aby go załadować.' | 386 | how_to: 'Wybierz swój plik eksportu z Readability i kliknij poniższy przycisk, aby go załadować.' |
363 | worker: | 387 | worker: |
364 | enabled: "Import jest wykonywany asynchronicznie. Od momentu rozpoczęcia importu, zewnętrzna usługa może zajmować się na raz tylko jednym zadaniem. Bieżącą usługą jest:" | 388 | enabled: "Import jest wykonywany asynchronicznie. Od momentu rozpoczęcia importu, zewnętrzna usługa może zajmować się na raz tylko jednym zadaniem. Bieżącą usługą jest:" |
389 | download_images_warning: "Włączyłeś pobieranie obrazów dla swoich artykułów. W połączeniu z klasycznym importem, może to zająć dużo czasu (lub zakończyć się niepowodzeniem).<strong>Zdecydowanie zalecamy</strong> włączenie asynchronicznego importu, w celu uniknięcia błędów." | ||
365 | firefox: | 390 | firefox: |
366 | page_title: 'Import > Firefox' | 391 | page_title: 'Import > Firefox' |
367 | description: "Ten importer zaimportuje wszystkie twoje zakładki z Firefoksa. Idź do twoich zakładek (Ctrl+Shift+O), następnie w \"Import i kopie zapasowe\", wybierz \"Utwórz kopię zapasową...\". Uzyskasz plik .json." | 392 | description: "Ten importer zaimportuje wszystkie twoje zakładki z Firefoksa. Idź do twoich zakładek (Ctrl+Shift+O), następnie w \"Import i kopie zapasowe\", wybierz \"Utwórz kopię zapasową...\". Uzyskasz plik .json." |
@@ -374,6 +399,10 @@ import: | |||
374 | page_title: 'Import > Instapaper' | 399 | page_title: 'Import > Instapaper' |
375 | description: 'Ten importer, zaimportuje wszystkie twoje artykuły z Instapaper. W ustawieniach (https://www.instapaper.com/user), kliknij na "Download .CSV file" w sekcji "Export". Otrzymasz plik CSV.' | 400 | description: 'Ten importer, zaimportuje wszystkie twoje artykuły z Instapaper. W ustawieniach (https://www.instapaper.com/user), kliknij na "Download .CSV file" w sekcji "Export". Otrzymasz plik CSV.' |
376 | how_to: 'Wybierz swój plik eksportu z Instapaper i kliknij poniższy przycisk, aby go załadować.' | 401 | how_to: 'Wybierz swój plik eksportu z Instapaper i kliknij poniższy przycisk, aby go załadować.' |
402 | pinboard: | ||
403 | page_title: "Import > Pinboard" | ||
404 | description: 'Ten importer, zaimportuje wszystkie twoje artykuły z Pinboard. W ustawieniach kopii zapasowej (https://pinboard.in/settings/backup), kliknij na "JSON" w sekcji "Bookmarks". Otrzymasz plik "pinboard_export".' | ||
405 | how_to: 'Wybierz swój plik eksportu z Pinboard i kliknij poniższy przycisk, aby go załadować.' | ||
377 | 406 | ||
378 | developer: | 407 | developer: |
379 | page_title: 'Deweloper' | 408 | page_title: 'Deweloper' |
@@ -453,7 +482,7 @@ user: | |||
453 | back_to_list: Powrót do listy | 482 | back_to_list: Powrót do listy |
454 | 483 | ||
455 | error: | 484 | error: |
456 | # page_title: An error occurred | 485 | page_title: Wystąpił błąd |
457 | 486 | ||
458 | flashes: | 487 | flashes: |
459 | config: | 488 | config: |
@@ -465,8 +494,10 @@ flashes: | |||
465 | rss_updated: 'Informacje RSS zaktualizowane' | 494 | rss_updated: 'Informacje RSS zaktualizowane' |
466 | tagging_rules_updated: 'Reguły tagowania zaktualizowane' | 495 | tagging_rules_updated: 'Reguły tagowania zaktualizowane' |
467 | tagging_rules_deleted: 'Reguła tagowania usunięta' | 496 | tagging_rules_deleted: 'Reguła tagowania usunięta' |
468 | user_added: 'Użytkownik "%username%" dodany' | ||
469 | rss_token_updated: 'Token kanału RSS zaktualizowany' | 497 | rss_token_updated: 'Token kanału RSS zaktualizowany' |
498 | annotations_reset: Zresetuj adnotacje | ||
499 | tags_reset: Zresetuj tagi | ||
500 | entries_reset: Zresetuj wpisy | ||
470 | entry: | 501 | entry: |
471 | notice: | 502 | notice: |
472 | entry_already_saved: 'Wpis już został dodany %date%' | 503 | entry_already_saved: 'Wpis już został dodany %date%' |
@@ -496,3 +527,8 @@ flashes: | |||
496 | notice: | 527 | notice: |
497 | client_created: 'Nowy klient utworzony.' | 528 | client_created: 'Nowy klient utworzony.' |
498 | client_deleted: 'Klient usunięty' | 529 | client_deleted: 'Klient usunięty' |
530 | user: | ||
531 | notice: | ||
532 | added: 'Użytkownik "%username%" dodany' | ||
533 | updated: 'Użytkownik "%username%" zaktualizowany' | ||
534 | deleted: 'Użytkownik "%username%" usunięty' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index a375ac7b..4084469c 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -70,7 +70,12 @@ config: | |||
70 | 200_word: 'Posso ler ~200 palavras por minuto' | 70 | 200_word: 'Posso ler ~200 palavras por minuto' |
71 | 300_word: 'Posso ler ~300 palavras por minuto' | 71 | 300_word: 'Posso ler ~300 palavras por minuto' |
72 | 400_word: 'Posso ler ~400 palavras por minuto' | 72 | 400_word: 'Posso ler ~400 palavras por minuto' |
73 | action_mark_as_read: | ||
74 | # label: 'Where do you to be redirected after mark an article as read?' | ||
75 | # redirect_homepage: 'To the homepage' | ||
76 | # redirect_current_page: 'To the current page' | ||
73 | pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo' | 77 | pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo' |
78 | # android_configuration: Configure your Android application | ||
74 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 79 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
75 | # help_items_per_page: "You can change the number of articles displayed on each page." | 80 | # help_items_per_page: "You can change the number of articles displayed on each page." |
76 | # 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." | 81 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
@@ -94,6 +99,18 @@ config: | |||
94 | email_label: 'E-mail' | 99 | email_label: 'E-mail' |
95 | twoFactorAuthentication_label: 'Autenticação de dois passos' | 100 | twoFactorAuthentication_label: 'Autenticação de dois passos' |
96 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." | 101 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." |
102 | delete: | ||
103 | # title: Delete my account (a.k.a danger zone) | ||
104 | # 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. | ||
105 | # confirm: Are you really sure? (THIS CAN'T BE UNDONE) | ||
106 | # button: Delete my account | ||
107 | reset: | ||
108 | # title: Reset area (a.k.a danger zone) | ||
109 | # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE. | ||
110 | # annotations: Remove ALL annotations | ||
111 | # tags: Remove ALL tags | ||
112 | # entries: Remove ALL entries | ||
113 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | ||
97 | form_password: | 114 | form_password: |
98 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 115 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
99 | old_password_label: 'Senha atual' | 116 | old_password_label: 'Senha atual' |
@@ -145,6 +162,7 @@ entry: | |||
145 | archived: 'Entradas arquivadas' | 162 | archived: 'Entradas arquivadas' |
146 | filtered: 'Entradas filtradas' | 163 | filtered: 'Entradas filtradas' |
147 | filtered_tags: 'Filtrar por tags:' | 164 | filtered_tags: 'Filtrar por tags:' |
165 | # filtered_search: 'Filtered by search:' | ||
148 | untagged: 'Entradas sem tags' | 166 | untagged: 'Entradas sem tags' |
149 | list: | 167 | list: |
150 | number_on_the_page: '{0} Não existem entradas.|{1} Existe uma entrada.|]1,Inf[ Existem %count% entradas.' | 168 | number_on_the_page: '{0} Não existem entradas.|{1} Existe uma entrada.|]1,Inf[ Existem %count% entradas.' |
@@ -168,6 +186,7 @@ entry: | |||
168 | preview_picture_label: 'Possui uma imagem de preview' | 186 | preview_picture_label: 'Possui uma imagem de preview' |
169 | preview_picture_help: 'Imagem de preview' | 187 | preview_picture_help: 'Imagem de preview' |
170 | language_label: 'Idioma' | 188 | language_label: 'Idioma' |
189 | # http_status_label: 'HTTP status' | ||
171 | reading_time: | 190 | reading_time: |
172 | label: 'Tempo de leitura em minutos' | 191 | label: 'Tempo de leitura em minutos' |
173 | from: 'de' | 192 | from: 'de' |
@@ -209,6 +228,8 @@ entry: | |||
209 | placeholder: 'http://website.com' | 228 | placeholder: 'http://website.com' |
210 | form_new: | 229 | form_new: |
211 | url_label: Url | 230 | url_label: Url |
231 | search: | ||
232 | # placeholder: 'What are you looking for?' | ||
212 | edit: | 233 | edit: |
213 | page_title: 'Editar uma entrada' | 234 | page_title: 'Editar uma entrada' |
214 | title_label: 'Título' | 235 | title_label: 'Título' |
@@ -329,6 +350,9 @@ tag: | |||
329 | list: | 350 | list: |
330 | number_on_the_page: '{0} Não existem tags.|{1} Uma tag.|]1,Inf[ Existem %count% tags.' | 351 | number_on_the_page: '{0} Não existem tags.|{1} Uma tag.|]1,Inf[ Existem %count% tags.' |
331 | see_untagged_entries: 'Ver entradas sem tags' | 352 | see_untagged_entries: 'Ver entradas sem tags' |
353 | new: | ||
354 | # add: 'Add' | ||
355 | # placeholder: 'You can add several tags, separated by a comma.' | ||
332 | 356 | ||
333 | import: | 357 | import: |
334 | page_title: 'Importar' | 358 | page_title: 'Importar' |
@@ -362,6 +386,7 @@ import: | |||
362 | how_to: 'Por favor, selecione sua exportação do Readability e clique no botão abaixo para importá-la.' | 386 | how_to: 'Por favor, selecione sua exportação do Readability e clique no botão abaixo para importá-la.' |
363 | worker: | 387 | worker: |
364 | enabled: "A importação é feita assíncronamente. Uma vez que a tarefa de importação é iniciada, um trabalho externo pode executar tarefas uma por vez. O serviço atual é:" | 388 | enabled: "A importação é feita assíncronamente. Uma vez que a tarefa de importação é iniciada, um trabalho externo pode executar tarefas uma por vez. O serviço atual é:" |
389 | # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors." | ||
365 | firefox: | 390 | firefox: |
366 | page_title: 'Importar > Firefox' | 391 | page_title: 'Importar > Firefox' |
367 | description: "Com este importador você importa todos os favoritos de seu Firefox. Somente vá até seus favoritos (Ctrl+Maj+O), e em \"Importar e Backup\" e escolha \"Backup...\". Você terá então um arquivo .json." | 392 | description: "Com este importador você importa todos os favoritos de seu Firefox. Somente vá até seus favoritos (Ctrl+Maj+O), e em \"Importar e Backup\" e escolha \"Backup...\". Você terá então um arquivo .json." |
@@ -374,6 +399,10 @@ import: | |||
374 | page_title: 'Importar > Instapaper' | 399 | page_title: 'Importar > Instapaper' |
375 | description: 'Este importador pode importar todos os artigos do seu Instapaper. Nas página de configurações (https://www.instapaper.com/user), clique em "Download .CSV file" na seção "Export". Um arquivo CSV será baixado (algo como "instapaper-export.csv").' | 400 | description: 'Este importador pode importar todos os artigos do seu Instapaper. Nas página de configurações (https://www.instapaper.com/user), clique em "Download .CSV file" na seção "Export". Um arquivo CSV será baixado (algo como "instapaper-export.csv").' |
376 | how_to: 'Por favor, selecione sua exportação do seu Instapaper e clique no botão abaixo para importá-la.' | 401 | how_to: 'Por favor, selecione sua exportação do seu Instapaper e clique no botão abaixo para importá-la.' |
402 | pinboard: | ||
403 | # page_title: "Import > Pinboard" | ||
404 | # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").' | ||
405 | # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.' | ||
377 | 406 | ||
378 | developer: | 407 | developer: |
379 | page_title: 'Desenvolvedor' | 408 | page_title: 'Desenvolvedor' |
@@ -452,17 +481,23 @@ user: | |||
452 | delete_confirm: 'Tem certeza?' | 481 | delete_confirm: 'Tem certeza?' |
453 | back_to_list: 'Voltar para a lista' | 482 | back_to_list: 'Voltar para a lista' |
454 | 483 | ||
484 | error: | ||
485 | # page_title: An error occurred | ||
486 | |||
455 | flashes: | 487 | flashes: |
456 | config: | 488 | config: |
457 | notice: | 489 | notice: |
458 | config_saved: 'Configiração salva.' | 490 | config_saved: 'Configiração salva.' |
459 | password_updated: 'Senha atualizada' | 491 | password_updated: 'Senha atualizada' |
460 | password_not_updated_demo: 'Em modo de demonstração, você não pode alterar a senha deste usuário.' | 492 | password_not_updated_demo: 'Em modo de demonstração, você não pode alterar a senha deste usuário.' |
461 | user_updated: 'Informação atualizada' | 493 | # user_updated: 'Information updated' |
462 | rss_updated: 'Informação de RSS atualizada' | 494 | rss_updated: 'Informação de RSS atualizada' |
463 | tagging_rules_updated: 'Regras de tags atualizadas' | 495 | tagging_rules_updated: 'Regras de tags atualizadas' |
464 | tagging_rules_deleted: 'Regra de tag apagada' | 496 | tagging_rules_deleted: 'Regra de tag apagada' |
465 | rss_token_updated: 'Token RSS atualizado' | 497 | rss_token_updated: 'Token RSS atualizado' |
498 | # annotations_reset: Annotations reset | ||
499 | # tags_reset: Tags reset | ||
500 | # entries_reset: Entries reset | ||
466 | entry: | 501 | entry: |
467 | notice: | 502 | notice: |
468 | entry_already_saved: 'Entrada já foi salva em %date%' | 503 | entry_already_saved: 'Entrada já foi salva em %date%' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 7d8fcea3..a6a7e146 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -70,7 +70,12 @@ config: | |||
70 | # 200_word: 'I read ~200 words per minute' | 70 | # 200_word: 'I read ~200 words per minute' |
71 | # 300_word: 'I read ~300 words per minute' | 71 | # 300_word: 'I read ~300 words per minute' |
72 | # 400_word: 'I read ~400 words per minute' | 72 | # 400_word: 'I read ~400 words per minute' |
73 | action_mark_as_read: | ||
74 | # label: 'Where do you to be redirected after mark an article as read?' | ||
75 | # redirect_homepage: 'To the homepage' | ||
76 | # redirect_current_page: 'To the current page' | ||
73 | pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket | 77 | pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket |
78 | # android_configuration: Configure your Android application | ||
74 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 79 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
75 | # help_items_per_page: "You can change the number of articles displayed on each page." | 80 | # help_items_per_page: "You can change the number of articles displayed on each page." |
76 | # 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." | 81 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
@@ -94,6 +99,18 @@ config: | |||
94 | email_label: 'E-mail' | 99 | email_label: 'E-mail' |
95 | # twoFactorAuthentication_label: 'Two factor authentication' | 100 | # twoFactorAuthentication_label: 'Two factor authentication' |
96 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." | 101 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." |
102 | delete: | ||
103 | # title: Delete my account (a.k.a danger zone) | ||
104 | # 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. | ||
105 | # confirm: Are you really sure? (THIS CAN'T BE UNDONE) | ||
106 | # button: Delete my account | ||
107 | reset: | ||
108 | # title: Reset area (a.k.a danger zone) | ||
109 | # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE. | ||
110 | # annotations: Remove ALL annotations | ||
111 | # tags: Remove ALL tags | ||
112 | # entries: Remove ALL entries | ||
113 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | ||
97 | form_password: | 114 | form_password: |
98 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 115 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
99 | old_password_label: 'Parola veche' | 116 | old_password_label: 'Parola veche' |
@@ -145,6 +162,7 @@ entry: | |||
145 | # archived: 'Archived entries' | 162 | # archived: 'Archived entries' |
146 | # filtered: 'Filtered entries' | 163 | # filtered: 'Filtered entries' |
147 | # filtered_tags: 'Filtered by tags:' | 164 | # filtered_tags: 'Filtered by tags:' |
165 | # filtered_search: 'Filtered by search:' | ||
148 | # untagged: 'Untagged entries' | 166 | # untagged: 'Untagged entries' |
149 | list: | 167 | list: |
150 | # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.' | 168 | # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.' |
@@ -168,6 +186,7 @@ entry: | |||
168 | preview_picture_label: 'Are o imagine de previzualizare' | 186 | preview_picture_label: 'Are o imagine de previzualizare' |
169 | preview_picture_help: 'Previzualizare imagine' | 187 | preview_picture_help: 'Previzualizare imagine' |
170 | language_label: 'Limbă' | 188 | language_label: 'Limbă' |
189 | # http_status_label: 'HTTP status' | ||
171 | reading_time: | 190 | reading_time: |
172 | label: 'Timp de citire în minute' | 191 | label: 'Timp de citire în minute' |
173 | from: 'de la' | 192 | from: 'de la' |
@@ -209,6 +228,8 @@ entry: | |||
209 | placeholder: 'http://website.com' | 228 | placeholder: 'http://website.com' |
210 | form_new: | 229 | form_new: |
211 | url_label: Url | 230 | url_label: Url |
231 | search: | ||
232 | # placeholder: 'What are you looking for?' | ||
212 | edit: | 233 | edit: |
213 | # page_title: 'Edit an entry' | 234 | # page_title: 'Edit an entry' |
214 | # title_label: 'Title' | 235 | # title_label: 'Title' |
@@ -329,6 +350,9 @@ tag: | |||
329 | list: | 350 | list: |
330 | # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.' | 351 | # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.' |
331 | # see_untagged_entries: 'See untagged entries' | 352 | # see_untagged_entries: 'See untagged entries' |
353 | new: | ||
354 | # add: 'Add' | ||
355 | # placeholder: 'You can add several tags, separated by a comma.' | ||
332 | 356 | ||
333 | import: | 357 | import: |
334 | # page_title: 'Import' | 358 | # page_title: 'Import' |
@@ -362,6 +386,7 @@ import: | |||
362 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 386 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
363 | worker: | 387 | worker: |
364 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" | 388 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" |
389 | # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors." | ||
365 | # firefox: | 390 | # firefox: |
366 | # page_title: 'Import > Firefox' | 391 | # page_title: 'Import > Firefox' |
367 | # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." | 392 | # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." |
@@ -374,6 +399,10 @@ import: | |||
374 | # page_title: 'Import > Instapaper' | 399 | # page_title: 'Import > Instapaper' |
375 | # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").' | 400 | # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").' |
376 | # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.' | 401 | # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.' |
402 | pinboard: | ||
403 | # page_title: "Import > Pinboard" | ||
404 | # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").' | ||
405 | # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.' | ||
377 | 406 | ||
378 | developer: | 407 | developer: |
379 | # page_title: 'Developer' | 408 | # page_title: 'Developer' |
@@ -465,8 +494,10 @@ flashes: | |||
465 | rss_updated: 'Informație RSS actualizată' | 494 | rss_updated: 'Informație RSS actualizată' |
466 | # tagging_rules_updated: 'Tagging rules updated' | 495 | # tagging_rules_updated: 'Tagging rules updated' |
467 | # tagging_rules_deleted: 'Tagging rule deleted' | 496 | # tagging_rules_deleted: 'Tagging rule deleted' |
468 | # user_added: 'User "%username%" added' | ||
469 | # rss_token_updated: 'RSS token updated' | 497 | # rss_token_updated: 'RSS token updated' |
498 | # annotations_reset: Annotations reset | ||
499 | # tags_reset: Tags reset | ||
500 | # entries_reset: Entries reset | ||
470 | entry: | 501 | entry: |
471 | notice: | 502 | notice: |
472 | # entry_already_saved: 'Entry already saved on %date%' | 503 | # entry_already_saved: 'Entry already saved on %date%' |
@@ -496,3 +527,8 @@ flashes: | |||
496 | notice: | 527 | notice: |
497 | # client_created: 'New client created.' | 528 | # client_created: 'New client created.' |
498 | # client_deleted: 'Client deleted' | 529 | # client_deleted: 'Client deleted' |
530 | user: | ||
531 | notice: | ||
532 | # added: 'User "%username%" added' | ||
533 | # updated: 'User "%username%" updated' | ||
534 | # deleted: 'User "%username%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 357aa2ae..630ad0ca 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -70,7 +70,12 @@ config: | |||
70 | # 200_word: 'I read ~200 words per minute' | 70 | # 200_word: 'I read ~200 words per minute' |
71 | # 300_word: 'I read ~300 words per minute' | 71 | # 300_word: 'I read ~300 words per minute' |
72 | # 400_word: 'I read ~400 words per minute' | 72 | # 400_word: 'I read ~400 words per minute' |
73 | action_mark_as_read: | ||
74 | # label: 'Where do you to be redirected after mark an article as read?' | ||
75 | # redirect_homepage: 'To the homepage' | ||
76 | # redirect_current_page: 'To the current page' | ||
73 | # pocket_consumer_key_label: Consumer key for Pocket to import contents | 77 | # pocket_consumer_key_label: Consumer key for Pocket to import contents |
78 | # android_configuration: Configure your Android application | ||
74 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." | 79 | # help_theme: "wallabag is customizable. You can choose your prefered theme here." |
75 | # help_items_per_page: "You can change the number of articles displayed on each page." | 80 | # help_items_per_page: "You can change the number of articles displayed on each page." |
76 | # 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." | 81 | # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." |
@@ -94,6 +99,18 @@ config: | |||
94 | email_label: 'E-posta' | 99 | email_label: 'E-posta' |
95 | twoFactorAuthentication_label: 'İki adımlı doğrulama' | 100 | twoFactorAuthentication_label: 'İki adımlı doğrulama' |
96 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." | 101 | # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." |
102 | delete: | ||
103 | # title: Delete my account (a.k.a danger zone) | ||
104 | # 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. | ||
105 | # confirm: Are you really sure? (THIS CAN'T BE UNDONE) | ||
106 | # button: Delete my account | ||
107 | reset: | ||
108 | # title: Reset area (a.k.a danger zone) | ||
109 | # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE. | ||
110 | # annotations: Remove ALL annotations | ||
111 | # tags: Remove ALL tags | ||
112 | # entries: Remove ALL entries | ||
113 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | ||
97 | form_password: | 114 | form_password: |
98 | # description: "You can change your password here. Your new password should by at least 8 characters long." | 115 | # description: "You can change your password here. Your new password should by at least 8 characters long." |
99 | old_password_label: 'Eski şifre' | 116 | old_password_label: 'Eski şifre' |
@@ -103,6 +120,7 @@ config: | |||
103 | # if_label: 'if' | 120 | # if_label: 'if' |
104 | # then_tag_as_label: 'then tag as' | 121 | # then_tag_as_label: 'then tag as' |
105 | # delete_rule_label: 'delete' | 122 | # delete_rule_label: 'delete' |
123 | # edit_rule_label: 'edit' | ||
106 | rule_label: 'Kural' | 124 | rule_label: 'Kural' |
107 | tags_label: 'Etiketler' | 125 | tags_label: 'Etiketler' |
108 | faq: | 126 | faq: |
@@ -144,6 +162,7 @@ entry: | |||
144 | # archived: 'Archived entries' | 162 | # archived: 'Archived entries' |
145 | # filtered: 'Filtered entries' | 163 | # filtered: 'Filtered entries' |
146 | # filtered_tags: 'Filtered by tags:' | 164 | # filtered_tags: 'Filtered by tags:' |
165 | # filtered_search: 'Filtered by search:' | ||
147 | # untagged: 'Untagged entries' | 166 | # untagged: 'Untagged entries' |
148 | list: | 167 | list: |
149 | number_on_the_page: '{0} Herhangi bir makale yok.|{1} Burada bir adet makale var.|]1,Inf[ Burada %count% adet makale var.' | 168 | number_on_the_page: '{0} Herhangi bir makale yok.|{1} Burada bir adet makale var.|]1,Inf[ Burada %count% adet makale var.' |
@@ -167,6 +186,7 @@ entry: | |||
167 | preview_picture_label: 'Resim önizlemesi varsa' | 186 | preview_picture_label: 'Resim önizlemesi varsa' |
168 | preview_picture_help: 'Resim önizlemesi' | 187 | preview_picture_help: 'Resim önizlemesi' |
169 | language_label: 'Dil' | 188 | language_label: 'Dil' |
189 | # http_status_label: 'HTTP status' | ||
170 | reading_time: | 190 | reading_time: |
171 | label: 'Dakika cinsinden okuma süresi' | 191 | label: 'Dakika cinsinden okuma süresi' |
172 | from: 'başlangıç' | 192 | from: 'başlangıç' |
@@ -208,6 +228,8 @@ entry: | |||
208 | placeholder: 'http://website.com' | 228 | placeholder: 'http://website.com' |
209 | form_new: | 229 | form_new: |
210 | url_label: Url | 230 | url_label: Url |
231 | search: | ||
232 | # placeholder: 'What are you looking for?' | ||
211 | edit: | 233 | edit: |
212 | page_title: 'Makaleyi düzenle' | 234 | page_title: 'Makaleyi düzenle' |
213 | title_label: 'Başlık' | 235 | title_label: 'Başlık' |
@@ -328,6 +350,9 @@ tag: | |||
328 | list: | 350 | list: |
329 | number_on_the_page: '{0} Herhangi bir etiket yok.|{1} Burada bir adet etiket var.|]1,Inf[ Burada %count% adet etiket var.' | 351 | number_on_the_page: '{0} Herhangi bir etiket yok.|{1} Burada bir adet etiket var.|]1,Inf[ Burada %count% adet etiket var.' |
330 | # see_untagged_entries: 'See untagged entries' | 352 | # see_untagged_entries: 'See untagged entries' |
353 | new: | ||
354 | # add: 'Add' | ||
355 | # placeholder: 'You can add several tags, separated by a comma.' | ||
331 | 356 | ||
332 | import: | 357 | import: |
333 | page_title: 'İçe Aktar' | 358 | page_title: 'İçe Aktar' |
@@ -361,6 +386,7 @@ import: | |||
361 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 386 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
362 | worker: | 387 | worker: |
363 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" | 388 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" |
389 | # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors." | ||
364 | firefox: | 390 | firefox: |
365 | page_title: 'İçe Aktar > Firefox' | 391 | page_title: 'İçe Aktar > Firefox' |
366 | # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." | 392 | # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." |
@@ -373,6 +399,10 @@ import: | |||
373 | page_title: 'İçe Aktar > Instapaper' | 399 | page_title: 'İçe Aktar > Instapaper' |
374 | # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").' | 400 | # description: 'This importer will import all your Instapaper articles. On the settings (https://www.instapaper.com/user) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like "instapaper-export.csv").' |
375 | # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.' | 401 | # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.' |
402 | pinboard: | ||
403 | # page_title: "Import > Pinboard" | ||
404 | # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").' | ||
405 | # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.' | ||
376 | 406 | ||
377 | developer: | 407 | developer: |
378 | # page_title: 'Developer' | 408 | # page_title: 'Developer' |
@@ -464,8 +494,10 @@ flashes: | |||
464 | rss_updated: 'RSS bilgiler güncellendi' | 494 | rss_updated: 'RSS bilgiler güncellendi' |
465 | tagging_rules_updated: 'Tagging rules updated' | 495 | tagging_rules_updated: 'Tagging rules updated' |
466 | tagging_rules_deleted: 'Tagging rule deleted' | 496 | tagging_rules_deleted: 'Tagging rule deleted' |
467 | user_added: 'User "%username%" added' | ||
468 | rss_token_updated: 'RSS token updated' | 497 | rss_token_updated: 'RSS token updated' |
498 | # annotations_reset: Annotations reset | ||
499 | # tags_reset: Tags reset | ||
500 | # entries_reset: Entries reset | ||
469 | entry: | 501 | entry: |
470 | notice: | 502 | notice: |
471 | entry_already_saved: 'Entry already saved on %date%' | 503 | entry_already_saved: 'Entry already saved on %date%' |
@@ -495,3 +527,8 @@ flashes: | |||
495 | notice: | 527 | notice: |
496 | # client_created: 'New client created.' | 528 | # client_created: 'New client created.' |
497 | # client_deleted: 'Client deleted' | 529 | # client_deleted: 'Client deleted' |
530 | user: | ||
531 | notice: | ||
532 | # added: 'User "%username%" added' | ||
533 | # updated: 'User "%username%" updated' | ||
534 | # deleted: 'User "%username%" deleted' | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index a1a9a136..289458d4 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig | |||
@@ -41,6 +41,8 @@ | |||
41 | {% block css %} | 41 | {% block css %} |
42 | {% endblock %} | 42 | {% endblock %} |
43 | {% block scripts %} | 43 | {% block scripts %} |
44 | <script src="{{ asset('bundles/fosjsrouting/js/router.js') }}"></script> | ||
45 | <script src="{{ path('fos_js_routing_js', { callback: 'fos.Router.setData' }) }}"></script> | ||
44 | {% endblock %} | 46 | {% endblock %} |
45 | 47 | ||
46 | <title>{% block title %}{% endblock %} – wallabag</title> | 48 | <title>{% block title %}{% endblock %} – wallabag</title> |
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 98b0e119..3548f590 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 | |||
@@ -47,6 +47,14 @@ | |||
47 | 47 | ||
48 | <fieldset class="w500p inline"> | 48 | <fieldset class="w500p inline"> |
49 | <div class="row"> | 49 | <div class="row"> |
50 | {{ form_label(form.config.action_mark_as_read) }} | ||
51 | {{ form_errors(form.config.action_mark_as_read) }} | ||
52 | {{ form_widget(form.config.action_mark_as_read) }} | ||
53 | </div> | ||
54 | </fieldset> | ||
55 | |||
56 | <fieldset class="w500p inline"> | ||
57 | <div class="row"> | ||
50 | {{ form_label(form.config.language) }} | 58 | {{ form_label(form.config.language) }} |
51 | {{ form_errors(form.config.language) }} | 59 | {{ form_errors(form.config.language) }} |
52 | {{ form_widget(form.config.language) }} | 60 | {{ form_widget(form.config.language) }} |
@@ -71,6 +79,19 @@ | |||
71 | </a> | 79 | </a> |
72 | </fieldset> | 80 | </fieldset> |
73 | 81 | ||
82 | <fieldset class="w500p inline"> | ||
83 | <div class="row"> | ||
84 | <h3>{{ 'config.form_settings.android_configuration'|trans }}</h3> | ||
85 | <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" >Touch here to prefill your Android application</a> | ||
86 | <br/> | ||
87 | <img id="androidQrcode" /> | ||
88 | <script> | ||
89 | const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}'); | ||
90 | document.getElementById('androidQrcode').src = imgBase64; | ||
91 | </script> | ||
92 | </div> | ||
93 | </fieldset> | ||
94 | |||
74 | {{ form_rest(form.config) }} | 95 | {{ form_rest(form.config) }} |
75 | </form> | 96 | </form> |
76 | 97 | ||
@@ -164,10 +185,41 @@ | |||
164 | </fieldset> | 185 | </fieldset> |
165 | {% endif %} | 186 | {% endif %} |
166 | 187 | ||
188 | <h2>{{ 'config.reset.title'|trans }}</h2> | ||
189 | <fieldset class="w500p inline"> | ||
190 | <p>{{ 'config.reset.description'|trans }}</p> | ||
191 | <ul> | ||
192 | <li> | ||
193 | <a href="{{ path('config_reset', { type: 'annotations'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
194 | {{ 'config.reset.annotations'|trans }} | ||
195 | </a> | ||
196 | </li> | ||
197 | <li> | ||
198 | <a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
199 | {{ 'config.reset.tags'|trans }} | ||
200 | </a> | ||
201 | </li> | ||
202 | <li> | ||
203 | <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
204 | {{ 'config.reset.entries'|trans }} | ||
205 | </a> | ||
206 | </li> | ||
207 | </ul> | ||
208 | </fieldset> | ||
209 | |||
167 | {{ form_widget(form.user._token) }} | 210 | {{ form_widget(form.user._token) }} |
168 | {{ form_widget(form.user.save) }} | 211 | {{ form_widget(form.user.save) }} |
169 | </form> | 212 | </form> |
170 | 213 | ||
214 | {% if enabled_users > 1 %} | ||
215 | <h2>{{ 'config.form_user.delete.title'|trans }}</h2> | ||
216 | |||
217 | <p>{{ 'config.form_user.delete.description'|trans }}</p> | ||
218 | <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"> | ||
219 | {{ 'config.form_user.delete.button'|trans }} | ||
220 | </a> | ||
221 | {% endif %} | ||
222 | |||
171 | <h2>{{ 'config.tab_menu.password'|trans }}</h2> | 223 | <h2>{{ 'config.tab_menu.password'|trans }}</h2> |
172 | 224 | ||
173 | {{ form_start(form.pwd) }} | 225 | {{ form_start(form.pwd) }} |
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 56a0faac..a13fe903 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | |||
@@ -1,11 +1,14 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block title %} | 3 | {% block title %} |
4 | {% set currentTag = '' %} | 4 | {% set filter = '' %} |
5 | {% if tag is defined %} | 5 | {% if tag is defined %} |
6 | {% set currentTag = tag %} | 6 | {% set filter = tag %} |
7 | {% endif %} | 7 | {% endif %} |
8 | {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'currentTag': currentTag} %} | 8 | {% if searchTerm is defined and searchTerm is not empty %} |
9 | {% set filter = searchTerm %} | ||
10 | {% endif %} | ||
11 | {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'filter': filter} %} | ||
9 | {% endblock %} | 12 | {% endblock %} |
10 | 13 | ||
11 | {% block content %} | 14 | {% block content %} |
@@ -131,6 +134,13 @@ | |||
131 | </div> | 134 | </div> |
132 | </div> | 135 | </div> |
133 | 136 | ||
137 | <div id="filter-http-status" class="filter-group"> | ||
138 | {{ form_label(form.httpStatus) }} | ||
139 | <div class="input-field "> | ||
140 | {{ form_widget(form.httpStatus) }} | ||
141 | </div> | ||
142 | </div> | ||
143 | |||
134 | <div id="filter-reading-time" class="filter-group"> | 144 | <div id="filter-reading-time" class="filter-group"> |
135 | <div class=""> | 145 | <div class=""> |
136 | {{ form_label(form.readingTime) }} | 146 | {{ form_label(form.readingTime) }} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 3689159b..2e9673d5 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | |||
@@ -11,7 +11,7 @@ | |||
11 | <div id="article_toolbar"> | 11 | <div id="article_toolbar"> |
12 | <ul class="links"> | 12 | <ul class="links"> |
13 | <li class="topPosF"><a href="#top" title="{{ 'entry.view.left_menu.back_to_top'|trans }}" class="tool top icon icon-arrow-up-thick"><span>{{ 'entry.view.left_menu.set_as_read'|trans }}</span></a></li> | 13 | <li class="topPosF"><a href="#top" title="{{ 'entry.view.left_menu.back_to_top'|trans }}" class="tool top icon icon-arrow-up-thick"><span>{{ 'entry.view.left_menu.set_as_read'|trans }}</span></a></li> |
14 | <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li> | 14 | <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon icon-link original"><span>{{ entry.domainName|removeWww }}</span></a></li> |
15 | <li><a title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span></a></li> | 15 | <li><a title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span></a></li> |
16 | 16 | ||
17 | {% set markAsReadLabel = 'entry.view.left_menu.set_as_unread' %} | 17 | {% set markAsReadLabel = 'entry.view.left_menu.set_as_unread' %} |
@@ -19,8 +19,8 @@ | |||
19 | {% set markAsReadLabel = 'entry.view.left_menu.set_as_read' %} | 19 | {% set markAsReadLabel = 'entry.view.left_menu.set_as_read' %} |
20 | {% endif %} | 20 | {% endif %} |
21 | 21 | ||
22 | <li><a title="{{ markAsReadLabel|trans }}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ markAsReadLabel|trans }}</span></a></li> | 22 | <li><a title="{{ markAsReadLabel|trans }}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %} markasread" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ markAsReadLabel|trans }}</span></a></li> |
23 | <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li> | 23 | <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %} favorite" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li> |
24 | <li><a id="nav-btn-add-tag" class="tool icon icon-price-tags" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li> | 24 | <li><a id="nav-btn-add-tag" class="tool icon icon-price-tags" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li> |
25 | <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li> | 25 | <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li> |
26 | {% if craue_setting('share_public') %} | 26 | {% if craue_setting('share_public') %} |
@@ -31,6 +31,7 @@ | |||
31 | {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="Email"><span>Email</span></a></li>{% endif %} | 31 | {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="Email"><span>Email</span></a></li>{% endif %} |
32 | {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %} | 32 | {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %} |
33 | {% if craue_setting('share_diaspora') %}<li><a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}¬es=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora"><span>diaspora</span></a></li>{% endif %} | 33 | {% if craue_setting('share_diaspora') %}<li><a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}¬es=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora"><span>diaspora</span></a></li>{% endif %} |
34 | {% if craue_setting('share_unmark') %}<li><a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&title={{entry.title|url_encode}}&v=6" target="_blank" class="tool unmark icon-image icon-image--unmark" title="unmark"><span>unmark.it</span></a></li>{% endif %} | ||
34 | {% if craue_setting('carrot') %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot"><span>Carrot</span></a></li>{% endif %} | 35 | {% if craue_setting('carrot') %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot"><span>Carrot</span></a></li>{% endif %} |
35 | {% if craue_setting('show_printlink') %}<li><a title="{{ 'entry.view.left_menu.print'|trans }}" class="tool icon icon-print" href="javascript: window.print();"><span>{{ 'entry.view.left_menu.print'|trans }}</span></a></li>{% endif %} | 36 | {% if craue_setting('show_printlink') %}<li><a title="{{ 'entry.view.left_menu.print'|trans }}" class="tool icon icon-print" href="javascript: window.print();"><span>{{ 'entry.view.left_menu.print'|trans }}</span></a></li>{% endif %} |
36 | {% if craue_setting('export_epub') %}<li><a href="?epub&method=id&value={{ entry.id }}" title="Generate ePub file">EPUB</a></li>{% endif %} | 37 | {% if craue_setting('export_epub') %}<li><a href="?epub&method=id&value={{ entry.id }}" title="Generate ePub file">EPUB</a></li>{% endif %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/search_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/search_form.html.twig new file mode 100644 index 00000000..20821b6d --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/search_form.html.twig | |||
@@ -0,0 +1,17 @@ | |||
1 | <form name="search" method="GET" action="{{ path('search')}}"> | ||
2 | <h2>{{ 'menu.left.search'|trans }}</h2> | ||
3 | <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">×</a> | ||
4 | {% if form_errors(form) %} | ||
5 | <span class="black-text">{{ form_errors(form) }}</span> | ||
6 | {% endif %} | ||
7 | |||
8 | {% if form_errors(form.term) %} | ||
9 | <span class="black-text">{{ form_errors(form.term) }}</span> | ||
10 | {% endif %} | ||
11 | |||
12 | <input type="hidden" name="currentRoute" value="{{ currentRoute }}" /> | ||
13 | |||
14 | {{ form_widget(form.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.search.placeholder'} }) }} | ||
15 | |||
16 | {{ form_rest(form) }} | ||
17 | </form> | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig index cd4ed3fa..07ff8e14 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig | |||
@@ -31,17 +31,11 @@ | |||
31 | <li class="menu all"><a href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }}</a></li> | 31 | <li class="menu all"><a href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }}</a></li> |
32 | <li class="menu tag"><a href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a></li> | 32 | <li class="menu tag"><a href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a></li> |
33 | <li class="menu new"><a href="{{ path('new') }}">{{ 'menu.left.save_link'|trans }}</a></li> | 33 | <li class="menu new"><a href="{{ path('new') }}">{{ 'menu.left.save_link'|trans }}</a></li> |
34 | <!--<li style="position: relative;"><a href="javascript: void(null);" id="search">{{ 'menu.left.search'|trans }}</a> | 34 | <li style="position: relative;"><a href="javascript: void(null);" id="search">{{ 'menu.left.search'|trans }}</a> |
35 | <div id="search-form" class="messages info popup-form"> | 35 | <div id="search-form" class="messages info popup-form"> |
36 | <form method="get" action="index.php"> | 36 | {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }} |
37 | <h2>{{ 'menu.left.search'|trans }}</h2> | ||
38 | <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">×</a> | ||
39 | <input type="hidden" name="view" value="search"> | ||
40 | <input required placeholder="{{ 'menu.search_form.input_label'|trans }}" type="text" name="search" id="searchfield"><br> | ||
41 | <input id="submit-search" type="submit" value="{{ 'menu.left.search'|trans }}"> | ||
42 | </form> | ||
43 | </div> | 37 | </div> |
44 | </li>--> | 38 | </li> |
45 | <li class="menu config"><a href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a></li> | 39 | <li class="menu config"><a href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a></li> |
46 | {% if is_granted('ROLE_SUPER_ADMIN') %} | 40 | {% if is_granted('ROLE_SUPER_ADMIN') %} |
47 | <li class="menu users"><a href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a></li> | 41 | <li class="menu users"><a href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a></li> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig index 92cabdd9..654c1d2d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig | |||
@@ -6,8 +6,10 @@ | |||
6 | {{ 'entry.page_titles.archived'|trans }} | 6 | {{ 'entry.page_titles.archived'|trans }} |
7 | {% elseif currentRoute == 'all' %} | 7 | {% elseif currentRoute == 'all' %} |
8 | {{ 'entry.page_titles.filtered'|trans }} | 8 | {{ 'entry.page_titles.filtered'|trans }} |
9 | {% elseif currentRoute == 'search' %} | ||
10 | {{ 'entry.page_titles.filtered_search'|trans }} {{ filter }} | ||
9 | {% elseif currentRoute == 'tag_entries' %} | 11 | {% elseif currentRoute == 'tag_entries' %} |
10 | {{ 'entry.page_titles.filtered_tags'|trans }} {{ currentTag }} | 12 | {{ 'entry.page_titles.filtered_tags'|trans }} {{ filter }} |
11 | {% elseif currentRoute == 'untagged' %} | 13 | {% elseif currentRoute == 'untagged' %} |
12 | {{ 'entry.page_titles.untagged'|trans }} | 14 | {{ 'entry.page_titles.untagged'|trans }} |
13 | {% else %} | 15 | {% else %} |
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 288bb54f..16ecaa97 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 | |||
@@ -2,7 +2,15 @@ | |||
2 | <rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/"> | 2 | <rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/"> |
3 | <channel> | 3 | <channel> |
4 | <title>wallabag — {{type}} feed</title> | 4 | <title>wallabag — {{type}} feed</title> |
5 | <link>{{ url('unread') }}</link> | 5 | <link>{{ url(type) }}</link> |
6 | <link rel="self" href="{{ app.request.uri }}"/> | ||
7 | {% if entries.hasPreviousPage -%} | ||
8 | <link rel="previous" href="{{ url }}?page={{ entries.previousPage }}"/> | ||
9 | {% endif -%} | ||
10 | {% if entries.hasNextPage -%} | ||
11 | <link rel="next" href="{{ url }}?page={{ entries.nextPage }}"/> | ||
12 | {% endif -%} | ||
13 | <link rel="last" href="{{ url }}?page={{ entries.nbPages }}"/> | ||
6 | <pubDate>{{ "now"|date('D, d M Y H:i:s') }}</pubDate> | 14 | <pubDate>{{ "now"|date('D, d M Y H:i:s') }}</pubDate> |
7 | <generator>wallabag</generator> | 15 | <generator>wallabag</generator> |
8 | <description>wallabag {{type}} elements</description> | 16 | <description>wallabag {{type}} elements</description> |
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 9f67217b..5d411fdd 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 | |||
@@ -66,6 +66,14 @@ | |||
66 | </div> | 66 | </div> |
67 | </div> | 67 | </div> |
68 | 68 | ||
69 | <div class="row"> | ||
70 | <div class="input-field col s12"> | ||
71 | {{ form_label(form.config.action_mark_as_read) }} | ||
72 | {{ form_errors(form.config.action_mark_as_read) }} | ||
73 | {{ form_widget(form.config.action_mark_as_read) }} | ||
74 | </div> | ||
75 | </div> | ||
76 | |||
69 | <div class="row"> | 77 | <div class="row"> |
70 | <div class="input-field col s11"> | 78 | <div class="input-field col s11"> |
71 | {{ form_label(form.config.language) }} | 79 | {{ form_label(form.config.language) }} |
@@ -96,6 +104,18 @@ | |||
96 | </div> | 104 | </div> |
97 | </div> | 105 | </div> |
98 | 106 | ||
107 | <div class="row"> | ||
108 | <div class="input-field col s12"> | ||
109 | <h5>{{ 'config.form_settings.android_configuration'|trans }}</h5> | ||
110 | <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" class="waves-effect waves-light btn hide-on-large-only">Touch here to prefill your Android application</a> | ||
111 | <img id="androidQrcode" class="hide-on-med-and-down" /> | ||
112 | </div> | ||
113 | <script> | ||
114 | const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}'); | ||
115 | document.getElementById('androidQrcode').src = imgBase64; | ||
116 | </script> | ||
117 | </div> | ||
118 | |||
99 | {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | 119 | {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} |
100 | {{ form_rest(form.config) }} | 120 | {{ form_rest(form.config) }} |
101 | </form> | 121 | </form> |
@@ -197,6 +217,34 @@ | |||
197 | {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | 217 | {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} |
198 | {{ form_widget(form.user._token) }} | 218 | {{ form_widget(form.user._token) }} |
199 | </form> | 219 | </form> |
220 | |||
221 | <br /><hr /><br /> | ||
222 | |||
223 | <div class="row"> | ||
224 | <h5>{{ 'config.reset.title'|trans }}</h5> | ||
225 | <p>{{ 'config.reset.description'|trans }}</p> | ||
226 | <a href="{{ path('config_reset', { type: 'annotations'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
227 | {{ 'config.reset.annotations'|trans }} | ||
228 | </a> | ||
229 | <a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
230 | {{ 'config.reset.tags'|trans }} | ||
231 | </a> | ||
232 | <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red"> | ||
233 | {{ 'config.reset.entries'|trans }} | ||
234 | </a> | ||
235 | </div> | ||
236 | |||
237 | {% if enabled_users > 1 %} | ||
238 | <br /><hr /><br /> | ||
239 | |||
240 | <div class="row"> | ||
241 | <h5>{{ 'config.form_user.delete.title'|trans }}</h5> | ||
242 | <p>{{ 'config.form_user.delete.description'|trans }}</p> | ||
243 | <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"> | ||
244 | {{ 'config.form_user.delete.button'|trans }} | ||
245 | </a> | ||
246 | </div> | ||
247 | {% endif %} | ||
200 | </div> | 248 | </div> |
201 | 249 | ||
202 | <div id="set4" class="col s12"> | 250 | <div id="set4" class="col s12"> |
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 c610c8d2..00e8bf63 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | |||
@@ -1,11 +1,14 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block title %} | 3 | {% block title %} |
4 | {% set currentTag = '' %} | 4 | {% set filter = '' %} |
5 | {% if tag is defined %} | 5 | {% if tag is defined %} |
6 | {% set currentTag = tag %} | 6 | {% set filter = tag %} |
7 | {% endif %} | ||
8 | {% if searchTerm is defined and searchTerm is not empty %} | ||
9 | {% set filter = searchTerm %} | ||
7 | {% endif %} | 10 | {% endif %} |
8 | {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'currentTag': currentTag} %} | 11 | {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'filter': filter} %} |
9 | {% endblock %} | 12 | {% endblock %} |
10 | 13 | ||
11 | {% block content %} | 14 | {% block content %} |
@@ -104,6 +107,14 @@ | |||
104 | </div> | 107 | </div> |
105 | 108 | ||
106 | <div class="col s12"> | 109 | <div class="col s12"> |
110 | {{ form_label(form.httpStatus) }} | ||
111 | </div> | ||
112 | |||
113 | <div class="input-field col s12"> | ||
114 | {{ form_widget(form.httpStatus) }} | ||
115 | </div> | ||
116 | |||
117 | <div class="col s12"> | ||
107 | {{ form_label(form.readingTime) }} | 118 | {{ form_label(form.readingTime) }} |
108 | </div> | 119 | </div> |
109 | <div class="input-field col s6"> | 120 | <div class="input-field col s6"> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index c615a907..bed0fdec 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | |||
@@ -46,14 +46,14 @@ | |||
46 | </li> | 46 | </li> |
47 | 47 | ||
48 | <li class="bold border-bottom hide-on-med-and-down"> | 48 | <li class="bold border-bottom hide-on-med-and-down"> |
49 | <a class="waves-effect collapsible-header" href="{{ entry.url|e }}"> | 49 | <a class="waves-effect collapsible-header original" href="{{ entry.url|e }}" target="_blank"> |
50 | <i class="material-icons small">link</i> | 50 | <i class="material-icons small">link</i> |
51 | <span>{{ 'entry.view.left_menu.view_original_article'|trans }}</span> | 51 | <span>{{ 'entry.view.left_menu.view_original_article'|trans }}</span> |
52 | </a> | 52 | </a> |
53 | <div class="collapsible-body"></div> | 53 | <div class="collapsible-body"></div> |
54 | </li> | 54 | </li> |
55 | 55 | ||
56 | <li class="bold hide-on-med-and-down"> | 56 | <li class="bold"> |
57 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" href="{{ path('reload_entry', { 'id': entry.id }) }}" id="reload"> | 57 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" href="{{ path('reload_entry', { 'id': entry.id }) }}" id="reload"> |
58 | <i class="material-icons small">autorenew</i> | 58 | <i class="material-icons small">autorenew</i> |
59 | <span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span> | 59 | <span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span> |
@@ -67,7 +67,7 @@ | |||
67 | {% endif %} | 67 | {% endif %} |
68 | 68 | ||
69 | <li class="bold hide-on-med-and-down"> | 69 | <li class="bold hide-on-med-and-down"> |
70 | <a class="waves-effect collapsible-header" title="{{ markAsReadLabel|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> | 70 | <a class="waves-effect collapsible-header markasread" title="{{ markAsReadLabel|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> |
71 | <i class="material-icons small">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i> | 71 | <i class="material-icons small">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i> |
72 | <span>{{ markAsReadLabel|trans }}</span> | 72 | <span>{{ markAsReadLabel|trans }}</span> |
73 | </a> | 73 | </a> |
@@ -75,21 +75,21 @@ | |||
75 | </li> | 75 | </li> |
76 | 76 | ||
77 | <li class="bold hide-on-med-and-down"> | 77 | <li class="bold hide-on-med-and-down"> |
78 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> | 78 | <a class="waves-effect collapsible-header favorite" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> |
79 | <i class="material-icons spall">{% if entry.isStarred == 0 %}star_outline{% else %}star{% endif %}</i> | 79 | <i class="material-icons spall">{% if entry.isStarred == 0 %}star_outline{% else %}star{% endif %}</i> |
80 | <span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span> | 80 | <span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span> |
81 | </a> | 81 | </a> |
82 | <div class="collapsible-body"></div> | 82 | <div class="collapsible-body"></div> |
83 | </li> | 83 | </li> |
84 | <li class="bold border-bottom hide-on-med-and-down"> | 84 | <li class="bold border-bottom"> |
85 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> | 85 | <a class="waves-effect collapsible-header delete" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> |
86 | <i class="material-icons small">delete</i> | 86 | <i class="material-icons small">delete</i> |
87 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> | 87 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> |
88 | </a> | 88 | </a> |
89 | <div class="collapsible-body"></div> | 89 | <div class="collapsible-body"></div> |
90 | </li> | 90 | </li> |
91 | 91 | ||
92 | <li class="bold border-bottom hide-on-med-and-down"> | 92 | <li class="bold border-bottom"> |
93 | <a class="waves-effect collapsible-header" id="nav-btn-add-tag"> | 93 | <a class="waves-effect collapsible-header" id="nav-btn-add-tag"> |
94 | <i class="material-icons small">label_outline</i> | 94 | <i class="material-icons small">label_outline</i> |
95 | <span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span> | 95 | <span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span> |
@@ -139,6 +139,14 @@ | |||
139 | </a> | 139 | </a> |
140 | </li> | 140 | </li> |
141 | {% endif %} | 141 | {% endif %} |
142 | {% if craue_setting('share_unmark') %} | ||
143 | <li> | ||
144 | <a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&title={{entry.title|url_encode}}&v=6" target="_blank"> | ||
145 | <i class="tool icon-image icon-image--unmark" title="unmark"></i> | ||
146 | <span>unmark.it</span> | ||
147 | </a> | ||
148 | </li> | ||
149 | {% endif %} | ||
142 | {% if craue_setting('carrot') %} | 150 | {% if craue_setting('carrot') %} |
143 | <li> | 151 | <li> |
144 | <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" title="carrot"> | 152 | <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" title="carrot"> |
@@ -186,14 +194,6 @@ | |||
186 | </div> | 194 | </div> |
187 | </li> | 195 | </li> |
188 | 196 | ||
189 | <li class="bold hide-on-large-only"> | ||
190 | <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> | ||
191 | <i class="material-icons small">delete</i> | ||
192 | <span>{{ 'entry.view.left_menu.delete'|trans }}</span> | ||
193 | </a> | ||
194 | <div class="collapsible-body"></div> | ||
195 | </li> | ||
196 | |||
197 | <li class="bold"> | 197 | <li class="bold"> |
198 | <a class="waves-effect collapsible-header" href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.description'|trans }}"> | 198 | <a class="waves-effect collapsible-header" href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.description'|trans }}"> |
199 | <i class="material-icons small">error</i> | 199 | <i class="material-icons small">error</i> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig new file mode 100644 index 00000000..f25de94d --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig | |||
@@ -0,0 +1,15 @@ | |||
1 | <form name="search" method="GET" action="{{ path('search')}}"> | ||
2 | {% if form_errors(form) %} | ||
3 | <span class="black-text">{{ form_errors(form) }}</span> | ||
4 | {% endif %} | ||
5 | |||
6 | {% if form_errors(form.term) %} | ||
7 | <span class="black-text">{{ form_errors(form.term) }}</span> | ||
8 | {% endif %} | ||
9 | |||
10 | <input type="hidden" name="currentRoute" value="{{ currentRoute }}" /> | ||
11 | |||
12 | {{ form_widget(form.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.search.placeholder'} }) }} | ||
13 | |||
14 | {{ form_rest(form) }} | ||
15 | </form> | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig index 6e552560..b702c4b6 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig | |||
@@ -9,5 +9,6 @@ | |||
9 | 9 | ||
10 | {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }} | 10 | {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }} |
11 | 11 | ||
12 | {{ form_rest(form) }} | 12 | {{ form_widget(form.add, {'attr': {'class': 'btn waves-effect waves-light hide-on-large-only'}}) }} |
13 | {{ form_widget(form._token) }} | ||
13 | </form> | 14 | </form> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index f1ef01df..551486e0 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -89,11 +89,11 @@ | |||
89 | <i class="material-icons">add</i> | 89 | <i class="material-icons">add</i> |
90 | </a> | 90 | </a> |
91 | </li> | 91 | </li> |
92 | <!--<li> | 92 | <li> |
93 | <a title="{{ 'menu.top.search'|trans }}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search"> | 93 | <a title="{{ 'menu.top.search'|trans }}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search"> |
94 | <i class="material-icons">search</i> | 94 | <i class="material-icons">search</i> |
95 | </a> | 95 | </a> |
96 | </li>--> | 96 | </li> |
97 | <li id="button_filters"> | 97 | <li id="button_filters"> |
98 | <a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters"> | 98 | <a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters"> |
99 | <i class="material-icons">filter_list</i> | 99 | <i class="material-icons">filter_list</i> |
@@ -106,13 +106,11 @@ | |||
106 | </li> | 106 | </li> |
107 | </ul> | 107 | </ul> |
108 | </div> | 108 | </div> |
109 | <form method="get" action="index.php"> | 109 | <div class="input-field nav-panel-search" style="display: none"> |
110 | <div class="input-field nav-panel-search" style="display: none"> | 110 | {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }} |
111 | <input name="search" id="searchfield" type="search" required placeholder="{{ 'menu.search_form.input_label'|trans }}"> | 111 | <label for="search" class="active"><i class="material-icons search">search</i></label> |
112 | <label for="search"><i class="material-icons search">search</i></label> | 112 | <i class="material-icons close">clear</i> |
113 | <i class="material-icons close">clear</i> | 113 | </div> |
114 | </div> | ||
115 | </form> | ||
116 | <div class="input-field nav-panel-add" style="display: none"> | 114 | <div class="input-field nav-panel-add" style="display: none"> |
117 | {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }} | 115 | {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }} |
118 | <label for="add" class="active"><i class="material-icons add">add</i></label> | 116 | <label for="add" class="active"><i class="material-icons add">add</i></label> |