Add CodeQL build

Merge 2.6.0 into master

.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

.eslintrc.json

@@ -1,6 +1,6 @@
 {
     "extends": "airbnb-base",
-    "parser": "babel-eslint",
+    "parser": "@babel/eslint-parser",
     "env": {
         "browser": true,
         "es6": true

.gitattributes

@@ -0,0 +1,7 @@
+/.editorconfig export-ignore
+/.gitattributes export-ignore
+/.github export-ignore
+/.gitignore export-ignore
+/phpstan.neon export-ignore
+/phpunit.xml.dist export-ignore
+/tests export-ignore

.github/CONTRIBUTING.md

@@ -6,11 +6,15 @@
 
 - Clone the repository
 - Ensure your Docker daemon is running
-- Launch `docker-compose up`
+- Copy `docker/php/env.example` to `docker/php/env` and customize
+- Launch `docker-compose run --rm php composer install` to bootstrap php dependencies
+- Launch `docker-compose run --rm php bin/console wallabag:install` to bootstrap your installation
+- Launch `docker-compose run --rm php yarn install` to bootstrap dependencies for the frontend
+- Launch `docker-compose run --rm php yarn build:dev` to build assets for the frontend
+- Launch `docker-compose up -d` to start the stack
 
 You'll then have:
-- a web server (nginx)
-- a PHP daemon (using FPM)
+- a PHP daemon with standalone web server
 - a Redis database (to handle imports)
 - a SQLite database to store articles
 
@@ -20,7 +24,7 @@ If you want to test using an other database than SQLite, uncomment the `postgres
 
 ### Using your own PHP server
 
-- Ensure you are running PHP > 7.1.
+- Ensure you are running PHP >= 7.4.
 - Clone the repository
 - Launch `composer install`
 - If you got some errors, fix them (they might be related to some missing PHP extension from your machine)

.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,43 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: weekly
+    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"
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: weekly
+    time: "04:00"
+    timezone: Europe/Paris
+  open-pull-requests-limit: 10

.github/release.yml

@@ -0,0 +1,7 @@
+changelog:
+  exclude:
+    labels:
+      - Dependencies
+    authors:
+      - dependabot
+      - weblate

.github/workflows/assets.yml

@@ -0,0 +1,44 @@
+name: "Assets"
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - 2.*
+
+permissions:
+  contents: read
+
+jobs:
+  js:
+    name: "Building assets"
+    runs-on: "ubuntu-20.04"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v3"
+
+      - name: "Install Node"
+        uses: actions/setup-node@v3
+        with:
+          node-version: "16"
+
+      - 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/codeql-analysis.yml

@@ -0,0 +1,42 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '22 9 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/coding-standards.yml

@@ -0,0 +1,51 @@
+name: "CS"
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - 2.*
+
+permissions:
+  contents: read
+
+jobs:
+  coding-standards:
+    name: "CS Fixer, PHPStan & TwigCS"
+    runs-on: "ubuntu-20.04"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v3"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: "7.4"
+          tools: cs2pr, pecl
+          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@v2"
+        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"
+
+      - name: "Run TwigCS"
+        run: "php bin/twigcs --severity=error --display=blocking --reporter checkstyle app/ src/ | 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-20.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.4"
+          - "8.0"
+          - "8.1"
+        database:
+          - "sqlite"
+          - "mysql"
+          - "pgsql"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v3"
+        with:
+          fetch-depth: 2
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php }}"
+          coverage: none
+          tools: pecl
+          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 -h 127.0.0.1 -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@v2"
+        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/dependabot-automerge-js.yml

@@ -0,0 +1,25 @@
+name: Auto-merge Dependabot JS
+on: pull_request_target
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.3.4
+        with:
+          github-token: '${{ secrets.GITHUB_TOKEN }}'
+      - name: Approve and merge minor updates
+        if: ${{ steps.metadata.outputs.package-ecosystem == 'npm_and_yarn' && (steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch') }}
+        run: |
+          gh pr review --approve "$PR_URL"
+          gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/translations.yml

@@ -0,0 +1,50 @@
+name: "Translations"
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - 2.*
+
+permissions:
+  contents: read
+
+jobs:
+  translations:
+    name: "Translations"
+    runs-on: "ubuntu-20.04"
+
+    strategy:
+      matrix:
+        php:
+          - "7.4"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v3"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php }}"
+          tools: pecl
+          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@v2"
+        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"

.github/workflows/upload-release-package.yml

@@ -0,0 +1,39 @@
+name: "Upload release package"
+
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        php:
+          - "7.4"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v3"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php }}"
+          tools: pecl, composer:2.2
+          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: Create the package
+        run: make release VERSION=${{ github.event.release.tag_name }}
+
+      - name: Upload the package to the release
+        uses: shogo82148/actions-upload-release-asset@v1
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: /tmp/wllbg-release/wallabag-${{ github.event.release.tag_name }}.tar.gz

.gitignore

@@ -9,11 +9,12 @@
 !/var/sessions
 /var/sessions/*
 !var/sessions/.gitkeep
-!var/SymfonyRequirements.php
 /bin/*
 !/bin/console
-!/bin/symfony_requirements
-.php_cs.cache
+.php-cs-fixer.php
+.php-cs-fixer.cache
+.phpunit.result.cache
+phpunit.xml
 
 # Parameters
 /app/config/parameters.yml
@@ -34,16 +35,15 @@ web/uploads/
 /build
 /coverage
 
+# Development
+docker/php/env
+
 # Composer PHAR
 /composer.phar
 
 # Data for wallabag
 data/db/wallabag*.sqlite
 
-# Docker container logs and data
-docker/logs/
-docker/data/
-
 # assets stuff
 node_modules/
 bin

.nvmrc

@@ -0,0 +1 @@
+16

.php-cs-fixer.dist.php

@@ -1,6 +1,7 @@
 <?php
 
-return PhpCsFixer\Config::create()
+$config = new PhpCsFixer\Config();
+return $config
     ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
@@ -10,16 +11,18 @@ return PhpCsFixer\Config::create()
         ],
         'combine_consecutive_unsets' => true,
         'heredoc_to_nowdoc' => true,
-        'no_extra_consecutive_blank_lines' => [
-        'break',
-            'continue',
-            'extra',
-            'return',
-            'throw',
-            'use',
-            'parenthesis_brace_block',
-            'square_brace_block',
-            'curly_brace_block'
+        'no_extra_blank_lines' => [
+            'tokens' => [
+                'break',
+                'continue',
+                'extra',
+                'return',
+                'throw',
+                'use',
+                'parenthesis_brace_block',
+                'square_brace_block',
+                'curly_brace_block'
+            ],
         ],
         'no_unreachable_default_argument_value' => true,
         'no_useless_else' => true,
@@ -28,7 +31,7 @@ return PhpCsFixer\Config::create()
         'ordered_imports' => true,
         'php_unit_strict' => true,
         'phpdoc_order' => true,
-        // 'psr4' => true,
+        // 'psr_autoloading' => true,
         'strict_comparison' => true,
         'strict_param' => true,
         'concat_space' => [
@@ -38,10 +41,12 @@ return PhpCsFixer\Config::create()
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->exclude([
+                'node_modules',
                 'vendor',
                 'var',
                 'web'
             ])
             ->in(__DIR__)
     )
+    ->setCacheFile('.php-cs-fixer.cache')
 ;

.scrutinizer.yml

@@ -1,43 +0,0 @@
-filter:
-    paths:
-        - src/*
-    excluded_paths:
-        - 'vendor/*'
-        - 'app/*'
-        - 'var/*'
-        - 'web/*'
-        - 'src/Wallabag/*Bundle/Tests/*'
-        - '*Test.php'
-
-tools:
-    php_cs_fixer: true
-    php_analyzer: true
-    php_mess_detector: true
-    php_changetracking: true
-    php_code_sniffer: true
-    php_pdepend: true
-    sensiolabs_security_checker: true
-    #external_code_coverage:
-    #    timeout: 3600
-    php_code_coverage: true
-    php_sim: false
-    php_cpd: false
-
-checks:
-    php:
-        code_rating: true
-
-# use the new PHP analysis engine
-# https://scrutinizer-ci.com/docs/tools/php/php-analyzer/guides/migrate_to_new_php_analysis
-build:
-    nodes:
-        analysis:
-            tests:
-                override:
-                    - php-scrutinizer-run
-
-    dependencies:
-        override:
-            - npm install -g 'yarn'
-            - yarn install --force
-            - COMPOSER_MEMORY_LIMIT=-1 composer install -o --no-interaction --no-progress --prefer-dist

.stylelintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "stylelint-config-standard"
-}

.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,250 @@
 # Changelog
 
+## [2.5.2](https://github.com/wallabag/wallabag/tree/2.5.2)
+   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.5.1...2.5.2)
+
+### Fixes
+* Add `nbEntries` to the API tags list response by @j0k3r in https://github.com/wallabag/wallabag/pull/5984
+* Typofixes by @nexxai in https://github.com/wallabag/wallabag/pull/6004
+* Add `domain_name` to entries api endpoint by @yotamN in https://github.com/wallabag/wallabag/pull/6019
+* Add support to download SVG locally by @j0k3r in https://github.com/wallabag/wallabag/pull/5992
+
+### Meta
+* Automatically create the package after a release by @j0k3r in https://github.com/wallabag/wallabag/pull/5851
+* Add .gitattributes, exclude tests from archive by @iamvar in https://github.com/wallabag/wallabag/pull/5910
+* Allow auto merging of Dependabot JS minor or patch by @j0k3r in https://github.com/wallabag/wallabag/pull/6003
+* Fix random failing tests by @j0k3r in https://github.com/wallabag/wallabag/pull/6013
+
+## [2.5.1](https://github.com/wallabag/wallabag/tree/2.5.1)
+   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.5.0...2.5.1)
+
+### Fixes
+- Jump to Node 16 to build assets by @j0k3r in https://github.com/wallabag/wallabag/pull/5822
+- Update some deps by @j0k3r in https://github.com/wallabag/wallabag/pull/5834
+- Fix error about template not found in 2fa form by @j0k3r in https://github.com/wallabag/wallabag/pull/5833
+- Translations update from Hosted Weblate by @weblate in https://github.com/wallabag/wallabag/pull/5846
+- material: fix "untagged entries" chip style by @Kdecherf in https://github.com/wallabag/wallabag/pull/5840
+
+## [2.5.0](https://github.com/wallabag/wallabag/tree/2.5.0)
+   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.4.3...2.5.0)
+
+### Features
+
+- Add Delicious import by @j0k3r in https://github.com/wallabag/wallabag/pull/5022
+- Add route to list entries with annotations by @nicosomb in https://github.com/wallabag/wallabag/pull/4341
+- Add an option to sort the feed entries by `updated_at` by @agallou in https://github.com/wallabag/wallabag/pull/5659
+- Add support to download webp image locally by @j0k3r in https://github.com/wallabag/wallabag/pull/5687
+- Update readme and docker development env by @Kdecherf in https://github.com/wallabag/wallabag/pull/5662
+- Add action to assign a search as a tag to each result by @nicosomb in https://github.com/wallabag/wallabag/pull/5381
+- Drop PHP prior to 7.4 by @yguedidi in https://github.com/wallabag/wallabag/pull/5791
+
+### Deprecated features
+- Deprecate Baggy theme by @j0k3r in https://github.com/wallabag/wallabag/pull/5742
+- Deprecate mobi export by @Kdecherf in https://github.com/wallabag/wallabag/pull/5775
+
+### API
+
+- Add new endpoint for API: config by @nicosomb in https://github.com/wallabag/wallabag/pull/5673
+
+### Technical stuff
+
+- Fix test with `usinenouvelle.com` being flaky these times by @j0k3r in https://github.com/wallabag/wallabag/pull/5686
+- Replace `iconv()` calls with Transliterator by @Kdecherf in https://github.com/wallabag/wallabag/pull/5680
+- Composer 2.3 isn't compatible with wallabag by @j0k3r in https://github.com/wallabag/wallabag/pull/5708
+- CI workaround for PHP < 7.4 & MySQL 8 by @j0k3r in https://github.com/wallabag/wallabag/pull/5729
+- Set permissions for GitHub actions by @naveensrinivasan in https://github.com/wallabag/wallabag/pull/5732
+- Included githubactions in the dependabot config by @naveensrinivasan in https://github.com/wallabag/wallabag/pull/5737
+- Remove bundle inheritance by @yguedidi in https://github.com/wallabag/wallabag/pull/5746
+- Fix SQLite database location by @yguedidi in https://github.com/wallabag/wallabag/pull/5771
+- Disable XDebug in test make recipe by @yguedidi in https://github.com/wallabag/wallabag/pull/5770
+- Exclude local phpunit.xml by @yguedidi in https://github.com/wallabag/wallabag/pull/5757
+- Upgrade PHP dependencies by @yguedidi in https://github.com/wallabag/wallabag/pull/5778
+
+### Translations
+
+- Enabled greek translation by @nicosomb in https://github.com/wallabag/wallabag/pull/5656
+- Translations update from Hosted Weblate by @weblate see https://github.com/wallabag/wallabag/pulls?q=is%3Apr+author%3Aweblate+milestone%3A2.5.0+is%3Amerged
+
+### Fixes
+
+- Fix tagging rule match when user has a custom reading speed by @j0k3r in https://github.com/wallabag/wallabag/pull/5646
+- Feat/home entries updated by @Simounet in https://github.com/wallabag/wallabag/pull/5664
+- Fix row and card style regressions by @Simounet in https://github.com/wallabag/wallabag/pull/5676
+- Fix epub language by @j0k3r in https://github.com/wallabag/wallabag/pull/5647
+- material: improve mass buttons style, mostly for smartphone screens by @Kdecherf in https://github.com/wallabag/wallabag/pull/5695
+- Fix composer version in docker dev configuration by @nicosomb in https://github.com/wallabag/wallabag/pull/5715
+- Use site with subdomain as tagging rule example by @jonas-hagen in https://github.com/wallabag/wallabag/pull/5744
+- Fix PHP Docker image by @yguedidi in https://github.com/wallabag/wallabag/pull/5772
+
+## [2.4.3](https://github.com/wallabag/wallabag/tree/2.4.3)
+   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.4.2...2.4.3)
+
+### Fixes
+* Tag view: order tags by label @Kdecherf in https://github.com/wallabag/wallabag/pull/5296
+* Pagination style updated by @Simounet in https://github.com/wallabag/wallabag/pull/5202
+* Improve performance of REST exists call by @Kdecherf in https://github.com/wallabag/wallabag/pull/5261
+* Make RSS feed entry links valid and accessible by @hennevogel in https://github.com/wallabag/wallabag/pull/5347
+* Fixed search on homepage by @nicosomb in https://github.com/wallabag/wallabag/pull/5379
+* Fixed timeout when assigning tags to entry by @nicosomb in https://github.com/wallabag/wallabag/pull/5156
+* Fixed reading time in epub/pdf exports by @nicosomb in https://github.com/wallabag/wallabag/pull/5405
+* Fix dark theme developper page by @Simounet in https://github.com/wallabag/wallabag/pull/5453
+* Fix dark mode background color for pre tags by @Kdecherf in https://github.com/wallabag/wallabag/pull/5465
+* Show when articles is read by @nicosomb in https://github.com/wallabag/wallabag/pull/5378
+* Added random button on article view by @nicosomb in https://github.com/wallabag/wallabag/pull/5380
+* Fixed wrong number of entries for tag feeds by @christianjunk in https://github.com/wallabag/wallabag/pull/5585
+* Add support for RTL content by @Monirzadeh in https://github.com/wallabag/wallabag/pull/5599
+* Avoid overlapping images when downloading them by @j0k3r in https://github.com/wallabag/wallabag/pull/5594
+
+### Meta
+* Fix/tests by @Simounet in https://github.com/wallabag/wallabag/pull/5217
+* dependabot: change schedule to check updates once a month by @Kdecherf in https://github.com/wallabag/wallabag/pull/5260
+* Update dependencies by @Kdecherf in https://github.com/wallabag/wallabag/pull/5326
+* Create SECURITY.md by @zidingz in https://github.com/wallabag/wallabag/pull/5406
+* Add build test on PHP 8.0 & 8.1 by @j0k3r in https://github.com/wallabag/wallabag/pull/5591
+* Fix Dependabot alerts for `tar` & `json-schema` by @j0k3r in https://github.com/wallabag/wallabag/pull/5541
+* Change the name of the static package's root directory by @oupala in https://github.com/wallabag/wallabag/pull/5542
+* Fixed unavailable russian website in test by @nicosomb in https://github.com/wallabag/wallabag/pull/5376
+* Update deps by @j0k3r in https://github.com/wallabag/wallabag/pull/5540
+
+### Translations
+* Translations update from Weblate by @weblate in https://github.com/wallabag/wallabag/pull/5187
+* Translations update from Weblate by @weblate in https://github.com/wallabag/wallabag/pull/5391
+* Add Czech language by @marapavelka in https://github.com/wallabag/wallabag/pull/5535
+* Translations update from Hosted Weblate by @weblate in https://github.com/wallabag/wallabag/pull/5580
+* Translations update from Hosted Weblate by @weblate in https://github.com/wallabag/wallabag/pull/5581
+
+## [2.4.2](https://github.com/wallabag/wallabag/tree/2.4.2)
+   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.4.1...2.4.2)
+
+### Fixes
+- Fix nav lang filter [#4908](https://github.com/wallabag/wallabag/pull/4908)
+- Fix accessibility problem with the 2FA QR code [#4915](https://github.com/wallabag/wallabag/pull/4915)
+- Preselect currently active section in the filter menu [#4972](https://github.com/wallabag/wallabag/pull/4972)
+- Fix translation of date in the footer using IntlDateFormatter [#4971](https://github.com/wallabag/wallabag/pull/4971)
+- Update dark theme [#4921](https://github.com/wallabag/wallabag/pull/4921)
+- Dark theme updated [#4983](https://github.com/wallabag/wallabag/pull/4983)
+- Fix account dropdown width [#4969](https://github.com/wallabag/wallabag/pull/4969)
+- Fix auto prefered color scheme [#5071](https://github.com/wallabag/wallabag/pull/5071)
+- Convert tag label to lowercase in RuleBasedTagger [#5111](https://github.com/wallabag/wallabag/pull/5111)
+- Fix myreadspeed links [#5113](https://github.com/wallabag/wallabag/pull/5113)
+- Internal server error while exporting to epub [#5052](https://github.com/wallabag/wallabag/issues/5052)
+- Error parsing image URL (with scrset) [#4914](https://github.com/wallabag/wallabag/issues/4914)
+
+## [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)
 

CREDITS.md

@@ -1,3 +1,3 @@
-wallabag is mainly developed by [Nicolas Lœuillet](https://github.com/nicosomb), [@j0k3r](https://github.com/j0k3r) and [@tcitworld](https://github.com/tcitworld) under the MIT License.
+wallabag is mainly developed by [Nicolas Lœuillet](https://github.com/nicosomb), [@j0k3r](https://github.com/j0k3r), [@tcitworld](https://github.com/tcitworld) and [@Kdecherf](https://github.com/Kdecherf) under the MIT License.
 
 Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors).

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
@@ -46,7 +46,7 @@ fixtures: ## Load fixtures into database
 	php bin/console doctrine:fixtures:load --no-interaction --env=test
 
 test: prepare fixtures ## Launch wallabag testsuite
-	bin/simple-phpunit -v
+	XDEBUG_MODE=off php -dmemory_limit=-1 bin/simple-phpunit -v
 
 release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
 ifndef VERSION

README.md

@@ -1,35 +1,61 @@
-[![Build Status](https://api.travis-ci.org/wallabag/wallabag.svg?branch=master)](https://travis-ci.org/wallabag/wallabag)
+# wallabag
+
+![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)
+![License](https://img.shields.io/github/license/wallabag/wallabag)
 
-# What is wallabag?
-wallabag is a self-hostable PHP application allowing you to not miss any content anymore.
-Click, save and read it when you can. It extracts content so that you can read it when you have time.
+wallabag is a web application allowing you to save web pages for later reading.
+Click, save and read it when you want. It extracts content so that you won't be distracted by pop-ups and cie.
 
-More information on our website: [wallabag.org](https://wallabag.org).
+You can install it on your own server, or you can create an account on [wallabag.it](https://wallabag.it).
 
-If you do not have your own server, consider [the wallabag.it hosting solution](https://wallabag.it).
+![wallabag](./.github/images/screenshot.png)
 
-![wallabag logo](https://raw.githubusercontent.com/wallabag/logo/master/_default/typo-horizontal/png/sm/logo-typo-horizontal-black-no-bg-no-border-sm.png)
+* Website: [wallabag.org](https://wallabag.org)
+* Android app: [wallabag/android-app](https://github.com/wallabag/android-app)
+* iOS app: [wallabag/ios-app](https://github.com/wallabag/ios-app)
+* Browser extension: [wallabag/wallabagger](https://github.com/wallabag/wallabagger)
+
+## Documentation
+
+The documentation is available at https://doc.wallabag.org.
+
+You can contribute to it through its dedicated repository, available here: https://github.com/wallabag/doc.
+
+## Installation
 
-# 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
 ```
 
 Now, [configure a virtual host](https://doc.wallabag.org/en/admin/installation/virtualhosts.html) to use your wallabag.
 
-# Run on YunoHost
-[![Install Wallabag with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=wallabag2)
+### Other methods
 
-Wallabag app for [YunoHost](https://yunohost.org). See [here](https://github.com/YunoHost-Apps/wallabag2_ynh)
+Refer to the [installation documentation](https://doc.wallabag.org/en/admin/installation/installation.html) for other installation methods.
 
-# License
+## Translation
+
+This project uses [Weblate](https://weblate.org/) for translation.
+
+Feel free to help us [translating wallabag](https://hosted.weblate.org/projects/wallabag/).
+
+## Contributing
+
+To learn more about developing wallabag, please refer to the [contribution guide](./.github/CONTRIBUTING.md).
+
+Content extraction relies on [Graby](https://github.com/j0k3r/graby), [php-readability](https://github.com/j0k3r/php-readability) and [ftr-site-config](https://github.com/fivefilters/ftr-site-config).
+
+## License
 Copyright © 2013-current Nicolas Lœuillet <nicolas@loeuillet.org>
+
 This work is free. You can redistribute it and/or modify it under the
-terms of the MIT License. See the COPYING file for more details.
+terms of the MIT License. See the [COPYING.md](./COPYING.md) file for more details.

RELEASE_PROCESS.md

@@ -16,33 +16,8 @@ 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:
-
-```
-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`)
+- [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).
+- 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`)
@@ -57,7 +32,7 @@ be locally specified in `composer.lock`:
 ```json
     "config": {
         "platform": {
-            "php": "7.1.3",
+            "php": "7.4.29",
             "ext-something": "4.0"
         }
     }

SECURITY.md

@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please report security issues to `hello@wallabag.org`

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(),
@@ -48,7 +48,6 @@ class AppKernel extends Kernel
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
             $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
-            $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
             $bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle();
 
             if ('test' === $this->getEnvironment()) {

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/DoctrineMigrations/Version20200414120227.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Application\Migrations;
+
+use Doctrine\DBAL\Migrations\SkipMigrationException;
+use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+
+/**
+ * Remove baggy theme.
+ */
+final class Version20200414120227 extends WallabagMigration
+{
+    public function up(Schema $schema): void
+    {
+        $this->addSql('UPDATE ' . $this->getTable('config', true) . " SET theme = 'material';");
+    }
+
+    public function down(Schema $schema): void
+    {
+        throw new SkipMigrationException('Not possible ... ');
+    }
+}

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.an.yml

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

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ar.yml

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

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ca.yml

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

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

@@ -0,0 +1,37 @@
+matomo_enabled: Povolit Matomo
+unmark_url: Adresa URL Unmark, pokud je služba povolena
+shaarli_url: Adresa URL Shaarli, pokud je služba povolena
+share_unmark: Povolit sdílení na Unmark.it
+share_twitter: Povolit sdílení na Twitteru
+share_shaarli: Povolit sdílení na Shaarli
+share_mail: Povolit sdílení e-mailem
+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: Adresa URL diaspora*, pokud je služba povolena
+download_pictures: Stáhnout obrázky na váš server
+settings_changed: Konfigurace byla aktualizována
+shaarli_share_origin_url: Povolit sdílení původní adresy URL na Shaarli, pokud je služba povolena
+store_article_headers: Povolit, pokud Wallabag ukládá záhlaví HTTP pro každý článek
+api_user_registration: Zapnout registraci uživatelů prostřednictvím API
+restricted_access: Povolit ověřování pro placené webové stránky
+download_images_enabled: Stahovat obrázky místně
+share_public: Povolit veřejné adresy URL pro položky
+demo_mode_username: Ukázkový uživatel
+demo_mode_enabled: Povolit ukázkový režim (Používá se pouze pro veřejnou ukázku Wallabag)
+matomo_site_id: ID vaší webové stránky na Matomo
+matomo_host: Hostitel vaší webové stránky na Matomo (bez http:// nebo https://)
+modify_settings: použít
+misc: různé
+import: import
+export: export
+entry: článek
+wallabag_support_url: Adresa URL pro podporu Wallabag
+show_printlink: Zobrazit odkaz pro vytištění obsahu
+import_with_redis: Povolit Redis pro asynchronní import dat
+import_with_rabbitmq: Povolit RabbitMQ pro asynchronní import dat

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

@@ -1,7 +1,5 @@
-# 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,15 +7,11 @@ 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
 share_twitter: Aktiver deling gennem Twitter
 share_unmark: Aktiver deling gennem Unmark.it
 show_printlink: Vis et link til print-indhold
@@ -32,9 +26,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,40 @@
-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
+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
+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

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.el.yml

@@ -0,0 +1,37 @@
+shaarli_share_origin_url: Ενεργοποίηση κοινοποίησης πρωτότυπου URL στο Shaarli, αν είναι ενεργοποιημένη η υπηρεσία
+store_article_headers: Ενεργοποίηση αποθήκευσης επικεφαλίδων HTTP για κάθε άρθρο
+api_user_registration: Ενεργοποίηση εγγραφής χρήστη μέσω του API
+restricted_access: Ενεργοποίηση επαλήθευσης για ιστοσελίδες με paywall
+download_images_enabled: Λήψη εικόνων τοπικά
+share_public: Να επιτρέπονται URL για τα άρθρα
+demo_mode_username: Χρήστης demo
+demo_mode_enabled: Ενεργοποίηση λειτουργίας demo; (Χρησιμοποιείται μόνο για το δημόσιο demo του wallabag)
+matomo_enabled: Ενεργοποίηση Matomo
+matomo_site_id: ID της ιστοσελίδας σας στο Matomo
+matomo_host: Διεύθυνση της ιστοσελίδας σας στο Matomo (χωρίς http:// ή https://)
+modify_settings: εφαρμογή
+misc: ποικίλα
+import: εισαγωγή
+export: εξαγωγή
+entry: άρθρο
+wallabag_support_url: Υποστήριξη URL για wallabag
+show_printlink: Προβολή συνδέσμου για εκτύπωση περιεχομένου
+share_unmark: Ενεργοποίηση κοινοποίησης στο Unmark.it
+share_twitter: Ενεργοποίηση κοινοποίησης στο Twitter
+share_shaarli: Ενεργοποίηση κοινοποίησης στο Shaarli
+share_mail: Ενεργοποίηση κοινοποίησης με ηλεκτρονικό ταχυδρομείο
+share_diaspora: Ενεργοποίηση κοινοποίησης στο diaspora*
+unmark_url: URL του Unmark, αν είναι ενεργοποιημένη η υπηρεσία
+shaarli_url: URL του Shaarli, αν είναι ενεργοποιημένη η υπηρεσία
+import_with_redis: Ενεργοποίηση Redis για την ασύγχρονη εισαγωγή δεδομένων
+import_with_rabbitmq: Ενεργοποίηση RabbitMQ για την ασύγχρονη εισαγωγή δεδομένων
+export_xml: Ενεργοποίηση εξαγωγής ΧΜΛ
+export_txt: Ενεργοποίηση εξαγωγής TXT
+export_json: Ενεργοποίηση εξαγωγής JSON
+export_csv: Ενεργοποίηση εξαγωγής CSV
+export_pdf: Ενεργοποίηση εξαγωγής PDF
+export_mobi: Ενεργοποίηση εξαγωγής .mobi
+export_epub: Ενεργοποίηση εξαγωγής ePub
+diaspora_url: URL του diaspora*, αν είναι ενεργοποιημένη η υπηρεσία
+download_pictures: Λήψη των εικόνων στον διακομιστή σας
+settings_changed: Η ρύθμιση παραμέτρων ενημερώθηκε

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

@@ -1,9 +1,8 @@
 settings_changed: Configuration updated
-download_pictures: Download pictures on your server
-carrot: Enable share to Carrot
+download_pictures: Download pictures onto your server
 diaspora_url: diaspora* URL, if the service is enabled
 export_epub: Enable ePub export
-export_mobi: Enable .mobi export
+export_mobi: Enable .mobi export (deprecated, will be removed soon)
 export_pdf: Enable PDF export
 export_csv: Enable CSV export
 export_json: Enable JSON export
@@ -12,29 +11,27 @@ 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 e-mail
 share_shaarli: Enable sharing to Shaarli
-share_scuttle: Enable sharing to Scuttle
 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,6 @@
 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
+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
@@ -12,15 +11,13 @@ export_xml: Activar exportación a XML
 import_with_rabbitmq: Activar RabbitMQ para importar datos de forma asíncrona
 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_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 +29,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.eu.yml

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

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

@@ -1,6 +1,4 @@
-# settings_changed: Configuration updated
 download_pictures: تصاویر را در کارگزار خودتان باربگیرید
-carrot: فعال‌سازی هم‌رسانی به Carrot
 diaspora_url: نشانی Diaspora، اگر فعال بود
 export_epub: فعال‌سازی برون‌سپاری به ePub
 export_mobi: فعال‌سازی برون‌سپاری به mobi
@@ -9,15 +7,11 @@ 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، اگر فعال بود
 share_diaspora: فعال‌سازی هم‌رسانی به Diaspora
 share_mail:  فعال‌سازی هم‌رسانی با ایمیل
 share_shaarli:  فعال‌سازی هم‌رسانی به Shaarli
-share_scuttle:  فعال‌سازی هم‌رسانی به Scuttle
 share_twitter:  فعال‌سازی هم‌رسانی به Twitter
 share_unmark:  فعال‌سازی هم‌رسانی به Unmark.it
 show_printlink: نمایش پیوندی برای چاپ مطلب
@@ -27,14 +21,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,9 +1,8 @@
 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_mobi: Activer l'export .mobi (déprécié, sera supprimé prochainement)
 export_pdf: Activer l'export PDF
 export_csv: Activer l'export CSV
 export_json: Activer l'export JSON
@@ -12,29 +11,27 @@ export_xml: Activer l'export XML
 import_with_rabbitmq: Activer RabbitMQ pour gérer les imports de façon asynchrone
 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.gl.yml

@@ -0,0 +1,37 @@
+shaarli_share_origin_url: Activar a compartición do URL de orixe en Shaarli, se o servizo está activo
+store_article_headers: Activar se wallabag garda cabeceiras HTTP para cada artigo
+api_user_registration: Activar rexistro de usuarias a través da API
+restricted_access: Activar autenticación para sitios web con acceso de pagamento
+download_images_enabled: Descargar imaxes localmente
+share_public: Permitir URLs públicos para entradas
+demo_mode_username: Usuaria Demo
+demo_mode_enabled: Activar modo demostración? (Só se usa na demo pública de wallabag)
+matomo_enabled: Activar Matomo
+matomo_site_id: ID do teu sitio web en Matomo
+matomo_host: Servidor do teu sitio web en Matomo (sen http:// ou https://)
+modify_settings: aplicar
+misc: varios
+import: importar
+export: exportar
+entry: artigo
+wallabag_support_url: URL de axuda de wallabag
+show_printlink: Mostrar unha ligazón para imprimir o contido
+share_unmark: Activar a compartición en Unmark.it
+share_twitter: Activar a compartición en Twitter
+share_shaarli: Activar a compartición en Shaarli
+share_mail: Activar a compartición por email
+share_diaspora: Activar a compartición en diaspora*
+unmark_url: URL Unmark, se o servizo está activo
+shaarli_url: URL Shaarli, se o servizo está activo
+import_with_redis: Activar a importación asíncrona con Redis
+import_with_rabbitmq: Activar a importación asíncrona con RabbitMQ
+export_xml: Activar exportación XML
+export_txt: Activar exportación TXT
+export_json: Activar exportación JSON
+export_csv: Activar exportación CSV
+export_pdf: Activar exportación PDF
+export_mobi: Activar exportación .mobi (xa non se usa, vai ser eliminada)
+export_epub: Activar exportación ePub
+diaspora_url: URL de diaspora*, se o servizo está activo
+download_pictures: Descargar imaxes no teu servidor
+settings_changed: Configuración actualizada

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

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

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

@@ -0,0 +1,39 @@
+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 (zastarjelo, uskoro će se ukloniti)
+demo_mode_enabled: Aktivirati demo modus? (Koristi se samo za javnu wallabag demonstraciju)
+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,39 @@
+settings_changed: Beállítások frissítve
+download_pictures: Képek letöltése a kiszolgáló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
+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_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.id.yml

@@ -0,0 +1,37 @@
+export_txt: Aktifkan pengeksporan TXT
+export_json: Aktifkan pengeksporan JSON
+export_csv: Aktifkan pengeksporan CSV
+export_pdf: Aktifkan pengeksporan PDF
+export_mobi: Aktifkan pengeksporan .mobi
+export_epub: Aktifkan pengeksporan ePub
+diaspora_url: URL diaspora*, jika layanan diaktifkan
+settings_changed: Konfigurasi diperbarui
+share_unmark: Aktifkan berbagi ke Unmark.it
+shaarli_share_origin_url: Aktifkan berbagi URL asal ke Shaarli, jika layanan diaktifkan
+share_public: Izinkan URL publik untuk entri
+restricted_access: Aktifkan otentikasi untuk situs web berbayar
+share_twitter: Aktifkan berbagi ke Twitter
+demo_mode_enabled: Aktifkan mode demo? (Hanya digunakan untuk demo wallabag publik)
+download_images_enabled: Unduh gambar secara lokal
+store_article_headers: Aktifkan jika wallabag menyimpan header HTTP untuk setiap artikel
+api_user_registration: Aktifkan pendaftaran pengguna melalui API
+demo_mode_username: Pengguna demo
+download_pictures: Unduh gambar ke server Anda
+export_xml: Aktifkan ekspor XML
+import_with_rabbitmq: Aktifkan RabbitMQ untuk mengimpor data secara asinkron
+import_with_redis: Aktifkan Redis untuk mengimpor data secara asinkron
+shaarli_url: URL Shaarli, jika layanan diaktifkan
+unmark_url: Unmark URL, jika layanan diaktifkan
+share_diaspora: Aktifkan berbagi ke diaspora*
+share_mail: Aktifkan berbagi melalui email
+share_shaarli: Aktifkan berbagi ke Shaarli
+show_printlink: Tampilkan tautan untuk mencetak konten
+wallabag_support_url: URL dukungan untuk wallabag
+entry: artikel
+export: ekspor
+import: impor
+misc: lainnya
+modify_settings: terapkan
+matomo_host: Host situs web Anda di Matomo (tanpa http:// atau https://)
+matomo_site_id: ID situs web Anda di Matomo
+matomo_enabled: Aktifkan Matomo

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

@@ -1,23 +1,17 @@
-# 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_mobi: Abilita esportazione .mobi (deprecato, verrà rimosso presto)
 export_pdf: Abilita esportazione PDF
 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
+shaarli_url: URL Shaarli, se il servizio è abilitato
+unmark_url: URL Unmark, se il servizio è abilitato
+share_diaspora: Abilita la condivisione con diaspora*
+share_mail: Abilita la condivisione via e-mail
 share_shaarli: Abilita la condivisione con Shaarli
-share_scuttle: Abilita la condivisione con Scuttle
 share_twitter: Abilita la condivisione con Twitter
 share_unmark: Abilita la condivisione con Unmark.it
 show_printlink: Mostra un collegamento per stampare il contenuto
@@ -32,9 +26,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,37 @@
-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、サービスが有効な場合
+settings_changed: 設定を更新しました
+download_pictures: サーバー上の画像をダウンロード
+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
 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_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,37 @@
+download_pictures: 서버로 이미지를 다운로드
+shaarli_share_origin_url: Shaarli에서 원래 URL 공유 활성화 (서비스가 활성화 된 경우)
+store_article_headers: Wallabag이 각 기사에 대한 HTTP 헤더를 저장하는 경우 활성화
+api_user_registration: API를 통해 사용자 등록 활성화
+restricted_access: 유료 웹 사이트에 대한 인증 활성화
+download_images_enabled: 이미지를 로컬로 다운로드
+share_public: 항목의 공개 URL 허용
+demo_mode_username: 데모 사용자
+demo_mode_enabled: 데모 모드를 사용 하시겠습니까? (공개 Wallabag 데모에만 사용됨)
+matomo_enabled: Matomo 활성화
+matomo_site_id: Matomo 웹 사이트 ID
+matomo_host: Matomo 웹 사이트의 호스트 (http:// 또는 https:// 없음)
+modify_settings: 적용
+misc: 기타
+import: 가져오기
+export: 내보내기
+entry: 기사
+wallabag_support_url: Wallabag 지원 URL
+show_printlink: 콘텐츠 인쇄 링크 표시
+share_unmark: Unmark.it 공유 활성화
+diaspora_url: Diaspora* URL (서비스가 활성화 된 경우)
+share_shaarli: Shaarli 공유 활성화
+share_mail: 이메일 공유 활성화
+share_diaspora: Diaspora* 공유 활성화
+share_twitter: Twitter 공유 활성화
+unmark_url: Unmark URL (서비스가 활성화 된 경우)
+shaarli_url: Shaarli URL (서비스가 활성화 된 경우)
+import_with_redis: Redis가 데이터를 비동기적으로 가져오도록 설정
+import_with_rabbitmq: RabbitMQ가 데이터를 비동기적으로 가져오도록 설정
+export_xml: XML 내보내기 활성화
+export_txt: TXT 내보내기 활성화
+export_json: JSON 내보내기 활성화
+export_csv: CSV 내보내기 활성화
+export_pdf: PDF 내보내기 활성화
+export_mobi: .mobi 내보내기 활성화
+export_epub: ePub 내보내기 활성화
+settings_changed: 설정을 업데이트했습니다

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.lt.yml

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

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

@@ -0,0 +1,40 @@
+settings_changed: Oppsett oppdatert
+download_pictures: Last ned bilder til tjeneren din
+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
+unmark_url: Unmark-nettadresse, hvis tjenesten er påskrudd
+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,38 @@
+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_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
+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,6 @@
 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
@@ -12,7 +11,6 @@ export_xml: Activar l'expòrt XML
 import_with_rabbitmq: Activar RabbitMQ per importar de donadas de manièra asincròna
 import_with_redis: Activar Redis per importar de donadas de manièra asincròna
 shaarli_url: URL de Shaarli, se lo servici Shaarli es activat
-scuttle_url: URL de Scuttle, se lo servici Scuttle es activat
 unmark_url: URL de Unmark, se lo servici Scuttle es activat
 share_diaspora: Activar lo partatge cap a Diaspora*
 share_mail: Activar lo partatge per corrièl

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

@@ -1,9 +1,8 @@
 settings_changed: Konfiguracja zaktualizowana
 download_pictures: Pobierz obrazy na swój serwer
-carrot: Włącz udostępnianie dla Carrot
 diaspora_url: Adres URL Diaspora, jeżeli usługa jest włączona
 export_epub: Włącz eksport do ePub
-export_mobi: Włącz eksport do .mobi
+export_mobi: Włącz eksport do plików .mobi (przestarzałe, zostanie wkrótce usunięte)
 export_pdf: Włącz eksport do PDF
 export_csv: Włącz eksport do CSV
 export_json: Włącz eksport do JSON
@@ -12,28 +11,27 @@ export_xml: Włącz eksport do XML
 import_with_rabbitmq: Włącz RabbitMQ dla asynchronicznego importu danych
 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łączyć tryb demonstracyjny? (Używany wyłącznie do 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 oryginalnego adresu URL do Shaarli, jeśli usługa jest włączona

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

@@ -1,7 +1,5 @@
-# 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
+download_pictures: Descarregar imagens ao seu servidor
+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,16 +7,12 @@ 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
+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
 share_twitter: Habilitar compartilhamento para o Twitter
 share_unmark: Habilitar compartilhamento para o Unmark.it
 show_printlink: Mostrar um link para imprimir o conteúdo
@@ -32,10 +26,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,5 @@
-# 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,15 +7,11 @@ 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
 share_twitter: Permite share către Twitter
 share_unmark: Permite share către Unmark.it
 show_printlink: Afișează un link pentru a printa content-ul
@@ -27,14 +21,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

@@ -1,6 +1,5 @@
 settings_changed: "Настройки обновлены"
 download_pictures: "Скачивать картинки на Ваш сервер"
-carrot: "Включить возможность отслеживания событий через Carrot"
 diaspora_url: "Diaspora URL, если сервис включен"
 export_epub: "Включить ePub экспорт"
 export_mobi: "Включить .mobi экспорт"
@@ -12,7 +11,6 @@ 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: "Включить возможность поделиться по email"
@@ -35,6 +33,6 @@ 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

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

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

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

@@ -1,6 +1,5 @@
 settings_changed: ปรับปรุงองค์ประกอบ
 download_pictures: ดาวน์โหลดรูปภาพผ่านเซิฟเวอร์ของคุณ
-carrot: เปิดการแชร์ Carrot
 diaspora_url: Diaspora-URL, ถ้าเซิฟเวอร์ถูกเปิดใช้งาน
 export_epub: เปิดใช้งานการนำเข้าข้อมูลแบบ ePub
 export_mobi: เปิดใช้งานการนำเข้าข้อมูลแบบ .mobi
@@ -15,7 +14,6 @@ shaarli_url: Shaarli-URL, ถ้าเซิฟเวอร์ถูกเปิ
 share_diaspora: เปิดการแชร์ Diaspora
 share_mail: เปิดการแชร์ผ่าน email
 share_shaarli: เปิดการแชร์ Shaarli
-share_scuttle: เปิดการแชร์ Scuttle
 share_twitter: เปิดการแชร์ Twitter
 share_unmark: เปิดการแชร์ Unmark.it
 show_printlink: แสดงลิงค์เพื่อปรินท์เนื้อหา
@@ -34,4 +32,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,37 @@
-# 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
+diaspora_url: hizmet etkinse diaspora* URL'si
+export_epub: ePub dışa aktarımını etkinleştir
+export_mobi: .mobi dışa aktarımını etkinleştir (kullanım dışı, yakında kaldırılacak)
+export_pdf: PDF dışa aktarımını etkinleştir
+export_csv: CSV dışa aktarımını etkinleştir
+export_json: JSON dışa aktarımını etkinleştir
+export_txt: TXT dışa aktarımını etkinleştir
+export_xml: XML dışa aktarımını etkinleştir
+import_with_rabbitmq: Verileri eşzamansız olarak içe aktarmak için RabbitMQ'yu etkinleştir
+import_with_redis: Verileri eşzamansız olarak içe aktarmak için Redis'i etkinleştir
+shaarli_url: Hizmet etkinse Shaarli URL'si
+unmark_url: Hizmet etkinse Unmark URL'si
+share_diaspora: diaspora*'ya paylaşımı etkinleştir
+share_mail: E-posta ile paylaşımı etkinleştir
+share_shaarli: Shaarli'ye paylaşımı etkinleştir
+share_twitter: Twitter'a paylaşımı etkinleştir
+share_unmark: Unmark.it'e paylaşımı etkinleş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'yu etkinleştir
+demo_mode_enabled: Demo mod etkinleştirilsin mi (Yalnızca herkese açık wallabag demoları için kullanılır)
+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 siteler için kimlik doğrulamayı etkinleştir
+api_user_registration: API aracılığıyla kullanıcı kaydını aç
+store_article_headers: Eğer wallabag her makale için HTTP üst bilgilerini saklıyorsa etkinleştirin
+shaarli_share_origin_url: Hizmet etkinse, orijinal URL'yi Shaarli'ye paylaşmayı etkinleştir

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

@@ -0,0 +1,37 @@
+settings_changed: Конфігурацію оновлено
+download_pictures: Завантажити картинки на ваш сервер
+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, якщо сервіс увімкнено
+unmark_url: Unmark URL, якщо сервіс увімкнено
+share_diaspora: Дозволити ділитися в diaspora*
+share_mail: Дозволити ділитись електронною поштою
+share_shaarli: Дозволити ділитися в Shaarli
+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.yml

@@ -1,9 +1,8 @@
 settings_changed: 配置已更新
 download_pictures: 在你的服务器上缓存图片
-carrot: 启用分享到 Carrot
 diaspora_url: diaspora* 链接，如果该服务已被启用
 export_epub: 启用 ePub 导出
-export_mobi: 启用 .mobi 导出
+export_mobi: 启用 .mobi 导出（已废弃，不久后将移除）
 export_pdf: 启用 PDF 导出
 export_csv: 启用 CSV 导出
 export_json: 启用 JSON 导出
@@ -12,12 +11,10 @@ export_xml: 启用 XML 导出
 import_with_rabbitmq: 启用 RabbitMQ 来异步导入数据
 import_with_redis: 启用 Redis 来异步导入数据
 shaarli_url: Shaarli 链接，如果该服务已被启用
-scuttle_url: Scuttle 链接，如果该服务已被启用
 unmark_url: Unmark 链接，如果该服务已被启用
 share_diaspora: 启用分享到 diaspora*
 share_mail: 启用邮件分享
 share_shaarli: 启用分享到 Shaarli
-share_scuttle: 启用分享到 Scuttle
 share_twitter: 启用分享到 Twitter
 share_unmark: 启用分享到 Unmark.it
 show_printlink: 展示一个用于打印内容的链接
@@ -26,15 +23,15 @@ entry: "文章"
 export: "导出"
 import: "导入"
 misc: "杂项"
-modify_settings: "申请"
+modify_settings: "应用"
 matomo_host: 你的网站在 Matomo 的主机名（不包括 http:// or https://）
 matomo_site_id: 你的网站在 Matomo 的 ID
 matomo_enabled: 启用 Matomo
 demo_mode_enabled: "启用演示模式？(仅用于 wallabag 公开演示)"
-demo_mode_username: "Demo user"
+demo_mode_username: "Demo 用户名"
 share_public: 允许为项目启用公开链接
 download_images_enabled: 在本地缓存图片
 restricted_access: 启用针对带有付费墙网站的认证
 api_user_registration: 允许新用户通过 API 注册
 store_article_headers: 让 wallabag 存储每篇文章的 HTTP header
-shaarli_share_origin_url: 选择分享原始链接到 Shaarli，如果该服务已被启用
+shaarli_share_origin_url: 如果启用了服务，则将原始链接分享到 Shaarli

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

@@ -0,0 +1,4 @@
+download_pictures: 下載圖片至你的服務器上
+diaspora_url: diaspora* URL(如果該服務已啟用)
+settings_changed: 已更新設定
+export_epub: 啟用 ePub 輸出

app/Resources/CraueConfigBundle/views/Settings/modify.html.twig

@@ -1,4 +1,4 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
+{% extends "@WallabagCore/layout.html.twig" %}
 
 {% block title %}{{ 'menu.left.internal_settings'|trans }}{% endblock %}
 
@@ -12,17 +12,17 @@
                     <div class="row">
                         <div class="div_tabs col s12">
                             <ul class="tabs">
-                                {% for section in sections | craue_sortSections %}
-                                    <li class="tab col s12 m6 l3"><a href="#set-{{ section }}">{{ section | trans({}, 'CraueConfigBundle') }}</a></li>
+                                {% for section in sections|craue_sortSections %}
+                                    <li class="tab col s12 m6 l3"><a href="#set-{{ section }}">{{ section|trans({}, 'CraueConfigBundle') }}</a></li>
                                 {% endfor %}
                             </ul>
                         </div>
 
-                        {% for section in sections | craue_sortSections %}
+                        {% for section in sections|craue_sortSections %}
                             <div id="set-{{ section }}" class="col s12">
                                 {% for setting in form.settings if setting.vars.value.section == section %}
                                     {{ form_row(setting.value, {
-                                        'label': setting.vars.value.name | trans({}, 'CraueConfigBundle'),
+                                        'label': setting.vars.value.name|trans({}, 'CraueConfigBundle'),
                                     }) }}
                                 {% endfor %}
                             </div>
@@ -30,7 +30,7 @@
                 </div>
 
                 <button class="btn waves-effect waves-light" type="submit" name="action">
-                    {{ 'modify_settings' | trans({}, 'CraueConfigBundle') }}
+                    {{ 'modify_settings'|trans({}, 'CraueConfigBundle') }}
                 </button>
 
                 {{ form_widget(form._token) }}

app/Resources/FOSUserBundle/views/ChangePassword/changePassword_content.html.twig

@@ -1,6 +1,6 @@
 {% trans_default_domain 'FOSUserBundle' %}
 
-{{ form_start(form, { 'action': path('fos_user_change_password'), 'attr': { 'class': 'fos_user_change_password' } }) }}
+{{ form_start(form, {'action': path('fos_user_change_password'), 'attr': {'class': 'fos_user_change_password'}}) }}
     <div class="card-content">
         <div class="row">
             {{ form_widget(form) }}

app/Resources/FOSUserBundle/views/Registration/check_email.html.twig

@@ -1,4 +1,4 @@
-{% extends "FOSUserBundle::layout.html.twig" %}
+{% extends "@FOSUser/layout.html.twig" %}
 
 {% trans_default_domain 'FOSUserBundle' %}
 

app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig

@@ -1,4 +1,4 @@
-{% extends "FOSUserBundle::layout.html.twig" %}
+{% extends "@FOSUser/layout.html.twig" %}
 
 {% trans_default_domain 'FOSUserBundle' %}
 
@@ -11,7 +11,7 @@
         {% endif %}
     </div>
     <div class="card-action center">
-        <a href="{{ path('homepage') }}" class="waves-effect waves-light btn">{{ 'security.register.go_to_account'|trans({},'messages') }}</a>
+        <a href="{{ path('homepage') }}" class="waves-effect waves-light btn">{{ 'security.register.go_to_account'|trans({}, 'messages') }}</a>
     </div>
 </div>
 {% endblock fos_user_content %}

app/Resources/FOSUserBundle/views/Registration/register_content.html.twig

@@ -5,8 +5,8 @@
         <div class="row">
             {{ form_widget(form._token) }}
 
-            {% for flashMessage in app.session.flashbag.get('notice') %}
-                <span class="black-text"><p>{{ flashMessage }}</p></span>
+            {% for flash_message in app.session.flashbag.get('notice') %}
+                <span class="black-text"><p>{{ flash_message }}</p></span>
             {% endfor %}
 
             <div class="input-field col s12">

app/Resources/FOSUserBundle/views/Resetting/check_email.html.twig

@@ -1,4 +1,4 @@
-{% extends "FOSUserBundle::layout.html.twig" %}
+{% extends "@FOSUser/layout.html.twig" %}
 
 {% trans_default_domain 'FOSUserBundle' %}
 

app/Resources/FOSUserBundle/views/Resetting/request_content.html.twig

@@ -5,8 +5,8 @@
         <div class="row">
             <p>{{ 'security.resetting.description'|trans({}, "messages") }}</p>
 
-            {% for flashMessage in app.session.flashbag.get('notice') %}
-                <span class="black-text"><p>{{ flashMessage }}</p></span>
+            {% for flash_message in app.session.flashbag.get('notice') %}
+                <span class="black-text"><p>{{ flash_message }}</p></span>
             {% endfor %}
 
             {% if invalid_username is defined %}

app/Resources/FOSUserBundle/views/Resetting/reset_content.html.twig

@@ -1,6 +1,6 @@
 {% trans_default_domain 'FOSUserBundle' %}
 
-{{ form_start(form, { 'action': path('fos_user_resetting_reset', {'token': token}), 'attr': { 'class': 'fos_user_resetting_reset' } }) }}
+{{ form_start(form, {'action': path('fos_user_resetting_reset', {'token': token}), 'attr': {'class': 'fos_user_resetting_reset'}}) }}
     <div class="card-content">
         <div class="row">
             {{ form_widget(form) }}

app/Resources/FOSUserBundle/views/Security/login.html.twig

@@ -1,4 +1,4 @@
-{% extends "FOSUserBundle::layout.html.twig" %}
+{% extends "@FOSUser/layout.html.twig" %}
 
 {% block fos_user_content %}
 <form action="{{ path('fos_user_security_check') }}" method="post" name="loginform">
@@ -8,8 +8,8 @@
             <script>Materialize.toast('{{ error.messageKey|trans(error.messageData, 'security') }}', 4000)</script>
         {% endif %}
 
-        {% for flashMessage in app.session.flashbag.get('notice') %}
-            <script>Materialize.toast('{{ flashMessage }}')</script>
+        {% for flash_message in app.session.flashbag.get('notice') %}
+            <script>Materialize.toast('{{ flash_message }}')</script>
         {% endfor %}
 
         <div class="row">

app/Resources/FOSUserBundle/views/layout.html.twig

@@ -1,4 +1,4 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
+{% extends "@WallabagCore/layout.html.twig" %}
 
 {% block title %}{{ 'security.login.page_title'|trans }}{% endblock %}
 
@@ -11,7 +11,7 @@
 <main class="valign-wrapper">
     <div class="valign row">
         <div class="card sw">
-            <div class="center"><img src="{{ asset('wallassets/themes/_global/img/logo-wallabag.svg') }}" class="typo-logo" alt="wallabag logo" /></div>
+            <div class="center"><img src="{{ asset('img/logo-wallabag.svg') }}" class="typo-logo" alt="wallabag logo" /></div>
             {% block fos_user_content %}
             {% endblock fos_user_content %}
         </div>

app/Resources/static/themes/_global/global.scss

@@ -5,9 +5,9 @@
 .material-icons.md-48 { font-size: 48px; }
 
 /* Rules for using icons as black on a light background. */
-.material-icons.md-dark { color: rgba(0, 0, 0, 0.54); }
-.material-icons.md-dark.md-inactive { color: rgba(0, 0, 0, 0.26); }
+.material-icons.md-dark { color: rgb(0 0 0 / 54%); }
+.material-icons.md-dark.md-inactive { color: rgb(0 0 0 / 26%); }
 
 /* Rules for using icons as white on a dark background. */
-.material-icons.md-light { color: rgba(255, 255, 255, 1); }
-.material-icons.md-light.md-inactive { color: rgba(255, 255, 255, 0.3); }
+.material-icons.md-light { color: rgb(255 255 255 / 100%); }
+.material-icons.md-light.md-inactive { color: rgb(255 255 255 / 30%); }

app/Resources/static/themes/_global/img/icons/Diaspora-asterisk.svg

@@ -1,67 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="800"
-   height="770"
-   id="svg4004"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="New document 11">
-  <defs
-     id="defs4006" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="359.23155"
-     inkscape:cy="349.10374"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1631"
-     inkscape:window-height="1026"
-     inkscape:window-x="49"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4009">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(21.42857,-101.6479)">
-    <image
-       y="101.6479"
-       x="-21.42857"
-       id="image4071"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAMCCAYAAACRFKJVAAAABHNCSVQICAgIfAhkiAAAIABJREFU
+<svg height="770" width="800" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g transform="translate(21.42857 -101.6479)"><image height="770" width="800" x="-21.42857" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAMCCAYAAACRFKJVAAAABHNCSVQICAgIfAhkiAAAIABJREFU
 eJzt3e2VVEeWLuCXu/r/ZFswiQU3sUApC7qwQGDBgAUqLICxAGQB1RYorwUqD5QeqDyo+yPIJkVS
 ReXHORFxzvOsxWK6B1TRiDoZ79k7djy7v78PAADAGP5P7QUAAADzIYAAAACjEUAAAIDRCCAAAMBo
 BBAAAGA0AggAADAaAQQAABiNAAIAAIxGAAEAAEYjgAAAAKMRQAAAgNH845hf/OzZs6HWATCEV0l+
@@ -321,14 +258,4 @@ AMNRAQEAvuvMau4i5TzI6ke/8AnepcKN5vZIMAwBBAD4rgu0k65S7gc51a6quzl3IaewR4JhaMEC
 AIZym9PHgW+SPE+l8AEMRwUEAPiuCw7UOHY079tc/gzJ0eyRYBgCCADwXRcMIIskf375+THblJar
 JsaI2yPBMLRgAQBD243PfcxNTrhAFeiPAAIAjOGh0by7cDLGBYZAA7RgAQDfNcClqt+O5r1NCR9N
 Vj3skWAYKiAAwFj2W7E+Jfk5jYYPYDgqIADAdw1QAdlZphw4b5o9EgxDAAEAAEajBQsAABiNAAIA
-AIxGAAEAAEYjgAAAAKMRQAAAgNEIIAAAwGj+P10o1H/ia8mRAAAAAElFTkSuQmCC
-"
-       height="770"
-       width="800" />
-    <path
-       style="fill:#FFF"
-       d="m 482.45517,806.8979 c -21.575,-30.1125 -55.23748,-77.12866 -74.80551,-104.48035 -19.98598,-27.9359 -36.2457,-49.73896 -37.10125,-49.75 -0.87914,-0.0113 -32.32337,42.25713 -74.37706,99.98035 -40.06973,55 -73.18741,100 -73.59485,100 -1.1396,0 -144.46068,-100.94983 -144.829571,-102.01235 -0.178476,-0.51406 32.221521,-48.07611 72.000001,-105.69344 39.77847,-57.61732 72.3245,-105.66675 72.3245,-106.77649 0,-1.78957 -12.89022,-6.31508 -114,-40.0232 -62.7,-20.90302 -114.613999,-38.24519 -115.364443,-38.53815 -1.043816,-0.4075 4.925559,-20.38013 25.402971,-84.99452 14.722078,-46.45402 27.100359,-84.84113 27.507293,-85.3047 0.406933,-0.46357 54.900599,16.97442 121.097029,38.75107 66.19643,21.77666 120.91108,39.59345 121.5881,39.59285 0.67702,-5.9e-4 1.44284,-1.01357 1.70181,-2.25107 0.25898,-1.2375 0.83006,-57.6 1.26906,-125.25 0.439,-67.65 1.16224,-123.5625 1.6072,-124.25 0.63709,-0.98436 19.23178,-1.24675 87.5,-1.23469 47.68004,0.008 87.18776,0.34593 87.79493,0.75 0.76529,0.50931 2.07325,37.70117 4.26357,121.23469 3.5965,137.16189 3.67401,139 5.86123,139 0.84816,0 53.3106,-17.56056 116.58321,-39.02347 63.2726,-21.46291 115.34958,-38.67541 115.72663,-38.25 1.27822,1.44219 53.1745,170.39371 52.53554,171.03267 -0.34901,0.34901 -53.15524,18.43347 -117.34717,40.18769 -88.30357,29.92548 -116.78951,39.96068 -117.02855,41.22754 -0.17651,0.93542 30.19001,46.31568 68.80279,102.8201 38.0153,55.63011 68.97925,101.56053 68.80877,102.06759 -0.39157,1.16463 -142.63129,105.93788 -143.82081,105.93788 -0.48298,0 -18.53042,-24.6375 -40.10542,-54.75 z"
-       id="path4093"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
+AIxGAAEAAEYjgAAAAKMRQAAAgNEIIAAAwGj+P10o1H/ia8mRAAAAAElFTkSuQmCC" y="101.6479"/><path d="m482.45517 806.8979c-21.575-30.1125-55.23748-77.12866-74.80551-104.48035-19.98598-27.9359-36.2457-49.73896-37.10125-49.75-.87914-.0113-32.32337 42.25713-74.37706 99.98035-40.06973 55-73.18741 100-73.59485 100-1.1396 0-144.46068-100.94983-144.829571-102.01235-.178476-.51406 32.221521-48.07611 72.000001-105.69344 39.77847-57.61732 72.3245-105.66675 72.3245-106.77649 0-1.78957-12.89022-6.31508-114-40.0232-62.7-20.90302-114.613999-38.24519-115.364443-38.53815-1.043816-.4075 4.925559-20.38013 25.402971-84.99452 14.722078-46.45402 27.100359-84.84113 27.507293-85.3047.406933-.46357 54.900599 16.97442 121.097029 38.75107 66.19643 21.77666 120.91108 39.59345 121.5881 39.59285.67702-.00059 1.44284-1.01357 1.70181-2.25107.25898-1.2375.83006-57.6 1.26906-125.25s1.16224-123.5625 1.6072-124.25c.63709-.98436 19.23178-1.24675 87.5-1.23469 47.68004.008 87.18776.34593 87.79493.75.76529.50931 2.07325 37.70117 4.26357 121.23469 3.5965 137.16189 3.67401 139 5.86123 139 .84816 0 53.3106-17.56056 116.58321-39.02347 63.2726-21.46291 115.34958-38.67541 115.72663-38.25 1.27822 1.44219 53.1745 170.39371 52.53554 171.03267-.34901.34901-53.15524 18.43347-117.34717 40.18769-88.30357 29.92548-116.78951 39.96068-117.02855 41.22754-.17651.93542 30.19001 46.31568 68.80279 102.8201 38.0153 55.63011 68.97925 101.56053 68.80877 102.06759-.39157 1.16463-142.63129 105.93788-143.82081 105.93788-.48298 0-18.53042-24.6375-40.10542-54.75z" fill="#fff"/></g></svg>