Merge pull request #4904 from wallabag/release-2.4.1

- update changelog
- bump version
- update deps

.babelrc

@@ -1,5 +1,10 @@
 {
-    "presets": [
-        ["env", {"modules": false}]
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "modules": false
+      }
     ]
+  ]
 }

.editorconfig

@@ -15,3 +15,6 @@ indent_size = 2
 
 [*akefile]
 indent_style = tab
+
+[.github/**.yml]
+indent_size = 2

.github/ISSUE_TEMPLATE.md

@@ -1,21 +0,0 @@
-:warning: If your issue is about an error during fetching a link, please read: http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that
-
-### Issue details
-
-Please provide issue details here.
-Remember, this is _not_ a place to ask questions. For that, go to https://community.wallabag.org/ (forum) or http://gitter.im/wallabag/wallabag (chat).
-
-### Environment
-
-* wallabag version (or git revision) that exhibits the issue:
-* How did you install wallabag? Via `git clone` or by downloading the package?
-* Last wallabag version that did not exhibit the issue (if applicable):
-* php version:
-* OS:
-* type of hosting (shared or dedicated):
-* which storage system you choose at install (SQLite, MySQL/MariaDB or PostgreSQL):
-
-### Steps to reproduce/test case
-
-Please provide necessary steps for reproduction of this issue, or better the
-reduced test case (without any external dependencies, if possible).

.github/ISSUE_TEMPLATE/1-fetching-content.md

@@ -0,0 +1,30 @@
+---
+name: Fetching content
+about: If wallabag can't extract content for an URL
+title: Wrong display in wallabag (HOST)
+labels: Site Config
+assignees: ''
+
+---
+
+<!--
+Thank you for reporting a fetching issue.
+
+Please fill in as much of the template below as you're able.
+-->
+
+**Before submitting the issue, please read:**
+If wallabag can't parse / extract content for a given link, please first read the documentation about it:
+http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that
+
+We have a lot of requests about fetching config issue. It'll help us A LOT if you give a try to fix it on your own following the doc.
+If you failed to fix it yourself, tick the following boxes:
+- [ ] I've tried myself without success
+- [ ] I've replaced `HOST` in the issue title with the host of the URL that can't be fetched (ie: `nytimes.com`, `20minutes.fr`, `bbc.com`, etc.)
+
+**Content related:**
+ - URL: [full url of the content]
+ - wallabag version: [e.g. 2.4.0]
+
+**Describe what's wrong:**
+A clear and concise description of what you expected to happen.

.github/ISSUE_TEMPLATE/2-bug-report.md

@@ -0,0 +1,43 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+Thank you for reporting an issue.
+
+Please fill in as much of the template below as you're able.
+
+Version:      if you know it, otherwise use the git revision
+Installation: How did you install wallabag? Using git clone, the docker image, an installer, downloading the package, etc.
+PHP version:  The version of PHP you are using
+OS:           The host running wallabag
+Database:     The storage system your instance is using (SQLite, MySQL/MariaDB or PostgreSQL) with the version
+Parameters:   Paste the content of your app/config/parameters.yml (hide sensitive stuff if you want)
+-->
+### Environment
+
+* **Version**:
+* **Installation**:
+* **PHP version**:
+* **OS**:
+* **Database**:
+* **Parameters**:
+
+<details>
+  <summary>My <code>app/config/parameters.yml</code> is:</summary>
+
+  ```
+  PASTE HERE
+  ```
+</details>
+
+### What steps will reproduce the bug?
+
+<!--
+Enter details about your bug and how to reproduce it
+-->

.github/ISSUE_TEMPLATE/3-feature-request.md

@@ -0,0 +1,26 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: Feature
+assignees: ''
+
+---
+
+<!--
+Thank you for suggesting an idea to make wallabag better.
+
+Please fill in as much of the template below as you're able.
+-->
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Want to ask something?
+    url: https://gitter.im/wallabag/wallabag
+    about: Use Gitter to ask questions.

.github/dependabot.yml

@@ -0,0 +1,36 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: materialize-css
+    versions:
+    - "> 0.98.2"
+- package-ecosystem: composer
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 10
+  reviewers:
+  - j0k3r
+  - tcitworld
+  - Kdecherf
+  labels:
+  - Ready for review
+  ignore:
+  - dependency-name: doctrine/doctrine-migrations-bundle
+    versions:
+    - "> 1.3.2"
+  - dependency-name: friendsofsymfony/user-bundle
+    versions:
+    - "> 2.0.2"
+  - dependency-name: nelmio/api-doc-bundle
+    versions:
+    - "> 2.13.4"

.github/workflows/assets.yml

@@ -0,0 +1,41 @@
+name: "Assets"
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - 2.*
+
+jobs:
+  js:
+    name: "Building assets"
+    runs-on: "ubuntu-20.04"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install Node"
+        uses: actions/setup-node@v1
+        with:
+          node-version: "12"
+
+      - name: "Install dependencies with Yarn"
+        run: "yarn install"
+
+      - name: "Build dev assets"
+        run: "yarn run build:dev"
+
+      - name: "Build prod assets"
+        run: "yarn run build:prod"
+
+      - name: "Validate no change were created"
+        run: |
+          GITDIFF=`git diff`
+          if [ "$GITDIFF" == "" ]; then
+            exit 0
+          else
+            git diff
+            exit 1
+          fi

.github/workflows/coding-standards.yml

@@ -0,0 +1,45 @@
+name: "CS"
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - 2.*
+
+jobs:
+  coding-standards:
+    name: "CS Fixer & PHPStan"
+    runs-on: "ubuntu-18.04"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: "7.3"
+          tools: cs2pr, pecl, composer:v1
+          extensions: pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
+          ini-values: "date.timezone=Europe/Paris"
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v1"
+        with:
+          composer-options: "--optimize-autoloader --prefer-dist"
+
+      - name: "Run PHP CS Fixer"
+        run: "bin/php-cs-fixer fix --verbose --dry-run --format=checkstyle | cs2pr"
+
+      - name: "Generate test cache for PHPStan"
+        run: "php bin/console cache:clear --env=test"
+
+      - name: "Install PHPUnit for PHPStan"
+        run: "php bin/simple-phpunit install"
+
+      - name: "Run PHPStan"
+        run: "php bin/phpstan analyse --no-progress --error-format=checkstyle | cs2pr"

.github/workflows/continuous-integration.yml

@@ -0,0 +1,81 @@
+name: "CI"
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - 2.*
+
+env:
+  PGPASSWORD: wallabagrocks
+  COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  phpunit:
+    name: "PHP ${{ matrix.php }} using ${{ matrix.database }}"
+    runs-on: "ubuntu-18.04"
+    services:
+      rabbitmq:
+        image: rabbitmq:3-alpine
+        ports:
+          - 5672:5672
+      redis:
+        image: redis:6-alpine
+        ports:
+          - 6379:6379
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php:
+          - "7.2"
+          - "7.3"
+          - "7.4"
+        database:
+          - "sqlite"
+          - "mysql"
+          - "pgsql"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+        with:
+          fetch-depth: 2
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php }}"
+          coverage: none
+          tools: pecl, composer:v1
+          extensions: json, pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
+          ini-values: "date.timezone=Europe/Paris"
+
+      - name: "Setup MySQL"
+        if: "${{ matrix.database == 'mysql' }}"
+        run: |
+          sudo systemctl start mysql.service
+          sudo mysql -u root -proot -e "CREATE DATABASE wallabag_test"
+
+      - name: "Setup PostgreSQL"
+        if: "${{ matrix.database == 'pgsql' }}"
+        run: |
+          sudo systemctl start postgresql
+          sudo -u postgres psql -d template1 -c "CREATE USER wallabag WITH PASSWORD 'wallabagrocks' CREATEDB"
+          createdb -h localhost -p 5432 -U wallabag wallabag_test
+          pg_isready -d wallabag_test -h localhost -p 5432 -U wallabag
+
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v1"
+        with:
+          composer-options: "--optimize-autoloader --prefer-dist"
+
+      - name: "Prepare database"
+        run: "make prepare DB=${{ matrix.database }}"
+
+      - name: "Prepare fixtures"
+        run: "make fixtures"
+
+      - name: "Run PHPUnit"
+        run: "php bin/simple-phpunit -v"

.github/workflows/translations.yml

@@ -0,0 +1,47 @@
+name: "Translations"
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - 2.*
+
+jobs:
+  translations:
+    name: "Translations"
+    runs-on: "ubuntu-18.04"
+
+    strategy:
+      matrix:
+        php:
+          - "7.3"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php }}"
+          tools: pecl, composer:v1
+          extensions: pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
+          ini-values: "date.timezone=Europe/Paris"
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v1"
+        with:
+          composer-options: "--optimize-autoloader --prefer-dist"
+
+      - name: "Validate Core translations"
+        run: "php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v"
+
+      - name: "Validate CraueConfig translations"
+        run: "php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v"
+
+      - name: "Validate User translations"
+        run: "php bin/console lint:yaml src/Wallabag/UserBundle/Resources/translations -v"

.gitignore

@@ -14,6 +14,7 @@
 !/bin/console
 !/bin/symfony_requirements
 .php_cs.cache
+.phpunit.result.cache
 
 # Parameters
 /app/config/parameters.yml

.php_cs

@@ -38,6 +38,7 @@ return PhpCsFixer\Config::create()
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->exclude([
+                'node_modules',
                 'vendor',
                 'var',
                 'web'

.stylelintrc

@@ -1,3 +1,13 @@
 {
-  "extends": "stylelint-config-standard"
+  "extends": "stylelint-config-standard",
+  "plugins": [
+    "stylelint-scss"
+  ],
+  rules: {
+    'at-rule-no-unknown': null,
+    'no-duplicate-selectors': null,
+    'font-family-no-missing-generic-family-keyword': null,
+    'no-descending-specificity': null,
+    'scss/at-rule-no-unknown': true,
+  },
 }

.travis.yml

@@ -1,79 +0,0 @@
-os: linux
-dist: xenial
-language: php
-
-services:
-    - mysql
-    - postgresql
-    - rabbitmq
-    - redis
-
-# cache vendor dirs
-cache:
-    apt: true
-    directories:
-        - $HOME/.composer/cache/files
-        - node_modules
-        - $HOME/.npm
-        - $HOME/.yarn-cache
-
-if: |
-    type = pull_request OR \
-    branch = master
-
-php:
-    - 7.1
-    - 7.2
-    - 7.3
-    - 7.4
-
-node_js:
-    - "5"
-
-env:
-    - DB=mysql
-    - DB=pgsql
-    - DB=sqlite
-
-jobs:
-    fast_finish: true
-    include:
-        - php: 7.3
-          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
-
-# exclude v1 branches
-branches:
-    except:
-        - legacy
-
-before_install:
-    - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
-    - PHP=$TRAVIS_PHP_VERSION
-    - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-    - phpenv config-rm xdebug.ini || echo "xdebug not available"
-    - composer self-update --no-progress
-    # install imagick
-    - pear config-set preferred_state beta
-    - pecl channel-update pecl.php.net
-    - yes | pecl install imagick
-
-install:
-    - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.10; fi;
-    - if [[ $ASSETS = build ]]; then npm install -g yarn@latest; fi;
-    - if [[ $ASSETS = build ]]; then yarn install; fi;
-    - composer install -o --no-interaction --no-progress --prefer-dist --no-suggest
-    - php bin/simple-phpunit install
-
-before_script:
-    - make prepare DB=$DB
-    - make fixtures
-
-script:
-    - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then ./bin/simple-phpunit -v ; fi;
-    # PHPStan needs PHPUnit to be installed and cache app to be generated
-    - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then php bin/phpstan analyse src tests --no-progress --level 1 ; fi;
-    - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix --verbose --dry-run ; fi;
-    - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
-    - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v ; fi;
-    - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/UserBundle/Resources/translations -v ; fi;
-    - if [[ $ASSETS = build ]]; then yarn run build:prod; fi;

CHANGELOG.md

@@ -1,5 +1,120 @@
 # Changelog
 
+## [2.4.1](https://github.com/wallabag/wallabag/tree/2.4.1)
+   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.4.0...2.4.1)
+
+### Fixes
+- Fix path icons from manifest.json [#4811](https://github.com/wallabag/wallabag/pull/4811)
+- Fix missing apple-touch-icon-512.png from manifest.json [#4823](https://github.com/wallabag/wallabag/pull/4823)
+- migrations: fix mysql migration for an edge case [#4832](https://github.com/wallabag/wallabag/pull/4832)
+- Add a command to clean downloaded images [#4844](https://github.com/wallabag/wallabag/pull/4844)
+- Add a query to parse only non-hashed URL [#4865](https://github.com/wallabag/wallabag/pull/4865) [#4878](https://github.com/wallabag/wallabag/pull/4878)
+- material: fix issue with cookie check for light/dark theme [#4866](https://github.com/wallabag/wallabag/pull/4866)
+- Show OTP secret next to the QR Code [#4868](https://github.com/wallabag/wallabag/pull/4868)
+- views: add title to tag li elements, for consistency [#4894](https://github.com/wallabag/wallabag/pull/4894)
+- Add label and issuer to otp config [#4301](https://github.com/wallabag/wallabag/pull/4301)
+
+### Meta
+- Update release process and introduce 2.4.1-dev [#4808](https://github.com/wallabag/wallabag/pull/4808)
+- Remove community.wallabag.org from the issue template [#4817](https://github.com/wallabag/wallabag/pull/4817)
+- Update issue templates [#4843](https://github.com/wallabag/wallabag/pull/4843)
+- Allow GitHub Actions to run on 2.* branches [#4896](https://github.com/wallabag/wallabag/pull/4896)
+- Prepare 2.4.1 [#4904](https://github.com/wallabag/wallabag/pull/4904)
+
+## [2.4.0](https://github.com/wallabag/wallabag/tree/2.4.0)
+   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.8...2.4.0)
+
+### Features
+
+- Allow to rename tags from the web interface [#3574](https://github.com/wallabag/wallabag/pull/3574)
+- Added possibility to change locale from login/register pages [#3216](https://github.com/wallabag/wallabag/pull/3216)
+- Add ability to import/export tagging rules [#4028](https://github.com/wallabag/wallabag/pull/4028)
+- Add quickstart into the menu [#3992](https://github.com/wallabag/wallabag/pull/3992)
+- Enable OTP 2FA via third apps (Google Authenticator, Authy or FreeOTP) [#3798](https://github.com/wallabag/wallabag/pull/3798)
+- Show untagged entries count on tag list [#3993](https://github.com/wallabag/wallabag/pull/3993)
+- Add random feature [#3526](https://github.com/wallabag/wallabag/pull/3526)
+- Added ability to revoke feed token [#3994](https://github.com/wallabag/wallabag/pull/3994)
+- Display login in config / user [#3995](https://github.com/wallabag/wallabag/pull/3995)
+- Move Ignore Origin rules to database [#4026](https://github.com/wallabag/wallabag/pull/4026)
+- Add ability to manually define the reading speed [#4053](https://github.com/wallabag/wallabag/pull/4053)
+- Added MathJax support [#4128](https://github.com/wallabag/wallabag/pull/4128)
+- Improved tags list [#4136](https://github.com/wallabag/wallabag/pull/4136)
+- Add untagged list link to filter menu [#4150](https://github.com/wallabag/wallabag/pull/4150)
+- Allow custom styles system wide [#4151](https://github.com/wallabag/wallabag/pull/4151)
+- Added elCurator import [#4175](https://github.com/wallabag/wallabag/pull/4175)
+- Added language support for Simplified Chinese（简体中文）[#4281](https://github.com/wallabag/wallabag/pull/4281)
+- Added publication date on epub export [#4315](https://github.com/wallabag/wallabag/pull/4315)
+- Enhanced article display [#4317](https://github.com/wallabag/wallabag/pull/4317)
+- Added mass actions for Material design in list view [#4326](https://github.com/wallabag/wallabag/pull/4326)
+- Added a button to disable 2FA when enabled [#4329](https://github.com/wallabag/wallabag/pull/4329)
+- Enhanced navigation menu in material theme [#4343](https://github.com/wallabag/wallabag/pull/4343)
+- Copy client info to clipboard [#4058](https://github.com/wallabag/wallabag/pull/4058)
+- Upgrade Piwik Twig Extension to Matomo [#4363](https://github.com/wallabag/wallabag/pull/4363)
+- Dark theme to Material [#4725](https://github.com/wallabag/wallabag/pull/4725)
+
+### API
+
+- Storage of hash of URL to check if pages already saved [#3158](https://github.com/wallabag/wallabag/pull/3158)
+- Added a basic search endpoint [#3627](https://github.com/wallabag/wallabag/pull/3627)
+- Entries: added add parameter detail to exclude or include content in response [#3960](https://github.com/wallabag/wallabag/pull/3960)
+- Add a new endpoint to retrieve information from the wallabag instance [#3845](https://github.com/wallabag/wallabag/pull/3845)
+- API return an error with empty quote [#4161](https://github.com/wallabag/wallabag/pull/4161)
+- Fixed bug when we delete entry via API [#4316](https://github.com/wallabag/wallabag/pull/4316)
+- Add ability to define lifetime token for the API [#4319](https://github.com/wallabag/wallabag/pull/4319)
+- Added archived_at property and updateArchived method [#3630](https://github.com/wallabag/wallabag/pull/3630)
+- Add `given_url` in Entry table to check if a redirected url has already added [#3271](https://github.com/wallabag/wallabag/pull/3271)
+
+### Technical stuff
+
+- Added support for secured emails via SMTP [#3596](https://github.com/wallabag/wallabag/pull/3596)
+- Changed RSS to Atom feed and improve paging [#3223](https://github.com/wallabag/wallabag/pull/3223)
+- MySQL: change collation of tag label [#3959](https://github.com/wallabag/wallabag/pull/3959)
+- Use httplug and graby 2.0 [#3390](https://github.com/wallabag/wallabag/pull/3390)
+- Use Imagick to keep GIF animation [#3955](https://github.com/wallabag/wallabag/pull/3955)
+- Jump to Symfony 3.4 [#3731](https://github.com/wallabag/wallabag/pull/3731)
+- Removed hardcoded database version [#3864](https://github.com/wallabag/wallabag/pull/3864)
+- Dropping PHP < 7.1 [#3758](https://github.com/wallabag/wallabag/pull/3758)
+- Dropping PHP < 7.2 [#4441](https://github.com/wallabag/wallabag/pull/4441)
+- Force default_protocol to generate an url input [#3879](https://github.com/wallabag/wallabag/pull/3879)
+- Cascade delete on oauth2 table when deleting a user [#3956](https://github.com/wallabag/wallabag/pull/3956)
+- Preview picture: use the 1st pic retrieved if no og:image set [#3965](https://github.com/wallabag/wallabag/pull/3965)
+- Force PHP version in Dockerfile [#3977](https://github.com/wallabag/wallabag/pull/3977)
+- Add Sentry support [#3990](https://github.com/wallabag/wallabag/pull/3990)
+- Fix slow/unindexed queries [#4081](https://github.com/wallabag/wallabag/pull/4081)
+- Rename internal settings table [#4084](https://github.com/wallabag/wallabag/pull/4084)
+- Add environment variables to control scripts/dev.sh behavior [#4152](https://github.com/wallabag/wallabag/pull/4152)
+- Increase php memory limit PHP Docker [#4163](https://github.com/wallabag/wallabag/pull/4163)
+- Ensure ENV is well defined when using make [#4249](https://github.com/wallabag/wallabag/pull/4249)
+- Update translations from Weblate [#4442](https://github.com/wallabag/wallabag/pull/4442)
+- Ditch Travis to use GitHub Actions [#4747](https://github.com/wallabag/wallabag/pull/4747)
+- Upgrade Webpack from v4 to v5 [#4727](https://github.com/wallabag/wallabag/pull/4727)
+
+### Translations
+
+- Add Japanese translation [#4274](https://github.com/wallabag/wallabag/pull/4274)
+- Add Croatian translation [#4518](https://github.com/wallabag/wallabag/pull/4518), [#4517](https://github.com/wallabag/wallabag/pull/4517)
+- Add Ukrainian translation [#4489](https://github.com/wallabag/wallabag/pull/4489)
+- Add language support for Simplified Chinese（简体中文）[#4281](https://github.com/wallabag/wallabag/pull/4281)
+- Add Dutch translation to the settings [#4632](https://github.com/wallabag/wallabag/pull/4632)
+- Support for Weblate [#4442](https://github.com/wallabag/wallabag/pull/4442) & [#4447](https://github.com/wallabag/wallabag/pull/4447)
+
+### Fixes
+
+- Fixed Instapaper import date order [#3980](https://github.com/wallabag/wallabag/pull/3980)
+- Add missing entries in craue_config_setting. [#3868](https://github.com/wallabag/wallabag/pull/3868)
+- Fix `reading_time` being NULL on SQLite [#4020](https://github.com/wallabag/wallabag/pull/4020)
+- Fix createdAt filter on material [#4299](https://github.com/wallabag/wallabag/pull/4299)
+- Fix duplicated icons on "Search engine" and "new link" forms [#4149](https://github.com/wallabag/wallabag/pull/4149)
+- Fix entries export from search view [#4278](https://github.com/wallabag/wallabag/pull/4278)
+- Fixed URL to share entry via twitter [#4250](https://github.com/wallabag/wallabag/pull/4250)
+- Sidebar sub entries not conditioned by hover anymore [#4254](https://github.com/wallabag/wallabag/pull/4254)
+- Fix print of long pages [#4263](https://github.com/wallabag/wallabag/pull/4263)
+- Fixed duplicated tags when renaming them [#4310](https://github.com/wallabag/wallabag/pull/4310)
+- Added authentication during import command for paywalled websites [#4325](https://github.com/wallabag/wallabag/pull/4325)
+- Added more coherence with color links for material theme [#4346](https://github.com/wallabag/wallabag/pull/4346)
+- Changed visibility for article stats [#4347](https://github.com/wallabag/wallabag/pull/4347)
+- PHP 7.4 support [#4309](https://github.com/wallabag/wallabag/pull/4309)
+
 ## [2.3.8](https://github.com/wallabag/wallabag/tree/2.3.8)
    [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.7...2.3.8)
 

GNUmakefile

@@ -31,8 +31,8 @@ run: ## Run the wallabag built-in server
 	@php bin/console server:run --env=dev
 
 build: ## Run webpack
-	@npm install
-	@npm run build:$(ENV)
+	@yarn install
+	@yarn build:$(ENV)
 
 prepare: clean ## Prepare database for testsuite
 ifdef DB

README.md

@@ -1,6 +1,10 @@
-[![Build Status](https://api.travis-ci.org/wallabag/wallabag.svg?branch=master)](https://travis-ci.org/wallabag/wallabag)
+<img src="https://raw.githubusercontent.com/wallabag/logo/master/_default/typo-horizontal/png/sm/logo-typo-horizontal-black-no-bg-no-border-sm.png" align="right" />
+
+![CI](https://github.com/wallabag/wallabag/workflows/CI/badge.svg)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=master)
 [![Gitter](https://badges.gitter.im/gitterHQ/gitter.svg)](https://gitter.im/wallabag/wallabag)
+[![Donation Status](https://img.shields.io/liberapay/goal/wallabag.svg?logo=liberapay)](https://liberapay.com/wallabag/donate)
+[![Translation status](https://hosted.weblate.org/widgets/wallabag/-/svg-badge.svg)](https://hosted.weblate.org/engage/wallabag/?utm_source=widget)
 
 # What is wallabag?
 wallabag is a self-hostable PHP application allowing you to not miss any content anymore.
@@ -10,14 +14,12 @@ More information on our website: [wallabag.org](https://wallabag.org).
 
 If you do not have your own server, consider [the wallabag.it hosting solution](https://wallabag.it).
 
-![wallabag logo](https://raw.githubusercontent.com/wallabag/logo/master/_default/typo-horizontal/png/sm/logo-typo-horizontal-black-no-bg-no-border-sm.png)
-
 # Install wallabag
 Please read [the documentation to see the wallabag requirements](https://doc.wallabag.org/en/admin/installation/requirements.html).
 
 Then you can install wallabag by executing the following commands:
 
-```
+```bash
 git clone https://github.com/wallabag/wallabag.git
 cd wallabag && make install
 ```
@@ -29,6 +31,10 @@ Now, [configure a virtual host](https://doc.wallabag.org/en/admin/installation/v
 
 Wallabag app for [YunoHost](https://yunohost.org). See [here](https://github.com/YunoHost-Apps/wallabag2_ynh)
 
+# Translate wallabag
+
+[wallabag](https://hosted.weblate.org/projects/wallabag/) is being translated using [Weblate](https://weblate.org/), a web tool designed to ease translating for both developers and translators. Feel free to help us [translate wallabag](https://hosted.weblate.org/projects/wallabag/)!
+
 # License
 Copyright © 2013-current Nicolas Lœuillet <nicolas@loeuillet.org>
 This work is free. You can redistribute it and/or modify it under the

RELEASE_PROCESS.md

@@ -16,25 +16,6 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (li
 
 #### Create a new release on GitHub
 
-- Run these commands to create the tag:
-
-```
-git checkout master
-git pull origin master
-git checkout -b release-$LAST_WALLABAG_RELEASE
-composer up
-```
-
-- Then continue with these commands:
-
-```
-git add composer.lock
-git commit -m "Release wallabag $LAST_WALLABAG_RELEASE"
-git push origin release-$LAST_WALLABAG_RELEASE
-```
-
-- Create a new pull request with this title `Release wallabag $LAST_WALLABAG_RELEASE`. This pull request is used to launch builds on Travis-CI.
-- Once PR is green, merge it and delete the branch.
 - Run this command to create the package:
 
 ```
@@ -42,7 +23,7 @@ make release VERSION=$LAST_WALLABAG_RELEASE
 ```
 
 - [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new) by targetting the `master` branch or any appropriate branch (for instance backports). You have to upload the package (generated previously).
-- Update the URL shortener (used on `wllbg.org` to update links like `https://wllbg.org/latest-v2-package` or `http://wllbg.org/latest-v2`)
+- Update nginx config to change the redirect rule for `https://wllbg.org/latest-v2-package` & `http://wllbg.org/latest-v2` (they both redirect to the asset of the GitHub release)
 - Update Dockerfile https://github.com/wallabag/docker (and create a new tag)
 - Update wallabag.org website (downloads, MD5 sum, releases and new blog post)
 - Put the next patch version suffixed with `-dev` in `app/config/wallabag.yml` (`wallabag_core.version`)

app/AppKernel.php

@@ -30,7 +30,7 @@ class AppKernel extends Kernel
             new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
             new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
             new Craue\ConfigBundle\CraueConfigBundle(),
-            new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
+            new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(),
             new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
             new BD\GuzzleSiteAuthenticatorBundle\BDGuzzleSiteAuthenticatorBundle(),
             new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),

app/DoctrineMigrations/Version20190510141130.php

@@ -64,8 +64,10 @@ final class Version20190510141130 extends WallabagMigration
                 $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' DROP FOREIGN KEY FK_368A4209A76ED395');
                 $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' ADD CONSTRAINT FK_368A4209A76ED395 FOREIGN KEY (user_id) REFERENCES ' . $this->getTable('user') . ' (id) ON DELETE CASCADE');
 
-                $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_clients') . ' DROP FOREIGN KEY IDX_user_oauth_client');
-                $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_clients') . ' ADD CONSTRAINT FK_635D765EA76ED395 FOREIGN KEY (user_id) REFERENCES ' . $this->getTable('user') . ' (id)');
+                if ($schema->getTable($this->getTable('oauth2_clients'))->hasForeignKey('IDX_user_oauth_client')) {
+                    $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_clients') . ' DROP FOREIGN KEY IDX_user_oauth_client');
+                    $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_clients') . ' ADD CONSTRAINT FK_635D765EA76ED395 FOREIGN KEY (user_id) REFERENCES ' . $this->getTable('user') . ' (id)');
+                }
 
                 $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_refresh_tokens') . ' DROP FOREIGN KEY FK_20C9FB24A76ED395');
                 $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_refresh_tokens') . ' ADD CONSTRAINT FK_20C9FB24A76ED395 FOREIGN KEY (user_id) REFERENCES ' . $this->getTable('user') . ' (id) ON DELETE CASCADE');

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.cs.yml

@@ -0,0 +1,21 @@
+matomo_enabled: Povolit Matomo
+unmark_url: Unmark URL adresa, pokud je služba povolena
+scuttle_url: Scuttle URL adresa, pokud je služba povolena
+shaarli_url: Shaarli URL adresa, pokud je služba povolena
+share_unmark: Povolit sdílení na Unmark.it
+share_twitter: Povolit sdílení na Twitteru
+share_scuttle: Povolit sdílení na Scuttle
+share_shaarli: Povolit sdílení na Shaarli
+share_mail: Povolit sdílení emailem
+share_diaspora: Povolit sdílení na diaspora*
+export_xml: Povolit export do XML
+export_txt: Povolit export do TXT
+export_epub: Povolit export do ePub
+export_json: Povolit export do JSON
+export_csv: Povolit export do CSV
+export_pdf: Povolit export do PDF
+export_mobi: Povolit export do .mobi
+diaspora_url: diaspora* URL adresa, pokud je služba povolena
+carrot: Povolit sdílet na Carrot
+download_pictures: Stáhnout obrázky na váš server
+settings_changed: Nastavení bylo aktualizováno

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml

@@ -1,7 +1,6 @@
-# settings_changed: Configuration updated
 download_pictures: Download billeder på din server
 carrot: Aktiver deling til Carrot
-diaspora_url: Diaspora URL, hvis tjenesten er aktiv
+diaspora_url: diaspora* URL, hvis tjenesten er aktiv
 export_epub: Aktiver eksport til ePub
 export_mobi: Aktiver eksport til .mobi
 export_pdf: Aktiver eksport til PDF
@@ -9,12 +8,10 @@ export_csv: Aktiver eksport til CSV
 export_json: Aktiver eksport til JSON
 export_txt: Aktiver eksport til TXT
 export_xml: Aktiver eksport til XML
-# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
-# import_with_redis: Enable Redis to import data asynchronously
 shaarli_url: Shaarli-URL, hvis tjenesten er aktiv
 scuttle_url: Scuttle-URL, hvis tjenesten er aktiv
 unmark_url: Unmark-URL, hvis tjenesten er aktiv
-share_diaspora: Aktiver deling til Diaspora
+share_diaspora: Aktiver deling til diaspora*
 share_mail: Aktiver deling med email
 share_shaarli: Aktiver deling gennem Shaarli
 share_scuttle: Aktiver deling gennem Scuttle
@@ -32,9 +29,3 @@ matomo_site_id: ID for din side hos Matomo
 matomo_enabled: Aktiver Matomo
 demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)"
 demo_mode_username: "Demobruger"
-# share_public: Allow public url for entries
-# download_images_enabled: Download images locally
-# restricted_access: Enable authentication for websites with paywall
-# api_user_registration: Enable user to be registered using the API
-# store_article_headers: Enable if wallabag stores HTTP headers for each article
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml

@@ -1,40 +1,43 @@
-settings_changed: 'Konfiguration aktualisiert'
-download_pictures: 'Bilder auf den Server herunterladen'
-carrot: 'Teilen zu Carrot aktivieren'
-diaspora_url: 'Diaspora-URL, sofern der Service aktiviert ist'
-export_epub: 'ePUB-Export aktivieren'
-export_mobi: 'mobi-Export aktivieren'
-export_pdf: 'PDF-Export aktivieren'
-export_csv: 'CSV-Export aktivieren'
-export_json: 'JSON-Export aktivieren'
-export_txt: 'TXT-Export aktivieren'
-export_xml: 'XML-Export aktivieren'
-import_with_rabbitmq: 'Aktiviere RabbitMQ, um Artikel asynchron zu importieren'
-import_with_redis: 'Aktiviere Redis, um Artikel asynchron zu importieren'
-shaarli_url: 'Shaarli-URL, sofern der Service aktiviert ist'
-scuttle_url: 'Scuttle-URL, sofern der Service aktiviert ist'
-unmark_url: 'Unmark-URL, sofern der Service aktiviert ist'
-share_diaspora: 'Teilen zu Diaspora aktiveren'
-share_mail: 'Teilen via E-Mail aktiveren'
-share_shaarli: 'Teilen zu Shaarli aktiveren'
-share_twitter: 'Teilen zu Twitter aktiveren'
-share_unmark: 'Teilen zu Unmark.it aktiveren'
-show_printlink: 'Link anzeigen, um den Inhalt auszudrucken'
-wallabag_support_url: 'Support-URL für wallabag'
-wallabag_url: 'URL von *deiner* wallabag-Instanz'
-entry: 'Artikel'
-export: 'Export'
-import: 'Import'
-misc: 'Verschiedenes'
-modify_settings: 'Übernehmen'
-matomo_host: 'Host deiner Webseite in Matomo (ohne http:// oder https://)'
-matomo_site_id: 'ID deiner Webseite in Matomo'
-matomo_enabled: 'Matomo aktivieren'
-demo_mode_enabled: 'Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)'
-demo_mode_username: 'Test-Benutzer'
-share_public: 'Erlaube eine öffentliche URL für Einträge'
-download_images_enabled: 'Bilder lokal herunterladen'
-restricted_access: 'Authentifizierung für Webseiten mit Paywall aktivieren'
-api_user_registration: 'Registrierung eines Benutzers über die API ermöglichen'
-store_article_headers: 'Speichern von HTTP-Headern für jeden Artikel aktivieren'
-shaarli_share_origin_url: 'Original-URL mit Shaarli teilen, wenn der Service aktiviert ist'
+settings_changed: Konfiguration aktualisiert
+download_pictures: Bilder auf den Server herunterladen
+carrot: Teilen zu Carrot aktivieren
+diaspora_url: diaspora*-URL, sofern der Service aktiviert ist
+export_epub: ePUB-Export aktivieren
+export_mobi: mobi-Export aktivieren
+export_pdf: PDF-Export aktivieren
+export_csv: CSV-Export aktivieren
+export_json: JSON-Export aktivieren
+export_txt: TXT-Export aktivieren
+export_xml: XML-Export aktivieren
+import_with_rabbitmq: Aktiviere RabbitMQ, um Artikel asynchron zu importieren
+import_with_redis: Aktiviere Redis, um Artikel asynchron zu importieren
+shaarli_url: Shaarli-URL, sofern der Service aktiviert ist
+scuttle_url: Scuttle-URL, sofern der Service aktiviert ist
+unmark_url: Unmark-URL, sofern der Service aktiviert ist
+share_diaspora: Freigabe für diaspora* aktivieren
+share_mail: Freigabe per E-Mail aktivieren
+share_shaarli: Freigabe für Shaarli aktivieren
+share_twitter: Freigabe für Twitter aktivieren
+share_unmark: Freigabe für Unmark.it aktivieren
+show_printlink: Link anzeigen, um den Inhalt auszudrucken
+wallabag_support_url: Support-URL für wallabag
+wallabag_url: URL von *deiner* wallabag-Instanz
+entry: Artikel
+export: Export
+import: Import
+misc: Verschiedenes
+modify_settings: Übernehmen
+matomo_host: Host deiner Webseite in Matomo (ohne http:// oder https://)
+matomo_site_id: ID deiner Webseite in Matomo
+matomo_enabled: Matomo aktivieren
+demo_mode_enabled: Demo-Modus aktivieren? (Wird nur für die öffentliche Wallabag-Demo
+  verwendet)
+demo_mode_username: Test-Benutzer
+share_public: Öffentliche URLs für Einträge zulassen
+download_images_enabled: Bilder lokal herunterladen
+restricted_access: Authentifizierung für Webseiten mit Paywall aktivieren
+api_user_registration: Registrierung eines Benutzers über die API ermöglichen
+store_article_headers: Speichern von HTTP-Headern für jeden Artikel aktivieren
+shaarli_share_origin_url: Original-URL mit Shaarli teilen, wenn der Service aktiviert
+  ist
+share_scuttle: Freigabe für Scuttle aktivieren

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml

@@ -1,5 +1,5 @@
 settings_changed: Configuration updated
-download_pictures: Download pictures on your server
+download_pictures: Download pictures onto your server
 carrot: Enable share to Carrot
 diaspora_url: diaspora* URL, if the service is enabled
 export_epub: Enable ePub export
@@ -22,19 +22,19 @@ share_twitter: Enable sharing to Twitter
 share_unmark: Enable sharing to Unmark.it
 show_printlink: Display a link to print content
 wallabag_support_url: Support URL for wallabag
-entry: "article"
-export: "export"
-import: "import"
-misc: "misc"
-modify_settings: "apply"
+entry: article
+export: export
+import: import
+misc: misc
+modify_settings: apply
 matomo_host: Host of your website in Matomo (without http:// or https://)
 matomo_site_id: ID of your website in Matomo
 matomo_enabled: Enable Matomo
-demo_mode_enabled: "Enable demo mode? (Only used for the public wallabag demo)"
-demo_mode_username: "Demo user"
-share_public: Allow public URL for entries
+demo_mode_enabled: Enable demo mode? (Only used for the public wallabag demo)
+demo_mode_username: Demo user
+share_public: Allow public URLs for entries
 download_images_enabled: Download images locally
 restricted_access: Enable authentication for paywalled websites
-api_user_registration: Enable user to be registered using the API
+api_user_registration: Turn on user registration via the API
 store_article_headers: Enable if wallabag stores HTTP headers for each article
-shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
+shaarli_share_origin_url: Enable sharing origin URL to Shaarli, if the service is enabled

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml

@@ -1,7 +1,7 @@
 settings_changed: Configuración actualizada
 download_pictures: Descargar imágenes en el servidor
-carrot: Activar compartir con Carrot
-diaspora_url: URL de Diaspora, si el servicio está activado
+carrot: Activar compartir en Carrot
+diaspora_url: URL de diaspora*, si el servicio está activado
 export_epub: Activar exportación a ePub
 export_mobi: Activar exportación a .mobi
 export_pdf: Activar exportación a PDF
@@ -14,13 +14,13 @@ import_with_redis: Activar Redis para importar datos de forma asíncrona
 shaarli_url: URL de Shaarli, si el servicio está activado
 scuttle_url: URL de Scuttle, si el servicio está activado
 unmark_url: URL de Unmark, si el servicio está activado
-share_diaspora: Activar compartir con Diaspora
-share_mail: Activar compartir con Email
-share_shaarli: Activar compartir con Shaarli
-share_scuttle: Activar compartir con Scuttle
-share_twitter: Activar compartir con Twitter
-share_unmark: Activar compartir con Unmark.it
-show_printlink: Mostrar un enlace para imprimir contenido
+share_diaspora: Activar compartir en diaspora*
+share_mail: Activar compartir por correo electrónico
+share_shaarli: Activar compartir en Shaarli
+share_scuttle: Activar compartir en Scuttle
+share_twitter: Activar compartir en Twitter
+share_unmark: Activar compartir en Unmark.it
+show_printlink: Mostrar un enlace para imprimir el contenido
 wallabag_support_url: URL de soporte de wallabag
 entry: "artículo"
 export: "exportar"
@@ -32,9 +32,9 @@ matomo_site_id: ID de tu website en Matomo
 matomo_enabled: Activar Matomo
 demo_mode_enabled: "Activar modo demo (sólo usado en la demo pública de wallabag)"
 demo_mode_username: "Nombre de usuario demo"
-share_public: Permitir URL pública para los artículos
+share_public: Permitir URLs públicas para los artículos
 download_images_enabled: Descargar imágenes localmente
 restricted_access: Activar autenticación para websites con paywall
-# api_user_registration: Enable user to be registered using the API
-# store_article_headers: Enable if wallabag stores HTTP headers for each article
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
+api_user_registration: Permitir el registro de usuarios utilizando el API
+shaarli_share_origin_url: Activar compartir en Shaarli, si el servicio está habilitado
+store_article_headers: Activar si wallabag almacena encabezados HTTP para cada artículo

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml

@@ -1,4 +1,3 @@
-# settings_changed: Configuration updated
 download_pictures: تصاویر را در کارگزار خودتان باربگیرید
 carrot: فعال‌سازی هم‌رسانی به Carrot
 diaspora_url: نشانی Diaspora، اگر فعال بود
@@ -9,8 +8,6 @@ export_csv:  فعال‌سازی برون‌سپاری به CSV
 export_json:  فعال‌سازی برون‌سپاری به JSON
 export_txt:  فعال‌سازی برون‌سپاری به TXT
 export_xml:  فعال‌سازی برون‌سپاری به XML
-# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
-# import_with_redis: Enable Redis to import data asynchronously
 shaarli_url: نشانی Shaarli، اگر فعال بود
 scuttle_url: نشانی Scuttle، اگر فعال بود
 unmark_url: نشانی Unmark، اگر فعال بود
@@ -27,14 +24,3 @@ export: "برون‌سپاری"
 import: "درون‌ریزی"
 misc: "غیره"
 modify_settings: "اعمال"
-# matomo_host: Host of your website in Matomo (without http:// or https://)
-# matomo_site_id: ID of your website in Matomo
-# matomo_enabled: Enable Matomo
-# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
-# demo_mode_username: "Demo user"
-# share_public: Allow public url for entries
-# download_images_enabled: Download images locally
-# restricted_access: Enable authentication for websites with paywall
-# api_user_registration: Enable user to be registered using the API
-# store_article_headers: Enable if wallabag stores HTTP headers for each article
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml

@@ -1,7 +1,7 @@
 settings_changed: Configuration mise à jour
 download_pictures: Télécharger les images sur le serveur
 carrot: Activer le partage vers Carrot
-diaspora_url: URL de Diaspora, si le service Diaspora est activé
+diaspora_url: URL de diaspora*, si le service est activé
 export_epub: Activer l'export ePub
 export_mobi: Activer l'export .mobi
 export_pdf: Activer l'export PDF
@@ -14,27 +14,27 @@ import_with_redis: Activer Redis pour gérer les imports de façon asynchrone
 shaarli_url: URL de Shaarli, si le service Shaarli est activé
 scuttle_url: URL de Scuttle, si le service Scuttle est activé
 unmark_url: URL de Unmark, si le service Unmark est activé
-share_diaspora: Activer le partage vers Diaspora
-share_mail: Activer le partage par email
+share_diaspora: Activer le partage vers diaspora*
+share_mail: Activer le partage par courriel
 share_shaarli: Activer le partage vers Shaarli
 share_scuttle: Activer le partage vers Scuttle
 share_twitter: Activer le partage vers Twitter
 share_unmark: Activer le partage vers Unmark.it
 show_printlink: Afficher un lien pour imprimer
 wallabag_support_url: URL de support de wallabag
-entry: "article"
-export: "export"
-import: "import"
-misc: "divers"
-modify_settings: "appliquer"
+entry: article
+export: export
+import: import
+misc: divers
+modify_settings: appliquer
 matomo_host: URL de votre site dans Matomo (sans http:// ou https://)
 matomo_site_id: ID de votre site dans Matomo
 matomo_enabled: Activer Matomo
-demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)"
-demo_mode_username: "Utilisateur de la démo"
-share_public: Autoriser une URL publique pour les articles
+demo_mode_enabled: Activer le mode démo ? (Utiliser uniquement pour la démo publique de wallabag)
+demo_mode_username: Utilisateur de la démo
+share_public: Autoriser les URL publiques pour les articles
 download_images_enabled: Télécharger les images en local
-restricted_access: Activer l'authentification pour les articles derrière un paywall
+restricted_access: Activer l'authentification pour les sites avec paywall
 api_user_registration: Activer la création de compte depuis l'API
 store_article_headers: Activer le stockage des en-têtes HTTP de chaque article
 shaarli_share_origin_url: Activer le partage de l'adresse d'origine vers Shaarli, si le service est activé

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.hi.yml

@@ -0,0 +1 @@
+{}

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.hr.yml

@@ -0,0 +1,40 @@
+share_diaspora: Aktiviraj dijeljenje na diaspora*
+share_twitter: Aktiviraj dijeljenje na Twitter
+shaarli_share_origin_url: Aktiviraj dijeljenje URL-a izvora na Shaarli, ako je usluga aktivirana
+export_csv: Aktiviraj CSV izvoz
+matomo_site_id: ID tvoje web-stranice u Matomo
+share_mail: Aktiviraj dijeljenje putem e-maila
+export_txt: Aktiviraj TXT izvoz
+download_images_enabled: Preuzmi slike lokalno
+share_scuttle: Aktiviraj dijeljenje na Scuttle
+export: izvezi
+export_json: Aktiviraj JSON izvoz
+store_article_headers: Aktiviraj, ako wallabag sprema HTTP zaglavlja za svaki članak
+entry: članak
+share_shaarli: Aktiviraj dijeljenje na Shaarli
+scuttle_url: Scuttle URL, ako je usluga aktivirana
+share_unmark: Aktiviraj dijeljenje na Unmark.it
+export_pdf: Aktiviraj PDF izvoz
+matomo_enabled: Aktiviraj Matomo
+import_with_redis: Aktiviraj Redis za asinkroni uvoz podataka
+restricted_access: Aktiviraj autentifikaciju za naplatne web-stranice
+export_mobi: Aktiviraj .mobi izvoz
+demo_mode_enabled: Aktivirati demo modus? (Koristi se samo za javnu wallabag demonstraciju)
+carrot: Aktiviraj dijeljenje na Carrot
+diaspora_url: diaspora* URL, ako je usluga aktivirana
+import_with_rabbitmq: Aktiviraj RabbitMQ za asinkroni uvoz podataka
+api_user_registration: Aktiviraj korisničku registraciju putem sučelja
+settings_changed: Konfiguracija aktualizirana
+matomo_host: Računalo tvoje web-stranice u Matomo (bez http:// ili https://)
+unmark_url: Unmark URL, ako je usluga aktivirana
+shaarli_url: Shaarli URL, ako je usluga aktivirana
+download_pictures: Preuzmi slike na vlastiti poslužitelj
+modify_settings: primijeni
+export_epub: Aktiviraj ePub izvoz
+misc: razno
+wallabag_support_url: URL podrške za wallabag
+export_xml: Aktiviraj XML izvoz
+show_printlink: Za ispis sadržaja, prikaži poveznicu
+demo_mode_username: Demo korisnik
+import: uvezi
+share_public: Dozvoli javne URL-ove za zapise

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.hu.yml

@@ -0,0 +1,42 @@
+settings_changed: Beállítások frissítve
+download_pictures: Képek letöltése a kiszolgálóra
+carrot: Megosztás engedélyezése a Carrot-ra
+diaspora_url: diaspora* URL, ha a szolgáltatás engedélyezett
+export_epub: ePub-ba exportálás engedélyezése
+export_mobi: .mobi-ba exportálás engedélyezése
+export_pdf: PDF-be exportálás engedélyezése
+export_csv: CSV-be exportálás engedélyezése
+export_json: JSON-ba exportálás engedélyezése
+export_txt: TXT-be exportálás engedélyezése
+export_xml: XML-be exportálás engedélyezése
+import_with_rabbitmq: A RabbitMQ aszinkron adatimportálásának engedélyezése
+import_with_redis: A Redis aszinkron adatimportálásának engedélyezése
+shaarli_url: Shaarli URL, ha a szolgáltatás engedélyezett
+scuttle_url: Scuttle URL, ha a szolgáltatás engedélyezett
+unmark_url: Unmark URL, ha a szolgáltatás engedélyezett
+share_diaspora: Megosztás engedélyezése a diaspora*-ra
+share_mail: Megosztás engedélyezése e-mail-ben
+share_shaarli: Megosztás engedélyezése a Shaarli-ra
+share_scuttle: Megosztás engedélyezése a Scuttle-ra
+share_twitter: Megosztás engedélyezése a Twitter-re
+share_unmark: Megosztás engedélyezése az Unmark.it-ra
+show_printlink: Hivatkozás mutatása a tartalom nyomtatására
+wallabag_support_url: Támogatási URL a wallabag-hoz
+entry: cikk
+export: exportál
+import: importál
+misc: egyéb
+modify_settings: alkalmaz
+piwik_host: Weboldalának hosztja a Piwik-en (http:// vagy https:// nélkül)
+piwik_site_id: Weboldalának azonosítója (ID-je) a Piwik-en
+piwik_enabled: Piwik engedélyezése
+demo_mode_enabled: Engedélyezi a bemutató (demó) módot? (Csak a nyilvános wallabag
+  demóhoz használva)
+demo_mode_username: Demó felhasználó
+share_public: Nyilvános URL-ek engedélyezése a bejegyzésekhez
+download_images_enabled: Képek letöltése helyileg
+restricted_access: Hitelesítés engedélyezése paywalled weboldalakhoz
+api_user_registration: Felhasználó API-n keresztüli regisztrálásának engedélyezése
+store_article_headers: HTTP fejlécek tárolása az összes cikkhez
+shaarli_share_origin_url: Az eredeti URL megosztásának engedélyezése a Shaarli-n,
+  ha a szolgáltatás engedélyezett

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml

@@ -1,7 +1,6 @@
-# settings_changed: Configuration updated
 download_pictures: Scarica le immagini sul tuo server
 carrot: Abilita la condivisione con Carrot
-diaspora_url: Diaspora URL, se il servizio è abilitato
+diaspora_url: URL di diaspora*, se il servizio è abilitato
 export_epub: Abilita esportazione ePub
 export_mobi: Abilita esportazione .mobi
 export_pdf: Abilita esportazione PDF
@@ -9,13 +8,11 @@ export_csv: Abilita esportazione CSV
 export_json: Abilita esportazione JSON
 export_txt: Abilita esportazione TXT
 export_xml: Abilita esportazione XML
-# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
-# import_with_redis: Enable Redis to import data asynchronously
 shaarli_url: Shaarli URL, se il servizio è abilitato
 scuttle_url: Scuttle URL, se il servizio è abilitato
 unmark_url: Unmark URL, se il servizio è abilitato
-share_diaspora: Abilita la condivisione con Diaspora
-share_mail: Abilita la condivisione per email
+share_diaspora: Abilita la condivisione con diaspora*
+share_mail: Abilita la condivisione per e-mail
 share_shaarli: Abilita la condivisione con Shaarli
 share_scuttle: Abilita la condivisione con Scuttle
 share_twitter: Abilita la condivisione con Twitter
@@ -32,9 +29,5 @@ matomo_site_id: ID del tuo sito in Matomo
 matomo_enabled: Abilita Matomo
 demo_mode_enabled: "Abilita modalità demo ? (usato solo per la demo pubblica di wallabag)"
 demo_mode_username: "Utente Demo"
-# share_public: Allow public url for entries
-# download_images_enabled: Download images locally
-# restricted_access: Enable authentication for websites with paywall
 api_user_registration: Abilita la registrazione dell'utente attraverso l'API
-# store_article_headers: Enable if wallabag stores HTTP headers for each article
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
+settings_changed: Configurazione aggiornata

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ja.yml

@@ -1,40 +1,40 @@
-settings_changed: 構成が更新されました
-download_pictures: 画像をあなたのサーバにダウンロード
+settings_changed: 設定を更新しました
+download_pictures: サーバー上の画像をダウンロード
 carrot: Carrot への共有を有効にする
-diaspora_url: diaspora* URL、サービスが有効な場合
-export_epub: ePub 形式でのエクスポートを有効にする
-export_mobi: .mobi 形式でのエクスポートを有効にする
-export_pdf: PDF 形式でのエクスポートを有効にする
-export_csv: CSV 形式でのエクスポートを有効にする
-export_json: JSON 形式でのエクスポートを有効にする
-export_txt: TXT 形式でのエクスポートを有効にする
-export_xml: XML 形式でのエクスポートを有効にする
-import_with_rabbitmq: データを非同期的にインポートする RabbitMQ を有効にする
-import_with_redis: データを非同期的にインポートする Redis を有効にする
-shaarli_url: Shaarli URL、サービスが有効な場合
-scuttle_url: Scuttle URL、サービスが有効な場合
+diaspora_url: diaspora* URL、サービスが有効になっている場合
+export_epub: ePub のエクスポートを有効にする
+export_mobi: .mobi のエクスポートを有効にする
+export_pdf: PDF のエクスポートを有効にする
+export_csv: CSV のエクスポートを有効にする
+export_json: JSON のエクスポートを有効にする
+export_txt: TXT のエクスポートを有効にする
+export_xml: XML のエクスポートを有効にする
+import_with_rabbitmq: RabbitMQ を有効にして、データを非同期的にインポートする
+import_with_redis: Redis を有効にして、データを非同期的にインポートする
+shaarli_url: サービスが有効になっている場合、Shaarli URL
+scuttle_url: Scuttle URL、サービスが有効になっている場合
 unmark_url: Unmark URL、サービスが有効な場合
-share_diaspora: diaspora* への共有を有効にする
-share_mail: 電子メールでの共有を有効にする
-share_shaarli: Shaarli への共有を有効にする
-share_scuttle: Scuttle への共有を有効にする
-share_twitter: Twitter への共有を有効にする
-share_unmark: Unmark.it への共有を有効にする
-show_printlink: コンテンツを印刷するためのリンクを表示する
-wallabag_support_url: Wallabag のサポート URL
-entry: "記事"
-export: "エクスポート"
-import: "インポート"
-misc: "misc"
-modify_settings: "適用"
-matomo_host: Matomo でのウェブサイトのホスト (http:// または https:// は不要)
+share_diaspora: diaspora* に共有を有効にする
+share_mail: メールで共有を有効にする
+share_shaarli: Shaarli に共有を有効にする
+share_scuttle: Scuttle に共有を有効にする
+share_twitter: Twitter に共有を有効にする
+share_unmark: Unmark.it に共有を有効にする
+show_printlink: 印刷するコンテンツへのリンクを表示
+wallabag_support_url: wallabag のサポート URL
+entry: 記事
+export: エクスポート
+import: インポート
+misc: その他
+modify_settings: 適用
+matomo_host: Matomo のウェブサイトのホスト (http:// および https:// なし)
 matomo_site_id: Matomo でのあなたのウェブサイトの ID
 matomo_enabled: Matomo を有効にする
-demo_mode_enabled: "デモモードを有効にしますか？ (パブリック Wallabag のデモにのみ使用)"
-demo_mode_username: "デモユーザー"
-share_public: 記事の公開 URL を許可する
-download_images_enabled: 画像をローカルにダウンロードする
-restricted_access: ペイウォールウェブサイトの認証を有効にする
-api_user_registration: API を使用してユーザーを登録できるようにする
-store_article_headers: 各記事の HTTP ヘッダーを Wallabag が格納する場合に有効にする
-shaarli_share_origin_url: サービスが有効になっている場合、Shaarli へのオリジン URL の共有を有効にする
+demo_mode_enabled: デモモードを有効にしますか? (公開 wallabag デモでのみ使用)
+demo_mode_username: デモユーザー
+share_public: エントリの公開 URL を許可する
+download_images_enabled: 画像をローカルにダウンロード
+restricted_access: ペイウォールのあるウェブサイトへの認証を有効にする
+api_user_registration: API を使ってユーザを登録できるようにする
+store_article_headers: wallabag が各記事の HTTP ヘッダーを格納するかどうかを有効にする
+shaarli_share_origin_url: サービスが有効な場合に Shaarli に元の url の共有を有効にする

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ko.yml

@@ -0,0 +1 @@
+{}

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.nb.yml

@@ -0,0 +1,43 @@
+settings_changed: Oppsett oppdatert
+download_pictures: Last ned bilder til tjeneren din
+carrot: Skru på deling til Carrot
+diaspora_url: diaspora*-nettadresse, hvis tjenesten er avskrudd
+export_epub: Skru på ePub-eksport
+export_mobi: Skru på .mobi-eksport
+export_pdf: Skru på PDF-eksport
+export_csv: Skru på CSV-eksport
+export_json: Skru på JSON-eksport
+export_txt: Skru på TXT-eksport
+export_xml: Skru på XML-eksport
+import_with_rabbitmq: Skru på RabbitMQ for å importere data asynkront
+import_with_redis: Skru på Redis for å importere data asynkront
+shaarli_url: Shaarli-nettadresse, hvis tjenesten er avskrudd
+share_diaspora: Skru på deling til diaspora*
+share_mail: Skru på deling via e-post
+share_shaarli: Skru på deling til Shaarli
+share_twitter: Skru på deling til Twitter
+share_unmark: Skru på deling til Unmark.it
+show_printlink: Vis en lenke for å skrive ut innhold
+wallabag_support_url: Støtte-nettadresse for wallabag
+entry: artikkel
+export: eksporter
+import: importer
+misc: ymse
+modify_settings: bruk
+piwik_host: Vertskap for din nettside hos Piwik (uten http:// eller https://)
+piwik_site_id: ID for din nettside hos Piwik
+piwik_enabled: Skru på Piwik
+demo_mode_enabled: Skru på demo-modus? (Kun brukt for offentlig wallabag-demo)
+demo_mode_username: Demo-bruker
+share_public: Tillat offentlige nettadresser for oppføringer
+download_images_enabled: Last ned bilder lokalt
+restricted_access: Skru på identitetsbekreftelse for nettsider med betalingsmur
+scuttle_url: Scuttle-nettadresse, hvis tjenesten er påskrudd
+unmark_url: Unmark-nettadresse, hvis tjenesten er påskrudd
+share_scuttle: Skru på deling til Scuttle
+api_user_registration: Skru på brukerregistrering via API-et
+store_article_headers: Skru på hvis wallabag lagrer HTTP-hoder for hver artikkel
+shaarli_share_origin_url: Skru på deling av opprinnelsesnettadresse til Shaarli, hvis tjenesten er påskrudd
+matomo_host: Vertstjen din nettside i Matomo (uten http:// eller http://)
+matomo_enabled: Skru på Matomo
+matomo_site_id: ID for din nettside i Matomo

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.nl.yml

@@ -0,0 +1,40 @@
+shaarli_share_origin_url: Schakel het delen van oorspronkelijke url naar Shaarli in, wanneer deze dienst ingeschakeld is
+store_article_headers: Schakel het opslaan van HTTP headers voor ieder artikel in
+api_user_registration: Schakel gebruikersregistratie via API in
+restricted_access: Schakel authenticatie voor betaalde websites in
+download_images_enabled: Download afbeelding lokaal
+demo_mode_username: Demo gebruiker
+demo_mode_enabled: Schakel demo modus in? (Gebruik dit alleen voor de publieke wallabag demo)
+matomo_enabled: Schakel Matomo in
+matomo_site_id: ID van uw Matomo website
+matomo_host: Adres van uw Matomo website (zonder http:// of https://)
+modify_settings: bevestig
+misc: overig
+import: importeer
+export: exporteer
+entry: Artikel
+wallabag_support_url: Hulp URL voor wallabag
+show_printlink: Toon een link naar de print inhoud
+share_unmark: Schakel delen met Unmark.it in
+share_twitter: Schakel delen met Twitter in
+share_scuttle: Schakel delen met Scuttle in
+share_shaarli: Schakel delen met Shaarli in
+share_mail: Schakel delen naar e-mail in
+share_diaspora: Schakel deel naar diaspora* in
+unmark_url: Unmark URL, als de dienst ingeschakeld is
+scuttle_url: Scuttle URL, wanneer de dienst ingeschakeld is
+shaarli_url: Shaarli URL, als de service ingeschakeld is
+import_with_redis: Schakel Redis in om data asynchroon te importeren
+import_with_rabbitmq: Schakel RabbitMQ in om data asynchroon te importeren
+export_xml: Schakel XML-export in
+export_txt: Schakel TXT-export in
+export_json: Schakel JSON-export in
+export_csv: Schakel CSV-export in
+export_pdf: Schakel PDF-export in
+export_mobi: Schakel .mobi-export in
+export_epub: Schakel ePub-export in
+carrot: Schakel delen naar Carrot in
+download_pictures: Download foto's naar jouw server
+settings_changed: Instellingen bijgewerkt
+diaspora_url: diaspora* URL, als de dienst is aangezet
+share_public: Sta openbare URL's toe voor items

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml

@@ -1,7 +1,7 @@
 settings_changed: Configuracion mesa a jorn
 download_pictures: Telecargar los imatges sul servidor
 carrot: Activar lo partatge cap a Carrot
-diaspora_url: URL de Diaspora, se lo servici Diaspora es activat
+diaspora_url: URL de diaspora*, se lo servici diaspora* es activat
 export_epub: Activar l'expòrt ePub
 export_mobi: Activar l'expòrt .mobi
 export_pdf: Activar l'expòrt PDF

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml

@@ -14,26 +14,28 @@ import_with_redis: Włącz Redis dla asynchronicznego importu danych
 shaarli_url: Adress URL Shaarli, jeżeli usługa jest włączona
 scuttle_url: Adress URL Scuttle, jeżeli usługa jest włączona
 share_diaspora: Włącz udostępnianie dla Diaspora
-share_mail: Włącz udostępnianie przez email
+share_mail: Włącz udostępnianie przez e-mail
 share_shaarli: Włącz udostępnianie dla Shaarli
 share_scuttle: Włącz udostępnianie dla Scuttle
 share_twitter: Włącz udostępnianie dla Twitter
 share_unmark: Włącz udostępnianie dla Unmark.it
 show_printlink: Pokaż link do wydrukowania zawartości
 wallabag_support_url: Adres URL wsparcia dla wallabag
-entry: "artykuł"
-export: "eksport"
-import: "import"
-misc: "różne"
-modify_settings: "zatwierdź"
+entry: artykuł
+export: eksport
+import: import
+misc: różne
+modify_settings: zatwierdź
 matomo_host: Host twojej strony Matomo (bez http:// lub https://)
 matomo_site_id: ID twojej strony Matomo
 matomo_enabled: Włacz Matomo
-demo_mode_enabled: "Włacz tryb demo? (używany wyłącznie dla publicznej demonstracji Wallabag)"
-demo_mode_username: "Użytkownik Demonstracyjny"
-share_public: Zezwalaj na publiczny adres url dla wpisow
+demo_mode_enabled: Włącz tryb demo? (używany wyłącznie dla publicznej demonstracji
+  Wallabag)
+demo_mode_username: Użytkownik Demonstracyjny
+share_public: Zezwalaj na publiczne adresy url dla wpisów
 download_images_enabled: Pobierz obrazy lokalnie
-restricted_access: Włącz autoryzację dla stron z paywallem
+restricted_access: Włącz autoryzację dla stron za paywallem
 api_user_registration: Włącz rejestrację użytkownika przy użyciu API
-# store_article_headers: Enable if wallabag stores HTTP headers for each article
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
+unmark_url: Odznacz URL, jeżeli usługa jest włączona
+store_article_headers: Włącz, jeżeli Wallabag zapisuje nagłówki HTTP dla każdego artykułu
+shaarli_share_origin_url: Włącz udostępnianie URL Shaarli, jeżeli usługa jest włączona

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml

@@ -1,7 +1,6 @@
-# settings_changed: Configuration updated
 download_pictures: Download imagens no seu servidor
 carrot: Habilitar compartilhamento para o Carrot
-diaspora_url: URL Diaspora caso o serviço esteja habilitado
+diaspora_url: URL de diaspora* caso o serviço esteja ativado
 export_epub: Habilita exportação para ePub
 export_mobi: Habilita exportação para .mobi
 export_pdf: Habilita exportação para PDF
@@ -9,13 +8,11 @@ export_csv: Habilita exportação para CSV
 export_json: Habilita exportação para JSON
 export_txt: Habilita exportação para TXT
 export_xml: Habilita exportação para XML
-# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
-# import_with_redis: Enable Redis to import data asynchronously
-shaarli_url: URL Shaarli caso o serviço esteja habilitado
-scuttle_url: URL Scuttle caso o serviço esteja habilitado
-unmark_url: URL Unmark caso o serviço esteja habilitado
+shaarli_url: URL de Shaarli caso o serviço esteja ativado
+scuttle_url: URL de Scuttle caso o serviço esteja ativado
+unmark_url: URL de Unmark caso o serviço esteja ativado
 pocket_consumer_key: Chave de consumidor do Pocket para importar conteúdo (https://getpocket.com/developer/docs/authentication)
-share_diaspora: Habilitar compartilhamento para o Diaspora
+share_diaspora: Habilitar compartilhamento para o diaspora*
 share_mail: Habilitar compartilhamento por e-mail
 share_shaarli: Habilitar compartilhamento para o Shaarli
 share_scuttle: Habilitar compartilhamento para o Scuttle
@@ -32,10 +29,13 @@ matomo_host: Host de seu website Matomo
 matomo_site_id: ID de seu website Matomo
 matomo_enabled: Habilitar Matomo
 demo_mode_enabled: "Habilitar modo demo? (somente usado para o demo público do wallabag)"
-demo_mode_username: "Usuário demo"
-# share_public: Allow public url for entries
-# download_images_enabled: Download images locally
-# restricted_access: Enable authentication for websites with paywall
-# api_user_registration: Enable user to be registered using the API
-# store_article_headers: Enable if wallabag stores HTTP headers for each article
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
+demo_mode_username: "Utilizador demo"
+restricted_access: Habilitar autenticação para sites com paywall
+download_images_enabled: Baixar imagens localmente
+import_with_redis: Habilitar Redis para importar dados assincronamente
+import_with_rabbitmq: Permitir que RabbitMQ importe dados assincronamente
+settings_changed: Configuração atualizada
+share_public: 'Permitir URLs públicas para entradas'
+shaarli_share_origin_url: Ativar o URL de origem de compartilhamento para Shaarli, se o serviço estiver ativado
+store_article_headers: Ativar se o wallabag armazena cabeçalhos de HTTP para cada artigo
+api_user_registration: Ative o registo do utilizador através da API

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml

@@ -1,7 +1,6 @@
-# settings_changed: Configuration updated
 download_pictures: Descarcă poze pe server
 carrot: Permite share către Carrot
-diaspora_url: Diaspora URL, dacă serviciul este permis
+diaspora_url: diaspora* URL, dacă serviciul este permis
 export_epub: Permite exportare ePub
 export_mobi: Permite exportare .mobi
 export_pdf: Permite exportare PDF
@@ -9,12 +8,10 @@ export_csv: Permite exportare CSV
 export_json: Permite exportare JSON
 export_txt: Permite exportare TXT
 export_xml: Permite exportare XML
-# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
-# import_with_redis: Enable Redis to import data asynchronously
 shaarli_url: Shaarli URL, dacă serviciul este permis
 scuttle_url: Scuttle URL, dacă serviciul este permis
 unmark_url: Unmark URL, dacă serviciul este permis
-share_diaspora: Permite share către Diaspora
+share_diaspora: Permite share către diaspora*
 share_mail: Permite share prin email
 share_shaarli: Permite share către Shaarli
 share_scuttle: Permite share către Scuttle
@@ -27,14 +24,3 @@ export: "exportă"
 import: "importă"
 misc: "diverse"
 modify_settings: "aplică"
-# matomo_host: Host of your website in Matomo (without http:// or https://)
-# matomo_site_id: ID of your website in Matomo
-# matomo_enabled: Enable Matomo
-# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
-# demo_mode_username: "Demo user"
-# share_public: Allow public url for entries
-# download_images_enabled: Download images locally
-# restricted_access: Enable authentication for websites with paywall
-# api_user_registration: Enable user to be registered using the API
-# store_article_headers: Enable if wallabag stores HTTP headers for each article
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ru.yml

@@ -35,6 +35,7 @@ demo_mode_username: "Демо пользователь"
 share_public: "Разрешить публичные ссылки на записи"
 download_images_enabled: "Скачивать изображения локально"
 restricted_access: "Включить авторизацию на сайте с помощью paywall"
-# api_user_registration: Enable user to be registered using the API
-# store_article_headers: Enable if wallabag stores HTTP headers for each article
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
+shaarli_share_origin_url: Включите отправку URL-адреса источника для Shaarli, если услуга включена
+store_article_headers: Включите, если wallabag хранит заголовки HTTP для каждой статьи
+api_user_registration: Разрешить пользователю регистрироваться с помощью API
+share_scuttle: Включить возможность поделиться в Shaarli

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.sv.yml

@@ -0,0 +1 @@
+{}

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.th.yml

@@ -34,4 +34,3 @@ share_public: ยอมรับ URL สาธารณะจากการเ
 download_images_enabled: ดาวน์โหลดรูปภาพเฉพาะ
 restricted_access: เปิดใช้งานการรองรับบนเว็บไซต์กับ paywall
 api_user_registration: เปิดใช้งานให้ผู้ใช้ลงทะเบียนการใช้ API
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml

@@ -1,41 +1,40 @@
-# settings_changed: Configuration updated
-# download_pictures: Download pictures on your server
-# carrot: Enable share to Carrot
-# diaspora_url: Diaspora URL, if the service is enabled
-# export_epub: Enable ePub export
-# export_mobi: Enable .mobi export
-# export_pdf: Enable PDF export
-# export_csv: Enable CSV export
-# export_json: Enable JSON export
-# export_txt: Enable TXT export
-# export_xml: Enable XML export
-# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
-# import_with_redis: Enable Redis to import data asynchronously
-# shaarli_url: Shaarli URL, if the service is enabled
-# scuttle_url: Scuttle URL, if the service is enabled
-# unmark_url: Unmark URL, if the service is enabled
-# share_diaspora: Enable share to Diaspora
-# share_mail: Enable share by email
-# share_shaarli: Enable share to Shaarli
-# share_scuttle: Enable share to Scuttle
-# share_twitter: Enable share to Twitter
-# share_unmark: Enable share to Unmark.it
-# show_printlink: Display a link to print content
-# wallabag_support_url: Support URL for wallabag
-# wallabag_url: URL of *your* wallabag instance
-# entry: "article"
-# export: "export"
-# import: "import"
-# misc: "misc"
-# modify_settings: "apply"
-# matomo_host: Host of your website in Matomo (without http:// or https://)
-# matomo_site_id: ID of your website in Matomo
-# matomo_enabled: Enable Matomo
-# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
-# demo_mode_username: "Demo user"
-# share_public: Allow public url for entries
-# download_images_enabled: Download images locally
-# restricted_access: Enable authentication for websites with paywall
-# api_user_registration: Enable user to be registered using the API
-# store_article_headers: Enable if wallabag stores HTTP headers for each article
-# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
+settings_changed: Ayarlar güncellendi
+download_pictures: Resimleri sunucuya indir
+carrot: Carrot'a paylaşımı aktifleştir
+diaspora_url: diaspora* URL'i (eğer servis aktifse)
+export_epub: ePub çıktı alımını aktifleştir
+export_mobi: .mobi çıktı alımını aktifleştir
+export_pdf: PDF çıktı alımını aktifleştir
+export_csv: CSV çıktı alımını aktifleştir
+export_json: JSON çıktı alımını aktifleştir
+export_txt: TXT çıktı alımını aktifleştir
+export_xml: XML çıktı alımını aktifleştir
+import_with_rabbitmq: Verileri asenkron olarak içeri alabilmek için RabbitMQ'yu aktifleştir
+import_with_redis: Verileri asenkron olarak içeri alabilmek için Redis'i aktifleştir
+shaarli_url: Shaarli URL'i (eğer servis aktifse)
+scuttle_url: Scuttle URL'i (eğer servis aktifse)
+unmark_url: Unmark URL'i (eğer servis aktifse)
+share_diaspora: diaspora*'ya paylaşımı aktifleştir
+share_mail: E-posta'ya paylaşımı aktifleştir
+share_shaarli: Shaarli'ye paylaşımı aktifleştir
+share_scuttle: Scuttle'a paylaşımı aktifleştir
+share_twitter: Twitter'a paylaşımı aktifleştir
+share_unmark: Unmark.it'e paylaşımı aktifleştir
+show_printlink: İçeriği yazdırabilmek için bir bağlantı görüntüle
+wallabag_support_url: Wallabag destek URL'i
+entry: makale
+export: dışarı aktar
+import: içe aktar
+misc: çeşitli
+modify_settings: uygula
+matomo_host: Matomo'teki web sitenizin host adresi (başında http:// veya https:// olmadan)
+matomo_site_id: Matomo'teki web sitenizin ID'si
+matomo_enabled: Matomo'i aktifleştir
+demo_mode_enabled: Demo mod aktifleştirilsin mi (Sadece herkese açık wallabag demoları için kullanılmakta)
+demo_mode_username: Demo kullanıcısı
+share_public: Makaleler için herkese açık URL'lere izin ver
+download_images_enabled: Resimleri lokale indir
+restricted_access: Ödeme ile erişim sağlanabilen sitelere doğrulama özelliğini aktifleştir
+api_user_registration: API ile üye kaydını aktifleştir
+store_article_headers: Eğer wallabag her makale için HTTP header'larını saklıyorsa aktifleştirin
+shaarli_share_origin_url: Shaarli'ye orijinal URL'in paylaşımını aktifleştir (eğer servis aktifse)

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.uk.yml

@@ -0,0 +1,40 @@
+settings_changed: Конфігурацію оновлено
+download_pictures: Завантажити картинки на ваш сервер
+carrot: Дозволити ділитися в Carrot
+diaspora_url: diaspora* адреса, якщо сервіс увімкнено
+export_epub: Увімкнути експорт в ePub
+export_mobi: Увімкнути експорт в .mobi
+export_pdf: Увімкнути експорт в PDF
+export_csv: Увімкнути експорт в CSV
+export_json: Увімкнути експорт в JSON
+export_txt: Увімкнути експорт в TXT
+export_xml: Увімкнути експорт в XML
+import_with_rabbitmq: Увімкнути можливість асинхронного імпорту через RabbitMQ
+import_with_redis: Увімкнути можливість асинхронного імпорту через Redis
+shaarli_url: Shaarli URL, якщо сервіс увімкнено
+scuttle_url: Scuttle URL, якщо сервіс увімкнено
+unmark_url: Unmark URL, якщо сервіс увімкнено
+share_diaspora: Дозволити ділитися в diaspora*
+share_mail: Дозволити ділитись електронною поштою
+share_shaarli: Дозволити ділитися в Shaarli
+share_scuttle: Дозволити ділитися в Scuttle
+share_twitter: Дозволити ділитися в Twitter
+share_unmark: Дозволити ділитися в Unmark.it
+show_printlink: Показувати лінк для друку
+wallabag_support_url: Адреса техпідтримки для wallabag
+entry: стаття
+export: експорт
+import: імпорт
+misc: інше
+modify_settings: застосувати
+matomo_host: Host вашого сайту в Matomo (без http:// чи https://)
+matomo_site_id: ID вашого сайту в Matomo
+matomo_enabled: Увімкнути Matomo
+demo_mode_enabled: Увімкнути демо-режим? (Використовується тільки для публічних демонстрацій wallabag)
+demo_mode_username: Демо-користувач
+share_public: Дозволити публічні посилання на статті
+download_images_enabled: Завантажувати картинки локально
+restricted_access: Увімкнути аутентифікацію для сайтів з платним контентом
+api_user_registration: Дозволити користувачам реєструватись через API
+store_article_headers: Увімкнути зберігання HTTP-заголовків для кожної статті
+shaarli_share_origin_url: Увімкнути можливість ділитись оригінальним лінком в Shaarli, якщо сервіс увімкнено

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.zh_Hant.yml

@@ -0,0 +1 @@
+{}

app/Resources/static/themes/_global/share.js

@@ -1,4 +1 @@
 import './share.scss';
-
-function requireAll(r) { r.keys().forEach(r); }
-requireAll(require.context('./img/', true, /\.(jpg|png|gif|svg|ico)$/));

app/Resources/static/themes/baggy/css/print.scss

@@ -2,7 +2,7 @@
   /* ### Layout ### */
 
   body {
-    font-family: Serif;
+    font-family: serif;
     background-color: #fff;
   }
 

app/Resources/static/themes/material/css/cards.scss

@@ -293,6 +293,11 @@ a.original:not(.waves-effect) {
   }
 }
 
+.card.archived,
+.card-stacked.archived {
+  opacity: 0.5;
+}
+
 #content .collection .collection-item {
   min-height: 65px;
   height: auto;

app/Resources/static/themes/material/css/dark_theme.scss

@@ -0,0 +1,78 @@
+.dark-theme {
+  body,
+  main #content,
+  #article,
+  .card,
+  .card-panel,
+  .card .card-reveal,
+  .card-stacked .preview:not(.preview--default),
+  .card .preview:not(.preview--default),
+  .collapsible-header,
+  .collection .collection-item,
+  .dropdown-content,
+  .nav-panel-add,
+  .nav-panel-search,
+  .side-nav,
+  .side-nav .collapsible-body,
+  .side-nav.fixed .collapsible-body,
+  .tabs {
+    background-color: black;
+  }
+
+  .dropdown-content li:hover,
+  .dropdown-content li.active,
+  .dropdown-content li.selected {
+    background-color: #575757;
+  }
+
+  main #content,
+  table.striped > tbody > tr > td,
+  #article article,
+  #article article h1,
+  #article article h2,
+  #article article h3,
+  #article article h4,
+  #article article h5,
+  #article article h6,
+  .results a,
+  .side-nav li > a,
+  .side-nav li > a > i.material-icons {
+    color: #dfdfdf;
+  }
+
+  .grey-text.text-darken-4 {
+    color: #dfdfdf !important;
+  }
+
+  .side-nav li.active,
+  .side-nav li:not(.logo) > a:hover,
+  .side-nav .collapsible-header:hover,
+  .side-nav.fixed .collapsible-header:hover {
+    background-color: #333;
+  }
+
+  #article {
+    box-shadow: 0 0 10px #575757;
+  }
+
+  nav,
+  .card,
+  .side-nav {
+    box-shadow: 0 2px 2px 0 rgba(255, 255, 255, 0.4), 0 1px 5px 0 rgba(255, 255, 255, 0.4), 0 3px 1px -2px rgba(255, 255, 255, 0.4);
+  }
+
+  .logo img,
+  .preview.preview--default,
+  .typo-logo {
+    filter: invert(100%);
+  }
+
+  .border-bottom,
+  .collapsible {
+    border-color: #222;
+  }
+
+  table.striped > tbody > tr:nth-child(2n+1) {
+    background-color: #0c0c0c;
+  }
+}

app/Resources/static/themes/material/css/index.scss

@@ -9,6 +9,7 @@
 @import 'nav';
 @import 'sidenav';
 @import 'various';
+@import 'dark_theme';
 
 /* Tools */
 @import 'fonts';

app/Resources/static/themes/material/css/media_queries.scss

@@ -15,7 +15,7 @@
 }
 
 @media screen and (min-width: 993px) {
-  body.entry main #content {
+  .entry #content {
     padding-left: 70px;
   }
 }
@@ -42,6 +42,10 @@
     padding-right: 0.75rem;
   }
 
+  .nav-panel-top {
+    padding: 6px 0;
+  }
+
   .nav-panel-buttom {
     justify-content: space-between;
   }
@@ -50,6 +54,7 @@
     max-width: 35em;
     margin-left: auto;
     margin-right: auto;
+    padding-bottom: 100px;
     font-size: 18px;
 
     > header > h1 {

app/Resources/static/themes/material/css/nav.scss

@@ -20,7 +20,8 @@ nav {
 .nav-panel-item .button-collapse {
   margin-left: 0;
   margin-right: 0.5rem;
-  padding: 0 0.5rem;
+  padding-left: 0.5rem;
+  padding-right: 0.5rem;
   height: auto;
   line-height: 1;
   background-color: transparent;
@@ -33,11 +34,15 @@ nav {
   flex-wrap: wrap;
   justify-content: space-between;
   align-items: center;
+
+  a {
+    padding: 10px 15px;
+  }
 }
 
 .nav-panel-item .material-icons {
-  height: 46px;
-  line-height: 46px;
+  height: auto;
+  line-height: 1;
 }
 
 .nav-input {
@@ -71,7 +76,6 @@ nav {
   }
 
   .input-field input:focus {
-    background-color: #fff;
     border: 0;
     box-shadow: none;
     color: #444;
@@ -108,6 +112,11 @@ nav {
   }
 }
 
+.nav-panel-add,
+.nav-panel-search {
+  background-color: white;
+}
+
 .nav-form-button {
   padding: 0;
   background-color: transparent;
@@ -145,11 +154,14 @@ nav {
 .dropdown-content {
   min-width: 300px;
 
-  .material-icons {
-    line-height: initial !important;
+  li {
+    min-height: auto;
   }
 
   li > a {
-    padding: 10px;
+    display: flex;
+    padding: 14px 10px;
+    align-items: center;
+    white-space: initial;
   }
 }

app/Resources/static/themes/material/css/print.scss

@@ -2,7 +2,7 @@
   /* ### Layout ### */
 
   body {
-    font-family: Serif;
+    font-family: serif;
     background-color: #fff;
   }
 

app/Resources/static/themes/material/css/sidenav.scss

@@ -11,6 +11,11 @@
     &.logo > a:hover {
       background: initial;
     }
+
+    & > a > i.material-icons.theme-toggle-icon {
+      float: none;
+      margin-left: 0;
+    }
   }
 
   a {

app/Resources/static/themes/material/index.js

@@ -19,6 +19,103 @@ import './css/index.scss';
 
 const mobileMaxWidth = 993;
 
+function darkTheme() {
+  const rootEl = document.querySelector('html');
+  const themeDom = {
+    darkClass: 'dark-theme',
+
+    toggleClass(el) {
+      return el.classList.toggle(this.darkClass);
+    },
+
+    addClass(el) {
+      return el.classList.add(this.darkClass);
+    },
+
+    removeClass(el) {
+      return el.classList.remove(this.darkClass);
+    },
+  };
+  const themeCookie = {
+    values: {
+      light: 'light',
+      dark: 'dark',
+    },
+
+    name: 'theme',
+
+    getValue(isDarkTheme) {
+      return isDarkTheme ? this.values.dark : this.values.light;
+    },
+
+    setCookie(isDarkTheme) {
+      const value = this.getValue(isDarkTheme);
+      document.cookie = `${this.name}=${value};samesite=Lax;path=/;max-age=31536000`;
+    },
+
+    removeCookie() {
+      document.cookie = `${this.name}=auto;samesite=Lax;path=/;max-age=0`;
+    },
+
+    exists() {
+      return document.cookie.split(';').some((cookie) => cookie.trim().startsWith(`${this.name}=`));
+    },
+  };
+  const preferedColorScheme = {
+    choose() {
+      if (this.isAvailable() && themeCookie.exists() === 0) {
+        const isPreferedColorSchemeDark = window.matchMedia('(prefers-color-scheme: dark)').matches === true;
+        if (themeCookie.exists() === 0) {
+          themeDom[isPreferedColorSchemeDark ? 'addClass' : 'removeClass'](rootEl);
+        }
+      }
+    },
+
+    isAvailable() {
+      return typeof window.matchMedia === 'function';
+    },
+
+    init() {
+      if (!this.isAvailable()) {
+        return false;
+      }
+      this.choose();
+      window.matchMedia('(prefers-color-scheme: dark)').addListener(() => {
+        this.choose();
+      });
+      return true;
+    },
+  };
+  preferedColorScheme.init();
+  const lightThemeButtons = document.querySelectorAll('.js-theme-toggle[data-theme="light"]');
+  [...lightThemeButtons].map((lightThemeButton) => {
+    lightThemeButton.addEventListener('click', (e) => {
+      e.preventDefault();
+      themeDom.removeClass(rootEl);
+      themeCookie.setCookie(false);
+    });
+    return true;
+  });
+  const darkThemeButtons = document.querySelectorAll('.js-theme-toggle[data-theme="dark"]');
+  [...darkThemeButtons].map((darkThemeButton) => {
+    darkThemeButton.addEventListener('click', (e) => {
+      e.preventDefault();
+      themeDom.addClass(rootEl);
+      themeCookie.setCookie(true);
+    });
+    return true;
+  });
+  const autoThemeButtons = document.querySelectorAll('.js-theme-toggle[data-theme="auto"]');
+  [...autoThemeButtons].map((autoThemeButton) => {
+    autoThemeButton.addEventListener('click', (e) => {
+      e.preventDefault();
+      themeCookie.removeCookie();
+      preferedColorScheme.choose();
+    });
+    return true;
+  });
+}
+
 const stickyNav = () => {
   const nav = $('.js-entry-nav-top');
   $('[data-toggle="actions"]').click(() => {
@@ -52,6 +149,7 @@ const articleScroll = () => {
 $(document).ready(() => {
   // sideNav
   $('.button-collapse').sideNav();
+  darkTheme();
   $('select').material_select();
   $('.collapsible').collapsible({
     accordion: false,
@@ -76,7 +174,6 @@ $(document).ready(() => {
   const toggleNav = (toShow, toFocus) => {
     $('.nav-panel-actions').hide(100);
     $(toShow).show(100);
-    $('.nav-panels').css('background', 'white');
     $(toFocus).focus();
   };
 
@@ -109,7 +206,6 @@ $(document).ready(() => {
   $('.close').on('click', (e) => {
     $(e.target).parent('.nav-panel-item').hide(100);
     $('.nav-panel-actions').show(100);
-    $('.nav-panels').css('background', 'transparent');
     return false;
   });
 

app/config/config.yml

@@ -209,6 +209,7 @@ scheb_two_factor:
 
     google:
         enabled: "%twofactor_auth%"
+        issuer: "%server_name%"
         template: WallabagUserBundle:Authentication:form.html.twig
 
     email:
@@ -277,11 +278,6 @@ old_sound_rabbit_mq:
             exchange_options:
                 name: 'wallabag.import.chrome'
                 type: topic
-        import_rss:
-            connection: default
-            exchange_options:
-                name: 'wallabag.import.rss'
-                type: topic
     consumers:
         import_pocket:
             connection: default
@@ -364,15 +360,6 @@ old_sound_rabbit_mq:
                 name: 'wallabag.import.chrome'
             callback: wallabag_import.consumer.amqp.chrome
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
-        import_rss:
-            connection: default
-            exchange_options:
-                name: 'wallabag.import.rss'
-                type: topic
-            queue_options:
-                name: 'wallabag.import.rss'
-            callback: wallabag_import.consumer.amqp.rss
-            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
 
 fos_js_routing:
     routes_to_expose:

app/config/parameters.yml.dist

@@ -24,6 +24,7 @@ parameters:
     database_charset: utf8mb4
 
     domain_name: https://your-wallabag-url-instance.com
+    server_name: "Your wallabag instance"
 
     mailer_transport:  smtp
     mailer_user:       ~

app/config/tests/parameters_test.mysql.yml

@@ -4,7 +4,7 @@ parameters:
     test_database_port: 3306
     test_database_name: wallabag_test
     test_database_user: root
-    test_database_password: ~
+    test_database_password: root
     test_database_path: ~
     env(TEST_DATABASE_PATH): ~
     test_database_charset: utf8mb4

app/config/tests/parameters_test.pgsql.yml

@@ -3,8 +3,8 @@ parameters:
     test_database_host: localhost
     test_database_port:
     test_database_name: wallabag_test
-    test_database_user: travis
-    test_database_password: ~
+    test_database_user: wallabag
+    test_database_password: wallabagrocks
     test_database_path: ~
     env(TEST_DATABASE_PATH): ~
     test_database_charset: utf8

app/config/wallabag.yml

@@ -1,10 +1,11 @@
 wallabag_core:
-    version: 2.4.0-dev
+    version: 2.4.1
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'
         fr: 'Français'
         de: 'Deutsch'
+        nl: 'Dutch'
         th: 'ไทย'
         tr: 'Türkçe'
         fa: 'فارسی'
@@ -18,6 +19,8 @@ wallabag_core:
         ru: 'Русский'
         ja: '日本語'
         zh: '简体中文'
+        uk: 'Українська'
+        hr: 'Hrvatski'
     items_on_page: 12
     theme: material
     language: '%locale%'

app/config/webpack/common.js

@@ -4,37 +4,35 @@ const StyleLintPlugin = require('stylelint-webpack-plugin');
 
 const rootDir = path.resolve(__dirname, '../../../');
 
-module.exports = function () {
-  return {
-    entry: {
-      material: path.join(rootDir, './app/Resources/static/themes/material/index.js'),
-      baggy: path.join(rootDir, './app/Resources/static/themes/baggy/index.js'),
-      public: path.join(rootDir, './app/Resources/static/themes/_global/share.js'),
+module.exports = {
+  entry: {
+    material: path.join(rootDir, './app/Resources/static/themes/material/index.js'),
+    baggy: path.join(rootDir, './app/Resources/static/themes/baggy/index.js'),
+    public: path.join(rootDir, './app/Resources/static/themes/_global/share.js'),
+  },
+  output: {
+    filename: '[name].js',
+    path: path.resolve(rootDir, 'web/wallassets'),
+    publicPath: '',
+  },
+  plugins: [
+    new webpack.ProvidePlugin({
+      $: 'jquery',
+      jQuery: 'jquery',
+      'window.$': 'jquery',
+      'window.jQuery': 'jquery',
+    }),
+    new StyleLintPlugin({
+      configFile: '.stylelintrc',
+      failOnError: false,
+      quiet: false,
+      context: 'app/Resources/static/themes',
+      files: '**/*.scss',
+    }),
+  ],
+  resolve: {
+    alias: {
+      jquery: path.join(rootDir, 'node_modules/jquery/dist/jquery.js'),
     },
-    output: {
-      filename: '[name].js',
-      path: path.resolve(rootDir, 'web/wallassets'),
-      publicPath: '',
-    },
-    plugins: [
-      new webpack.ProvidePlugin({
-        $: 'jquery',
-        jQuery: 'jquery',
-        'window.$': 'jquery',
-        'window.jQuery': 'jquery',
-      }),
-      new StyleLintPlugin({
-        configFile: '.stylelintrc',
-        failOnError: false,
-        quiet: false,
-        context: 'app/Resources/static/themes',
-        files: '**/*.scss',
-      }),
-    ],
-    resolve: {
-      alias: {
-        jquery: path.join(rootDir, 'node_modules/jquery/dist/jquery.js'),
-      },
-    },
-  };
+  },
 };

app/config/webpack/dev.js

@@ -1,61 +1,65 @@
-const webpackMerge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const webpack = require('webpack');
 const commonConfig = require('./common.js');
 
-module.exports = function () {
-  return webpackMerge(commonConfig(), {
-    devtool: 'eval-source-map',
-    output: {
-      filename: '[name].dev.js',
-    },
-
-    devServer: {
-      hot: true,
-      // enable HMR on the server
-
-      contentBase: './web',
-      // match the output path
-    },
-    plugins: [
-      new webpack.HotModuleReplacementPlugin(),
-    ],
-    module: {
-      rules: [
-        {
-          enforce: 'pre',
-          test: /\.js$/,
-          loader: 'eslint-loader',
-          exclude: /node_modules/,
-        },
-        {
-          test: /\.js$/,
-          exclude: /(node_modules)/,
-          use: {
-            loader: 'babel-loader',
-            options: {
-              presets: ['env'],
-            },
+module.exports = merge(commonConfig, {
+  devtool: 'eval-source-map',
+  output: {
+    filename: '[name].dev.js',
+  },
+  mode: 'development',
+  devServer: {
+    hot: true,
+    // enable HMR on the server
+    contentBase: './web',
+    // match the output path
+  },
+  plugins: [
+    new webpack.HotModuleReplacementPlugin(),
+  ],
+  module: {
+    rules: [
+      {
+        enforce: 'pre',
+        test: /\.js$/,
+        loader: 'eslint-loader',
+        exclude: /node_modules/,
+      },
+      {
+        test: /\.js$/,
+        exclude: /(node_modules)/,
+        use: {
+          loader: 'babel-loader',
+          options: {
+            presets: ['@babel/preset-env'],
           },
         },
-        {
-          test: /\.(s)?css$/,
-          use: [
-            'style-loader',
-            {
-              loader: 'css-loader',
-              options: {
-                importLoaders: 1,
+      },
+      {
+        test: /\.(s)?css$/,
+        use: [
+          'style-loader',
+          {
+            loader: 'css-loader',
+            options: {
+              importLoaders: 1,
+            },
+          },
+          {
+            loader: 'postcss-loader',
+            options: {
+              postcssOptions: {
+                plugins: ['autoprefixer'],
               },
             },
-            'postcss-loader',
-            'sass-loader',
-          ],
-        },
-        {
-          test: /\.(jpg|png|gif|svg|ico|eot|ttf|woff|woff2)$/,
-          use: 'url-loader',
-        },
-      ],
-    },
-  });
-};
+          },
+          'sass-loader',
+        ],
+      },
+      {
+        test: /\.(jpg|png|gif|svg|ico|eot|ttf|woff|woff2)$/,
+        use: 'url-loader',
+      },
+    ],
+  },
+});

app/config/webpack/prod.js

@@ -1,111 +1,112 @@
 const webpack = require('webpack');
-const webpackMerge = require('webpack-merge');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
-const ManifestPlugin = require('webpack-manifest-plugin');
+const { merge } = require('webpack-merge');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const { WebpackManifestPlugin } = require('webpack-manifest-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
 
 const commonConfig = require('./common.js');
 
-module.exports = function () {
-  return webpackMerge(commonConfig(), {
-    output: {
-      filename: '[name].js',
-    },
-    devtool: 'source-map',
-    plugins: [
-      new webpack.DefinePlugin({
-        'process.env': {
-          'NODE_ENV': JSON.stringify('production'),
+module.exports = merge(commonConfig, {
+  output: {
+    filename: '[name].js',
+  },
+  mode: 'production',
+  devtool: 'source-map',
+  optimization: {
+    minimize: true,
+    minimizer: [
+      new TerserPlugin({
+        parallel: true,
+        terserOptions: {
+          output: {
+            comments: false,
+          },
         },
-      }),
-      new webpack.optimize.UglifyJsPlugin({
-        beautify: false,
-        mangle: {
-          screw_ie8: true,
-          keep_fnames: true,
-        },
-        compress: {
-          screw_ie8: true,
-          warnings: false,
-        },
-        comments: false,
-      }),
-      new ExtractTextPlugin('[name].css'),
-      new ManifestPlugin({
-        fileName: 'manifest.json',
+        extractComments: false,
       }),
     ],
-    module: {
-      rules: [
-        {
-          enforce: 'pre',
-          test: /\.js$/,
-          loader: 'eslint-loader',
-          exclude: /node_modules/,
-        },
-        {
-          test: /\.js$/,
-          exclude: /(node_modules)/,
-          use: {
-            loader: 'babel-loader',
-            options: {
-              presets: ['env'],
-            },
+  },
+  plugins: [
+    new MiniCssExtractPlugin(),
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: JSON.stringify('production'),
+      },
+    }),
+    new WebpackManifestPlugin({
+      fileName: 'manifest.json',
+      sort: (file1, file2) => file1.path.localeCompare(file2.path),
+    }),
+  ],
+  module: {
+    rules: [
+      {
+        enforce: 'pre',
+        test: /\.js$/,
+        loader: 'eslint-loader',
+        exclude: /node_modules/,
+      },
+      {
+        test: /\.js$/,
+        exclude: /(node_modules)/,
+        use: {
+          loader: 'babel-loader',
+          options: {
+            presets: ['@babel/preset-env'],
           },
         },
-        {
-          test: /\.(s)?css$/,
-          use: ExtractTextPlugin.extract({
-            fallback: 'style-loader',
-            use: [
-              {
-                loader: 'css-loader',
-                options: {
-                  importLoaders: 1,
-                  minimize: {
-                    discardComments: {
-                      removeAll: true,
-                    },
-                    core: true,
-                    minifyFontValues: true,
-                  },
-                },
+      },
+      {
+        test: /\.(sa|sc|c)ss$/,
+        use: [
+          MiniCssExtractPlugin.loader,
+          {
+            loader: 'css-loader',
+            options: {
+              importLoaders: 1,
+            },
+          },
+          {
+            loader: 'postcss-loader',
+            options: {
+              postcssOptions: {
+                plugins: ['autoprefixer'],
               },
-              'postcss-loader',
-              'sass-loader',
-            ],
-          }),
-        },
-        {
-          test: /\.(jpg|png|gif|svg|ico)$/,
-          include: /node_modules/,
-          use: {
-            loader: 'file-loader',
-            options: {
-              name: 'img/[name].[ext]',
             },
           },
-        },
-        {
-          test: /\.(jpg|png|gif|svg|ico)$/,
-          exclude: /node_modules/,
-          use: {
-            loader: 'file-loader',
-            options: {
-              context: 'app/Resources/static',
-              name: '[path][name].[ext]',
-            },
+          'sass-loader',
+        ],
+      },
+      {
+        test: /\.(jpg|png|gif|svg|ico)$/,
+        include: /node_modules/,
+        use: {
+          loader: 'file-loader',
+          options: {
+            name: 'img/[name].[ext]',
           },
         },
-        {
-          test: /\.(eot|ttf|woff|woff2)$/,
-          use: {
-            loader: 'file-loader',
-            options: {
-              name: 'fonts/[name].[ext]',
-            },
+      },
+      {
+        test: /\.(jpg|png|gif|svg|ico)$/,
+        exclude: /node_modules/,
+        use: {
+          loader: 'file-loader',
+          options: {
+            context: 'app/Resources/static',
+            name: '[path][name].[ext]',
           },
         },
-      ],
-    },
-  });
-};
+      },
+      {
+        test: /\.(eot|ttf|woff|woff2)$/,
+        use: {
+          loader: 'file-loader',
+          options: {
+            name: 'fonts/[name].[ext]',
+          },
+        },
+      },
+    ],
+  },
+});

composer.json

@@ -3,6 +3,8 @@
     "type": "project",
     "description": "open source self hostable read-it-later web application",
     "keywords": [
+        "poche",
+        "wallabag",
         "read-it-later",
         "read it later"
     ],
@@ -22,7 +24,7 @@
         },
         {
             "name": "Jérémy Benoist",
-            "homepage": "http://www.j0k3r.net",
+            "homepage": "https://www.j0k3r.net",
             "role": "Developer"
         }
     ],
@@ -31,7 +33,7 @@
         "issues": "https://github.com/wallabag/wallabag/issues"
     },
     "require": {
-        "php": ">=7.1.3",
+        "php": ">=7.2.5",
         "ext-ctype": "*",
         "ext-curl": "*",
         "ext-dom": "*",
@@ -47,10 +49,10 @@
         "ext-tidy": "*",
         "ext-tokenizer": "*",
         "ext-xml": "*",
+        "babdev/pagerfanta-bundle": "^2.5",
         "bdunogier/guzzle-site-authenticator": "^1.0.0",
         "craue/config-bundle": "^2.3.0",
         "defuse/php-encryption": "^2.1",
-        "doctrine/dbal": "2.9.2",
         "doctrine/doctrine-bundle": "^1.9",
         "doctrine/doctrine-cache-bundle": "^1.3",
         "doctrine/doctrine-migrations-bundle": "^1.3",
@@ -64,7 +66,7 @@
         "incenteev/composer-parameter-handler": "^2.1",
         "j0k3r/graby": "^2.0",
         "javibravo/simpleue": "^2.0",
-        "jms/serializer-bundle": "~2.2",
+        "jms/serializer-bundle": "~3.6",
         "kphoen/rulerz-bundle": "~0.13",
         "laminas/laminas-code": "^3.4",
         "laminas/laminas-diactoros": "^2.3",
@@ -75,15 +77,16 @@
         "nelmio/api-doc-bundle": "^2.13.2",
         "nelmio/cors-bundle": "~1.5",
         "ocramius/proxy-manager": "^2.1.1",
+        "pagerfanta/pagerfanta": "^2.4",
         "php-amqplib/rabbitmq-bundle": "^1.14",
         "php-http/guzzle5-adapter": "^2.0",
         "php-http/httplug-bundle": "^1.14",
         "pragmarx/recovery": "^0.1.0",
-        "predis/predis": "v1.1.x-dev",
+        "predis/predis": "^1.1.3",
         "scheb/two-factor-bundle": "^4.11.0",
         "sensio/distribution-bundle": "^5.0",
         "sensio/framework-extra-bundle": "^5.2",
-        "sentry/sentry-symfony": "3.2.1",
+        "sentry/sentry-symfony": "3.5.3",
         "stof/doctrine-extensions-bundle": "^1.2",
         "symfony/dom-crawler": "^3.4",
         "symfony/monolog-bundle": "^3.1",
@@ -93,22 +96,22 @@
         "twig/extensions": "^1.5",
         "wallabag/php-mobi": "~1.0",
         "wallabag/phpepub": "^4.0.7.2",
-        "white-october/pagerfanta-bundle": "^1.1",
-        "willdurand/hateoas-bundle": "~1.3"
+        "willdurand/hateoas-bundle": "~2.1"
     },
     "require-dev": {
-        "dama/doctrine-test-bundle": "^5.0",
+        "dama/doctrine-test-bundle": "^6.0",
         "doctrine/doctrine-fixtures-bundle": "~3.0",
         "friendsofphp/php-cs-fixer": "~2.13",
         "guzzlehttp/psr7": "^1.0",
         "m6web/redis-mock": "^5.0",
         "php-http/mock-client": "^1.0",
-        "phpstan/phpstan": "^0.11.0",
-        "phpstan/phpstan-doctrine": "^0.11.0",
-        "phpstan/phpstan-phpunit": "^0.11.0",
-        "phpstan/phpstan-symfony": "^0.11.0",
+        "phpstan/extension-installer": "^1.0",
+        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan-doctrine": "^0.12",
+        "phpstan/phpstan-phpunit": "^0.12",
+        "phpstan/phpstan-symfony": "^0.12",
         "symfony/maker-bundle": "^1.18",
-        "symfony/phpunit-bridge": "~4.3.8"
+        "symfony/phpunit-bridge": "~5.1"
     },
     "suggest": {
         "ext-imagick": "To keep GIF animation when downloading image is enabled"
@@ -159,7 +162,7 @@
     "config": {
         "bin-dir": "bin",
         "platform": {
-            "php": "7.1.3"
+            "php": "7.2.5"
         },
         "sort-packages": true
     },

package.json

@@ -7,7 +7,7 @@
     "doc": "docs"
   },
   "engines": {
-    "node": ">=6.10"
+    "node": ">=12"
   },
   "repository": {
     "type": "git",
@@ -36,52 +36,56 @@
     "url": "https://github.com/wallabag/wallabag/issues"
   },
   "devDependencies": {
-    "autoprefixer": "^7.1.1",
-    "babel-core": "^6.24.1",
-    "babel-eslint": "^7.2.3",
-    "babel-loader": "^7.0.0",
-    "babel-preset-env": "^1.4.0",
-    "css-loader": "^0.28.0",
-    "eslint": "^4.0.0",
-    "eslint-config-airbnb-base": "^11.1.3",
-    "eslint-loader": "^1.7.1",
-    "eslint-plugin-import": "^2.2.0",
-    "extract-text-webpack-plugin": "^2.1.0",
-    "file-loader": "^0.11.0",
+    "@babel/core": "^7.12.10",
+    "@babel/preset-env": "^7.12.11",
+    "autoprefixer": "^10.1.0",
+    "babel-eslint": "^10.1.0",
+    "babel-loader": "^8.2.2",
+    "css-loader": "^5.0.1",
+    "eslint": "^7.17.0",
+    "eslint-config-airbnb-base": "^14.2.1",
+    "eslint-loader": "^4.0.2",
+    "eslint-plugin-import": "^2.22.1",
+    "file-loader": "^6.2.0",
     "lato-font": "^3.0.0",
-    "node-sass": "^4.5.2",
-    "postcss-loader": "^2.0.5",
-    "sass-loader": "^6.0.3",
-    "style-loader": "^0.18.2",
-    "stylelint": "^7.9.0",
-    "stylelint-config-standard": "^16.0.0",
-    "stylelint-webpack-plugin": "^0.7.0",
-    "url-loader": "^0.5.8",
-    "webpack": "^2.3.2",
-    "webpack-dev-server": "^2.4.4",
-    "webpack-manifest-plugin": "^1.1.0",
-    "webpack-merge": "^4.1.0"
+    "mini-css-extract-plugin": "^1.3.3",
+    "node-sass": "^5.0.0",
+    "postcss": "^8.2.2",
+    "postcss-loader": "^4.0.4",
+    "sass": "^1.32.0",
+    "sass-loader": "^10.0.5",
+    "style-loader": "^2.0.0",
+    "stylelint": "^13.7.2",
+    "stylelint-config-standard": "^20.0.0",
+    "stylelint-scss": "^3.18.0",
+    "stylelint-webpack-plugin": "^2.1.1",
+    "url-loader": "^4.1.1",
+    "webpack": "^5.11.1",
+    "webpack-cli": "^4.3.1",
+    "webpack-dev-server": "^3.11.1",
+    "webpack-manifest-plugin": "^3.0.0",
+    "webpack-merge": "^5.7.3"
   },
   "dependencies": {
-    "annotator": "git://github.com/wallabag/annotator.git#0f076c7d371ed25eb0793346f46982d90f2c4c85",
+    "annotator": "wallabag/annotator#master",
     "clipboard": "^2.0.4",
     "hammerjs": "^2.0.8",
-    "highlight.js": "^9.12.0",
+    "highlight.js": "^10.5.0",
     "icomoon-free-npm": "^0.0.0",
-    "jquery": "^2.1.4",
+    "jquery": "^3.5.0",
     "jquery.cookie": "^1.4.1",
     "jr-qrcode": "^1.0.7",
-    "material-design-icons-iconfont": "^5.0.1",
+    "material-design-icons-iconfont": "^6.1.0",
     "materialize-css": "^0.98.1",
-    "mathjax": "^3.0.0",
+    "mathjax": "^3.1.2",
     "mousetrap": "^1.6.0",
     "ptsans-npm-webfont": "^0.0.4",
-    "roboto-fontface": "^0.7.0",
+    "roboto-fontface": "^0.10.0",
     "waypoints": "^4.0.1"
   },
   "scripts": {
-    "watch": "./node_modules/.bin/webpack-dev-server --env=dev",
-    "build:dev": "./node_modules/.bin/webpack --env=dev",
-    "build:prod": "./node_modules/.bin/webpack --env=prod"
+    "watch": "webpack-dev-server --env=dev",
+    "build:dev": "webpack --env=dev",
+    "build:prod": "webpack --env=prod"
   }
 }

phpstan.neon

@@ -1,15 +1,13 @@
-includes:
-    - vendor/phpstan/phpstan-phpunit/extension.neon
-    - vendor/phpstan/phpstan-symfony/extension.neon
-    - vendor/phpstan/phpstan-doctrine/extension.neon
-    - vendor/phpstan/phpstan-phpunit/rules.neon
-
 parameters:
+    level: 1
+    paths:
+        - src
+        - tests
+
     symfony:
         container_xml_path: %rootDir%/../../../var/cache/test/appTestDebugProjectContainer.xml
 
-    # https://github.com/phpstan/phpstan/issues/694#issuecomment-350724288
-    autoload_files:
-        - vendor/bin/.phpunit/phpunit-7.4/vendor/autoload.php
+    bootstrapFiles:
+        - vendor/bin/.phpunit/phpunit-8.3-0/vendor/autoload.php
 
     inferPrivatePropertyTypeFromConstructor: true

postcss.config.js

@@ -1,7 +0,0 @@
-module.exports = {
-  plugins: function () {
-    return [
-      require('autoprefixer'),
-    ];
-  }
-};

scripts/require.sh

@@ -3,7 +3,7 @@
 # Check for composer
 if [ ! -f composer.phar ]; then
     echo "composer.phar not found, we'll see if composer is installed globally."
-    command -v composer >/dev/null 2>&1 || { echo >&2 "wallabag requires composer but it's not installed (see http://doc.wallabag.org/en/master/user/installation.html). Aborting."; exit 1; }
+    command -v composer >/dev/null 2>&1 || { echo >&2 "wallabag requires composer but it's not installed (see https://doc.wallabag.org/en/admin/installation/requirements.html). Aborting."; exit 1; }
 else
     COMPOSER_COMMAND='./composer.phar'
 fi

src/Wallabag/AnnotationBundle/DataFixtures/AnnotationFixtures.php

@@ -4,7 +4,7 @@ namespace Wallabag\AnnotationBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Wallabag\AnnotationBundle\Entity\Annotation;
 use Wallabag\CoreBundle\DataFixtures\EntryFixtures;
 use Wallabag\UserBundle\DataFixtures\UserFixtures;

src/Wallabag/ApiBundle/Controller/SearchRestController.php

@@ -5,7 +5,7 @@ namespace Wallabag\ApiBundle\Controller;
 use Hateoas\Configuration\Route;
 use Hateoas\Representation\Factory\PagerfantaFactory;
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
-use Pagerfanta\Adapter\DoctrineORMAdapter;
+use Pagerfanta\Doctrine\ORM\QueryAdapter as DoctrineORMAdapter;
 use Pagerfanta\Pagerfanta;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;

src/Wallabag/CoreBundle/Command/CleanDownloadedImagesCommand.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace Wallabag\CoreBundle\Command;
+
+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Finder\Finder;
+
+class CleanDownloadedImagesCommand extends ContainerAwareCommand
+{
+    protected function configure()
+    {
+        $this
+            ->setName('wallabag:clean-downloaded-images')
+            ->setDescription('Cleans downloaded images which are no more associated to an entry')
+            ->addOption(
+               'dry-run',
+               null,
+               InputOption::VALUE_NONE,
+               'Do not remove images, just dump counters'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $io = new SymfonyStyle($input, $output);
+
+        $dryRun = (bool) $input->getOption('dry-run');
+
+        if ($dryRun) {
+            $io->text('Dry run mode <info>enabled</info> (no images will be removed)');
+        }
+
+        $downloadImages = $this->getContainer()->get('wallabag_core.entry.download_images');
+        $baseFolder = $downloadImages->getBaseFolder();
+
+        $io->text('Retrieve existing images');
+
+        // retrieve _existing_ folders in the image folder
+        $finder = new Finder();
+        $finder
+            ->directories()
+            ->ignoreDotFiles(true)
+            ->depth(2)
+            ->in($baseFolder);
+
+        $existingPaths = [];
+        foreach ($finder as $file) {
+            $existingPaths[] = $file->getFilename();
+        }
+
+        $io->text(sprintf('  -> <info>%d</info> images found', \count($existingPaths)));
+
+        $io->text('Retrieve valid folders attached to a user');
+
+        $entries = $this->getContainer()->get('wallabag_core.entry_repository')->findAllEntriesIdByUserId();
+
+        // retrieve _valid_ folders from existing entries
+        $validPaths = [];
+        foreach ($entries as $entry) {
+            $path = $downloadImages->getRelativePath($entry['id']);
+
+            if (!file_exists($baseFolder . '/' . $path)) {
+                continue;
+            }
+
+            // only store the hash, not the full path
+            $validPaths[] = explode('/', $path)[2];
+        }
+
+        $io->text(sprintf('  -> <info>%d</info> folders found', \count($validPaths)));
+
+        $deletedCount = 0;
+
+        $io->text('Remove images');
+
+        // check if existing path are valid, if not, remove all images and the folder
+        foreach ($existingPaths as $existingPath) {
+            if (!\in_array($existingPath, $validPaths, true)) {
+                $fullPath = $baseFolder . '/' . $existingPath[0] . '/' . $existingPath[1] . '/' . $existingPath;
+                $files = glob($fullPath . '/*.*');
+
+                if (!$dryRun) {
+                    array_map('unlink', $files);
+                    rmdir($fullPath);
+                }
+
+                $deletedCount += \count($files);
+
+                $io->text(sprintf('Deleted images in <info>%s</info>: <info>%d</info>', $existingPath, \count($files)));
+            }
+        }
+
+        $io->success(sprintf('Finished cleaning. %d deleted images', $deletedCount));
+
+        return 0;
+    }
+}

src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php

@@ -59,7 +59,7 @@ class GenerateUrlHashesCommand extends ContainerAwareCommand
         $em = $this->getContainer()->get('doctrine.orm.entity_manager');
         $repo = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry');
 
-        $entries = $repo->findByUser($user->getId());
+        $entries = $repo->findByEmptyHashedUrlAndUserId($user->getId());
 
         $i = 1;
         foreach ($entries as $entry) {

src/Wallabag/CoreBundle/Controller/ConfigController.php

@@ -344,6 +344,7 @@ class ConfigController extends Controller
         return $this->render('WallabagCoreBundle:Config:otp_app.html.twig', [
             'backupCodes' => $backupCodes,
             'qr_code' => $this->get('scheb_two_factor.security.google_authenticator')->getQRContent($user),
+            'secret' => $secret,
         ]);
     }
 

src/Wallabag/CoreBundle/Controller/EntryController.php

@@ -3,7 +3,7 @@
 namespace Wallabag\CoreBundle\Controller;
 
 use Doctrine\ORM\NoResultException;
-use Pagerfanta\Adapter\DoctrineORMAdapter;
+use Pagerfanta\Doctrine\ORM\QueryAdapter as DoctrineORMAdapter;
 use Pagerfanta\Exception\OutOfRangeCurrentPageException;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;

src/Wallabag/CoreBundle/Controller/FeedController.php

@@ -3,7 +3,7 @@
 namespace Wallabag\CoreBundle\Controller;
 
 use Pagerfanta\Adapter\ArrayAdapter;
-use Pagerfanta\Adapter\DoctrineORMAdapter;
+use Pagerfanta\Doctrine\ORM\QueryAdapter as DoctrineORMAdapter;
 use Pagerfanta\Exception\OutOfRangeCurrentPageException;
 use Pagerfanta\Pagerfanta;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;

src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php

@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\Config;
 use Wallabag\UserBundle\DataFixtures\UserFixtures;
 
@@ -13,7 +13,7 @@ class ConfigFixtures extends Fixture implements DependentFixtureInterface
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $adminConfig = new Config($this->getReference('admin-user'));
 

src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php

@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\UserBundle\DataFixtures\UserFixtures;
 
@@ -13,7 +13,7 @@ class EntryFixtures extends Fixture implements DependentFixtureInterface
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $entries = [
             'entry1' => [

src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginInstanceRuleFixtures.php

@@ -3,7 +3,7 @@
 namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule;
@@ -23,7 +23,7 @@ class IgnoreOriginInstanceRuleFixtures extends Fixture implements ContainerAware
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         foreach ($this->container->getParameter('wallabag_core.default_ignore_origin_instance_rules') as $ignore_origin_instance_rule) {
             $newIgnoreOriginInstanceRule = new IgnoreOriginInstanceRule();

src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginUserRuleFixtures.php

@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\IgnoreOriginUserRule;
 use Wallabag\UserBundle\DataFixtures\UserFixtures;
 
@@ -13,7 +13,7 @@ class IgnoreOriginUserRuleFixtures extends Fixture implements DependentFixtureIn
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $rule = new IgnoreOriginUserRule();
         $rule->setRule('host = "example.fr"');

src/Wallabag/CoreBundle/DataFixtures/InternalSettingFixtures.php

@@ -3,7 +3,7 @@
 namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Wallabag\CoreBundle\Entity\InternalSetting;
@@ -23,7 +23,7 @@ class InternalSettingFixtures extends Fixture implements ContainerAwareInterface
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         foreach ($this->container->getParameter('wallabag_core.default_internal_settings') as $setting) {
             $newSetting = new InternalSetting();

src/Wallabag/CoreBundle/DataFixtures/SiteCredentialFixtures.php

@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Wallabag\CoreBundle\Entity\SiteCredential;
@@ -25,7 +25,7 @@ class SiteCredentialFixtures extends Fixture implements DependentFixtureInterfac
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $credential = new SiteCredential($this->getReference('admin-user'));
         $credential->setHost('.super.com');

src/Wallabag/CoreBundle/DataFixtures/TagFixtures.php

@@ -3,7 +3,7 @@
 namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\Tag;
 
 class TagFixtures extends Fixture
@@ -11,7 +11,7 @@ class TagFixtures extends Fixture
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $tags = [
             'foo-bar-tag' => 'foo bar', //tag used for EntryControllerTest

src/Wallabag/CoreBundle/DataFixtures/TaggingRuleFixtures.php

@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\TaggingRule;
 
 class TaggingRuleFixtures extends Fixture implements DependentFixtureInterface
@@ -12,7 +12,7 @@ class TaggingRuleFixtures extends Fixture implements DependentFixtureInterface
     /**
      * {@inheritdoc}
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $tr1 = new TaggingRule();
         $tr1->setRule('content matches "spurs"');

src/Wallabag/CoreBundle/Helper/DownloadImages.php

@@ -37,6 +37,11 @@ class DownloadImages
         $this->setFolder();
     }
 
+    public function getBaseFolder()
+    {
+        return $this->baseFolder;
+    }
+
     /**
      * Process the html and extract images URLs from it.
      *
@@ -99,7 +104,7 @@ class DownloadImages
      * @param string $url          Url from where the image were found
      * @param string $relativePath Relative local path to saved the image
      *
-     * @return string Relative url to access the image from the web
+     * @return string|false Relative url to access the image from the web
      */
     public function processSingleImage($entryId, $imagePath, $url, $relativePath = null)
     {
@@ -210,6 +215,29 @@ class DownloadImages
         @rmdir($folderPath);
     }
 
+    /**
+     * Generate the folder where we are going to save images based on the entry url.
+     *
+     * @param int  $entryId      ID of the entry
+     * @param bool $createFolder Should we create the folder for the given id?
+     *
+     * @return string
+     */
+    public function getRelativePath($entryId, $createFolder = true)
+    {
+        $hashId = hash('crc32', $entryId);
+        $relativePath = $hashId[0] . '/' . $hashId[1] . '/' . $hashId;
+        $folderPath = $this->baseFolder . '/' . $relativePath;
+
+        if (!file_exists($folderPath) && $createFolder) {
+            mkdir($folderPath, 0777, true);
+        }
+
+        $this->logger->debug('DownloadImages: Folder used for that Entry id', ['folder' => $folderPath, 'entryId' => $entryId]);
+
+        return $relativePath;
+    }
+
     /**
      * Get images urls from the srcset image attribute.
      *
@@ -254,28 +282,6 @@ class DownloadImages
         }
     }
 
-    /**
-     * Generate the folder where we are going to save images based on the entry url.
-     *
-     * @param int $entryId ID of the entry
-     *
-     * @return string
-     */
-    private function getRelativePath($entryId)
-    {
-        $hashId = hash('crc32', $entryId);
-        $relativePath = $hashId[0] . '/' . $hashId[1] . '/' . $hashId;
-        $folderPath = $this->baseFolder . '/' . $relativePath;
-
-        if (!file_exists($folderPath)) {
-            mkdir($folderPath, 0777, true);
-        }
-
-        $this->logger->debug('DownloadImages: Folder used for that Entry id', ['folder' => $folderPath, 'entryId' => $entryId]);
-
-        return $relativePath;
-    }
-
     /**
      * Make an $url absolute based on the $base.
      *

src/Wallabag/CoreBundle/Repository/EntryRepository.php

@@ -5,7 +5,7 @@ namespace Wallabag\CoreBundle\Repository;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\NoResultException;
 use Doctrine\ORM\QueryBuilder;
-use Pagerfanta\Adapter\DoctrineORMAdapter;
+use Pagerfanta\Doctrine\ORM\QueryAdapter as DoctrineORMAdapter;
 use Pagerfanta\Pagerfanta;
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\CoreBundle\Entity\Tag;
@@ -369,6 +369,22 @@ class EntryRepository extends EntityRepository
         );
     }
 
+    /**
+     * Find all entries which have an empty value for hash.
+     *
+     * @return Entry|false
+     */
+    public function findByEmptyHashedUrlAndUserId(int $userId)
+    {
+        return $this->createQueryBuilder('e')
+            ->where('e.hashedUrl = :empty')->setParameter('empty', '')
+            ->orWhere('e.hashedUrl is null')
+            ->andWhere('e.user = :user_id')->setParameter('user_id', $userId)
+            ->andWhere('e.url is not null')
+            ->getQuery()
+            ->getResult();
+    }
+
     /**
      * Find an entry by its hashed url and its owner.
      * If it exists, return the entry otherwise return false.

src/Wallabag/CoreBundle/Repository/TagRepository.php

@@ -27,8 +27,7 @@ class TagRepository extends EntityRepository
 
         if (null !== $cacheLifeTime) {
             $query->useQueryCache(true);
-            $query->useResultCache(true);
-            $query->setResultCacheLifetime($cacheLifeTime);
+            $query->enableResultCache($cacheLifeTime);
         }
 
         return \count($query->getArrayResult());

src/Wallabag/CoreBundle/Resources/config/services.yml

@@ -150,7 +150,7 @@ services:
         arguments:
             - "@translator"
             - '%domain_name%'
-            - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png
+            - web/img/appicon/apple-touch-icon-152.png
 
     wallabag.operator.array.matches:
         class: Wallabag\CoreBundle\Operator\PHP\Matches

src/Wallabag/CoreBundle/Resources/translations/messages.cs.yml

@@ -0,0 +1,191 @@
+entry:
+    filters:
+        action:
+            filter: Filtrovat
+            clear: Pročistit
+        created_at:
+            to: do
+            from: od
+            label: Datum vytvoření
+        domain_label: Název domény
+        reading_time:
+            to: do
+            from: od
+            label: Čas čtení v minutách
+        status_label: Stav
+        title: Filtry
+        language_label: Jazyk
+        unread_label: Nepřečtené
+        archived_label: Archivované
+    search:
+        placeholder: Co hledáte?
+    view:
+        left_menu:
+            share_content: Sdílet
+            add_a_tag: Přidat štítek
+            set_as_unread: Označit jako nepřečtené
+            set_as_read: Označit jako přečtené
+    page_titles:
+        all: Všechny položky
+        untagged: Položky bez štítků
+menu:
+    top:
+        search: Hledat
+        add_new_entry: Přidat novou položku
+    left:
+        tags: Štítky
+        all_articles: Všechny položky
+        archive: Archiv
+        unread: Nepřečtené
+        logout: Odhlásit se
+        import: Import
+        developer: Správa API klientů
+config:
+    form_rules:
+        faq:
+            variable_description:
+                readingTime: Odhadovaný čas čtení položky, v minutách
+                language: Jazyk položky
+                isArchived: Zda je položka archivovaná nebo ne
+                url: URL adresa položky
+                title: Název položky
+                label: Proměnná
+            operator_description:
+                greater_than: Větší než…
+    form_user:
+        name_label: Jméno
+        delete:
+            description: Pokud odstraníte váš účet, VŠECHNY vaše články, VŠECHNY vaše štítky, VŠECHNY vaše anotace a váš účet budou TRVALE odstraněny (tuto akci NELZE VRÁTIT ZPĚT). Pak budete odhlášeni.
+    form_settings:
+        help_language: Zde můžete změnit jazyk uživatelského rozhraní wallabagu.
+        help_reading_speed: wallabag spočítá pro každý článek čas potřebný k jeho čtení. Zde můžete určit, pomocí tohoto seznamu, jestli jste rychlý nebo pomalý čtenář a wallabag následně přepočítá čas potřebný ke čtení každého článku.
+        items_per_page_label: Položek na stránku
+        action_mark_as_read:
+            redirect_current_page: Zůstat na aktuální stránce
+        reading_speed:
+            400_word: Čtu ~ 400 slov za minutu
+            300_word: Čtu ~ 300 slov za minutu
+            200_word: Čtu ~ 200 slov za minutu
+            100_word: Čtu ~ 100 slov za minutu
+            label: Rychlost čtení
+        language_label: Jazyk
+    form_password:
+        new_password_label: Nové heslo
+        old_password_label: Aktuální heslo
+        description: Zde můžete změnit vaše heslo. Vaše nové heslo by mělo mít nejméně 8 znaků.
+    form_rss:
+        rss_limit: Počet položek v novinkovém kanálu
+        rss_link:
+            all: Všechny
+            archive: Archivované
+            unread: Nepřečtené
+        token_create: Vytvořit váš token
+        no_token: Žádný token
+    tab_menu:
+        rss: RSS
+        settings: Nastavení
+        password: Heslo
+        new_user: Přidat uživatele
+    form:
+        save: Uložit
+security:
+    register:
+        page_title: Vytvořit účet
+    login:
+        cancel: Zrušit
+        register: Zaregistrovat se
+        submit: Přihlásit se
+        forgot_password: Zapomněli jste vaše heslo?
+        page_title: Vítejte ve wallabagu!
+        password: Heslo
+        username: Uživatelské jméno
+        keep_logged_in: Neodhlašovat mě
+tag:
+    new:
+        add: Přidat
+    page_title: Štítky
+quickstart:
+    support:
+        title: Podpora
+        gitter: Na Gitteru
+        email: Emailem
+        github: Na GitHubu
+    docs:
+        title: Úplná dokumentace
+    developer:
+        title: Vývojáři
+    migrate:
+        description: Používáte jinou službu? Pomůžeme vám načíst vaše data na wallabag.
+    first_steps:
+        description: Nyní je wallabag správně nakonfigurován a je načase začít archivovat web. Pomocí znaku + vpravo nahoře můžete přidat odkaz.
+developer:
+    existing_clients:
+        no_client: Zatím tu není žádný klient.
+        title: Existující klienti
+    howto:
+        back: Zpět
+        page_title: Správa API klientů > Jak vytvořit moji první aplikaci
+    client:
+        form:
+            name_label: Název klienta
+            save_label: Vytvořit nového klienta
+        action_back: Zpět
+        page_title: Správa API klientů > Nový klient
+    client_parameter:
+        back: Zpět
+        field_id: ID klienta
+        field_name: Název klienta
+        page_title: Správa API klientů > Parametry klienta
+    page_title: Správa API klientů
+    how_to_first_app: Jak vytvořit moji první aplikaci
+user:
+    form:
+        enabled_label: Povoleno
+        email_label: Email
+        plain_password_label: ????
+        password_label: Heslo
+        username_label: Uživatelské jméno
+        back_to_list: Zpátky na seznam
+        delete_confirm: Jste si jistí?
+        delete: Smazat
+    list:
+        create_new_one: Vytvořit nového uživatele
+        no: Ne
+        yes: Ano
+        edit_action: Upravit
+        actions: Akce
+    description: Zde můžete spravovat všechny uživatele (vytvářet je, upravovat a mazat)
+    edit_user: Upravit existujícího uživatele
+    new_user: Vytvořit nového uživatele
+    page_title: Správa uživatelů
+    search:
+        placeholder: Filtrovat podle uživatelského jména nebo emailu
+site_credential:
+    form:
+        password_label: Heslo
+        username_label: Uživatelské jméno
+        back_to_list: Zpátky na seznam
+        delete_confirm: Jste si jistí?
+        delete: Smazat
+        save: Uložit
+    list:
+        no: Ne
+        yes: Ano
+        edit_action: Upravit
+import:
+    form:
+        save_label: Nahrát soubor
+        file_label: Soubor
+    pocket:
+        connect_to_pocket: Připojit se k Pocketu a importovat data
+flashes:
+    config:
+        notice:
+            password_updated: Heslo bylo aktualizováno
+error:
+    page_title: Vyskytla se chyba
+about:
+    getting_help:
+        documentation: Dokumentace
+    who_behind_wallabag:
+        version: Verze

src/Wallabag/CoreBundle/Resources/translations/messages.da.yml

@@ -1,19 +1,12 @@
 security:
     login:
-        # page_title: 'Welcome to wallabag!'
         keep_logged_in: 'Forbliv logget ind'
         forgot_password: 'Glemt adgangskoden?'
         submit: 'Log ind'
-        # register: 'Register'
         username: 'Brugernavn'
         password: 'Adgangskode'
-        # cancel: 'Cancel'
     resetting:
         description: "Indtast din emailadresse nedenfor, så vil du modtage instrukser om at nulstille adgangskoden."
-    register:
-        # page_title: 'Create an account'
-        # go_to_account: 'Go to your account'
-
 menu:
     left:
         unread: 'Ulæst'
@@ -22,36 +15,21 @@ menu:
         all_articles: 'Alle artikler'
         config: 'Opsætning'
         tags: 'Tags'
-        # internal_settings: 'Internal Settings'
-        # import: 'Import'
         howto: 'KUow-to'
-        # developer: 'API clients management'
         logout: 'Log ud'
         about: 'Om'
         search: 'Søg'
-        # save_link: 'Save a link'
         back_to_unread: 'Tilbage til de ulæste artikler'
-        # users_management: 'Users management'
-        # site_credentials: 'Site credentials'
-        # ignore_origin_instance_rules: 'Global ignore origin rules'
-        # quickstart: "Quickstart"
     top:
         add_new_entry: 'Tilføj ny artikel'
         search: 'Søg'
         filter_entries: 'Filtrer artikler'
-        # random_entry: Jump to a random entry from that list
-        # export: 'Export'
-        # account: 'My account'
     search_form:
         input_label: 'Indtast søgning'
 
 footer:
     wallabag:
-        # elsewhere: 'Take wallabag with you'
-        # social: 'Social'
-        # powered_by: 'powered by'
         about: 'Om'
-    # stats: Since %user_creation% you read %nb_archives% articles. That is about %per_day% a day!
 
 config:
     page_title: 'Opsætning'
@@ -60,178 +38,43 @@ config:
         feed: 'RSS'
         user_info: 'Brugeroplysninger'
         password: 'Adgangskode'
-        # rules: 'Tagging rules'
-        # ignore_origin: 'Ignore origin rules'
         new_user: 'Tilføj bruger'
-        # reset: 'Reset area'
     form:
         save: 'Gem'
     form_settings:
         theme_label: 'Tema'
         items_per_page_label: 'Poster pr. side'
         language_label: 'Sprog'
-        reading_speed:
-            # label: 'Reading speed (words per minute)'
-            # help_message: 'You can use online tools to estimate your reading speed:'
-        action_mark_as_read:
-            # label: 'Where do you want to be redirected to after marking an article as read?'
-            # redirect_homepage: 'To the homepage'
-            # redirect_current_page: 'To the current page'
         pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer
-        # android_configuration: Configure your Android application
-        # android_instruction: "Touch here to prefill your Android application"
-        # help_theme: "wallabag is customizable. You can choose your prefered theme here."
-        # help_items_per_page: "You can change the number of articles displayed on each page."
-        # 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."
-        # help_language: "You can change the language of wallabag interface."
-        # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
     form_feed:
         description: 'RSS-feeds fra wallabag gør det muligt at læse de artikler, der gemmes i wallabag, med din RSS-læser. Det kræver, at du genererer et token først.'
         token_label: 'RSS-Token'
         no_token: 'Intet token'
         token_create: 'Opret token'
         token_reset: 'Nulstil token'
-        # token_revoke: 'Revoke the token'
         feed_links: 'RSS-Links'
         feed_link:
             unread: 'Ulæst'
             starred: 'Favoritter'
             archive: 'Arkiv'
-            # all: 'All'
-        # feed_limit: 'Number of items in the feed'
     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: 'Navn'
         email_label: 'Emailadresse'
-        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
-            # table_state: State
-            # table_action: Action
-            # state_enabled: Enabled
-            # state_disabled: Disabled
-            # action_email: Use email
-            # action_app: Use OTP App
-        delete:
-            # title: Delete my account (a.k.a danger zone)
-            # 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.
-            # confirm: Are you really sure? (THIS CAN'T BE UNDONE)
-            # button: Delete my account
-    reset:
-        # title: Reset area (a.k.a danger zone)
-        # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
-        # annotations: Remove ALL annotations
-        # tags: Remove ALL tags
-        # entries: Remove ALL entries
-        # archived: Remove ALL archived entries
-        # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
     form_password:
-        # description: "You can change your password here. Your new password should by at least 8 characters long."
         old_password_label: 'Gammel adgangskode'
         new_password_label: 'Ny adgangskode'
         repeat_new_password_label: 'Gentag adgangskode'
-    form_rules:
-        # if_label: 'if'
-        # then_tag_as_label: 'then tag as'
-        # delete_rule_label: 'delete'
-        # 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?'
-        #     tagging_rules_definition_description: 'They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.'
-        #     how_to_use_them_title: 'How do I use them?'
-        #     how_to_use_them_description: 'Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »'
-        #     variables_available_title: 'Which variables and operators can I use to write rules?'
-        #     variables_available_description: 'The following variables and operators can be used to create tagging rules:'
-        #     meaning: 'Meaning'
-        #     variable_description:
-        #         label: 'Variable'
-        #         title: 'Title of the entry'
-        #         url: 'URL of the entry'
-        #         isArchived: 'Whether the entry is archived or not'
-        #         isStarred: 'Whether the entry is starred or not'
-        #         content: "The entry's content"
-        #         language: "The entry's language"
-        #         mimetype: "The entry's mime-type"
-        #         readingTime: "The estimated entry's reading time, in minutes"
-        #         domainName: 'The domain name of the entry'
-        #     operator_description:
-        #         label: 'Operator'
-        #         less_than: 'Less than...'
-        #         strictly_less_than: 'Strictly less than...'
-        #         greater_than: 'Greater than...'
-        #         strictly_greater_than: 'Strictly greater than...'
-        #         equal_to: 'Equal to...'
-        #         not_equal_to: 'Not equal to...'
-        #         or: 'One rule OR another'
-        #         and: 'One rule AND another'
-        #         matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</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>'
-    form_ignore_origin_rules:
-        # faq:
-        #     title: 'FAQ'
-        #     ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?'
-        #     ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.<br />If a redirect occurs while fetching a new entry, all the ignore origin rules (<i>user defined and instance defined</i>) will be used to ignore the origin address.'
-        #     how_to_use_them_title: 'How do I use them?'
-        #     how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « <i>rss.example.com</i> » (<i>knowing that after a redirect, the actual address is example.com</i>).<br />In that case, you should put « host = "rss.example.com" » in the <i>Rule</i> field.'
-        #     variables_available_title: 'Which variables and operators can I use to write rules?'
-        #     variables_available_description: 'The following variables and operators can be used to create ignore origin rules:'
-        #     meaning: 'Meaning'
-        #     variable_description:
-        #         label: 'Variable'
-        #         host: 'Host of the address'
-        #         _all: 'Full address, mainly for pattern matching'
-        #     operator_description:
-        #         label: 'Operator'
-        #         equal_to: 'Equal to…'
-        #         matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>_all ~ "https?://rss.example.com/foobar/.*"</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: 'Title of the entry'
-    page_titles:
-        # unread: 'Unread entries'
-        # starred: 'Starred entries'
-        # archived: 'Archived entries'
-        # filtered: 'Filtered entries'
-        # filtered_tags: 'Filtered by tags:'
-        # filtered_search: 'Filtered by search:'
-        # untagged: 'Untagged entries'
-        # all: 'All entries'
     list:
-        # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
         reading_time: 'estimeret læsetid'
         reading_time_minutes: 'estimeret læsetid: %readingTime% min'
         reading_time_less_one_minute: 'estimeret læsetid: &lt; 1 min'
-        # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
         reading_time_minutes_short: '%readingTime% min'
         reading_time_less_one_minute_short: '&lt; 1 min'
         original_article: 'original'
         toogle_as_read: 'Marker som læst'
         toogle_as_star: 'Skift favoritstatus'
         delete: 'Slet'
-        # export_title: 'Export'
     filters:
         title: 'Filtre'
         status_label: 'Status'
@@ -240,10 +83,7 @@ entry:
         unread_label: 'Ulæst'
         preview_picture_label: 'Har et vist billede'
         preview_picture_help: 'Forhåndsvis billede'
-        # is_public_label: 'Has a public link'
-        # is_public_help: 'Public link'
         language_label: 'Sprog'
-        # http_status_label: 'HTTP status'
         reading_time:
             label: 'Læsetid i minutter'
             from: 'fra'
@@ -258,57 +98,27 @@ entry:
             filter: 'Filter'
     view:
         left_menu:
-            # back_to_top: 'Back to top'
             back_to_homepage: 'Tilbage'
             set_as_read: 'Marker som læst'
-            # set_as_unread: 'Mark as unread'
             set_as_starred: 'Marker som favorit'
             view_original_article: 'Originalartikel'
-            # re_fetch_content: 'Re-fetch content'
             delete: 'Slet'
             add_a_tag: 'Tliføj et tag'
             share_content: 'Deling'
-            # share_email_label: 'Email'
-            # public_link: 'public link'
-            # delete_public_link: 'delete public link'
-            # export: 'Export'
-            # print: 'Print'
             problem:
                 label: 'Problemer?'
                 description: 'Vises artiklen forkert?'
         edit_title: 'Rediger titel'
         original_article: 'original'
-        # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
         created_at: 'Oprettelsesdato'
-        # published_at: 'Publication date'
-        # published_by: 'Published by'
-        # provided_by: 'Provided by'
     new:
         page_title: 'Gem ny artikel'
         placeholder: 'https://website.dk'
         form_new:
             url_label: Url
-    search:
-        # placeholder: 'What are you looking for?'
     edit:
-        # page_title: 'Edit an entry'
-        # title_label: 'Title'
         url_label: 'Url'
-        # origin_url_label: 'Origin url (from where you found that entry)'
         save_label: 'Gem'
-    public:
-        # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
-    confirm:
-        # delete: "Are you sure you want to remove that article?"
-        # delete_entries: "Are you sure you want to remove those articles?"
-        # 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"
-        # address: "Address"
-        # added_on: "Added on"
-        # published_on: "Published on"
-
 about:
     page_title: 'Om'
     top_menu:
@@ -316,7 +126,6 @@ about:
         getting_help: 'Find hjælp'
         helping: 'Hjælp wallabag'
         contributors: 'Bidragsydere'
-        # third_party: 'Third-party libraries'
     who_behind_wallabag:
         developped_by: 'Udviklet af'
         website: 'Hjemmeside'
@@ -331,21 +140,12 @@ about:
     helping:
         description: 'wallabag er gratis og Open source. Du kan hjælpe os:'
         by_contributing: 'ved at bidrage til projektet:'
-        by_contributing_2: 'et Github-issue fortæller om alt, hvad vi har brug for:'
+        by_contributing_2: 'et Github-issue fortæller om alt, hvad vi har brug for'
         by_paypal: 'via Paypal'
-    contributors:
-        # description: 'Thank you to contributors on wallabag web application'
     third_party:
-        # description: 'Here are the list of third-party libraries used in wallabag (with their licenses):'
-        # package: 'Package'
         license: 'Licens'
-
 howto:
-    page_title: 'How-to'
-    # page_description: 'There are several ways to save an article:'
-    tab_menu:
-        # add_link: "Add a link"
-        # shortcuts: "Use shortcuts"
+    page_title: 'KUow-to'
     top_menu:
         browser_addons: 'Browserudvidelser'
         mobile_apps: 'Apps'
@@ -360,330 +160,28 @@ howto:
         android:
             via_f_droid: 'via F-Droid'
             via_google_play: 'via Google Play'
-        # ios: 'on the iTunes Store'
-        # windows: 'on the Microsoft Store'
     bookmarklet:
         description: 'Træk dette link til din bogmærkeliste:'
-    shortcuts:
-        # page_description: Here are the shortcuts available in wallabag.
-        # shortcut: Shortcut
-        # action: Action
-        # all_pages_title: Shortcuts available in all pages
-        # go_unread: Go to unread
-        # go_starred: Go to starred
-        # go_archive: Go to archive
-        # go_all: Go to all entries
-        # go_tags: Go to tags
-        # go_config: Go to config
-        # go_import: Go to import
-        # go_developers: Go to developers
-        # go_howto: Go to howto (this page!)
-        # go_logout: Logout
-        # list_title: Shortcuts available in listing pages
-        # search: Display the search form
-        # article_title: Shortcuts available in entry view
-        # open_original: Open original URL of the entry
-        # toggle_favorite: Toggle star status for the entry
-        # toggle_archive: Toggle read status for the entry
-        # delete: Delete the entry
-        # material_title: Shortcuts available with Material theme only
-        # add_link: Add a new link
-        # hide_form: Hide the current form (search or new link)
-        # arrows_navigation: Navigate through articles
-        # open_article: Display the selected entry
-
-quickstart:
-    # page_title: 'Quickstart'
-    # more: 'More…'
-    # intro:
-    #     title: 'Welcome to wallabag!'
-    #     paragraph_1: "We'll accompany you to visit wallabag and show you some features which can interest you."
-    #     paragraph_2: 'Follow us!'
-    # configure:
-    #     title: 'Configure the application'
-    #     description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'
-    #     language: 'Change language and design'
-    #     feed: 'Enable RSS feeds'
-    #     tagging_rules: 'Write rules to automatically tag your articles'
-    # admin:
-    #     title: 'Administration'
-    #     description: 'As an administrator, you have privileges on wallabag. You can:'
-    #     new_user: 'Create a new user'
-    #     analytics: 'Configure analytics'
-    #     sharing: 'Enable some parameters about article sharing'
-    #     export: 'Configure export'
-    #     import: 'Configure import'
-    # first_steps:
-    #     title: 'First steps'
-    #     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."
-    #     new_article: 'Save your first article'
-    #     unread_articles: 'And classify it!'
-    # migrate:
-    #     title: 'Migrate from an existing service'
-    #     description: "Are you using another service? We'll help you to retrieve your data on wallabag."
-    #     pocket: 'Migrate from Pocket'
-    #     wallabag_v1: 'Migrate from wallabag v1'
-    #     wallabag_v2: 'Migrate from wallabag v2'
-    #     readability: 'Migrate from Readability'
-    #     instapaper: 'Migrate from Instapaper'
-    # developer:
-    #     title: 'Developers'
-    #     description: 'We also thought to the developers: Docker, API, translations, etc.'
-    #     create_application: 'Create your third application'
-    #     use_docker: 'Use Docker to install wallabag'
-    # docs:
-    #     title: 'Full documentation'
-    #     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."
-    #     annotate: 'Annotate your article'
-    #     export: 'Convert your articles into ePUB or PDF'
-    #     search_filters: 'See how you can look for an article by using search engine and filters'
-    #     fetching_errors: 'What can I do if an article encounters errors during fetching?'
-    #     all_docs: 'And so many other articles!'
-    # support:
-    #     title: 'Support'
-    #     description: 'If you need some help, we are here for you.'
-    #     github: 'On GitHub'
-    #     email: 'By email'
-    #     gitter: 'On Gitter'
-
 tag:
     page_title: 'Tags'
-    list:
-        # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
-        # see_untagged_entries: 'See untagged entries'
-        # no_untagged_entries: 'There are no untagged entries.'
-        # untagged: 'Untagged entries'
-    new:
-        # add: 'Add'
-        # placeholder: 'You can add several tags, separated by a comma.'
-    rename:
-        # placeholder: 'You can update tag name.'
-
-# 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>'
-#     unknown: 'Unknown'
-
-import:
-    # page_title: 'Import'
-    # page_description: 'Welcome to wallabag importer. Please select your previous service that you want to migrate.'
-    # action:
-    #     import_contents: 'Import contents'
-    # form:
-    #     mark_as_read_title: 'Mark all as read?'
-    #     mark_as_read_label: 'Mark all imported entries as read'
-    #     file_label: 'File'
-    #     save_label: 'Upload file'
-    # pocket:
-    #     page_title: 'Import > Pocket'
-    #     description: "This importer will import all your Pocket data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag."
-    #     config_missing:
-    #         description: "Pocket import isn't configured."
-    #         admin_message: 'You need to define %keyurls%a pocket_consumer_key%keyurle%.'
-    #         user_message: 'Your server admin needs to define an API Key for Pocket.'
-    #     authorize_message: 'You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.'
-    #     connect_to_pocket: 'Connect to Pocket and import data'
-    # wallabag_v1:
-    #     page_title: 'Import > Wallabag v1'
-    #     description: 'This importer will import all your wallabag v1 articles. On your config page, click on "JSON export" in the "Export your wallabag data" section. You will have a "wallabag-export-1-xxxx-xx-xx.json" file.'
-    #     how_to: 'Please select your wallabag export and click on the below button to upload and import it.'
-    # wallabag_v2:
-    #     page_title: 'Import > Wallabag v2'
-    #     description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.'
-    # elcurator:
-    #     page_title: 'Import > elCurator'
-    #     description: 'This importer will import all your elCurator articles. Go to your preferences in your elCurator account and then, export your content. You will have a JSON file.'
-    # readability:
-    #     page_title: 'Import > Readability'
-    #     description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).'
-    #     how_to: 'Please select your Readability export and click on the below button to upload and import it.'
-    worker:
-        # 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:"
-        # 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."
-    # firefox:
-    #    page_title: 'Import > Firefox'
-    #    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."
-    #    how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
-    #chrome:
-    #    page_title: 'Import > Chrome'
-    #    description: "This importer will import all your Chrome bookmarks. The location of the file depends on your operating system : <ul><li>On Linux, go into the <code>~/.config/chromium/Default/</code> directory</li><li>On Windows, it should be at <code>%LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default</code></li><li>On OS X, it should be at <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Once you got there, copy the Bookmarks file someplace you'll find.<em><br>Note that if you have Chromium instead of Chrome, you'll have to correct paths accordingly.</em></p>"
-    #    how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
-    # instapaper:
-    #     page_title: 'Import > Instapaper'
-    #     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").'
-    #     how_to: 'Please select your Instapaper export and click on the below button to upload and import it.'
-    pinboard:
-        # page_title: "Import > Pinboard"
-        # 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").'
-        # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.'
-
-developer:
-    # page_title: 'API clients management'
-    # welcome_message: 'Welcome to the wallabag API'
-    # documentation: 'Documentation'
-    # how_to_first_app: 'How to create my first application'
-    # full_documentation: 'View full API documentation'
-    # list_methods: 'List API methods'
-    # clients:
-    #     title: 'Clients'
-    #     create_new: 'Create a new client'
-    # existing_clients:
-    #     title: 'Existing clients'
-    #     field_id: 'Client ID'
-    #     field_secret: 'Client secret'
-    #     field_uris: 'Redirect URIs'
-    #     field_grant_types: 'Grant type allowed'
-    #     no_client: 'No client yet.'
-    # remove:
-    #     warn_message_1: 'You have the ability to remove this client. This action is IRREVERSIBLE !'
-    #     warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
-    #     action: 'Remove this client'
-    # client:
-    #     page_title: 'API clients management > New client'
-    #     page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
-    #     form:
-    #         name_label: 'Name of the client'
-    #         redirect_uris_label: 'Redirect URIs'
-    #         save_label: 'Create a new client'
-    #     action_back: 'Back'
-    #     copy_to_clipboard: Copy
-    # client_parameter:
-    #     page_title: 'API clients management > Client parameters'
-    #     page_description: 'Here are your client parameters.'
-    #     field_name: 'Client name'
-    #     field_id: 'Client ID'
-    #     field_secret: 'Client secret'
-    #     back: 'Back'
-    #     read_howto: 'Read the howto "Create my first application"'
-    # howto:
-    #     page_title: 'Developer > How to create my first application'
-    #     description:
-    #         paragraph_1: 'The following commands make use of the <a href="https://github.com/jkbrzt/httpie">HTTPie library</a>. Make sure it is installed on your system before using it.'
-    #         paragraph_2: 'You need a token to communicate between your 3rd application and wallabag API.'
-    #         paragraph_3: 'To create this token, you need <a href="%link%">to create a new client</a>.'
-    #         paragraph_4: 'Now, create your token (replace client_id, client_secret, username and password with the good values):'
-    #         paragraph_5: 'The API will return a response like this:'
-    #         paragraph_6: 'The access_token is useful to do a call to the API endpoint. For example:'
-    #         paragraph_7: 'This call will return all the entries for your user.'
-    #         paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
-    #     back: 'Back'
-
 user:
-    # page_title: Users management
-    # new_user: Create a new user
-    # edit_user: Edit an existing user
-    # description: "Here you can manage all users (create, edit and delete)"
-    # list:
-    #     actions: Actions
-    #     edit_action: Edit
-    #     yes: Yes
-    #     no: No
-    #     create_new_one: Create a new user
     form:
         username_label: 'Brugernavn'
-        # name_label: 'Name'
         password_label: 'Adgangskode'
         repeat_new_password_label: 'Gentag adgangskode'
         plain_password_label: '????'
         email_label: 'Emailadresse'
-        # enabled_label: 'Enabled'
-        # last_login_label: 'Last login'
-        # twofactor_email_label: Two factor authentication by email
-        # twofactor_google_label: Two factor authentication by OTP app
-        # save: Save
-        # delete: Delete
-        # delete_confirm: Are you sure?
-        # back_to_list: Back to list
-    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: 'Username'
-    #     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
-
 flashes:
     config:
         notice:
             config_saved: 'Opsætning gemt.'
             password_updated: 'Adgangskode opdateret'
-            # password_not_updated_demo: "In demonstration mode, you can't change password for this user."
             user_updated: 'Oplysninger opdateret'
             feed_updated: 'RSS-oplysninger opdateret'
-            # tagging_rules_updated: 'Tagging rules updated'
-            # tagging_rules_deleted: 'Tagging rule deleted'
-            # 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
-            # otp_disabled: Two-factor authentication disabled
-            # tagging_rules_imported: Tagging rules imported
-            # tagging_rules_not_imported: Error while importing tagging rules
-            # ignore_origin_rules_deleted: 'Ignore origin rule deleted'
-            # ignore_origin_rules_updated: 'Ignore origin rule updated'
     entry:
         notice:
-            # entry_already_saved: 'Entry already saved on %date%'
-            # entry_saved: 'Entry saved'
-            # entry_saved_failed: 'Entry saved but fetching content failed'
-            # entry_updated: 'Entry updated'
-            # entry_reloaded: 'Entry reloaded'
-            # entry_reloaded_failed: 'Entry reloaded but fetching content failed'
             entry_archived: 'Artikel arkiveret'
             entry_unarchived: 'Artikel ikke længere arkiveret'
             entry_starred: 'Artikel markeret som favorit'
             entry_unstarred: 'Artikel ikke længere markeret som favorit'
             entry_deleted: 'Artikel slettet'
-            # no_random_entry: 'No article with these criterias was found'
-    tag:
-        notice:
-            # tag_added: 'Tag added'
-            # tag_renamed: 'Tag renamed'
-    import:
-        notice:
-            # failed: 'Import failed, please try again.'
-            # failed_on_file: 'Error while processing import. Please verify your import file.'
-            # summary: 'Import summary: %imported% imported, %skipped% already saved.'
-            # summary_with_queue: 'Import summary: %queued% queued.'
-        error:
-            # redis_enabled_not_installed: Redis is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check Redis configuration.
-            # rabbit_enabled_not_installed: RabbitMQ is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check RabbitMQ configuration.
-    developer:
-        notice:
-            # client_created: 'New client created.'
-            # client_deleted: 'Client deleted'
-    user:
-        notice:
-            # added: 'User "%username%" added'
-            # updated: 'User "%username%" updated'
-            # deleted: 'User "%username%" deleted'
-    site_credential:
-        notice:
-            # added: 'Site credential for "%host%" added'
-            # updated: 'Site credential for "%host%" updated'
-            # deleted: 'Site credential for "%host%" deleted'
-    ignore_origin_instance_rule:
-        notice:
-            # added: 'Global ignore origin rule added'
-            # updated: 'Global ignore origin rule updated'
-            # deleted: 'Global ignore origin rule deleted'

src/Wallabag/CoreBundle/Resources/translations/messages.en.yml

@@ -1,90 +1,94 @@
 security:
     login:
-        page_title: 'Welcome to wallabag!'
-        keep_logged_in: 'Keep me logged in'
-        forgot_password: 'Forgot your password?'
-        submit: 'Login'
-        register: 'Register'
-        username: 'Login'
-        password: 'Password'
-        cancel: 'Cancel'
+        page_title: Welcome to wallabag!
+        keep_logged_in: Keep me logged in
+        forgot_password: Forgot your password?
+        submit: Log in
+        register: Register
+        username: Username
+        password: Password
+        cancel: Cancel
     resetting:
-        description: "Enter your email address below and we'll send you password reset instructions."
+        description: Enter your email address below and we'll send you password reset instructions.
     register:
-        page_title: 'Create an account'
-        go_to_account: 'Go to your account'
-
+        page_title: Create an account
+        go_to_account: Go to your account
 menu:
     left:
-        unread: 'Unread'
-        starred: 'Starred'
-        archive: 'Archive'
-        all_articles: 'All entries'
-        config: 'Config'
-        tags: 'Tags'
-        internal_settings: 'Internal Settings'
-        import: 'Import'
-        howto: 'How to'
-        developer: 'API clients management'
-        logout: 'Logout'
-        about: 'About'
-        search: 'Search'
-        save_link: 'Save a link'
-        back_to_unread: 'Back to unread articles'
-        users_management: 'Users management'
-        site_credentials: 'Site credentials'
+        unread: Unread
+        starred: Starred
+        archive: Archive
+        all_articles: All entries
+        config: Config
+        tags: Tags
+        internal_settings: Internal Settings
+        import: Import
+        howto: Howto
+        developer: API clients management
+        logout: Logout
+        about: About
+        search: Search
+        save_link: Save a link
+        back_to_unread: Back to unread articles
+        users_management: Users management
+        site_credentials: Site credentials
         ignore_origin_instance_rules: 'Global ignore origin rules'
         quickstart: "Quickstart"
+        theme_toggle_light: "Light theme"
+        theme_toggle_dark: "Dark theme"
+        theme_toggle_auto: "Automatic theme"
     top:
-        add_new_entry: 'Add a new entry'
-        search: 'Search'
-        filter_entries: 'Filter entries'
+        add_new_entry: Add a new entry
+        search: Search
+        filter_entries: Filter entries
+        export: Export
         random_entry: Jump to a random entry from that list
-        export: 'Export'
         account: 'My account'
     search_form:
-        input_label: 'Enter your search here'
-
+        input_label: Enter your search here
 footer:
     wallabag:
-        elsewhere: 'Take wallabag with you'
-        social: 'Social'
-        powered_by: 'powered by'
-        about: 'About'
+        elsewhere: Take wallabag with you
+        social: Social
+        powered_by: powered by
+        about: About
     stats: Since %user_creation% you read %nb_archives% articles. That is about %per_day% a day!
-
 config:
-    page_title: 'Config'
+    page_title: Config
     tab_menu:
-        settings: 'Settings'
+        settings: Settings
         feed: 'Feeds'
-        user_info: 'User information'
-        password: 'Password'
-        rules: 'Tagging rules'
+        user_info: User information
+        password: Password
+        rules: Tagging rules
+        new_user: Add a user
         ignore_origin: 'Ignore origin rules'
-        new_user: 'Add a user'
         reset: 'Reset area'
     form:
-        save: 'Save'
+        save: Save
     form_settings:
-        theme_label: 'Theme'
-        items_per_page_label: 'Items per page'
-        language_label: 'Language'
+        theme_label: Theme
+        items_per_page_label: Items per page
+        language_label: Language
         reading_speed:
-            label: 'Reading speed (words per minute)'
+            label: Reading speed
             help_message: 'You can use online tools to estimate your reading speed:'
+            100_word: I read ~100 words per minute
+            200_word: I read ~200 words per minute
+            300_word: I read ~300 words per minute
+            400_word: I read ~400 words per minute
         action_mark_as_read:
-            label: 'What to do after removing, starring or marking as read an article?'
-            redirect_homepage: 'Go to the homepage'
-            redirect_current_page: 'Stay on the current page'
+            label: What to do after removing, starring or marking as read an article?
+            redirect_homepage: Go to the homepage
+            redirect_current_page: Stay on the current page
         pocket_consumer_key_label: Consumer key for Pocket to import contents
-        android_configuration: Configure your Android application
-        android_instruction: "Touch here to prefill your Android application"
-        help_theme: "wallabag is customizable. You can choose your prefered theme here."
-        help_items_per_page: "You can change the number of articles displayed on each page."
-        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."
-        help_language: "You can change the language of wallabag interface."
-        help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
+        android_configuration: Configure your Android app
+        android_instruction: Touch here to prefill your Android app
+        help_theme: wallabag is customizable. You can choose your prefered theme here.
+        help_items_per_page: You can change the number of articles displayed on each page.
+        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.
+        help_language: You can change the language of wallabag interface.
+        help_pocket_consumer_key: Required for Pocket import. You can create it in your Pocket account.
     form_feed:
         description: 'Atom feeds provided by wallabag allow you to read your saved articles with your favourite Atom reader. You need to generate a token first.'
         token_label: 'Feed token'
@@ -100,7 +104,7 @@ config:
             all: 'All'
         feed_limit: 'Number of items in the feed'
     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."
+        two_factor_description: Enabling two factor authentication means you'll receive an email with a code on every new untrusted connection.
         login_label: 'Login (can not be changed)'
         name_label: 'Name'
         email_label: 'Email'
@@ -128,17 +132,17 @@ config:
         archived: Remove ALL archived entries
         confirm: Are you really sure? (THIS CAN'T BE UNDONE)
     form_password:
-        description: "You can change your password here. Your new password should be at least 8 characters long."
-        old_password_label: 'Current password'
-        new_password_label: 'New password'
-        repeat_new_password_label: 'Repeat new password'
+        description: You can change your password here. Your new password should be at least 8 characters long.
+        old_password_label: Current password
+        new_password_label: New password
+        repeat_new_password_label: Repeat new password
     form_rules:
-        if_label: 'if'
-        then_tag_as_label: 'then tag as'
-        delete_rule_label: 'delete'
-        edit_rule_label: 'edit'
-        rule_label: 'Rule'
-        tags_label: 'Tags'
+        if_label: if
+        then_tag_as_label: then tag as
+        delete_rule_label: delete
+        edit_rule_label: edit
+        rule_label: Rule
+        tags_label: Tags
         card:
             new_tagging_rule: Create a tagging rule
             import_tagging_rules: Import tagging rules
@@ -149,41 +153,41 @@ config:
         import_submit: Import
         export: Export
         faq:
-            title: 'FAQ'
-            tagging_rules_definition_title: 'What does « tagging rules » mean?'
-            tagging_rules_definition_description: 'They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble of manually classifying your entries.'
-            how_to_use_them_title: 'How do I use them?'
-            how_to_use_them_description: 'Let us assume you want to tag new entries as « <i>short reading</i> » when the reading time is under 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them with a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »'
-            variables_available_title: 'Which variables and operators can I use to write rules?'
+            title: FAQ
+            tagging_rules_definition_title: What does “tagging rules” mean?
+            tagging_rules_definition_description: They are rules used by wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble of manually classifying your entries.
+            how_to_use_them_title: How do I use them?
+            how_to_use_them_description: 'Let us assume you want to tag new entries as « <i>short reading</i> » when the reading time is under 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them with a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, GitHub </i> »'
+            variables_available_title: Which variables and operators can I use to write rules?
             variables_available_description: 'The following variables and operators can be used to create tagging rules:'
-            meaning: 'Meaning'
+            meaning: Meaning
             variable_description:
-                label: 'Variable'
-                title: 'Title of the entry'
-                url: 'URL of the entry'
-                isArchived: 'Whether the entry is archived or not'
-                isStarred: 'Whether the entry is starred or not'
-                content: "The entry's content"
-                language: "The entry's language"
-                mimetype: "The entry's mime-type"
-                readingTime: "The estimated entry's reading time, in minutes"
-                domainName: 'The domain name of the entry'
+                label: Variable
+                title: Title of the entry
+                url: URL of the entry
+                isArchived: Whether the entry is archived or not
+                isStarred: Whether the entry is starred or not
+                content: The entry's content
+                language: The entry's language
+                mimetype: The entry's media type
+                readingTime: The estimated entry's reading time, in minutes
+                domainName: The domain name of the entry
             operator_description:
-                label: 'Operator'
-                less_than: 'Less than...'
-                strictly_less_than: 'Strictly less than...'
-                greater_than: 'Greater than...'
-                strictly_greater_than: 'Strictly greater than...'
-                equal_to: 'Equal to...'
-                not_equal_to: 'Not equal to...'
-                or: 'One rule OR another'
-                and: 'One rule AND another'
+                label: Operator
+                less_than: Less than…
+                strictly_less_than: Strictly less than…
+                greater_than: Greater than…
+                strictly_greater_than: Strictly greater than…
+                equal_to: Equal to…
+                not_equal_to: Not equal to…
+                or: One rule OR another
+                and: One rule AND another
                 matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</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>'
+                notmatches: "Tests that a <i>subject</i> doesn't match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches \"football\"</code>"
     form_ignore_origin_rules:
         faq:
             title: 'FAQ'
-            ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?'
+            ignore_origin_rules_definition_title: 'What does “ignore origin rules” mean?'
             ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.<br />If a redirect occurs while fetching a new entry, all the ignore origin rules (<i>user defined and instance defined</i>) will be used to ignore the origin address.'
             how_to_use_them_title: 'How do I use them?'
             how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « <i>rss.example.com</i> » (<i>knowing that after a redirect, the actual address is example.com</i>).<br />In that case, you should put « host = "rss.example.com" » in the <i>Rule</i> field.'
@@ -201,169 +205,170 @@ config:
     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_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 disappear 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:'
+            two_factor_code_description_5: "If you can't see the QR Code or can't scan it, enter the following secret in your app:"
             cancel: Cancel
             enable: Enable
-
 entry:
-    default_title: 'Title of the entry'
+    default_title: Title of the entry
     page_titles:
-        unread: 'Unread entries'
-        starred: 'Starred entries'
-        archived: 'Archived entries'
-        filtered: 'Filtered entries'
+        unread: Unread entries
+        starred: Starred entries
+        archived: Archived entries
+        filtered: Filtered entries
         filtered_tags: 'Filtered by tags:'
         filtered_search: 'Filtered by search:'
-        untagged: 'Untagged entries'
-        all: 'All entries'
+        untagged: Untagged entries
+        all: All entries
     list:
         number_on_the_page: '{0} There are no entries.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
-        reading_time: 'estimated reading time'
+        reading_time: estimated reading time
         reading_time_minutes: 'estimated reading time: %readingTime% min'
         reading_time_less_one_minute: 'estimated reading time: &lt; 1 min'
         number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
         reading_time_minutes_short: '%readingTime% min'
         reading_time_less_one_minute_short: '&lt; 1 min'
-        original_article: 'original'
-        toogle_as_read: 'Toggle mark as read'
-        toogle_as_star: 'Toggle starred'
-        delete: 'Delete'
-        export_title: 'Export'
+        original_article: original
+        toogle_as_read: Toggle mark as read
+        toogle_as_star: Toggle starred
+        delete: Delete
+        export_title: Export
     filters:
-        title: 'Filters'
-        status_label: 'Status'
-        archived_label: 'Archived'
-        starred_label: 'Starred'
-        unread_label: 'Unread'
-        preview_picture_label: 'Has a preview picture'
-        preview_picture_help: 'Preview picture'
-        is_public_label: 'Has a public link'
-        is_public_help: 'Public link'
-        language_label: 'Language'
-        http_status_label: 'HTTP status'
+        title: Filters
+        status_label: Status
+        archived_label: Archived
+        starred_label: Starred
+        unread_label: Unread
+        preview_picture_label: Has a preview picture
+        preview_picture_help: Preview picture
+        is_public_label: Has a public link
+        is_public_help: Public link
+        language_label: Language
+        http_status_label: HTTP status
         reading_time:
-            label: 'Reading time in minutes'
-            from: 'from'
-            to: 'to'
-        domain_label: 'Domain name'
+            label: Reading time in minutes
+            from: from
+            to: to
+        domain_label: Domain name
         created_at:
-            label: 'Creation date'
-            from: 'from'
-            to: 'to'
+            label: Creation date
+            from: from
+            to: to
         action:
-            clear: 'Clear'
-            filter: 'Filter'
+            clear: Clear
+            filter: Filter
     view:
         left_menu:
-            back_to_top: 'Back to top'
-            back_to_homepage: 'Back'
-            set_as_read: 'Mark as read'
-            set_as_unread: 'Mark as unread'
-            set_as_starred: 'Toggle starred'
-            view_original_article: 'Original article'
-            re_fetch_content: 'Re-fetch content'
-            delete: 'Delete'
-            add_a_tag: 'Add a tag'
-            share_content: 'Share'
-            share_email_label: 'Email'
-            public_link: 'public link'
-            delete_public_link: 'delete public link'
-            export: 'Export'
-            print: 'Print'
+            back_to_top: Back to top
+            back_to_homepage: Back
+            set_as_read: Mark as read
+            set_as_unread: Mark as unread
+            set_as_starred: Toggle starred
+            view_original_article: Original article
+            re_fetch_content: Re-fetch content
+            delete: Delete
+            add_a_tag: Add a tag
+            share_content: Share
+            share_email_label: Email
+            public_link: public link
+            delete_public_link: delete public link
+            export: Export
+            print: Print
+            theme_toggle: Theme toggle
+            theme_toggle_light: Light
+            theme_toggle_dark: Dark
+            theme_toggle_auto: Automatic
             problem:
-                label: 'Problems?'
-                description: 'Does this article appear wrong?'
-        edit_title: 'Edit title'
-        original_article: 'original'
+                label: Problems?
+                description: Does this article appear wrong?
+        edit_title: Edit title
+        original_article: original
         annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
-        created_at: 'Creation date'
-        published_at: 'Publication date'
-        published_by: 'Published by'
-        provided_by: 'Provided by'
+        created_at: Creation date
+        published_at: Publication date
+        published_by: Published by
+        provided_by: Provided by
     new:
-        page_title: 'Save new entry'
-        placeholder: 'https://website.com'
+        page_title: Save new entry
+        placeholder: http://website.com
         form_new:
             url_label: Url
     search:
-        placeholder: 'What are you looking for?'
+        placeholder: What are you looking for?
     edit:
-        page_title: 'Edit an entry'
-        title_label: 'Title'
-        url_label: 'Url'
-        origin_url_label: 'Origin url (from where you found that entry)'
-        save_label: 'Save'
+        page_title: Edit an entry
+        title_label: Title
+        url_label: Url
+        origin_url_label: Origin url (from where you found that entry)
+        save_label: Save
     public:
-        shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
+        shared_by_wallabag: This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>
     confirm:
-        delete: "Are you sure you want to remove that article?"
-        delete_entries: "Are you sure you want to remove those articles?"
-        delete_tag: "Are you sure you want to remove that tag from that article?"
+        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"
-        address: "Address"
-        added_on: "Added on"
+        reading_time: Estimated reading time
+        reading_time_minutes_short: '%readingTime% min'
+        address: Address
+        added_on: Added on
         published_on: "Published on"
-
 about:
-    page_title: 'About'
+    page_title: About
     top_menu:
-        who_behind_wallabag: 'Who is behind wallabag'
-        getting_help: 'Getting help'
-        helping: 'Helping wallabag'
-        contributors: 'Contributors'
-        third_party: 'Third-party libraries'
+        who_behind_wallabag: Who is behind wallabag
+        getting_help: Getting help
+        helping: Helping wallabag
+        contributors: Contributors
+        third_party: Third-party libraries
     who_behind_wallabag:
-        developped_by: 'Developed by'
-        website: 'website'
-        many_contributors: 'And many others contributors ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">on GitHub</a>'
-        project_website: 'Project website'
-        license: 'License'
-        version: 'Version'
+        developped_by: Developed by
+        website: website
+        many_contributors: And many others contributors ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">on GitHub</a>
+        project_website: Project website
+        license: License
+        version: Version
     getting_help:
-        documentation: 'Documentation'
-        bug_reports: 'Bug reports'
-        support: '<a href="https://github.com/wallabag/wallabag/issues">on GitHub</a>'
+        documentation: Documentation
+        bug_reports: Bug reports
+        support: <a href="https://github.com/wallabag/wallabag/issues">on GitHub</a>
     helping:
         description: 'wallabag is free and open source. You can help us:'
         by_contributing: 'by contributing to the project:'
-        by_contributing_2: 'an issue lists all our needs'
-        by_paypal: 'via Paypal'
+        by_contributing_2: an issue lists all our needs
+        by_paypal: via Paypal
     contributors:
-        description: 'Thank you to contributors on wallabag web application'
+        description: Thank you to contributors on wallabag web application
     third_party:
         description: 'Here is the list of third-party libraries used in wallabag (with their licenses):'
-        package: 'Package'
-        license: 'License'
-
+        package: Package
+        license: License
 howto:
-    page_title: 'How to'
+    page_title: Howto
     tab_menu:
-        add_link: "Add a link"
-        shortcuts: "Use shortcuts"
+        add_link: Add a link
+        shortcuts: Use shortcuts
     page_description: 'There are several ways to save an article:'
     top_menu:
-        browser_addons: 'Browser addons'
-        mobile_apps: 'Mobile apps'
-        bookmarklet: 'Bookmarklet'
+        browser_addons: Browser addons
+        mobile_apps: Mobile apps
+        bookmarklet: Bookmarklet
     form:
-        description: 'Thanks to this form'
+        description: Thanks to this form
     browser_addons:
-        firefox: 'Firefox addon'
-        chrome: 'Chrome addon'
-        opera: 'Opera addon'
+        firefox: Firefox addon
+        chrome: Chrome addon
+        opera: Opera addon
     mobile_apps:
         android:
-            via_f_droid: 'via F-Droid'
-            via_google_play: 'via Google Play'
-        ios: 'on the iTunes Store'
-        windows: 'on the Microsoft Store'
+            via_f_droid: via F-Droid
+            via_google_play: via Google Play
+        ios: on the iTunes Store
+        windows: on the Microsoft Store
     bookmarklet:
-        description: 'Drag & drop this link to your bookmarks bar:'
+        description: 'Drag and drop this link to your bookmarks bar:'
     shortcuts:
         page_description: Here are the shortcuts available in wallabag.
         shortcut: Shortcut
@@ -391,187 +396,179 @@ howto:
         hide_form: Hide the current form (search or new link)
         arrows_navigation: Navigate through articles
         open_article: Display the selected entry
-
 quickstart:
-    page_title: 'Quickstart'
-    more: 'More…'
+    page_title: Quickstart
+    more: More…
     intro:
-        title: 'Welcome to wallabag!'
-        paragraph_1: "We'll accompany you on your visit to wallabag and show you some features that might interest you."
-        paragraph_2: 'Follow us!'
+        title: Welcome to wallabag!
+        paragraph_1: We'll accompany you on your visit to wallabag and show you some features that might interest you.
+        paragraph_2: Follow us!
     configure:
-        title: 'Configure the application'
-        description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'
-        language: 'Change language and design'
+        title: Configure the application
+        description: In order to have an application which suits you, have a look into the configuration of wallabag.
+        language: Change language and design
         feed: 'Enable feeds'
-        tagging_rules: 'Write rules to automatically tag your articles'
+        tagging_rules: Write rules to automatically tag your articles
     admin:
-        title: 'Administration'
+        title: Administration
         description: 'As an administrator, you have privileges on wallabag. You can:'
-        new_user: 'Create a new user'
-        analytics: 'Configure analytics'
-        sharing: 'Enable some parameters about article sharing'
-        export: 'Configure export'
-        import: 'Configure import'
+        new_user: Create a new user
+        analytics: Configure analytics
+        sharing: Enable some parameters about article sharing
+        export: Configure export
+        import: Configure import
     first_steps:
-        title: 'First steps'
-        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."
-        new_article: 'Save your first article'
-        unread_articles: 'And classify it!'
+        title: First steps
+        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.
+        new_article: Save your first article
+        unread_articles: And classify it!
     migrate:
-        title: 'Migrate from an existing service'
-        description: "Are you using another service? We'll help you to retrieve your data on wallabag."
-        pocket: 'Migrate from Pocket'
-        wallabag_v1: 'Migrate from wallabag v1'
-        wallabag_v2: 'Migrate from wallabag v2'
-        readability: 'Migrate from Readability'
-        instapaper: 'Migrate from Instapaper'
+        title: Migrate from an existing service
+        description: Are you using another service? We'll help you to retrieve your data on wallabag.
+        pocket: Migrate from Pocket
+        wallabag_v1: Migrate from wallabag v1
+        wallabag_v2: Migrate from wallabag v2
+        readability: Migrate from Readability
+        instapaper: Migrate from Instapaper
     developer:
-        title: 'Developers'
+        title: Developers
         description: 'We also thought of the developers: Docker, API, translations, etc.'
-        create_application: 'Create your third-party application'
-        use_docker: 'Use Docker to install wallabag'
+        create_application: Create your third-party application
+        use_docker: Use Docker to install wallabag
     docs:
-        title: 'Full documentation'
-        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."
-        annotate: 'Annotate your article'
-        export: 'Convert your articles into ePUB or PDF'
-        search_filters: 'See how you can look for an article by using the search engine and filters'
-        fetching_errors: 'What can I do if an article encounters errors during fetching?'
-        all_docs: 'And so many other articles!'
+        title: Full documentation
+        description: There are so many features in wallabag. Don't hesitate to read the manual to know them and to learn how to use them.
+        annotate: Annotate your article
+        export: Convert your articles into ePUB or PDF
+        search_filters: See how you can look for an article by using the search engine and filters
+        fetching_errors: What can I do if an article encounters errors during fetching?
+        all_docs: And so many other articles!
     support:
-        title: 'Support'
-        description: 'If you need some help, we are here for you.'
-        github: 'On GitHub'
-        email: 'By email'
-        gitter: 'On Gitter'
-
+        title: Support
+        description: If you need some help, we are here for you.
+        github: On GitHub
+        email: By email
+        gitter: On Gitter
 tag:
-    page_title: 'Tags'
+    page_title: Tags
     list:
         number_on_the_page: '{0} There are no tags.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
-        see_untagged_entries: 'See untagged entries'
+        see_untagged_entries: See untagged entries
         no_untagged_entries: 'There are no untagged entries.'
         untagged: 'Untagged entries'
     new:
-        add: 'Add'
-        placeholder: 'You can add several tags, separated by a comma.'
-    rename:
-        placeholder: 'You can update tag name.'
-
+        add: Add
+        placeholder: You can add several tags, separated by a comma.
 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>'
-    unknown: 'Unknown'
-
+    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
 import:
-    page_title: 'Import'
-    page_description: 'Welcome to wallabag importer. Please select your previous service from which you want to migrate.'
+    page_title: Import
+    page_description: Welcome to wallabag importer. Please select your previous service from which you want to migrate.
     action:
-        import_contents: 'Import contents'
+        import_contents: Import contents
     form:
-        mark_as_read_title: 'Mark all as read?'
-        mark_as_read_label: 'Mark all imported entries as read'
-        file_label: 'File'
-        save_label: 'Upload file'
+        mark_as_read_title: Mark all as read?
+        mark_as_read_label: Mark all imported entries as read
+        file_label: File
+        save_label: Upload file
     pocket:
-        page_title: 'Import > Pocket'
-        description: "This importer will import all of your Pocket data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag."
+        page_title: Import > Pocket
+        description: This importer will import all of your Pocket data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag.
         config_missing:
-            description: "Pocket import isn't configured."
-            admin_message: 'You need to define %keyurls%a pocket_consumer_key%keyurle%.'
-            user_message: 'Your server admin needs to define an API Key for Pocket.'
-        authorize_message: 'You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.'
-        connect_to_pocket: 'Connect to Pocket and import data'
+            description: Pocket import isn't configured.
+            admin_message: You need to define %keyurls%a pocket_consumer_key%keyurle%.
+            user_message: Your server admin needs to define an API Key for Pocket.
+        authorize_message: You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.
+        connect_to_pocket: Connect to Pocket and import data
     wallabag_v1:
-        page_title: 'Import > Wallabag v1'
-        description: 'This importer will import all your wallabag v1 articles. On your config page, click on "JSON export" in the "Export your wallabag data" section. You will have a "wallabag-export-1-xxxx-xx-xx.json" file.'
-        how_to: 'Please select your wallabag export and click on the below button to upload and import it.'
+        page_title: Import > Wallabag v1
+        description: This importer will import all your wallabag v1 articles. On your config page, click on "JSON export" in the "Export your wallabag data" section. You will have a "wallabag-export-1-xxxx-xx-xx.json" file.
+        how_to: Please select your wallabag export and click on the below button to upload and import it.
     wallabag_v2:
-        page_title: 'Import > Wallabag v2'
-        description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.'
+        page_title: Import > Wallabag v2
+        description: This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.
     elcurator:
         page_title: 'Import > elCurator'
         description: 'This importer will import all your elCurator articles. Go to your preferences in your elCurator account and then, export your content. You will have a JSON file.'
     readability:
-        page_title: 'Import > Readability'
-        description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).'
-        how_to: 'Please select your Readability export and click on the below button to upload and import it.'
+        page_title: Import > Readability
+        description: This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).
+        how_to: Please select your Readability export and click on the below button to upload and import it.
     worker:
-        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:"
-        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."
+        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:'
+        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.
     firefox:
-        page_title: 'Import > Firefox'
-        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."
-        how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+        page_title: Import > Firefox
+        description: This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Shift+O), then into "Import and backup", choose "Backup…". You will obtain a JSON file.
+        how_to: Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched.
     chrome:
-        page_title: 'Import > Chrome'
+        page_title: Import > Chrome
         description: "This importer will import all your Chrome bookmarks. The location of the file depends on your operating system : <ul><li>On Linux, go into the <code>~/.config/chromium/Default/</code> directory</li><li>On Windows, it should be at <code>%LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default</code></li><li>On OS X, it should be at <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Once you got there, copy the <code>Bookmarks</code> file someplace you'll find.<em><br>Note that if you have Chromium instead of Chrome, you'll have to correct paths accordingly.</em></p>"
-        how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+        how_to: Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched.
     instapaper:
-        page_title: 'Import > Instapaper'
-        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").'
-        how_to: 'Please select your Instapaper export and click on the below button to upload and import it.'
+        page_title: Import > Instapaper
+        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").
+        how_to: Please select your Instapaper export and click on the below button to upload and import it.
     pinboard:
-        page_title: "Import > Pinboard"
-        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").'
-        how_to: 'Please select your Pinboard export and click on the below button to upload and import it.'
-
+        page_title: Import > Pinboard
+        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").
+        how_to: Please select your Pinboard export and click on the below button to upload and import it.
 developer:
-    page_title: 'API clients management'
-    welcome_message: 'Welcome to the wallabag API'
-    documentation: 'Documentation'
-    how_to_first_app: 'How to create my first application'
-    full_documentation: 'View full API documentation'
-    list_methods: 'List API methods'
+    page_title: API clients management
+    welcome_message: Welcome to the wallabag API
+    documentation: Documentation
+    how_to_first_app: How to create my first application
+    full_documentation: View full API documentation
+    list_methods: List API methods
     clients:
-        title: 'Clients'
-        create_new: 'Create a new client'
+        title: Clients
+        create_new: Create a new client
     existing_clients:
-        title: 'Existing clients'
-        field_id: 'Client ID'
-        field_secret: 'Client secret'
-        field_uris: 'Redirect URIs'
-        field_grant_types: 'Grant type allowed'
-        no_client: 'No client yet.'
+        title: Existing clients
+        field_id: Client ID
+        field_secret: Client secret
+        field_uris: Redirect URIs
+        field_grant_types: Grant type allowed
+        no_client: No client yet.
     remove:
-        warn_message_1: 'You have the ability to remove the client %name%. This action is IRREVERSIBLE !'
-        warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
-        action: 'Remove the client %name%'
+        warn_message_1: You have the ability to remove the client %name%. This action is IRREVERSIBLE !
+        warn_message_2: If you remove it, every app configured with that client won't be able to auth on your wallabag.
+        action: Remove the client %name%
     client:
-        page_title: 'API clients management > New client'
-        page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
+        page_title: API clients management > New client
+        page_description: You are about to create a new client. Please fill the field below for the redirect URI of your application.
         form:
-            name_label: 'Name of the client'
-            redirect_uris_label: 'Redirect URIs (optional)'
-            save_label: 'Create a new client'
-        action_back: 'Back'
+            name_label: Name of the client
+            redirect_uris_label: Redirect URIs (optional)
+            save_label: Create a new client
+        action_back: Back
         copy_to_clipboard: Copy
     client_parameter:
-        page_title: 'API clients management > Client parameters'
-        page_description: 'Here are your client parameters.'
-        field_name: 'Client name'
-        field_id: 'Client ID'
-        field_secret: 'Client secret'
-        back: 'Back'
-        read_howto: 'Read the howto "Create my first application"'
+        page_title: API clients management > Client parameters
+        page_description: Here are your client parameters.
+        field_name: Client name
+        field_id: Client ID
+        field_secret: Client secret
+        back: Back
+        read_howto: Read the howto "Create my first application"
     howto:
-        page_title: 'API clients management > How to create my first application'
+        page_title: API clients management > How to create my first application
         description:
-            paragraph_1: 'The following commands make use of the <a href="https://github.com/jkbrzt/httpie">HTTPie library</a>. Make sure it is installed on your system before using it.'
-            paragraph_2: 'You need a token to communicate between your 3rd application and wallabag API.'
-            paragraph_3: 'To create this token, you need <a href="%link%">to create a new client</a>.'
+            paragraph_1: The following commands make use of the <a href="https://github.com/jkbrzt/httpie">HTTPie library</a>. Make sure it is installed on your system before using it.
+            paragraph_2: You need a token to communicate between your third-party application and wallabag API.
+            paragraph_3: To create this token, you need <a href="%link%">to create a new client</a>.
             paragraph_4: 'Now, create your token (replace client_id, client_secret, username and password with the good values):'
             paragraph_5: 'The API will return a response like this:'
             paragraph_6: 'The access_token is useful to do a call to the API endpoint. For example:'
-            paragraph_7: 'This call will return all the entries for your user.'
-            paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
-        back: 'Back'
-
+            paragraph_7: This call will return all the entries for your user.
+            paragraph_8: If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.
+        back: Back
 user:
     page_title: Users management
     new_user: Create a new user
     edit_user: Edit an existing user
-    description: "Here you can manage all users (create, edit and delete)"
+    description: Here you can manage all users (create, edit and delete)
     list:
         actions: Actions
         edit_action: Edit
@@ -579,14 +576,14 @@ user:
         no: No
         create_new_one: Create a new user
     form:
-        username_label: 'Login'
-        name_label: 'Name'
-        password_label: 'Password'
-        repeat_new_password_label: 'Repeat new password'
-        plain_password_label: '????'
-        email_label: 'Email'
-        enabled_label: 'Enabled'
-        last_login_label: 'Last login'
+        username_label: Username
+        name_label: Name
+        password_label: Password
+        repeat_new_password_label: Repeat new password
+        plain_password_label: ????
+        email_label: Email
+        enabled_label: Enabled
+        last_login_label: Last login
         twofactor_email_label: Two factor authentication by email
         twofactor_google_label: Two factor authentication by OTP app
         save: Save
@@ -594,13 +591,12 @@ user:
         delete_confirm: Are you sure?
         back_to_list: Back to list
     search:
-        placeholder: Filter by login or email
-
+        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."
+    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
@@ -615,7 +611,6 @@ site_credential:
         delete: Delete
         delete_confirm: Are you sure?
         back_to_list: Back to list
-
 ignore_origin_instance_rule:
     page_title: Global ignore origin rules
     new_ignore_origin_instance_rule: Create a global ignore origin rule
@@ -633,22 +628,20 @@ ignore_origin_instance_rule:
         delete: Delete
         delete_confirm: Are you sure?
         back_to_list: Back to list
-
 error:
     page_title: An error occurred
-
 flashes:
     config:
         notice:
-            config_saved: 'Config saved.'
-            password_updated: 'Password updated'
-            password_not_updated_demo: "In demonstration mode, you can't change password for this user."
-            user_updated: 'Information updated'
+            config_saved: Config saved.
+            password_updated: Password updated
+            password_not_updated_demo: In demonstration mode, you can't change password for this user.
+            user_updated: Information updated
+            tagging_rules_updated: Tagging rules updated
+            tagging_rules_deleted: Tagging rule deleted
             feed_updated: 'Feed information updated'
-            tagging_rules_updated: 'Tagging rules updated'
-            tagging_rules_deleted: 'Tagging rule deleted'
             feed_token_updated: 'Feed token updated'
-            feed_token_revoked: 'RSS token revoked'
+            feed_token_revoked: 'Feed token revoked'
             annotations_reset: Annotations reset
             tags_reset: Tags reset
             entries_reset: Entries reset
@@ -661,26 +654,26 @@ flashes:
             ignore_origin_rules_updated: 'Ignore origin rule updated'
     entry:
         notice:
-            entry_already_saved: 'Entry already saved on %date%'
-            entry_saved: 'Entry saved'
-            entry_saved_failed: 'Entry saved but fetching content failed'
-            entry_updated: 'Entry updated'
-            entry_reloaded: 'Entry reloaded'
-            entry_reloaded_failed: 'Entry reloaded but fetching content failed'
-            entry_archived: 'Entry archived'
-            entry_unarchived: 'Entry unarchived'
-            entry_starred: 'Entry starred'
-            entry_unstarred: 'Entry unstarred'
-            entry_deleted: 'Entry deleted'
+            entry_already_saved: Entry already saved on %date%
+            entry_saved: Entry saved
+            entry_saved_failed: Entry saved but fetching content failed
+            entry_updated: Entry updated
+            entry_reloaded: Entry reloaded
+            entry_reloaded_failed: Entry reloaded but fetching content failed
+            entry_archived: Entry archived
+            entry_unarchived: Entry unarchived
+            entry_starred: Entry starred
+            entry_unstarred: Entry unstarred
+            entry_deleted: Entry deleted
             no_random_entry: 'No article with these criterias was found'
     tag:
         notice:
-            tag_added: 'Tag added'
+            tag_added: Tag added
             tag_renamed: 'Tag renamed'
     import:
         notice:
-            failed: 'Import failed, please try again.'
-            failed_on_file: 'Error while processing import. Please verify your import file.'
+            failed: Import failed, please try again.
+            failed_on_file: Error while processing import. Please verify your import file.
             summary: 'Import summary: %imported% imported, %skipped% already saved.'
             summary_with_queue: 'Import summary: %queued% queued.'
         error:
@@ -688,18 +681,18 @@ flashes:
             rabbit_enabled_not_installed: RabbitMQ is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check RabbitMQ configuration.
     developer:
         notice:
-            client_created: 'New client %name% created.'
-            client_deleted: 'Client %name% deleted'
+            client_created: New client %name% created.
+            client_deleted: Client %name% deleted
     user:
         notice:
-            added: 'User "%username%" added'
-            updated: 'User "%username%" updated'
-            deleted: 'User "%username%" deleted'
+            added: User "%username%" added
+            updated: User "%username%" updated
+            deleted: User "%username%" deleted
     site_credential:
         notice:
-            added: 'Site credential for "%host%" added'
-            updated: 'Site credential for "%host%" updated'
-            deleted: 'Site credential for "%host%" deleted'
+            added: Site credential for "%host%" added
+            updated: Site credential for "%host%" updated
+            deleted: Site credential for "%host%" deleted
     ignore_origin_instance_rule:
         notice:
             added: 'Global ignore origin rule added'

src/Wallabag/CoreBundle/Resources/translations/messages.es.yml

@@ -2,7 +2,7 @@ security:
     login:
         page_title: '¡Bienvenido a wallabag!'
         keep_logged_in: 'Permanecer conectado'
-        forgot_password: '¿Se ha olvidado de su contraseña?'
+        forgot_password: '¿Ha olvidado su contraseña?'
         submit: 'Conectarse'
         register: 'Registrarse'
         username: 'Nombre de usuario'
@@ -13,12 +13,11 @@ security:
     register:
         page_title: 'Crear una cuenta'
         go_to_account: 'Acceder su cuenta'
-
 menu:
     left:
         unread: 'Sin leer'
         starred: 'Favoritos'
-        archive: 'Archivo'
+        archive: 'Archivados'
         all_articles: 'Todos los artículos'
         config: 'Configuración'
         tags: 'Etiquetas'
@@ -29,30 +28,30 @@ menu:
         logout: 'Desconectarse'
         about: 'Acerca de'
         search: 'Buscar'
-        save_link: 'Guardar un enlace'
+        save_link: 'Guardar un artículo'
         back_to_unread: 'Volver a los artículos sin leer'
         users_management: 'Configuración de usuarios'
-        site_credentials: 'Credenciales del sitio'
-        # ignore_origin_instance_rules: 'Global ignore origin rules'
-        quickstart: "Inicio rápido"
+        site_credentials: Credenciales del sitio
+        quickstart: Inicio rápido
+        theme_toggle_auto: Tema automático
+        theme_toggle_dark: Tema oscuro
+        theme_toggle_light: Tema claro
     top:
         add_new_entry: 'Añadir un nuevo artículo'
         search: 'Buscar'
         filter_entries: 'Filtrar los artículos'
         random_entry: 'Ir a un artículo aleatório de esta lista'
         export: 'Exportar'
-        # account: 'My account'
+        account: Mi cuenta
     search_form:
         input_label: 'Introduzca su búsqueda aquí'
-
 footer:
     wallabag:
         elsewhere: 'Lleva wallabag contigo'
         social: 'Social'
         powered_by: 'impulsado por'
         about: 'Acerca de'
-    stats: Desde el %user_creation% has leído %nb_archives% artículos. ¡Eso hace unos %per_day% por día!
-
+    stats: Desde el %user_creation% has leído %nb_archives% artículos. ¡Eso son unos %per_day% por día!
 config:
     page_title: 'Configuración'
     tab_menu:
@@ -60,10 +59,10 @@ config:
         feed: 'RSS'
         user_info: 'Información de usuario'
         password: 'Contraseña'
-        rules: 'Reglas de etiquetado automáticas'
-        # ignore_origin: 'Ignore origin rules'
+        rules: 'Reglas de etiquetado'
         new_user: 'Añadir un usuario'
         reset: 'Reiniciar mi cuenta'
+        rss: RSS
     form:
         save: 'Guardar'
     form_settings:
@@ -73,37 +72,39 @@ config:
         reading_speed:
             label: 'Velocidad de lectura (palabras por minuto)'
             help_message: 'Puede utilizar herramientas en línea para calcular su velocidad de lectura:'
+            400_word: Leo ~400 palabras por minuto
+            300_word: Leo ~300 palabras por minuto
+            200_word: Leo ~200 palabras por minuto
+            100_word: Leo ~100 palabras por minuto
         action_mark_as_read:
-            label: '¿Dónde quieres ser redirigido después de marcar un artículo como leído?'
-            redirect_homepage: 'A la página de inicio'
-            redirect_current_page: 'A la página actual'
+            label: '¿Qué hacer después de eliminar, marcar como favorito o marcar un artículo como leído?'
+            redirect_homepage: 'Ir a la página de inicio'
+            redirect_current_page: 'Permanecer en la página actual'
         pocket_consumer_key_label: Clave de consumidor para importar contenidos de Pocket
         android_configuration: Configura tu aplicación Android
-        android_instruction: "Toca aquí para prellenar tu aplicación Android"
         help_theme: "wallabag es personalizable. Puedes elegir tu tema preferido aquí."
         help_items_per_page: "Puedes cambiar el número de artículos mostrados en cada página."
-        help_reading_speed: "wallabag calcula un tiempo de lectura para cada artículo. Puedes definir aquí, gracias a esta lista, si eres un lector rápido o lento. wallabag recalculará el tiempo de lectura para cada artículo."
+        help_reading_speed: "wallabag calcula un tiempo de lectura para cada artículo. Aquí puedes definir, gracias a esta lista, si eres un lector rápido o lento. wallabag recalculará el tiempo de lectura para cada artículo."
         help_language: "Puedes cambiar el idioma de la interfaz de wallabag."
         help_pocket_consumer_key: "Requerido para la importación desde Pocket. Puedes crearla en tu cuenta de Pocket."
-    form_feed:
-        description: 'Los feeds RSS de wallabag permiten leer los artículos guardados con tu lector RSS favorito. Primero necesitas generar un token.'
+        android_instruction: Pulse aquí para completar tu aplicación Android
+    form_rss:
+        description: 'Los feeds RSS proporcionados por wallabag permiten leer los artículos guardados con su lector RSS favorito. Primero necesitas generar un token.'
         token_label: 'Token RSS'
         no_token: 'Sin token'
-        token_create: 'Crear token'
-        token_reset: 'Reiniciar token'
-        token_revoke: 'Revocar token'
-        feed_links: 'URLs de feeds RSS'
-        feed_link:
+        token_create: 'Crear un token'
+        token_reset: 'Reiniciar el token'
+        rss_links: 'URLs de feeds RSS'
+        rss_link:
             unread: 'Sin leer'
             starred: 'Favoritos'
             archive: 'Archivados'
-            all: 'Todos'
-        feed_limit: 'Límite de artículos en feed RSS'
+            all: Todos
+        rss_limit: 'Número de artículos en el feed RSS'
     form_user:
-        two_factor_description: "Activar la autenticación de dos pasos significa que recibirás un correo electrónico con un código o que necesitarás usar una aplicación OTP (como Google Authenticator, Authy or FreeOTP) para conseguir un código de utilización única en cada nueva conexión no confiable. No puedes usar los dos métodos."
-        login_label: 'Nombre de usuario (no se puede cambiar)'
+        two_factor_description: "Activar la autenticación en dos pasos significa que recibirás un código por correo electrónico en cada nueva conexión que no sea de confianza."
         name_label: 'Nombre'
-        email_label: 'Dirección de correo electrónico'
+        email_label: 'Correo electrónico'
         two_factor:
             emailTwoFactor_label: 'Usando el correo electrónico (recibe un código por correo electrónico)'
             googleTwoFactor_label: 'Usando una aplicación OTP (abre la aplicación, por ejemplo Google Authenticator, Authy o FreeOTP, para conseguir un código de utilización única)'
@@ -115,13 +116,15 @@ config:
             action_email: 'Usar correo electrónico'
             action_app: 'Usar aplicación OTP'
         delete:
-            title: Eliminar mi cuenta (Zona peligrosa)
-            description: Si eliminas tu cuenta, TODOS tus artículos, TODAS tus etiquetas, TODAS tus anotaciones y tu cuenta serán eliminadas de forma PERMANENTE (no se puede deshacer). Después serás desconectado.
+            title: Eliminar mi cuenta (zona peligrosa)
+            description: Si eliminas tu cuenta, TODOS tus artículos, TODAS tus etiquetas, TODAS tus anotaciones y tu cuenta serán eliminadas de forma PERMANENTE (no se puede DESHACER). Después serás desconectado.
             confirm: ¿Estás completamente seguro? (NO SE PUEDE DESHACER)
             button: Eliminar mi cuenta
+        help_twoFactorAuthentication: Si habilita la autenticación de dos factores (2FA), cada vez que desee iniciar sesión en wallabag, recibirá un código por correo electrónico.
+        twoFactorAuthentication_label: Autenticación de dos factores
     reset:
-        title: Reiniciar mi cuenta (Zona peligrosa)
-        description: Pulsando los botones de abajo puedes eliminar información de tu cuenta. Ten en cuenta que estas acciones son IRREVERSIBLES.
+        title: Reiniciar mi cuenta (zona peligrosa)
+        description: Pulsando los botones de abajo puedes eliminar alguna información de tu cuenta. Ten en cuenta que estas acciones son IRREVERSIBLES.
         annotations: Eliminar TODAS las anotaciones
         tags: Eliminar TODAS las etiquetas
         entries: Eliminar TODOS los artículos
@@ -149,19 +152,19 @@ config:
         import_submit: Importar
         export: Exportar
         faq:
-            title: 'Preguntas frecuentes'
-            tagging_rules_definition_title: '¿Qué significa « reglas de etiquetado automático »?'
-            tagging_rules_definition_description: 'Son las reglas usadas por wallabag para etiquetar automáticamente los nuevos artículos.<br />Cada vez que un artículo sea añadido, todas las reglas de etiquetado automático serán usadas para etiquetarlo, ayudándote a clasificar automáticamente tus artículos.'
+            title: 'Preguntas frecuentes (FAQ)'
+            tagging_rules_definition_title: '¿Qué significa «reglas de etiquetado»?'
+            tagging_rules_definition_description: 'Son las reglas usadas por wallabag para etiquetar automáticamente los nuevos artículos.<br />Cada vez que un artículo es añadido, todas las reglas de etiquetado automático serán usadas para etiquetarlo, ayudándote a clasificar automáticamente tus artículos.'
             how_to_use_them_title: '¿Cómo se utilizan?'
-            how_to_use_them_description: 'Supongamos que quiere etiquetar los artículos nuevos como « <i>lectura corta</i> » cuando el tiempo de lectura sea menos de 3 minutos.<br /> En ese caso, debe poner « readingTime &lt;= 3 » en el campo <i>Regla</i> y « <i>lectura corta</i> » en el campo <i>Etiquetas</i>.<br />Se pueden añadir varias etiquetas al mismo tiempo separadas por comas: « <i>lectura corta, lectura obligada</i> »<br />Se pueden escribir reglas complejas utilizando los operadores predefinidos: si « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » entonces etiqueta como « <i>lectura larga, github </i> »'
+            how_to_use_them_description: 'Supongamos que quiere etiquetar los artículos nuevos como « <i>lectura corta</i> » cuando el tiempo de lectura sea menos de 3 minutos.<br /> En este caso, debe poner « readingTime &lt;= 3 » en el campo <i>Regla</i> y « <i>lectura corta</i> » en el campo <i>Etiquetas</i>.<br />Se pueden añadir varias etiquetas al mismo tiempo separadas por comas: « <i>lectura corta, lectura obligada</i> »<br />Se pueden escribir reglas complejas utilizando los operadores predefinidos: si « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » entonces etiqueta como « <i>lectura larga, GitHub </i> »'
             variables_available_title: '¿Qué variables y operadores se pueden utilizar para escribir las reglas?'
-            variables_available_description: 'Las siguientes variables y operadores se pueden utilizar para crear reglas de etiquetado automático:'
+            variables_available_description: 'Las siguientes variables y operadores se pueden utilizar para crear reglas de etiquetado:'
             meaning: 'Significado'
             variable_description:
                 label: 'Variable'
                 title: 'Título del artículo'
                 url: 'URL del artículo'
-                isArchived: 'Si artículo está archivado o no'
+                isArchived: 'Si el artículo está archivado o no'
                 isStarred: 'Si el artículo está en favoritos o no'
                 content: "El contenido del artículo"
                 language: "El idioma del artículo"
@@ -179,35 +182,30 @@ config:
                 or: 'Una regla U otra'
                 and: 'Una regla Y la otra'
                 matches: 'Prueba si un <i>sujeto</i> corresponde a una <i>búsqueda</i> (insensible a mayúsculas).<br />Ejemplo : <code>title matches "fútbol"</code>'
-                notmatches: 'Prueba si <i>subject</i> no corresponde a una <i>búsqueda</i> (insensible a mayúsculas).<br />Example: <code>title notmatches "fútbol"</code>'
-    form_ignore_origin_rules:
-        # faq:
-        #     title: 'FAQ'
-        #     ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?'
-        #     ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.<br />If a redirect occurs while fetching a new entry, all the ignore origin rules (<i>user defined and instance defined</i>) will be used to ignore the origin address.'
-        #     how_to_use_them_title: 'How do I use them?'
-        #     how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « <i>rss.example.com</i> » (<i>knowing that after a redirect, the actual address is example.com</i>).<br />In that case, you should put « host = "rss.example.com" » in the <i>Rule</i> field.'
-        #     variables_available_title: 'Which variables and operators can I use to write rules?'
-        #     variables_available_description: 'The following variables and operators can be used to create ignore origin rules:'
-        #     meaning: 'Meaning'
-        #     variable_description:
-        #         label: 'Variable'
-        #         host: 'Host of the address'
-        #         _all: 'Full address, mainly for pattern matching'
-        #     operator_description:
-        #         label: 'Operator'
-        #         equal_to: 'Equal to…'
-        #         matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>_all ~ "https?://rss.example.com/foobar/.*"</code>'
+                notmatches: 'Prueba si un <i>sujeto</i> no corresponde a una <i>búsqueda</i> (insensible a mayúsculas).<br />Ejemplo : <code>title notmatches "fútbol"</code>'
     otp:
-        page_title: Autenticación de dos pasos
         app:
-            two_factor_code_description_1: Acabas de activar la autenticación en dos factores con OTP, abre tu aplicación OTP y consigue un código de utilización única. Desaparecerá al volver a cargar la página.
-            two_factor_code_description_2: 'Puedes escanear el código QR con tu aplicación:'
-            two_factor_code_description_3: 'No olvides guardar los códigos de seguridad en un lugar seguro, los puedes utilizar en caso de que pierdas el accesso a tu aplicación OTP:'
-            two_factor_code_description_4: 'Prueba un código generado por tu aplicación OTP:'
             cancel: Cancelar
-            enable: Activar
-
+            enable: Habilitar
+            two_factor_code_description_2: 'Puedes escanear ese Código QR con tu applicación:'
+        page_title: Autenticación de doble factor
+    form_ignore_origin_rules:
+        faq:
+            operator_description:
+                equal_to: Igual a…
+                label: Operador
+            variable_description:
+                label: Variable
+            meaning: Significado
+            variables_available_title: ¿Qué variables y operadores se pueden utilizar para escribir las reglas?
+            how_to_use_them_title: ¿Cómo se utilizan?
+            title: Preguntas frecuentes (FAQ)
+    form_feed:
+        feed_link:
+            all: Todos
+            archive: Archivados
+            starred: Favorito
+            unread: No leídos
 entry:
     default_title: 'Título del artículo'
     page_titles:
@@ -240,12 +238,10 @@ entry:
         unread_label: 'Sin leer'
         preview_picture_label: 'Tiene imagen de previsualización'
         preview_picture_help: 'Imagen de previsualización'
-        is_public_label: 'Tiene un enlace público'
-        is_public_help: 'Enlace público'
         language_label: 'Idioma'
         http_status_label: 'Código de estado HTTP'
         reading_time:
-            label: 'Duración de lectura en minutos'
+            label: 'Tiempo de lectura en minutos'
             from: 'de'
             to: 'a'
         domain_label: 'Nombre de dominio'
@@ -256,10 +252,12 @@ entry:
         action:
             clear: 'Limpiar'
             filter: 'Filtrar'
+        is_public_help: Enlace público
+        is_public_label: Tiene un enlace público
     view:
         left_menu:
-            back_to_top: 'Regrese al principio'
-            back_to_homepage: 'Regrese a la página principal'
+            back_to_top: 'Volver al principio'
+            back_to_homepage: 'Volver'
             set_as_read: 'Marcar como leído'
             set_as_unread: 'Marcar como no leído'
             set_as_starred: 'Marcar como favorito'
@@ -280,9 +278,9 @@ entry:
         original_article: 'original'
         annotations_on_the_entry: '{0} Sin anotaciones|{1} Una anotación|]1,Inf[ %count% anotaciones'
         created_at: 'Fecha de creación'
-        published_at: 'Fecha de publicación'
-        published_by: 'Publicado por'
-        provided_by: 'Proporcionado por'
+        provided_by: Proporcionado por
+        published_by: Publicado por
+        published_at: Fecha de publicación
     new:
         page_title: 'Guardar un nuevo artículo'
         placeholder: 'https://sitioweb.es'
@@ -294,44 +292,42 @@ entry:
         page_title: 'Editar un artículo'
         title_label: 'Título'
         url_label: 'URL'
-        origin_url_label: 'URL de origen (de dónde has encontrado este artículo)'
         save_label: 'Guardar'
+        origin_url_label: URL original (de donde encontraste el artículo)
     public:
-        shared_by_wallabag: "Este artículo se ha compartido con <a href='%wallabag_instance%'>wallabag</a>"
+        shared_by_wallabag: "Este artículo ha sido compartido por %username% con <a href='%wallabag_instance%'>wallabag</a>"
     confirm:
-        delete: "¿Estás seguro de que quieres eliminar este artículo?"
-        # delete_entries: "Are you sure you want to remove those articles?"
-        delete_tag: "¿Estás seguro de que quieres eliminar esta etiqueta de este artículo?"
+        delete_tag: ¿Estás seguro de que deseas eliminar la etiqueta de este artículo?
+        delete: ¿Seguro que quieres eliminar este artículo?
     metadata:
-        reading_time: "Tiempo de lectura estimado"
-        reading_time_minutes_short: "%readingTime% min"
-        address: "Dirección"
-        added_on: "Añadido el"
-        # published_on: "Published on"
-
+        added_on: Añadido el
+        address: Dirección
+        reading_time_minutes_short: '%readingTime% min'
+        reading_time: Tiempo estimado de lectura
+        published_on: Publicado en
 about:
     page_title: 'Acerca de'
     top_menu:
         who_behind_wallabag: 'Quién está detrás de wallabag'
-        getting_help: 'Pedir ayuda'
+        getting_help: 'Solicitar ayuda'
         helping: 'Ayudar a wallabag'
         contributors: 'Colaboradores'
         third_party: 'Bibliotecas de terceros'
     who_behind_wallabag:
         developped_by: 'Desarrollado por'
-        website: 'Sitio web'
+        website: 'sitio web'
         many_contributors: 'Y otros muchos colaboradores ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">en Github</a>'
         project_website: 'Sitio web del proyecto'
         license: 'Licencia'
         version: 'Versión'
     getting_help:
         documentation: 'Documentación'
-        bug_reports: 'Reporte de errores'
+        bug_reports: 'Informes de error'
         support: '<a href="https://github.com/wallabag/wallabag/issues">en GitHub</a>'
     helping:
         description: 'wallabag es software libre y gratuito. Usted puede ayudarnos:'
-        by_contributing: 'contribuyendo al proyecto :'
-        by_contributing_2: 'nuestras necesidades están en un ticket'
+        by_contributing: 'contribuyendo al proyecto:'
+        by_contributing_2: 'un informe lista todas nuestras necesidades'
         by_paypal: 'vía Paypal'
     contributors:
         description: 'Gracias a los colaboradores de la aplicación web de wallabag'
@@ -339,11 +335,10 @@ about:
         description: 'Aquí está la lista de bibliotecas de terceros utilizadas por wallabag (con sus licencias):'
         package: 'Paquete'
         license: 'Licencia'
-
 howto:
     page_title: 'Ayuda'
     tab_menu:
-        add_link: "Añadir un artículo"
+        add_link: "Añadir un enlace"
         shortcuts: "Utilizar atajos de teclado"
     page_description: 'Hay muchas maneras de guardar un artículo:'
     top_menu:
@@ -391,7 +386,6 @@ howto:
         hide_form: Ocultar el formulario actual (búsqueda o nuevo artículo)
         arrows_navigation: Navegar por los artículos
         open_article: Mostrar el artículo seleccionado
-
 quickstart:
     page_title: 'Inicio rápido'
     more: 'Más…'
@@ -405,21 +399,22 @@ quickstart:
         language: 'Cambie el idioma y el diseño'
         feed: 'Activar los feeds RSS'
         tagging_rules: 'Escribe reglas para etiquetar automáticamente tus artículos'
+        rss: Habilitar canales RSS
     admin:
         title: 'Administración'
-        description: 'Como administrador, tiene algunos privilegios en wallabag. Puedes:'
+        description: 'Como administrador, tienes algunos privilegios en wallabag. Puedes:'
         new_user: 'Crear un nuevo usuario'
         analytics: 'Configurar analíticas'
-        sharing: 'Activar algunos parámetros de compartir artículos'
-        export: 'Configurar exportación'
-        import: 'Configurar importación'
+        sharing: 'Activar algunos parámetros para compartir artículos'
+        export: 'Configurar la exportación'
+        import: 'Configurar la importación'
     first_steps:
         title: 'Primeros pasos'
         description: "Ahora que wallabag está bien configurado, es el momento de archivar la web. Puedes hacer clic en el signo + de la parte superior derecha para añadir un artículo."
         new_article: 'Guarda tu primer artículo'
         unread_articles: '¡Y clasifícalo!'
     migrate:
-        title: 'Migrar de un servicio existente'
+        title: 'Migrar desde un servicio existente'
         description: "¿Estás usando otro servicio? Le ayudaremos a migrar sus datos a wallabag."
         pocket: 'Migrar desde Pocket'
         wallabag_v1: 'Migrar desde wallabag v1'
@@ -429,7 +424,7 @@ quickstart:
     developer:
         title: 'Desarrolladores'
         description: 'Nosotros también pensamos en los desarrolladores: Docker, API, traducciones, etc.'
-        create_application: 'Cree su aplicación de terceros'
+        create_application: 'Crear tu aplicación de terceros'
         use_docker: 'Utilice Docker para instalar wallabag'
     docs:
         title: 'Documentación completa'
@@ -440,12 +435,11 @@ quickstart:
         fetching_errors: '¿Qué puedo hacer si se encuentran errores mientras se descarga un artículo?'
         all_docs: '¡Y muchos más artículos!'
     support:
-        title: 'Apoyo'
+        title: 'Soporte'
         description: 'Si necesitas ayuda, estamos a tu disposición.'
         github: 'En GitHub'
         email: 'Por correo electrónico'
         gitter: 'En Gitter'
-
 tag:
     page_title: 'Etiquetas'
     list:
@@ -455,14 +449,7 @@ tag:
         untagged: 'Artículos sin etiquetas'
     new:
         add: 'Añadir'
-        placeholder: 'Puedes añadir varias etiquetas, separadas por una coma.'
-    rename:
-        placeholder: 'Puedes actualizar el nombre de la etiqueta.'
-
-export:
-    footer_template: '<div style="text-align:center;"><p>Producido por wallabag con %method%</p><p>Por favor abre <a href="https://github.com/wallabag/wallabag/issues">un ticket</a> si tienes algún problema con la visualización de este E-Book en tu dispositivo.</p></div>'
-    unknown: 'Desconocido'
-
+        placeholder: 'Puedes añadir varias etiquetas, separadas por comas.'
 import:
     page_title: 'Importar'
     page_description: 'Bienvenido a la herramienta de importación de wallabag. Seleccione el servicio desde el que desea migrar.'
@@ -470,7 +457,7 @@ import:
         import_contents: 'Importar los contenidos'
     form:
         mark_as_read_title: '¿Marcar todos como leídos?'
-        mark_as_read_label: 'Marcar todos artículos importados como leídos'
+        mark_as_read_label: 'Marcar todos los artículos importados como leídos'
         file_label: 'Archivo'
         save_label: 'Subir el archivo'
     pocket:
@@ -478,7 +465,7 @@ import:
         description: "Importa todos tus datos de Pocket. Pocket no nos permite descargar el contenido desde su servicio, de manera que el contenido de cada artículo será redescargado por wallabag."
         config_missing:
             description: "La importación de Pocket no está configurada."
-            admin_message: 'Debe definir %keyurls%una clave del API Pocket%keyurle%.'
+            admin_message: 'Debe definir %keyurls%una clave de consumidor en Pocket%keyurle%.'
             user_message: 'El administrador de su servidor debe definir una clave del API Pocket.'
         authorize_message: 'Puede importar sus datos desde su cuenta de Pocket. Sólo tiene que hacer clic el botón para autorizar que wallabag se conecte a getpocket.com.'
         connect_to_pocket: 'Conectarse a Pocket e importar los datos'
@@ -489,33 +476,29 @@ import:
     wallabag_v2:
         page_title: 'Importar > Wallabag v2'
         description: 'Importa todos tus artículos de wallabag v2. En la sección Todos los artículos, en la barra lateral, haga clic en "JSON". Obtendrás un archivo llamado "All articles.json".'
-    # elcurator:
-    #     page_title: 'Import > elCurator'
-    #     description: 'This importer will import all your elCurator articles. Go to your preferences in your elCurator account and then, export your content. You will have a JSON file.'
     readability:
         page_title: 'Importar > Readability'
-        description: 'Importa todos tus artículos de Readability. En la página de herramientas (https://www.readability.com/tools/), haga clic en "Exportar tus datos" en la sección "Exportar datos". Recibirás un correo electrónico para descargar un JSON (que no tiene extensión .json).'
+        description: 'Importa todos tus artículos de Readability. En la página de herramientas (https://www.readability.com/tools/), haga clic en «Exportar tus datos» en la sección «Exportar datos». Recibirás un correo electrónico para descargar un JSON (aunque no tiene extensión .json).'
         how_to: 'Seleccione el archivo exportado de Readability y haga clic en el botón para subirlo e importarlo.'
     worker:
-        enabled: "La importación se realiza de forma asíncrona. Una vez que la tarea de importación ha comenzado, un trabajador externo se encargará de los artículos uno a uno. El servicio actual es:"
-        download_images_warning: "Tienes activado descargar imágenes de los artículos. Esto junto con la importación clásica de artículos puede tardar mucho tiempo en ser procesado (o incluso fallar). <strong>Recomendamos encarecidamente</strong> habilitar la importación asíncrona para evitar errores."
+        enabled: "La importación se realiza de forma asíncrona. Una vez que la tarea de importación ha comenzado, un trabajador externo se encargará de procesar los artículos uno a uno. El servicio actual es:"
+        download_images_warning: "Tienes activado la descarga de imágenes de los artículos. Esto junto con la importación clásica de artículos puede tardar mucho tiempo en ser procesado (o incluso fallar). <strong>Recomendamos encarecidamente</strong> habilitar la importación asíncrona para evitar errores."
     firefox:
-       page_title: 'Importar > Firefox'
-       description: "Importa todos tus marcadores de Firefox. En la ventana de marcadores (Ctrl+Mayus+O), en \"Importar y respaldar\", elige \"Copiar...\". Obtendrás un archivo .json."
-       how_to: "Seleccione el archivo exportado de Firefox y haga clic en el botón para subirlo e importarlo. Tenga en cuenta que este proceso puede tardar ya que se tienen que descargar todos los artículos."
+        page_title: 'Importar > Firefox'
+        description: "Importa todos tus marcadores de Firefox. En la ventana de marcadores (Ctrl+Mayus+O), en \"Importar y respaldar\", elige \"Copiar…\". Obtendrás un archivo JSON."
+        how_to: "Seleccione el archivo exportado de Firefox y haga clic en el botón para importarlo. Tenga en cuenta que este proceso puede tardar ya que se tienen que descargar todos los artículos."
     chrome:
-       page_title: 'Importar > Chrome'
-       description: "Importa todos tus marcadores de Chrome. La ubicación del archivo depende de tu sistema operativo : <ul><li>En Linux, <code>~/.config/chromium/Default/</code></li><li>En Windows, <code>%LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default</code></li><li>En OS X, <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Una vez estés en ese directorio, copia el archivo de favoritos (bookmarks) en algún sitio fácil de encontrar.<em><br>Ten en cuenta que si utilizas Chromium en vez de Chrome, la ubicación del archivo cambia.</em></p>"
-       how_to: "Seleccione el archivo exportado de Chrome y haga clic en el botón para subirlo e importarlo. Tenga en cuenta que este proceso puede tardar ya que se tienen que descargar todos los artículos."
+        page_title: 'Importar > Chrome'
+        description: "Importa todos tus marcadores de Chrome. La ubicación del archivo depende de tu sistema operativo : <ul><li>En Linux, <code>~/.config/chromium/Default/</code></li><li>En Windows, <code>%LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default</code></li><li>En OS X, <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Una vez estés en ese directorio, copia el archivo <code>Bookmarks</code> (favoritos) en algún sitio fácil de encontrar.<em><br>Ten en cuenta que si utilizas Chromium en vez de Chrome, la ubicación del archivo es distinta.</em></p>"
+        how_to: "Seleccione el archivo exportado de Chrome y haga clic en el botón para importarlo. Tenga en cuenta que este proceso puede tardar ya que se tienen que descargar todos los artículos."
     instapaper:
         page_title: 'Importar > Instapaper'
         description: 'Importa todos tus artículos de Instapaper. En la página de preferencias (https://www.instapaper.com/user), haz clic en "Descargar archivo .CSV" en la sección "Exportar". Obtendrás un archivo CSV llamado "instapaper-export.csv".'
-        how_to: 'Seleccione el archivo exportado de Instapaper y haga clic en el botón para subirlo e importarlo.'
+        how_to: 'Seleccione el archivo exportado de Instapaper y haga clic en el botón para importarlo.'
     pinboard:
         page_title: "Importar > Pinboard"
         description: 'Importa todos tus artículos de Pinboard. En la página de backup (https://pinboard.in/settings/backup), haz clic en "JSON" en la sección "Marcadores". Obtendrás un archivo JSON llamado "pinboard_export".'
-        how_to: 'Seleccione el archivo exportado de Pinboard y haga clic en el botón para subirlo e importarlo.'
-
+        how_to: 'Seleccione el archivo exportado de Pinboard y haga clic en el botón para importarlo.'
 developer:
     page_title: 'Gestión de clientes API'
     welcome_message: 'Bienvenido al API de wallabag'
@@ -542,7 +525,7 @@ developer:
         page_description: 'Está a punto de crear un nuevo cliente. Por favor, rellene el campo de abajo con la URI de redirección de su aplicación.'
         form:
             name_label: 'Nombre del cliente'
-            redirect_uris_label: 'URIs de redirección'
+            redirect_uris_label: 'URIs de redirección (opcional)'
             save_label: 'Crear un nuevo cliente'
         action_back: 'Volver'
         copy_to_clipboard: 'Copiar'
@@ -560,16 +543,15 @@ developer:
             paragraph_1: 'Los siguientes comandos hacen uso de la <a href="https://github.com/jkbrzt/httpie">biblioteca HTTPie</a>. Comprueba que está instalada en tu sistema antes de usarla.'
             paragraph_2: 'Necesitas un token para establecer la comunicación entre una aplicación de terceros y la API de wallabag.'
             paragraph_3: 'Para crear este token, necesitas <a href="%link%">crear un nuevo cliente</a>.'
-            paragraph_4: 'Ahora crea tu token (reemplaza client_id, client_secret, username y password con los valores generados):'
-            paragraph_5: 'Este API devolverá una respuesta como esta:'
+            paragraph_4: 'Ahora crea tu token (reemplace client_id, client_secret, username y password con los valores generados):'
+            paragraph_5: 'El API devolverá una respuesta como esta:'
             paragraph_6: 'El access_token es útil para llamar a los métodos del API. Por ejemplo:'
             paragraph_7: 'Esta llamada devolverá todos los artículos de tu usuario.'
             paragraph_8: 'Si quieres ver todos los métodos del API, puedes verlos en <a href="%link%">nuestra documentación del API</a>.'
         back: 'Volver'
-
 user:
     page_title: Gestión de usuarios
-    new_user: Crear un usuario
+    new_user: Crear un nuevo usuario
     edit_user: Editar un usuario existente
     description: "Aquí puedes gestionar todos los usuarios (crear, editar y eliminar)"
     list:
@@ -577,7 +559,7 @@ user:
         edit_action: Editar
         yes: Sí
         no: No
-        create_new_one: Crear un usuario
+        create_new_one: Crear un nuevo usuario
     form:
         username_label: 'Nombre de usuario'
         name_label: 'Nombre'
@@ -593,38 +575,36 @@ user:
         delete: Eliminar
         delete_confirm: ¿Estás seguro?
         back_to_list: Volver a la lista
+        twofactor_label: Autenticación de dos factores
     search:
-        placeholder: 'Filtrar por nombre de usuario o correo electrónico'
-
+        placeholder: Filtrar por nombre de usuario o correo electrónico
 site_credential:
-    page_title: 'Gestión de credenciales del sitio'
-    new_site_credential: 'Crear una credencial'
-    edit_site_credential: 'Editar una credencial existente'
-    description: "Aquí puedes gestionar todas las credenciales para los sitios que las necesiten (crear, editar y borrar), como un paywall, una autenticación, etc."
-    list:
-         actions: 'Acciones'
-         edit_action: 'Editar'
-         yes: 'Sí'
-         no: 'No'
-         create_new_one: 'Crear una nueva credencial'
     form:
-         username_label: 'Nombre de usuario'
-         host_label: 'Host (subdominio.ejemplo.org, .ejemplo.org, etc.)'
-         password_label: 'Contraseña'
-         save: 'Guardar'
-         delete: 'Borrar'
-         delete_confirm: '¿Estás seguro?'
-         back_to_list: 'Volver a la lista'
-
+        back_to_list: Volver
+        delete_confirm: ¿Estás seguro?
+        delete: Eliminar
+        save: Guardar
+        password_label: Contraseña
+        host_label: Host
+        username_label: Nombre de usuario
+    list:
+        create_new_one: Crea una nueva credencial
+        no: No
+        yes: Sí
+        edit_action: Editar
+        actions: Acciones
+    description: Aquí puede administrar todas las credenciales de los sitios que la requieran (crear, editar y eliminar), como un muro de pago, una autenticación, etc.
+    edit_site_credential: Editar una credencial existente
+    new_site_credential: Crea una credencial
+    page_title: Gestión de credenciales del sitio
 error:
     page_title: Ha ocurrido un error
-
 flashes:
     config:
         notice:
             config_saved: 'Configuración guardada.'
             password_updated: 'Contraseña actualizada'
-            password_not_updated_demo: "En el modo demo, no puede cambiar la contraseña del usuario."
+            password_not_updated_demo: "En el modo demo, no puedes cambiar la contraseña del usuario."
             user_updated: 'Información actualizada'
             feed_updated: 'Configuración RSS actualizada'
             tagging_rules_updated: 'Regla de etiquetado actualizada'
@@ -634,13 +614,11 @@ flashes:
             annotations_reset: Anotaciones reiniciadas
             tags_reset: Etiquetas reiniciadas
             entries_reset: Artículos reiniciados
-            archived_reset: Artículos archivados borrados
-            otp_enabled: Autenticación de dos pasos activada
-            # otp_disabled: Two-factor authentication disabled
-            tagging_rules_imported: Reglas de etiquetado importadas
-            tagging_rules_not_imported: Un error se ha producico en la importación de las reglas de etiquetado
-            # ignore_origin_rules_deleted: 'Ignore origin rule deleted'
-            # ignore_origin_rules_updated: 'Ignore origin rule updated'
+            archived_reset: Artículos archivados eliminados
+            rss_token_updated: Token RSS actualizado
+            rss_updated: Información RSS actualizada
+            otp_disabled: Autenticación de doble factor deshabilitada
+            otp_enabled: Autenticación de doble factor habilitada
     entry:
         notice:
             entry_already_saved: 'Artículo ya guardado el %fecha%'
@@ -663,8 +641,8 @@ flashes:
         notice:
             failed: 'Importación fallida, por favor, inténtelo de nuevo.'
             failed_on_file: 'Ocurrió un error al procesar la importación. Por favor, verifique el archivo importado.'
-            summary: 'Resúmen de la importación: %imported% importados, %skipped% ya guardados.'
-            summary_with_queue: 'Resúmen de la importación: %queued% encolados.'
+            summary: 'Resumen de la importación: %imported% importados, %skipped% ya guardados.'
+            summary_with_queue: 'Resumen de la importación: %queued% encolados.'
         error:
             redis_enabled_not_installed: Redis está activado para gestionar la importación asíncrona pero parece que <u>no se puede conectar</u>. Por favor, comprueba la configuración de Redis.
             rabbit_enabled_not_installed: RabbitMQ está activado para gestionar la importación asíncrona pero parece que <u>no se puede conectar</u>. Por favor, comprueba la configuración de RabbitMQ.
@@ -679,11 +657,21 @@ flashes:
             deleted: 'El usuario "%username%" ha sido eliminado'
     site_credential:
         notice:
-             added: 'Credenciales del sitio añadidas para "%host%"'
-             updated: 'Credenciales del sitio actualizadas para "%host%"'
-             deleted: 'Credenciales del sitio eliminadas para "%host%"'
-    ignore_origin_instance_rule:
-        notice:
-            # added: 'Global ignore origin rule added'
-            # updated: 'Global ignore origin rule updated'
-            # deleted: 'Global ignore origin rule deleted'
+            deleted: Eliminada credencial del sitio para "%host%"
+            updated: Actualizada credencial del sitio para "%host%"
+            added: Añadida credencial del sitio para "%host%"
+export:
+    unknown: Desconocido
+    footer_template: <div style="text-align:center;"><p>Producido por wallabag con %method%</p><p>Por favor, abre <a href="https://github.com/wallabag/wallabag/issues">un issue</a> si tiene problemas con la visualización de este libro electrónico en su dispositivo.</p></div>
+ignore_origin_instance_rule:
+    form:
+        back_to_list: Volver a la lista
+        delete_confirm: ¿Estás seguro?
+        delete: Eliminar
+        save: Guardar
+        rule_label: Regla
+    list:
+        no: No
+        yes: Sí
+        edit_action: Editar
+        actions: Acciones

src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml

@@ -1,689 +1,349 @@
 security:
     login:
-        page_title: 'به wallabag خوش آمدید!'
-        keep_logged_in: 'مرا به خاطر بسپار'
-        forgot_password: ' رمزتان را گم کرده‌اید؟'
-        submit: 'ورود'
-        register: 'نام‌نویسی'
-        username: 'نام کاربری'
-        password: 'رمز'
-        cancel: 'لغو'
+        page_title: به wallabag خوش آمدید!
+        keep_logged_in: مرا به خاطر بسپار
+        forgot_password: رمزتان را گم کرده‌اید؟
+        submit: ورود
+        register: نام‌نویسی
+        username: نام کاربری
+        password: رمز
+        cancel: لغو
     resetting:
-        description: "نشانی ایمیل خود را بنویسید تا راهنمای تغییر رمز را برایتان بفرستیم."
+        description: نشانی ایمیل خود را بنویسید تا راهنمای تغییر رمز را برایتان بفرستیم.
     register:
-        page_title: 'حساب بسازید'
-        go_to_account: 'حساب خود را ببینید'
-
+        page_title: حساب بسازید
+        go_to_account: حساب خود را ببینید
 menu:
     left:
-        unread: 'خوانده‌نشده'
-        starred: 'برگزیده'
-        archive: 'بایگانی'
-        all_articles: 'همه'
-        config: 'پیکربندی'
-        tags: 'برچسب‌ها'
-        internal_settings: 'تنظیمات درونی'
-        import: 'درون‌ریزی'
-        howto: 'خودآموز'
-        # developer: 'API clients management'
-        logout: 'خروج'
-        about: 'درباره'
-        search: 'جستجو'
-        save_link: 'ذخیرهٔ یک پیوند'
-        back_to_unread: 'بازگشت به خوانده‌نشده‌ها'
-        # users_management: 'Users management'
-        # site_credentials: 'Site credentials'
-        # ignore_origin_instance_rules: 'Global ignore origin rules'
-        quickstart: "Quickstart"
+        unread: خوانده‌نشده
+        starred: برگزیده
+        archive: بایگانی
+        all_articles: همه
+        config: پیکربندی
+        tags: برچسب‌ها
+        internal_settings: تنظیمات درونی
+        import: درون‌ریزی
+        howto: خودآموز
+        logout: خروج
+        about: درباره
+        search: جستجو
+        save_link: ذخیرهٔ یک پیوند
+        back_to_unread: بازگشت به خوانده‌نشده‌ها
+        site_credentials: اعتبارنامه‌های وب‌گاه
+        users_management: مدیریت کاربران
+        developer: مدیریت کارخواه‌های API
     top:
-        add_new_entry: 'افزودن مقالهٔ تازه'
-        search: 'جستجو'
-        filter_entries: 'فیلترکردن مقاله‌ها'
-        # random_entry: Jump to a random entry from that list
-        export: 'برون‌بری'
-        # account: 'My account'
+        add_new_entry: افزودن مقالهٔ تازه
+        search: جستجو
+        filter_entries: فیلترکردن مقاله‌ها
+        export: برون‌بری
     search_form:
-        input_label: 'جستجوی خود را این‌جا بنویسید:'
-
+        input_label: 'جستجوی خود را این‌جا بنویسید'
 footer:
     wallabag:
-        elsewhere: 'wallabag همراه شما'
-        social: 'شبکه‌های اجتماعی'
-        powered_by: 'توانمند با'
-        about: 'درباره'
-    # stats: Since %user_creation% you read %nb_archives% articles. That is about %per_day% a day!
-
+        elsewhere: wallabag همراه شما
+        social: شبکه‌های اجتماعی
+        powered_by: توانمند با
+        about: درباره
+    stats: از %user_creation% تا کنون %nb_archives% مقاله خوانده‌اید. می‌شود تقریبا %per_day% مقاله در روز!
 config:
-    page_title: 'پیکربندی'
+    page_title: پیکربندی
     tab_menu:
-        settings: 'تنظیمات'
-        feed: 'آر-اس-اس'
-        user_info: 'اطلاعات کاربر'
-        password: 'رمز'
-        rules: 'برچسب‌گذاری خودکار'
-        # ignore_origin: 'Ignore origin rules'
-        new_user: 'افزودن کاربر'
-        # reset: 'Reset area'
+        settings: تنظیمات
+        rss: آر-اس-اس
+        user_info: اطلاعات کاربر
+        password: رمز
+        rules: برچسب‌گذاری خودکار
+        new_user: افزودن کاربر
     form:
-        save: 'ذخیره'
+        save: ذخیره
     form_settings:
-        theme_label: 'پوسته'
-        items_per_page_label: 'تعداد مقاله در هر صفحه'
-        language_label: 'زبان'
+        theme_label: پوسته
+        items_per_page_label: تعداد مقاله در هر صفحه
+        language_label: زبان
         reading_speed:
-            # label: 'Reading speed (words per minute)'
+            label: سرعت خواندن
             help_message: 'سرعت خواندن‌تان را با ابزارهای آنلاین تخمین بزنید:'
-        action_mark_as_read:
-            # label: 'Where do you want to be redirected to after marking an article as read?'
-            # redirect_homepage: 'To the homepage'
-            # redirect_current_page: 'To the current page'
+            100_word: من تقریباً ۱۰۰ واژه را در دقیقه می‌خوانم
+            200_word: من تقریباً ۲۰۰ واژه را در دقیقه می‌خوانم
+            300_word: من تقریباً ۳۰۰ واژه را در دقیقه می‌خوانم
+            400_word: من تقریباً ۴۰۰ واژه را در دقیقه می‌خوانم
         pocket_consumer_key_label: کلید کاربری Pocket برای درون‌ریزی مطالب
-        # android_configuration: Configure your Android application
-        # help_theme: "wallabag is customizable. You can choose your prefered theme here."
-        # android_instruction: "Touch here to prefill your Android application"
-        # help_items_per_page: "You can change the number of articles displayed on each page."
-        # 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."
-        # help_language: "You can change the language of wallabag interface."
-        # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
-    form_feed:
-        description: 'با خوراک آر-اس-اس که wallabag در اختیارتان می‌گذارد، می‌توانید مقاله‌های ذخیره‌شده را در نرم‌افزار آر-اس-اس دلخواه خود بخوانید. برای این کار نخست باید یک کد بسازید.'
-        token_label: 'کد آر-اس-اس'
-        no_token: 'بدون کد'
-        token_create: 'کد خود را بسازید'
-        token_reset: 'بازنشانی کد'
-        # token_revoke: 'Revoke the token'
-        feed_links: 'پیوند آر-اس-اس'
-        feed_link:
-            unread: 'خوانده‌نشده'
-            starred: 'برگزیده'
-            archive: 'بایگانی'
-            # all: 'All'
-        feed_limit: 'محدودیت آر-اس-اس'
+        android_configuration: پیکربندی برنامه اندرویدتان
+        action_mark_as_read:
+            redirect_homepage: رفتن به صفحه اصلی
+            redirect_current_page: ماندن در صفحه جاری
+            label: پس از حذف یا ستاره زدن یک مقاله یا علامت زدن به عنوان خوانده شده چه اتفاقی رخ دهد؟
+    form_rss:
+        description: با خوراک آر-اس-اس که wallabag در اختیارتان می‌گذارد، می‌توانید مقاله‌های ذخیره‌شده را در نرم‌افزار آر-اس-اس دلخواه خود بخوانید. برای این کار نخست باید یک کد بسازید.
+        token_label: کد آر-اس-اس
+        no_token: بدون کد
+        token_create: کد خود را بسازید
+        token_reset: بازنشانی کد
+        rss_links: پیوند آر-اس-اس
+        rss_link:
+            unread: خوانده‌نشده
+            starred: برگزیده
+            archive: بایگانی
+        rss_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: 'نشانی ایمیل'
-        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
-            # table_state: State
-            # table_action: Action
-            # state_enabled: Enabled
-            # state_disabled: Disabled
-            # action_email: Use email
-            # action_app: Use OTP App
-        delete:
-            # title: Delete my account (a.k.a danger zone)
-            # 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.
-            # confirm: Are you really sure? (THIS CAN'T BE UNDONE)
-            # button: Delete my account
-    reset:
-        # title: Reset area (a.k.a danger zone)
-        # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE.
-        # annotations: Remove ALL annotations
-        # tags: Remove ALL tags
-        # entries: Remove ALL entries
-        # archived: Remove ALL archived entries
-        # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
+        two_factor_description: با فعال‌کردن تأیید ۲مرحله‌ای هر بار که اتصال تأییدنشده‌ای برقرار شد، به شما یک کد از راه ایمیل فرستاده می‌شود.
+        name_label: نام
+        email_label: نشانی ایمیل
+        twoFactorAuthentication_label: تأیید ۲مرحله‌ای
     form_password:
-        # description: "You can change your password here. Your new password should by at least 8 characters long."
-        old_password_label: 'رمز قدیمی'
-        new_password_label: 'رمز تازه'
-        repeat_new_password_label: 'رمز تازه را دوباره بنویسید'
+        old_password_label: رمز قدیمی
+        new_password_label: رمز تازه
+        repeat_new_password_label: رمز تازه را دوباره بنویسید
     form_rules:
-        if_label: 'اگر'
-        then_tag_as_label: 'این برچسب را بزن'
-        delete_rule_label: 'پاک کن'
-        # 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
+        if_label: اگر
+        then_tag_as_label: این برچسب را بزن
+        delete_rule_label: پاک کن
+        rule_label: قانون
+        tags_label: برچسب‌ها
         faq:
-            title: 'پرسش‌های متداول'
-            tagging_rules_definition_title: 'برچسب‌گذاری خودکار یعنی چه؟'
-        #     tagging_rules_definition_description: 'They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.'
-        #     how_to_use_them_title: 'How do I use them?'
-        #     how_to_use_them_description: 'Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »'
-        #     variables_available_title: 'Which variables and operators can I use to write rules?'
-        #     variables_available_description: 'The following variables and operators can be used to create tagging rules:'
-        #     meaning: 'Meaning'
-        #     variable_description:
-        #         label: 'Variable'
-        #         title: 'Title of the entry'
-        #         url: 'URL of the entry'
-        #         isArchived: 'Whether the entry is archived or not'
-        #         isStarred: 'Whether the entry is starred or not'
-        #         content: "The entry's content"
-        #         language: "The entry's language"
-        #         mimetype: "The entry's mime-type"
-        #         readingTime: "The estimated entry's reading time, in minutes"
-        #         domainName: 'The domain name of the entry'
-        #     operator_description:
-        #         label: 'Operator'
-        #         less_than: 'Less than...'
-        #         strictly_less_than: 'Strictly less than...'
-        #         greater_than: 'Greater than...'
-        #         strictly_greater_than: 'Strictly greater than...'
-        #         equal_to: 'Equal to...'
-        #         not_equal_to: 'Not equal to...'
-        #         or: 'One rule OR another'
-        #         and: 'One rule AND another'
-        #         matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</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>'
-    form_ignore_origin_rules:
-        # faq:
-        #     title: 'FAQ'
-        #     ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?'
-        #     ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.<br />If a redirect occurs while fetching a new entry, all the ignore origin rules (<i>user defined and instance defined</i>) will be used to ignore the origin address.'
-        #     how_to_use_them_title: 'How do I use them?'
-        #     how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « <i>rss.example.com</i> » (<i>knowing that after a redirect, the actual address is example.com</i>).<br />In that case, you should put « host = "rss.example.com" » in the <i>Rule</i> field.'
-        #     variables_available_title: 'Which variables and operators can I use to write rules?'
-        #     variables_available_description: 'The following variables and operators can be used to create ignore origin rules:'
-        #     meaning: 'Meaning'
-        #     variable_description:
-        #         label: 'Variable'
-        #         host: 'Host of the address'
-        #         _all: 'Full address, mainly for pattern matching'
-        #     operator_description:
-        #         label: 'Operator'
-        #         equal_to: 'Equal to…'
-        #         matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>_all ~ "https?://rss.example.com/foobar/.*"</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
-
+            title: پرسش‌های متداول
+            tagging_rules_definition_title: برچسب‌گذاری خودکار یعنی چه؟
 entry:
-    # default_title: 'Title of the entry'
     page_titles:
-        unread: 'مقاله‌های خوانده‌نشده'
-        starred: 'مقاله‌های برگزیده'
-        archived: 'مقاله‌های بایگانی‌شده'
-        filtered: 'مقاله‌های فیلترشده'
-        # filtered_tags: 'Filtered by tags:'
-        # filtered_search: 'Filtered by search:'
-        # untagged: 'Untagged entries'
-        # all: 'All entries'
+        unread: مقاله‌های خوانده‌نشده
+        starred: مقاله‌های برگزیده
+        archived: مقاله‌های بایگانی‌شده
+        filtered: مقاله‌های فیلترشده
     list:
         number_on_the_page: '{0} هیج مقاله‌ای نیست.|{1} یک مقاله هست.|]1,Inf[ %count% مقاله هست.'
-        reading_time: 'زمان تخمینی برای خواندن'
+        reading_time: زمان تخمینی برای خواندن
         reading_time_minutes: 'زمان تخمینی برای خواندن: %readingTime% min'
         reading_time_less_one_minute: 'زمان تخمینی برای خواندن: &lt; 1 min'
-        # number_of_tags: '{1}and one other tag|]1,Inf[and %count% other tags'
         reading_time_minutes_short: '%readingTime% min'
         reading_time_less_one_minute_short: '&lt; 1 min'
-        original_article: 'original'
-        toogle_as_read: 'خوانده‌شده/خوانده‌نشده'
-        toogle_as_star: 'برگزیده/نابرگزیده'
-        delete: 'پاک کردن'
-        export_title: 'برون‌بری'
+        original_article: original
+        toogle_as_read: خوانده‌شده/خوانده‌نشده
+        toogle_as_star: برگزیده/نابرگزیده
+        delete: پاک کردن
+        export_title: برون‌بری
     filters:
-        title: 'فیلتر'
-        status_label: 'وضعیت'
-        archived_label: 'بایگانی‌شده'
-        starred_label: 'برگزیده'
-        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 status'
+        title: فیلتر
+        status_label: وضعیت
+        archived_label: بایگانی‌شده
+        starred_label: برگزیده
+        unread_label: خوانده‌نشده
+        preview_picture_label: دارای عکس پیش‌نمایش
+        preview_picture_help: پیش‌نمایش عکس
+        language_label: زبان
         reading_time:
-            label: 'زمان خواندن به دقیقه'
-            from: 'از'
-            to: 'تا'
-        domain_label: 'نام دامنه'
+            label: زمان خواندن به دقیقه
+            from: از
+            to: تا
+        domain_label: نام دامنه
         created_at:
-            label: 'زمان ساخت'
-            from: 'از'
-            to: 'تا'
+            label: زمان ساخت
+            from: از
+            to: تا
         action:
-            clear: 'از نو'
-            filter: 'فیلتر'
+            clear: از نو
+            filter: فیلتر
     view:
         left_menu:
-            back_to_top: 'بازگشت به بالای صفحه'
-            back_to_homepage: 'بازگشت'
-            set_as_read: 'خوانده‌شده'
-            set_as_unread: 'به عنوان خوانده‌نشده علامت بزن'
-            set_as_starred: 'برگزیده'
-            view_original_article: 'مقالهٔ اصلی'
-            re_fetch_content: 'مقاله‌ها را دوباره دریافت کن'
-            delete: 'پاک کردن'
-            add_a_tag: 'افزودن برچسب'
-            share_content: 'هم‌رسانی'
-            share_email_label: 'نشانی ایمیل'
-            # public_link: 'public link'
-            # delete_public_link: 'delete public link'
-            export: 'بارگیری'
-            print: 'چاپ'
+            back_to_top: بازگشت به بالای صفحه
+            back_to_homepage: بازگشت
+            set_as_read: خوانده‌شده
+            set_as_unread: به عنوان خوانده‌نشده علامت بزن
+            set_as_starred: برگزیده
+            view_original_article: مقالهٔ اصلی
+            re_fetch_content: مقاله‌ها را دوباره دریافت کن
+            delete: پاک کردن
+            add_a_tag: افزودن برچسب
+            share_content: هم‌رسانی
+            share_email_label: نشانی ایمیل
+            export: بارگیری
+            print: چاپ
             problem:
-                label: 'مشکلات؟'
-                description: 'آیا مقاله نادرست نشان داده شده؟'
-        edit_title: 'ویرایش عنوان'
-        original_article: 'اصلی'
+                label: مشکلات؟
+                description: آیا مقاله نادرست نشان داده شده؟
+        edit_title: ویرایش عنوان
+        original_article: اصلی
         annotations_on_the_entry: '{0} بدون حاشیه|{1} یک حاشیه|]1,Inf[ %nbحاشیه% annotations'
-        created_at: 'زمان ساخت'
-        # published_at: 'Publication date'
-        # published_by: 'Published by'
-        # provided_by: 'Provided by'
+        created_at: زمان ساخت
     new:
-        page_title: 'ذخیرهٔ مقالهٔ تازه'
-        placeholder: 'https://website.ir'
+        page_title: ذخیرهٔ مقالهٔ تازه
+        placeholder: http://website.com
         form_new:
             url_label: نشانی
-    search:
-        # placeholder: 'What are you looking for?'
     edit:
-        page_title: 'ویرایش مقاله'
-        title_label: 'عنوان'
-        url_label: 'نشانی'
-        # origin_url_label: 'Origin url (from where you found that entry)'
-        save_label: 'ذخیره'
-    public:
-        # shared_by_wallabag: "This article has been shared by %username% with <a href='%wallabag_instance%'>wallabag</a>"
-    confirm:
-        # delete: "Are you sure you want to remove that article?"
-        # delete_entries: "Are you sure you want to remove those articles?"
-        # 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"
-        # address: "Address"
-        # added_on: "Added on"
-        # published_on: "Published on"
-
+        page_title: ویرایش مقاله
+        title_label: عنوان
+        url_label: نشانی
+        save_label: ذخیره
 about:
-    page_title: 'درباره'
+    page_title: درباره
     top_menu:
-        who_behind_wallabag: 'سازندگان wallabag'
-        getting_help: 'گرفتن کمک'
-        helping: 'کمک‌کردن به wallabag'
-        contributors: 'مشارکت‌کنندگان'
-        third_party: 'کتابخانه‌های نرم‌افزاری'
+        who_behind_wallabag: سازندگان wallabag
+        getting_help: گرفتن کمک
+        helping: کمک‌کردن به wallabag
+        contributors: مشارکت‌کنندگان
+        third_party: کتابخانه‌های نرم‌افزاری
     who_behind_wallabag:
-        developped_by: 'ساختهٔ'
-        website: 'وب‌گاه'
-        many_contributors: 'و بسیاری دیگر از مشارکت‌کنندگان ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">روی Github</a>'
-        project_website: 'وب‌گاه پروژه'
-        license: 'پروانه'
-        version: 'نسخه'
+        developped_by: ساختهٔ
+        website: وب‌گاه
+        many_contributors: و بسیاری دیگر از مشارکت‌کنندگان ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">روی Github</a>
+        project_website: وب‌گاه پروژه
+        license: پروانه
+        version: نسخه
     getting_help:
-        documentation: 'راهنما'
-        bug_reports: 'گزارش اشکال‌ها'
-        support: '<a href="https://github.com/wallabag/wallabag/issues">روی GitHub</a>'
+        documentation: راهنما
+        bug_reports: گزارش اشکال‌ها
+        support: <a href="https://github.com/wallabag/wallabag/issues">روی GitHub</a>
     helping:
         description: 'wallabag رایگان، آزاد، و متن‌باز است. شما می‌توانید به ما کمک کنید:'
         by_contributing: 'با مشارکت در پروژه:'
-        by_contributing_2: 'فهرست نیازمندی‌های ما در این صفحه است:'
-        by_paypal: 'از راه Paypal'
+        by_contributing_2: 'فهرست نیازمندی‌های ما در این صفحه است'
+        by_paypal: از راه Paypal
     contributors:
-        description: 'از مشارکت شما در برنامهٔ وب wallabag ممنونیم.'
+        description: از مشارکت شما در برنامهٔ وب wallabag ممنونیم
     third_party:
         description: 'فهرست کتابخانه‌های نرم‌افزاری که در wallabag به کار رفته‌اند (به همراه پروانهٔ آن‌ها) :'
-        package: 'بسته'
-        license: 'پروانه'
-
+        package: بسته
+        license: پروانه
 howto:
-    page_title: 'خودآموز'
+    page_title: خودآموز
     page_description: 'راه‌های زیادی برای ذخیرهٔ مقاله‌ها هست:'
-    tab_menu:
-        # add_link: "Add a link"
-        # shortcuts: "Use shortcuts"
     top_menu:
-        browser_addons: 'افزونه برای مرورگرها'
-        mobile_apps: 'برنامه‌های موبایل'
-        bookmarklet: 'ابزار علامت‌گذاری صفحه‌ها'
+        browser_addons: افزونه برای مرورگرها
+        mobile_apps: برنامه‌های موبایل
+        bookmarklet: ابزار علامت‌گذاری صفحه‌ها
     form:
-        description: 'به کمک این فرم'
+        description: به کمک این فرم
     browser_addons:
-        firefox: 'افزونهٔ فایرفاکس'
-        chrome: 'افزونهٔ کروم'
-        # opera: 'Opera addon'
+        firefox: افزونهٔ فایرفاکس
+        chrome: افزونهٔ کروم
     mobile_apps:
         android:
-            via_f_droid: 'از راه F-Droid'
-            via_google_play: 'از راه Google Play'
-        ios: 'از راه iTunes Store'
-        windows: 'از راه Microsoft Store'
+            via_f_droid: از راه F-Droid
+            via_google_play: از راه Google Play
+        ios: از راه iTunes Store
+        windows: از راه Microsoft Store
     bookmarklet:
         description: 'این پیوند را به نوار بوک‌مارک مرورگرتان بکشید:'
-    shortcuts:
-        # page_description: Here are the shortcuts available in wallabag.
-        # shortcut: Shortcut
-        # action: Action
-        # all_pages_title: Shortcuts available in all pages
-        # go_unread: Go to unread
-        # go_starred: Go to starred
-        # go_archive: Go to archive
-        # go_all: Go to all entries
-        # go_tags: Go to tags
-        # go_config: Go to config
-        # go_import: Go to import
-        # go_developers: Go to developers
-        # go_howto: Go to howto (this page!)
-        # go_logout: Logout
-        # list_title: Shortcuts available in listing pages
-        # search: Display the search form
-        # article_title: Shortcuts available in entry view
-        # open_original: Open original URL of the entry
-        # toggle_favorite: Toggle star status for the entry
-        # toggle_archive: Toggle read status for the entry
-        # delete: Delete the entry
-        # material_title: Shortcuts available with Material theme only
-        # add_link: Add a new link
-        # hide_form: Hide the current form (search or new link)
-        # arrows_navigation: Navigate through articles
-        # open_article: Display the selected entry
-
 quickstart:
-    page_title: 'Quickstart'
-    # more: 'More…'
+    page_title: ''
     intro:
-        title: 'به wallabag خوش آمدید!!'
-        paragraph_1: "به شما کمک خواهیم کرد تا wallabag را بشناسید و با برخی از ویژگی‌های جالبش آشنا شوید"
-        paragraph_2: 'ادامه دهید!'
+        title: به wallabag خوش آمدید!!
+        paragraph_1: به شما کمک خواهیم کرد تا wallabag را بشناسید و با برخی از ویژگی‌های جالبش آشنا شوید.
+        paragraph_2: ادامه دهید!
     configure:
-        title: 'برنامه را تنظیم کنید'
-        # description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'
-        language: 'زبان و نمای برنامه را تغییر دهید'
-        feed: 'خوراک آر-اس-اس را فعال کنید'
-        tagging_rules: 'قانون‌های برچسب‌گذاری خودکار مقاله‌هایتان را تعریف کنید'
+        title: برنامه را تنظیم کنید
+        language: زبان و نمای برنامه را تغییر دهید
+        rss: خوراک آر-اس-اس را فعال کنید
+        tagging_rules: قانون‌های برچسب‌گذاری خودکار مقاله‌هایتان را تعریف کنید
     admin:
-        title: 'مدیریت'
+        title: مدیریت
         description: 'به عنوان مدیر، شما دسترسی‌های بیشتری به wallabag دارید. شما می‌توانید:'
-        new_user: 'کاربر تازه‌ای بسازید'
-        analytics: 'تحلیل‌های آماری را تنظیم کنید'
-        sharing: 'گزینه‌های مربوط به هم‌رسانی مقاله‌ها را فعال کنید'
-        export: 'برون‌سپاری را تنظیم کنید'
-        import: 'درون‌ریزی را تنظیم کنید'
+        new_user: کاربر تازه‌ای بسازید
+        analytics: تحلیل‌های آماری را تنظیم کنید
+        sharing: گزینه‌های مربوط به هم‌رسانی مقاله‌ها را فعال کنید
+        export: برون‌سپاری را تنظیم کنید
+        import: درون‌ریزی را تنظیم کنید
     first_steps:
-        title: 'گام نخست'
-        # 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."
-        new_article: 'نخستین مقالهٔ خود را ذخیره کنید'
-        unread_articles: 'و آن را طبقه‌بندی کنید!'
+        title: گام نخست
+        new_article: نخستین مقالهٔ خود را ذخیره کنید
+        unread_articles: و آن را طبقه‌بندی کنید!
     migrate:
-        title: 'از سرویس قبلی خود به این‌جا مهاجرت کنید'
-        description: "آیا سرویس دیگری را به‌کار می‌برید؟ داده‌هایتان را به wallabag بیاورید.."
-        pocket: 'مهاجرت از Pocket'
-        wallabag_v1: 'مهاجرت از نسخهٔ یکم wallabag'
-        wallabag_v2: 'مهاجرت از نسخهٔ دوم wallabag'
-        readability: 'مهاجرت از نسخهٔ دوم Readability'
-        instapaper: 'مهاجرت از نسخهٔ دوم Instapaper'
+        title: از سرویس قبلی خود به این‌جا مهاجرت کنید
+        description: آیا سرویس دیگری را به‌کار می‌برید؟ داده‌هایتان را به wallabag بیاورید..
+        pocket: مهاجرت از Pocket
+        wallabag_v1: مهاجرت از نسخهٔ یکم wallabag
+        wallabag_v2: مهاجرت از نسخهٔ دوم wallabag
+        readability: مهاجرت از نسخهٔ دوم Readability
+        instapaper: مهاجرت از نسخهٔ دوم Instapaper
     developer:
-        title: 'برنامه‌نویسان'
-        # description: 'We also thought to the developers: Docker, API, translations, etc.'
-        create_application: 'برنامهٔ wallabag خود را بسازید'
-        # use_docker: 'Use Docker to install wallabag'
+        title: برنامه‌نویسان
+        create_application: برنامهٔ wallabag خود را بسازید
     docs:
-        title: 'راهنمای کامل'
-        # 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."
-        annotate: 'روی مقاله‌هایتان یادداشت بگذارید'
-        export: 'مقاله‌هایتان را به قالب ePUB یا PDF دربیاورید'
-        search_filters: 'به کمک موتور جستجو و فیلترها به دنبال مقاله‌هایتان بگردید'
-        fetching_errors: 'اگر مقاله‌ای هنگام ذخیره‌ شدن به مشکل برخورد چه کار کنید؟'
-        all_docs: 'و بسیاری از موضوعات دیگر'
+        title: راهنمای کامل
+        annotate: روی مقاله‌هایتان یادداشت بگذارید
+        export: مقاله‌هایتان را به قالب ePUB یا PDF دربیاورید
+        search_filters: به کمک موتور جستجو و فیلترها به دنبال مقاله‌هایتان بگردید
+        fetching_errors: اگر مقاله‌ای هنگام ذخیره‌ شدن به مشکل برخورد چه کار کنید؟
+        all_docs: و بسیاری از موضوعات دیگر!
     support:
-        title: 'پشتیبانی'
-        description: 'به کمک نیاز دارید؟ ما پشتیبان شما هستیم!'
-        github: 'روی گیت‌هاب'
-        email: 'با ایمیل'
-        gitter: 'روی گیتر'
-
+        title: پشتیبانی
+        description: به کمک نیاز دارید؟ ما پشتیبان شما هستیم.
+        github: روی گیت‌هاب
+        email: با ایمیل
+        gitter: روی گیتر
 tag:
-    page_title: 'برچسب‌ها'
+    page_title: برچسب‌ها
     list:
         number_on_the_page: '{0} هیچ برچسبی نیست.|{1} یک برچسب هست.|]1,Inf[ %count% برچسب هست.'
-        # see_untagged_entries: 'See untagged entries'
-        # no_untagged_entries: 'There are no untagged entries.'
-        # untagged: 'Untagged entries'
-    new:
-        # add: 'Add'
-        # placeholder: 'You can add several tags, separated by a comma.'
-    rename:
-        # placeholder: 'You can update tag name.'
-
-# 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>'
-#     unknown: 'Unknown'
-
 import:
-    page_title: 'درون‌ریزی'
-    page_description: 'به درون‌ریز wallabag خوش آمدید. لطفاً سرویس قبلی خود را که می‌خواهید از آن مهاجرت کنید انتخاب کنید.'
+    page_title: درون‌ریزی
+    page_description: به درون‌ریز wallabag خوش آمدید. لطفاً سرویس قبلی خود را که می‌خواهید از آن مهاجرت کنید انتخاب کنید.
     action:
-        import_contents: 'درون‌ریزی مقاله‌ها'
+        import_contents: درون‌ریزی مقاله‌ها
     form:
-        mark_as_read_title: 'علامت‌زدن همه به عنوان خوانده‌شده؟'
-        mark_as_read_label: 'همهٔ مقاله‌های درون‌ریزی شده را به عنوان خوانده‌شده علامت بزن'
-        file_label: 'پرونده'
-        save_label: 'بارگذاری پرونده'
+        mark_as_read_title: علامت‌زدن همه به عنوان خوانده‌شده؟
+        mark_as_read_label: همهٔ مقاله‌های درون‌ریزی شده را به عنوان خوانده‌شده علامت بزن
+        file_label: پرونده
+        save_label: بارگذاری پرونده
     pocket:
-        page_title: 'درون‌ریزی > Pocket'
-        description: "این برنامه همهٔ داده‌های Pocket شما را درون‌ریزی می‌کند. سرویس Pocket اجازه نمی‌دهد که متن مقاله‌ها را درون‌ریزی کنیم، بنابراین wallabag متن مقاله‌ها را دوباره از اینترنت دریافت می‌کند."
+        page_title: درون‌ریزی > Pocket
+        description: این برنامه همهٔ داده‌های Pocket شما را درون‌ریزی می‌کند. سرویس Pocket اجازه نمی‌دهد که متن مقاله‌ها را درون‌ریزی کنیم، بنابراین wallabag متن مقاله‌ها را دوباره از اینترنت دریافت می‌کند.
         config_missing:
-           description: "درون‌ریزی از Pocket تنظیم نشده است."
-           admin_message: 'شما باید %keyurls%یک pocket_consumer_key%keyurle% تعریف کنید.'
-           user_message: 'مدیر سرور شما باید یک API Key برای Pocket تعریف کند.'
-        authorize_message: 'شما می‌توانید داده‌هایتان را از حساب Pocket خود درون‌ریزی کنید. روی دکمهٔ زیر کلیک کنید و به برنامه اجازه دهید تا به getpocket.com وصل شود.'
-        connect_to_pocket: 'به Pocket وصل شو و داده‌ها را دریافت کن'
+            description: درون‌ریزی از Pocket تنظیم نشده است.
+            admin_message: شما باید %keyurls%یک pocket_consumer_key%keyurle% تعریف کنید.
+            user_message: مدیر سرور شما باید یک API Key برای Pocket تعریف کند.
+        authorize_message: شما می‌توانید داده‌هایتان را از حساب Pocket خود درون‌ریزی کنید. روی دکمهٔ زیر کلیک کنید و به برنامه اجازه دهید تا به getpocket.com وصل شود.
+        connect_to_pocket: به Pocket وصل شو و داده‌ها را دریافت کن
     wallabag_v1:
-        page_title: 'درون‌ریزی > Wallabag v1'
-        description: 'این برنامه همهٔ داده‌های شما را در نسخهٔ ۱ wallabag درون‌ریزی می‌کند. در صفحهٔ تنظیمات، روی "JSON export" در بخش "Export your wallabag data" کلیک کنید. با این کار شما پرونده‌ای به شکل "wallabag-export-1-xxxx-xx-xx.json" دریافت خواهید کرد.'
-        how_to: 'لطفاً پرونده را انتخاب کنید و روی دکمهٔ زیر کلیک کنید تا بارگذاری و درون‌ریزی شود.'
+        page_title: درون‌ریزی > Wallabag v1
+        description: این برنامه همهٔ داده‌های شما را در نسخهٔ ۱ wallabag درون‌ریزی می‌کند. در صفحهٔ تنظیمات، روی "JSON export" در بخش "Export your wallabag data" کلیک کنید. با این کار شما پرونده‌ای به شکل "wallabag-export-1-xxxx-xx-xx.json" دریافت خواهید کرد.
+        how_to: لطفاً پرونده را انتخاب کنید و روی دکمهٔ زیر کلیک کنید تا بارگذاری و درون‌ریزی شود.
     wallabag_v2:
-        page_title: 'درون‌ریزی > Wallabag v2'
-        description: 'این برنامه همهٔ داده‌های شما را در نسخهٔ ۲ wallabag درون‌ریزی می‌کند. به بخش «همهٔ مقاله‌ها» بروید و در بخش «برون‌ریزی» روی "JSON" کلیک کنید. با این کار شما پرونده‌ای به شکل "All articles.json" دریافت خواهید کرد.'
-    # elcurator:
-    #     page_title: 'Import > elCurator'
-    #     description: 'This importer will import all your elCurator articles. Go to your preferences in your elCurator account and then, export your content. You will have a JSON file.'
+        page_title: درون‌ریزی > Wallabag v2
+        description: این برنامه همهٔ داده‌های شما را در نسخهٔ ۲ wallabag درون‌ریزی می‌کند. به بخش «همهٔ مقاله‌ها» بروید و در بخش «برون‌ریزی» روی "JSON" کلیک کنید. با این کار شما پرونده‌ای به شکل "All articles.json" دریافت خواهید کرد.
     readability:
-        page_title: 'درون‌ریزی > Readability'
-        # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).'
-        # how_to: 'Please select your Readability export and click on the below button to upload and import it.'
-    worker:
-        # 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:"
-        # 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."
+        page_title: درون‌ریزی > Readability
     firefox:
-       page_title: 'درون‌ریزی > Firefox'
-       # 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."
-       # how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+        page_title: درون‌ریزی > Firefox
     chrome:
-       page_title: 'درون‌ریزی > Chrome'
-       # description: "This importer will import all your Chrome bookmarks. The location of the file depends on your operating system : <ul><li>On Linux, go into the <code>~/.config/chromium/Default/</code> directory</li><li>On Windows, it should be at <code>%LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default</code></li><li>On OS X, it should be at <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Once you got there, copy the Bookmarks file someplace you'll find.<em><br>Note that if you have Chromium instead of Chrome, you'll have to correct paths accordingly.</em></p>"
-       # how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
+        page_title: درون‌ریزی > Chrome
     instapaper:
-        page_title: 'درون‌ریزی > Instapaper'
-        # 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").'
-        # how_to: 'Please select your Instapaper export and click on the below button to upload and import it.'
-    pinboard:
-        # page_title: "Import > Pinboard"
-        # 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").'
-        # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.'
-
-developer:
-    # page_title: 'API clients management'
-    # welcome_message: 'Welcome to the wallabag API'
-    # documentation: 'Documentation'
-    # how_to_first_app: 'How to create my first application'
-    # full_documentation: 'View full API documentation'
-    # list_methods: 'List API methods'
-    # clients:
-    #     title: 'Clients'
-    #     create_new: 'Create a new client'
-    # existing_clients:
-    #     title: 'Existing clients'
-    #     field_id: 'Client ID'
-    #     field_secret: 'Client secret'
-    #     field_uris: 'Redirect URIs'
-    #     field_grant_types: 'Grant type allowed'
-    #     no_client: 'No client yet.'
-    # remove:
-    #     warn_message_1: 'You have the ability to remove this client. This action is IRREVERSIBLE !'
-    #     warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
-    #     action: 'Remove this client'
-    # client:
-    #     page_title: 'API clients management > New client'
-    #     page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
-    #     form:
-    #         name_label: 'Name of the client'
-    #         redirect_uris_label: 'Redirect URIs'
-    #         save_label: 'Create a new client'
-    #     action_back: 'بازگشت'
-    #     copy_to_clipboard: Copy
-    # client_parameter:
-    #     page_title: 'API clients management > Client parameters'
-    #     page_description: 'Here are your client parameters.'
-    #     field_name: 'Client name'
-    #     field_id: 'Client ID'
-    #     field_secret: 'Client secret'
-    #     back: 'بازگشت'
-    #     read_howto: 'Read the howto "Create my first application"'
-    # howto:
-    #     page_title: 'API clients management > How to create my first application'
-    #     description:
-    #         paragraph_1: 'The following commands make use of the <a href="https://github.com/jkbrzt/httpie">HTTPie library</a>. Make sure it is installed on your system before using it.'
-    #         paragraph_2: 'You need a token to communicate between your 3rd application and wallabag API.'
-    #         paragraph_3: 'To create this token, you need <a href="%link%">to create a new client</a>.'
-    #         paragraph_4: 'Now, create your token (replace client_id, client_secret, username and password with the good values):'
-    #         paragraph_5: 'The API will return a response like this:'
-    #         paragraph_6: 'The access_token is useful to do a call to the API endpoint. For example:'
-    #         paragraph_7: 'This call will return all the entries for your user.'
-    #         paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
-    #     back: 'بازگشت'
-
+        page_title: درون‌ریزی > Instapaper
 user:
-    # page_title: Users management
-    # new_user: Create a new user
-    # edit_user: Edit an existing user
-    # description: "Here you can manage all users (create, edit and delete)"
-    # list:
-    #     actions: Actions
-    #     edit_action: Edit
-    #     yes: Yes
-    #     no: No
-    #     create_new_one: Create a new user
     form:
-        username_label: 'نام کاربری'
-        # name_label: 'Name'
-        password_label: 'رمز'
-        repeat_new_password_label: 'رمز تازه را دوباره بنویسید'
-        plain_password_label: '????'
-        email_label: 'نشانی ایمیل'
-        # enabled_label: 'Enabled'
-        # last_login_label: 'Last login'
-        # twofactor_email_label: Two factor authentication by email
-        # twofactor_google_label: Two factor authentication by OTP app
-        # save: Save
-        # delete: Delete
-        # delete_confirm: Are you sure?
-        # back_to_list: Back to list
-    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: 'Username'
-    #     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
-
+        username_label: نام کاربری
+        password_label: رمز
+        repeat_new_password_label: رمز تازه را دوباره بنویسید
+        plain_password_label: ????
+        email_label: نشانی ایمیل
 flashes:
     config:
         notice:
-            config_saved: 'پیکربندی ذخیره شد.'
-            password_updated: 'رمز به‌روز شد'
-            password_not_updated_demo: "در حالت نمایشی نمی‌توانید رمز کاربر را عوض کنید."
-            user_updated: 'اطلاعات به‌روز شد'
-            feed_updated: 'اطلاعات آر-اس-اس به‌روز شد'
-            tagging_rules_updated: 'برچسب‌گذاری خودکار به‌روز شد'
-            tagging_rules_deleted: 'قانون برچسب‌گذاری پاک شد'
-            feed_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
-            # otp_disabled: Two-factor authentication disabled
-            # tagging_rules_imported: Tagging rules imported
-            # tagging_rules_not_imported: Error while importing tagging rules
-            # ignore_origin_rules_deleted: 'Ignore origin rule deleted'
-            # ignore_origin_rules_updated: 'Ignore origin rule updated'
+            config_saved: پیکربندی ذخیره شد.
+            password_updated: رمز به‌روز شد
+            password_not_updated_demo: در حالت نمایشی نمی‌توانید رمز کاربر را عوض کنید.
+            user_updated: اطلاعات به‌روز شد
+            rss_updated: اطلاعات آر-اس-اس به‌روز شد
+            tagging_rules_updated: برچسب‌گذاری خودکار به‌روز شد
+            tagging_rules_deleted: قانون برچسب‌گذاری پاک شد
+            rss_token_updated: کد آر-اس-اس به‌روز شد
     entry:
         notice:
-            entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود'
-            entry_saved: 'مقاله ذخیره شد'
-            # entry_saved_failed: 'Entry saved but fetching content failed'
-            entry_updated: 'مقاله به‌روز شد'
-            entry_reloaded: 'مقاله به‌روز شد'
-            # entry_reloaded_failed: 'Entry reloaded but fetching content failed'
-            entry_archived: 'مقاله بایگانی شد'
-            entry_unarchived: 'مقاله از بایگانی درآمد'
-            entry_starred: 'مقاله برگزیده شد'
-            entry_unstarred: 'مقاله نابرگزیده شد'
-            entry_deleted: 'مقاله پاک شد'
-            # no_random_entry: 'No article with these criterias was found'
+            entry_already_saved: این مقاله در تاریخ %date% ذخیره شده بود
+            entry_saved: مقاله ذخیره شد
+            entry_updated: مقاله به‌روز شد
+            entry_reloaded: مقاله به‌روز شد
+            entry_archived: مقاله بایگانی شد
+            entry_unarchived: مقاله از بایگانی درآمد
+            entry_starred: مقاله برگزیده شد
+            entry_unstarred: مقاله نابرگزیده شد
+            entry_deleted: مقاله پاک شد
     tag:
         notice:
-            tag_added: 'برچسب افزوده شد'
-            # tag_renamed: 'Tag renamed'
+            tag_added: برچسب افزوده شد
     import:
         notice:
-            failed: 'درون‌ریزی شکست خورد. لطفاً دوباره تلاش کنید.'
-            failed_on_file: 'خطا هنگام پردازش پروندهٔ ورودی. آیا پروندهٔ درون‌ریزی شده سالم است؟'
+            failed: درون‌ریزی شکست خورد. لطفاً دوباره تلاش کنید.
+            failed_on_file: خطا هنگام پردازش پروندهٔ ورودی. آیا پروندهٔ درون‌ریزی شده سالم است.
             summary: 'گزارش درون‌ریزی: %imported% وارد شد, %skipped% از قبل ذخیره شده بود.'
-            # summary_with_queue: 'Import summary: %queued% queued.'
-        error:
-            # redis_enabled_not_installed: Redis is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check Redis configuration.
-            # rabbit_enabled_not_installed: RabbitMQ is enabled for handle asynchronous import but it looks like <u>we can't connect to it</u>. Please check RabbitMQ configuration.
-    developer:
-        notice:
-            # client_created: 'New client created.'
-            # client_deleted: 'Client deleted'
-    user:
-        notice:
-            # added: 'User "%username%" added'
-            # updated: 'User "%username%" updated'
-            # deleted: 'User "%username%" deleted'
-    site_credential:
-        notice:
-            # added: 'Site credential for "%host%" added'
-            # updated: 'Site credential for "%host%" updated'
-            # deleted: 'Site credential for "%host%" deleted'
-    ignore_origin_instance_rule:
-        notice:
-            # added: 'Global ignore origin rule added'
-            # updated: 'Global ignore origin rule updated'
-            # deleted: 'Global ignore origin rule deleted'

src/Wallabag/CoreBundle/Resources/translations/messages.hi.yml

@@ -0,0 +1 @@
+{}

src/Wallabag/CoreBundle/Resources/translations/messages.hr.yml

@@ -0,0 +1,719 @@
+developer:
+    client_parameter:
+        page_title: Upravljanje klijentima sučelja > Parametri klijenta
+        back: Natrag
+        read_howto: Pročitaj „Kako stvoriti moj prvi program”
+        field_secret: Tajna klijenta
+        page_description: Ovo su parametri tvog klijenta.
+        field_name: Ime klijenta
+        field_id: ID klijenta
+    client:
+        action_back: Natrag
+        form:
+            redirect_uris_label: Preusmjeri URI adrese (opcionalno)
+            save_label: Stvori novog klijenta
+            name_label: Ime klijenta
+        page_title: Upravljanje klijentima sučelja > Novi klijent
+        page_description: Stvorit ćeš novog klijenta. Ispuni donja polja za preusmjeravanje URI adrese tvog programa.
+        copy_to_clipboard: Kopiraj
+    clients:
+        create_new: Stvori novog klijenta
+        title: Klijent
+    page_title: Upravljanje klijentima sučelja
+    existing_clients:
+        no_client: Još nema klijenta.
+        field_uris: Preusmjeri URI adrese
+        field_id: ID klijenta
+        field_grant_types: Dopuštene vrste dozvola
+        field_secret: Tajna klijenta
+        title: Postojeći klijenti
+    full_documentation: Pregledaj potpunu dokumentaciju za sučelje
+    remove:
+        action: Ukloni klijenta %name%
+        warn_message_1: Imaš mogućnost ukloniti klijenta %name%. Ova je radnja NEPOVRATNA!
+        warn_message_2: Ako ga ukloniš, nijedan program konfiguriran s tim klijentom neće se moći autorizirati na tvom wallabagu.
+    howto:
+        page_title: Upravljanje klijentima sučelja > Kako stvoriti moj prvi program
+        back: Natrag
+        description:
+            paragraph_5: 'Sučelje će odgovoriti ovako:'
+            paragraph_4: 'Sada stvori token (zamijeni ID klijenta (client_id), tajnu klijenta (client_secret), korisničko ime i lozinku s ispravnim vrijednostima):'
+            paragraph_6: 'Token za pristup (access_token) koristan je za upućivanje poziva krajnjoj točci sučelja. Na primjer:'
+            paragraph_1: Sljedeće naredbe koriste <a href="https://github.com/jkbrzt/httpie">HTTPie biblioteku</a>. Prije upotrebe mora se instalirati na sustav.
+            paragraph_2: Za komunikaciju između tvog programa i wallabag sučelja trebaš token.
+            paragraph_3: Za stvaranje tokena, moraš <a href="%link%">stvoriti novog klijenta</a>.
+            paragraph_7: Ovaj poziv vraća sve zapise za tvog korisnika.
+            paragraph_8: Ako želiš vidjeti sve krajnje točke sučelja, pregledaj <a href="%link%">našu dokumentaciju za sučelje</a>.
+    list_methods: Nabroji metode sučelja
+    how_to_first_app: Kako stvoriti moj prvi program
+    welcome_message: Dobro došao/dobro došla u sučelje wallabaga
+    documentation: Dokumentacija
+import:
+    page_title: Uvoz
+    firefox:
+        how_to: 'Odaberi datoteku sigurnosne kopije zabilježaka i pritisni donji gumb za uvoz datoteke. Napomena: uvoz može potrajati, jer se moraju dohvatiti svi članci.'
+        page_title: Uvoz > Firefox
+        description: Ovaj uvoznik uvozi sve tvoje Firefox zabilješke. Idi na zabilješke (Ctrl+Shift+O), zatim u „Uvoz i sigurnosna kopija“, odaberi „Sigurnosna kopija …“. Dobit ćeš .json datoteku.
+    wallabag_v2:
+        description: Ovaj uvoznik uvozi sve tvoje članke wallabaga verzije 2. Idi na „Svi članci”, zatim na bočnoj traci za izvoz, pritisni „JSON”. Dobit ćeš datoteku „Svi članci.json”.
+        page_title: Uvoz > Wallabag v2
+    chrome:
+        page_title: Uvoz > Chrome
+        how_to: 'Odaberi datoteku sigurnosne kopije zabilježaka i pritisni donji gumb za uvoz datoteke. Napomena: uvoz može potrajati, jer se moraju dohvatiti svi članci.'
+        description: 'Ovaj uvoznik uvozi sve tvoje zabilješke iz Chromea. Mjesto datoteke ovisi o tvom operacijskom sustavu: Na Linuxu sustavu idi u mapu <code>~/.config/chromium/Default/</code></li><li>Na Windows sustavu mapa bi se trebala nalziti u <code>%LOCALAPPDATA%\Google\Chrome\User Data\Default</code></li><li>Na OS X sustavu trebala bi biti u <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Kad stigneš tamo, kopiraj datoteku <code>Bookmarks</code> na neko mjesto gdje ćeš je pronaći.<em><br>Ako koristiš Chromium umjesto Chromea, morat ćeš u skladu s time ispraviti staze.</em></p>'
+    readability:
+        how_to: Odaberi Readability izvoz i pritisni donji gumb za preuzimanje i uvoz datoteke.
+        page_title: Uvoz > Readability
+        description: Ovaj uvoznik uvozi sve tvoje Readability članke. Na stranici alata (https://www.readability.com/tools/), pritisni „Izvezi svoje podatke” u odjeljku „Izvoz podataka”. Primit ćeš e-mail za preuzimanje json-a (što zapravo ne završava s .json).
+    worker:
+        enabled: 'Uvoz se vrši asinkrono. Nakon što se uvoz zadatak pokrene, jedna vanjska usluga obradit će poslove jedan po jedan. Trenutačna usluga je:'
+        download_images_warning: Aktivirao(la) si preuzimanje slika za članke. U kombinaciji s klasičnim uvozom, postupak može potrajati godinama (ili možda ne uspije). <strong>Preporučujemo</strong> aktivirati asinkroniziran uvoz za izbjegavanje grešaka.
+    pinboard:
+        page_title: Uvoz > Pinboard
+        how_to: Odaberi Pinboard izvoz i pritisni donji gumb za preuzimanje i uvoz datoteke.
+        description: Ovaj uvoznik uvozi sve tvoje Pinboard članke. Na stranici sigurnosne kopije (https://pinboard.in/settings/backup), pritisni „JSON” u odjeljku „Zabilješke”. Preuzet će se JSON datoteka (poput „pinboard_export”).
+    instapaper:
+        page_title: Uvoz > Instapaper
+        how_to: Odaberi Instapaper izvoz i pritisni donji gumb za preuzimanje i uvoz datoteke.
+        description: Ovaj uvoznik uvozi sve tvoje Instapaper članke. Na stranici postavki (https://www.instapaper.com/user) pritisni „Preuzmi .CSV datoteku” u odjeljku „Izvoz”. Preuzet će se CSV datoteka (poput „instapaper-export.csv”).
+    pocket:
+        config_missing:
+            admin_message: Moraš definirati %keyurls%jedan pocket_consumer_key%keyurle% (ključ Pocket korisnika).
+            description: Uvoz iz Pocketa nije konfiguriran.
+            user_message: Administrator tvog poslužitelja mora definirati ključ za sučelje za Pocket.
+        description: Ovaj uvoznik uvozi sve tvoje Pocket podatke. Pocket nam ne dopušta dohvaćanje sadržaja iz njihove usluge, stoga će se čitljiv sadržaj svakog članka ponovno dohvatiti pomoću wallabaga.
+        authorize_message: Tvoje podatke možeš uvesti s tvog Pocket računa. Jednostavno pritisni donji gumb i autoriziraj program, da se poveže s getpocket.com.
+        connect_to_pocket: Spoji se na Pocket i uvezi podatke
+        page_title: Uvoz > Pocket
+    form:
+        mark_as_read_label: Označi sve uvezene zapise kao pročitane
+        mark_as_read_title: Označiti kao pročitano?
+        file_label: Datoteka
+        save_label: Prenesi datoteku
+    wallabag_v1:
+        page_title: Uvoz > Wallabag v1
+        how_to: Odaberi wallabag izvoz i pritisni donji gumb za preuzimanje i uvoz datoteke.
+        description: Ovaj uvoznik uvozi sve tvoje članke wallabaga verzije 1. Na tvojoj stranici konfiguracije, pritisni „JSON izvoz” u odjeljku „Izvezi svoje wallabag podatke”. Dobit ćeš datoteku „wallabag-export-1-xxxx-xx-xx.json”.
+    page_description: Dobro došao/dobro došla u uvoznik wallabaga. Odaberi prethodnu uslugu s koje želiš premjestiti podatke.
+    action:
+        import_contents: Sadržaj uvoza
+    elcurator:
+        description: Ovaj će uvoznik uvesti sve tvoje elCurator članke. Prijeđi na postavke na tvom elCurator računu, a zatim izvezi sadržaj. Dobit ćete JSON datoteku.
+        page_title: Uvezi > elCurator
+about:
+    helping:
+        by_contributing: 'doprinošenjem projektu:'
+        description: 'wallabag je slobodan softver otvorenog koda. Možeš nam pomoći:'
+        by_paypal: putem PayPal-a
+        by_contributing_2: problem nabraja sve naše potrebe
+    who_behind_wallabag:
+        license: Licenca
+        website: web-stranica
+        many_contributors: I mnogi drugi doprinositelji ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">na GitHub-u</a>
+        project_website: Web-stranica projekta
+        developped_by: Razvijeno od
+        version: Verzija
+    top_menu:
+        third_party: Biblioteke trećih strana
+        who_behind_wallabag: Tko predstavlja wallabag
+        contributors: Doprinositelji
+        getting_help: Dobivanje pomoći
+        helping: Pomoć wallabagu
+    third_party:
+        license: Licenca
+        description: 'Ovdje se nalazi popis biblioteka trećih strana koje se koriste u wallabagu (s njihovim licencama):'
+        package: Paket
+    contributors:
+        description: Hvala ti na dorpinosu web-programu wallabag
+    getting_help:
+        documentation: Dokumentacija
+        support: <a href="https://github.com/wallabag/wallabag/issues">na GitHub-u</a>
+        bug_reports: Izvještaji o greškama
+    page_title: Informacije
+config:
+    form_rss:
+        rss_limit: Broj stavki u feedu
+        rss_link:
+            unread: Nepročitano
+            archive: Arhivirano
+            starred: Favorizirano
+            all: Sve
+        token_label: RSS token
+        description: RSS feedovi koje pruža wallabag dozvoljavaju ti čitati tvoje spremljene članke s tvojim omiljenim čitačem RSS-a. Najprije moraš generirati token.
+        no_token: Nema tokena
+        token_reset: Ponovo generiraj token
+        token_create: Stvori token
+        rss_links: RSS poveznice
+    form_rules:
+        faq:
+            variable_description:
+                isArchived: Je li zapis arhiviran ili ne
+                label: Varijabla
+                content: Sadržaj zapisa
+                mimetype: Vrsta medija zapisa
+                domainName: Ime domene zapisa
+                language: Jezik zapisa
+                title: Naslov zapisa
+                isStarred: Je li zapis omiljen ili nije
+                url: URL zapisa
+                readingTime: Procijenjeno vrijeme čitanja zapisa, u minutama
+            operator_description:
+                strictly_greater_than: Strogo veće od …
+                label: Operator
+                or: Jedno pravilo ILI jedno drugo
+                equal_to: Jednako …
+                less_than: Manje od …
+                greater_than: Veće od …
+                not_equal_to: Nije jednako …
+                and: Jedno pravilo I jedno drugo
+                strictly_less_than: Strogo manje od …
+                notmatches: 'Provjerava nepoklapanje <i>teme</i> s <i>traženim izrazom</i> (razlikuje mala/velika slova).<br /> Primjer: <code> naslov se ne poklapa s „nogomet”</code>'
+                matches: 'Provjerava poklapanje <i>teme</i> s <i>traženim izrazom</i> (razlikuje mala/velika slova).<br /> Primjer: <code> naslov se poklapa s „nogomet”</code>'
+            tagging_rules_definition_description: To su pravila koja wallabag koristi za automatsko označivanje novih zapisa.<br />Pri svakom dodavanju novog zapisa, primijenjuju se sva tvoja pravila za označivanje, kako bi se dodale konfigurirane oznake. Na taj način izbjegavaš pojedinačnu klasifikaciju zapisa.
+            tagging_rules_definition_title: Što znači „Pravila za označivanje”?
+            how_to_use_them_title: Kako ih koristiti?
+            variables_available_description: 'Sljedeće varijable i opretori mogu se koristiti za izradu pravila za označivanje:'
+            title: ČPP
+            meaning: Značenje
+            variables_available_title: Koje varijable i operateri mogu koristiti za pisanje pravila?
+            how_to_use_them_description: 'Pretpostavimo da želiš označiti nove zapise kao <i>kratko čitanje</i> kad je vrijeme čitanja manje od 3 minute.<br />U tom slučaju, postavi „readingTime &lt;= 3” u polju <i>Pravilo</i> i <i>kratko čitanje</i> u polju <i>Oznake</i>.<br />Moguće je dodati više oznaka istovremeno, odvajajući ih zarezom: „<i>kratko čitanje, moram čitati</i>”<br />Složena pravila mogu se napisati pomoću unaprijed definiranih operatora: ako „<i>readingTime &gt;= 5 AND domainName = "github.com"</i>”, onda označi kao „<i>dugo čitanje, GitHub </i>”'
+        delete_rule_label: ukloni
+        edit_rule_label: uredi
+        if_label: ako
+        then_tag_as_label: zatim označi kao
+        tags_label: Oznake
+        rule_label: Pravilo
+        card:
+            export_tagging_rules_detail: Ovime će se preuzeti JSON datoteka koju možeš koristiti za uvoz pravila za označivanja na drugim mjestima ili za izradu sigurnosne kopije.
+            import_tagging_rules_detail: Moraš odabrati prethodno izvezenu JSON datoteku.
+            export_tagging_rules: Izvezi pravila za označivanje
+            import_tagging_rules: Uvezi pravila za označivanje
+            new_tagging_rule: Stvori pravilo za označivanje
+        export: Izvezi
+        import_submit: Uvezi
+        file_label: JSON datoteka
+    form_settings:
+        theme_label: Tema
+        help_items_per_page: Možeš promijeniti broj prikazanih članaka na svakoj stranici.
+        help_theme: wallabag je prilagodljiv. Ovdje možeš odabrati željenu temu.
+        action_mark_as_read:
+            label: Što učiniti nakon što se članak ukloni, označi kao omiljeni ili kao pročitani?
+            redirect_current_page: Ostani na trenutačnoj stranici
+            redirect_homepage: Idi na naslovnu web-stranicu
+        android_configuration: Konfiguriraj tvoj Android program
+        help_language: Mošeš promijeniti jezik sučelja wallabaga.
+        android_instruction: Dodirni ovdje za automatkso ispunjavanje tvog Android programa
+        reading_speed:
+            200_word: Čitam ~200 riječi u minuti
+            label: Brzina čitanja
+            400_word: Čitam ~400 riječi u minuti
+            300_word: Čitam ~300 riječi u minuti
+            help_message: 'Možeš koristiti online alate za procjenu tvoje brzine čitanja:'
+            100_word: Čitam ~100 riječi u minuti
+        help_pocket_consumer_key: Potrebno za uvoz Pocketa. Možeš stvoriti u tvom Pocket računu.
+        pocket_consumer_key_label: Korisnički ključ za Pocket za uvoz sadržaja
+        items_per_page_label: Broj stavki po stranici
+        help_reading_speed: wallabag izračunava vrijeme čitanja za svaki članak. Ovdje možeš definirati, zahvaljujući ovom popisu, jesi li brz ili spor čitač. wallabag će izračunati vrijeme čitanja za svaki članak.
+        language_label: Jezik
+    form_user:
+        delete:
+            confirm: Sigurno? (OVO JE NEPOVRATNA RADNJA)
+            title: Izbriši moj račun (poznato kao područje opasnosti)
+            description: Ako ukloniš svoj račun, SVI članci, SVE oznake, SVE napomene i tvoj račun TRAJNO će se ukloniti (ovo je NEPOVRATNA radnja). Tada ćeš biti odjavljen(a).
+            button: Izbriši moj račun
+        name_label: Ime
+        two_factor_description: Aktiviranje dvofaktorske autentifikacije znači, da ćeš primati e-mail s kodom za svaku novu nepouzdanu vezu.
+        twoFactorAuthentication_label: Dvofaktorska autentifikacija
+        help_twoFactorAuthentication: Ako aktiviraš dvofaktorsku autentifikaciju, pri svakoj prijavi na wallabag primit ćeš e-mail s kodom.
+        email_label: E-mail
+        two_factor:
+            action_app: Koristi OTP program
+            action_email: Koristi e-mail
+            state_disabled: Deaktivirano
+            state_enabled: Aktivirano
+            table_action: Radnja
+            table_state: Stanje
+            table_method: Metoda
+            emailTwoFactor_label: Upotreba e-maila (primi kod putem e-maila)
+            googleTwoFactor_label: Upotreba OTP programa (otvori program – npr. Google Authenticator, Authy or FreeOTP – za dobivanje jednokratnog koda)
+        login_label: Prijava (ne može se promijeniti)
+    page_title: Konfiguracija
+    reset:
+        archived: Ukloni SVE arhivirane zapise
+        title: Resetiraj područje (poznato kao područje opasnosti)
+        description: Ako pritisneš donje gumbe ispod, moći ćeš ukloniti neke podatke s računa. Imaj na umu, da su to NEPOVRATNE radnje.
+        entries: Ukloni SVE zapise
+        confirm: Stvarno? (OVO JE NEPOVRATNA RADNJA)
+        annotations: Ukloni SVE napomene
+        tags: Ukloni SVE oznake
+    form_password:
+        repeat_new_password_label: Ponovi novu lozinku
+        old_password_label: Trenutačna lozinka
+        description: Ovdje možeš promijeniti lozinku. Tvoja nova lozinka mora sadržati barem osam znakova.
+        new_password_label: Nova lozinka
+    form:
+        save: Spremi
+    tab_menu:
+        user_info: Korisnički podaci
+        new_user: Dodaj korisnika
+        rules: Pravila za označivanje
+        password: Lozinka
+        rss: RSS
+        settings: Postavke
+        reset: Ponovo postavi područje
+        ignore_origin: Pravila za zanemarivanje izvora
+        feed: Feedovi
+    otp:
+        app:
+            two_factor_code_description_3: 'Također, spremi ove sigurnosne kodove na sigurno mjesto. Možeš ih koristiti u slučaju da izgubiš pristup OTP programu:'
+            two_factor_code_description_1: Upravo si aktivirao/la dvofaktorsku OTP autentifikaciju. Otvori OTP program i koristi taj kod za dobivanje jednokratne lozinke. Lozinka će nestati nakon ponovnog učitavanja stranice.
+            two_factor_code_description_4: 'Testiraj OTP kod iz tvog konfiguriranog programa:'
+            two_factor_code_description_2: 'QR kod možeš skenirati pomoću tvog programa:'
+            enable: Aktiviraj
+            cancel: Odustani
+        page_title: Dvofaktorska autentifikacija
+    form_ignore_origin_rules:
+        faq:
+            operator_description:
+                matches: 'Provjerava poklapanje <i>teme</i> s <i>traženim izrazom</i> (ne razlikuje mala/velika slova).<br />Primjer: <code>_all ~ "https?://rss.example.com/foobar/.*"</code>'
+                equal_to: Jednako …
+                label: Operator
+            variable_description:
+                _all: Potpuna adresa, uglavnom za poklapanje s uzorcima
+                host: Računalo adrese
+                label: Varijabla
+            meaning: Značenje
+            variables_available_description: 'Za izradu pravila za zanemarivanje izvora mogu se koristiti sljedeće varijable i operatori:'
+            variables_available_title: Koje se varijable i operatori mogu koristiti za pisanje pravila?
+            how_to_use_them_title: Kako ih koristiti?
+            ignore_origin_rules_definition_title: Čemu služe „pravila za zanemarivanje izvora”?
+            title: ČPP
+            ignore_origin_rules_definition_description: Wallabag ih koristi za automatsko zanemarivanje adrese izvora nakon preusmjeravanja.<br />Ako dođe do preusmjeravanja tijekom dohvaćanja novog zapisa, sva pravila za zanemarivanje izvora (<i>definirana od korisnika i primjerka programa</i>) koristit će se za zanemarivanje adrese izvora.
+            how_to_use_them_description: Pretpostavimo da želiš zanemariti izvor unosa koji dolazi od „<i>rss.example.com</i>” (<i>znajući da je nakon preusmjeravanja, stvarna adresa example.com</i>).<br />U tom slučaju, postavi host = "rss.example.com" u polje <i>Pravilo</i>.
+    form_feed:
+        description: Atom feedovi koje pruža wallabag omogućuju čitanje spremljenih članaka pomoću tvojeg omiljenog Atom čitača. Najprije moraš generirati token.
+        no_token: Nema tokena
+        token_label: Token feeda
+        feed_limit: Broj elemenata u feedu
+        feed_link:
+            all: Sve
+            archive: Arhivirani
+            starred: Omiljeni
+            unread: Nepročitani
+        feed_links: Poveznice feeda
+        token_revoke: Odbaci tvoj token
+        token_reset: Ponovo generiraj tvoj token
+        token_create: Stvori tvoj token
+howto:
+    mobile_apps:
+        android:
+            via_f_droid: putem F-Droid
+            via_google_play: putem Google Play
+        windows: na Microsoft Store
+        ios: na iTunes Store
+    tab_menu:
+        add_link: Dodaj poveznicu
+        shortcuts: Koristi prečace
+    shortcuts:
+        hide_form: Sakrij trenutačni obrazac (traži ili nova poveznica)
+        all_pages_title: Dostupni prečaci na svim stranicama
+        go_starred: Idi na omiljene
+        delete: Izbriši zapis
+        go_archive: Idi na arhivu
+        shortcut: Prečac
+        go_howto: Idi na kako koristiti (ova stranica!)
+        page_description: Ovo su dostupni prečaci u wallabagu.
+        go_tags: Idi na oznake
+        open_article: Prikaži odabrani zapis
+        go_unread: Idi na nepročitane
+        go_config: Idi na konfiguraciju
+        open_original: Kopiraj izvorni URL zapisa
+        go_developers: Idi na programere
+        search: Prikaži obrazac pretrage
+        arrows_navigation: Kretanje po člancima
+        go_import: Idi na uvoz
+        action: Akcija
+        toggle_favorite: Uklj/isklj stanje favorita za zapis
+        go_all: Idi na sve zapise
+        material_title: Dostupni prečaci samo za Material temu
+        add_link: Dodaj novu poveznicu
+        toggle_archive: Uklj/Isklj stanje čitanja za zapis
+        list_title: Dostupni prečaci na stranicama popisa
+        go_logout: Odjava
+        article_title: Dostupni prečaci u prikazu zapisa
+    browser_addons:
+        firefox: Dodatak za Firefox
+        chrome: Dodatak za Chrome
+        opera: Dodatak za Opera
+    top_menu:
+        mobile_apps: Programi za mobilne uređaje
+        bookmarklet: Zabilježavanje
+        browser_addons: Dodaci za preglednik
+    form:
+        description: Zahvaljujući ovom obrascu
+    bookmarklet:
+        description: 'Povuci i ispusti ovu poveznicu na traku zabilježaka:'
+    page_description: 'Postoji nekoliko načina za spremanje članka:'
+    page_title: Kako koristiti
+footer:
+    wallabag:
+        powered_by: pokreće
+        social: Društvene mreže
+        elsewhere: Ponesi wallabag sa sobom
+        about: Informacije
+    stats: Od %user_creation% pročitao/pročitala si %nb_archives% članaka. To je otprilike %per_day% na dan!
+flashes:
+    entry:
+        notice:
+            entry_unstarred: Zapis isključen iz omiljenih
+            entry_already_saved: Zapis je već spremljen %date%
+            entry_unarchived: Zapis uklonjen iz arhiva
+            entry_reloaded_failed: Zapis ponovo učitan, ali dohvaćanje sadržaja neuspjelo
+            entry_saved_failed: Zapis spremljen, ali dohvaćanje sadržaja neuspjelo
+            entry_updated: Zapis aktualiziran
+            entry_deleted: Zapis izbrisan
+            entry_starred: Zapis uključen u omiljene
+            entry_reloaded: Zapis ponovo učitan
+            entry_saved: Zapis spremljen
+            entry_archived: Zapis arhiviran
+            no_random_entry: Nema članaka s ovim kriterijima
+    user:
+        notice:
+            added: Korisnik „%username%” dodan
+            updated: Korisnik „%username%” aktualiziran
+            deleted: Korisnik „%username%” izbrisan
+    developer:
+        notice:
+            client_deleted: Klijent %name% izbrisan
+            client_created: Novi klijent %name% stvoren.
+    import:
+        error:
+            redis_enabled_not_installed: Redis je aktiviran za rukovanje asinkronim uvozom, ali čini se, <u>da se s njim ne možemo povezati</u>. Provjeri konfiguraciju za Redis.
+            rabbit_enabled_not_installed: RabbitMQ je aktiviran za rukovanje asinkronim uvozom, ali čini se, <u>da se s njim ne možemo povezati</u>. Provjeri konfiguraciju za RabbitMQ.
+        notice:
+            summary: 'Sažetak uvoza: %imported% uvezeno, %skipped% već spremljeno.'
+            failed: Uvoz neuspio, pokušaj ponovo.
+            failed_on_file: Greška pri obradi uvoza. Potvrdi uvoznu datoteku.
+            summary_with_queue: 'Sažetak uvoza: %queued% u redu čekanja.'
+    config:
+        notice:
+            password_not_updated_demo: U demonstracijskom modusu ne možeš promijeniti lozinku za ovog korisnika.
+            tags_reset: Oznake resetirane
+            password_updated: Lozinka aktualizirana
+            config_saved: Konfiguracija spremljena.
+            tagging_rules_updated: Pravila za označivanje aktualizirana
+            rss_token_updated: RSS token aktualiziran
+            annotations_reset: Napomene resetirane
+            tagging_rules_deleted: Pravilo za označivanje izbrisano
+            archived_reset: Arhivirani zapisi izbrisani
+            rss_updated: RSS podatak aktualiziran
+            user_updated: Podaci aktualizirani
+            entries_reset: Zapis resetiran
+            ignore_origin_rules_updated: Pravilo za zanemarivanje izvora aktualizirano
+            ignore_origin_rules_deleted: Pravilo za zanemarivanje izvora izbrisano
+            tagging_rules_not_imported: Greška pri uvozu pravila za označivanje
+            tagging_rules_imported: Pravila označivanja uvezena
+            otp_disabled: Dvofaktorska autentifikacija deaktivirana
+            otp_enabled: Dvofaktorska autentifikacija aktivirana
+            feed_token_revoked: Token feeda opozvan
+            feed_token_updated: Token feeda aktualiziran
+            feed_updated: Podaci feeda aktualizirani
+    site_credential:
+        notice:
+            deleted: Podaci za prijavu na stranicu „%host%” izbrisani
+            added: Podaci za prijavu na stranicu „%host%” dodani
+            updated: Podaci za prijavu na stranicu „%host%” aktualizirani
+    tag:
+        notice:
+            tag_added: Oznaka dodana
+            tag_renamed: Oznaka preimenovana
+    ignore_origin_instance_rule:
+        notice:
+            deleted: Globalno pravilo za zanemarivanje izvora izbrisano
+            updated: Globalno pravilo za zanemarivanje izvora aktualizirano
+            added: Globalno pravilo za zanemarivanje izvora dodano
+site_credential:
+    list:
+        yes: Da
+        create_new_one: Stvori nove podate za prijavu
+        actions: Radnje
+        no: Ne
+        edit_action: Uredi
+    form:
+        password_label: Lozinka
+        host_label: Računalo (poddomena.primjer.org, .primjer.org, itd.)
+        save: Spremi
+        delete_confirm: Stvarno?
+        username_label: Prijava
+        delete: Izbriši
+        back_to_list: Natrag na popis
+    edit_site_credential: Uredi jedan postojeći podatak za prijavu
+    page_title: Upravljanje podacima za prijavu na stranicu
+    description: Ovdje možeš upravljati svim podacima za prijavu za web-stranice koje su ih zahtijevale (stvoriti, urediti i brisati), poput paywalla, autentifikacije itd.
+    new_site_credential: Stvori podate za prijavu
+entry:
+    filters:
+        preview_picture_label: Ima sliku za pretprikaz
+        is_public_help: Javna poveznica
+        domain_label: Ime domene
+        starred_label: Omiljeni
+        reading_time:
+            to: do
+            from: od
+            label: Vrijeme čitanja u minutama
+        status_label: Stanje
+        language_label: Jezik
+        preview_picture_help: Slika za pretprikaz
+        action:
+            filter: Filtar
+            clear: Poništi
+        is_public_label: Ima javnu poveznicu
+        created_at:
+            from: od
+            to: do
+            label: Datum stvaranja
+        archived_label: Arhivirani
+        http_status_label: Stanje HTTP-a
+        title: Filtri
+        unread_label: Nepročitani
+    list:
+        delete: Izbriši
+        reading_time_less_one_minute: 'procijenjeno vrijeme čitanja: &lt; 1 min'
+        original_article: izvorni
+        number_on_the_page: '{0} Nema zapisa.|{1} Postoji jedan zapis.|]1,Inf[ Broj zapisa: %count%.'
+        toogle_as_star: Uklj/Isklj omiljene
+        reading_time_minutes_short: '%readingTime% min'
+        reading_time: procijenjeno vrijeme čitanja
+        export_title: Izvoz
+        reading_time_minutes: 'procijenjeno vrijeme čitanja: %readingTime% min'
+        toogle_as_read: Uklj/Isklj oznaku kao pročitano
+        number_of_tags: '{1}i još jedna druga oznaka|]1,Inf[i %count% druge oznake'
+        reading_time_less_one_minute_short: '&lt; 1 min'
+    view:
+        left_menu:
+            set_as_starred: Uklj/Isklj omiljene
+            back_to_homepage: Natrag
+            share_email_label: E-mail
+            back_to_top: Natrag na vrh
+            view_original_article: Izvorni članak
+            public_link: javna poveznica
+            export: Izvoz
+            re_fetch_content: Ponovo dohvati sadržaj
+            set_as_unread: Označi kao nepročitano
+            delete_public_link: izbriši javnu poveznicu
+            set_as_read: Označi kao pročitano
+            problem:
+                description: Izgleda li članak pogrešno?
+                label: Problemi?
+            add_a_tag: Dodaj oznaku
+            delete: Izbriši
+            share_content: Dijeli
+            print: Ispis
+            theme_toggle_auto: Automatski
+            theme_toggle_dark: Tamna
+            theme_toggle_light: Svijetla
+            theme_toggle: Mijenjanje teme
+        created_at: Datum stvaranja
+        original_article: izvorni
+        edit_title: Uredi naslov
+        provided_by: Omogućuje
+        published_by: Izdavač
+        published_at: Datum izdanja
+        annotations_on_the_entry: '{0} Bez napomena|{1} Jedna napomena|]1,Inf[ %count% napomene'
+    page_titles:
+        unread: Nepročitani zapisi
+        starred: Omiljeni zapisi
+        filtered: Filtrirani zapisi
+        all: Svi zapisi
+        archived: Arhivirani zapisi
+        untagged: Zapisi bez oznaka
+        filtered_tags: 'Filtrirano po oznakama:'
+        filtered_search: 'Filtrirano po pretrazi:'
+    metadata:
+        reading_time_minutes_short: '%readingTime% min'
+        added_on: Dodano
+        reading_time: Procijenjeno vrijeme čitanja
+        address: Adresa
+        published_on: Datum objavljivanja
+    confirm:
+        delete: Stvarno želiš ukloniti taj članak?
+        delete_tag: Stvarno želiš ukloniti tu oznaku za taj članak?
+    edit:
+        title_label: Naslov
+        url_label: Url
+        save_label: Spremi
+        page_title: Uredi jedan zapis
+        origin_url_label: URL izvora (mjesto gdje je taj zapis pronađen)
+    new:
+        placeholder: http://website.com
+        form_new:
+            url_label: Url
+        page_title: Spremi novi zapis
+    public:
+        shared_by_wallabag: "%username% je dijelio/dijelila ovaj članak s <a href='%wallabag_instance%'>wallabagom</a>"
+    default_title: Naslov zapisa
+    search:
+        placeholder: Što tražiš?
+user:
+    edit_user: Uredi jednog korisnika
+    form:
+        plain_password_label: ????
+        delete: Izbriši
+        repeat_new_password_label: Ponovi novu lozinku
+        last_login_label: Zadnja prijava
+        delete_confirm: Stvarno?
+        twofactor_label: Dvofaktorska autentifikacija
+        back_to_list: Natrag na popis
+        save: Spremi
+        username_label: Korisničko ime
+        enabled_label: Aktivirano
+        password_label: Lozinka
+        name_label: Ime
+        email_label: E-mail
+        twofactor_google_label: Dvofaktorska autentifikacija putem OTP programa
+        twofactor_email_label: Dvofaktorska autentifikacija putem e-maila
+    description: Ovdje možeš upravljati svim korisnicima (stvoriti, urediti i brisati)
+    list:
+        create_new_one: Stvori novog korisnika
+        no: Ne
+        edit_action: Uredi
+        yes: Da
+        actions: Radnje
+    new_user: Stvori novog korisnika
+    search:
+        placeholder: Filtriraj po korisničkom imenu ili e-mailu
+    page_title: Upravljanje korisnicima
+quickstart:
+    migrate:
+        pocket: Premjesti podatke iz usluge Pocket
+        title: Premjesti podatke iz postojeće usluge
+        wallabag_v1: Premjesti podatke iz usluge wallabag v1
+        instapaper: Premjesti podatke iz usluge Instapaper
+        description: Koristiš neku drugu uslugu? Pomoći ćemo ti preuzeti podatke na wallabag.
+        readability: Premjesti podatke iz usluge Readability
+        wallabag_v2: Premjesti podatke iz usluge wallabag v2
+    admin:
+        title: Administracija
+        analytics: Konfiguriraj analitiku
+        description: 'Kao administrator imaš posebna prava na wallabagu. Možeš:'
+        export: Konfiguriraj izvoz
+        sharing: Aktiviraj neke parametre o dijeljenju članka
+        import: Konfiguriraj uvoz
+        new_user: Stvori novog korisnika
+    configure:
+        rss: Aktiviraj RSS feedove
+        description: Za dobivanje programa koji tebi najviše odgovara, pogledaj konfiguraciju wallabaga.
+        tagging_rules: Odredi pravila za automatsko označivanje članaka
+        title: Konfiguriraj program
+        language: Promijeni jezik i dizajn
+        feed: Aktiviraj feedove
+    developer:
+        description: 'Mislili smo i na pregramere: Docker, sučelje (API), prijevodi itd.'
+        create_application: Stvori tvoj program
+        title: Programeri
+        use_docker: Koristi Docker za instliranje wallabaga
+    support:
+        github: Na GitHubu
+        gitter: Na Gitteru
+        title: Podrška
+        email: Putem e-maila
+        description: Ako trebaš pomoć, spremni smo ti pomoći.
+    more: Više …
+    intro:
+        paragraph_1: Pratit ćemo te pri tvom posjetu wallabagu i pokazat ćemo ti neke funkcije koje bi te mogle zanimati.
+        title: Dobro došao/dobro došla u wallabag!
+        paragraph_2: Prati nas!
+    first_steps:
+        unread_articles: I klasificiraj ga!
+        new_article: Spremi svoj prvi članak
+        description: Pošto je wallabag sada dobro konfiguriran, vrijeme je za arhiviranje weba. Za dodavanje poveznice, pritisni znak plus (+) gore desno.
+        title: Prvi koraci
+    docs:
+        fetching_errors: Što mogu učiniti, ako članak naiđe na greške tijekom dohvaćanja?
+        all_docs: I još puno više članaka!
+        search_filters: Pogledaj kako potražiti članak pomoću tražilice i filtera
+        title: Potpuna dokumentacija
+        export: Pretvori članke u ePUB ili PDF
+        annotate: Zabilježi napomenu za tvoj članak
+        description: Postoji neizmjerno mnogo funkcija u wallabagu. Pročitaj priručnik i nauči, kako ih koristiti.
+    page_title: Prvi koraci
+menu:
+    left:
+        search: Traži
+        save_link: Spremi poveznicu
+        config: Konfiguracija
+        logout: Odjava
+        about: Informacije
+        tags: Oznake
+        starred: Omiljeni
+        site_credentials: Podaci za prijavu na stranicu
+        archive: Arhiv
+        all_articles: Svi zapisi
+        howto: Kako koristiti
+        unread: Nepročitano
+        internal_settings: Interne postavke
+        back_to_unread: Natrag na nepročitane članke
+        users_management: Upravljanje korisnicima
+        import: Uvoz
+        developer: Upravljanje klijentima sučelja
+        ignore_origin_instance_rules: Globalna pravila za zanemarivanje izvora
+        quickstart: Brzo pokretanje
+        theme_toggle_auto: Automatska tema
+        theme_toggle_dark: Tamna tema
+        theme_toggle_light: Svijetla tema
+    top:
+        add_new_entry: Dodaj novi zapis
+        filter_entries: Filtriraj zapise
+        search: Traži
+        export: Izvoz
+        random_entry: Prijeđi na slučajno odabrani zapis tog popisa
+        account: Moj račun
+    search_form:
+        input_label: Ovdje upiši što tražiš
+tag:
+    list:
+        number_on_the_page: '{0} Nema oznaka.|{1} Postoji jedna oznaka.|]1,Inf[ Broj oznaka: %count%.'
+        see_untagged_entries: Pogledaj zapise bez oznaka
+        untagged: Zapisi bez oznaka
+        no_untagged_entries: Nema zapisa bez oznaka.
+    page_title: Oznake
+    new:
+        add: Dodaj
+        placeholder: Dodaj više oznaka odjednom, odvojene zarezom.
+security:
+    register:
+        page_title: Stvori račun
+        go_to_account: Idi na tvoj račun
+    login:
+        password: Lozinka
+        username: Korisničko ime
+        submit: Prijava
+        register: Registracija
+        cancel: Odustani
+        forgot_password: Ne sjećaš se lozinke?
+        page_title: Dobro došao/dobro došla u wallabag!
+        keep_logged_in: Nemoj me odjaviti
+    resetting:
+        description: Dolje upiši svoju e-mail adresu i poslat ćemo ti upute za resetiranje lozinke.
+export:
+    footer_template: <div style="text-align:center;"><p>Prizvedeno od wallabaga pomoću %method%</p><p>Prijavi <a href="https://github.com/wallabag/wallabag/issues">problem</a>, ako imaš poteškoća s prikazom ove e-knjige na tvom uređaju.</p></div>
+    unknown: Nepoznato
+error:
+    page_title: Došlo je do greške
+ignore_origin_instance_rule:
+    description: Ovdje možeš upravljati globalnim pravilima za zanemarivanje izvora koja se koriste za zanemarivanje nekih uzoraka URL-a izvora.
+    list:
+        create_new_one: Stvori novo globalno pravilo za zanemarivanje izvora
+        no: Ne
+        yes: Da
+        edit_action: Uredi
+        actions: Radnje
+    edit_ignore_origin_instance_rule: Uredi postojeće globalno pravilo za zanemarivanje izvora
+    new_ignore_origin_instance_rule: Stvori globalno pravilo za zanemarivanje izvora
+    page_title: Globalna pravila za zanemarivanje izvora
+    form:
+        back_to_list: Natrag na popis
+        delete_confirm: Stvarno?
+        delete: Izbriši
+        save: Spremi
+        rule_label: Pravilo