14 files changed, 260 insertions, 13 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 065d281c..2db283ae 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -136,6 +136,15 @@ config:
        # edit_rule_label: 'edit'
        # rule_label: 'Rule'
        # tags_label: 'Tags'
+        # card:
+        #     new_tagging_rule: Create a tagging rule
+        #     import_tagging_rules: Import tagging rules
+        #     import_tagging_rules_detail: You have to select the JSON file you previously exported.
+        #     export_tagging_rules: Export tagging rules
+        #     export_tagging_rules_detail: This will download a JSON file that you can use to import tagging rules elsewhere or to backup them.
+        # file_label: JSON file
+        # import_submit: Import
+        # export: Export
        # faq:
        #     title: 'FAQ'
        #     tagging_rules_definition_title: 'What does « tagging rules » mean?'
@@ -598,6 +607,9 @@ flashes:
            # tags_reset: Tags reset
            # entries_reset: Entries reset
            # archived_reset: Archived entries deleted
+            # otp_enabled: Two-factor authentication enabled
+            # tagging_rules_imported: Tagging rules imported
+            # tagging_rules_not_imported: Error while importing tagging rules
    entry:
        notice:
            # entry_already_saved: 'Entry already saved on %date%'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index ef909978..db01272f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -136,6 +136,15 @@ config:
        edit_rule_label: 'bearbeiten'
        rule_label: 'Regel'
        tags_label: 'Tags'
+        # card:
+        #     new_tagging_rule: Create a tagging rule
+        #     import_tagging_rules: Import tagging rules
+        #     import_tagging_rules_detail: You have to select the JSON file you previously exported.
+        #     export_tagging_rules: Export tagging rules
+        #     export_tagging_rules_detail: This will download a JSON file that you can use to import tagging rules elsewhere or to backup them.
+        # file_label: JSON file
+        # import_submit: Import
+        # export: Export
        faq:
            title: 'FAQ'
            tagging_rules_definition_title: 'Was bedeuten die "Tagging-Regeln"?'
@@ -168,6 +177,15 @@ config:
                and: 'Eine Regel UND eine andere'
                matches: 'Testet, ob eine <i>Variable</i> auf eine <i>Suche</i> zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).<br />Beispiel: <code>title matches "Fußball"</code>'
                notmatches: 'Testet, ob ein <i>Titel</i> nicht auf eine <i>Suche</i> zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).<br />Beispiel: <code>title notmatches "Fußball"</code>'
+    otp:
+        # page_title: Two-factor authentication
+        # app:
+        #     two_factor_code_description_1: You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. It'll disapear after a page reload.
+        #     two_factor_code_description_2: 'You can scan that QR Code with your app:'
+        #     two_factor_code_description_3: 'Also, save these backup codes in a safe place, you can use them in case you lose access to your OTP app:'
+        #     two_factor_code_description_4: 'Test an OTP code from your configured app:'
+        #     cancel: Cancel
+        #     enable: Enable
 entry:
    default_title: 'Titel des Eintrags'
@@ -589,6 +607,9 @@ flashes:
            tags_reset: Tags zurücksetzen
            entries_reset: Einträge zurücksetzen
            archived_reset: Archiverte Einträge zurücksetzen
+            # otp_enabled: Two-factor authentication enabled
+            # tagging_rules_imported: Tagging rules imported
+            # tagging_rules_not_imported: Error while importing tagging rules
    entry:
        notice:
            entry_already_saved: 'Eintrag bereits am %date% gespeichert'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index dc12015f..6d006310 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -136,6 +136,15 @@ config:
        edit_rule_label: 'edit'
        rule_label: 'Rule'
        tags_label: 'Tags'
+        card:
+            new_tagging_rule: Create a tagging rule
+            import_tagging_rules: Import tagging rules
+            import_tagging_rules_detail: You have to select the JSON file you previously exported.
+            export_tagging_rules: Export tagging rules
+            export_tagging_rules_detail: This will download a JSON file that you can use to import tagging rules elsewhere or to backup them.
+        file_label: JSON file
+        import_submit: Import
+        export: Export
        faq:
            title: 'FAQ'
            tagging_rules_definition_title: 'What does « tagging rules » mean?'
@@ -599,6 +608,8 @@ flashes:
            entries_reset: Entries reset
            archived_reset: Archived entries deleted
            otp_enabled: Two-factor authentication enabled
+            tagging_rules_imported: Tagging rules imported
+            tagging_rules_not_imported: Error while importing tagging rules
    entry:
        notice:
            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 6eb5498d..0eb74396 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -136,6 +136,15 @@ config:
        edit_rule_label: 'editar'
        rule_label: 'Regla'
        tags_label: 'Etiquetas'
+        # card:
+        #     new_tagging_rule: Create a tagging rule
+        #     import_tagging_rules: Import tagging rules
+        #     import_tagging_rules_detail: You have to select the JSON file you previously exported.
+        #     export_tagging_rules: Export tagging rules
+        #     export_tagging_rules_detail: This will download a JSON file that you can use to import tagging rules elsewhere or to backup them.
+        # file_label: JSON file
+        # import_submit: Import
+        # export: Export
        faq:
            title: 'Preguntas frecuentes'
            tagging_rules_definition_title: '¿Qué significa « reglas de etiquetado automático »?'
@@ -598,6 +607,9 @@ flashes:
            tags_reset: Etiquetas reiniciadas
            entries_reset: Artículos reiniciados
            # archived_reset: Archived entries deleted
+            # otp_enabled: Two-factor authentication enabled
+            # tagging_rules_imported: Tagging rules imported
+            # tagging_rules_not_imported: Error while importing tagging rules
    entry:
        notice:
            entry_already_saved: 'Artículo ya guardado el %fecha%'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 659331c6..35afdbf4 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -136,6 +136,15 @@ config:
        # edit_rule_label: 'edit'
        rule_label: 'قانون'
        tags_label: 'برچسب‌ها'
+        # card:
+        #     new_tagging_rule: Create a tagging rule
+        #     import_tagging_rules: Import tagging rules
+        #     import_tagging_rules_detail: You have to select the JSON file you previously exported.
+        #     export_tagging_rules: Export tagging rules
+        #     export_tagging_rules_detail: This will download a JSON file that you can use to import tagging rules elsewhere or to backup them.
+        # file_label: JSON file
+        # import_submit: Import
+        # export: Export
        faq:
            title: 'پرسش‌های متداول'
            tagging_rules_definition_title: 'برچسب‌گذاری خودکار یعنی چه؟'
@@ -598,6 +607,9 @@ flashes:
            # tags_reset: Tags reset
            # entries_reset: Entries reset
            # archived_reset: Archived entries deleted
+            # otp_enabled: Two-factor authentication enabled
+            # tagging_rules_imported: Tagging rules imported
+            # tagging_rules_not_imported: Error while importing tagging rules
    entry:
        notice:
            entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index f19d8c4c..8a79b02f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -136,6 +136,15 @@ config:
        edit_rule_label: "éditer"
        rule_label: "Règle"
        tags_label: "Tags"
+        card:
+            new_tagging_rule: Créer une règle
+            import_tagging_rules: Importer des règles
+            import_tagging_rules_detail: Vous devez sélectionné un fichier JSON que vous avez précédemment exporté.
+            export_tagging_rules: Exporter les règles
+            export_tagging_rules_detail: Un fichier JSON sera téléchargé et vous pourrez l'utiliser pour ré-importer les règles ou comme sauvegarde.
+        file_label: Fichier JSON
+        import_submit: Importer
+        export: Export
        faq:
            title: "FAQ"
            tagging_rules_definition_title: "Que signifient les règles de tag automatiques ?"
@@ -600,6 +609,8 @@ flashes:
            entries_reset: "Articles supprimés"
            archived_reset: "Articles archivés supprimés"
            otp_enabled: "Authentification à double-facteur activée"
+            tagging_rules_imported: Règles bien importées
+            tagging_rules_not_imported: Impossible d'importer les règles
    entry:
        notice:
            entry_already_saved: "Article déjà sauvegardé le %date%"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 700a37d2..859bbb14 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -101,6 +101,7 @@ config:
        # login_label: 'Login (can not be changed)'
        name_label: 'Nome'
        email_label: 'E-mail'
+        two_factor:
            # emailTwoFactor_label: 'Using email (receive a code by email)'
            # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)'
            # table_method: Method
@@ -135,6 +136,15 @@ config:
        edit_rule_label: 'modifica'
        rule_label: 'Regola'
        tags_label: 'Etichetta'
+        # card:
+        #     new_tagging_rule: Create a tagging rule
+        #     import_tagging_rules: Import tagging rules
+        #     import_tagging_rules_detail: You have to select the JSON file you previously exported.
+        #     export_tagging_rules: Export tagging rules
+        #     export_tagging_rules_detail: This will download a JSON file that you can use to import tagging rules elsewhere or to backup them.
+        # file_label: JSON file
+        # import_submit: Import
+        # export: Export
        faq:
            title: 'FAQ'
            tagging_rules_definition_title: 'Cosa significa « regole di etichettatura » ?'
@@ -597,6 +607,9 @@ flashes:
            tags_reset: Reset etichette
            entries_reset: Reset articoli
            # archived_reset: Archived entries deleted
+            # otp_enabled: Two-factor authentication enabled
+            # tagging_rules_imported: Tagging rules imported
+            # tagging_rules_not_imported: Error while importing tagging rules
    entry:
        notice:
            entry_already_saved: 'Contenuto già salvato in data %date%'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 023aa2e5..7d928613 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -101,6 +101,7 @@ config:
        # login_label: 'Login (can not be changed)'
        name_label: 'Nom'
        email_label: 'Adreça de corrièl'
+        two_factor:
            # emailTwoFactor_label: 'Using email (receive a code by email)'
            # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)'
            # table_method: Method
@@ -135,6 +136,15 @@ config:
        edit_rule_label: 'modificar'
        rule_label: 'Règla'
        tags_label: 'Etiquetas'
+        # card:
+        #     new_tagging_rule: Create a tagging rule
+        #     import_tagging_rules: Import tagging rules
+        #     import_tagging_rules_detail: You have to select the JSON file you previously exported.
+        #     export_tagging_rules: Export tagging rules
+        #     export_tagging_rules_detail: This will download a JSON file that you can use to import tagging rules elsewhere or to backup them.
+        # file_label: JSON file
+        # import_submit: Import
+        # export: Export
        faq:
            title: 'FAQ'
            tagging_rules_definition_title: "Qué significa las règlas d'etiquetas automaticas ?"
@@ -597,6 +607,9 @@ flashes:
            tags_reset: Etiquetas levadas
            entries_reset: Articles levats
            archived_reset: Articles archivat suprimits
+            # otp_enabled: Two-factor authentication enabled
+            # tagging_rules_imported: Tagging rules imported
+            # tagging_rules_not_imported: Error while importing tagging rules
    entry:
        notice:
            entry_already_saved: 'Article ja salvagardat lo %date%'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 876db24a..8e7ad7f2 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -101,6 +101,7 @@ config:
        # login_label: 'Login (can not be changed)'
        name_label: 'Nazwa'
        email_label: 'Adres email'
+        two_factor:
            # emailTwoFactor_label: 'Using email (receive a code by email)'
            # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)'
            # table_method: Method
@@ -135,6 +136,15 @@ config:
        edit_rule_label: 'edytuj'
        rule_label: 'Reguła'
        tags_label: 'Tagi'
+        # card:
+        #     new_tagging_rule: Create a tagging rule
+        #     import_tagging_rules: Import tagging rules
+        #     import_tagging_rules_detail: You have to select the JSON file you previously exported.
+        #     export_tagging_rules: Export tagging rules
+        #     export_tagging_rules_detail: This will download a JSON file that you can use to import tagging rules elsewhere or to backup them.
+        # file_label: JSON file
+        # import_submit: Import
+        # export: Export
        faq:
            title: 'FAQ'
            tagging_rules_definition_title: 'Co oznaczają « reguły tagowania » ?'
@@ -597,6 +607,9 @@ flashes:
            tags_reset: Zresetuj tagi
            entries_reset: Zresetuj wpisy
            archived_reset: Zarchiwizowane wpisy usunięte
+            # otp_enabled: Two-factor authentication enabled
+            # tagging_rules_imported: Tagging rules imported
+            # tagging_rules_not_imported: Error while importing tagging rules
    entry:
        notice:
            entry_already_saved: 'Wpis już został dodany %date%'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 786288c1..ee45c085 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -101,6 +101,7 @@ config:
        # login_label: 'Login (can not be changed)'
        name_label: 'Nome'
        email_label: 'E-mail'
+        two_factor:
            # emailTwoFactor_label: 'Using email (receive a code by email)'
            # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)'
            # table_method: Method
@@ -135,6 +136,15 @@ config:
        edit_rule_label: 'editar'
        rule_label: 'Regras'
        tags_label: 'Tags'
+        # card:
+        #     new_tagging_rule: Create a tagging rule
+        #     import_tagging_rules: Import tagging rules
+        #     import_tagging_rules_detail: You have to select the JSON file you previously exported.
+        #     export_tagging_rules: Export tagging rules
+        #     export_tagging_rules_detail: This will download a JSON file that you can use to import tagging rules elsewhere or to backup them.
+        # file_label: JSON file
+        # import_submit: Import
+        # export: Export
        faq:
            title: 'FAQ'
            tagging_rules_definition_title: 'O que as « regras de tags » significam?'
@@ -597,6 +607,9 @@ flashes:
            # tags_reset: Tags reset
            # entries_reset: Entries reset
            # archived_reset: Archived entries deleted
+            # otp_enabled: Two-factor authentication enabled
+            # tagging_rules_imported: Tagging rules imported
+            # tagging_rules_not_imported: Error while importing tagging rules
    entry:
        notice:
            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 0d8904fe..edfc77a2 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -101,6 +101,7 @@ config:
        # login_label: 'Login (can not be changed)'
        name_label: 'Nume'
        email_label: 'E-mail'
+        two_factor:
            # emailTwoFactor_label: 'Using email (receive a code by email)'
            # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)'
            # table_method: Method
@@ -135,6 +136,15 @@ config:
        # edit_rule_label: 'edit'
        # rule_label: 'Rule'
        # tags_label: 'Tags'
+        # card:
+        #     new_tagging_rule: Create a tagging rule
+        #     import_tagging_rules: Import tagging rules
+        #     import_tagging_rules_detail: You have to select the JSON file you previously exported.
+        #     export_tagging_rules: Export tagging rules
+        #     export_tagging_rules_detail: This will download a JSON file that you can use to import tagging rules elsewhere or to backup them.
+        # file_label: JSON file
+        # import_submit: Import
+        # export: Export
        # faq:
        #     title: 'FAQ'
        #     tagging_rules_definition_title: 'What does « tagging rules » mean?'
@@ -425,9 +435,9 @@ tag:
    rename:
        # placeholder: 'You can update tag name.'
-# export:
+export:
-#     footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>'
+    # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>'
-#     unknown: 'Unknown'
+    # unknown: 'Unknown'
 import:
    # page_title: 'Import'
@@ -597,6 +607,9 @@ flashes:
            # tags_reset: Tags reset
            # entries_reset: Entries reset
            # archived_reset: Archived entries deleted
+            # otp_enabled: Two-factor authentication enabled
+            # tagging_rules_imported: Tagging rules imported
+            # tagging_rules_not_imported: Error while importing tagging rules
    entry:
        notice:
            # entry_already_saved: 'Entry already saved on %date%'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
index 04daf855..c99da444 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
@@ -76,6 +76,7 @@ config:
            redirect_current_page: 'На текущую страницу'
        pocket_consumer_key_label: "Ключ от Pocket для импорта контента"
        android_configuration: "Настройте Ваше Android приложение"
+        # android_instruction: "Touch here to prefill your Android application"
        help_theme: "wallabag настраиваемый, здесь Вы можете выбрать тему."
        help_items_per_page: "Вы можете выбрать количество отображаемых записей на странице."
        help_reading_speed: "wallabag посчитает сколько времени занимает чтение каждой записи. Вы можете определить здесь, как быстро вы читаете. wallabag пересчитает время чтения для каждой записи."
@@ -93,12 +94,14 @@ config:
            unread: 'непрочитанные'
            starred: 'помеченные'
            archive: 'архивные'
+            # all: 'All'
        feed_limit: 'Количество записей в фиде'
    form_user:
        # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code OR need to use an OTP app (like Google Authenticator, Authy or FreeOTP) to get a one time code on every new untrusted connection. You can't choose both option."
        # login_label: 'Login (can not be changed)'
        name_label: 'Имя'
        email_label: 'Email'
+        two_factor:
            # emailTwoFactor_label: 'Using email (receive a code by email)'
            # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)'
            # table_method: Method
@@ -119,6 +122,7 @@ config:
        annotations: "Удалить все аннотации"
        tags: "Удалить все теги"
        entries: "Удалить все записи"
+        # archived: Remove ALL archived entries
        confirm: "Вы уверены? (Данные будут БЕЗВОЗВРАТНО удалены, эти действия необратимы)"
    form_password:
        description: "Здесь Вы можете поменять своя пароль. Ваш пароль должен быть длиннее 8 символов."
@@ -132,6 +136,15 @@ config:
        edit_rule_label: 'изменить'
        rule_label: 'Правило'
        tags_label: 'теги'
+        # card:
+        #     new_tagging_rule: Create a tagging rule
+        #     import_tagging_rules: Import tagging rules
+        #     import_tagging_rules_detail: You have to select the JSON file you previously exported.
+        #     export_tagging_rules: Export tagging rules
+        #     export_tagging_rules_detail: This will download a JSON file that you can use to import tagging rules elsewhere or to backup them.
+        # file_label: JSON file
+        # import_submit: Import
+        # export: Export
        faq:
            title: 'FAQ'
            tagging_rules_definition_title: 'Что значит "правило тегирования"?'
@@ -163,6 +176,7 @@ config:
                or: 'Одно правило ИЛИ другое'
                and: 'Одно правило И другое'
                matches: 'Тесты, в которых <i> тема </i> соответствует <i> поиску </i> (без учета регистра). Пример: <code> title matches "футбол" </code>'
+                # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
    otp:
        # page_title: Two-factor authentication
        # app:
@@ -183,6 +197,7 @@ entry:
        filtered_tags: 'Отфильтрованные по тегу:'
        filtered_search: 'Отфильтрованные по поиску:'
        untagged: 'Записи без тегов'
+        # all: 'All entries'
    list:
        number_on_the_page: '{0} Записей не обнаружено.|{1} Одна запись.|]1,Inf[ Найдено %count% записей.'
        reading_time: 'расчетное время чтения'
@@ -204,6 +219,8 @@ entry:
        unread_label: 'Непрочитанная'
        preview_picture_label: 'Есть картинка предварительного просмотра'
        preview_picture_help: 'Картинка предварительного просмотра'
+        # is_public_label: 'Has a public link'
+        # is_public_help: 'Public link'
        language_label: 'Язык'
        http_status_label: 'статус HTTP'
        reading_time:
@@ -242,6 +259,8 @@ entry:
        original_article: 'оригинал'
        annotations_on_the_entry: '{0} Нет аннотации|{1} Одна аннотация|]1,Inf[ %count% аннотаций'
        created_at: 'Дата создания'
+        # published_at: 'Publication date'
+        # published_by: 'Published by'
        # provided_by: 'Provided by'
    new:
        page_title: 'Сохранить новую запись'
@@ -255,10 +274,12 @@ entry:
        title_label: 'Название'
        url_label: 'Ссылка'
        # origin_url_label: 'Origin url (from where you found that entry)'
-        is_public_label: 'Публичная'
        save_label: 'Сохранить'
    public:
        shared_by_wallabag: "Запись была опубликована <a href='%wallabag_instance%'>wallabag</a>"
+    confirm:
+        # delete: "Are you sure you want to remove that article?"
+        # delete_tag: "Are you sure you want to remove that tag from that article?"
    metadata:
        # reading_time: "Estimated reading time"
        # reading_time_minutes_short: "%readingTime% min"
@@ -414,9 +435,9 @@ tag:
    rename:
        # placeholder: 'You can update tag name.'
-# export:
+export:
-#     footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>'
+    # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>'
-#     unknown: 'Unknown'
+    # unknown: 'Unknown'
 import:
    page_title: 'Импорт'
@@ -544,6 +565,28 @@ user:
        delete: "Удалить"
        delete_confirm: "Вы уверены?"
        back_to_list: "Назад к списку"
+    search:
+        # placeholder: Filter by login or email
+site_credential:
+    # page_title: Site credentials management
+    # new_site_credential: Create a credential
+    # edit_site_credential: Edit an existing credential
+    # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc."
+    # list:
+    #     actions: Actions
+    #     edit_action: Edit
+    #     yes: Yes
+    #     no: No
+    #     create_new_one: Create a new credential
+    # form:
+    #     username_label: 'Login'
+    #     host_label: 'Host (subdomain.example.org, .example.org, etc.)'
+    #     password_label: 'Password'
+    #     save: Save
+    #     delete: Delete
+    #     delete_confirm: Are you sure?
+    #     back_to_list: Back to list
 error:
    page_title: "Произошла ошибка"
@@ -563,6 +606,10 @@ flashes:
            annotations_reset: "Аннотации сброшены"
            tags_reset: "Теги сброшены"
            entries_reset: "Записи сброшены"
+            # archived_reset: Archived entries deleted
+            # otp_enabled: Two-factor authentication enabled
+            # tagging_rules_imported: Tagging rules imported
+            # tagging_rules_not_imported: Error while importing tagging rules
    entry:
        notice:
            entry_already_saved: 'Запись была сохранена ранее %date%'
@@ -599,3 +646,8 @@ flashes:
            added: 'Пользователь "%username%" добавлен'
            updated: 'Пользователь "%username%" обновлен'
            deleted: 'Пользователь "%username%" удален'
+    site_credential:
+        notice:
+            # added: 'Site credential for "%host%" added'
+            # updated: 'Site credential for "%host%" updated'
+            # deleted: 'Site credential for "%host%" deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
index 66642029..9927d059 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
@@ -101,6 +101,7 @@ config:
        # login_label: 'Login (can not be changed)'
        name_label: 'ชื่อ'
        email_label: 'อีเมล'
+        two_factor:
            # emailTwoFactor_label: 'Using email (receive a code by email)'
            # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)'
            # table_method: Method
@@ -135,6 +136,15 @@ config:
        edit_rule_label: 'ปรับแก้'
        rule_label: 'ข้อบังคับ'
        tags_label: 'แท็ก'
+        # card:
+        #     new_tagging_rule: Create a tagging rule
+        #     import_tagging_rules: Import tagging rules
+        #     import_tagging_rules_detail: You have to select the JSON file you previously exported.
+        #     export_tagging_rules: Export tagging rules
+        #     export_tagging_rules_detail: This will download a JSON file that you can use to import tagging rules elsewhere or to backup them.
+        # file_label: JSON file
+        # import_submit: Import
+        # export: Export
        faq:
            title: 'FAQ'
            tagging_rules_definition_title: 'ข้อบังคับการแท็กคืออะไร?'
@@ -251,6 +261,7 @@ entry:
        created_at: 'วันที่สร้าง'
        published_at: 'วันที่ประกาศ'
        published_by: 'ประกาศโดย'
+        # provided_by: 'Provided by'
    new:
        page_title: 'บันทึกรายการใหม่'
        placeholder: 'http://website.com'
@@ -262,6 +273,7 @@ entry:
        page_title: 'แก้ไขรายการ'
        title_label: 'หัวข้อ'
        url_label: 'Url'
+        # origin_url_label: 'Origin url (from where you found that entry)'
        save_label: 'บันทึก'
    public:
        shared_by_wallabag: "บทความนี้จะมีการแชร์โดย %username% กับ <a href='%wallabag_instance%'>wallabag</a>"
@@ -595,6 +607,9 @@ flashes:
            tags_reset: รีเซ็ตแท็ก
            entries_reset: รีเซ็ตรายการ
            archived_reset: การลบเอกสารของรายการ
+            # otp_enabled: Two-factor authentication enabled
+            # tagging_rules_imported: Tagging rules imported
+            # tagging_rules_not_imported: Error while importing tagging rules
    entry:
        notice:
            entry_already_saved: 'รายการพร้อมบันทึกที่ %date%'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 6ee723f1..60fa44d5 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -101,6 +101,7 @@ config:
        # login_label: 'Login (can not be changed)'
        name_label: 'İsim'
        email_label: 'E-posta'
+        two_factor:
            # emailTwoFactor_label: 'Using email (receive a code by email)'
            # googleTwoFactor_label: 'Using an OTP app (open the app, like Google Authenticator, Authy or FreeOTP, to get a one time code)'
            # table_method: Method
@@ -135,6 +136,15 @@ config:
        # edit_rule_label: 'edit'
        rule_label: 'Kural'
        tags_label: 'Etiketler'
+        # card:
+        #     new_tagging_rule: Create a tagging rule
+        #     import_tagging_rules: Import tagging rules
+        #     import_tagging_rules_detail: You have to select the JSON file you previously exported.
+        #     export_tagging_rules: Export tagging rules
+        #     export_tagging_rules_detail: This will download a JSON file that you can use to import tagging rules elsewhere or to backup them.
+        # file_label: JSON file
+        # import_submit: Import
+        # export: Export
        faq:
            title: 'S.S.S.'
            tagging_rules_definition_title: '« etiketleme kuralları » ne anlama geliyor?'
@@ -209,6 +219,8 @@ entry:
        unread_label: 'Okunmayan'
        preview_picture_label: 'Resim önizlemesi varsa'
        preview_picture_help: 'Resim önizlemesi'
+        # is_public_label: 'Has a public link'
+        # is_public_help: 'Public link'
        language_label: 'Dil'
        # http_status_label: 'HTTP status'
        reading_time:
@@ -423,9 +435,9 @@ tag:
    rename:
        # placeholder: 'You can update tag name.'
-# export:
+export:
-#     footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>'
+    # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>'
-#     unknown: 'Unknown'
+    # unknown: 'Unknown'
 import:
    page_title: 'İçe Aktar'
@@ -556,6 +568,26 @@ user:
    search:
        # placeholder: Filter by username or email
+site_credential:
+    # page_title: Site credentials management
+    # new_site_credential: Create a credential
+    # edit_site_credential: Edit an existing credential
+    # description: "Here you can manage all credentials for sites which required them (create, edit and delete), like a paywall, an authentication, etc."
+    # list:
+    #     actions: Actions
+    #     edit_action: Edit
+    #     yes: Yes
+    #     no: No
+    #     create_new_one: Create a new credential
+    # form:
+    #     username_label: 'Login'
+    #     host_label: 'Host (subdomain.example.org, .example.org, etc.)'
+    #     password_label: 'Password'
+    #     save: Save
+    #     delete: Delete
+    #     delete_confirm: Are you sure?
+    #     back_to_list: Back to list
 error:
    # page_title: An error occurred
@@ -567,13 +599,17 @@ flashes:
            password_not_updated_demo: "In demonstration mode, you can't change password for this user."
            user_updated: 'Bilgiler güncellendi'
            feed_updated: 'RSS bilgiler güncellendi'
-            tagging_rules_updated: 'Tagging rules updated'
+            # tagging_rules_updated: 'Tagging rules updated'
-            tagging_rules_deleted: 'Tagging rule deleted'
+            # tagging_rules_deleted: 'Tagging rule deleted'
-            feed_token_updated: 'RSS token updated'
+            # feed_token_updated: 'RSS token updated'
+            # feed_token_revoked: 'RSS token revoked'
            # annotations_reset: Annotations reset
            # tags_reset: Tags reset
            # entries_reset: Entries reset
            # archived_reset: Archived entries deleted
+            # otp_enabled: Two-factor authentication enabled
+            # tagging_rules_imported: Tagging rules imported
+            # tagging_rules_not_imported: Error while importing tagging rules
    entry:
        notice:
            entry_already_saved: 'Entry already saved on %date%'