Release wallabag 2.0.4

Prepare wallabag 2.0.4

.travis.yml

@@ -53,7 +53,7 @@ before_install:
     - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
 
 script:
-    - travis_wait composer install --no-interaction --no-progress --prefer-dist -o
+    - travis_wait composer update --no-interaction --no-progress
     - ant prepare-$DB
     - bin/phpunit -v
     - if [ "$CS_FIXER" = "run" ]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;

CHANGELOG.md

@@ -2,6 +2,42 @@
 
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.4] - 2016-05-07
+
+### Added
+
+- [#2016](https://github.com/wallabag/wallabag/pull/2016) Big updates in [our documentation](http://doc.wallabag.org/en/master/) (Nicolas Lœuillet)
+- [#2028](https://github.com/wallabag/wallabag/pull/2028) Documentation about android application (Strubbl)
+- [#2019](https://github.com/wallabag/wallabag/pull/2019) Italian translation (Daniele Conca)
+- [#2011](https://github.com/wallabag/wallabag/pull/2011) Documentation about wallabag upgrade (biva)
+- [#1985](https://github.com/wallabag/wallabag/pull/1985) Documentation about rights access (FoxMaSk)
+- [#1969](https://github.com/wallabag/wallabag/pull/1969) Third resources for API in documentation (Nicolas Lœuillet)
+- [#1967](https://github.com/wallabag/wallabag/pull/1967) FAQ page in documentation (Nicolas Lœuillet)
+
+### Changed
+
+- [#1977](https://github.com/wallabag/wallabag/pull/1977) Spanish documentation (jami7)
+
+### Fixed
+
+- [#2023](https://github.com/wallabag/wallabag/pull/2023) Fix translation for validators (Nicolas Lœuillet)
+- [#2020](https://github.com/wallabag/wallabag/pull/2020) Fix number of entries in tag/list (Nicolas Lœuillet)
+- [#2022](https://github.com/wallabag/wallabag/pull/2022) Fix pagination bar on small devices (Nicolas Lœuillet)
+- [#2013](https://github.com/wallabag/wallabag/pull/2013) Fix tag listing (Nicolas Lœuillet)
+- [#1976](https://github.com/wallabag/wallabag/pull/1976) Fix filter reading time (Nicolas Lœuillet)
+- [#2005](https://github.com/wallabag/wallabag/pull/2005) Fix reading speed not defined when user was created via config page (Nicolas Lœuillet)
+- [#2010](https://github.com/wallabag/wallabag/pull/2010) Set the title via POST /api/entries (Nicolas Lœuillet)
+
+## [2.0.3] - 2016-04-22
+
+### Added
+
+- [#1962](https://github.com/wallabag/wallabag/pull/1962) cURL examples in documentation about API (Dirk Deimeke)
+
+### Fixed
+
+- Forgot `composer.lock` file in 2.0.2 release so some users may encounter `Fatal error: Out of memory` error during installation
+
 ## [2.0.2] - 2016-04-21
 
 ### Added

README.md

@@ -1,5 +1,5 @@
-[![Build Status](https://travis-ci.org/wallabag/wallabag.svg?branch=v2)](https://travis-ci.org/wallabag/wallabag)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=v2)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2)
+[![Build Status](https://api.travis-ci.org/wallabag/wallabag.svg?branch=master)](https://travis-ci.org/wallabag/wallabag)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2)
 [![Gitter](https://badges.gitter.im/gitterHQ/gitter.svg)](https://gitter.im/wallabag/wallabag)
 
 # What is wallabag?
@@ -16,7 +16,7 @@ Then you can install wallabag by executing the following commands:
 ```
     git clone https://github.com/wallabag/wallabag.git
     cd wallabag
-    git checkout 2.0.2
+    git checkout 2.0.4
     SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod
     php bin/console server:run --env=prod

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

@@ -1,6 +1,6 @@
-download_pictures: Descagar imagenes
+download_pictures: Descargar imágenes
 carrot: Activar compartir con Carrot
-diaspora_url: Diaspora URL, si el servicio esta activado
+diaspora_url: Diaspora URL, si el servicio está activado
 export_epub: Activar exportación a ePub
 export_mobi: Activar exportación a .mobi
 export_pdf: Activar exportación a PDF
@@ -14,7 +14,7 @@ share_diaspora: Activar compartir con Diaspora
 share_mail: Activar compartir con email
 share_shaarli: Activar compartir con Shaarli
 share_twitter: Activar compartir con Twitter
-show_printlink: Mostrar un link para imprimir contenido
+show_printlink: Mostrar un enlace para imprimir contenido
 wallabag_support_url: URL de soporte de wallabag
 wallabag_url: URL de *tu* instancia de wallabag
 entry: "artículo"

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

@@ -0,0 +1,29 @@
+download_pictures: Scarica le immagini sul tuo server
+carrot: Abilita la condivisione su Carrot
+diaspora_url: Diaspora URL, se il servizio è abilitato
+export_epub: Abilita esportazione ePub
+export_mobi: Abilita esportazione .mobi
+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
+pocket_consumer_key: Consumer key per Pocket per importare i contenuti (https://getpocket.com/developer/docs/authentication)
+shaarli_url: Shaarli URL, if the service is enabled
+share_diaspora: Abilita la condivisione su Diaspora
+share_mail: Abilita la condivisione per email
+share_shaarli: Abilita la condivisione su Shaarli
+share_twitter: Abilita la condivisione su Twitter
+show_printlink: Mostra un collegamento per stampare il contenuto
+wallabag_support_url: URL di supporto per wallabag
+wallabag_url: URL della *tua* installazione di wallabag
+entry: "articolo"
+export: "esporta"
+import: "importa"
+misc: "misc"
+modify_settings: "applica"
+piwik_host: Host del tuo sito in Piwik
+piwik_site_id: ID del tuo sito in Piwik
+piwik_enabled: Abilita Piwik
+demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
+demo_mode_username: "Utente Demo"

app/config/config.yml

@@ -28,7 +28,7 @@ framework:
     assets: ~
 
 wallabag_core:
-    version: 2.0.2
+    version: 2.0.4
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'
@@ -41,6 +41,7 @@ wallabag_core:
         da: 'Dansk'
         es: 'Español'
         oc: 'Occitan'
+        it: 'Italiano'
     items_on_page: 12
     theme: material
     language: en

docs/en/developer/api.rst

@@ -69,7 +69,7 @@ You'll have this in return:
 
 We'll work with the ``access_token`` value in our next calls.
 
-Curl example:
+cURL example:
 
 ::
 
@@ -126,7 +126,7 @@ returns:
 
 The ``items`` array is empty.
 
-Curl example:
+cURL example:
 
 ::
 
@@ -186,7 +186,7 @@ returns
 
 Now, if you execute the previous command (see **Get existing entries**), you'll have data.
 
-Curl example:
+cURL example:
 
 ::
 
@@ -245,7 +245,7 @@ returns
 
 And if you want to list the existing entries (see **Get existing entries**), the array is empty.
 
-Curl example:
+cURL example:
 
 ::
 
@@ -257,3 +257,12 @@ Other methods
 We won't write samples for each API method.
 
 Have a look on the listing here: http://localhost:8000/api/doc to know each method.
+
+Third resources
+---------------
+
+Some applications or libraries use our API. Here is a non-exhaustive list of them:
+
+- `Java wrapper for the wallabag API <https://github.com/Strubbl/wallabag-java>`_ by Strubbl.
+- `.NET library for the wallabag v2 API <https://github.com/jlnostr/wallabag-api>`_ by Julian Oster.
+- `Python API for wallabag <https://github.com/foxmask/wallabag_api>`_ by FoxMaSk, for his project `Trigger Happy <https://blog.trigger-happy.eu/>`_.

docs/en/developer/documentation.rst

@@ -0,0 +1,12 @@
+Contribute to this documentation
+================================
+
+Sources of our documentation are here https://github.com/wallabag/wallabag/tree/master/docs
+
+We use `ReadTheDocs
+<https://readthedocs.org>`__ to generate it.
+
+Pages are written in `Restructured Text
+<https://en.wikipedia.org/wiki/ReStructuredText>`__ format. You can use online tools like http://rst.aaroniles.net/ or http://rst.ninjs.org/ to preview your articles. 
+
+If you create a new page, don't forget to edit the `index.rst <https://raw.githubusercontent.com/wallabag/wallabag/master/docs/en/index.rst>`__ file to add a link in the sidebar.

docs/en/developer/translate.rst

@@ -14,7 +14,7 @@ Translation files
 
 You can find translation files here: https://github.com/wallabag/wallabag/tree/master/src/Wallabag/CoreBundle/Resources/translations.
 
-You have to create ``messages.CODE.yml``, where CODE
+You have to create ``messages.CODE.yml`` and ``validators.CODE.yml``, where CODE
 is the ISO 639-1 code of your language (`see wikipedia <https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes>`__).
 
 Other files to translate:

docs/en/index.rst

@@ -8,7 +8,7 @@ wallabag documentation
 **wallabag** is a read-it-later application: it saves a web page by
 keeping content only. Elements like navigation or ads are deleted.
 
-.. note::
+.. tip::
 
     This documentation is about wallabag v2. If you want to read documentation for wallabag v1, `please have a look here <https://github.com/wallabag/documentation>`__.
 
@@ -23,18 +23,21 @@ The main documentation for this application is organized into a couple sections:
    :maxdepth: 2
    :caption: User documentation
 
+   user/faq
    user/installation
+   user/upgrade
    user/migration
+   user/import
    user/create_account
    user/login
    user/configuration
    user/first_article
    user/errors_during_fetching
    user/annotations
-   user/import
    user/download_articles
    user/filters
    user/tags
+   user/android
 
 .. _dev-docs:
 
@@ -44,5 +47,6 @@ The main documentation for this application is organized into a couple sections:
 
    developer/api
    developer/docker
+   developer/documentation
    developer/translate
    developer/maintenance

docs/en/user/android.rst

@@ -0,0 +1,107 @@
+Android App
+===========
+
+
+Purpose of this document
+------------------------
+
+This document describes how you can setup your Android application to work with your wallabag instance. There is no difference in this procedure for wallabag v1 or v2.
+
+
+Steps to configure your app
+---------------------------
+
+When you first start the app, you see the welcome screen, where you are adviced to configure the app for your wallabag instance at first.
+
+.. image:: ../../img/user/android_welcome_screen.de.png
+    :alt: Welcome screen
+    :align: center
+
+Just confirm that message and you get redirected to the settings screen.
+
+.. image:: ../../img/user/android_configuration_screen.de.png
+    :alt: Settings screen
+    :align: center
+
+Fill in your wallabag data. You need to enter your wallabag address. It is important that this URL does not end with a slash. Also add your wallabag credentials to the user name and password field.
+
+.. image:: ../../img/user/android_configuration_filled_in.de.png
+    :alt: Filled in settings
+    :align: center
+
+After you have filled in your data, push the button Connection test and wait for the test to finish. 
+
+.. image:: ../../img/user/android_configuration_connection_test.de.png
+    :alt: Connection test with your wallabag data
+    :align: center
+
+The connection test shall finish with success. If not, you need to fix this first until you proceed. 
+
+.. image:: ../../img/user/android_configuration_connection_test_success.de.png
+    :alt: Connection test successful
+    :align: center
+
+After the connection test was successful, you can push the button to get your feed credentials. The app now tries to login to your wallabag instance and get the user id and the corresponding token for the feeds.
+
+.. image:: ../../img/user/android_configuration_get_feed_credentials.de.png
+    :alt: Getting the feed credentials
+    :align: center
+
+When the process of getting your feed credentials finishes with success you see a toast message that the user id and the token were automatically filled in to the form.
+
+.. image:: ../../img/user/android_configuration_feed_credentials_automatically_filled_in.de.png
+    :alt: Getting feed credentials successful
+    :align: center
+
+Now you need to scroll to the bottom of the settings menu. Of course you can adjust the given settings to your needs. Finish the configuration of your app with pushing the save button.
+
+.. image:: ../../img/user/android_configuration_scroll_bottom.de.png
+    :alt: Bottom of the settings screen
+    :align: center
+
+After hitting the save button, you get the following screen. The app proposes to initiate a syncronisation process to update your feeds of articles. It is recommended to acknowledge this action and press Yes.
+
+.. image:: ../../img/user/android_configuration_saved_feed_update.de.png
+    :alt: Settings saved the first time
+    :align: center
+
+Finally after the syncronisation finished successfully, you are presented the list of unread articles. 
+
+.. image:: ../../img/user/android_unread_feed_synced.de.png
+    :alt: Filled article list cause feeds successfully syncronized
+    :align: center
+
+
+
+Known limitations
+----
+
+2FA
+~~~
+
+Currently the does not support two-factor authentication. You should disable that to get the app working.
+
+
+Limited amount of articles with wallabag v2
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In your wallabag web instance you can configure how many items are part of the RSS feed. This option did not exist in wallabag v1, where all articles were part of the feed. So if you set the amount of articles being displayed greater than the number of items being content of your RSS feed, you will only see the number of items in your RSS feed. 
+
+
+SSL/TLS encryption
+~~~~~~~~~~~~~~~~~~
+
+If you can reach your wallabag web instance via HTTPS, you should use that. Especially if your HTTP URL redirects you to the HTTPS one. Currently, the app cannot handle that redirect properly.
+
+
+References
+----------
+
+`Source code of the Android application <https://github.com/wallabag/android-app>`_
+
+`Android Application on F-Droid <https://f-droid.org/repository/browse/?fdfilter=wallabag&fdid=fr.gaulupeau.apps.InThePoche>`_
+
+`Android Application on Google Play <https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche>`_
+
+`Support chat <https://gitter.im/wallabag/wallabag>`_
+

docs/en/user/create_account.rst

@@ -23,24 +23,3 @@ Your account is now activated.
 .. image:: ../../img/user/activated_account.png
    :alt: Welcome on board!
    :align: center
-
-Frequently asked questions
---------------------------
-
-I can't valid the registration form
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Make sure that all fields are well filled:
-
-* valid email address
-* same passwords in two fields
-
-I don't receive my activation email
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Are you sure your email address was correct? Did you check your spams folder?
-
-When I click on the activation link, I've got this message: ``The user with confirmation token "DtrOPfbQeVkWf6N" does not exist``.
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You already enabled your account or the URL of the activation email is wrong.

docs/en/user/faq.rst

@@ -0,0 +1,35 @@
+Frequently Asked Questions
+==========================
+
+During the installation, I've got this error ``Error Output: sh: 1: @post-cmd: not found``
+------------------------------------------------------------------------------------------
+
+It seems you have a problem with your ``composer`` installation. Try to uninstall and reinstall it.
+
+`Read the documentation about composer to know how to install it
+<https://getcomposer.org/doc/00-intro.md>`__.
+
+I can't valid the registration form
+-----------------------------------
+
+Make sure that all fields are well filled:
+
+* valid email address
+* same passwords in two fields
+
+I don't receive my activation email
+-----------------------------------
+
+Are you sure your email address was correct? Did you check your spams folder?
+
+When I click on the activation link, I've got this message: ``The user with confirmation token "DtrOPfbQeVkWf6N" does not exist``.
+----------------------------------------------------------------------------------------------------------------------------------
+
+You already enabled your account or the URL of the activation email is wrong.
+
+I forgot my password
+--------------------
+
+You can reset your password by clicking on ``Forgot your password?`` link,
+on the login page. Then, fill the form with your email address or your username,
+you'll receive an email to reset your password.

docs/en/user/import.rst

@@ -1,42 +1,5 @@
-Migrate to wallabag
-===================
-
-From wallabag
--------------
-
-Export your data from your wallabag 1.x
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-On your config page, click on ``JSON export`` in the ``Export your wallabag data`` section.
-
-.. image:: ../../img/user/export_wllbg_1.png
-   :alt: Export from wallabag 1.x
-   :align: center
-
-You will have a ``wallabag-export-1-1970-01-01.json`` file.
-
-Export your data from your wallabag 2.x
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-On the export sidebar, click on ``JSON``.
-
-.. image:: ../../img/user/export_wllbg_2.png
-   :alt: Export from wallabag 2.x
-   :align: center
-
-You will have a ``Unread articles.json`` file.
-
-Import your data into wallabag 2.x
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Click on  ``Import`` link in the menu, choose the right wallabag version,
-select your export file on your computer and import it.
-
-.. image:: ../../img/user/import_wllbg.png
-   :alt: Import from wallabag 1.x
-   :align: center
-
-All your wallabag articles will be imported.
+Migrate from a third service
+============================
 
 From Pocket
 -----------
@@ -53,7 +16,7 @@ a new application on their developer website to continue.
   and submit your new application
 
 Pocket will give you a **Consumer Key** (for example, `49961-985e4b92fe21fe4c78d682c1`).
-You need to configure the ``pocket_consumer_key`` into the ``app/config/parameters.yml`` file in wallabag.
+You need to configure the ``pocket_consumer_key`` into the ``Import`` section in the ``Internal settings`` menu.
 
 Now, all is fine to migrate from Pocket.
 

docs/en/user/installation.rst

@@ -34,6 +34,9 @@ and it's corresponding database server.
 Installation
 ------------
 
+On a dedicated web server (recommended way)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 wallabag uses a big number of libraries in order to function. These libraries must be installed with a tool called Composer. You need to install it if you don't already have.
 
 Install Composer:
@@ -50,11 +53,11 @@ To install wallabag itself, you must run these two commands:
 
     git clone https://github.com/wallabag/wallabag.git
     cd wallabag
-    git checkout 2.0.2
+    git checkout 2.0.4
     SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod
 
-To start php's build-in server and test if everything did install correctly, you can do:
+To start PHP's build-in server and test if everything did install correctly, you can do:
 
 ::
 
@@ -62,14 +65,48 @@ To start php's build-in server and test if everything did install correctly, you
 
 And access wallabag at http://yourserverip:8000
 
-.. note::
+.. tip::
 
     To define parameters with environment variables, you have to set these variables with ``SYMFONY__`` prefix. For example, ``SYMFONY__DATABASE_DRIVER``. You can have a look to the `Symfony documentation <http://symfony.com/doc/current/cookbook/configuration/external_parameters.html>`__.
 
-Installing on Apache
---------------------
+On a shared hosting
+~~~~~~~~~~~~~~~~~~~
 
-Assuming you install wallabag in the /var/www/wallabag folder and that you want to use php as an Apache module, here's a vhost for wallabag:
+We provide you a package with all dependancies inside.
+The default configuration uses SQLite for the database. If you want to change these settings, please edit ``app/config/parameters.yml``.
+
+We already created a user: login and password are ``wallabag``.
+
+.. caution:: With this package, wallabag don't check mandatory extensions used in the application (theses checks are made during ``composer install`` when you have a dedicated web server, see above).
+
+Execute this command to download and extract the latest package:
+
+.. code-block:: bash
+
+    wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
+
+Now, read the following documentation to create your virtual host, then access to your wallabag.
+If you changed the database configuration to use MySQL or PostgreSQL, you need to create a user via this command ``php bin/console wallabag:install --env=prod``.
+
+Installation with Docker
+------------------------
+
+We provide you a Docker image to install wallabag easily. Have a look to our repository on `Docker Hub <https://hub.docker.com/r/wallabag/wallabag/>`__ to have more information.
+
+Command to launch container
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: bash
+
+    docker pull wallabag/wallabag
+
+Virtual hosts
+-------------
+
+Configuration on Apache
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Assuming you install wallabag in the ``/var/www/wallabag`` folder and that you want to use PHP as an Apache module, here's a vhost for wallabag:
 
 ::
 
@@ -111,10 +148,10 @@ Assuming you install wallabag in the /var/www/wallabag folder and that you want
 
 After reloading or restarting Apache, you should now be able to access wallabag at http://domain.tld.
 
-Installing on Nginx
--------------------
+Configuration on Nginx
+~~~~~~~~~~~~~~~~~~~~~~
 
-Assuming you install wallabag in the /var/www/wallabag folder, here's the recipe for wallabag :
+Assuming you install wallabag in the ``/var/www/wallabag`` folder, here's the recipe for wallabag :
 
 ::
 
@@ -151,6 +188,67 @@ Assuming you install wallabag in the /var/www/wallabag folder, here's the recipe
 
 After reloading or restarting nginx, you should now be able to access wallabag at http://domain.tld.
 
-.. note::
+.. tip::
 
     When you want to import large file into wallabag, you need to add this line in your nginx configuration ``client_max_body_size XM; # allows file uploads up to X megabytes``.
+
+Configuration on lighttpd
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Assuming you install wallabag in the /var/www/wallabag folder, here's the recipe for wallabag (edit your ``lighttpd.conf`` file and paste this configuration into it):
+
+::
+
+    server.modules = (
+        "mod_fastcgi",
+        "mod_access",
+        "mod_alias",
+        "mod_compress",
+        "mod_redirect",
+        "mod_rewrite",
+    )
+    server.document-root = "/var/www/wallabag/web"
+    server.upload-dirs = ( "/var/cache/lighttpd/uploads" )
+    server.errorlog = "/var/log/lighttpd/error.log"
+    server.pid-file = "/var/run/lighttpd.pid"
+    server.username = "www-data"
+    server.groupname = "www-data"
+    server.port = 80
+    server.follow-symlink = "enable"
+    index-file.names = ( "index.php", "index.html", "index.lighttpd.html")
+    url.access-deny = ( "~", ".inc" )
+    static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
+    compress.cache-dir = "/var/cache/lighttpd/compress/"
+    compress.filetype = ( "application/javascript", "text/css", "text/html", "text/plain" )
+    include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port
+    include_shell "/usr/share/lighttpd/create-mime.assign.pl"
+    include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
+    dir-listing.activate = "disable"
+
+    url.rewrite-if-not-file = (
+        "^/([^?])(?:\?(.))?" => "/app.php?$1&$2",
+        "^/([^?]*)" => "/app.php?=$1",
+    )
+
+Rights access to the folders of the project
+-------------------------------------------
+
+Test environment
+~~~~~~~~~~~~~~~~
+
+When we just want to test wallabag, we just run the command ``php bin/console server:run --env=prod`` to start our wallabag instance and everything will go smoothly because the user who started the project can access to the current folder naturally, without any problem.
+
+Production environment
+~~~~~~~~~~~~~~~~~~~~~~
+
+As soon as we use Apache or Nginx to access to our wallabag instance, and not from the command  ``php bin/console server:run --env=prod`` to start it, we should take care to grant the good rights on the good folders to keep safe all the folders of the project.
+
+To do so, the folder name, known as ``DocumentRoot`` (for apache) or ``root`` (for Nginx), has to be absolutely accessible by the Apache/Nginx user. Its name is generally ``www-data``, ``apache`` or ``nobody`` (depending on linux system used).
+
+So the folder ``/var/www/wallabag/web`` has to be accessible by this last one. But this could be not enough if we just care about this folder, because we could meet a blank page or get an error 500 when trying to access to the homepage of the project.
+
+This is due to the fact that we will need to grant the same rights access on the folder ``/var/www/wallabag/var`` like those we gave on the folder ``/var/www/wallabag/web``. Thus, we fix this problem with the following command:
+
+.. code-block:: bash
+
+   chown -R www-data:www-data /var/www/wallabag/var

docs/en/user/login.rst

@@ -11,13 +11,3 @@ you can check the ``Keep me logged in`` checkbox: wallabag will remember you for
 .. image:: ../../img/user/login_form.png
    :alt: Login form
    :align: center
-
-Frequently asked questions
---------------------------
-
-I forgot my password
-~~~~~~~~~~~~~~~~~~~~
-
-You can reset your password by clicking on ``Forgot your password?`` link,
-on the login page. Then, fill the form with your email address or your username,
-you'll receive an email to reset your password.

docs/en/user/migration.rst

@@ -1,5 +1,5 @@
-Migrate wallabag
-================
+Migrate from v1 or v2
+=====================
 
 From wallabag 1.x
 -----------------
@@ -16,7 +16,7 @@ If you were using wallabag v1.x, you need to export your data before migrating t
 .. note::
     If you encounter issues during the export or the import, don't hesitate to `ask for support <https://www.wallabag.org/pages/support.html>`__.
 
-When you have retrieved the json file containing your entries, you can install wallabag v2 if needed by following `the standard procedure <http://doc.wallabag.org/en/v2/user/installation.html>`__.
+When you have retrieved the json file containing your entries, you can install wallabag v2 if needed by following `the standard procedure <http://doc.wallabag.org/en/master/user/installation.html>`__.
 
 After creating an user account on your new wallabag v2 instance, you must head over to the `Import` section and select `Import from wallabag v1`. Select your json file and upload it.
 

docs/en/user/upgrade.rst

@@ -0,0 +1,32 @@
+Upgrade wallabag
+================
+
+Upgrade on a dedicated web server
+---------------------------------
+
+The last release is published on https://www.wallabag.org/pages/download-wallabag.html. In order to upgrade your wallabag installation and get the last version, run the following commands in you wallabag folder (replace ``2.0.3`` by the last release number):
+
+::
+
+    git fetch origin
+    git fetch --tags
+    git checkout 2.0.3
+    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
+    php bin/console cache:clear --env=prod
+
+Upgrade on a shared hosting 
+---------------------------
+
+Backup your ``app/config/parameters.yml`` file.
+
+Download the last release of wallabag: 
+
+.. code-block:: bash
+
+    wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
+
+Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours.
+
+If you use SQLite, you must also copy your ``data/`` folder inside the new installation.
+
+Empty ``var/cache`` folder.

docs/fr/developer/api.rst

@@ -69,6 +69,12 @@ Vous obtiendrez :
 
 Nous allons utiliser la valeur de ``access_token`` dans nos prochains appels.
 
+Exemple cURL :
+
+::
+
+    curl -s "https://localhost:8000/oauth/v2/token?grant_type=password&client_id=1_3o53gl30vhgk0c8ks4cocww08o84448osgo40wgw4gwkoo8skc&client_secret=636ocbqo978ckw0gsw4gcwwocg8044sco0w8w84cws48ggogs4&username=wallabag&password=wallabag"
+
 Récupérer les articles existants
 --------------------------------
 
@@ -120,6 +126,12 @@ retournera :
 
 Le tableau ``items`` est vide.
 
+Exemple cURL :
+
+::
+
+    curl --get "https://localhost:8000/api/entries.html?access_token=ZGJmNTA2MDdmYTdmNWFiZjcxOWY3MWYyYzkyZDdlNWIzOTU4NWY3NTU1MDFjOTdhMTk2MGI3YjY1ZmI2NzM5MA"
+
 Créer votre premier article
 ---------------------------
 
@@ -174,6 +186,12 @@ retournera :
 
 Maintenant, si vous exécutez la précédente commande (voir **Récupérer les articles existants**), vous obtiendrez quelque chose.
 
+Exemple cURL :
+
+::
+
+    curl "https://localhost:8000/api/entries.html?access_token=ZGJmNTA2MDdmYTdmNWFiZjcxOWY3MWYyYzkyZDdlNWIzOTU4NWY3NTU1MDFjOTdhMTk2MGI3YjY1ZmI2NzM5MA&url=http://www.numerama.com/tech/160115-le-pocket-libre-wallabag-fait-le-plein-de-fonctionnalites.html"
+
 Supprimer un article
 --------------------
 
@@ -227,9 +245,24 @@ retournera :
 
 Et si vous voulez voir la liste des articles existants (voir **Récupérer les articles existants**), le tableau sera vide.
 
+Exemple cURL :
+
+::
+
+    curl --request DELETE "https://localhost:8000/api/entries/1.html?access_token=ZGJmNTA2MDdmYTdmNWFiZjcxOWY3MWYyYzkyZDdlNWIzOTU4NWY3NTU1MDFjOTdhMTk2MGI3YjY1ZmI2NzM5MA"
+
 Autres méthodes
 ---------------
 
 Nous n'écrirons pas d'exemples pour toutes les méthodes de l'API.
 
 Jetez un œil à la liste complète ici http://localhost:8000/api/doc pour connaitre chaque méthode.
+
+Ressources tierces
+------------------
+
+Certaines applications ou bibliothèques utilisent notre API. En voici une liste non exhaustive :
+
+- `Java wrapper for the wallabag API <https://github.com/Strubbl/wallabag-java>`_ par Strubbl.
+- `.NET library for the wallabag v2 API <https://github.com/jlnostr/wallabag-api>`_ par Julian Oster.
+- `Python API for wallabag <https://github.com/foxmask/wallabag_api>`_ par FoxMaSk, pour son projet `Trigger Happy <https://blog.trigger-happy.eu/>`_.

docs/fr/developer/documentation.rst

@@ -0,0 +1,12 @@
+Contribuer à cette documentation
+================================
+
+Les sources de notre documentation sont ici https://github.com/wallabag/wallabag/tree/master/docs
+
+Nous utilisons `ReadTheDocs
+<https://readthedocs.org>`__ pour la générer.
+
+Les pages sont écrites au format `Restructured Text
+<https://fr.wikipedia.org/wiki/ReStructuredText>`__. Vous pouvez utiliser des outils en ligne comme http://rst.aaroniles.net/ ou http://rst.ninjs.org/ pour prévisualiser vos articles. 
+
+Si vous créez une nouvelle page, n'oubliez pas d'éditer le fichier `index.rst <https://raw.githubusercontent.com/wallabag/wallabag/master/docs/en/index.rst>`__ pour ajouter un lien dans la barre latérale.

docs/fr/developer/translate.rst

@@ -15,7 +15,7 @@ Fichiers de traductions
 
 Les principaux fichiers de traduction se trouvent ici : https://github.com/wallabag/wallabag/tree/master/src/Wallabag/CoreBundle/Resources/translations.
 
-Vous devez créer le fichier ``messages.CODE.yml``,
+Vous devez créer les fichiers ``messages.CODE.yml`` et ``validators.CODE.yml``,
 où CODE est le code ISO 639-1 de votre langue (`cf wikipedia <https://fr.wikipedia.org/wiki/Liste_des_codes_ISO_639-1>`__).
 
 Autres fichiers à traduire :

docs/fr/index.rst

@@ -9,7 +9,7 @@ Documentation de wallabag
 simplement d’archiver une page web en ne conservant que le contenu. Les
 éléments superflus (menu, publicité, etc.) sont supprimés.
 
-.. note::
+.. tip::
 
     Vous vous trouvez sur la documentation de wallabag v2. Si vous voulez lire la documentation de wallabag v1, `vous pouvez jeter un œil ici <https://github.com/wallabag/documentation>`__.
 
@@ -24,15 +24,17 @@ La documentation principale de cette application est découpée en plusieurs sec
    :maxdepth: 2
    :caption: Documentation utilisateur
 
+   user/faq
    user/installation
+   user/upgrade
    user/migration
+   user/import
    user/create_account
    user/login
    user/configuration
    user/first_article
    user/errors_during_fetching
    user/annotations
-   user/import
    user/download_articles
    user/filters
    user/tags
@@ -45,5 +47,6 @@ La documentation principale de cette application est découpée en plusieurs sec
 
    developer/api
    developer/docker
+   developer/documentation
    developer/translate
    developer/maintenance

docs/fr/user/create_account.rst

@@ -23,24 +23,3 @@ Votre compte est maintenant actif.
 .. image:: ../../img/user/activated_account.png
    :alt: Bienvenue à bord !
    :align: center
-
-Foire aux questions
--------------------
-
-Je ne peux pas valider le formulaire de création de compte
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Soyez sur d'avoir bien renseigné tous les champs :
-
-* une adresse email valide
-* le même mot de passe dans les deux champs
-
-Je n'ai pas reçu mon email d'activation
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Êtes-vous sur d'avoir renseigné votre bonne adresse ? Avez-vous vérifié le dossier de spams ?
-
-Quand je clique sur le lien d'activation, j'ai ce message : ``The user with confirmation token "DtrOPfbQeVkWf6N" does not exist``.
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Vous avez déjà activé votre compte ou l'URL d'activation n'est pas correcte.

docs/fr/user/faq.rst

@@ -0,0 +1,35 @@
+Foire Aux Questions
+===================
+
+Durant l'installation, je rencontre cette erreur ``Error Output: sh: 1: @post-cmd: not found``
+----------------------------------------------------------------------------------------------
+
+Il semblerait que vous ayiez un problème avec votre installation de ``composer``. Essayez de le désinstaller puis de le réinstaller.
+
+`Vous pouvez lire la documentation de composer pour savoir comment l'installer
+<https://getcomposer.org/doc/00-intro.md>`__.
+
+Je ne peux pas valider le formulaire de création de compte
+----------------------------------------------------------
+
+Soyez sur d'avoir bien renseigné tous les champs :
+
+* une adresse email valide
+* le même mot de passe dans les deux champs
+
+Je n'ai pas reçu mon email d'activation
+---------------------------------------
+
+Êtes-vous sur d'avoir renseigné votre bonne adresse ? Avez-vous vérifié le dossier de spams ?
+
+Quand je clique sur le lien d'activation, j'ai ce message : ``The user with confirmation token "DtrOPfbQeVkWf6N" does not exist``.
+----------------------------------------------------------------------------------------------------------------------------------
+
+Vous avez déjà activé votre compte ou l'URL d'activation n'est pas correcte.
+
+J'ai oublié mon mot de passe
+----------------------------
+
+Vous pouvez réinitialiser votre mot de passe en cliquant sur ``Mot de passe oublié ?``,
+sur la page de connexion. Ensuite, renseignez votre adresse email ou votre nom d'utilisateur,
+un email vous sera envoyé.

docs/fr/user/import.rst

@@ -1,42 +1,5 @@
-Migrer à wallabag
-=================
-
-Depuis wallabag
----------------
-
-Exportez vos données de wallabag 1.x
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Sur la page de configuration, cliquez sur ``Export JSON`` dans la section ``Exportez vos données wallabag``.
-
-.. image:: ../../img/user/export_wllbg_1.png
-   :alt: Export depuis wallabag 1.x
-   :align: center
-
-Vous obtiendrez un fichier ``wallabag-export-1-1970-01-01.json``.
-
-Exportez vos données de wallabag 2.x
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Dans la barre latérale de téléchargement, cliquez sur ``JSON``.
-
-.. image:: ../../img/user/export_wllbg_2.png
-   :alt: Export depuis wallabag 2.x
-   :align: center
-
-Vous obtiendrez un fichier ``Unread articles.json``.
-
-Importez vos données wallabag 2.x
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Cliquez sur le lien ``Importer`` dans le menu, choisissez la version de wallabag correspondante,
-sélectionnez votre fichier d'export sur votre ordinateur et importez-le.
-
-.. image:: ../../img/user/import_wllbg.png
-   :alt: Import depuis wallabag 1.x
-   :align: center
-
-Tous vos articles wallabag seront importés.
+Migrer depuis un service externe
+================================
 
 Depuis Pocket
 -------------
@@ -53,7 +16,7 @@ Vous devez créer une nouvelle application sur leur site dédié aux développeu
   termes d'utilisation du service et soumettez votre application
 
 Pocket vous fournira une **Consumer Key** (par exemple, `49961-985e4b92fe21fe4c78d682c1`).
-Vous devez configurer la ``pocket_consumer_key`` dans le fichier ``app/config/parameters.yml``.
+Vous devez configurer la ``pocket_consumer_key`` dans la section ``Import`` du menu ``Configuration interne``.
 
 Maintenant, tout est bien configuré pour migrer depuis Pocket.
 

docs/fr/user/installation.rst

@@ -32,6 +32,9 @@ wallabag utilise PDO afin de se connecter à une base de données, donc vous aur
 Installation
 ------------
 
+Sur un serveur dédié (méthode conseillée)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 wallabag utilise un grand nombre de bibliothèques pour fonctionner. Ces bibliothèques doivent être installées à l'aide d'un outil nommé Composer. Vous devez l'installer si ce n'est déjà fait.
 
 Installation de Composer :
@@ -48,7 +51,7 @@ Pour installer wallabag, vous devez exécuter ces deux commandes :
 
     git clone https://github.com/wallabag/wallabag.git
     cd wallabag
-    git checkout 2.0.2
+    git checkout 2.0.4
     SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod
 
@@ -60,13 +63,47 @@ Pour démarrer le serveur interne à php et vérifier que tout s'est installé c
 
 Et accéder wallabag à l'adresse http://lipdevotreserveur:8000
 
-.. note::
+.. tip::
     Pour définir des paramètres via des variables d'environnement, vous pouvez les spécifier avec le préfixe ``SYMFONY__``. Par exemple, ``SYMFONY__DATABASE_DRIVER``. Vous pouvez lire `documentation Symfony <http://symfony.com/doc/current/cookbook/configuration/external_parameters.html>`__ pour en savoir plus.
 
-Installation avec Apache
+Sur un serveur mutualisé
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Nous mettons à votre disposition une archive avec toutes les dépendances à l'intérieur.
+La configuration par défaut utilise SQLite pour la base de données. Si vous souhaitez changer ces paramètres, vous devez modifier le fichier ``app/config/parameters.yml``.
+
+Nous avons déjà créé un utilisateur : le login et le mot de passe sont ``wallabag``.
+
+.. caution:: Avec cette archive, wallabag ne vérifie pas si les extensions obligatoires sont présentes sur votre serveur pour bien fonctionner (ces vérifications sont faites durant le ``composer install`` quand vous avez un serveur dédié, voir ci-dessus).
+
+Exécutez cette commande pour télécharger et décompresser l'archive :
+
+.. code-block:: bash
+
+    wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
+
+Maintenant, lisez la documentation ci-dessous pour crééer un virtual host. Accédez ensuite à votre installation de wallabag.
+Si vous avez changé la configuration pour modifier le type de stockage (MySQL ou PostgreSQL), vous devrez vous créer un utilisateur via la commande ``php bin/console wallabag:install --env=prod``.
+
+Installation avec Docker
 ------------------------
 
-En imaginant que vous vouliez installer wallabag dans le dossier /var/www/wallabag et que vous utilisiez php comme un module Apache, voici un vhost pour wallabag :
+Nous vous proposons une image Docker pour installer wallabag facilement. Allez voir du côté de `Docker Hub <https://hub.docker.com/r/wallabag/wallabag/>`__ pour plus d'informations.
+
+Commande pour démarrer le containeur
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: bash
+
+    docker pull wallabag/wallabag
+
+Virtual hosts
+-------------
+
+Configuration avec Apache
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+En imaginant que vous vouliez installer wallabag dans le dossier ``/var/www/wallabag`` et que vous utilisiez PHP comme un module Apache, voici un vhost pour wallabag :
 
 ::
 
@@ -108,10 +145,10 @@ En imaginant que vous vouliez installer wallabag dans le dossier /var/www/wallab
 
 Après que vous ayez rechargé/redémarré Apache, vous devriez pouvoir avoir accès à wallabag à l'adresse http://domain.tld.
 
-Installation avec Nginx
------------------------
+Configuration avec Nginx
+~~~~~~~~~~~~~~~~~~~~~~~~
 
-En imaginant que vous vouliez installer wallabag dans le dossier /var/www/wallabag, voici un fichier de configuration Nginx pour wallabag :
+En imaginant que vous vouliez installer wallabag dans le dossier ``/var/www/wallabag``, voici un fichier de configuration Nginx pour wallabag :
 
 ::
 
@@ -148,6 +185,67 @@ En imaginant que vous vouliez installer wallabag dans le dossier /var/www/wallab
 
 Après que vous ayez rechargé/redémarré Nginx, vous devriez pouvoir avoir accès à wallabag à l'adresse http://domain.tld.
 
-.. note::
+.. tip::
 
     Si vous voulez importer un fichier important dans wallabag, vous devez ajouter cette ligne dans votre configuration nginx ``client_max_body_size XM; # allows file uploads up to X megabytes``.
+
+Configuration avec lighttpd
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+En imaginant que vous vouliez installer wallabag dans le dossier ``/var/www/wallabag``, voici un fichier de configuration pour wallabag (éditez votre fichier ``lighttpd.conf`` collez-y cette configuration) :
+
+::
+
+    server.modules = (
+        "mod_fastcgi",
+        "mod_access",
+        "mod_alias",
+        "mod_compress",
+        "mod_redirect",
+        "mod_rewrite",
+    )
+    server.document-root = "/var/www/wallabag/web"
+    server.upload-dirs = ( "/var/cache/lighttpd/uploads" )
+    server.errorlog = "/var/log/lighttpd/error.log"
+    server.pid-file = "/var/run/lighttpd.pid"
+    server.username = "www-data"
+    server.groupname = "www-data"
+    server.port = 80
+    server.follow-symlink = "enable"
+    index-file.names = ( "index.php", "index.html", "index.lighttpd.html")
+    url.access-deny = ( "~", ".inc" )
+    static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
+    compress.cache-dir = "/var/cache/lighttpd/compress/"
+    compress.filetype = ( "application/javascript", "text/css", "text/html", "text/plain" )
+    include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port
+    include_shell "/usr/share/lighttpd/create-mime.assign.pl"
+    include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
+    dir-listing.activate = "disable"
+
+    url.rewrite-if-not-file = (
+        "^/([^?])(?:\?(.))?" => "/app.php?$1&$2",
+        "^/([^?]*)" => "/app.php?=$1",
+    )
+
+Droits d'accès aux dossiers du projet
+-------------------------------------
+
+Environnement de test
+~~~~~~~~~~~~~~~~~~~~~
+
+Quand nous souhaitons juste tester wallabag, nous lançons simplement la commande  ``php bin/console server:run --env=prod`` pour démarrer l'instance wallabag et tout se passe correctement car l'utilisateur qui a démarré le projet a accès naturellement au repertoire courant, tout va bien.
+
+Environnement de production
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Dès lors que nous utilisons Apache ou Nginx pour accéder à notre instance wallabag, et non plus la commande ``php bin/console server:run --env=prod`` pour la démarrer, il faut prendre garde à octroyer les bons droits aux bons dossiers afin de préserver la sécurité de l'ensemble des fichiers fournis par le projet.
+
+Aussi, le dossier, connu sous le nom de ``DocumentRoot`` (pour apache) ou ``root`` (pour Nginx), doit être impérativement accessible par l'utilisateur de Apache ou Nginx. Le nom de cet utilisateur est généralement ``www-data``, ``apache`` ou ``nobody`` (selon les systèmes linux utilisés).
+
+Donc le dossier ``/var/www/wallabag/web`` doit être accessible par ce dernier. Mais cela ne suffira pas si nous nous contentons de ce dossier, et nous pourrions avoir, au mieux une page blanche en accédant à la page d'accueil du projet, au pire une erreur 500.
+
+Cela est dû au fait qu'il faut aussi octroyer les mêmes droits d'accès au dossier ``/var/www/wallabag/var`` que ceux octroyés au dossier ``/var/www/wallabag/web``. Ainsi, on règle le problème par la commande suivante :
+
+.. code-block:: bash
+
+   chown -R www-data:www-data /var/www/wallabag/var

docs/fr/user/login.rst

@@ -11,13 +11,3 @@ vous pouvez cocher la case ``Restez connecté`` : wallabag se souviendra de vous
 .. image:: ../../img/user/login_form.png
    :alt: Formulaire de connexion
    :align: center
-
-Foire aux questions
--------------------
-
-J'ai oublié mon mot de passe
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Vous pouvez réinitialiser votre mot de passe en cliquant sur ``Mot de passe oublié ?``,
-sur la page de connexion. Ensuite, renseignez votre adresse email ou votre nom d'utilisateur,
-un email vous sera envoyé.

docs/fr/user/migration.rst

@@ -1,5 +1,5 @@
-Migrer wallabag
-===============
+Migrer depuis la v1 ou la v2
+============================
 
 Depuis wallabag 1.x
 -------------------
@@ -16,7 +16,7 @@ Si vous utilisiez wallabag v1.x, vous devez exporter vos données avant de migre
 .. note::
     S'il vous arrive des problèmes durant l'export ou l'import, n'hésitez pas à `demander de l'aide <https://www.wallabag.org/pages/support.html>`__.
 
-Une fois que vous avez récupéré le fichier json contenant vos données, vous pouvez installer wallabag v2 si c'est nécessaire en suivant `la procédure standard <http://doc.wallabag.org/fr/v2/user/installation.html>`__.
+Une fois que vous avez récupéré le fichier json contenant vos données, vous pouvez installer wallabag v2 si c'est nécessaire en suivant `la procédure standard <http://doc.wallabag.org/fr/master/user/installation.html>`__.
 
 Une fois que vous avez créé un compte utilisateur sur votre nouvelle instance de wallabag v2, rendez-vous dans la section `Import`. Vous devez choisir l'import depuis wallabag v1 puis sélectionner votre fichier json récupéré précédemment.
 

docs/fr/user/upgrade.rst

@@ -0,0 +1,32 @@
+Mettre à jour wallabag
+======================
+
+Mise à jour sur un serveur dédié
+--------------------------------
+
+La dernière version de wallabag est publiée à cette adresse : https://www.wallabag.org/pages/download-wallabag.html. Pour mettre à jour votre installation de wallabag, exécutez les commandes suivantes dans votre répertoire d'installation (remplacez ``2.0.3`` par le numéro de la dernière version) :
+
+::
+
+    git fetch origin
+    git fetch --tags
+    git checkout 2.0.3
+    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
+    php bin/console cache:clear --env=prod
+
+Mise à jour sur un hébergement mutualisé
+----------------------------------------
+
+Effectuez une sauvegarde du fichier ``app/config/parameters.yml``.
+
+Téléchargez la dernière version de wallabag : 
+
+.. code-block:: bash
+
+    wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
+
+Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre.
+
+Si vous utilisez SQLite, vous devez également conserver le contenu du répertoire ``data/``.
+
+Videz le répertoire ``var/cache``.

src/Wallabag/ApiBundle/Controller/WallabagRestController.php

@@ -109,6 +109,7 @@ class WallabagRestController extends FOSRestController
         $this->validateAuthentication();
 
         $url = $request->request->get('url');
+        $title = $request->request->get('title');
         $isArchived = (int) $request->request->get('archive');
         $isStarred = (int) $request->request->get('starred');
 
@@ -121,6 +122,10 @@ class WallabagRestController extends FOSRestController
             );
         }
 
+        if (!is_null($title)) {
+            $entry->setTitle($title);
+        }
+
         $tags = $request->request->get('tags', '');
         if (!empty($tags)) {
             $this->get('wallabag_core.content_proxy')->assignTagsToEntry($entry, $tags);

src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php

@@ -152,6 +152,7 @@ class WallabagRestControllerTest extends WallabagApiTestCase
         $this->client->request('POST', '/api/entries.json', [
             'url' => 'http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html',
             'tags' => 'google',
+            'title' => 'New title for my article',
         ]);
 
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
@@ -162,6 +163,7 @@ class WallabagRestControllerTest extends WallabagApiTestCase
         $this->assertEquals('http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html', $content['url']);
         $this->assertEquals(false, $content['is_archived']);
         $this->assertEquals(false, $content['is_starred']);
+        $this->assertEquals('New title for my article', $content['title']);
         $this->assertEquals(1, $content['user_id']);
         $this->assertCount(1, $content['tags']);
     }

src/Wallabag/CoreBundle/Controller/ConfigController.php

@@ -140,6 +140,7 @@ class ConfigController extends Controller
             $config->setItemsPerPage($this->getParameter('wallabag_core.items_on_page'));
             $config->setRssLimit($this->getParameter('wallabag_core.rss_limit'));
             $config->setLanguage($this->getParameter('wallabag_core.language'));
+            $config->setReadingSpeed($this->getParameter('wallabag_core.reading_speed'));
 
             $em->persist($config);
 

src/Wallabag/CoreBundle/Controller/TagController.php

@@ -81,7 +81,7 @@ class TagController extends Controller
     {
         $tags = $this->getDoctrine()
             ->getRepository('WallabagCoreBundle:Tag')
-            ->findTags($this->getUser()->getId());
+            ->findAllTags($this->getUser()->getId());
 
         return $this->render(
             'WallabagCoreBundle:Tag:tags.html.twig',

src/Wallabag/CoreBundle/Entity/Tag.php

@@ -117,4 +117,16 @@ class Tag
     {
         return $this->entries;
     }
+
+    public function getEntriesByUserId($userId)
+    {
+        $filteredEntries = new ArrayCollection();
+        foreach ($this->entries as $entry) {
+            if ($entry->getUser()->getId() === $userId) {
+                $filteredEntries->add($entry);
+            }
+        }
+
+        return $filteredEntries;
+    }
 }

src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php

@@ -35,6 +35,20 @@ class EntryFilterType extends AbstractType
     {
         $builder
             ->add('readingTime', NumberRangeFilterType::class, [
+                'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
+                    $value = $values['value'];
+
+                    if (null === $value['left_number'][0] || null === $value['right_number'][0]) {
+                        return;
+                    }
+
+                    $min = (int) ($value['left_number'][0] * $this->user->getConfig()->getReadingSpeed());
+                    $max = (int) ($value['right_number'][0] * $this->user->getConfig()->getReadingSpeed());
+
+                    $expression = $filterQuery->getExpr()->between($field, $min, $max);
+
+                    return $filterQuery->createCondition($expression);
+                },
                 'label' => 'entry.filters.reading_time.label',
             ])
             ->add('createdAt', DateRangeFilterType::class, [

src/Wallabag/CoreBundle/Repository/TagRepository.php

@@ -3,41 +3,9 @@
 namespace Wallabag\CoreBundle\Repository;
 
 use Doctrine\ORM\EntityRepository;
-use Pagerfanta\Adapter\DoctrineORMAdapter;
-use Pagerfanta\Pagerfanta;
 
 class TagRepository extends EntityRepository
 {
-    /**
-     * Return only the QueryBuilder to retrieve all tags for a given user.
-     *
-     * @param int $userId
-     *
-     * @return QueryBuilder
-     */
-    private function getQbForAllTags($userId)
-    {
-        return $this->createQueryBuilder('t')
-            ->leftJoin('t.entries', 'e')
-            ->where('e.user = :userId')->setParameter('userId', $userId);
-    }
-
-    /**
-     * Find Tags and return a Pager.
-     *
-     * @param int $userId
-     *
-     * @return Pagerfanta
-     */
-    public function findTags($userId)
-    {
-        $qb = $this->getQbForAllTags($userId);
-
-        $pagerAdapter = new DoctrineORMAdapter($qb);
-
-        return new Pagerfanta($pagerAdapter);
-    }
-
     /**
      * Find Tags.
      *
@@ -47,7 +15,9 @@ class TagRepository extends EntityRepository
      */
     public function findAllTags($userId)
     {
-        return $this->getQbForAllTags($userId)
+        return $this->createQueryBuilder('t')
+            ->leftJoin('t.entries', 'e')
+            ->where('e.user = :userId')->setParameter('userId', $userId)
             ->getQuery()
             ->getResult();
     }

src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css

@@ -437,6 +437,9 @@ main ul.row {
     .indicator {
         display: none;
     }
+    .pagination li.prev, .pagination li.next {
+        width: auto;
+    }
   }
 
 @media only screen and (min-width : 400px) {

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

@@ -380,13 +380,6 @@ developer:
     #         paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
     #     back: 'Back'
 
-validator:
-    password_must_match: 'De indtastede adgangskoder skal være ens'
-    password_too_short: 'Adgangskoden skal være mindst 8 tegn'
-    # password_wrong_value: 'Wrong value for your current password'
-    # item_per_page_too_high: 'This will certainly kill the app'
-    # rss_limit_too_hight: 'This will certainly kill the app'
-
 flashes:
     config:
         notice:

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

@@ -380,13 +380,6 @@ developer:
             paragraph_8: 'Wenn du alle API-Endpunkte sehen willst, werfe einen Blick auf die <a href="%link%">API-Dokumentation</a>.'
         back: 'Zurück'
 
-validator:
-    password_must_match: 'Die Kennwort-Felder müssen übereinstimmen.'
-    password_too_short: 'Kennwort-Mindestlänge von acht Zeichen nicht erfüllt'
-    password_wrong_value: 'Falscher Wert für dein aktuelles Kennwort'
-    item_per_page_too_high: 'Dies wird die Anwendung möglicherweise beenden'
-    rss_limit_too_hight: 'Dies wird die Anwendung möglicherweise beenden'
-
 flashes:
     config:
         notice:

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

@@ -380,13 +380,6 @@ developer:
             paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
         back: 'Back'
 
-validator:
-    password_must_match: 'The password fields must match.'
-    password_too_short: 'Password should by at least 8 chars long'
-    password_wrong_value: 'Wrong value for your current password'
-    item_per_page_too_high: 'This will certainly kill the app'
-    rss_limit_too_hight: 'This will certainly kill the app'
-
 flashes:
     config:
         notice:

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

@@ -7,7 +7,7 @@ security:
         register: 'Registrarse'
         username: 'Nombre de usuario'
         password: 'Contraseña'
-        # cancel: 'Cancel'
+        cancel: 'Cancelar'
     resetting:
         description: "Introduzca su dirección del correo electrónico y le enviaremos las instrucciones para reiniciar la contraseña"
     register:
@@ -43,7 +43,7 @@ footer:
     wallabag:
         elsewhere: 'Lleve wallabag consigo'
         social: 'Social'
-        # powered_by: 'powered by'
+        powered_by: 'funciona por'
         about: 'Acerca de'
 
 config:
@@ -71,7 +71,7 @@ config:
     form_rss:
         description: 'Los feeds RSS de wallabag permiten leer los artículos guardados con su lector RSS favorito. Necesita generar un token primero'
         token_label: 'RSS token'
-        # no_token: 'No token'
+        no_token: 'No token'
         token_create: 'Crear token'
         token_reset: 'Reiniciar token'
         rss_links: 'URL de su feed RSS'
@@ -171,19 +171,19 @@ entry:
             filter: 'Filtrar'
     view:
         left_menu:
-            # back_to_top: 'Back to top'
-            back_to_homepage: 'Volver'
+            back_to_top: 'Regrese al principio'
+            back_to_homepage: 'Regrese a la página principal'
             set_as_read: 'Marcar como leído'
-            # set_as_unread: 'Mark as unread'
+            set_as_unread: 'Marcar como no leído'
             set_as_favorite: 'Marcar como favorito'
             view_original_article: 'Artículo original'
             re_fetch_content: 'Redescargar el contenido'
             delete: 'Suprimir'
             add_a_tag: 'Añadir una etiqueta'
             share_content: 'Compartir'
-            share_email_label: 'Direccion e-mail'
+            share_email_label: 'Dirección e-mail'
             download: 'Descargar'
-            # print: 'Print'
+            print: 'Imprimir'
             problem:
                 label: '¿Algún problema?'
                 description: '¿Este artículo no se muestra bien?'
@@ -196,7 +196,7 @@ entry:
         form_new:
             url_label: Url
     edit:
-        page_title: 'Editar una artículo'
+        page_title: 'Editar un artículo'
         title_label: 'Título'
         url_label: 'Url'
         is_public_label: 'Es Público'
@@ -220,14 +220,14 @@ about:
     getting_help:
         documentation: 'Documentación'
         bug_reports: 'Reporte de errores'
-        support: '<a href="https://support.wallabag.org">En nuestra web de soporte website</a> o <a href="https://github.com/wallabag/wallabag/issues">en GitHub</a>'
+        support: '<a href="https://support.wallabag.org">En nuestra web de apoyo website</a> o <a href="https://github.com/wallabag/wallabag/issues">en GitHub</a>'
     helping:
         description: 'wallabag es libre y gratuito. Usted puede ayudarnos :'
         by_contributing: 'contribuyendo al proyecto :'
         by_contributing_2: 'nuestras necesidades están en un ticket'
         by_paypal: 'via Paypal'
     contributors:
-        description: 'Gradias a los colaboradores de la aplicación web de wallabag'
+        description: 'Gracias a los colaboradores de la aplicación web de wallabag'
     third_party:
         description: 'Aquí está la lista de las dependencias utilizadas por wallabag (con sus licencias) :'
         package: 'Paquete'
@@ -259,24 +259,24 @@ quickstart:
     intro:
         title: 'Bienvenido a wallabag !'
         paragraph_1: "Le acompañaremos a su visita de wallabag y le mostraremos algunas características que le pueden interesar."
-        paragraph_2: '¡Siganos!'
+        paragraph_2: '¡Síganos!'
     configure:
         title: 'Configure la aplicación'
-        language: 'Cambie el idoma y el diseño de la aplicación'
+        language: 'Cambie el idioma y el diseño de la aplicación'
         rss: 'Activar los feeds RSS'
-        # tagging_rules: 'Write rules to automatically tag your articles'
+        tagging_rules: 'Escribir reglas para etiquetear automaticamente sus artículos'
     admin:
-        # title: 'Administration'
-        # description: 'As an administrator, you have privileges on wallabag. You can:'
-        # new_user: 'Create a new user'
-        # analytics: 'Configure analytics'
-        # sharing: 'Enable some parameters about article sharing'
-        # export: 'Configure export'
-        # import: 'Configure import'
+        title: 'Administración'
+        description: 'Como administrador, tiene privilegios por wallabag. Se puede:'
+        new_user: 'Crear un nuevo usuario'
+        analytics: 'Configure analíticas'
+        sharing: 'Active unos parámetros de compartir artículos'
+        export: 'Configure exportación'
+        import: 'Configure importación'
     first_steps:
-        title: 'Prieros pasos'
+        title: 'Primeros pasos'
         new_article: 'Guarde su primer artículo'
-        unread_articles: '¡Y clasifiquelo!'
+        unread_articles: '¡Y clasifíquelo!'
     migrate:
         title: 'Migrar de un servicio existente'
         description: "¿Está usando otro servicio? Le ayudaremos a migrar sus datos a wallabag."
@@ -284,18 +284,18 @@ quickstart:
         wallabag_v1: 'Migrar desde wallabag v1'
         wallabag_v2: 'Migrar desde wallabag v2'
     developer:
-        # title: 'Developers'
-        # create_application: 'Create your third application'
+        title: 'Promotores'
+        create_application: 'Cree su tercera aplicación'
     docs:
         title: 'Documentación completa'
-        # annotate: 'Annotate your article'
+        annotate: 'Anote su artículo'
         export: 'Convierta sus artículos a ePub o a PDF'
         search_filters: 'Aprenda a utilizar el buscador y los filtros para encontrar el artículo que le interese'
-        # fetching_errors: 'What can I do if an article encounters errors during fetching?'
+        fetching_errors: '¿Qué puedo hacer si un artículo encuentra errores por la búsqueda?'
         all_docs: '¡Y muchos más artículos!'
     support:
-        title: 'Soporte'
-        description: 'Sí necesita ayuda, estamos disponibles para usted.'
+        title: 'Apoyo'
+        description: 'Si necesita ayuda, estamos disponibles para usted.'
         github: 'En GitHub'
         email: 'Por email'
         gitter: 'En Gitter'
@@ -303,7 +303,7 @@ quickstart:
 tag:
     page_title: 'Etiquetas'
     list:
-        number_on_the_page: '{0} No hay ningun etiqueta.|{1} Hay un etiqueta.|]1,Inf[ Hay %count% etiquetas.'
+        number_on_the_page: '{0} No hay ninguna etiqueta.|{1} Hay una etiqueta.|]1,Inf[ Hay %count% etiquetas.'
 
 import:
     page_title: 'Importar'
@@ -311,8 +311,8 @@ import:
     action:
         import_contents: 'Importar los contenidos'
     form:
-        # mark_as_read_title: 'Mark all as read?'
-        # mark_as_read_label: 'Mark all imported entries as read'
+        mark_as_read_title: '¿Marcar todos como leídos?'
+        mark_as_read_label: 'Marcar todos artículos importados como leídos'
         file_label: 'Fichero'
         save_label: 'Importar el fichero'
     pocket:
@@ -321,78 +321,71 @@ import:
         config_missing:
             description: "La importación de Pocket no está configurada."
             admin_message: 'Debe definir %keyurls%una clava del API Pocket%keyurle%.'
-            user_message: 'El administrador de vuestro servidor debe definir una clave API Pocket.'
-        authorize_message: 'Puedes importar sus datos desde su cuenta de Pocket. Sólo tienes que pulsar en el botón para autrizar que wallabag se conecte a getpocket.com.'
-        connect_to_pocket: 'Conectese a Pocket para importar los datos'
+            user_message: 'El administrador de su servidor debe definir una clave API Pocket.'
+        authorize_message: 'Puede importar sus datos desde su cuenta de Pocket. Sólo tiene que oprimir el botón para autorizar que wallabag se conecte a getpocket.com.'
+        connect_to_pocket: 'Conéctese a Pocket para importar los datos'
     wallabag_v1:
         page_title: 'Importar > Wallabag v1'
-        description: 'Va a importar sus artículos de wallabag v1. En su configuración de wallabag v1, pulse sobre "Exportar JSON" dentro de la sección "Exportar sus datos de wallabag". Usted tendrá un fichero "wallabag-export-1-xxxx-xx-xx.json".'
-        how_to: 'Seleccione el fichero de su exportación de wallabag v1 y puelse en el botón para subirla y importarla.'
+        description: 'Va a importar sus artículos de wallabag v1. En su configuración de wallabag v1, oprima "Exportar JSON" dentro de la sección "Exportar sus datos de wallabag". Usted tendrá un fichero "wallabag-export-1-xxxx-xx-xx.json".'
+        how_to: 'Seleccione el fichero de su exportación de wallabag v1 y oprima el botón para subirlo y importarlo.'
     wallabag_v2:
         page_title: 'Importar > Wallabag v2'
-        description: 'Va a importar sus artículos de otra instancia de wallabag v2. Vaya a Todos los artículos, entonces, en la barra lateral, clickee en "JSON". Usted tendrá un fichero "All articles.json"'
+        description: 'Va a importar sus artículos de otra instancia de wallabag v2. Vaya a Todos los artículos, entonces, en la barra lateral, oprima en "JSON". Usted tendrá un fichero "All articles.json"'
 
 developer:
-    # page_title: 'Developer'
-    # welcome_message: 'Welcome to the wallabag API'
-    # documentation: 'Documentation'
-    # how_to_first_app: 'How to create my first application'
-    # full_documentation: 'View full API documentation'
-    # list_methods: 'List API methods'
-    # clients:
-    #     title: 'Clients'
-    #     create_new: 'Create a new client'
-    # existing_clients:
-    #     title: 'Existing clients'
-    #     field_id: 'Client ID'
-    #     field_secret: 'Client secret'
-    #     field_uris: 'Redirect URIs'
-    #     field_grant_types: 'Grant type allowed'
-    #     no_client: 'No client yet.'
-    # remove:
-    #     warn_message_1: 'You have the ability to remove this client. This action is IRREVERSIBLE !'
-    #     warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
-    #     action: 'Remove this client'
-    # client:
-    #     page_title: 'Developer > New client'
-    #     page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
-    #     form:
-    #         redirect_uris_label: 'Redirect URIs'
-    #         save_label: 'Create a new client'
-    #     action_back: 'Back'
-    # client_parameter:
-    #     page_title: 'Developer > Client parameters'
-    #     page_description: 'Here are your client parameters.'
-    #     field_id: 'Client ID'
-    #     field_secret: 'Client secret'
-    #     back: 'Back'
-    #     read_howto: 'Read the howto "Create my first application"'
-    # howto:
-    #     page_title: 'Developer > How to create my first application'
-    #     description:
-    #         paragraph_1: 'The following commands make use of the <a href="https://github.com/jkbrzt/httpie">HTTPie library</a>. Make sure it is installed on your system before using it.'
-    #         paragraph_2: 'You need a token to communicate between your 3rd application and wallabag API.'
-    #         paragraph_3: 'To create this token, you need <a href="%link%">to create a new client</a>.'
-    #         paragraph_4: 'Now, create your token (replace client_id, client_secret, username and password with the good values):'
-    #         paragraph_5: 'The API will return a response like this:'
-    #         paragraph_6: 'The access_token is useful to do a call to the API endpoint. For example:'
-    #         paragraph_7: 'This call will return all the entries for your user.'
-    #         paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
-    #     back: 'Back'
-
-validator:
-    password_must_match: 'Las contraseñas no coinciden'
-    password_too_short: 'La contraseña debe tener al menos 8 carácteres'
-    # password_wrong_value: 'Wrong value for your current password'
-    # item_per_page_too_high: 'This will certainly kill the app'
-    # rss_limit_too_hight: 'This will certainly kill the app'
+    page_title: 'Promotor'
+    welcome_message: 'Bienvenido a wallabag API'
+    documentation: 'Documentación'
+    how_to_first_app: 'Cómo crear mi primera aplicación'
+    full_documentation: 'Ver documentación de API entera'
+    list_methods: 'Hacer una lista de métodos API'
+    clients:
+        title: 'Clientes'
+        create_new: 'Crear un nuevo cliente'
+    existing_clients:
+        title: 'Clientes actuales'
+        field_id: 'identificación del cliente'
+        field_secret: 'Cliente secreto'
+        field_uris: 'Redirigir los URI'
+        field_grant_types: 'Conceder manera permitida'
+        no_client: 'No cliente todavía.'
+    remove:
+        warn_message_1: 'Se puede quitar este cliente. ¡Está acción no se puede ser irreversible !'
+        warn_message_2: "Si lo elimine, cada aplicación configurada con ese cliente no se puede ser autorizada por su wallbag."
+        action: 'Quite este cliente'
+    client:
+        page_title: 'Promotor > Nuevo cliente'
+        page_description: 'Va a crear un nuevo cliente. Por favor, llene el campo abajo para URI redirigido de su aplicación.'
+        form:
+            redirect_uris_label: 'los URI redirigidos'
+            save_label: 'Crear un nuevo cliente'
+        action_back: 'Atrás'
+    client_parameter:
+        page_title: 'Promotor > Parámetros del cliente'
+        page_description: 'Aquí hay sus parámetros del cliente.'
+        field_id: 'Identificación del cliente'
+        field_secret: 'Cliente secreto'
+        back: 'Atrás'
+        read_howto: 'Leer el howto "Crear mi primera aplicación"'
+    howto:
+        page_title: 'Promotor > Cómo crear mi primera aplicación'
+        description:
+            paragraph_1: 'Los siguientes comandos se usan el <a href="https://github.com/jkbrzt/httpie">HTTPie library</a>. Esté seguro de que se instalen en sus sistema antes de usarlos.'
+            paragraph_2: 'Necesita un token para comunicar entre su tercera aplicación y wallabag API.'
+            paragraph_3: 'Para crear este token, necesita <a href="%link%">to create a new client</a>.'
+            paragraph_4: 'Ahora, cree su token (reemplace cliente_id, cliente_secreto, usuario y contraseñ con las buenas entradas):'
+            paragraph_5: 'Este API devolverá una respuestas así:'
+            paragraph_6: 'El acceso_token es útil para hacer una llamada al final API. Por ejempolo:'
+            paragraph_7: 'Esta llamada devolverá todos los artículos para su usuario.'
+            paragraph_8: 'Si quiere ver todos los fines de API, se puede ver <a href="%link%">a nuestra documentación API</a>.'
+        back: 'Atrás'
 
 flashes:
     config:
         notice:
             config_saved: 'Configuración guardada. Algunos parámetros serán recargados cuando se vuelva a conectar.'
             password_updated: 'Contraseña actualizada'
-            password_not_updated_demo: "En modo demo, no puedes cambiar la contraseña del usuario."
+            password_not_updated_demo: "En modo demo, no puede cambiar la contraseña del usuario."
             user_updated: 'Su información personal ha sido actualizada'
             rss_updated: 'La configuración de los feeds RSS ha sido actualizada'
             tagging_rules_updated: 'Regla de etiquetado borrada'
@@ -401,11 +394,11 @@ flashes:
             rss_token_updated: 'RSS token actualizado'
     entry:
         notice:
-            # entry_already_saved: 'Entry already saved on %date%'
-            # entry_saved: 'Entry saved'
-            # entry_updated: 'Entry updated'
-            # entry_reloaded: 'Entry reloaded'
-            # entry_reload_failed: 'Failed to reload entry'
+            entry_already_saved: 'Entrada ya guardada por %fecha%'
+            entry_saved: 'Entrada guardada'
+            entry_updated: 'Entrada actualizada'
+            entry_reloaded: 'Entrada recargada'
+            entry_reload_failed: 'Entrada recargada reprobada'
             entry_archived: 'Artículo archivado'
             entry_unarchived: 'Artículo desarchivado'
             entry_starred: 'Artículo guardado en los favoritos'
@@ -416,10 +409,10 @@ flashes:
             tag_added: 'Etiqueta añadida'
     import:
         notice:
-            # failed: 'Import failed, please try again.'
-            # failed_on_file: 'Error while processing import. Please verify your import file.'
-            # summary: 'Import summary: %imported% imported, %skipped% already saved.'
+             failed: 'Importación reprobada, por favor inténtelo de nuevo.'
+             failed_on_file: 'Se ocurre un error por procesar importación. Por favor verifique su archivo importado.'
+             summary: 'Resúmen importado: %importado% importado, %saltados% ya guardado.'
     developer:
         notice:
-            # client_created: 'New client created.'
-            # client_deleted: 'Client deleted'
+            client_created: 'Nuevo cliente creado.'
+            client_deleted: 'Cliente suprimido'

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

@@ -380,13 +380,6 @@ developer:
     #         paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
     #     back: 'بازگشت'
 
-validator:
-    password_must_match: 'رمزها باید یکی باشند'
-    password_too_short: 'رمز شما باید ۸ حرف یا بیشتر باشد'
-    password_wrong_value: 'رمز فعلی را اشتباه وارد کرده‌اید'
-    item_per_page_too_high: 'با این تعداد برنامه به فنا می‌رود'
-    rss_limit_too_hight: 'با این تعداد برنامه به فنا می‌رود'
-
 flashes:
     config:
         notice:

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

@@ -380,13 +380,6 @@ developer:
             paragraph_8: "Si vous voulez toutes les méthodes de l'API, jetez un oeil <a href=\"%link%\">à la documentation de l'API</a>."
         back: 'Retour'
 
-validator:
-    password_must_match: 'Les deux mots de passe doivent être les mêmes'
-    password_too_short: 'Le mot de passe doit contenir au moins 8 caractères'
-    password_wrong_value: 'Votre mot de passe actuel est faux'
-    item_per_page_too_high: "Ca ne va pas plaire à l'application"
-    rss_limit_too_hight: "Ca ne va pas plaire à l'application"
-
 flashes:
     config:
         notice:

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

@@ -0,0 +1,418 @@
+security:
+    login:
+        page_title: 'Benvenuto in wallabag!'
+        keep_logged_in: 'Resta loggato'
+        forgot_password: 'Hai dimenticato la password?'
+        submit: 'Login'
+        register: 'Registrati'
+        username: 'Username'
+        password: 'Password'
+        cancel: 'Cancella'
+    resetting:
+        description: "Inserisci il tuo indirizzo e-mail nel campo sottostante e ti invieremo le istruzioni per il reset della password."
+    register:
+        page_title: 'Crea un account'
+        go_to_account: 'Vai al tuo account'
+
+menu:
+    left:
+        unread: 'Non letti'
+        starred: 'Preferiti'
+        archive: 'Archivio'
+        all_articles: 'Tutti'
+        config: 'Configurazione'
+        tags: 'Tags'
+        internal_settings: 'Strumenti'
+        import: 'Importa'
+        howto: 'How to'
+        developer: 'Sviluppatori'
+        logout: 'Logout'
+        about: 'About'
+        search: 'Cerca'
+        save_link: 'Salva collegamento'
+        back_to_unread: 'Torna ai contenuti non letti'
+    top:
+        add_new_entry: 'Aggiungi un nuovo contenuto'
+        search: 'Cerca'
+        filter_entries: 'Filtra contenuti'
+        export: 'Esporta'
+    search_form:
+        input_label: 'Inserisci qui la tua ricerca'
+
+footer:
+    wallabag:
+        elsewhere: 'Porta wallabag con te'
+        social: 'Social'
+        powered_by: 'powered by'
+        about: 'About'
+
+config:
+    page_title: 'Configurazione'
+    tab_menu:
+        settings: 'Impostazioni'
+        rss: 'RSS'
+        user_info: 'Informazioni utente'
+        password: 'Password'
+        rules: 'Regole di tagging'
+        new_user: 'Aggiungi utente'
+    form:
+        save: 'Salva'
+    form_settings:
+        theme_label: 'Tema'
+        items_per_page_label: 'Elementi per pagina'
+        language_label: 'Lingua'
+        reading_speed:
+            label: 'Velocità di lettura'
+            help_message: 'Puoi utilizzare dei tools online per valutare la tua velocità di lettura:'
+            100_word: 'Leggo ~100 parole al minuto'
+            200_word: 'Leggo ~200 parole al minuto'
+            300_word: 'Leggo ~300 parole al minuto'
+            400_word: 'Leggo ~400 parole al minuto'
+    form_rss:
+        description: 'I feed RSS generati da wallabag ti permettono di leggere i tuoi contenuti salvati con il tuo lettore di RSS preferito. Prima, devi generare un token.'
+        token_label: 'RSS token'
+        no_token: 'Nessun token'
+        token_create: 'Crea il tuo token'
+        token_reset: 'Rigenera il tuo token'
+        rss_links: 'Collegamenti RSS'
+        rss_link:
+            unread: 'non letti'
+            starred: 'preferiti'
+            archive: 'archiviati'
+        rss_limit: 'Numero di elementi nel feed'
+    form_user:
+        two_factor_description: "Abilitando la two factor authentication riceverai una e-mail con un codice per ogni nuova connesione non verificata"
+        name_label: 'Nome'
+        email_label: 'E-mail'
+        twoFactorAuthentication_label: 'Two factor authentication'
+    form_password:
+        old_password_label: 'Password corrente'
+        new_password_label: 'Nuova password'
+        repeat_new_password_label: 'Ripeti la nuova password'
+    form_rules:
+        if_label: 'se'
+        then_tag_as_label: 'allora tagga come'
+        delete_rule_label: 'elimina'
+        rule_label: 'Regola'
+        tags_label: 'Tag'
+        faq:
+            title: 'FAQ'
+            tagging_rules_definition_title: 'Cosa significa « regole di tagging » ?'
+            tagging_rules_definition_description: 'Sono regole utilizzate da wallabag per taggare automaticamente i contenuti.<br />Ogni volta che viene aggiunto un contenuto, tutte le regole di tagging rules vengono utilizzate per aggiungere i tag configurati, risparmiandoti il lavoro di classificare i contenuti manualmente.'
+            how_to_use_them_title: 'Come si usano?'
+            how_to_use_them_description: 'Diciamo che vuoi taggare un contenuto come « <i>lettura veloce</i> » quando il tempo di lettura è inferiore ai 3 minuti.<br />In questo case, devi mettere « readingTime &lt;= 3 » nel campo <i>Regola</i> e « <i>lettura veloce</i> » nel campo <i>Tag</i>.<br />Molti tag si possono aggiungere contemporanemente separandoli con una virgola: « <i>lettura veloce, da leggere</i> »<br />Regole complesse possono essere scritte utilizzando gli operatori predefiniti: se « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » allora tagga « <i>lettura lunga, github </i> »'
+            variables_available_title: 'Quali operatori e variabili posso utilizzare per scrivere delle regole?'
+            variables_available_description: 'I seguenti operatori e variabili posso essere utilizzati per scrivere regole di tagging:'
+            meaning: 'Significato'
+            variable_description:
+                label: 'Variabile'
+                title: "Titolo del contenuto"
+                url: "URL del contenuto"
+                isArchived: "Specifica se il contenuto è archiviato o no"
+                isStarred: "Specifica se il contenuto è preferito o no"
+                content: "La pagina del contenuto"
+                language: "La lingua del contenuto"
+                mimetype: "Mime-type del contenuto"
+                readingTime: "Il tempo di lettura stimato del contenuto, in minuti"
+                domainName: "Il nome di dominio del contenuto"
+            operator_description:
+                label: 'Operatore'
+                less_than: 'Minore/uguale di...'
+                strictly_less_than: 'Minore di...'
+                greater_than: 'Maggiore/uguale di...'
+                strictly_greater_than: 'Maggiore di...'
+                equal_to: 'Uguale a...'
+                not_equal_to: 'Non uguale a...'
+                or: "Una regola O un'altra"
+                and: "Una regola E un'altra"
+                matches: 'Verifica che un <i>oggetto</i> risulti in una <i>ricerca</i> (case-insensitive).<br />Esempio: <code>titolo contiene "football"</code>'
+    form_new_user:
+        username_label: 'Username'
+        password_label: 'Password'
+        repeat_new_password_label: 'Ripeti password'
+        plain_password_label: '????'
+        email_label: 'E-mail'
+
+entry:
+    page_titles:
+        unread: 'Contenuti non letti'
+        starred: 'Contenuti preferiti'
+        archived: 'Contenuti archiviati'
+        filtered: 'Contenuti filtrati'
+    list:
+        number_on_the_page: "{0} Non ci sono contenuti.|{1} C'è un contenuto.|]1,Inf[ Ci sono %count% contenuti."
+        reading_time: 'tempo di lettura stimato'
+        reading_time_minutes: 'tempo di lettura stimato: %readingTime% min'
+        reading_time_less_one_minute: 'tempo di lettura stimato: <small class="inferieur">&lt;</small> 1 min'
+        original_article: 'originale'
+        toogle_as_read: 'Segna come da leggere'
+        toogle_as_star: 'Segna come non preferito'
+        delete: 'Elimina'
+        export_title: 'Esporta'
+    filters:
+        title: 'Filtri'
+        status_label: 'Stato'
+        archived_label: 'Archiviati'
+        starred_label: 'Preferiti'
+        preview_picture_label: "Ha un'immagine di anteprima"
+        preview_picture_help: 'Immagine di anteprima'
+        language_label: 'Lingua'
+        reading_time:
+            label: 'Tempo di lettura in minuti'
+            from: 'da'
+            to: 'a'
+        domain_label: 'Nome di dominio'
+        created_at:
+            label: 'Data di creazione'
+            from: 'da'
+            to: 'a'
+        action:
+            clear: 'Pulisci'
+            filter: 'Filtra'
+    view:
+        left_menu:
+            back_to_top: "Torna all'inizio"
+            back_to_homepage: 'Indietro'
+            set_as_read: 'Segna come già letto'
+            set_as_unread: 'Segna come da leggere'
+            set_as_favorite: 'Segna come preferito'
+            view_original_article: 'Contenuto originale'
+            re_fetch_content: 'Ri-ottieni pagina'
+            delete: 'Elimina'
+            add_a_tag: 'Aggiungi un tag'
+            share_content: 'Condividi'
+            share_email_label: 'E-mail'
+            download: 'Download'
+            print: 'Stampa'
+            problem:
+                label: 'Problemi?'
+                description: 'Questo contenuto viene visualizzato male?'
+        edit_title: 'Modifica titolo'
+        original_article: 'originale'
+        annotations_on_the_entry: '{0} Nessuna annotazione|{1} Una annotazione|]1,Inf[ %nbAnnotations% annotazioni'
+    new:
+        page_title: 'Salva un nuovo contenuto'
+        placeholder: 'http://website.com'
+        form_new:
+            url_label: Url
+    edit:
+        page_title: 'Modifica voce'
+        title_label: 'Titolo'
+        url_label: 'Url'
+        is_public_label: 'Pubblico'
+        save_label: 'Salva'
+
+about:
+    page_title: 'About'
+    top_menu:
+        who_behind_wallabag: "Chi c'è dietro a wallabag"
+        getting_help: 'Ottieni aiuto'
+        helping: 'Aiuta wallabag'
+        contributors: 'Collaboratori'
+        third_party: 'Librerie di terze parti'
+    who_behind_wallabag:
+        developped_by: 'Sviluppato da'
+        website: 'sito web'
+        many_contributors: 'E molti altri collaboratori ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">su Github</a>'
+        project_website: 'Sito web del progetto'
+        license: 'Licenza'
+        version: 'Versione'
+    getting_help:
+        documentation: 'Documentazione'
+        bug_reports: 'Bug reports'
+        support: '<a href="https://support.wallabag.org">Sul nostro sito di supporto</a> o <a href="https://github.com/wallabag/wallabag/issues">su GitHub</a>'
+    helping:
+        description: 'wallabag è gratuito opensource. Puoi aiutarci:'
+        by_contributing: 'per contribuire al progetto:'
+        by_contributing_2: 'un elenco delle attività richieste'
+        by_paypal: 'via Paypal'
+    contributors:
+        description: 'Un grazie ai collaboratori di wallabag web application'
+    third_party:
+        description: 'Ecco un elenco delle librerie di terze parti utilizzate in wallabag (con le rispettive licenze):'
+        package: 'Package'
+        license: 'Licenza'
+
+howto:
+    page_title: 'How to'
+    page_description: 'Ci sono diversi modi per salvare un contenuto:'
+    top_menu:
+        browser_addons: 'tramite addons del Browser'
+        mobile_apps: 'tramite app Mobile'
+        bookmarklet: 'tramite Bookmarklet'
+    form:
+        description: 'Tramite questo modulo'
+    browser_addons:
+        firefox: 'Add-On di Firefox'
+        chrome: 'Estensione di Chrome'
+    mobile_apps:
+        android:
+            via_f_droid: 'via F-Droid'
+            via_google_play: 'via Google Play'
+        ios: 'sullo store di iTunes'
+        windows: 'sullo store di Microsoft'
+    bookmarklet:
+        description: 'Trascinando e rilasciando questo link sulla barra dei bookmark del tuo browser:'
+
+quickstart:
+    page_title: 'Introduzione'
+    intro:
+        title: 'Benvenuto su wallabag!'
+        paragraph_1: "Un tour in cui ti guideremo per scoprire e che ti mostrerà delle funzionalità che potrebbero interessarti."
+        paragraph_2: 'Seguici!'
+    configure:
+        title: "Configura l'applicazione"
+        language: 'Cambia lingua e design'
+        rss: 'Abilita i feed RSS'
+        tagging_rules: 'Scrivi delle regole per taggare automaticamente i contenuti'
+    admin:
+        title: 'Amministrazione'
+        description: 'Come amministratore, hai la possibilità di svolgere le seguenti operazioni in wallabag:'
+        new_user: 'Crea un nuovo account'
+        analytics: 'Configura analytics'
+        sharing: 'Abilita alcuni parametri riguardo il salvataggio dei contenuti'
+        export: "Configura l'esportazione"
+        import: "Configura l'importazione"
+    first_steps:
+        title: 'Pimi passi'
+        new_article: 'Salva il tuo primo contenuto'
+        unread_articles: 'E classificalo!'
+    migrate:
+        title: 'Trasferimento da un servizio esistente'
+        description: "Stai utilizzando un altro servizio? Ti aiutiamo a traferire i tuoi dati su wallabag."
+        pocket: 'Trasferisci da Pocket'
+        wallabag_v1: 'Trasferisci da wallabag v1'
+        wallabag_v2: 'Trasferisci da wallabag v2'
+    developer:
+        title: 'Sviluppatori'
+        create_application: 'Crea la tua applicazione'
+    docs:
+        title: 'Documentazione completa'
+        annotate: 'Annota il tuo contenuto'
+        export: 'Converti i tuoi contenuti in EPUB o PDF'
+        search_filters: 'Impara come puoi recuperare un contenuto tramite la ricerca e i filtri'
+        fetching_errors: 'Cosa posso fare se riscontro problemi nel recupero di un contenuto?'
+        all_docs: 'E molta altra documentazione!'
+    support:
+        title: 'Supporto'
+        description: 'Se hai bisogno di aiuto, siamo qui per te.'
+        github: 'Su GitHub'
+        email: 'Per email'
+        gitter: 'Su Gitter'
+
+tag:
+    page_title: 'Tags'
+    list:
+        number_on_the_page: "{0} Non ci sono tag.|{1} C'è un tag.|]1,Inf[ ci sono %count% tag."
+
+import:
+    page_title: 'Importa'
+    page_description: "Benvenuto nell'importatore di wallabag. Seleziona il servizio da cui vuoi trasferire i contenuti."
+    action:
+        import_contents: 'Importa contenuti'
+    form:
+        mark_as_read_title: 'Segna tutto come già letto?'
+        mark_as_read_label: 'Segna tutti i contenuti importati come letti'
+        file_label: 'File'
+        save_label: 'Carica file'
+    pocket:
+        page_title: 'Importa da > Pocket'
+        description: "Questo importatore copierà tutti i tuoi dati da Pocket. Pocket non ci consente di ottenere contenuti dal loro servzio, così il contenuto leggibile di ogni articolo verrà ri-ottenuto da wallabag."
+        config_missing:
+            description: "Importazione da Pocket non configurata."
+            admin_message: 'Devi definire %keyurls% una pocket_consumer_key %keyurle%.'
+            user_message: 'Il tuo amministratore di server deve define una API Key per Pocket.'
+        authorize_message: 'Puoi importare dati dal tuo account Pocket. Devi solo cliccare sul pulsante sottostante e autorizzare la connessione a getpocket.com.'
+        connect_to_pocket: 'Connetti a Pocket and importa i dati'
+    wallabag_v1:
+        page_title: 'Importa da > Wallabag v1'
+        description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v1. Nella tua pagina di configurazione, clicca su "JSON export" nella sezione "Esport i tuoi dati di wallabag". Otterrai un file "wallabag-export-1-xxxx-xx-xx.json".'
+        how_to: 'Seleziona la tua esportazione di wallabag e clicca sul pulsante sottostante caricare il file e importare i dati.'
+    wallabag_v2:
+        page_title: 'Importa da > Wallabag v2'
+        description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v2. Vai in "Tutti i contenuti", e, nella sidebar di esportazione, clicca su "JSON". Otterrai un file "Tutti i contenuti.json".'
+
+developer:
+    page_title: 'Sviluppatori'
+    welcome_message: 'Benvenuto nelle API di wallabag'
+    documentation: 'Documentazione'
+    how_to_first_app: 'Come creare la mia prima applicazione'
+    full_documentation: 'Consulta la documentazione API completa'
+    list_methods: 'Elenco dei metodi API'
+    clients:
+        title: 'Client'
+        create_new: 'Crea un nuovo client'
+    existing_clients:
+        title: 'Client esistenti'
+        field_id: 'Client ID'
+        field_secret: 'Client secret'
+        field_uris: 'Redirect URI'
+        field_grant_types: 'Tipi di grant permessi'
+        no_client: 'Ancora nessun client.'
+    remove:
+        warn_message_1: "Hai la possibilitò di rimuovere questo client.L'operazione è IRREVERSIBILE!"
+        warn_message_2: "Se lo rimuovi, ogni app configurata con questo client non sarà più in grado di autenticarsi."
+        action: 'Rimuovi questo client'
+    client:
+        page_title: 'Sviluppatori > Nuovo client'
+        page_description: 'Stai per creare un nuovo client. Compila i campi sottostanti per il redirect URI della tua applicazione.'
+        form:
+            redirect_uris_label: 'Redirect URI'
+            save_label: 'Crea un nuovo client'
+        action_back: 'Indietro'
+    client_parameter:
+        page_title: 'Sviluppatori > parametri Client'
+        page_description: 'Questi sono i tuoi parametri del client.'
+        field_id: 'Client ID'
+        field_secret: 'Client secret'
+        back: 'Indietro'
+        read_howto: 'Leggi howto "Come creare la mia prima applicazione"'
+    howto:
+        page_title: 'Sviluppatori > Come creare la mia prima applicazione'
+        description:
+            paragraph_1: 'I seguenti comandi fanno uso della <a href="https://github.com/jkbrzt/httpie">libreria HTTPie</a>. Verifica che sia installata sul tuo sistema prima di utilizzarli.'
+            paragraph_2: 'Hai bisogno di un token per far comunicare la tua applicazione di terze parti e le API di wallabag.'
+            paragraph_3: 'Per creare questo token, hai bisogno di <a href="%link%">creare un nuovo client</a>.'
+            paragraph_4: 'Ora, crea il tuo token (sostituisci client_id, client_secret, username e password con valori reali):'
+            paragraph_5: 'Le API ritorneranno una risposta di questo tipo:'
+            paragraph_6: "L'access_token è utile per chiamare un API endpoint. Per esempio:"
+            paragraph_7: 'Questa chiamata ritornerà tutti i contenuti per il tuo utente.'
+            paragraph_8: 'Se vuoi visualizzare tutti gli API endpoints, dai una occhiata alla <a href="%link%">documentazione delle API</a>.'
+        back: 'Indietro'
+
+flashes:
+    config:
+        notice:
+            config_saved: 'Configurazione salvata. Alcuni parametri verranno utilizzati dopo il logout/login.'
+            password_updated: 'Password aggiornata'
+            password_not_updated_demo: "In modalità demo, non puoi cambiare la password dell'utente."
+            user_updated: 'Informazioni aggiornate'
+            rss_updated: 'Informazioni RSS aggiornate'
+            tagging_rules_updated: 'Regole di tagging aggiornate'
+            tagging_rules_deleted: 'Regola di tagging aggiornate'
+            user_added: 'Utente "%username%" aggiunto'
+            rss_token_updated: 'RSS token aggiornato'
+    entry:
+        notice:
+            entry_already_saved: 'Contenuto già salvato in data %date%'
+            entry_saved: 'Contenuto salvato'
+            entry_updated: 'Contenuto aggiornato'
+            entry_reloaded: 'Contenuto ricaricato'
+            entry_reload_failed: 'Errore nel ricaricamento del contenuto'
+            entry_archived: 'Contenuto archiviato'
+            entry_unarchived: 'Contenuto dis-archiviato'
+            entry_starred: 'Contenuto segnato come preferito'
+            entry_unstarred: 'Contenuto rimosso dai preferiti'
+            entry_deleted: 'Contenuto eliminato'
+    tag:
+        notice:
+            tag_added: 'Tag aggiunto'
+    import:
+        notice:
+            failed: 'Importazione fallita, riprova.'
+            failed_on_file: 'Errore durante la processazione dei dati da importare. Verifica il tuo file di import.'
+            summary: 'Sommario di importazione: %imported% importati, %skipped% già salvati.'
+    developer:
+        notice:
+            client_created: 'Nuovo client creato.'
+            client_deleted: 'Client eliminato'

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

@@ -380,13 +380,6 @@ developer:
             paragraph_8: "Se volètz totas las adreças d'accès de l'API, donatz un còp d’uèlh <a href=\"%link%\">a la documentacion de l'API</a>."
         back: 'Retorn'
 
-validator:
-    password_must_match: 'Cal que los dos senhals siasquen los meteisses'
-    password_too_short: 'Lo senhal deu aver almens 8 caractèrs'
-    password_wrong_value: 'Vòstre senhal actual es pas bon'
-    item_per_page_too_high: "Aquò li agradarà pas a l'aplicacion"
-    rss_limit_too_hight: "Aquò li agradarà pas a l'aplicacion"
-
 flashes:
     config:
         notice:

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

@@ -380,13 +380,6 @@ developer:
             paragraph_8: 'Jeżeli chcesz wyświetlić wszystkie punkty końcowe API, zobacz <a href="%link%">Dokumentacja naszego API</a>.'
          back: 'Cofnij'
 
-validator:
-    password_must_match: 'Hasło w polach musi być takie same'
-    password_too_short: 'Hasło powinno mieć minimum 8 znaków długości'
-    password_wrong_value: 'Twoje obecne hasło jest błędne'
-    item_per_page_too_high: 'To może spowodować problemy z aplikacją'
-    rss_limit_too_hight: 'To może spowodować problemy z aplikacją'
-
 flashes:
     config:
         notice:

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

@@ -380,13 +380,6 @@ developer:
     #         paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
     #     back: 'Back'
 
-validator:
-    password_must_match: 'Câmpurile destinate parolelor trebuie să se potrivească'
-    password_too_short: 'Parola ar trebui să conțină cel puțin 8 caractere'
-    # password_wrong_value: 'Wrong value for your current password'
-    # item_per_page_too_high: 'This will certainly kill the app'
-    # rss_limit_too_hight: 'This will certainly kill the app'
-
 flashes:
     config:
         notice:

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

@@ -380,13 +380,6 @@ developer:
     #         paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
     #     back: 'Back'
 
-validator:
-    # password_must_match: 'The password fields must match.'
-    # password_too_short: 'Password should by at least 8 chars long'
-    # password_wrong_value: 'Wrong value for your current password'
-    # item_per_page_too_high: 'This will certainly kill the app'
-    # rss_limit_too_hight: 'This will certainly kill the app'
-
 flashes:
     config:
         notice:

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

@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'De indtastede adgangskoder skal være ens'
+    password_too_short: 'Adgangskoden skal være mindst 8 tegn'
+#     password_wrong_value: 'Wrong value for your current password'
+#     item_per_page_too_high: 'This will certainly kill the app'
+#     rss_limit_too_hight: 'This will certainly kill the app'

src/Wallabag/CoreBundle/Resources/translations/validators.de.yml

@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'Die Kennwort-Felder müssen übereinstimmen.'
+    password_too_short: 'Kennwort-Mindestlänge von acht Zeichen nicht erfüllt'
+    password_wrong_value: 'Falscher Wert für dein aktuelles Kennwort'
+    item_per_page_too_high: 'Dies wird die Anwendung möglicherweise beenden'
+    rss_limit_too_hight: 'Dies wird die Anwendung möglicherweise beenden'

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

@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'The password fields must match.'
+    password_too_short: 'Password should by at least 8 chars long'
+    password_wrong_value: 'Wrong value for your current password'
+    item_per_page_too_high: 'This will certainly kill the app'
+    rss_limit_too_hight: 'This will certainly kill the app'

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

@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'Las contraseñas no coinciden'
+    password_too_short: 'La contraseña debe tener al menos 8 carácteres'
+    password_wrong_value: 'Entrada equivocada para su contraseña actual'
+    item_per_page_too_high: 'Esto matará la aplicación'
+    rss_limit_too_hight: 'Esto matará la aplicación'

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

@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'رمزها باید یکی باشند'
+    password_too_short: 'رمز شما باید ۸ حرف یا بیشتر باشد'
+    password_wrong_value: 'رمز فعلی را اشتباه وارد کرده‌اید'
+    item_per_page_too_high: 'با این تعداد برنامه به فنا می‌رود'
+    rss_limit_too_hight: 'با این تعداد برنامه به فنا می‌رود'

src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml

@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'Les deux mots de passe doivent être les mêmes'
+    password_too_short: 'Le mot de passe doit contenir au moins 8 caractères'
+    password_wrong_value: 'Votre mot de passe actuel est faux'
+    item_per_page_too_high: "Ca ne va pas plaire à l'application"
+    rss_limit_too_hight: "Ca ne va pas plaire à l'application"

src/Wallabag/CoreBundle/Resources/translations/validators.it.yml

@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'Le password devono corrispondere.'
+    password_too_short: 'La password deve essere lunga almeno 8 caratteri'
+    password_wrong_value: 'Valore inserito per la password corrente errato'
+    item_per_page_too_high: 'Questo valore è troppo alto'
+    rss_limit_too_hight: 'Questo valore è troppo alto'

src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml

@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'Cal que los dos senhals siasquen los meteisses'
+    password_too_short: 'Lo senhal deu aver almens 8 caractèrs'
+    password_wrong_value: 'Vòstre senhal actual es pas bon'
+    item_per_page_too_high: "Aquò li agradarà pas a l'aplicacion"
+    rss_limit_too_hight: "Aquò li agradarà pas a l'aplicacion"

src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml

@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'Hasło w polach musi być takie same'
+    password_too_short: 'Hasło powinno mieć minimum 8 znaków długości'
+    password_wrong_value: 'Twoje obecne hasło jest błędne'
+    item_per_page_too_high: 'To może spowodować problemy z aplikacją'
+    rss_limit_too_hight: 'To może spowodować problemy z aplikacją'

src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml

@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'Câmpurile destinate parolelor trebuie să se potrivească'
+    password_too_short: 'Parola ar trebui să conțină cel puțin 8 caractere'
+    # password_wrong_value: 'Wrong value for your current password'
+    # item_per_page_too_high: 'This will certainly kill the app'
+    # rss_limit_too_hight: 'This will certainly kill the app'

src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml

@@ -0,0 +1,6 @@
+validator:
+#     password_must_match: 'The password fields must match.'
+#     password_too_short: 'Password should by at least 8 chars long'
+#     password_wrong_value: 'Wrong value for your current password'
+#     item_per_page_too_high: 'This will certainly kill the app'
+#     rss_limit_too_hight: 'This will certainly kill the app'

src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig

@@ -3,17 +3,7 @@
 {% block title %}{{ 'entry.page_titles.unread'|trans }}{% endblock %}
 
 {% block content %}
-    {% block pager %}
-        <div class="results">
-            <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
-            <div class="pagination">
-                <a href="#" id="filter">{{ 'entry.filters.title'|trans }}</a>
-                {% if entries.getNbPages > 1 %}
-                    {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
-                {% endif %}
-            </div>
-        </div>
-    {% endblock %}
+    {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
 
     {% for entry in entries %}
         <div id="entry-{{ entry.id|e }}" class="entry">
@@ -121,4 +111,5 @@
         </form>
     </aside>
 
+    {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
 {% endblock %}

src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig

@@ -0,0 +1,11 @@
+{% block pager %}
+    <div class="results">
+        <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
+        <div class="pagination">
+            <a href="#" id="filter">{{ 'entry.filters.title'|trans }}</a>
+            {% if entries.getNbPages > 1 %}
+                {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+            {% endif %}
+        </div>
+    </div>
+{% endblock %}

src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig

@@ -4,12 +4,12 @@
 
 {% block content %}
     <div class="results">
-        <div class="nb-results">{{ 'tag.list.number_on_the_page'|transchoice(tags.count) }}</div>
+        <div class="nb-results">{{ 'tag.list.number_on_the_page'|transchoice(tags|length) }}</div>
     </div>
 
     <ul>
     {% for tag in tags %}
-        <li id="tag-{{ tag.id|e }}">{{tag.label}} ({{ tag.entries.getValues | length }})</li>
+        <li id="tag-{{ tag.id|e }}">{{tag.label}} ({{ tag.getEntriesByUserId(app.user.id) | length }})</li>
     {% endfor %}
     </ul>
 {% endblock %}

src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig

@@ -16,16 +16,7 @@
 {% endblock %}
 
 {% block content %}
-    {% block pager %}
-    <div class="results clearfix">
-        <div class="nb-results left">
-            {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
-        </div>
-        {% if entries.getNbPages > 1 %}
-            {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
-        {% endif %}
-    </div>
-    {% endblock %}
+    {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
     <br />
     <ul class="row data">
         {% for entry in entries %}
@@ -193,4 +184,5 @@
 
         </form>
     </div>
+    {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
 {% endblock %}

src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig

@@ -0,0 +1,10 @@
+{% block pager %}
+    <div class="results clearfix">
+        <div class="nb-results left">
+            {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
+        </div>
+        {% if entries.getNbPages > 1 %}
+            {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+        {% endif %}
+    </div>
+{% endblock %}

src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig

@@ -4,12 +4,12 @@
 
 {% block content %}
     <div class="results clearfix">
-        <div class="nb-results left">{{ 'tag.list.number_on_the_page'|transchoice(tags.count) }}</div>
+        <div class="nb-results left">{{ 'tag.list.number_on_the_page'|transchoice(tags|length) }}</div>
     </div>
     <br />
     <ul class="row data">
     {% for tag in tags %}
-        <li id="tag-{{ tag.id|e }}" class="col l4 m6 s12">{{tag.label}} ({{ tag.entries.getValues | length }})</li>
+        <li id="tag-{{ tag.id|e }}" class="col l4 m6 s12">{{tag.label}} ({{ tag.getEntriesByUserId(app.user.id) | length }})</li>
     {% endfor %}
     </ul>
 {% endblock %}

src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php

@@ -60,6 +60,43 @@ class ConfigControllerTest extends WallabagCoreTestCase
         $this->assertContains('flashes.config.notice.config_saved', $alert[0]);
     }
 
+    public function testChangeReadingSpeed()
+    {
+        $this->logInAs('admin');
+        $client = $this->getClient();
+
+        $crawler = $client->request('GET', '/unread/list');
+        $form = $crawler->filter('button[id=submit-filter]')->form();
+        $dataFilters = [
+            'entry_filter[readingTime][right_number]' => 22,
+            'entry_filter[readingTime][left_number]' => 22,
+        ];
+        $crawler = $client->submit($form, $dataFilters);
+        $this->assertCount(1, $crawler->filter('div[class=entry]'));
+
+        // Change reading speed
+        $crawler = $client->request('GET', '/config');
+        $form = $crawler->filter('button[id=config_save]')->form();
+        $data = [
+            'config[reading_speed]' => '2',
+        ];
+        $client->submit($form, $data);
+
+        // Is the entry still available via filters?
+        $crawler = $client->request('GET', '/unread/list');
+        $form = $crawler->filter('button[id=submit-filter]')->form();
+        $crawler = $client->submit($form, $dataFilters);
+        $this->assertCount(0, $crawler->filter('div[class=entry]'));
+
+        // Restore old configuration
+        $crawler = $client->request('GET', '/config');
+        $form = $crawler->filter('button[id=config_save]')->form();
+        $data = [
+            'config[reading_speed]' => '0.5',
+        ];
+        $client->submit($form, $data);
+    }
+
     public function dataForUpdateFailed()
     {
         return [
@@ -355,6 +392,11 @@ class ConfigControllerTest extends WallabagCoreTestCase
 
         $this->assertTrue(false !== $user);
         $this->assertTrue($user->isEnabled());
+        $this->assertEquals('material', $user->getConfig()->getTheme());
+        $this->assertEquals(12, $user->getConfig()->getItemsPerPage());
+        $this->assertEquals(50, $user->getConfig()->getRssLimit());
+        $this->assertEquals('en', $user->getConfig()->getLanguage());
+        $this->assertEquals(1, $user->getConfig()->getReadingSpeed());
     }
 
     public function testRssUpdateResetToken()

src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php

@@ -462,8 +462,8 @@ class EntryControllerTest extends WallabagCoreTestCase
         $form = $crawler->filter('button[id=submit-filter]')->form();
 
         $data = [
-            'entry_filter[readingTime][right_number]' => 11,
-            'entry_filter[readingTime][left_number]' => 11,
+            'entry_filter[readingTime][right_number]' => 22,
+            'entry_filter[readingTime][left_number]' => 22,
         ];
 
         $crawler = $client->submit($form, $data);