Change Travis configuration

Move setup config outside setupAdmin

.github/ISSUE_TEMPLATE.md

@@ -6,7 +6,7 @@ Remember, this is _not_ a place to ask questions. For that, go to http://gitter.
 ### Environment
 
 * wallabag version (or git revision) that exhibits the issue:
-* How did you install wallabag? Via `composer create-project` or by downloading the package?
+* How did you install wallabag? Via `git clone` or by downloading the package?
 * Last wallabag version that did not exhibit the issue (if applicable):
 * php version:
 * OS:

.travis.yml

@@ -11,6 +11,7 @@ addons:
 
 # cache vendor dirs
 cache:
+    apt: true
     directories:
         - vendor
         - $HOME/.composer/cache
@@ -22,12 +23,15 @@ php:
     - hhvm
 
 env:
-  - DB=mysql
+    - DB=mysql
-  - DB=pgsql
+    - DB=pgsql
-  - DB=sqlite
+    - DB=sqlite
 
 matrix:
     fast_finish: true
+    include:
+        - php: 7.0
+          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite
     exclude:
         - php: hhvm
           env: DB=pgsql  # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
@@ -53,3 +57,5 @@ script:
     - 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;
+    - if [ "$VALIDATE_TRANSLATION_FILE" = "run" ]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;

CHANGELOG.md

@@ -0,0 +1,64 @@
+# Changelog
+
+All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [2.0.1] - 2016-04-11
+### Added
+
+- [Documentation about importing large file](http://doc.wallabag.org/en/v2/user/installation.html#installing-on-nginx) into nginx. (Nicolas Lœuillet)
+- [Documentation about wallabag API](http://doc.wallabag.org/en/v2/developer/api.html) (Nicolas Lœuillet)
+- [#1861](https://github.com/wallabag/wallabag/pull/1861) Round estimated time and add reading speed for Baggy (Nicolas Lœuillet)
+- [Documentation about wallabag v1 CLI import](http://doc.wallabag.org/en/v2/user/migration.html#import-via-command-line-interface-cli) (Nicolas Lœuillet)
+- [Add migrate link](http://doc.wallabag.org/en/v2/user/migration.html) in documentation (Nicolas Lœuillet)
+
+### Changed
+
+- [#1823](https://github.com/wallabag/wallabag/pull/1823) Persian translation (Masoud Abkenar)
+- [#1901](https://github.com/wallabag/wallabag/pull/1901) Spanish translation (Jeremy Benoist)
+- [#1879](https://github.com/wallabag/wallabag/pull/1879) Move tag form in Material theme (Nicolas Lœuillet)
+
+### Fixed
+
+- [#1903](https://github.com/wallabag/wallabag/pull/1903) Force server version to avoid connection error (Jeremy Benoist)
+- [#1887](https://github.com/wallabag/wallabag/pull/1887) Fix duplicate article when added via the bookmarklet (Nicolas Lœuillet)
+- [#1895](https://github.com/wallabag/wallabag/pull/1895) API: All the entries are fetched via GET /api/entries (Nicolas Lœuillet)
+- [#1898](https://github.com/wallabag/wallabag/pull/1898) Fix estimated reading time in material view #1893 (Nicolas Lœuillet)
+- [#1896](https://github.com/wallabag/wallabag/pull/1896) remove download_picture setting and manage show_printlink in material theme #1867 (Nicolas Lœuillet)
+- [#1894](https://github.com/wallabag/wallabag/pull/1894) Fix documentation link in developer page (Nicolas Lœuillet)
+- [#1891](https://github.com/wallabag/wallabag/pull/1891) Fix typo on configuration page (Nicolas Lœuillet)
+- [#1884](https://github.com/wallabag/wallabag/pull/1884) Change the installation method in issue template (Nicolas Lœuillet)
+- [#1844](https://github.com/wallabag/wallabag/pull/1844) Lock ocramius/proxy-manager (Jeremy Benoist)
+- [#1840](https://github.com/wallabag/wallabag/pull/1840) Fix Archive page title translation (Nicolas Lœuillet)
+- [#1801](https://github.com/wallabag/wallabag/pull/1804) Force user-agent for iansommerville.com (Jeremy Benoist)
+
+### Removed
+
+- [#1900](https://github.com/wallabag/wallabag/pull/1900) Remove empty portugese documentation (Nicolas Lœuillet)
+- [#1868](https://github.com/wallabag/wallabag/pull/1868) Remove keyboard shortcut and add tagging rule panel in baggy (Nicolas Lœuillet)
+- [#1824](https://github.com/wallabag/wallabag/pull/1824) Remove SMTP configuration environment overrides (Mathieu Bruyen)
+
+## [2.0.0] - 2016-04-03
+### Added
+
+* save an article, read it, favorite it, archive it. (Hopefully)
+* annotations: In each article you read, you can write annotations. ([read the doc](http://doc.wallabag.org/en/v2/user/annotations.html))
+* filter entries by reading time, domain name, creation date, status, etc.
+* assign tags to entries
+* edit article titles
+* a REST API ([you can have a look to the documentation](http://v2.wallabag.org/api/doc))
+* authorization via oAuth2
+* a new default theme, called `material`
+* RSS feeds (with ability to limit number of articles)
+* create a new account from the config page (for super admin only)
+* recover passwords from login page (you have to fill your email on config page)
+* picture preview, if available, is displayed for each entry
+* Public registration
+* migration from wallabag v1/v2 (based on JSON export) ([read the doc](http://doc.wallabag.org/en/v2/user/import.html))
+* migration from Pocket (it works, but we need to implement asynchronous import: if you have too many articles, it can fail) ([read the doc](http://doc.wallabag.org/en/v2/user/import.html))
+* exports in many formats (PDF, JSON, EPUB, MOBI, XML, CSV and TXT).
+* 2-Factor authentication via email ([read the doc](http://doc.wallabag.org/en/v2/user/configuration.html#two-factor-authentication))
+* Tagging rule: create a rule to automatically assign tags to entries! ([read the doc](http://doc.wallabag.org/en/v2/user/configuration.html#tagging-rules))
+* Occitan, German, French, Turkish, Persian, Romanian, Polish, Danish, Spanish and English translations
+* Quickstart for beginners (when you don't have any entries)
+* Internal settings for administrator (the account created during installation)
+* For 3rd apps developers, a developer page is available to create API token

README.md

@@ -8,8 +8,7 @@ Click, save and read it when you can. It extracts content so that you can read i
 
 More informations on our website: [wallabag.org](https://wallabag.org)
 
-# Want to test the v2?
+# Install wallabag
-Keep in mind it's an **unstable** branch, everything can be broken :)
 
 If you don't have it yet, please [install composer](https://getcomposer.org/download/).
 Then you can install wallabag by executing the following commands:
@@ -17,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.0-beta.2
+    git checkout 2.0.1
     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.de.yml

@@ -0,0 +1,29 @@
+download_pictures: Bilder auf den Server herunterladen
+carrot: Teilen zu Carrot aktivieren
+diaspora_url: Diaspora-URL, sofern der Service aktiviert ist
+export_epub: ePUB-Export aktivieren
+export_mobi: .mobi-Export aktivieren
+export_pdf: PDF-Export aktivieren
+export_csv: CSV-Export aktivieren
+export_json: JSON-Export aktivieren
+export_txt: TXT-Export aktivieren
+export_xml: XML-Export aktivieren
+pocket_consumer_key: Consumer-Key für Pocket, um Inhalte zu importieren (https://getpocket.com/developer/docs/authentication)
+shaarli_url: Shaarli-URL, sofern der Service aktiviert ist
+share_diaspora: Teilen zu Diaspora aktiveren
+share_mail: Teilen via E-Mail aktiveren
+share_shaarli: Teilen zu Shaarli aktiveren
+share_twitter: Teilen zu Twitter aktiveren
+show_printlink: Link anzeigen, um den Inhalt auszudrucken
+wallabag_support_url: Support-URL für wallabag
+wallabag_url: URL von *deiner* wallabag-Instanz
+entry: "Artikel"
+export: "Export"
+import: "Import"
+misc: "Verschiedenes"
+modify_settings: "Übernehmen"
+piwik_host: Host deiner Webseite in Piwik
+piwik_site_id: ID deiner Webseite in Piwik
+piwik_enabled: Piwik aktivieren
+demo_mode_enabled: "Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)"
+demo_mode_username: "Test-Benutzer"

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

@@ -0,0 +1,29 @@
+download_pictures: Telecargar los imatges sul servidor
+carrot: Activar lo partatge cap a Carrot
+diaspora_url: URL de Diaspora, se lo servici Diaspora es activat
+export_epub: Activar l'expòrt ePub
+export_mobi: Activar l'expòrt .mobi
+export_pdf: Activar l'expòrt PDF
+export_csv: Activar l'expòrt CSV
+export_json: Activar l'expòrt JSON
+export_txt: Activar l'expòrt TXT
+export_xml: Activar l'expòrt XML
+pocket_consumer_key: Clau d'autentificacion Pocket per importar las donadas (https://getpocket.com/developer/docs/authentication)
+shaarli_url: URL de Shaarli, se lo servici Shaarli es activat
+share_diaspora: Activar lo partatge cap a Diaspora
+share_mail: Activar lo partatge per corrièl
+share_shaarli: Activar lo partatge cap a Shaarli
+share_twitter: Activar lo partatge cap a Twitter
+show_printlink: Afichar un ligam per imprimir
+wallabag_support_url: URL d'assisténcia de wallabag
+wallabag_url: URL de *vòstra* instància de wallabag
+entry: "article"
+export: "expòrt"
+import: "impòrt"
+misc: "divèrs"
+modify_settings: "aplicar"
+piwik_host: URL de vòstre site dins Piwik
+piwik_site_id: ID de vòstre site dins Piwik
+piwik_enabled: Activar Piwik
+demo_mode_enabled: "Activar lo mode demostracion ? (utilizar solament per la demostracion publica de wallabag)"
+demo_mode_username: "Utilizaire de la demostracion"

app/Resources/FOSUserBundle/translations/FOSUserBundle.de.yml

@@ -0,0 +1,2 @@
+Login: "Anmelden"
+Enter your email address below and we'll send you password reset instructions.: "Tippe deine E-Mail-Adresse unten ein und wir senden dir die Anweisungen, wie du dein Kennwort zurücksetzen kannst."

app/Resources/FOSUserBundle/translations/FOSUserBundle.oc.yml

@@ -0,0 +1,2 @@
+Login: "Se connectar"
+Enter your email address below and we'll send you password reset instructions.: "Picatz vòstra adreça de corrièl çai-jos, vos mandarem las instruccions per reïnicializar vòstre senhal."

app/Resources/FOSUserBundle/translations/FOSUserBundle.pl.yml

@@ -0,0 +1,2 @@
+Login: "Logowanie"
+Enter your email address below and we'll send you password reset instructions.: "Wpisz poniżej swój adres email, abyśmy mogli wysłać ci instrukcję resetowania hasła."

app/config/config.yml

@@ -28,7 +28,7 @@ framework:
     assets: ~
 
 wallabag_core:
-    version: 2.0.0-beta.2
+    version: 2.0.1
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'
@@ -40,10 +40,12 @@ wallabag_core:
         pl: 'Polish'
         da: 'Dansk'
         es: 'Español'
+        oc: 'Occitan'
     items_on_page: 12
     theme: material
     language: en
     rss_limit: 50
+    reading_speed: 1
 
 wallabag_import:
     allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
@@ -80,6 +82,7 @@ doctrine:
         password: "%database_password%"
         charset:  UTF8
         path:     "%database_path%"
+        server_version: 5.6
 
     orm:
         auto_generate_proxy_classes: "%kernel.debug%"

app/config/config_test.yml

@@ -7,6 +7,8 @@ framework:
         storage_id: session.storage.mock_file
     profiler:
         collect: false
+    translator:
+        enabled: false
 
 web_profiler:
     toolbar: false

bin/php-cs-fixer

@@ -0,0 +1 @@
+../vendor/fabpot/php-cs-fixer/php-cs-fixer

composer.json

@@ -80,20 +80,19 @@
         "paragonie/random_compat": "~1.0",
         "craue/config-bundle": "~1.4",
         "mnapoli/piwik-twig-extension": "^1.0",
-        "lexik/maintenance-bundle": "~2.1"
+        "lexik/maintenance-bundle": "~2.1",
+        "ocramius/proxy-manager": "1.*"
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "~2.2",
         "sensio/generator-bundle": "^3.0",
         "phpunit/phpunit": "~4.4",
-        "symfony/phpunit-bridge": "^2.7"
+        "symfony/phpunit-bridge": "^2.7",
+        "fabpot/php-cs-fixer": "~1.9"
     },
     "scripts": {
-        "build-parameters": [
-            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
-        ],
         "post-cmd": [
-            "@build-parameters",
+            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
@@ -115,13 +114,7 @@
         "symfony-tests-dir": "tests",
         "symfony-assets-install": "relative",
         "incenteev-parameters": {
-            "file": "app/config/parameters.yml",
+            "file": "app/config/parameters.yml"
-            "env-map": {
-                "mailer_host": "WALLABAG_MAILER_HOST",
-                "mailer_user": "WALLABAG_MAILER_USER",
-                "mailer_password": "WALLABAG_MAILER_PASSWORD",
-                "secret": "WALLABAG_SECRET"
-            }
         }
     },
     "autoload": {

composer.lock

@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "e3aeeae0e8d73fc682d2f5a5e710d411",
+    "hash": "ba30b73585f433f82b458cbc382ad137",
-    "content-hash": "bdb2cdbe68aa6ef654fd8c67764e8ebb",
+    "content-hash": "241710c2b913269e8e7dff9edb379cef",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -857,16 +857,16 @@
         },
         {
             "name": "doctrine/migrations",
-            "version": "v1.4.0",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/migrations.git",
-                "reference": "abc571dadd45df42f19baac7a0a1a371216dd93d"
+                "reference": "0d0ff5da10c5d30846da32060bd9e357abf70a05"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/migrations/zipball/abc571dadd45df42f19baac7a0a1a371216dd93d",
+                "url": "https://api.github.com/repos/doctrine/migrations/zipball/0d0ff5da10c5d30846da32060bd9e357abf70a05",
-                "reference": "abc571dadd45df42f19baac7a0a1a371216dd93d",
+                "reference": "0d0ff5da10c5d30846da32060bd9e357abf70a05",
                 "shasum": ""
             },
             "require": {
@@ -926,7 +926,7 @@
                 "database",
                 "migrations"
             ],
-            "time": "2016-02-23 15:28:39"
+            "time": "2016-03-14 12:29:11"
         },
         {
             "name": "doctrine/orm",
@@ -1453,16 +1453,16 @@
         },
         {
             "name": "grandt/phpepub",
-            "version": "v4.0.6",
+            "version": "4.0.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Grandt/PHPePub.git",
-                "reference": "05d309052ddeaf38dea89bae72c6016f27b61108"
+                "reference": "ccb501e566358ac19a9fedb6eb8bf96665823452"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Grandt/PHPePub/zipball/05d309052ddeaf38dea89bae72c6016f27b61108",
+                "url": "https://api.github.com/repos/Grandt/PHPePub/zipball/ccb501e566358ac19a9fedb6eb8bf96665823452",
-                "reference": "05d309052ddeaf38dea89bae72c6016f27b61108",
+                "reference": "ccb501e566358ac19a9fedb6eb8bf96665823452",
                 "shasum": ""
             },
             "require": {
@@ -1498,7 +1498,7 @@
                 "e-book",
                 "epub"
             ],
-            "time": "2016-03-08 21:46:00"
+            "time": "2016-03-16 15:48:26"
         },
         {
             "name": "grandt/phpresizegif",
@@ -1952,16 +1952,16 @@
         },
         {
             "name": "hoa/event",
-            "version": "1.16.01.11",
+            "version": "1.16.03.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hoaproject/Event.git",
-                "reference": "4470e090207336c01ea0cc6f9f1fa8832e4d9866"
+                "reference": "b1577069d63d6efc559406f3bc31813ac33e76b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hoaproject/Event/zipball/4470e090207336c01ea0cc6f9f1fa8832e4d9866",
+                "url": "https://api.github.com/repos/hoaproject/Event/zipball/b1577069d63d6efc559406f3bc31813ac33e76b8",
-                "reference": "4470e090207336c01ea0cc6f9f1fa8832e4d9866",
+                "reference": "b1577069d63d6efc559406f3bc31813ac33e76b8",
                 "shasum": ""
             },
             "require": {
@@ -2004,7 +2004,7 @@
                 "listener",
                 "observer"
             ],
-            "time": "2016-01-11 08:34:41"
+            "time": "2016-03-15 14:49:59"
         },
         {
             "name": "hoa/exception",
@@ -2124,16 +2124,16 @@
         },
         {
             "name": "hoa/iterator",
-            "version": "2.16.01.11",
+            "version": "2.16.03.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hoaproject/Iterator.git",
-                "reference": "eed36f2ec8233f494fd4450d570453b9a84736da"
+                "reference": "60bdefab8db17717871a11101dedec60572f95b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hoaproject/Iterator/zipball/eed36f2ec8233f494fd4450d570453b9a84736da",
+                "url": "https://api.github.com/repos/hoaproject/Iterator/zipball/60bdefab8db17717871a11101dedec60572f95b8",
-                "reference": "eed36f2ec8233f494fd4450d570453b9a84736da",
+                "reference": "60bdefab8db17717871a11101dedec60572f95b8",
                 "shasum": ""
             },
             "require": {
@@ -2174,7 +2174,7 @@
                 "iterator",
                 "library"
             ],
-            "time": "2016-01-11 09:13:46"
+            "time": "2016-03-15 14:51:54"
         },
         {
             "name": "hoa/math",
@@ -2359,16 +2359,16 @@
         },
         {
             "name": "hoa/ruler",
-            "version": "2.16.01.15",
+            "version": "2.16.04.06",
             "source": {
                 "type": "git",
-                "url": "https://github.com/hoaproject/Ruler.git",
+                "url": "git@github.com:hoaproject/Ruler.git",
-                "reference": "0aeb1a48d78427a55fbf656c65c6406c096a4325"
+                "reference": "9528f5ed84081f83310a65e21754edb4fdc60822"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hoaproject/Ruler/zipball/0aeb1a48d78427a55fbf656c65c6406c096a4325",
+                "url": "https://api.github.com/repos/hoaproject/Ruler/zipball/9528f5ed84081f83310a65e21754edb4fdc60822",
-                "reference": "0aeb1a48d78427a55fbf656c65c6406c096a4325",
+                "reference": "9528f5ed84081f83310a65e21754edb4fdc60822",
                 "shasum": ""
             },
             "require": {
@@ -2376,6 +2376,7 @@
                 "hoa/consistency": "~1.0",
                 "hoa/exception": "~1.0",
                 "hoa/file": "~1.0",
+                "hoa/protocol": "~1.0",
                 "hoa/visitor": "~2.0"
             },
             "require-dev": {
@@ -2412,7 +2413,7 @@
                 "library",
                 "ruler"
             ],
-            "time": "2016-01-14 21:42:47"
+            "time": "2016-04-06 08:55:04"
         },
         {
             "name": "hoa/stream",
@@ -2592,16 +2593,16 @@
         },
         {
             "name": "hoa/zformat",
-            "version": "1.16.01.14",
+            "version": "1.16.03.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hoaproject/Zformat.git",
-                "reference": "685bba314c5cacb97afdd5e638b64c42399a580c"
+                "reference": "d261637aa6f4485d697ebcb898a379f7a34b4e34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hoaproject/Zformat/zipball/685bba314c5cacb97afdd5e638b64c42399a580c",
+                "url": "https://api.github.com/repos/hoaproject/Zformat/zipball/d261637aa6f4485d697ebcb898a379f7a34b4e34",
-                "reference": "685bba314c5cacb97afdd5e638b64c42399a580c",
+                "reference": "d261637aa6f4485d697ebcb898a379f7a34b4e34",
                 "shasum": ""
             },
             "require": {
@@ -2640,7 +2641,7 @@
                 "parameter",
                 "zformat"
             ],
-            "time": "2016-01-14 20:19:54"
+            "time": "2016-03-15 14:55:30"
         },
         {
             "name": "htmlawed/htmlawed",
@@ -2797,16 +2798,16 @@
         },
         {
             "name": "j0k3r/graby-site-config",
-            "version": "1.0.14",
+            "version": "1.0.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/j0k3r/graby-site-config.git",
-                "reference": "bd9b8555b72a23b1dcaa47ec9072eadc6507a311"
+                "reference": "553fb65e75f2df9514f606758f105855994abaec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/bd9b8555b72a23b1dcaa47ec9072eadc6507a311",
+                "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/553fb65e75f2df9514f606758f105855994abaec",
-                "reference": "bd9b8555b72a23b1dcaa47ec9072eadc6507a311",
+                "reference": "553fb65e75f2df9514f606758f105855994abaec",
                 "shasum": ""
             },
             "require": {
@@ -2829,7 +2830,7 @@
                 }
             ],
             "description": "Graby site config files",
-            "time": "2016-02-29 12:02:57"
+            "time": "2016-04-10 19:15:54"
         },
         {
             "name": "j0k3r/php-readability",
@@ -3231,16 +3232,16 @@
         },
         {
             "name": "kphoen/rulerz",
-            "version": "0.18.1",
+            "version": "0.19.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/K-Phoen/rulerz.git",
-                "reference": "7228f1378c260e9c272f90ea191ac9d7959c98a7"
+                "reference": "41236e2d1936ed4adfa126957e13017f728d4eca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/K-Phoen/rulerz/zipball/7228f1378c260e9c272f90ea191ac9d7959c98a7",
+                "url": "https://api.github.com/repos/K-Phoen/rulerz/zipball/41236e2d1936ed4adfa126957e13017f728d4eca",
-                "reference": "7228f1378c260e9c272f90ea191ac9d7959c98a7",
+                "reference": "41236e2d1936ed4adfa126957e13017f728d4eca",
                 "shasum": ""
             },
             "require": {
@@ -3297,7 +3298,7 @@
                 "doctrine",
                 "specification"
             ],
-            "time": "2016-02-19 21:44:56"
+            "time": "2016-03-18 08:34:34"
         },
         {
             "name": "kphoen/rulerz-bundle",
@@ -3489,16 +3490,16 @@
         },
         {
             "name": "lexik/maintenance-bundle",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lexik/LexikMaintenanceBundle.git",
-                "reference": "722b5be3f5d97c3f482a15d70f7a3eacd212a36d"
+                "reference": "01c2763f1f2012958d4b43bbb87daf96b0316706"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lexik/LexikMaintenanceBundle/zipball/722b5be3f5d97c3f482a15d70f7a3eacd212a36d",
+                "url": "https://api.github.com/repos/lexik/LexikMaintenanceBundle/zipball/01c2763f1f2012958d4b43bbb87daf96b0316706",
-                "reference": "722b5be3f5d97c3f482a15d70f7a3eacd212a36d",
+                "reference": "01c2763f1f2012958d4b43bbb87daf96b0316706",
                 "shasum": ""
             },
             "require": {
@@ -3544,7 +3545,7 @@
                 "bundle",
                 "maintenance"
             ],
-            "time": "2016-02-22 08:01:18"
+            "time": "2016-03-15 09:38:32"
         },
         {
             "name": "liip/theme-bundle",
@@ -3736,16 +3737,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "1.18.0",
+            "version": "1.18.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "e19b764b5c855580e8ffa7e615f72c10fd2f99cc"
+                "reference": "064b38c16790249488e7a8b987acf1c9d7383c09"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/e19b764b5c855580e8ffa7e615f72c10fd2f99cc",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/064b38c16790249488e7a8b987acf1c9d7383c09",
-                "reference": "e19b764b5c855580e8ffa7e615f72c10fd2f99cc",
+                "reference": "064b38c16790249488e7a8b987acf1c9d7383c09",
                 "shasum": ""
             },
             "require": {
@@ -3760,13 +3761,13 @@
                 "doctrine/couchdb": "~1.0@dev",
                 "graylog2/gelf-php": "~1.0",
                 "jakub-onderka/php-parallel-lint": "0.9",
+                "php-amqplib/php-amqplib": "~2.4",
                 "php-console/php-console": "^3.1.3",
                 "phpunit/phpunit": "~4.5",
                 "phpunit/phpunit-mock-objects": "2.3.0",
                 "raven/raven": "^0.13",
                 "ruflin/elastica": ">=0.90 <3.0",
-                "swiftmailer/swiftmailer": "~5.3",
+                "swiftmailer/swiftmailer": "~5.3"
-                "videlalvaro/php-amqplib": "~2.4"
             },
             "suggest": {
                 "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
@@ -3775,11 +3776,11 @@
                 "ext-mongo": "Allow sending log messages to a MongoDB server",
                 "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
                 "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
+                "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
                 "php-console/php-console": "Allow sending log messages to Google Chrome",
                 "raven/raven": "Allow sending log messages to a Sentry server",
                 "rollbar/rollbar": "Allow sending log messages to Rollbar",
-                "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
+                "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
-                "videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib"
             },
             "type": "library",
             "extra": {
@@ -3810,7 +3811,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2016-03-01 18:00:40"
+            "time": "2016-04-02 13:12:58"
         },
         {
             "name": "neitanod/forceutf8",
@@ -3848,17 +3849,17 @@
         },
         {
             "name": "nelmio/api-doc-bundle",
-            "version": "2.11.2",
+            "version": "2.12.0",
             "target-dir": "Nelmio/ApiDocBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nelmio/NelmioApiDocBundle.git",
-                "reference": "1ae2cfa9a50279d722d6b6e7b02322cef948d55d"
+                "reference": "6793b701570f5f426678309910b2440c8f5d1d9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/1ae2cfa9a50279d722d6b6e7b02322cef948d55d",
+                "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/6793b701570f5f426678309910b2440c8f5d1d9e",
-                "reference": "1ae2cfa9a50279d722d6b6e7b02322cef948d55d",
+                "reference": "6793b701570f5f426678309910b2440c8f5d1d9e",
                 "shasum": ""
             },
             "require": {
@@ -3871,6 +3872,7 @@
             "conflict": {
                 "jms/serializer": "<0.12",
                 "jms/serializer-bundle": "<0.11",
+                "symfony/symfony": "~2.7.8",
                 "twig/twig": "<1.12"
             },
             "require-dev": {
@@ -3899,7 +3901,7 @@
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.11-dev"
+                    "dev-master": "2.12-dev"
                 }
             },
             "autoload": {
@@ -3928,7 +3930,7 @@
                 "documentation",
                 "rest"
             ],
-            "time": "2015-12-16 15:17:51"
+            "time": "2016-03-21 11:19:12"
         },
         {
             "name": "nelmio/cors-bundle",
@@ -4119,16 +4121,16 @@
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v1.2.2",
+            "version": "v1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "b3313b618f4edd76523572531d5d7e22fe747430"
+                "reference": "c7e26a21ba357863de030f0b9e701c7d04593774"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/b3313b618f4edd76523572531d5d7e22fe747430",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/c7e26a21ba357863de030f0b9e701c7d04593774",
-                "reference": "b3313b618f4edd76523572531d5d7e22fe747430",
+                "reference": "c7e26a21ba357863de030f0b9e701c7d04593774",
                 "shasum": ""
             },
             "require": {
@@ -4163,7 +4165,7 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2016-03-11 19:54:08"
+            "time": "2016-03-18 20:34:03"
         },
         {
             "name": "phpcollection/phpcollection",
@@ -4366,16 +4368,16 @@
         },
         {
             "name": "react/promise",
-            "version": "v2.2.2",
+            "version": "v2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/promise.git",
-                "reference": "3aacad8bf10c7d83e6fa2089d413529888c2bedf"
+                "reference": "f942da7b505d1a294284ab343d05df42d02ad6d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/promise/zipball/3aacad8bf10c7d83e6fa2089d413529888c2bedf",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/f942da7b505d1a294284ab343d05df42d02ad6d9",
-                "reference": "3aacad8bf10c7d83e6fa2089d413529888c2bedf",
+                "reference": "f942da7b505d1a294284ab343d05df42d02ad6d9",
                 "shasum": ""
             },
             "require": {
@@ -4406,20 +4408,20 @@
                 }
             ],
             "description": "A lightweight implementation of CommonJS Promises/A for PHP",
-            "time": "2016-02-26 19:09:02"
+            "time": "2016-03-31 13:10:33"
         },
         {
             "name": "scheb/two-factor-bundle",
-            "version": "v2.1.0",
+            "version": "v2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/scheb/two-factor-bundle.git",
-                "reference": "949f00ece5aabc1b6f38a81ab05fe73dcd406c91"
+                "reference": "524faa717bdc3c8823e045e8fd8c23b6a2b4dcac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/949f00ece5aabc1b6f38a81ab05fe73dcd406c91",
+                "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/524faa717bdc3c8823e045e8fd8c23b6a2b4dcac",
-                "reference": "949f00ece5aabc1b6f38a81ab05fe73dcd406c91",
+                "reference": "524faa717bdc3c8823e045e8fd8c23b6a2b4dcac",
                 "shasum": ""
             },
             "require": {
@@ -4457,20 +4459,20 @@
                 "two-factor",
                 "two-step"
             ],
-            "time": "2016-02-14 14:03:21"
+            "time": "2016-03-21 14:47:17"
         },
         {
             "name": "sensio/distribution-bundle",
-            "version": "v5.0.4",
+            "version": "v5.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
-                "reference": "2c167426fc24f9de116345195bc1697a748ee847"
+                "reference": "3a160355bb1364da55ed9e415c1aa1fa8d457b6f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/2c167426fc24f9de116345195bc1697a748ee847",
+                "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/3a160355bb1364da55ed9e415c1aa1fa8d457b6f",
-                "reference": "2c167426fc24f9de116345195bc1697a748ee847",
+                "reference": "3a160355bb1364da55ed9e415c1aa1fa8d457b6f",
                 "shasum": ""
             },
             "require": {
@@ -4509,20 +4511,20 @@
                 "configuration",
                 "distribution"
             ],
-            "time": "2016-02-12 16:21:30"
+            "time": "2016-03-15 16:21:41"
         },
         {
             "name": "sensio/framework-extra-bundle",
-            "version": "v3.0.14",
+            "version": "v3.0.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git",
-                "reference": "cccf975c565ccd835bddc30a8fea5cdfe3357bf1"
+                "reference": "507a15f56fa7699f6cc8c2c7de4080b19ce22546"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/cccf975c565ccd835bddc30a8fea5cdfe3357bf1",
+                "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/507a15f56fa7699f6cc8c2c7de4080b19ce22546",
-                "reference": "cccf975c565ccd835bddc30a8fea5cdfe3357bf1",
+                "reference": "507a15f56fa7699f6cc8c2c7de4080b19ce22546",
                 "shasum": ""
             },
             "require": {
@@ -4571,7 +4573,7 @@
                 "annotations",
                 "controllers"
             ],
-            "time": "2016-03-01 10:50:07"
+            "time": "2016-03-25 17:08:27"
         },
         {
             "name": "sensiolabs/security-checker",
@@ -4880,16 +4882,16 @@
         },
         {
             "name": "symfony/assetic-bundle",
-            "version": "v2.7.1",
+            "version": "v2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/assetic-bundle.git",
-                "reference": "d885ec8451d5a7b077bda81bb19ac9fbff9cdc76"
+                "reference": "aa5b4f8b712f38745928fa845ddb73300bb2af6d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/d885ec8451d5a7b077bda81bb19ac9fbff9cdc76",
+                "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/aa5b4f8b712f38745928fa845ddb73300bb2af6d",
-                "reference": "d885ec8451d5a7b077bda81bb19ac9fbff9cdc76",
+                "reference": "aa5b4f8b712f38745928fa845ddb73300bb2af6d",
                 "shasum": ""
             },
             "require": {
@@ -4946,20 +4948,20 @@
                 "compression",
                 "minification"
             ],
-            "time": "2015-11-17 09:45:47"
+            "time": "2015-12-28 13:12:39"
         },
         {
             "name": "symfony/monolog-bundle",
-            "version": "v2.9.0",
+            "version": "v2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/monolog-bundle.git",
-                "reference": "27c2e3eaec7a0ba3462f99ea92678cbfc7b146e4"
+                "reference": "82fd8f36e2cccbe94faf237403c48052d4d4b77e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/27c2e3eaec7a0ba3462f99ea92678cbfc7b146e4",
+                "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/82fd8f36e2cccbe94faf237403c48052d4d4b77e",
-                "reference": "27c2e3eaec7a0ba3462f99ea92678cbfc7b146e4",
+                "reference": "82fd8f36e2cccbe94faf237403c48052d4d4b77e",
                 "shasum": ""
             },
             "require": {
@@ -4971,6 +4973,7 @@
                 "symfony/monolog-bridge": "~2.3|~3.0"
             },
             "require-dev": {
+                "phpunit/phpunit": "^4.8",
                 "symfony/console": "~2.3|~3.0",
                 "symfony/yaml": "~2.3|~3.0"
             },
@@ -5005,7 +5008,7 @@
                 "log",
                 "logging"
             ],
-            "time": "2016-03-01 17:53:42"
+            "time": "2016-03-13 15:55:56"
         },
         {
             "name": "symfony/polyfill-intl-icu",
@@ -5350,16 +5353,16 @@
         },
         {
             "name": "symfony/symfony",
-            "version": "v3.0.3",
+            "version": "v3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/symfony.git",
-                "reference": "09ae53562ce8b7842206efa217ec81442975f055"
+                "reference": "4e17cb2ecb3fd637097ebeb871fc0e2cbdd5e7ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/symfony/zipball/09ae53562ce8b7842206efa217ec81442975f055",
+                "url": "https://api.github.com/repos/symfony/symfony/zipball/4e17cb2ecb3fd637097ebeb871fc0e2cbdd5e7ff",
-                "reference": "09ae53562ce8b7842206efa217ec81442975f055",
+                "reference": "4e17cb2ecb3fd637097ebeb871fc0e2cbdd5e7ff",
                 "shasum": ""
             },
             "require": {
@@ -5442,10 +5445,7 @@
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/",
+                    "Symfony\\Bridge\\": "src/Symfony/Bridge/",
-                    "Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/",
-                    "Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/",
-                    "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/",
                     "Symfony\\Bundle\\": "src/Symfony/Bundle/",
                     "Symfony\\Component\\": "src/Symfony/Component/"
                 },
@@ -5475,7 +5475,7 @@
             "keywords": [
                 "framework"
             ],
-            "time": "2016-02-28 21:33:29"
+            "time": "2016-03-30 10:41:14"
         },
         {
             "name": "tecnickcom/tcpdf",

docs/en/developer/translate.rst

@@ -14,7 +14,7 @@ Translation files
 
 You can find translation files here: https://github.com/wallabag/wallabag/tree/v2/src/Wallabag/CoreBundle/Resources/translations.
 
-You have to create ``messages.CODE.yml`` and ``validators.CODE.yml``, where CODE
+You have to create ``messages.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

@@ -24,6 +24,7 @@ The main documentation for this application is organized into a couple sections:
    :caption: User documentation
 
    user/installation
+   user/migration
    user/create_account
    user/login
    user/configuration
@@ -41,7 +42,7 @@ The main documentation for this application is organized into a couple sections:
    :maxdepth: 2
    :caption: Developer documentation
 
+   developer/api
    developer/docker
    developer/translate
    developer/maintenance
-   developer/releasing

docs/en/user/configuration.rst

@@ -21,6 +21,12 @@ Items per page
 
 You can change the number of articles displayed on each page.
 
+Reading speed
+~~~~~~~~~~~~~
+
+wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are
+a fast or a slow reader. wallabag will recalculate the reading time for each article.
+
 Language
 ~~~~~~~~
 

docs/en/user/installation.rst

@@ -4,9 +4,9 @@ Install wallabag
 Requirements
 ------------
 
-wallabag is compatible with php >= 5.5, including php 7.
+wallabag is compatible with PHP >= 5.5, including PHP 7.
 
-You'll need the following extensions for wallabag to work. Some of these may already activated in your version of php, so you may not have to install all corresponding packages.
+You'll need the following extensions for wallabag to work. Some of these may already activated in your version of PHP, so you may not have to install all corresponding packages.
 
 - php-session
 - php-ctype
@@ -25,9 +25,9 @@ You'll need the following extensions for wallabag to work. Some of these may alr
 
 wallabag uses PDO to connect to database, so you'll need one of:
 
-- php-pdo_mysql
+- pdo_mysql
-- php-pdo_sqlite
+- pdo_sqlite
-- php-pdo_pgsql
+- pdo_pgsql
 
 and it's corresponding database server.
 
@@ -50,7 +50,7 @@ To install wallabag itself, you must run these two commands:
 
     git clone https://github.com/wallabag/wallabag.git
     cd wallabag
-    git checkout 2.0.0-beta.2
+    git checkout 2.0.1
     SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod
 
@@ -62,6 +62,11 @@ To start php's build-in server and test if everything did install correctly, you
 
 And access wallabag at http://yourserverip:8000
 
+.. note::
+
+    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
 --------------------
 
@@ -146,3 +151,7 @@ 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::
+
+    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``.

docs/en/user/migration.rst

@@ -0,0 +1,62 @@
+Migrate wallabag
+================
+
+From wallabag 1.x
+-----------------
+
+If you were using wallabag v1.x, you need to export your data before migrating to wallabag v2.x, because the application and its database changed a lot. In your old wallabag installation, you can export your data, which can be done on the Config page of your old wallabag installation.
+
+.. image:: ../../img/user/export_v1.png
+   :alt: Exporting from wallabag v1
+   :align: center
+
+.. note::
+    If you have multiple accounts on the same instance of wallabag, each user must export from v1 and import into v2 its data.
+
+.. 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>`__.
+
+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.
+
+.. image:: ../../img/user/import_wallabagv1.png
+   :alt: Import from wallabag v1
+   :align: center
+
+Import via command-line interface (CLI)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If you have a CLI access on your web server, you can execute this command to import your wallabag v1 export:
+
+::
+
+    bin/console wallabag:import-v1 1 ~/Downloads/wallabag-export-1-2016-04-05.json --env=prod
+
+Please replace values:
+
+* ``1`` is the user identifier in database (The ID of the first user created on wallabag is 1)
+* ``~/Downloads/wallabag-export-1-2016-04-05.json`` is the path of your wallabag v1 export
+
+You'll have this in return:
+
+::
+
+    Start : 05-04-2016 11:36:07 ---
+    403 imported
+    0 already saved
+    End : 05-04-2016 11:36:09 ---
+
+From wallabag 2.x
+-----------------
+
+From the previous wallabag instance on which you were before, go to `All articles`, then export these articles as json.
+
+.. image:: ../../img/user/export_v2.png
+   :alt: Export depuis wallabag v2
+   :align: center
+
+From your new wallabag instance, create your user account and click on the link in the menu to proceed to import. Choose import from wallabag v2 and select your json file to upload it.
+
+.. 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>`__.

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/v2/src/Wallabag/CoreBundle/Resources/translations.
 
-Vous devez créer les fichiers ``messages.CODE.yml`` et ``validators.CODE.yml``,
+Vous devez créer le fichier ``messages.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

@@ -25,6 +25,7 @@ La documentation principale de cette application est découpée en plusieurs sec
    :caption: Documentation utilisateur
 
    user/installation
+   user/migration
    user/create_account
    user/login
    user/configuration
@@ -42,6 +43,7 @@ La documentation principale de cette application est découpée en plusieurs sec
    :maxdepth: 2
    :caption: Documentation développeur
 
+   developer/api
    developer/docker
    developer/translate
    developer/maintenance

docs/fr/user/configuration.rst

@@ -22,6 +22,11 @@ Nombre d'articles par page
 
 Vous pouvez définir le nombre d'articles affichés sur chaque page.
 
+Vitesse de lecture
+~~~~~~~~~~~~~~~~~~
+
+wallabag calcule une durée de lecture pour chaque article. Vous pouvez définir ici, grâce à cette liste déroulante, si vous lisez plus ou moins vite. wallabag recalculera la durée de lecture de chaque article.
+
 Langue
 ~~~~~~
 

docs/fr/user/installation.rst

@@ -4,9 +4,9 @@ Installer wallabag
 Pré-requis
 ------------
 
-wallabag est compatible avec php >= 5.5, php 7 inclus.
+wallabag est compatible avec PHP >= 5.5, PHP 7 inclus.
 
-Vous aurez besoin des extensions suivantes pour que wallabag fonctionne. Il est possible que certaines de ces extensions soient déjà activées dans votre version de php, donc vous n'avez pas forcément besoin d'installer tous les paquets correspondants.
+Vous aurez besoin des extensions suivantes pour que wallabag fonctionne. Il est possible que certaines de ces extensions soient déjà activées dans votre version de PHP, donc vous n'avez pas forcément besoin d'installer tous les paquets correspondants.
 
 - php-session
 - php-ctype
@@ -25,9 +25,9 @@ Vous aurez besoin des extensions suivantes pour que wallabag fonctionne. Il est
 
 wallabag utilise PDO afin de se connecter à une base de données, donc vous aurez besoin d'une extension et d'un système de bases de données parmi :
 
-- php-pdo_mysql
+- pdo_mysql
-- php-pdo_sqlite
+- pdo_sqlite
-- php-pdo_pgsql
+- pdo_pgsql
 
 Installation
 ------------
@@ -48,7 +48,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.0-beta.2
+    git checkout 2.0.1
     SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod
 
@@ -60,6 +60,11 @@ 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::
+
+    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
 ------------------------
 
@@ -144,3 +149,7 @@ 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::
+
+    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``.

docs/fr/user/migration.rst

@@ -0,0 +1,62 @@
+Migrer wallabag
+===============
+
+Depuis wallabag 1.x
+-------------------
+
+Si vous utilisiez wallabag v1.x, vous devez exporter vos données avant de migrer à wallabag v2.x, à cause du changement complet de l'application et de sa base de données. Sur votre ancienne instance de wallabag v1, vous pouvez exporter vos données en allant sur la page de configuration de l'application.
+
+.. image:: ../../img/user/export_v1.png
+   :alt: Export depuis wallabag v1
+   :align: center
+
+.. note::
+    Si vous avez plusieurs comptes sur la même instance de wallabag, chaque utilisateur doit exporter ses données depuis wallabag v1 et les importer dans la v2.
+
+.. 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 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.
+
+.. image:: ../../img/user/import_wallabagv1.png
+   :alt: Import depuis wallabag v1
+   :align: center
+
+Import via via la ligne de commande (CLI)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Si vous avez accès à la ligne de commandes de votre serveur web, vous pouvez exécuter cette commande pour import votre fichier wallabag v1 :
+
+::
+
+    bin/console wallabag:import-v1 1 ~/Downloads/wallabag-export-1-2016-04-05.json --env=prod
+
+Remplacez les valeurs :
+
+* ``1`` est l'identifiant de votre utilisateur en base (l'ID de votre premier utilisateur créé sur wallabag est 1)
+* ``~/Downloads/wallabag-export-1-2016-04-05.json`` est le chemin de votre export wallabag v1
+
+Vous obtiendrez :
+
+::
+
+    Start : 05-04-2016 11:36:07 ---
+    403 imported
+    0 already saved
+    End : 05-04-2016 11:36:09 ---
+
+Depuis wallabag 2.x
+-------------------
+
+Depuis l'instance sur laquelle vous étiez, rendez-vous dans la section `Tous les articles`, puis exportez ces articles au format json.
+
+.. image:: ../../img/user/export_v2.png
+   :alt: Export depuis wallabag v2
+   :align: center
+
+Depuis votre nouvelle instance de wallabag, créez votre compte utilisateur puis cliquez sur le lien dans le menu pour accéder à l'import. Choisissez l'import depuis wallabag v2 puis sélectionnez votre fichier json pour l'uploader.
+
+.. 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>`__.

docs/pt-br/conf.py

@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# wallabag documentation build configuration file, created by
-# sphinx-quickstart on Fri Oct 16 06:47:23 2015.
-
-import sys
-import os
-
-extensions = []
-templates_path = ['_templates']
-source_suffix = '.rst'
-master_doc = 'index'
-project = u'wallabag-pt'
-copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
-version = '2.0.0'
-release = version
-exclude_patterns = ['_build']
-pygments_style = 'sphinx'
-html_theme = 'default'
-html_static_path = ['_static']
-htmlhelp_basename = 'wallabagfrdoc'
-
-latex_elements = {
-}
-
-latex_documents = [
-  ('index', 'wallabag-pt.tex', u'wallabag Documentation',
-   u'Nicolas Lœuillet', 'manual'),
-]
-
-man_pages = [
-    ('index', 'wallabagpt', u'wallabag Documentation',
-     [u'Nicolas Lœuillet'], 1)
-]
-
-texinfo_documents = [
-  ('index', 'wallabag', u'wallabag Documentation',
-   u'Nicolas Lœuillet', 'wallabag', 'wallabag is an opensource read-it-later.',
-   'Miscellaneous'),
-]
-
-##### Guzzle sphinx theme
-
-import guzzle_sphinx_theme
-html_translator_class = 'guzzle_sphinx_theme.HTMLTranslator'
-html_theme_path = guzzle_sphinx_theme.html_theme_path()
-html_theme = 'guzzle_sphinx_theme'
-
-# Custom sidebar templates, maps document names to template names.
-html_sidebars = {
-    '**': ['logo-text.html', 'globaltoc.html', 'searchbox.html']
-}
-
-# Register the theme as an extension to generate a sitemap.xml
-extensions.append("guzzle_sphinx_theme")

docs/pt-br/index.rst

@@ -1,36 +0,0 @@
-wallabag documentation
-======================
-
-.. image:: ../img/wallabag.png
-   :alt: wallabag logo
-   :align: center
-
-**wallabag** É uma aplicação "leia mais tarde": Ele salva páginas da web mantendo apenas o conteúdo. Elementos como ícones de navegação ou propaganda são deletedos.
-
-A documentação principal desta aplicação é organizada em duas seções:
-
-* :ref:`doc-usuario`
-* :ref:`doc-desenvolvedor`
-
-.. _user-docs:
-
-.. toctree::
-   :maxdepth: 2
-   :caption: Documentação do usuário
-
-   user/criar_conta
-   user/login
-   user/configuração
-   user/primeiro_artigo
-   user/importar
-   user/baixar_artigos
-   user/filtros
-   user/tags
-
-.. _dev-docs:
-
-.. toctree::
-   :maxdepth: 2
-   :caption: Documentação do desenvolvedor
-
-   developer/docker

docs/pt-br/requirements.txt

@@ -1,2 +0,0 @@
-Sphinx>=1.3.0,<1.4.0
-guzzle_sphinx_theme>=0.7.0,<0.8.0

src/Wallabag/AnnotationBundle/Entity/Annotation.php

@@ -82,7 +82,7 @@ class Annotation
     /*
      * @param User     $user
      */
-    public function __construct(\Wallabag\UserBundle\Entity\User $user)
+    public function __construct(User $user)
     {
         $this->user = $user;
     }
@@ -204,7 +204,7 @@ class Annotation
     /**
      * Set user.
      *
-     * @param string $user
+     * @param User $user
      *
      * @return Annotation
      */
@@ -218,7 +218,7 @@ class Annotation
     /**
      * Get user.
      *
-     * @return string
+     * @return User
      */
     public function getUser()
     {

src/Wallabag/ApiBundle/Controller/WallabagRestController.php

@@ -27,13 +27,13 @@ class WallabagRestController extends FOSRestController
      *
      * @ApiDoc(
      *       parameters={
-     *          {"name"="archive", "dataType"="boolean", "required"=false, "format"="true or false, all entries by default", "description"="filter by archived status."},
+     *          {"name"="archive", "dataType"="integer", "required"=false, "format"="1 or 0, all entries by default", "description"="filter by archived status."},
-     *          {"name"="star", "dataType"="boolean", "required"=false, "format"="true or false, all entries by default", "description"="filter by starred status."},
+     *          {"name"="starred", "dataType"="integer", "required"=false, "format"="1 or 0, all entries by default", "description"="filter by starred status."},
      *          {"name"="sort", "dataType"="string", "required"=false, "format"="'created' or 'updated', default 'created'", "description"="sort entries by date."},
      *          {"name"="order", "dataType"="string", "required"=false, "format"="'asc' or 'desc', default 'desc'", "description"="order of sort."},
      *          {"name"="page", "dataType"="integer", "required"=false, "format"="default '1'", "description"="what page you want."},
      *          {"name"="perPage", "dataType"="integer", "required"=false, "format"="default'30'", "description"="results per page."},
-     *          {"name"="tags", "dataType"="string", "required"=false, "format"="api%2Crest", "description"="a list of tags url encoded. Will returns entries that matches ALL tags."},
+     *          {"name"="tags", "dataType"="string", "required"=false, "format"="api,rest", "description"="a list of tags url encoded. Will returns entries that matches ALL tags."},
      *       }
      * )
      *
@@ -43,8 +43,8 @@ class WallabagRestController extends FOSRestController
     {
         $this->validateAuthentication();
 
-        $isArchived = $request->query->get('archive');
+        $isArchived = (null === $request->query->get('archive')) ? null : (bool) $request->query->get('archive');
-        $isStarred = $request->query->get('star');
+        $isStarred = (null === $request->query->get('starred')) ? null : (bool) $request->query->get('starred');
         $sort = $request->query->get('sort', 'created');
         $order = $request->query->get('order', 'desc');
         $page = (int) $request->query->get('page', 1);
@@ -97,8 +97,8 @@ class WallabagRestController extends FOSRestController
      *          {"name"="url", "dataType"="string", "required"=true, "format"="http://www.test.com/article.html", "description"="Url for the entry."},
      *          {"name"="title", "dataType"="string", "required"=false, "description"="Optional, we'll get the title from the page."},
      *          {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."},
-     *          {"name"="starred", "dataType"="boolean", "required"=false, "format"="true or false", "description"="entry already starred"},
+     *          {"name"="starred", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="entry already starred"},
-     *          {"name"="archive", "dataType"="boolean", "required"=false, "format"="true or false", "description"="entry already archived"},
+     *          {"name"="archive", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="entry already archived"},
      *       }
      * )
      *
@@ -109,25 +109,29 @@ class WallabagRestController extends FOSRestController
         $this->validateAuthentication();
 
         $url = $request->request->get('url');
-        $isArchived = $request->request->get('archive');
+        $isArchived = (int) $request->request->get('archive');
-        $isStarred = $request->request->get('starred');
+        $isStarred = (int) $request->request->get('starred');
 
-        $entry = $this->get('wallabag_core.content_proxy')->updateEntry(
+        $entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($url, $this->getUser()->getId());
-            new Entry($this->getUser()),
+
-            $url
+        if (false === $entry) {
-        );
+            $entry = $this->get('wallabag_core.content_proxy')->updateEntry(
+                new Entry($this->getUser()),
+                $url
+            );
+        }
 
         $tags = $request->request->get('tags', '');
         if (!empty($tags)) {
             $this->get('wallabag_core.content_proxy')->assignTagsToEntry($entry, $tags);
         }
 
-        if (true === (bool) $isStarred) {
+        if (!is_null($isStarred)) {
-            $entry->setStarred(true);
+            $entry->setStarred((bool) $isStarred);
         }
 
-        if (true === (bool) $isArchived) {
+        if (!is_null($isArchived)) {
-            $entry->setArchived(true);
+            $entry->setArchived((bool) $isArchived);
         }
 
         $em = $this->getDoctrine()->getManager();
@@ -150,8 +154,8 @@ class WallabagRestController extends FOSRestController
      *      parameters={
      *          {"name"="title", "dataType"="string", "required"=false},
      *          {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."},
-     *          {"name"="archive", "dataType"="boolean", "required"=false, "format"="true or false", "description"="archived the entry."},
+     *          {"name"="archive", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="archived the entry."},
-     *          {"name"="star", "dataType"="boolean", "required"=false, "format"="true or false", "description"="starred the entry."},
+     *          {"name"="starred", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="starred the entry."},
      *      }
      * )
      *
@@ -163,19 +167,19 @@ class WallabagRestController extends FOSRestController
         $this->validateUserAccess($entry->getUser()->getId());
 
         $title = $request->request->get('title');
-        $isArchived = $request->request->get('archive');
+        $isArchived = (int) $request->request->get('archive');
-        $isStarred = $request->request->get('star');
+        $isStarred = (int) $request->request->get('starred');
 
         if (!is_null($title)) {
             $entry->setTitle($title);
         }
 
         if (!is_null($isArchived)) {
-            $entry->setArchived($isArchived);
+            $entry->setArchived((bool) $isArchived);
         }
 
         if (!is_null($isStarred)) {
-            $entry->setStarred($isStarred);
+            $entry->setStarred((bool) $isStarred);
         }
 
         $tags = $request->request->get('tags', '');

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

@@ -27,6 +27,9 @@ class WallabagRestControllerTest extends WallabagApiTestCase
         $this->assertEquals($entry->getTitle(), $content['title']);
         $this->assertEquals($entry->getUrl(), $content['url']);
         $this->assertCount(count($entry->getTags()), $content['tags']);
+        $this->assertEquals($entry->getUserName(), $content['user_name']);
+        $this->assertEquals($entry->getUserEmail(), $content['user_email']);
+        $this->assertEquals($entry->getUserId(), $content['user_id']);
 
         $this->assertTrue(
             $this->client->getResponse()->headers->contains(
@@ -159,15 +162,35 @@ 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(1, $content['user_id']);
         $this->assertCount(1, $content['tags']);
     }
 
+    public function testPostSameEntry()
+    {
+        $this->client->request('POST', '/api/entries.json', array(
+            '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',
+            'archive' => '1',
+            'tags' => 'google, apple',
+        ));
+
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+
+        $content = json_decode($this->client->getResponse()->getContent(), true);
+
+        $this->assertGreaterThan(0, $content['id']);
+        $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(true, $content['is_archived']);
+        $this->assertEquals(false, $content['is_starred']);
+        $this->assertCount(2, $content['tags']);
+    }
+
     public function testPostArchivedAndStarredEntry()
     {
         $this->client->request('POST', '/api/entries.json', array(
             'url' => 'http://www.lemonde.fr/idees/article/2016/02/08/preserver-la-liberte-d-expression-sur-les-reseaux-sociaux_4861503_3232.html',
-            'archive' => true,
+            'archive' => '1',
-            'starred' => true,
+            'starred' => '1',
         ));
 
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
@@ -178,6 +201,25 @@ class WallabagRestControllerTest extends WallabagApiTestCase
         $this->assertEquals('http://www.lemonde.fr/idees/article/2016/02/08/preserver-la-liberte-d-expression-sur-les-reseaux-sociaux_4861503_3232.html', $content['url']);
         $this->assertEquals(true, $content['is_archived']);
         $this->assertEquals(true, $content['is_starred']);
+        $this->assertEquals(1, $content['user_id']);
+    }
+
+    public function testPostArchivedAndStarredEntryWithoutQuotes()
+    {
+        $this->client->request('POST', '/api/entries.json', array(
+            'url' => 'http://www.lemonde.fr/idees/article/2016/02/08/preserver-la-liberte-d-expression-sur-les-reseaux-sociaux_4861503_3232.html',
+            'archive' => 0,
+            'starred' => 1,
+        ));
+
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+
+        $content = json_decode($this->client->getResponse()->getContent(), true);
+
+        $this->assertGreaterThan(0, $content['id']);
+        $this->assertEquals('http://www.lemonde.fr/idees/article/2016/02/08/preserver-la-liberte-d-expression-sur-les-reseaux-sociaux_4861503_3232.html', $content['url']);
+        $this->assertEquals(false, $content['is_archived']);
+        $this->assertEquals(true, $content['is_starred']);
     }
 
     public function testPatchEntry()
@@ -197,8 +239,40 @@ class WallabagRestControllerTest extends WallabagApiTestCase
         $this->client->request('PATCH', '/api/entries/'.$entry->getId().'.json', array(
             'title' => 'New awesome title',
             'tags' => 'new tag '.uniqid(),
-            'star' => true,
+            'starred' => '1',
-            'archive' => false,
+            'archive' => '0',
+        ));
+
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+
+        $content = json_decode($this->client->getResponse()->getContent(), true);
+
+        $this->assertEquals($entry->getId(), $content['id']);
+        $this->assertEquals($entry->getUrl(), $content['url']);
+        $this->assertEquals('New awesome title', $content['title']);
+        $this->assertGreaterThan($nbTags, count($content['tags']));
+        $this->assertEquals(1, $content['user_id']);
+    }
+
+    public function testPatchEntryWithoutQuotes()
+    {
+        $entry = $this->client->getContainer()
+            ->get('doctrine.orm.entity_manager')
+            ->getRepository('WallabagCoreBundle:Entry')
+            ->findOneByUser(1);
+
+        if (!$entry) {
+            $this->markTestSkipped('No content found in db.');
+        }
+
+        // hydrate the tags relations
+        $nbTags = count($entry->getTags());
+
+        $this->client->request('PATCH', '/api/entries/'.$entry->getId().'.json', array(
+            'title' => 'New awesome title',
+            'tags' => 'new tag '.uniqid(),
+            'starred' => 1,
+            'archive' => 0,
         ));
 
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode());

src/Wallabag/CoreBundle/Command/InstallCommand.php

@@ -60,6 +60,7 @@ class InstallCommand extends ContainerAwareCommand
             ->checkRequirements()
             ->setupDatabase()
             ->setupAdmin()
+            ->setupConfig()
             ->setupAsset()
         ;
 
@@ -69,40 +70,40 @@ class InstallCommand extends ContainerAwareCommand
 
     protected function checkRequirements()
     {
-        $this->defaultOutput->writeln('<info><comment>Step 1 of 4.</comment> Checking system requirements.</info>');
+        $this->defaultOutput->writeln('<info><comment>Step 1 of 5.</comment> Checking system requirements.</info>');
 
         $fulfilled = true;
 
-        $label = '<comment>PDO Drivers</comment>';
+        $label = '<comment>PDO Driver</comment>';
-        if (extension_loaded('pdo_sqlite') || extension_loaded('pdo_mysql') || extension_loaded('pdo_pgsql')) {
+        $status = '<info>OK!</info>';
-            $status = '<info>OK!</info>';
+        $help = '';
-            $help = '';
+
-        } else {
+        if (!extension_loaded($this->getContainer()->getParameter('database_driver'))) {
             $fulfilled = false;
             $status = '<error>ERROR!</error>';
-            $help = 'Needs one of sqlite, mysql or pgsql PDO drivers';
+            $help = 'Database driver "'.$this->getContainer()->getParameter('database_driver').'" is not installed.';
         }
 
-        $rows[] = array($label, $status, $help);
+        $rows = [];
+        $rows[] = [$label, $status, $help];
 
         foreach ($this->functionExists as $functionRequired) {
             $label = '<comment>'.$functionRequired.'</comment>';
+            $status = '<info>OK!</info>';
+            $help = '';
 
-            if (function_exists($functionRequired)) {
+            if (!function_exists($functionRequired)) {
-                $status = '<info>OK!</info>';
-                $help = '';
-            } else {
                 $fulfilled = false;
                 $status = '<error>ERROR!</error>';
                 $help = 'You need the '.$functionRequired.' function activated';
             }
 
-            $rows[] = array($label, $status, $help);
+            $rows[] = [$label, $status, $help];
         }
 
         $table = new Table($this->defaultOutput);
         $table
-            ->setHeaders(array('Checked', 'Status', 'Recommendation'))
+            ->setHeaders(['Checked', 'Status', 'Recommendation'])
             ->setRows($rows)
             ->render();
 
@@ -119,14 +120,14 @@ class InstallCommand extends ContainerAwareCommand
 
     protected function setupDatabase()
     {
-        $this->defaultOutput->writeln('<info><comment>Step 2 of 4.</comment> Setting up database.</info>');
+        $this->defaultOutput->writeln('<info><comment>Step 2 of 5.</comment> Setting up database.</info>');
 
         // user want to reset everything? Don't care about what is already here
         if (true === $this->defaultInput->getOption('reset')) {
             $this->defaultOutput->writeln('Droping database, creating database and schema, clearing the cache');
 
             $this
-                ->runCommand('doctrine:database:drop', array('--force' => true))
+                ->runCommand('doctrine:database:drop', ['--force' => true])
                 ->runCommand('doctrine:database:create')
                 ->runCommand('doctrine:schema:create')
                 ->runCommand('cache:clear')
@@ -158,7 +159,7 @@ class InstallCommand extends ContainerAwareCommand
             $this->defaultOutput->writeln('Droping database, creating database and schema');
 
             $this
-                ->runCommand('doctrine:database:drop', array('--force' => true))
+                ->runCommand('doctrine:database:drop', ['--force' => true])
                 ->runCommand('doctrine:database:create')
                 ->runCommand('doctrine:schema:create')
             ;
@@ -168,7 +169,7 @@ class InstallCommand extends ContainerAwareCommand
                 $this->defaultOutput->writeln('Droping schema and creating schema');
 
                 $this
-                    ->runCommand('doctrine:schema:drop', array('--force' => true))
+                    ->runCommand('doctrine:schema:drop', ['--force' => true])
                     ->runCommand('doctrine:schema:create')
                 ;
             }
@@ -190,7 +191,7 @@ class InstallCommand extends ContainerAwareCommand
 
     protected function setupAdmin()
     {
-        $this->defaultOutput->writeln('<info><comment>Step 3 of 4.</comment> Administration setup.</info>');
+        $this->defaultOutput->writeln('<info><comment>Step 3 of 5.</comment> Administration setup.</info>');
 
         $questionHelper = $this->getHelperSet()->get('question');
         $question = new ConfirmationQuestion('Would you like to create a new admin user (recommended) ? (Y/n)', true);
@@ -222,19 +223,25 @@ class InstallCommand extends ContainerAwareCommand
         $config->setTheme($this->getContainer()->getParameter('wallabag_core.theme'));
         $config->setItemsPerPage($this->getContainer()->getParameter('wallabag_core.items_on_page'));
         $config->setRssLimit($this->getContainer()->getParameter('wallabag_core.rss_limit'));
+        $config->setReadingSpeed($this->getContainer()->getParameter('wallabag_core.reading_speed'));
         $config->setLanguage($this->getContainer()->getParameter('wallabag_core.language'));
 
         $em->persist($config);
 
+        $this->defaultOutput->writeln('');
+
+        return $this;
+    }
+
+    protected function setupConfig()
+    {
+        $this->defaultOutput->writeln('<info><comment>Step 4 of 5.</comment> Config setup.</info>');
+        $em = $this->getContainer()->get('doctrine.orm.entity_manager');
+
         // cleanup before insert new stuff
         $em->createQuery('DELETE FROM CraueConfigBundle:Setting')->execute();
 
         $settings = [
-            [
-                'name' => 'download_pictures',
-                'value' => '1',
-                'section' => 'entry',
-            ],
             [
                 'name' => 'carrot',
                 'value' => '1',
@@ -369,7 +376,7 @@ class InstallCommand extends ContainerAwareCommand
 
     protected function setupAsset()
     {
-        $this->defaultOutput->writeln('<info><comment>Step 4 of 4.</comment> Installing assets.</info>');
+        $this->defaultOutput->writeln('<info><comment>Step 5 of 5.</comment> Installing assets.</info>');
 
         $this
             ->runCommand('assets:install')
@@ -387,19 +394,19 @@ class InstallCommand extends ContainerAwareCommand
      * @param string $command
      * @param array  $parameters Parameters to this command (usually 'force' => true)
      */
-    protected function runCommand($command, $parameters = array())
+    protected function runCommand($command, $parameters = [])
     {
         $parameters = array_merge(
-            array('command' => $command),
+            ['command' => $command],
             $parameters,
-            array(
+            [
                 '--no-debug' => true,
                 '--env' => $this->defaultInput->getOption('env') ?: 'dev',
-            )
+            ]
         );
 
         if ($this->defaultInput->getOption('no-interaction')) {
-            $parameters = array_merge($parameters, array('--no-interaction' => true));
+            $parameters = array_merge($parameters, ['--no-interaction' => true]);
         }
 
         $this->getApplication()->setAutoExit(false);
@@ -459,7 +466,13 @@ class InstallCommand extends ContainerAwareCommand
             return false;
         }
 
-        return in_array($databaseName, $schemaManager->listDatabases());
+        try {
+            return in_array($databaseName, $schemaManager->listDatabases());
+        } catch (\Doctrine\DBAL\Exception\ConnectionException $e) {
+            // it means we weren't able to get database list, assume the database doesn't exist
+
+            return false;
+        }
     }
 
     /**

src/Wallabag/CoreBundle/Controller/ConfigController.php

@@ -45,7 +45,7 @@ class ConfigController extends Controller
 
             $this->get('session')->getFlashBag()->add(
                 'notice',
-                'Config saved. Some parameters will be considered after disconnection.'
+                'flashes.config.notice.config_saved'
             );
 
             return $this->redirect($this->generateUrl('config'));
@@ -57,9 +57,9 @@ class ConfigController extends Controller
 
         if ($pwdForm->isValid()) {
             if ($this->get('craue_config')->get('demo_mode_enabled') && $this->get('craue_config')->get('demo_mode_username') === $user->getUsername()) {
-                $message = 'In demonstration mode, you can\'t change password for this user.';
+                $message = 'flashes.config.notice.password_not_updated_demo';
             } else {
-                $message = 'Password updated';
+                $message = 'flashes.config.notice.password_updated';
 
                 $user->setPlainPassword($pwdForm->get('new_password')->getData());
                 $userManager->updateUser($user, true);
@@ -82,7 +82,7 @@ class ConfigController extends Controller
 
             $this->get('session')->getFlashBag()->add(
                 'notice',
-                'Information updated'
+                'flashes.config.notice.user_updated'
             );
 
             return $this->redirect($this->generateUrl('config').'#set3');
@@ -98,7 +98,7 @@ class ConfigController extends Controller
 
             $this->get('session')->getFlashBag()->add(
                 'notice',
-                'RSS information updated'
+                'flashes.config.notice.rss_updated'
             );
 
             return $this->redirect($this->generateUrl('config').'#set2');
@@ -116,7 +116,7 @@ class ConfigController extends Controller
 
             $this->get('session')->getFlashBag()->add(
                 'notice',
-                'Tagging rules updated'
+                'flashes.config.notice.tagging_rules_updated'
             );
 
             return $this->redirect($this->generateUrl('config').'#set5');
@@ -147,7 +147,7 @@ class ConfigController extends Controller
 
             $this->get('session')->getFlashBag()->add(
                 'notice',
-                $this->get('translator')->trans('User "%username%" added', array('%username%' => $newUser->getUsername()))
+                $this->get('translator')->trans('flashes.config.notice.user_added', array('%username%' => $newUser->getUsername()))
             );
 
             return $this->redirect($this->generateUrl('config').'#set6');
@@ -192,7 +192,7 @@ class ConfigController extends Controller
 
         $this->get('session')->getFlashBag()->add(
             'notice',
-            'RSS token updated'
+            'flashes.config.notice.rss_token_updated'
         );
 
         return $this->redirect($this->generateUrl('config').'#set2');
@@ -210,7 +210,7 @@ class ConfigController extends Controller
     public function deleteTaggingRuleAction(TaggingRule $rule)
     {
         if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) {
-            throw $this->createAccessDeniedException('You can not access this tagging ryle.');
+            throw $this->createAccessDeniedException('You can not access this tagging rule.');
         }
 
         $em = $this->getDoctrine()->getManager();
@@ -219,7 +219,7 @@ class ConfigController extends Controller
 
         $this->get('session')->getFlashBag()->add(
             'notice',
-            'Tagging rule deleted'
+            'flashes.config.notice.tagging_rules_deleted'
         );
 
         return $this->redirect($this->generateUrl('config').'#set5');

src/Wallabag/CoreBundle/Controller/DeveloperController.php

@@ -43,13 +43,13 @@ class DeveloperController extends Controller
         $clientForm->handleRequest($request);
 
         if ($clientForm->isValid()) {
-            $client->setAllowedGrantTypes(array('token', 'authorization_code', 'password'));
+            $client->setAllowedGrantTypes(array('token', 'authorization_code', 'password', 'refresh_token'));
             $em->persist($client);
             $em->flush();
 
             $this->get('session')->getFlashBag()->add(
                 'notice',
-                'New client created.'
+                'flashes.developer.notice.client_created'
             );
 
             return $this->render('WallabagCoreBundle:Developer:client_parameters.html.twig', array(
@@ -80,7 +80,7 @@ class DeveloperController extends Controller
 
         $this->get('session')->getFlashBag()->add(
             'notice',
-            'Client deleted'
+            'flashes.developer.notice.client_deleted'
         );
 
         return $this->redirect($this->generateUrl('developer'));

src/Wallabag/CoreBundle/Controller/EntryController.php

@@ -49,13 +49,12 @@ class EntryController extends Controller
         $form->handleRequest($request);
 
         if ($form->isValid()) {
-            // check for existing entry, if it exists, redirect to it with a message
+            $existingEntry = $this->checkIfEntryAlreadyExists($entry);
-            $existingEntry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
 
             if (false !== $existingEntry) {
                 $this->get('session')->getFlashBag()->add(
                     'notice',
-                    'Entry already saved on '.$existingEntry->getCreatedAt()->format('d-m-Y')
+                    $this->get('translator')->trans('flashes.entry.notice.entry_already_saved', array('%date%' => $existingEntry->getCreatedAt()->format('d-m-Y')))
                 );
 
                 return $this->redirect($this->generateUrl('view', array('id' => $existingEntry->getId())));
@@ -64,7 +63,7 @@ class EntryController extends Controller
             $this->updateEntry($entry);
             $this->get('session')->getFlashBag()->add(
                 'notice',
-                'Entry saved'
+                'flashes.entry.notice.entry_saved'
             );
 
             return $this->redirect($this->generateUrl('homepage'));
@@ -86,19 +85,20 @@ class EntryController extends Controller
     {
         $entry = new Entry($this->getUser());
         $entry->setUrl($request->get('url'));
-        $this->updateEntry($entry);
+
+        if (false === $this->checkIfEntryAlreadyExists($entry)) {
+            $this->updateEntry($entry);
+        }
 
         return $this->redirect($this->generateUrl('homepage'));
     }
 
     /**
-     * @param Request $request
-     *
      * @Route("/new", name="new")
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function addEntryAction(Request $request)
+    public function addEntryAction()
     {
         return $this->render('WallabagCoreBundle:Entry:new.html.twig');
     }
@@ -128,7 +128,7 @@ class EntryController extends Controller
 
             $this->get('session')->getFlashBag()->add(
                 'notice',
-                'Entry updated'
+                'flashes.entry.notice.entry_updated'
             );
 
             return $this->redirect($this->generateUrl('view', array('id' => $entry->getId())));
@@ -304,9 +304,9 @@ class EntryController extends Controller
     {
         $this->checkUserAction($entry);
 
-        $message = 'Entry reloaded';
+        $message = 'flashes.entry.notice.entry_reloaded';
         if (false === $this->updateEntry($entry)) {
-            $message = 'Failed to reload entry';
+            $message = 'flashes.entry.notice.entry_reload_failed';
         }
 
         $this->get('session')->getFlashBag()->add(
@@ -334,9 +334,14 @@ class EntryController extends Controller
         $entry->toggleArchive();
         $this->getDoctrine()->getManager()->flush();
 
+        $message = 'flashes.entry.notice.entry_unarchived';
+        if ($entry->isArchived()) {
+            $message = 'flashes.entry.notice.entry_archived';
+        }
+
         $this->get('session')->getFlashBag()->add(
             'notice',
-            'Entry '.($entry->isArchived() ? 'archived' : 'unarchived')
+            $message
         );
 
         return $this->redirect($request->headers->get('referer'));
@@ -359,9 +364,14 @@ class EntryController extends Controller
         $entry->toggleStar();
         $this->getDoctrine()->getManager()->flush();
 
+        $message = 'flashes.entry.notice.entry_unstarred';
+        if ($entry->isStarred()) {
+            $message = 'flashes.entry.notice.entry_starred';
+        }
+
         $this->get('session')->getFlashBag()->add(
             'notice',
-            'Entry '.($entry->isStarred() ? 'starred' : 'unstarred')
+            $message
         );
 
         return $this->redirect($request->headers->get('referer'));
@@ -394,7 +404,7 @@ class EntryController extends Controller
 
         $this->get('session')->getFlashBag()->add(
             'notice',
-            'Entry deleted'
+            'flashes.entry.notice.entry_deleted'
         );
 
         // don't redirect user to the deleted entry
@@ -412,4 +422,16 @@ class EntryController extends Controller
             throw $this->createAccessDeniedException('You can not access this entry.');
         }
     }
+
+    /**
+     * Check for existing entry, if it exists, redirect to it with a message.
+     *
+     * @param $entry
+     *
+     * @return array|bool
+     */
+    private function checkIfEntryAlreadyExists($entry)
+    {
+        return $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
+    }
 }

src/Wallabag/CoreBundle/Controller/TagController.php

@@ -20,30 +20,22 @@ class TagController extends Controller
      */
     public function addTagFormAction(Request $request, Entry $entry)
     {
-        $tag = new Tag();
+        $form = $this->createForm(NewTagType::class, new Tag());
-        $form = $this->createForm(NewTagType::class, $tag);
         $form->handleRequest($request);
 
         if ($form->isValid()) {
-            $existingTag = $this->getDoctrine()
+            $this->get('wallabag_core.content_proxy')->assignTagsToEntry(
-                ->getRepository('WallabagCoreBundle:Tag')
+                $entry,
-                ->findOneByLabel($tag->getLabel());
+                $form->get('label')->getData()
+            );
 
             $em = $this->getDoctrine()->getManager();
-
+            $em->persist($entry);
-            if (is_null($existingTag)) {
-                $entry->addTag($tag);
-                $em->persist($tag);
-            } elseif (!$existingTag->hasEntry($entry)) {
-                $entry->addTag($existingTag);
-                $em->persist($existingTag);
-            }
-
             $em->flush();
 
             $this->get('session')->getFlashBag()->add(
                 'notice',
-                'Tag added'
+                'flashes.tag.notice.tag_added'
             );
 
             return $this->redirect($this->generateUrl('view', array('id' => $entry->getId())));

src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php

@@ -25,6 +25,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface
 
         $adminConfig->setTheme('material');
         $adminConfig->setItemsPerPage(30);
+        $adminConfig->setReadingSpeed(1);
         $adminConfig->setLanguage('en');
 
         $manager->persist($adminConfig);
@@ -34,6 +35,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface
         $bobConfig = new Config($this->getReference('bob-user'));
         $bobConfig->setTheme('default');
         $bobConfig->setItemsPerPage(10);
+        $bobConfig->setReadingSpeed(1);
         $bobConfig->setLanguage('fr');
 
         $manager->persist($bobConfig);
@@ -43,6 +45,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface
         $emptyConfig = new Config($this->getReference('empty-user'));
         $emptyConfig->setTheme('material');
         $emptyConfig->setItemsPerPage(10);
+        $emptyConfig->setReadingSpeed(1);
         $emptyConfig->setLanguage('en');
 
         $manager->persist($emptyConfig);

src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php

@@ -15,11 +15,6 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface
     public function load(ObjectManager $manager)
     {
         $settings = [
-            [
-                'name' => 'download_pictures',
-                'value' => '1',
-                'section' => 'entry',
-            ],
             [
                 'name' => 'carrot',
                 'value' => '1',

src/Wallabag/CoreBundle/DependencyInjection/Configuration.php

@@ -29,6 +29,9 @@ class Configuration implements ConfigurationInterface
                 ->integerNode('rss_limit')
                     ->defaultValue(50)
                 ->end()
+                ->integerNode('reading_speed')
+                    ->defaultValue(1)
+                ->end()
                 ->scalarNode('version')
                 ->end()
                 ->scalarNode('paypal_url')

src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php

@@ -19,6 +19,7 @@ class WallabagCoreExtension extends Extension
         $container->setParameter('wallabag_core.theme', $config['theme']);
         $container->setParameter('wallabag_core.language', $config['language']);
         $container->setParameter('wallabag_core.rss_limit', $config['rss_limit']);
+        $container->setParameter('wallabag_core.reading_speed', $config['reading_speed']);
         $container->setParameter('wallabag_core.version', $config['version']);
         $container->setParameter('wallabag_core.paypal_url', $config['paypal_url']);
 

src/Wallabag/CoreBundle/Entity/Config.php

@@ -40,7 +40,7 @@ class Config
      * @Assert\Range(
      *      min = 1,
      *      max = 100000,
-     *      maxMessage = "This will certainly kill the app"
+     *      maxMessage = "validator.item_per_page_too_high"
      * )
      * @ORM\Column(name="items_per_page", type="integer", nullable=false)
      */
@@ -68,11 +68,18 @@ class Config
      * @Assert\Range(
      *      min = 1,
      *      max = 100000,
-     *      maxMessage = "This will certainly kill the app"
+     *      maxMessage = "validator.rss_limit_too_hight"
      * )
      */
     private $rssLimit;
 
+    /**
+     * @var float
+     *
+     * @ORM\Column(name="reading_speed", type="float", nullable=true)
+     */
+    private $readingSpeed;
+
     /**
      * @ORM\OneToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="config")
      */
@@ -247,6 +254,30 @@ class Config
         return $this->rssLimit;
     }
 
+    /**
+     * Set readingSpeed.
+     *
+     * @param float $readingSpeed
+     *
+     * @return Config
+     */
+    public function setReadingSpeed($readingSpeed)
+    {
+        $this->readingSpeed = $readingSpeed;
+
+        return $this;
+    }
+
+    /**
+     * Get readingSpeed.
+     *
+     * @return float
+     */
+    public function getReadingSpeed()
+    {
+        return $this->readingSpeed;
+    }
+
     /**
      * @param TaggingRule $rule
      *

src/Wallabag/CoreBundle/Entity/Entry.php

@@ -7,6 +7,9 @@ use Doctrine\ORM\Mapping as ORM;
 use Hateoas\Configuration\Annotation as Hateoas;
 use JMS\Serializer\Annotation\Groups;
 use JMS\Serializer\Annotation\XmlRoot;
+use JMS\Serializer\Annotation\Exclude;
+use JMS\Serializer\Annotation\VirtualProperty;
+use JMS\Serializer\Annotation\SerializedName;
 use Symfony\Component\Validator\Constraints as Assert;
 use Wallabag\UserBundle\Entity\User;
 use Wallabag\AnnotationBundle\Entity\Annotation;
@@ -56,6 +59,8 @@ class Entry
     /**
      * @var bool
      *
+     * @Exclude
+     *
      * @ORM\Column(name="is_archived", type="boolean")
      *
      * @Groups({"entries_for_user", "export_all"})
@@ -65,6 +70,8 @@ class Entry
     /**
      * @var bool
      *
+     * @Exclude
+     *
      * @ORM\Column(name="is_starred", type="boolean")
      *
      * @Groups({"entries_for_user", "export_all"})
@@ -161,6 +168,8 @@ class Entry
     private $isPublic;
 
     /**
+     * @Exclude
+     *
      * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="entries")
      *
      * @Groups({"export_all"})
@@ -178,7 +187,7 @@ class Entry
     /*
      * @param User     $user
      */
-    public function __construct(\Wallabag\UserBundle\Entity\User $user)
+    public function __construct(User $user)
     {
         $this->user = $user;
         $this->tags = new ArrayCollection();
@@ -266,6 +275,16 @@ class Entry
         return $this->isArchived;
     }
 
+    /**
+     * @VirtualProperty
+     * @SerializedName("is_archived")
+     * @Groups({"entries_for_user", "export_all"})
+     */
+    public function is_Archived()
+    {
+        return (int) $this->isArchived();
+    }
+
     public function toggleArchive()
     {
         $this->isArchived = $this->isArchived() ^ 1;
@@ -297,6 +316,16 @@ class Entry
         return $this->isStarred;
     }
 
+    /**
+     * @VirtualProperty
+     * @SerializedName("is_starred")
+     * @Groups({"entries_for_user", "export_all"})
+     */
+    public function is_Starred()
+    {
+        return (int) $this->isStarred();
+    }
+
     public function toggleStar()
     {
         $this->isStarred = $this->isStarred() ^ 1;
@@ -336,6 +365,33 @@ class Entry
         return $this->user;
     }
 
+    /**
+     * @VirtualProperty
+     * @SerializedName("user_name")
+     */
+    public function getUserName()
+    {
+        return $this->user->getUserName();
+    }
+
+    /**
+     * @VirtualProperty
+     * @SerializedName("user_email")
+     */
+    public function getUserEmail()
+    {
+        return $this->user->getEmail();
+    }
+
+    /**
+     * @VirtualProperty
+     * @SerializedName("user_id")
+     */
+    public function getUserId()
+    {
+        return $this->user->getId();
+    }
+
     /**
      * @return string
      */

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

@@ -16,23 +16,27 @@ class ChangePasswordType extends AbstractType
     {
         $builder
             ->add('old_password', PasswordType::class, array(
-                'constraints' => new UserPassword(array('message' => 'Wrong value for your current password')),
+                'constraints' => new UserPassword(array('message' => 'validator.password_wrong_value')),
+                'label' => 'config.form_password.old_password_label',
             ))
             ->add('new_password', RepeatedType::class, array(
                 'type' => PasswordType::class,
-                'invalid_message' => 'The password fields must match.',
+                'invalid_message' => 'validator.password_must_match',
                 'required' => true,
-                'first_options' => array('label' => 'New password'),
+                'first_options' => array('label' => 'config.form_password.new_password_label'),
-                'second_options' => array('label' => 'Repeat new password'),
+                'second_options' => array('label' => 'config.form_password.repeat_new_password_label'),
                 'constraints' => array(
                     new Constraints\Length(array(
                         'min' => 8,
-                        'minMessage' => 'Password should by at least 8 chars long',
+                        'minMessage' => 'validator.password_too_short',
                     )),
                     new Constraints\NotBlank(),
                 ),
+                'label' => 'config.form_password.new_password_label',
+            ))
+            ->add('save', SubmitType::class, array(
+                'label' => 'config.form.save',
             ))
-            ->add('save', SubmitType::class)
         ;
     }
 

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

@@ -14,8 +14,8 @@ class ClientType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('redirect_uris', UrlType::class, array('required' => true, 'label' => 'Redirect URIs'))
+            ->add('redirect_uris', UrlType::class, array('required' => true, 'label' => 'developer.client.form.redirect_uris_label'))
-            ->add('save', SubmitType::class, array('label' => 'Create a new client'))
+            ->add('save', SubmitType::class, array('label' => 'developer.client.form.save_label'))
         ;
 
         $builder->get('redirect_uris')

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

@@ -33,13 +33,28 @@ class ConfigType extends AbstractType
             ->add('theme', ChoiceType::class, array(
                 'choices' => array_flip($this->themes),
                 'choices_as_values' => true,
+                'label' => 'config.form_settings.theme_label',
+            ))
+            ->add('items_per_page', null, array(
+                'label' => 'config.form_settings.items_per_page_label',
+            ))
+            ->add('reading_speed', ChoiceType::class, array(
+                'label' => 'config.form_settings.reading_speed.label',
+                'choices' => array(
+                    'config.form_settings.reading_speed.100_word' => '0.5',
+                    'config.form_settings.reading_speed.200_word' => '1',
+                    'config.form_settings.reading_speed.300_word' => '1.5',
+                    'config.form_settings.reading_speed.400_word' => '2',
+                ),
             ))
-            ->add('items_per_page')
             ->add('language', ChoiceType::class, array(
                 'choices' => array_flip($this->languages),
                 'choices_as_values' => true,
+                'label' => 'config.form_settings.language_label',
+            ))
+            ->add('save', SubmitType::class, array(
+                'label' => 'config.form.save',
             ))
-            ->add('save', SubmitType::class)
         ;
     }
 

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

@@ -14,9 +14,22 @@ class EditEntryType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('title', TextType::class, array('required' => true))
+            ->add('title', TextType::class, array(
-            ->add('is_public', CheckboxType::class, array('required' => false))
+                'required' => true,
-            ->add('save', SubmitType::class)
+                'label' => 'entry.edit.title_label',
+            ))
+            ->add('is_public', CheckboxType::class, array(
+                'required' => false,
+                'label' => 'entry.edit.is_public_label',
+            ))
+            ->add('url', TextType::class, array(
+                'disabled' => true,
+                'required' => false,
+                'label' => 'entry.edit.url_label',
+            ))
+            ->add('save', SubmitType::class, array(
+                'label' => 'entry.edit.save_label',
+            ))
         ;
     }
 

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

@@ -34,7 +34,9 @@ class EntryFilterType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('readingTime', NumberRangeFilterType::class)
+            ->add('readingTime', NumberRangeFilterType::class, array(
+                'label' => 'entry.filters.reading_time.label',
+            ))
             ->add('createdAt', DateRangeFilterType::class, array(
                     'left_date_options' => array(
                         'attr' => array(
@@ -50,6 +52,7 @@ class EntryFilterType extends AbstractType
                         'format' => 'dd/MM/yyyy',
                         'widget' => 'single_text',
                     ),
+                    'label' => 'entry.filters.created_at.label',
                 )
             )
             ->add('domainName', TextFilterType::class, array(
@@ -62,9 +65,14 @@ class EntryFilterType extends AbstractType
 
                     return $filterQuery->createCondition($expression);
                 },
+                'label' => 'entry.filters.domain_label',
+            ))
+            ->add('isArchived', CheckboxFilterType::class, array(
+                'label' => 'entry.filters.archived_label',
+            ))
+            ->add('isStarred', CheckboxFilterType::class, array(
+                'label' => 'entry.filters.starred_label',
             ))
-            ->add('isArchived', CheckboxFilterType::class)
-            ->add('isStarred', CheckboxFilterType::class)
             ->add('previewPicture', CheckboxFilterType::class, array(
                 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
                     if (false === $values['value']) {
@@ -75,10 +83,12 @@ class EntryFilterType extends AbstractType
 
                     return $filterQuery->createCondition($expression);
                 },
+                'label' => 'entry.filters.preview_picture_label',
             ))
             ->add('language', ChoiceFilterType::class, array(
                 'choices' => array_flip($this->repository->findDistinctLanguageByUser($this->user->getId())),
                 'choices_as_values' => true,
+                'label' => 'entry.filters.language_label',
             ))
         ;
     }

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

@@ -3,7 +3,6 @@
 namespace Wallabag\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\UrlType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -13,8 +12,10 @@ class NewEntryType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('url', UrlType::class, array('required' => true))
+            ->add('url', UrlType::class, array(
-            ->add('save', SubmitType::class)
+                'required' => true,
+                'label' => 'entry.new.form_new.url_label',
+            ))
         ;
     }
 

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

@@ -3,7 +3,6 @@
 namespace Wallabag\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -14,7 +13,6 @@ class NewTagType extends AbstractType
     {
         $builder
             ->add('label', TextType::class, array('required' => true))
-            ->add('save', SubmitType::class)
         ;
     }
 

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

@@ -17,22 +17,30 @@ class NewUserType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('username', TextType::class, array('required' => true))
+            ->add('username', TextType::class, array(
+                'required' => true,
+                'label' => 'config.form_new_user.username_label',
+            ))
             ->add('plainPassword', RepeatedType::class, array(
                 'type' => PasswordType::class,
-                'invalid_message' => 'The password fields must match',
+                'invalid_message' => 'validator.password_must_match',
-                'first_options' => array('label' => 'Password'),
+                'first_options' => array('label' => 'config.form_new_user.password_label'),
-                'second_options' => array('label' => 'Repeat new password'),
+                'second_options' => array('label' => 'config.form_new_user.repeat_new_password_label'),
                 'constraints' => array(
                     new Constraints\Length(array(
                         'min' => 8,
-                        'minMessage' => 'Password should by at least 8 chars long',
+                        'minMessage' => 'validator.password_too_short',
                     )),
                     new Constraints\NotBlank(),
                 ),
+                'label' => 'config.form_new_user.plain_password_label',
+            ))
+            ->add('email', EmailType::class, array(
+                'label' => 'config.form_new_user.email_label',
+            ))
+            ->add('save', SubmitType::class, array(
+                'label' => 'config.form.save',
             ))
-            ->add('email', EmailType::class)
-            ->add('save', SubmitType::class)
         ;
     }
 

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

@@ -12,8 +12,12 @@ class RssType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('rss_limit')
+            ->add('rss_limit', null, array(
-            ->add('save', SubmitType::class)
+                'label' => 'config.form_rss.rss_limit',
+            ))
+            ->add('save', SubmitType::class, array(
+                'label' => 'config.form.save',
+            ))
         ;
     }
 

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

@@ -14,12 +14,19 @@ class TaggingRuleType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('rule', TextType::class, array('required' => true))
+            ->add('rule', TextType::class, array(
-            ->add('save', SubmitType::class)
+                'required' => true,
+                'label' => 'config.form_rules.rule_label',
+            ))
+            ->add('save', SubmitType::class, array(
+                'label' => 'config.form.save',
+            ))
         ;
 
         $tagsField = $builder
-            ->create('tags', TextType::class)
+            ->create('tags', TextType::class, array(
+                'label' => 'config.form_rules.tags_label',
+            ))
             ->addModelTransformer(new StringToListTransformer(','));
 
         $builder->add($tagsField);

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

@@ -15,10 +15,19 @@ class UserInformationType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('name', TextType::class)
+            ->add('name', TextType::class, array(
-            ->add('email', EmailType::class)
+                'label' => 'config.form_user.name_label',
-            ->add('twoFactorAuthentication', CheckboxType::class, array('required' => false))
+            ))
-            ->add('save', SubmitType::class)
+            ->add('email', EmailType::class, array(
+                'label' => 'config.form_user.email_label',
+            ))
+            ->add('twoFactorAuthentication', CheckboxType::class, array(
+                'required' => false,
+                'label' => 'config.form_user.twoFactorAuthentication_label',
+            ))
+            ->add('save', SubmitType::class, array(
+                'label' => 'config.form.save',
+            ))
             ->remove('username')
             ->remove('plainPassword')
         ;

src/Wallabag/CoreBundle/Helper/ContentProxy.php

@@ -32,14 +32,21 @@ class ContentProxy
      * Fetch content using graby and hydrate given entry with results information.
      * In case we couldn't find content, we'll try to use Open Graph data.
      *
-     * @param Entry  $entry Entry to update
+     * We can also force the content, in case of an import from the v1 for example, so the function won't
-     * @param string $url   Url to grab content for
+     * fetch the content from the website but rather use information given with the $content parameter.
+     *
+     * @param Entry  $entry   Entry to update
+     * @param string $url     Url to grab content for
+     * @param array  $content An array with AT LEAST keys title, html, url, language & content_type to skip the fetchContent from the url
      *
      * @return Entry
      */
-    public function updateEntry(Entry $entry, $url)
+    public function updateEntry(Entry $entry, $url, array $content = [])
     {
-        $content = $this->graby->fetchContent($url);
+        // do we have to fetch the content or the provided one is ok?
+        if (empty($content) || false === $this->validateContent($content)) {
+            $content = $this->graby->fetchContent($url);
+        }
 
         $title = $content['title'];
         if (!$title && isset($content['open_graph']['og_title'])) {
@@ -62,7 +69,11 @@ class ContentProxy
         $entry->setLanguage($content['language']);
         $entry->setMimetype($content['content_type']);
         $entry->setReadingTime(Utils::getReadingTime($html));
-        $entry->setDomainName(parse_url($entry->getUrl(), PHP_URL_HOST));
+
+        $domainName = parse_url($entry->getUrl(), PHP_URL_HOST);
+        if (false !== $domainName) {
+            $entry->setDomainName($domainName);
+        }
 
         if (isset($content['open_graph']['og_image'])) {
             $entry->setPreviewPicture($content['open_graph']['og_image']);
@@ -113,4 +124,17 @@ class ContentProxy
             }
         }
     }
+
+    /**
+     * Validate that the given content as enough value to be used
+     * instead of fetch the content from the url.
+     *
+     * @param array $content
+     *
+     * @return bool true if valid otherwise false
+     */
+    private function validateContent(array $content)
+    {
+        return isset($content['title']) && isset($content['html']) && isset($content['url']) && isset($content['language']) && isset($content['content_type']);
+    }
 }

src/Wallabag/CoreBundle/Helper/EntriesExport.php

@@ -81,27 +81,9 @@ class EntriesExport
      */
     public function exportAs($format)
     {
-        switch ($format) {
+        $functionName = 'produce'.ucfirst($format);
-            case 'epub':
+        if (method_exists($this, $functionName)) {
-                return $this->produceEpub();
+            return $this->$functionName();
-
-            case 'mobi':
-                return $this->produceMobi();
-
-            case 'pdf':
-                return $this->producePDF();
-
-            case 'csv':
-                return $this->produceCSV();
-
-            case 'json':
-                return $this->produceJSON();
-
-            case 'xml':
-                return $this->produceXML();
-
-            case 'txt':
-                return $this->produceTXT();
         }
 
         throw new \InvalidArgumentException(sprintf('The format "%s" is not yet supported.', $format));
@@ -242,7 +224,7 @@ class EntriesExport
     /**
      * Use TCPDF to dump a .pdf file.
      */
-    private function producePDF()
+    private function producePdf()
     {
         $pdf = new \TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
 
@@ -296,7 +278,7 @@ class EntriesExport
     /**
      * Inspired from CsvFileDumper.
      */
-    private function produceCSV()
+    private function produceCsv()
     {
         $delimiter = ';';
         $enclosure = '"';
@@ -336,7 +318,7 @@ class EntriesExport
         );
     }
 
-    private function produceJSON()
+    private function produceJson()
     {
         return Response::create(
             $this->prepareSerializingContent('json'),
@@ -349,7 +331,7 @@ class EntriesExport
         );
     }
 
-    private function produceXML()
+    private function produceXml()
     {
         return Response::create(
             $this->prepareSerializingContent('xml'),
@@ -362,7 +344,7 @@ class EntriesExport
         );
     }
 
-    private function produceTXT()
+    private function produceTxt()
     {
         $content = '';
         $bar = str_repeat('=', 100);
@@ -385,6 +367,8 @@ class EntriesExport
     /**
      * Return a Serializer object for producing processes that need it (JSON & XML).
      *
+     * @param string $format
+     *
      * @return Serializer
      */
     private function prepareSerializingContent($format)

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

@@ -39,7 +39,22 @@ services:
     wallabag_core.graby:
         class: Graby\Graby
         arguments:
-            - { error_message: "wallabag can't retrieve contents for this article. Please report this issue to us." }
+            -
+                error_message: "wallabag can't retrieve contents for this article. Please report this issue to us."
+                http_client:
+                    user_agents:
+                        'lifehacker.com': 'PHP/5.2'
+                        'gawker.com': 'PHP/5.2'
+                        'deadspin.com': 'PHP/5.2'
+                        'kotaku.com': 'PHP/5.2'
+                        'jezebel.com': 'PHP/5.2'
+                        'io9.com': 'PHP/5.2'
+                        'jalopnik.com': 'PHP/5.2'
+                        'gizmodo.com': 'PHP/5.2'
+                        '.wikipedia.org': 'Mozilla/5.2'
+                        '.fok.nl': 'Googlebot/2.1'
+                        'getpocket.com': 'PHP/5.2'
+                        'iansommerville.com': 'PHP/5.2'
         calls:
             - [ setLogger, [ "@logger" ] ]
         tags:

src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/saveLink.js

@@ -78,19 +78,6 @@ $.fn.ready(function() {
     event.preventDefault();
   });
 
-  /* ==========================================================================
-   Keyboard gestion
-   ========================================================================== */
-
-  $(window).keydown(function(e){
-    if ( ( e.target.tagName.toLowerCase() !== 'input' && e.keyCode == 83 ) || (e.keyCode == 27 && $bagitForm.is(':visible') ) ) {
-      $bagit.removeClass("current");
-      $("#bagit-arrow").removeClass("arrow-down");
-      toggleSaveLinkForm();
-      return false;
-    }
-  });
-
   /* ==========================================================================
    Process all links inside an article
    ========================================================================== */

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

@@ -54,20 +54,6 @@ body.login main {
     padding: 0;
 }
 
-#warning_message {
-    position: fixed;
-    background-color: #ff6347;
-    z-index: 1000;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    color: #000;
-}
-
-#warning_message a {
-    color: #555;
-}
-
 .border-bottom {
     border-bottom: 1px solid #DDD;
 }
@@ -420,6 +406,17 @@ main ul.row {
     .reader-mode span {
         opacity: 1;
     }
+
+    .tabs {
+        display: inline-block;
+        height: auto;
+    }
+    .tab {
+        min-width: 100%;
+    }
+    .indicator {
+        display: none;
+    }
   }
 
 @media only screen and (min-width : 400px) {

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

@@ -1,130 +1,425 @@
-#Login
+security:
-Keep me logged in: 'Forbliv logget ind'
+    login:
-Forgot your password?: 'Glemt adgangskoden?'
+        # page_title: 'Welcome to wallabag!'
-Login: 'Log ind'
+        keep_logged_in: 'Forbliv logget ind'
-Back to login: 'Tilbage til login'
+        forgot_password: 'Glemt adgangskoden?'
-Send: 'Send'
+        submit: 'Log ind'
-"Enter your email address below and we'll send you password reset instructions.": "Indtast din emailadresse nedenfor, så vil du modtage instrukser om at nulstille adgangskoden."
+        # register: 'Register'
+        username: 'Brugernavn'
+        password: 'Adgangskode'
+        # cancel: 'Cancel'
+    resetting:
+        description: "Indtast din emailadresse nedenfor, så vil du modtage instrukser om at nulstille adgangskoden."
+    register:
+        # page_title: 'Create an account'
+        # go_to_account: 'Go to your account'
 
-# Menu
+menu:
-unread: 'ulæst'
+    left:
-starred: 'favoritter'
+        unread: 'Ulæst'
-archive: 'arkiv'
+        starred: 'Favoritter'
-all: 'alle artikler'
+        archive: 'Arkiv'
-tags: 'tags'
+        all_articles: 'Alle artikler'
-config: 'Opsætning'
+        config: 'Opsætning'
-howto: 'how-to'
+        tags: 'Tags'
-logout: 'log ud'
+        # internal_settings: 'Internal Settings'
-Filtered: 'Filtreret'
+        # import: 'Import'
-About: 'Om'
+        howto: 'KUow-to'
+        # developer: 'Developer'
+        logout: 'Log ud'
+        about: 'Om'
+        search: 'Søg'
+        # save_link: 'Save a link'
+        back_to_unread: 'Tilbage til de ulæste artikler'
+    top:
+        add_new_entry: 'Tilføj ny artikel'
+        search: 'Søg'
+        filter_entries: 'Filtrer artikler'
+        # export: 'Export'
+    search_form:
+        input_label: 'Indtast søgning'
 
-# Header
+footer:
-Back to unread articles: 'Tilbage til de ulæste artikler'
+    wallabag:
-Add a new entry: 'Tilføj ny artikel'
+        # elsewhere: 'Take wallabag with you'
-Search: 'Søg'
+        # social: 'Social'
-Filter entries: 'Filtrer artikler'
+        # powered_by: 'powered by'
-Enter your search here: 'Indtast søgning'
+        about: 'Om'
-Save new entry: 'Gem ny artikel'
 
-# Config screen
+config:
-Settings: 'Indstillinger'
+    page_title: 'Opsætning'
-User information: 'Brugeroplysninger'
+    tab_menu:
-Password: 'Adgangskode'
+        settings: 'Indstillinger'
-RSS: 'RSS'
+        rss: 'RSS'
-Add a user: 'Tilføj bruger'
+        user_info: 'Brugeroplysninger'
-Theme: 'Tema'
+        password: 'Adgangskode'
-Items per page: 'Poster pr. side'
+        # rules: 'Tagging rules'
-Language: 'Sprog'
+        new_user: 'Tilføj bruger'
-Save: 'Gem'
+    form:
-RSS token: 'RSS-Token'
+        save: 'Gem'
-Name: 'Navn'
+    form_settings:
-Email: 'Emailadresse'
+        theme_label: 'Tema'
-No token: 'Intet token'
+        items_per_page_label: 'Poster pr. side'
-Reset your token: 'Nulstil token'
+        language_label: 'Sprog'
-Create your token: 'Opret token'
+        reading_speed:
-Rss limit: 'RSS-grænse'
+            # label: 'Reading speed'
-RSS links: 'RSS-Links'
+            # help_message: 'You can use online tools to estimate your reading speed:'
-'RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.': 'RSS-feeds fra wallabag gør det muligt at læse de artikler, der gemmes i wallabag, med din RSS-læser. Det kræver, at du genererer et token først.'
+            # 100_word: 'I read ~100 words per minute'
-Old password: 'Gammel adgangskode'
+            # 200_word: 'I read ~200 words per minute'
-New password: 'Ny adgangskode'
+            # 300_word: 'I read ~300 words per minute'
-Repeat new password: 'Gentag adgangskode'
+            # 400_word: 'I read ~400 words per minute'
-Username: 'Brugernavn'
+    form_rss:
+        description: 'RSS-feeds fra wallabag gør det muligt at læse de artikler, der gemmes i wallabag, med din RSS-læser. Det kræver, at du genererer et token først.'
+        token_label: 'RSS-Token'
+        no_token: 'Intet token'
+        token_create: 'Opret token'
+        token_reset: 'Nulstil token'
+        rss_links: 'RSS-Links'
+        rss_link:
+            unread: 'ulæst'
+            starred: 'favoritter'
+            archive: 'arkiv'
+        # rss_limit: 'Number of items in the feed'
+    form_user:
+        # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion"
+        name_label: 'Navn'
+        email_label: 'Emailadresse'
+        # twoFactorAuthentication_label: 'Two factor authentication'
+    form_password:
+        old_password_label: 'Gammel adgangskode'
+        new_password_label: 'Ny adgangskode'
+        repeat_new_password_label: 'Gentag adgangskode'
+    form_rules:
+        # if_label: 'if'
+        # then_tag_as_label: 'then tag as'
+        # delete_rule_label: 'delete'
+        # rule_label: 'Rule'
+        # tags_label: 'Tags'
+        # faq:
+        #     title: 'FAQ'
+        #     tagging_rules_definition_title: 'What does « tagging rules » mean?'
+        #     tagging_rules_definition_description: 'They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.'
+        #     how_to_use_them_title: 'How do I use them?'
+        #     how_to_use_them_description: 'Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »'
+        #     variables_available_title: 'Which variables and operators can I use to write rules?'
+        #     variables_available_description: 'The following variables and operators can be used to create tagging rules:'
+        #     meaning: 'Meaning'
+        #     variable_description:
+        #         label: 'Variable'
+        #         title: 'Title of the entry'
+        #         url: 'URL of the entry'
+        #         isArchived: 'Whether the entry is archived or not'
+        #         isStarred: 'Whether the entry is starred or not'
+        #         content: "The entry's content"
+        #         language: "The entry's language"
+        #         mimetype: "The entry's mime-type"
+        #         readingTime: "The estimated entry's reading time, in minutes"
+        #         domainName: 'The domain name of the entry'
+        #     operator_description:
+        #         label: 'Operator'
+        #         less_than: 'Less than...'
+        #         strictly_less_than: 'Strictly less than...'
+        #         greater_than: 'Greater than...'
+        #         strictly_greater_than: 'Strictly greater than...'
+        #         equal_to: 'Equal to...'
+        #         not_equal_to: 'Not equal to...'
+        #         or: 'One rule OR another'
+        #         and: 'One rule AND another'
+        #         matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
+    form_new_user:
+        username_label: 'Brugernavn'
+        password_label: 'Adgangskode'
+        repeat_new_password_label: 'Gentag adgangskode'
+        plain_password_label: '????'
+        email_label: 'Emailadresse'
 
-# Entries
+entry:
-'estimated reading time': 'estimeret læsetid'
+    page_titles:
-original: original
+        # unread: 'Unread entries'
-Toggle mark as read: 'Marker som læst'
+        # starred: 'Starred entries'
-Toggle favorite: 'Skift favoritstatus'
+        # archived: 'Archived entries'
-Delete: 'Slet'
+        # filtered: 'Filtered entries'
+    list:
+        # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
+        reading_time: 'estimeret læsetid'
+        reading_time_minutes: 'estimeret læsetid: %readingTime% min'
+        reading_time_less_one_minute: 'estimeret læsetid: <small class="inferieur">&lt;</small> 1 min'
+        original_article: 'original'
+        toogle_as_read: 'Marker som læst'
+        toogle_as_star: 'Skift favoritstatus'
+        delete: 'Slet'
+        # export_title: 'Export'
+    filters:
+        title: 'Filtre'
+        status_label: 'Status'
+        archived_label: 'Arkiveret'
+        starred_label: 'Favorit'
+        preview_picture_label: 'Har et vist billede'
+        preview_picture_help: 'Forhåndsvis billede'
+        language_label: 'Sprog'
+        reading_time:
+            label: 'Læsetid i minutter'
+            from: 'fra'
+            to: 'til'
+        domain_label: 'Domænenavn'
+        created_at:
+            label: 'Oprettelsesdato'
+            from: 'fra'
+            to: 'til'
+        action:
+            clear: 'Ryd'
+            filter: 'Filter'
+    view:
+        left_menu:
+            # back_to_top: 'Back to top'
+            back_to_homepage: 'Tilbage'
+            set_as_read: 'Marker som læst'
+            # set_as_unread: 'Mark as unread'
+            set_as_favorite: 'Marker som favorit'
+            view_original_article: 'Originalartikel'
+            # re_fetch_content: 'Re-fetch content'
+            delete: 'Slet'
+            add_a_tag: 'Tliføj et tag'
+            share_content: 'Deling'
+            # share_email_label: 'Email'
+            download: 'Download'
+            # print: 'Print'
+            problem:
+                label: 'Problemer?'
+                description: 'Vises artiklen forkert?'
+        edit_title: 'Rediger titel'
+        original_article: 'original'
+        # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations'
+    new:
+        page_title: 'Gem ny artikel'
+        placeholder: 'http://website.com'
+        form_new:
+            url_label: Url
+    edit:
+        # page_title: 'Edit an entry'
+        # title_label: 'Title'
+        url_label: 'Url'
+        # is_public_label: 'Public'
+        save_label: 'Gem'
 
-# Filters
+about:
-Filters: 'Filtre'
+    page_title: 'Om'
-Status: 'Status'
+    top_menu:
-Archived: 'Arkiveret'
+        who_behind_wallabag: 'Hvem står bag wallabag'
-Starred: 'Favorit'
+        getting_help: 'Find hjælp'
-Preview picture: 'Forhåndsvis billede'
+        helping: 'Hjælp wallabag'
-Has a preview picture: 'Har et vist billede'
+        contributors: 'Bidragsydere'
-Reading time in minutes: 'Læsetid i minutter'
+        # third_party: 'Third-party libraries'
-from: 'fra'
+    who_behind_wallabag:
-to: 'til'
+        developped_by: 'Udviklet af'
-website.com: 'website.com'
+        website: 'Hjemmeside'
-Domain name: 'Domænenavn'
+        many_contributors: 'Og mange andre bidragsydere ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">på Github</a>'
-Creation date: 'Oprettelsesdato'
+        project_website: 'Projektets hjemmeside'
-dd/mm/yyyy: 'dd.mm.åååå'
+        license: 'Licens'
-Clear: 'Ryd'
+        version: 'Version'
-Filter: 'Filter'
+    getting_help:
+        documentation: 'Dokumentation'
+        bug_reports: 'Bugs'
+        support: '<a href="https://support.wallabag.org">På vor support-side</a> eller <a href="https://github.com/wallabag/wallabag/issues">på GitHub</a>'
+    helping:
+        description: 'wallabag er gratis og Open source. Du kan hjælpe os:'
+        by_contributing: 'ved at bidrage til projektet:'
+        by_contributing_2: 'et Github-issue fortæller om alt, hvad vi har brug for:'
+        by_paypal: 'via Paypal'
+    contributors:
+        # description: 'Thank you to contributors on wallabag web application'
+    third_party:
+        # description: 'Here are the list of third-party libraries used in wallabag (with their licenses):'
+        # package: 'Package'
+        license: 'Licens'
 
-# About
+howto:
-Who is behind wallabag: "hvem står bag wallabag"
+    page_title: 'How-to'
-Getting help: "Find hjælp"
+    # page_description: 'There are several ways to save an article:'
-Helping wallabag: "hjælp wallabag"
+    top_menu:
-Developed by: "Udviklet af"
+        browser_addons: 'Browserudvidelser'
-website: "Hjemmeside"
+        mobile_apps: 'Apps'
-And many others contributors ♥: "Og mange andre bidragsydere ♥"
+        bookmarklet: 'Bookmarklet'
-on GitHub: "på GitHub"
+    form:
-Project website: "Projektets hjemmeside"
+        description: 'Tak gennem denne formular'
-License: "Licens"
+    browser_addons:
-Version: "Version"
+        firefox: 'Standardudvidelse til Firefox'
-Documentation: "Dokumentation"
+        chrome: 'Chrome-udvidelse'
-Bug reports: "Bugs"
+    mobile_apps:
-On our support website: "På vor support-side"
+        android:
-or: "eller"
+            via_f_droid: 'via F-Droid'
-"wallabag is free and opensource. You can help us:": "wallabag er gratis og Open source. Du kan hjælpe os:"
+            via_google_play: 'via Google Play'
-"by contributing to the project:": "ved at bidrage til projektet:"
+        # ios: 'on the iTunes Store'
-an issue lists all our needs: "et Github-issue fortæller om alt, hvad vi har brug for:"
+        # windows: 'on the Microsoft Store'
-via Paypal: "via PayPal"
+    bookmarklet:
+        description: 'Træk dette link til din bogmærkeliste:'
 
-# Howto
+quickstart:
-Form: Formular
+    # page_title: 'Quickstart'
-Thanks to this form: "Tak gennem denne formular"
+    # intro:
-Browser addons: "Browserudvidelser"
+    #     title: 'Welcome to wallabag!'
-Mobile apps: "Apps"
+    #     paragraph_1: "We'll accompany you to visit wallabag and show you some features which can interest you."
-Bookmarklet: "Bookmarklet"
+    #     paragraph_2: 'Follow us!'
-Standard Firefox Add-On: "Standardudvidelse til Firefox"
+    # configure:
-Chrome Extension: "Chrome-udvidelse"
+    #     title: 'Configure the application'
-download the application: "Download"
+    #     language: 'Change language and design'
-"Drag &amp; drop this link to your bookmarks bar:": "Træk dette link til din bogmærkeliste:"
+    #     rss: 'Enable RSS feeds'
+    #     tagging_rules: 'Write rules to automatically tag your articles'
+    # admin:
+    #     title: 'Administration'
+    #     description: 'As an administrator, you have privileges on wallabag. You can:'
+    #     new_user: 'Create a new user'
+    #     analytics: 'Configure analytics'
+    #     sharing: 'Enable some parameters about article sharing'
+    #     export: 'Configure export'
+    #     import: 'Configure import'
+    # first_steps:
+    #     title: 'First steps'
+    #     new_article: 'Save your first article'
+    #     unread_articles: 'And classify it!'
+    # migrate:
+    #     title: 'Migrate from an existing service'
+    #     description: "Are you using another service? We'll help you to retrieve your data on wallabag."
+    #     pocket: 'Migrate from Pocket'
+    #     wallabag_v1: 'Migrate from wallabag v1'
+    #     wallabag_v2: 'Migrate from wallabag v2'
+    # developer:
+    #     title: 'Developers'
+    #     create_application: 'Create your third application'
+    # docs:
+    #     title: 'Full documentation'
+    #     annotate: 'Annotate your article'
+    #     export: 'Convert your articles into ePUB or PDF'
+    #     search_filters: 'See how you can look for an article by using search engine and filters'
+    #     fetching_errors: 'What can I do if an article encounters errors during fetching?'
+    #     all_docs: 'And so many other articles!'
+    # support:
+    #     title: 'Support'
+    #     description: 'If you need some help, we are here for you.'
+    #     github: 'On GitHub'
+    #     email: 'By email'
+    #     gitter: 'On Gitter'
 
-# Flash messages
+tag:
-Information updated: "Oplysninger opdateret"
+    page_title: 'Tags'
-"Config saved. Some parameters will be considered after disconnection.": "Opsætning gemt. Visse ændringer vil først fremgå ved næste login."
+    list:
-RSS information updated: "RSS-oplysninger opdateret"
+        # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
-Password updated: "Adgangskode opdateret"
-Entry starred: "Artikel markeret som favorit"
-Entry unstarred: "Artikel ikke længere markeret som favorit"
-Entry archived: "Artikel arkiveret"
-Entry unarchived: "Artikel ikke længere arkiveret"
-Entry deleted: "Artikel slettet"
 
-# Entry
+import:
-Mark as read: 'Marker som læst'
+    # page_title: 'Import'
-Favorite: 'Marker som favorit'
+    # page_description: 'Welcome to wallabag importer. Please select your previous service that you want to migrate.'
-back: 'tilbage'
+    # action:
-original article: 'Originalartikel'
+    #     import_contents: 'Import contents'
-Add a tag: 'Tliføj et tag'
+    # form:
-Share: 'Deling'
+    #     mark_as_read_title: 'Mark all as read?'
-Download: 'Download'
+    #     mark_as_read_label: 'Mark all imported entries as read'
-Does this article appear wrong?: "Vises artiklen forkert?"
+    #     file_label: 'File'
-Problems?: 'Problemer?'
+    #     save_label: 'Upload file'
-Edit title: "Rediger titel"
+    # pocket:
+    #     page_title: 'Import > Pocket'
+    #     description: "This importer will import all your Pocket data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag."
+    #     config_missing:
+    #         description: "Pocket import isn't configured."
+    #         admin_message: 'You need to define %keyurls%a pocket_consumer_key%keyurle%.'
+    #         user_message: 'Your server admin needs to define an API Key for Pocket.'
+    #     authorize_message: 'You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.'
+    #     connect_to_pocket: 'Connect to Pocket and import data'
+    # wallabag_v1:
+    #     page_title: 'Import > Wallabag v1'
+    #     description: 'This importer will import all your wallabag v1 articles. On your config page, click on "JSON export" in the "Export your wallabag data" section. You will have a "wallabag-export-1-xxxx-xx-xx.json" file.'
+    #     how_to: 'Please select your wallabag export and click on the below button to upload and import it.'
+    # wallabag_v2:
+    #     page_title: 'Import > Wallabag v2'
+    #     description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.'
 
+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: '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:
+            config_saved: 'Opsætning gemt. Visse ændringer vil først fremgå ved næste login.'
+            password_updated: 'Adgangskode opdateret'
+            # password_not_updated_demo: "In demonstration mode, you can't change password for this user."
+            user_updated: 'Oplysninger opdateret'
+            rss_updated: 'RSS-oplysninger opdateret'
+            # tagging_rules_updated: 'Tagging rules updated'
+            # tagging_rules_deleted: 'Tagging rule deleted'
+            # user_added: 'User "%username%" added'
+            # rss_token_updated: 'RSS token updated'
+    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_archived: 'Artikel arkiveret'
+            entry_unarchived: 'Artikel ikke længere arkiveret'
+            entry_starred: 'Artikel markeret som favorit'
+            entry_unstarred: 'Artikel ikke længere markeret som favorit'
+            entry_deleted: 'Artikel slettet'
+    tag:
+        notice:
+            # tag_added: 'Tag added'
+    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.'
+    developer:
+        notice:
+            # client_created: 'New client created.'
+            # client_deleted: 'Client deleted'

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

@@ -1,129 +1,425 @@
-#Login
+security:
-Keep me logged in: 'Angemeldet bleiben'
+    login:
-Forgot your password?: 'Kennwort vergessen?'
+        page_title: 'Willkommen bei wallabag!'
-Login: 'Anmelden'
+        keep_logged_in: 'Angemeldet bleiben'
-Back to login: 'Zurück zur Anmeldung'
+        forgot_password: 'Kennwort vergessen?'
-Send: 'Senden'
+        submit: 'Anmelden'
-"Enter your email address below and we'll send you password reset instructions.": "Gib unten deine E-Mail-Adresse ein und wir senden dir eine Anleitung für das Zurücksetzen deines Kennworts."
+        register: 'Registrieren'
+        username: 'Benutzername'
+        password: 'Kennwort'
+        cancel: 'Abbrechen'
+    resetting:
+        description: "Gib unten deine E-Mail-Adresse ein und wir senden dir eine Anleitung für das Zurücksetzen deines Kennworts."
+    register:
+        page_title: 'Account erstellen'
+        go_to_account: 'Gehe zu deinem Account'
 
-# Menu
+menu:
-unread: 'ungelesen'
+    left:
-starred: 'favoriten'
+        unread: 'Ungelesen'
-archive: 'archiv'
+        starred: 'Favoriten'
-all: 'alle artikel'
+        archive: 'Archiv'
-tags: 'tags'
+        all_articles: 'Alle Artikel'
-config: 'konfiguration'
+        config: 'Konfiguration'
-howto: 'how-to'
+        tags: 'Tags'
-logout: 'abmelden'
+        internal_settings: 'Interne Einstellungen'
-Filtered: 'Gefiltert'
+        import: 'Importieren'
-About: 'Über'
+        howto: 'How-To'
+        developer: 'Entwickler'
+        logout: 'Abmelden'
+        about: 'Über'
+        search: 'Suche'
+        save_link: 'Link speichern'
+        back_to_unread: 'Zurück zu ungelesenen Artikeln'
+    top:
+        add_new_entry: 'Neuen Artikel hinzufügen'
+        search: 'Suche'
+        filter_entries: 'Artikel filtern'
+        export: 'Exportieren'
+    search_form:
+        input_label: 'Suchbegriff hier eingeben'
 
-# Header
+footer:
-Back to unread articles: 'Zurück zu ungelesenen Artikeln'
+    wallabag:
-Add a new entry: 'Neuen Artikel hinzufügen'
+        elsewhere: 'Nimm wallabag mit dir mit'
-Search: 'Suche'
+        social: 'Soziales'
-Filter entries: 'Artikel filtern'
+        powered_by: 'angetrieben von'
-Enter your search here: 'Suchbegriff hier eingeben'
+        about: 'Über'
-Save new entry: 'Neuen Artikel speichern'
 
-# Config screen
+config:
-Settings: 'Einstellungen'
+    page_title: 'Einstellungen'
-User information: 'Benutzer-Information'
+    tab_menu:
-Password: 'Kennwort'
+        settings: 'Einstellungen'
-RSS: 'RSS'
+        rss: 'RSS'
-Add a user: 'Benutzer hinzufügen'
+        user_info: 'Benutzer-Information'
-Theme: 'Theme'
+        password: 'Kennwort'
-Items per page: 'Einträge pro Seite'
+        rules: 'Tagging-Regeln'
-Language: 'Sprache'
+        new_user: 'Benutzer hinzufügen'
-Save: 'Speichern'
+    form:
-RSS token: 'RSS-Token'
+        save: 'Speichern'
-Name: 'Name'
+    form_settings:
-Email: 'E-Mail-Adresse'
+        theme_label: 'Theme'
-No token: 'Kein Token'
+        items_per_page_label: 'Einträge pro Seite'
-Reset your token: 'Token zurücksetzen'
+        language_label: 'Sprache'
-Create your token: 'Token erstellen'
+        reading_speed:
-Rss limit: 'RSS-Limit'
+            label: 'Lesegeschwindigkeit'
-RSS links: 'RSS-Links'
+            help_message: 'Du kannst Online-Tools nutzen, um deine Lesegeschwindigkeit herauszufinden.'
-'RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.': 'Die RSS-Feeds von wallabag erlauben es dir, deine gespeicherten Artikel mit deinem bevorzugten RSS-Reader zu lesen. Vorher musst du jedoch einen Token erstellen.'
+            100_word: 'Ich lese ~100 Wörter pro Minute'
-Old password: 'Altes Kennwort'
+            200_word: 'Ich lese ~200 Wörter pro Minute'
-New password: 'Neues Kennwort'
+            300_word: 'Ich lese ~300 Wörter pro Minute'
-Repeat new password: 'Neues Kennwort wiederholen'
+            400_word: 'Ich lese ~400 Wörter pro Minute'
-Username: 'Benutzername'
+    form_rss:
+        description: 'Die RSS-Feeds von wallabag erlauben es dir, deine gespeicherten Artikel mit deinem bevorzugten RSS-Reader zu lesen. Vorher musst du jedoch einen Token erstellen.'
+        token_label: 'RSS-token'
+        no_token: 'Kein Token'
+        token_create: 'Token erstellen'
+        token_reset: 'Token zurücksetzen'
+        rss_links: 'RSS-Links'
+        rss_link:
+            unread: 'ungelesen'
+            starred: 'favoriten'
+            archive: 'archiv'
+        rss_limit: 'Anzahl der Einträge im Feed'
+    form_user:
+        two_factor_description: "Wenn du die Zwei-Faktor-Authentifizierung aktivierst, erhältst du eine E-Mail mit einem Code bei jeder nicht vertraulichen Verbindung"
+        name_label: 'Name'
+        email_label: 'E-Mail-Adresse'
+        twoFactorAuthentication_label: 'Zwei-Faktor-Authentifizierung'
+    form_password:
+        old_password_label: 'Altes Kennwort'
+        new_password_label: 'Neues Kennwort'
+        repeat_new_password_label: 'Neues Kennwort wiederholen'
+    form_rules:
+        if_label: 'Wenn'
+        then_tag_as_label: 'dann tagge als'
+        delete_rule_label: 'löschen'
+        rule_label: 'Regel'
+        tags_label: 'Tags'
+        faq:
+            title: 'FAQ'
+            tagging_rules_definition_title: 'Was bedeuten die "Tagging-Regeln"?'
+            tagging_rules_definition_description: 'Dies sind Regeln von wallabag, um neu hinzugefügte Einträge autmatisch zu taggen.<br />Jedes Mal, wenn ein neuer Eintrag hinzufügt wird, werden die Tagging-Regeln angewandt. Dies erleichtert dir die Arbeit, deine Einträge manuell zu klassifizieren.'
+            how_to_use_them_title: 'Wie nutze ich sie?'
+            how_to_use_them_description: 'Nehmen wir an, du möchtest deine Einträge als "<i>schnell lesbar</i>" taggen, wenn die Lesezeit kürzer als drei Minuten ist.<br />In diesem Falle solltest du "readingTime &lt;= 3" in das <i>Regel</i>-Feld und "<i>schnell lesbar</i>" in das <i>Tags</i>-Feld schreiben.<br />Mehrere Tags können gleichzeitig hinzugefügt werden, indem sie durch ein Kommata getrennt werden: "<i>schnell lesbar, interessant</i>"<br />Komplexe Regeln können durch vordefinierte Operatoren geschrieben werden: if "<i>readingTime &gt;= 5 AND domainName = "github.com"</i>" then tag as "<i>long reading, github </i>"'
+            variables_available_title: 'Welche Variablen und Operatoren kann ich nutzen, um Regeln zu schreiben?'
+            variables_available_description: 'Die folgenden Variablen und Operatoren können genutzt werden, um Tagging-Regeln zu erstellen:'
+            meaning: 'Bedeutung'
+            variable_description:
+                label: 'Variable'
+                title: 'Titel des Eintrags'
+                url: 'URL des Eintrags'
+                isArchived: 'gibt an, ob der Eintrag archiviert ist oder nicht'
+                isStarred: 'gibt an, ob der Eintrag favorisiert ist oder nicht'
+                content: "Inhalt des Eintrags"
+                language: "Sprache des Eintrags"
+                mimetype: "MIME-Typ des Eintrags"
+                readingTime: "Die geschätzte Lesezeit in Minuten"
+                domainName: 'Der Domain-Name des Eintrags'
+            operator_description:
+                label: 'Operator'
+                less_than: 'Weniger oder gleich als…'
+                strictly_less_than: 'Weniger als…'
+                greater_than: 'Größer oder gleich als…'
+                strictly_greater_than: 'Größer als…'
+                equal_to: 'gleich'
+                not_equal_to: 'ungleich'
+                or: 'Eine Regel ODER die andere'
+                and: 'Eine Regel UND eine andere'
+                matches: 'Tests, ob eine <i>Variable</i> auf eine <i>Suche</i> zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).<br />Beispiel: <code>title matches "Fußball"</code>'
+    form_new_user:
+        username_label: 'Benutzername'
+        password_label: 'Kennwort'
+        repeat_new_password_label: 'Neues Kennwort wiederholen'
+        plain_password_label: '????'
+        email_label: 'E-Mail-Adresse'
 
-# Entries
+entry:
-'estimated reading time': 'geschätzte Lesezeit'
+    page_titles:
-original: original
+        unread: 'Ungelesene Einträge'
-Toggle mark as read: 'Gelesen-Status ändern'
+        starred: 'Favorisierte Einträge'
-Toggle favorite: 'Favoriten-Status ändern'
+        archived: 'Archivierte Einträge'
-Delete: 'Löschen'
+        filtered: 'Gefilterte Einträge'
+    list:
+        number_on_the_page: '{0} Es gibt keine Einträge.|{1} Es gibt einen Eintrag.|]1,Inf[ Es gibt %count% Einträge.'
+        reading_time: 'geschätzte Lesezeit'
+        reading_time_minutes: 'geschätzte Lesezeit: %readingTime% min'
+        reading_time_less_one_minute: 'geschätzte Lesezeit: <small class="inferieur">&lt;</small> 1 min'
+        original_article: 'original'
+        toogle_as_read: 'Gelesen-Status ändern'
+        toogle_as_star: 'Favoriten-Status ändern'
+        delete: 'Löschen'
+        export_title: 'Exportieren'
+    filters:
+        title: 'Filters'
+        status_label: 'Status'
+        archived_label: 'Archiviert'
+        starred_label: 'Favorisiert'
+        preview_picture_label: 'Vorschaubild vorhanden'
+        preview_picture_help: 'Vorschaubild'
+        language_label: 'Sprache'
+        reading_time:
+            label: 'Lesezeit in Minuten'
+            from: 'von'
+            to: 'bis'
+        domain_label: 'Domain-Name'
+        created_at:
+            label: 'Erstellungsdatum'
+            from: 'von'
+            to: 'bis'
+        action:
+            clear: 'Zurücksetzen'
+            filter: 'Filter'
+    view:
+        left_menu:
+            back_to_top: 'Nach oben'
+            back_to_homepage: 'Zurück'
+            set_as_read: 'Als gelesen markieren'
+            set_as_unread: 'Als ungelesen markieren'
+            set_as_favorite: 'Favorisieren'
+            view_original_article: 'Original-Artikel'
+            re_fetch_content: 'Inhalt neu laden'
+            delete: 'Löschen'
+            add_a_tag: 'Tag hinzufügen'
+            share_content: 'Teilen'
+            share_email_label: 'E-Mail'
+            download: 'Herunterladen'
+            print: 'Drucken'
+            problem:
+                label: 'Probleme?'
+                description: 'Erscheint dieser Artikel falsch?'
+        edit_title: 'Titel ändern'
+        original_article: 'original'
+        annotations_on_the_entry: '{0} Keine Anmerkungen|{1} Eine Anmerkung|]1,Inf[ %nbAnnotations% Anmerkungen'
+    new:
+        page_title: 'Neuen Artikel speichern'
+        placeholder: 'https://website.de'
+        form_new:
+            url_label: URL
+    edit:
+        page_title: 'Eintrag bearbeiten'
+        title_label: 'Titel'
+        url_label: 'URL'
+        is_public_label: 'Öffentlich'
+        save_label: 'Speichern'
 
-# Filters
+about:
-Filters: 'Filter'
+    page_title: 'Über'
-Status: 'Status'
+    top_menu:
-Archived: 'Archiviert'
+        who_behind_wallabag: 'Wer steht hinter wallabag'
-Starred: 'Favorisiert'
+        getting_help: 'Hilfe bekommen'
-Preview picture: 'Vorschaubild'
+        helping: 'wallabag unterstützen'
-Has a preview picture: 'Vorschaubild vorhanden'
+        contributors: 'Unterstützer'
-Reading time in minutes: 'Lesezeit in Minuten'
+        third_party: 'Third-party libraries'
-from: 'von'
+    who_behind_wallabag:
-to: 'bis'
+        developped_by: 'Entwickelt von'
-website.com: 'website.com'
+        website: 'Webseite'
-Domain name: 'Domain-Name'
+        many_contributors: 'Und vielen anderen Unterstützern ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">auf Github</a>'
-Creation date: 'Erstellungsdatum'
+        project_website: 'Projektwebseite'
-dd/mm/yyyy: 'dd.mm.yyyy'
+        license: 'Lizenz'
-Clear: 'zurücksetzen'
+        version: 'Version'
-Filter: 'Filter'
+    getting_help:
+        documentation: 'Dokumentation'
+        bug_reports: 'Bugs'
+        support: '<a href="https://support.wallabag.org">Auf unserer Support-Webseite</a> oder <a href="https://github.com/wallabag/wallabag/issues">auf GitHub</a>'
+    helping:
+        description: 'wallabag ist kostenlos und Open-Source. Du kannst uns helfen:'
+        by_contributing: 'indem du zu dem Projekt beiträgst:'
+        by_contributing_2: 'ein Issue listet alle unsere Bedürfnisse:'
+        by_paypal: 'via PayPal'
+    contributors:
+        description: 'Ein Dankeschön an die Unterstützer von wallabag'
+    third_party:
+        description: 'Hier ist eine Liste der verwendeten Bibliotheken in wallabag (mit den jeweiligen Lizenzen):'
+        package: 'Paket'
+        license: 'Lizenz'
 
-# About
+howto:
-Who is behind wallabag: "Wer steht hinter wallabag"
+    page_title: 'How-To'
-Getting help: "Hilfe bekommen"
+    page_description: 'Es gibt mehrere Möglichkeiten, einen Artikel zu speichern:'
-Helping wallabag: "wallabag unterstützen"
+    top_menu:
-Developed by: "Entwickelt von"
+        browser_addons: 'Browser-Addons'
-website: "Webseite"
+        mobile_apps: 'Apps'
-And many others contributors ♥: "Und vielen anderen Unterstützern ♥"
+        bookmarklet: 'Bookmarklet'
-on GitHub: "auf GitHub"
+    form:
-Project website: "Projektwebseite"
+        description: 'Danke an dieses Formular'
-License: "Lizenz"
+    browser_addons:
-Version: "Version"
+        firefox: 'Firefox-Erweiterung'
-Documentation: "Dokumentation"
+        chrome: 'Chrome-Erweiterung'
-Bug reports: "Bugs"
+    mobile_apps:
-On our support website: "Auf unserer Support-Webseite"
+        android:
-or: "oder"
+            via_f_droid: 'via F-Droid'
-"wallabag is free and opensource. You can help us:": "wallabag ist kostenlos und Open-Source. Du kannst uns helfen:"
+            via_google_play: 'via Google Play'
-"by contributing to the project:": "indem du zu dem Projekt beiträgst:"
+        ios: 'im iTunes-Store'
-an issue lists all our needs: "ein Issue listet alle unsere Bedürfnisse:"
+        windows: 'im Microsoft-Store'
-via Paypal: "via PayPal"
+    bookmarklet:
+        description: 'Ziehe diesen Link in deine Lesezeichenleiste:'
 
-# Howto
+quickstart:
-Form: Formular
+    page_title: 'Schnelleinstieg'
-Thanks to this form: "Danke an dieses Formular"
+    intro:
-Browser addons: "Browser-Addons"
+        title: 'Willkommen zu wallabag!'
-Mobile apps: "Apps"
+        paragraph_1: "Wir werden dich bei der Benutzung von wallabag begleiten und dir einige Funktionen zeigen, die dich interessieren könnten."
-Bookmarklet: "Bookmarklet"
+        paragraph_2: 'Folge uns!'
-Standard Firefox Add-On: "Firefox-Erweiterung"
+    configure:
-Chrome Extension: "Chrome-Erweiterung"
+        title: 'Anwendung konfigurieren'
-download the application: "herunterladen"
+        language: 'Sprache und Design ändern'
-"Drag &amp; drop this link to your bookmarks bar:": "Ziehe diesen Link in deine Lesezeichenleiste:"
+        rss: 'RSS-Feeds aktivieren'
+        tagging_rules: 'Schreibe Regeln, um deine Beiträge automatisch zu taggen (verschlagworten)'
+    admin:
+        title: 'Administration'
+        description: 'Als Adminstrator hast du einige Privilegien. Du kannst:'
+        new_user: 'Einen neuen Nutzer anlegen'
+        analytics: 'das Tracking konfigurieren'
+        sharing: 'Einige Parameter für das Teilen von Artikel setzen'
+        export: 'Export-Einstellungen ändern'
+        import: 'Import-Einstellungen ändern'
+    first_steps:
+        title: 'Erste Schritte'
+        new_article: 'Speichere deinen ersten Artikel'
+        unread_articles: 'Und klassifiziere ihn!'
+    migrate:
+        title: 'Von einem anderen Dienst migrieren'
+        description: "Du nutzt einen anderen Dienst? Wir helfen dir, um deine Daten zu wallabag zu transportieren."
+        pocket: 'von Pocket migrieren'
+        wallabag_v1: 'von wallabag v1 migrieren'
+        wallabag_v2: 'von wallabag v2 migrieren'
+    developer:
+        title: 'Entwickler'
+        create_application: 'Erstelle eine Anwendung und nutze die wallabag API'
+    docs:
+        title: 'Komplette Dokumentation'
+        annotate: 'Anmerkungen zu Artikeln hinzufügen'
+        export: 'Artikel nach ePUB oder PDF konvertieren'
+        search_filters: 'Schau nach, wie du nach einem Artikel über die Such- und Filterfunktion suchen kannst'
+        fetching_errors: 'Was kann ich machen, wenn ein Artikel Fehler beim Herunterladen des Inhalts zeigt?'
+        all_docs: 'Und viele weitere Artikel!'
+    support:
+        title: 'Support'
+        description: 'Wenn du Hilfe brauchst, wir sind für dich da.'
+        github: 'Auf GitHub'
+        email: 'Über E-Mail'
+        gitter: 'Auf Gitter'
 
-# Flash messages
+tag:
-Information updated: "Information aktualisiert"
+    page_title: 'Tags'
-"Config saved. Some parameters will be considered after disconnection.": "Konfiguration gespeichert. Einige Einstellungen werden erst nach einer erneuten Anmeldung übernommen."
+    list:
-RSS information updated: "RSS-Informationen aktualisiert"
+        number_on_the_page: '{0} Es gibt keine Tags.|{1} Es gibt einen Tag.|]1,Inf[ Es gibt %count% Tags.'
-Password updated: "Kennwort aktualisiert"
-Entry starred: "Artikel favorisiert"
-Entry unstarred: "Artikel defavorisiert"
-Entry archived: "Artikel archiviert"
-Entry unarchived: "Artikel dearchiviert"
-Entry deleted: "Artikel gelöscht"
 
-# Entry
+import:
-Mark as read: 'Als gelesen markieren'
+    page_title: 'Importieren'
-Favorite: 'Favorisieren'
+    page_description: 'Willkommen beim wallabag-Importer. Wähle deinen vorherigen Service aus, von dem du die Daten migrieren willst.'
-back: 'zurück'
+    action:
-original article: 'Original-Artikel'
+        import_contents: 'Inhalte importieren'
-Add a tag: 'Tag hinzufügen'
+    form:
-Share: 'Teilen'
+        mark_as_read_title: 'Alle als gelesen markieren?'
-Download: 'Herunterladen'
+        mark_as_read_label: 'Alle importierten Einträge als gelesen markieren'
-Does this article appear wrong?: "Erscheint dieser Artikel falsch?"
+        file_label: 'Datei'
-Problems?: 'Probleme?'
+        save_label: 'Datei hochladen'
-Edit title: "Titel ändern"
+    pocket:
+        page_title: 'Aus Pocket importieren'
+        description: "Dieser Importer wird all deine Pocket-Daten importieren. Pocket erlaubt es uns nicht, den Inhalt zu migrieren, daher wird der lesbare Inhalt erneut von wallabag heruntergeladen."
+        config_missing:
+            description: "Pocket-Import ist nicht konfiguriert."
+            admin_message: 'Du musst noch den %keyurls%a pocket_consumer_key%keyurle% definieren.'
+            user_message: 'Der Server-Administrator muss noch einen API-Key für Pocket konfigurieren.'
+        authorize_message: 'Du kannst deine Daten von deinem Pocket-Account importieren. Dazu musst du nur den nachfolgenden Button klicken und die Anwendung authentifizieren, sich mit getpocket.com zu verbinden.'
+        connect_to_pocket: 'Mit Pocket verbinden und Daten importieren'
+    wallabag_v1:
+        page_title: 'Aus wallabag v1 importieren'
+        description: 'Dieser Import wird all deine Artikel aus wallabag v1 importieren. Klicke auf der Konfigurations-Seite auf "JSON-Export" im "wallabag-Daten exportieren"-Abschnitt. Du erhältst eine "wallabag-export-1-xxxx-xx-xx.json"-Datei.'
+        how_to: 'Wähle die Export-Datei aus und klicke den nachfolgenden Button, um diese hochzuladen und zu importieren.'
+    wallabag_v2:
+        page_title: 'Aus wallabag v2 importieren'
+        description: 'Dieser Import wird all deine Artikel aus wallabag v2 importieren. Gehe auf "Alle Artikel" und dann, in der Exportieren-Seitenleiste auf "JSON". Dabei erhältst du eine "All articles.json"-Datei.'
+
+developer:
+    page_title: 'Entwickler'
+    welcome_message: 'Willkomen zur wallabag-API'
+    documentation: 'Dokumentation'
+    how_to_first_app: 'Wie erstelle ich meine erste Anwendung'
+    full_documentation: 'Komplette API-Dokumentation einsehen'
+    # list_methods: 'List API methods'
+    clients:
+        title: 'Clients'
+        create_new: 'Neuen Client erstellen'
+    existing_clients:
+        title: 'Bestehende Clients'
+        field_id: 'Client-ID'
+        field_secret: 'Client-Secret'
+        field_uris: 'Weiterleitungs-URIs'
+        field_grant_types: "Erlaubte grant_types"
+        no_client: 'Bisher kein Client.'
+    remove:
+        warn_message_1: 'Du hast die Möglichkeit, diesen Client zu entfernen. DIESE AKTION IST NICHT WIDERRUFBAR!'
+        warn_message_2: "Wenn du ihn entfernst, hat keine der damit konfigurierten Anwendungen mehr die Möglichkeit, sich in deinen wallabag-Account anzumelden."
+        action: 'Client entfernen'
+    client:
+        page_title: 'Entwickler > Neuer Client'
+        page_description: 'Du bist dabei, einen neuen Client zu erstellen. Fülle das nachfolgende Feld für die Weiterleitungs-URIs deiner Anwendung aus.'
+        form:
+            redirect_uris_label: 'Weiterleitungs-URIs'
+            save_label: 'Neuen Client erstellen'
+        action_back: 'Zurück'
+    client_parameter:
+        page_title: 'Entwickler > Client-Parameter'
+        page_description: 'Dies sind deine Client-Parameter.'
+        field_id: 'Client-ID'
+        field_secret: 'Client-Secret'
+        back: 'Zurück'
+        read_howto: 'Lese des How-To zu "Wie erstelle ich meine erste Anwendung"'
+    howto:
+        page_title: 'Entwickler > Wie erstelle ich meine erste Anwendung'
+        description:
+            paragraph_1: 'Die folgenden Befehle machen Gebrauch von der <a href="https://github.com/jkbrzt/httpie">HTTPie-Bibliothek</a>. Stelle sicher, dass sie auf deinem System installiert ist, bevor du fortfährst.'
+            paragraph_2: 'Du benötigst einen Token, damit deine Anwendung mit der wallabag-API kommunizieren kann.'
+            paragraph_3: 'Um diesen Token zu erstellen, muss <a href="%link%">ein neuer Client erstellt werden</a>.'
+            paragraph_4: 'Nun erstelle deinen Token (ersetze client_id, client_secret, username und password mit deinen Werten):'
+            paragraph_5: 'Die API wird eine Antwort der folgenden Art zurückgeben:'
+            paragraph_6: 'Der access_token ist nützlich, um die API aufzurufen. Beispiel:'
+            paragraph_7: 'Dieser Aufruf wird alle Einträge für den Nutzer zurückgeben.'
+            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:
+            config_saved: 'Konfiguration gespeichert. Einige Einstellungen werden erst nach einer erneuten Anmeldung übernommen.'
+            password_updated: 'Kennwort aktualisiert'
+            password_not_updated_demo: "Im Test-Modus kannst du das Kennwort nicht ändern."
+            user_updated: 'Information aktualisiert'
+            rss_updated: 'RSS-Informationen aktualisiert'
+            tagging_rules_updated: 'Tagging-Regeln aktualisiert'
+            tagging_rules_deleted: 'Tagging-Regel gelöscht'
+            user_added: 'Benutzer "%username%" erstellt'
+            rss_token_updated: 'RSS-Token aktualisiert'
+    entry:
+        notice:
+            entry_already_saved: 'Eintrag bereits am %date% gespeichert'
+            entry_saved: 'Eintag gespeichert'
+            entry_updated: 'Eintrag aktualisiert'
+            entry_reloaded: 'Eintrag neugeladen'
+            entry_reload_failed: 'Neuladen des Eintrags fehlgeschlagen'
+            entry_archived: 'Artikel archiviert'
+            entry_unarchived: 'Artikel dearchiviert'
+            entry_starred: 'Artikel favorisiert'
+            entry_unstarred: 'Artikel defavorisiert'
+            entry_deleted: 'Artikel gelöscht'
+    tag:
+        notice:
+            tag_added: 'Tag hinzugefügt'
+    import:
+        notice:
+            failed: 'Import fehlgeschlagen, bitte erneut probieren.'
+            failed_on_file: 'Fehler während des Imports. Bitte überprüfe deine Import-Datei.'
+            summary: 'Import-Zusammenfassung: %imported% importiert, %skipped% bereits gespeichert.'
+    developer:
+        notice:
+            client_created: 'Neuer Client erstellt.'
+            client_deleted: 'Client gelöscht'

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

@@ -0,0 +1,425 @@
+security:
+    login:
+        page_title: 'Welcome to wallabag!'
+        keep_logged_in: 'Keep me logged in'
+        forgot_password: 'Forgot your password?'
+        submit: 'Login'
+        register: 'Register'
+        username: 'Username'
+        password: 'Password'
+        cancel: 'Cancel'
+    resetting:
+        description: "Enter your email address below and we'll send you password reset instructions."
+    register:
+        page_title: 'Create an account'
+        go_to_account: 'Go to your account'
+
+menu:
+    left:
+        unread: 'Unread'
+        starred: 'Starred'
+        archive: 'Archive'
+        all_articles: 'All entries'
+        config: 'Config'
+        tags: 'Tags'
+        internal_settings: 'Internal Settings'
+        import: 'Import'
+        howto: 'How to'
+        developer: 'Developer'
+        logout: 'Logout'
+        about: 'About'
+        search: 'Search'
+        save_link: 'Save a link'
+        back_to_unread: 'Back to unread articles'
+    top:
+        add_new_entry: 'Add a new entry'
+        search: 'Search'
+        filter_entries: 'Filter entries'
+        export: 'Export'
+    search_form:
+        input_label: 'Enter your search here'
+
+footer:
+    wallabag:
+        elsewhere: 'Take wallabag with you'
+        social: 'Social'
+        powered_by: 'powered by'
+        about: 'About'
+
+config:
+    page_title: 'Config'
+    tab_menu:
+        settings: 'Settings'
+        rss: 'RSS'
+        user_info: 'User information'
+        password: 'Password'
+        rules: 'Tagging rules'
+        new_user: 'Add a user'
+    form:
+        save: 'Save'
+    form_settings:
+        theme_label: 'Theme'
+        items_per_page_label: 'Items per page'
+        language_label: 'Language'
+        reading_speed:
+            label: 'Reading speed'
+            help_message: 'You can use online tools to estimate your reading speed:'
+            100_word: 'I read ~100 words per minute'
+            200_word: 'I read ~200 words per minute'
+            300_word: 'I read ~300 words per minute'
+            400_word: 'I read ~400 words per minute'
+    form_rss:
+        description: 'RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.'
+        token_label: 'RSS token'
+        no_token: 'No token'
+        token_create: 'Create your token'
+        token_reset: 'Regenerate your token'
+        rss_links: 'RSS links'
+        rss_link:
+            unread: 'unread'
+            starred: 'starred'
+            archive: 'archived'
+        rss_limit: 'Number of items in the feed'
+    form_user:
+        two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion"
+        name_label: 'Name'
+        email_label: 'Email'
+        twoFactorAuthentication_label: 'Two factor authentication'
+    form_password:
+        old_password_label: 'Current password'
+        new_password_label: 'New password'
+        repeat_new_password_label: 'Repeat new password'
+    form_rules:
+        if_label: 'if'
+        then_tag_as_label: 'then tag as'
+        delete_rule_label: 'delete'
+        rule_label: 'Rule'
+        tags_label: 'Tags'
+        faq:
+            title: 'FAQ'
+            tagging_rules_definition_title: 'What does « tagging rules » mean?'
+            tagging_rules_definition_description: 'They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.'
+            how_to_use_them_title: 'How do I use them?'
+            how_to_use_them_description: 'Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »'
+            variables_available_title: 'Which variables and operators can I use to write rules?'
+            variables_available_description: 'The following variables and operators can be used to create tagging rules:'
+            meaning: 'Meaning'
+            variable_description:
+                label: 'Variable'
+                title: 'Title of the entry'
+                url: 'URL of the entry'
+                isArchived: 'Whether the entry is archived or not'
+                isStarred: 'Whether the entry is starred or not'
+                content: "The entry's content"
+                language: "The entry's language"
+                mimetype: "The entry's mime-type"
+                readingTime: "The estimated entry's reading time, in minutes"
+                domainName: 'The domain name of the entry'
+            operator_description:
+                label: 'Operator'
+                less_than: 'Less than...'
+                strictly_less_than: 'Strictly less than...'
+                greater_than: 'Greater than...'
+                strictly_greater_than: 'Strictly greater than...'
+                equal_to: 'Equal to...'
+                not_equal_to: 'Not equal to...'
+                or: 'One rule OR another'
+                and: 'One rule AND another'
+                matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
+    form_new_user:
+        username_label: 'Username'
+        password_label: 'Password'
+        repeat_new_password_label: 'Repeat new password'
+        plain_password_label: '????'
+        email_label: 'Email'
+
+entry:
+    page_titles:
+        unread: 'Unread entries'
+        starred: 'Starred entries'
+        archived: 'Archived entries'
+        filtered: 'Filtered entries'
+    list:
+        number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
+        reading_time: 'estimated reading time'
+        reading_time_minutes: 'estimated reading time: %readingTime% min'
+        reading_time_less_one_minute: 'estimated reading time: <small class="inferieur">&lt;</small> 1 min'
+        original_article: 'original'
+        toogle_as_read: 'Toggle mark as read'
+        toogle_as_star: 'Toggle favorite'
+        delete: 'Delete'
+        export_title: 'Export'
+    filters:
+        title: 'Filters'
+        status_label: 'Status'
+        archived_label: 'Archived'
+        starred_label: 'Starred'
+        preview_picture_label: 'Has a preview picture'
+        preview_picture_help: 'Preview picture'
+        language_label: 'Language'
+        reading_time:
+            label: 'Reading time in minutes'
+            from: 'from'
+            to: 'to'
+        domain_label: 'Domain name'
+        created_at:
+            label: 'Creation date'
+            from: 'from'
+            to: 'to'
+        action:
+            clear: 'Clear'
+            filter: 'Filter'
+    view:
+        left_menu:
+            back_to_top: 'Back to top'
+            back_to_homepage: 'Back'
+            set_as_read: 'Mark as read'
+            set_as_unread: 'Mark as unread'
+            set_as_favorite: 'Favorite'
+            view_original_article: 'Original article'
+            re_fetch_content: 'Re-fetch content'
+            delete: 'Delete'
+            add_a_tag: 'Add a tag'
+            share_content: 'Share'
+            share_email_label: 'Email'
+            download: 'Download'
+            print: 'Print'
+            problem:
+                label: 'Problems?'
+                description: 'Does this article appear wrong?'
+        edit_title: 'Edit title'
+        original_article: 'original'
+        annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations'
+    new:
+        page_title: 'Save new entry'
+        placeholder: 'http://website.com'
+        form_new:
+            url_label: Url
+    edit:
+        page_title: 'Edit an entry'
+        title_label: 'Title'
+        url_label: 'Url'
+        is_public_label: 'Public'
+        save_label: 'Save'
+
+about:
+    page_title: 'About'
+    top_menu:
+        who_behind_wallabag: 'Who is behind wallabag'
+        getting_help: 'Getting help'
+        helping: 'Helping wallabag'
+        contributors: 'Contributors'
+        third_party: 'Third-party libraries'
+    who_behind_wallabag:
+        developped_by: 'Developed by'
+        website: 'website'
+        many_contributors: 'And many others contributors ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">on Github</a>'
+        project_website: 'Project website'
+        license: 'License'
+        version: 'Version'
+    getting_help:
+        documentation: 'Documentation'
+        bug_reports: 'Bug reports'
+        support: '<a href="https://support.wallabag.org">On our support website</a> or <a href="https://github.com/wallabag/wallabag/issues">on GitHub</a>'
+    helping:
+        description: 'wallabag is free and opensource. You can help us:'
+        by_contributing: 'by contributing to the project:'
+        by_contributing_2: 'an issue lists all our needs'
+        by_paypal: 'via Paypal'
+    contributors:
+        description: 'Thank you to contributors on wallabag web application'
+    third_party:
+        description: 'Here are the list of third-party libraries used in wallabag (with their licenses):'
+        package: 'Package'
+        license: 'License'
+
+howto:
+    page_title: 'How to'
+    page_description: 'There are several ways to save an article:'
+    top_menu:
+        browser_addons: 'Browser addons'
+        mobile_apps: 'Mobile apps'
+        bookmarklet: 'Bookmarklet'
+    form:
+        description: 'Thanks to this form'
+    browser_addons:
+        firefox: 'Standard Firefox Add-On'
+        chrome: 'Chrome Extension'
+    mobile_apps:
+        android:
+            via_f_droid: 'via F-Droid'
+            via_google_play: 'via Google Play'
+        ios: 'on the iTunes Store'
+        windows: 'on the Microsoft Store'
+    bookmarklet:
+        description: 'Drag & drop this link to your bookmarks bar:'
+
+quickstart:
+    page_title: 'Quickstart'
+    intro:
+        title: 'Welcome to wallabag!'
+        paragraph_1: "We'll accompany you to visit wallabag and show you some features which can interest you."
+        paragraph_2: 'Follow us!'
+    configure:
+        title: 'Configure the application'
+        language: 'Change language and design'
+        rss: 'Enable RSS feeds'
+        tagging_rules: 'Write rules to automatically tag your articles'
+    admin:
+        title: 'Administration'
+        description: 'As an administrator, you have privileges on wallabag. You can:'
+        new_user: 'Create a new user'
+        analytics: 'Configure analytics'
+        sharing: 'Enable some parameters about article sharing'
+        export: 'Configure export'
+        import: 'Configure import'
+    first_steps:
+        title: 'First steps'
+        new_article: 'Save your first article'
+        unread_articles: 'And classify it!'
+    migrate:
+        title: 'Migrate from an existing service'
+        description: "Are you using another service? We'll help you to retrieve your data on wallabag."
+        pocket: 'Migrate from Pocket'
+        wallabag_v1: 'Migrate from wallabag v1'
+        wallabag_v2: 'Migrate from wallabag v2'
+    developer:
+        title: 'Developers'
+        create_application: 'Create your third application'
+    docs:
+        title: 'Full documentation'
+        annotate: 'Annotate your article'
+        export: 'Convert your articles into ePUB or PDF'
+        search_filters: 'See how you can look for an article by using search engine and filters'
+        fetching_errors: 'What can I do if an article encounters errors during fetching?'
+        all_docs: 'And so many other articles!'
+    support:
+        title: 'Support'
+        description: 'If you need some help, we are here for you.'
+        github: 'On GitHub'
+        email: 'By email'
+        gitter: 'On Gitter'
+
+tag:
+    page_title: 'Tags'
+    list:
+        number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
+
+import:
+    page_title: 'Import'
+    page_description: 'Welcome to wallabag importer. Please select your previous service that you want to migrate.'
+    action:
+        import_contents: 'Import contents'
+    form:
+        mark_as_read_title: 'Mark all as read?'
+        mark_as_read_label: 'Mark all imported entries as read'
+        file_label: 'File'
+        save_label: 'Upload file'
+    pocket:
+        page_title: 'Import > Pocket'
+        description: "This importer will import all your Pocket data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag."
+        config_missing:
+            description: "Pocket import isn't configured."
+            admin_message: 'You need to define %keyurls%a pocket_consumer_key%keyurle%.'
+            user_message: 'Your server admin needs to define an API Key for Pocket.'
+        authorize_message: 'You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.'
+        connect_to_pocket: 'Connect to Pocket and import data'
+    wallabag_v1:
+        page_title: 'Import > Wallabag v1'
+        description: 'This importer will import all your wallabag v1 articles. On your config page, click on "JSON export" in the "Export your wallabag data" section. You will have a "wallabag-export-1-xxxx-xx-xx.json" file.'
+        how_to: 'Please select your wallabag export and click on the below button to upload and import it.'
+    wallabag_v2:
+        page_title: 'Import > Wallabag v2'
+        description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.'
+
+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: '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:
+            config_saved: 'Config saved. Some parameters will be considered after disconnection.'
+            password_updated: 'Password updated'
+            password_not_updated_demo: "In demonstration mode, you can't change password for this user."
+            user_updated: 'Information updated'
+            rss_updated: 'RSS information updated'
+            tagging_rules_updated: 'Tagging rules updated'
+            tagging_rules_deleted: 'Tagging rule deleted'
+            user_added: 'User "%username%" added'
+            rss_token_updated: 'RSS token updated'
+    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_archived: 'Entry archived'
+            entry_unarchived: 'Entry unarchived'
+            entry_starred: 'Entry starred'
+            entry_unstarred: 'Entry unstarred'
+            entry_deleted: 'Entry deleted'
+    tag:
+        notice:
+            tag_added: 'Tag added'
+    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.'
+    developer:
+        notice:
+            client_created: 'New client created.'
+            client_deleted: 'Client deleted'

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

@@ -1,242 +1,425 @@
-#Login
+security:
-Keep me logged in: 'Mantenme conectado'
+    login:
-Forgot your password?: '¿Ha olvidado su contraseña?'
+        page_title: '¡Bienvenido a wallabag !'
-Login: 'Conectarse'
+        keep_logged_in: 'Manténgame conectado'
-Back to login: 'Revenir au formulaire de connexion'
+        forgot_password: '¿Se ha olvidado de su contraseña?'
-Send: 'Envíar'
+        submit: 'Conectarse'
-"Enter your email address below and we'll send you password reset instructions.": "Introduce tu dirección de email y le enviaremos las instrucciones para resetear la contraseña"
+        register: 'Registrarse'
-Register: 'Registrarse'
+        username: 'Nombre de usuario'
+        password: 'Contraseña'
+        # cancel: 'Cancel'
+    resetting:
+        description: "Introduzca su dirección del correo electrónico y le enviaremos las instrucciones para reiniciar la contraseña"
+    register:
+        page_title: 'Crear una cuenta'
+        go_to_account: 'Acceder su cuenta'
 
-# Menu
+menu:
-unread: 'Sin leer'
+    left:
-starred: 'Favoritos'
+        unread: 'Sin leer'
-archive: 'Archivo'
+        starred: 'Favoritos'
-all: 'Todos los artículos'
+        archive: 'Archivo'
-tags: 'Tags'
+        all_articles: 'Todos artículos'
-config: 'Configuración'
+        config: 'Configuración'
-internal settings: 'Configuración interna'
+        tags: 'Etiquetas'
-import: 'Importar'
+        internal_settings: 'Configuración interna'
-howto: 'Ayuda'
+        import: 'Importar'
-logout: 'Desconectarse'
+        howto: 'Ayuda'
-Filtered: 'Articulos filtrados'
+        developer: 'Promotor'
-About: 'Acerca de'
+        logout: 'Desconectarse'
+        about: 'Acerca de'
+        search: 'Buscar'
+        save_link: 'Archivar un enlace'
+        back_to_unread: 'Volver a los artículos sin leer'
+    top:
+        add_new_entry: 'Añadir un nuevo artículo'
+        search: 'Buscar'
+        filter_entries: 'Filtrar los artículos'
+        export: 'Exportar'
+    search_form:
+        input_label: 'Introduzca su búsqueda aquí'
 
-# Header
+footer:
-Back to unread articles: 'Volver a los artículos sin leer'
+    wallabag:
-Add a new entry: 'Añadir un nuevo artículo'
+        elsewhere: 'Lleve wallabag consigo'
-Search: 'Buscar'
+        social: 'Social'
-Filter entries: 'Filtrar los artículos'
+        # powered_by: 'powered by'
-Enter your search here: 'Introduce tu búsqueda aquí'
+        about: 'Acerca de'
-Save new entry: 'Guardar un nuevo artículo'
-Export: 'Exportar'
 
-# Config screen
+config:
-Settings: 'Configuración'
+    page_title: 'Configuración'
-User information: 'Información de usuario'
+    tab_menu:
-Password: 'Contraseña'
+        settings: 'Configuración'
-RSS: 'RSS'
+        rss: 'RSS'
-Add a user: 'Añadir un usuario'
+        user_info: 'Información de usuario'
-Theme: 'Tema'
+        password: 'Contraseña'
-Items per page: "Número de artículos por página"
+        rules: 'Reglas de etiquetado automáticas'
-Language: 'Idioma'
+        new_user: 'Añadir un usuario'
-Save: 'Enregistrer'
+    form:
-RSS token: 'RSS token'
+        save: 'Guardar'
-RSS token updated: 'RSS token actualizado '
+    form_settings:
-Name: 'Nombre'
+        theme_label: 'Tema'
-Email: 'Direccion e-mail'
+        items_per_page_label: 'Número de artículos por página'
-No token: 'Aucun jeton généré'
+        language_label: 'Idioma'
-Reset your token: 'Resetear token'
+        reading_speed:
-Create your token: 'Crear token'
+            label: 'Velocidad de leer'
-Rss limit: "Límite de artículos en feed RSS"
+            help_message: 'Se puede usar las técnicas para calcular su velocidad de leer:'
-RSS links: 'URL de su feed RSS'
+            100_word: 'Leo ~100 palabras por minuto'
-"RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.": "Los feeds RSS de wallabag permiten leer los artículos guardados con su lector RSS favorito. Necesita generar un token primero"
+            200_word: 'Leo ~200 palabras por minuto'
-Old password: 'Contraseña actual'
+            300_word: 'Leo ~300 palabras por minuto'
-New password: 'Nueva contraseña'
+            400_word: 'Leo ~400 palabras por minuto'
-Repeat new password: 'Confirmar la nueva contraseña'
+    form_rss:
-Username: "Nombre de usuario"
+        description: 'Los feeds RSS de wallabag permiten leer los artículos guardados con su lector RSS favorito. Necesita generar un token primero'
-Two factor authentication: "Autentificación de dos factores"
+        token_label: 'RSS token'
-"Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion": "Con la autentificación de dos factores recibirá código mediante email en cada nueva conexión que no sea de confianza"
+        # no_token: 'No token'
+        token_create: 'Crear token'
+        token_reset: 'Reiniciar token'
+        rss_links: 'URL de su feed RSS'
+        rss_link:
+            unread: 'sin leer'
+            starred: 'favoritos'
+            archive: 'archivo'
+        rss_limit: 'Límite de artículos en feed RSS'
+    form_user:
+        two_factor_description: "Con la autentificación de dos factores recibirá código mediante email en cada nueva conexión que no sea de confianza"
+        name_label: 'Nombre'
+        email_label: 'Direccion e-mail'
+        twoFactorAuthentication_label: 'Autentificación de dos factores'
+    form_password:
+        old_password_label: 'Contraseña actual'
+        new_password_label: 'Nueva contraseña'
+        repeat_new_password_label: 'Confirmar la nueva contraseña'
+    form_rules:
+        if_label: 'si'
+        then_tag_as_label: 'Etiquete como'
+        delete_rule_label: 'Borre'
+        rule_label: 'Regla'
+        tags_label: 'Etiquetas'
+        faq:
+            title: 'FAQ'
+            tagging_rules_definition_title: '¿Qué significa reglas de etiquetado autómaticas?'
+            tagging_rules_definition_description: 'Son las reglas usadas por Wallabag para etiquetar automáticamente los nuevos artículos.<br />Cada vez que un nuevo artículo sea añadido, todas las reglas de etiquetado automáticas serán usadas para etiquetarlo, ayudándole a clasificar automáticamente los artículos.'
+            how_to_use_them_title: '¿Cómo se utilizan?'
+            how_to_use_them_description: 'Supongamos que quiere etiquetar nuevos artículos como « <i>lectura corta</i> » cuando el tiempo de leer sea menos de 3 minutos. <br /> En este caso, debe poner Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »'
+            variables_available_title: '¿Qué variables y operadores se pueden utilizar para escribir las reglas?'
+            variables_available_description: 'Las siguientes variables y operadores se pueden utilizar para crear las reglas de etiquetado automáticas:'
+            meaning: 'Significado'
+            variable_description:
+                label: 'Variable'
+                title: 'Titúlo del artículo'
+                url: 'URL del artículo'
+                isArchived: 'El artículo está guardado o no'
+                isStarred: 'Si el artículo es un favorito o no'
+                content: "El contenido del artículo"
+                language: "El idoma del artículo"
+                mimetype: "Tipo MIME del artículo"
+                readingTime: "El tiempo estimado de lectura del artículo, en minutos"
+                domainName: 'El dominio del artículo'
+            operator_description:
+                label: 'Operador'
+                less_than: 'Menos que…'
+                strictly_less_than: 'Estrictámente menos que…'
+                greater_than: 'Más que…'
+                strictly_greater_than: 'Estrictámente mas que…'
+                equal_to: 'Egual a…'
+                not_equal_to: 'Diferente de…'
+                or: 'Una regla O otra'
+                and: 'Una regla Y la otra'
+                matches: 'Prueba si un <i>sujeto</i> corresponde a una <i>busqueda</i> (insensible a mayusculas).<br />Ejemplo : <code>título coincide "football"</code>'
+    form_new_user:
+        username_label: 'Nombre de usuario'
+        password_label: 'Contraseña'
+        repeat_new_password_label: 'Confirmar la nueva contraseña'
+        plain_password_label: '????'
+        email_label: 'Email'
 
-# Tagging rules
+entry:
-Tagging rules: "Reglas de etiquetado automáticas"
+    page_titles:
-What does « tagging rules » mean?: "¿Qué significa reglas de etiquetado autómaticas?"
+        # unread: 'Unread entries'
-"They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.": "Son las reglas usadas por Wallabag para etiquetar automáticamente los nuevos artículos.<br />Cáda vez que un nuevo artículo es añadido, todas las reglas de etiquetado automáticas serán usadas para etiquetarlo, ayudandote a clasificar automáticamente los artículos."
+        # starred: 'Starred entries'
-How do I use them?: "¿Cómo se utilizan?"
+        # archived: 'Archived entries'
-"Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = \"github.com\"</i> » then tag as « <i>long reading, github </i> »": "Imaginons que voulez attribuer aux nouveaux articles le tag « <i>lecture courte</i> » lorsque le temps de lecture est inférieur à 3 minutes.<br />Dans ce cas, vous devriez mettre « readingTime &lt;= 3 » dans le champ <i>Règle</i> et « <i>lecture courte</i> » dans le champ <i>Tag</i>.<br />Plusieurs tags peuvent être ajoutés simultanément en les séparant par des virgules : « <i>lecture courte, à lire</i> »<br />Des règles complexes peuvent être créées en utilisant des opérateurs prédéfinis: si « <i>readingTime &gt;= 5 AND domainName = \"github.com\"</i> » alors attribuer les tags « <i>lecteur longue, github </i> »"
+        # filtered: 'Filtered entries'
-Which variables and operators can I use to write rules?: "¿Qué variables y operadores se pueden utilizar para escribir las reglas?"
+    list:
-The following variables and operators can be used to create tagging rules:: "Las siguientes variables y operadores se pueden utilizar para crear las reglas de etiquetado automáticas:"
+        number_on_the_page: '{0} No hay artículos.|{1} Hay un artículo.|]1,Inf[ Hay %count% artículos.'
-Variable: "Variable"
+        reading_time: 'tiempo estimado de lectura'
-Meaning: "Significado"
+        reading_time_minutes: 'tiempo estimado de lectura: %readingTime% min'
-Operator: "Operador"
+        reading_time_less_one_minute: 'tiempo estimado de lectura: <small class="inferieur">&lt;</small> 1 min'
-Title of the entry: "Titúlo del artículo"
+        original_article: 'original'
-Less than…: "Menos que…"
+        toogle_as_read: 'Marcar cómo leído/ no leído'
-URL of the entry: "URL del artículo"
+        toogle_as_star: 'Marcar cómo favorito/ no favorito'
-Strictly less than…: "Estrictámente menos que…"
+        delete: 'Suprimir'
-Whether the entry is archived or not: "El artículo está guardado o no"
+        export_title: 'Exportar'
-Greater than…: "Más que…"
+    filters:
-Whether the entry is starred or not: "Si el artículo es un favorito o no"
+        title: 'Filtros'
-Strictly greater than…: "Estrictámente mas que…"
+        status_label: 'Estatus'
-The entry's content: "El contenido del artículo"
+        archived_label: 'Archivado'
-Equal to…: "Egual a…"
+        starred_label: 'Favorito'
-The entry's language: "El idoma del artículo"
+        preview_picture_label: 'Hay una foto'
-Not equal to…: "Diferente de…"
+        preview_picture_help: 'Foto de preview'
-The entry's mime-type: "Tipo MIME del artículo"
+        language_label: 'Idioma'
-One rule or another: "Una regla o otra"
+        reading_time:
-The estimated entry's reading time, in minutes: "El tiempo estimado de lectura del artículo, en minutos"
+            label: 'Duración de  lectura en minutos'
-One rule and another: "Una regla y la otra"
+            from: 'de'
-The domain name of the entry: "El dominio del artículo"
+            to: 'a'
-"Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches \"football\"</code>": "Prueba si un <i>sujeto</i> corresponde a una <i>busqueda</i> (insensible a mayusculas).<br />Ejemplo : <code>título coincide \"football\"</code>"
+        domain_label: 'Nombre de dominio'
-Rule: "Regla"
+        created_at:
-FAQ: "FAQ"
+            label: 'Fecha de creación'
+            from: 'de'
+            to: 'a'
+        action:
+            clear: 'Limpiar'
+            filter: 'Filtrar'
+    view:
+        left_menu:
+            # back_to_top: 'Back to top'
+            back_to_homepage: 'Volver'
+            set_as_read: 'Marcar como leído'
+            # set_as_unread: 'Mark as unread'
+            set_as_favorite: 'Marcar cómo 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'
+            download: 'Descargar'
+            # print: 'Print'
+            problem:
+                label: '¿Algún problema?'
+                description: '¿Este artículo no se muestra bien?'
+        edit_title: 'Modificar el título'
+        original_article: 'original'
+        annotations_on_the_entry: '{0} Sin anotaciones|{1} Una anotación|]1,Inf[ %nbAnnotations% anotaciones'
+    new:
+        page_title: 'Guardar un nuevo artículo'
+        placeholder: 'http://website.com'
+        form_new:
+            url_label: Url
+    edit:
+        page_title: 'Editar una artículo'
+        title_label: 'Título'
+        url_label: 'Url'
+        is_public_label: 'Es Público'
+        save_label: 'Guardar'
 
-# Entries
+about:
-"estimated reading time: %readingTime% min": "tiempo estimado de lectura: %readingTime% min"
+    page_title: 'Acerca de'
-"estimated reading time: %inferior% 1 min": "tiempo estimado de lectura: %inferior% 1 min"
+    top_menu:
-original: "original"
+        who_behind_wallabag: 'Equipo de desarrollo de wallabag'
-Toggle mark as read: 'Marcar cómo leído/ no leído'
+        getting_help: 'Conseguir ayuda'
-Toggle favorite: 'Marcar cómo favorito/ no favorito'
+        helping: 'Ayudar a wallabag'
-Delete: 'Suprimir'
+        contributors: 'Contribuidores'
-"{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.": "{0} No hay artículos.|{1} Hay un artículo.|]1,Inf[ Hay %count% artículos."
+        third_party: 'Librerías de terceeros'
-http://website: "http://website"
+    who_behind_wallabag:
-"{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations": "{0} Sin anotaciones|{1} Una anotación|]1,Inf[ %nbAnnotations% anotaciones"
+        developped_by: 'Desarrollado por'
+        website: 'Sitio web'
+        many_contributors: 'Y muchos otros contribuidores ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">en Github</a>'
+        project_website: 'Web del proyecto'
+        license: 'Licencia'
+        version: 'Version'
+    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>'
+    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 contribuidores 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'
+        license: 'Licencia'
 
-# Edit entry
+howto:
-Edit an entry: "Editar una artículo"
+    page_title: 'Ayuda'
-Title: "Título"
+    # page_description: 'There are several ways to save an article:'
-Is public: "Es Público"
+    top_menu:
+        browser_addons: 'Extensiones de navigador'
+        mobile_apps: 'Applicaciones para smartphone'
+        bookmarklet: 'Bookmarklet'
+    form:
+        description: 'Gracias a este formulario'
+    browser_addons:
+        firefox: 'Extensión Firefox'
+        chrome: 'Extensión Chrome'
+    mobile_apps:
+        android:
+            via_f_droid: 'via F-Droid'
+            via_google_play: 'via Google Play'
+        # ios: 'on the iTunes Store'
+        # windows: 'on the Microsoft Store'
+    bookmarklet:
+        description: 'Desplazar y soltar este link en la barra de marcadores :'
 
-# tag
+quickstart:
-Tags: Tags
+    page_title: 'Comienzo rápido'
-"{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.": "{0} No hay ningun tag.|{1} Hay un tag.|]1,Inf[ Hay %count% tags."
+    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!'
+    configure:
+        title: 'Configure la aplicación'
+        language: 'Cambie el idoma y el diseño de la aplicación'
+        rss: 'Activar los feeds RSS'
+        # tagging_rules: 'Write rules to automatically tag your articles'
+    admin:
+        # title: 'Administration'
+        # description: 'As an administrator, you have privileges on wallabag. You can:'
+        # new_user: 'Create a new user'
+        # analytics: 'Configure analytics'
+        # sharing: 'Enable some parameters about article sharing'
+        # export: 'Configure export'
+        # import: 'Configure import'
+    first_steps:
+        title: 'Prieros pasos'
+        new_article: 'Guarde su primer artículo'
+        unread_articles: '¡Y clasifiquelo!'
+    migrate:
+        title: 'Migrar de un servicio existente'
+        description: "¿Está usando otro servicio? Le ayudaremos a migrar sus datos a wallabag."
+        pocket: 'Migrar desde Pocket'
+        wallabag_v1: 'Migrar desde wallabag v1'
+        wallabag_v2: 'Migrar desde wallabag v2'
+    developer:
+        # title: 'Developers'
+        # create_application: 'Create your third application'
+    docs:
+        title: 'Documentación completa'
+        # annotate: 'Annotate your article'
+        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?'
+        all_docs: '¡Y muchos más artículos!'
+    support:
+        title: 'Soporte'
+        description: 'Sí necesita ayuda, estamos disponibles para usted.'
+        github: 'En GitHub'
+        email: 'Por email'
+        gitter: 'En Gitter'
 
-# Filters
+tag:
-Filters: 'Filtros'
+    page_title: 'Etiquetas'
-Status: 'Estatus'
+    list:
-Archived: 'Archivado'
+        number_on_the_page: '{0} No hay ningun etiqueta.|{1} Hay un etiqueta.|]1,Inf[ Hay %count% etiquetas.'
-Starred: 'Favorito'
-Preview picture: 'Foto de preview'
-Has a preview picture: 'Hay una foto'
-Reading time in minutes: 'Duración de  lectura en minutos'
-from: 'de'
-to: 'a'
-website.com: 'website.com'
-Domain name: 'Nombre de dominio'
-Creation date: 'Fecha de creación'
-dd/mm/yyyy: 'dd/mm/aaaa'
-Clear: 'Limpiar'
-Filter: 'Filtrar'
-website.com: "website.com"
 
-# About
+import:
-About: "Acerca de"
+    page_title: 'Importar'
-Who is behind wallabag: "Equipo de desarrollo de wallabag"
+    page_description: 'Bienvenido al útil de migración de wallabag. Seleccione el servicio previo del que usted quiera migrar.'
-Getting help: "Conseguir ayuda"
+    action:
-Helping wallabag: "Ayudar a wallabag"
+        import_contents: 'Importar los contenidos'
-Developed by: "Desarrollado por"
+    form:
-website: "Sitio web"
+        # mark_as_read_title: 'Mark all as read?'
-And many others contributors ♥: "Y muchos otros contribuidores ♥"
+        # mark_as_read_label: 'Mark all imported entries as read'
-on GitHub: "en GitHub"
+        file_label: 'Fichero'
-Project website: "Web del proyecto"
+        save_label: 'Importar el fichero'
-License: "Licencia"
+    pocket:
-Version: "Versión"
+        page_title: 'Importar > Pocket'
-Documentation: "Documentación"
+        description: "Va a importar sus datos de Pocket. Pocket no nos permite descargar el contenido de su servicio, así que el contenido de cada artículo será redescargado por wallabag."
-Bug reports: "Reporte de errores"
+        config_missing:
-On our support website: "En nuestra web de soporte"
+            description: "La importación de Pocket no está configurada."
-or: "o"
+            admin_message: 'Debe definir %keyurls%una clava del API Pocket%keyurle%.'
-"wallabag is free and opensource. You can help us:": "wallabag es libre y gratuito. Usted puede ayudarnos :"
+            user_message: 'El administrador de vuestro servidor debe definir una clave API Pocket.'
-"by contributing to the project:": "contribuyendo al proyecto :"
+        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.'
-an issue lists all our needs: "nuestras necesidades están en un ticket"
+        connect_to_pocket: 'Conectese a Pocket para importar los datos'
-via Paypal: "via Paypal"
+    wallabag_v1:
-Take wallabag with you: "Llevate wallabag contigo"
+        page_title: 'Importar > Wallabag v1'
-Social: "Social"
+        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".'
-powered by: "propulsé par"
+        how_to: 'Seleccione el fichero de su exportación de wallabag v1 y puelse en el botón para subirla y importarla.'
-Contributors: "Contribuidores"
+    wallabag_v2:
-Thank you to contributors on wallabag web application: "Gradias a los contribuidores de la aplicación web de wallabag"
+        page_title: 'Importar > Wallabag v2'
-Third-party libraries: "Librerías de terceeros"
+        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"'
-"Here are the list of third-party libraries used in wallabag (with their licenses):": "Aquí está la lista de las dependencias utilizadas por wallabag (con sus licencias):"
-Package: Paquete
-License: Licencia
 
-# Howto
+developer:
-Form: "Formulario"
+    # page_title: 'Developer'
-Thanks to this form: "Gracias a este formulario"
+    # welcome_message: 'Welcome to the wallabag API'
-Browser addons: "Extensiones de navigador"
+    # documentation: 'Documentation'
-Mobile apps: "Applicaciones para smartphone"
+    # how_to_first_app: 'How to create my first application'
-Bookmarklet: "Bookmarklet"
+    # full_documentation: 'View full API documentation'
-Standard Firefox Add-On: "Extensión Firefox"
+    # list_methods: 'List API methods'
-Chrome Extension: "Extensión Chrome"
+    # clients:
-download the application: "descargar la aplicación"
+    #     title: 'Clients'
-"Drag &amp; drop this link to your bookmarks bar:": "Desplazar y soltar este link en la barra de marcadores :"
+    #     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'
 
-# Flash messages
+validator:
-Information updated: "Su información personal ha sido actualizada"
+    password_must_match: 'Las contraseñas no coinciden'
-"Config saved. Some parameters will be considered after disconnection.": "Configuración guardada. Algunos parámetros serán recargados cuando se vuelva a conectar."
+    password_too_short: 'La contraseña debe tener al menos 8 carácteres'
-RSS information updated: "La configuración de los feeds RSS ha sido actualizada"
+    # password_wrong_value: 'Wrong value for your current password'
-Password updated: "Contraseña actualizada"
+    # item_per_page_too_high: 'This will certainly kill the app'
-Entry starred: "Artículo guardado en los favoritos"
+    # rss_limit_too_hight: 'This will certainly kill the app'
-Entry unstarred: "Artículo retirado de los favoritos"
-Entry archived: "Artículo archivado"
-Entry unarchived: "Artículo desarchivado"
-Entry deleted: "Artículo suprimido"
-Tagging rule deleted: "Regla de etiquetado borrada"
-Tagging rules updated: "Regla de etiquetado actualizada"
-User "%username%" added: 'Usuario "%username%" añadido'
-In demonstration mode, you can't change password for this user.: 'En modo demo, no puedes cambiar la contraseña del usuario.'
 
-# Entry
+flashes:
-Mark as read: 'Marcar como leído'
+    config:
-Favorite: 'Marcar cómo favorito'
+        notice:
-back: 'Volver'
+            config_saved: 'Configuración guardada. Algunos parámetros serán recargados cuando se vuelva a conectar.'
-original article: 'Artículo original'
+            password_updated: 'Contraseña actualizada'
-Add a tag: 'Añadir una etiqueta'
+            password_not_updated_demo: "En modo demo, no puedes cambiar la contraseña del usuario."
-Share: 'Compartir'
+            user_updated: 'Su información personal ha sido actualizada'
-Download: 'Descargar'
+            rss_updated: 'La configuración de los feeds RSS ha sido actualizada'
-Does this article appear wrong?: "¿Este artículo no se muestra bien?"
+            tagging_rules_updated: 'Regla de etiquetado borrada'
-Problems?: '¿Algún problema?'
+            tagging_rules_deleted: 'Regla de etiquetado actualizada'
-Edit title: "Modificar el título"
+            user_added: 'Usuario "%username%" añadido'
-Re-fetch content: "Redescargar el contenido"
+            rss_token_updated: 'RSS token actualizado'
-Tag added: "Etiqueta añadida"
+    entry:
-
+        notice:
-# Import
+            # entry_already_saved: 'Entry already saved on %date%'
-Welcome to wallabag importer. Please select your previous service that you want to migrate.: "Bienvenido al útil de migración de wallabag. Seleccione el servicio previo del que usted quiera migrar."
+            # entry_saved: 'Entry saved'
-"This importer will import all your Pocket data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag.": "Va a importar sus datos de Pocket. Pocket no nos permite descargar el contenido de su servicio, así que el contenido de cada artículo será redescargado por wallabag."
+            # entry_updated: 'Entry updated'
-"This importer will import all your wallabag v1 articles. On your config page, click on \"JSON export\" in the \"Export your wallabag data\" section. You will have a \"wallabag-export-1-xxxx-xx-xx.json\" file.": "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\"."
+            # entry_reloaded: 'Entry reloaded'
-"This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on \"JSON\". You will have a \"All articles.json\" file.": "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\""
+            # entry_reload_failed: 'Failed to reload entry'
-"You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.": "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."
+            entry_archived: 'Artículo archivado'
-Import > Pocket: "Importar > Pocket"
+            entry_unarchived: 'Artículo desarchivado'
-Pocket import isn't configured.: "La importación de Pocket no está configurada."
+            entry_starred: 'Artículo guardado en los favoritos'
-You need to define %keyurls% a pocket_consumer_key %keyurle%.: "Debe definir %keyurls% una clava del API Pocket %keyurle%."
+            entry_unstarred: 'Artículo retirado de los favoritos'
-Your server admin needs to define an API Key for Pocket.: "El administrador de vuestro servidor debe definir una clave API Pocket."
+            entry_deleted: 'Artículo suprimido'
-Connect to Pocket and import data: "Conectese a Pocket para importar los datos"
+    tag:
-Please select your wallabag export and click on the below button to upload and import it.: "Seleccione el fichero de su exportación de wallabag v1 y puelse en el botón para subirla y importarla."
+        notice:
-File: "Fichero"
+            tag_added: 'Etiqueta añadida'
-Upload file: "Importar el fichero"
+    import:
-Import contents: "Importar los contenidos"
+        notice:
-Import: "Importar"
+            # failed: 'Import failed, please try again.'
-Import > Wallabag v1: "Importar > Wallabag v1"
+            # failed_on_file: 'Error while processing import. Please verify your import file.'
-Import > Wallabag v2: "Importar > Wallabag v2"
+            # summary: 'Import summary: %imported% imported, %skipped% already saved.'
-
+    developer:
-# Quickstart
+        notice:
-Quickstart: Comienzo rápido
+            # client_created: 'New client created.'
-Welcome to wallabag!: "Bienvenido a wallabag !"
+            # client_deleted: 'Client deleted'
-We'll accompany you to visit wallabag and show you some features which can interess you.: "Le acompañaremos a su visita de wallabag y le mostraremos algunas características que le pueden interesar."
-Follow us!: "¡Siganos!"
-Configure the application: "Configure la aplicación"
-Change language and design: "Cambie el idoma y el diseño de la aplicación"
-Enable RSS feeds: "Activar los feeds RSS"
-First steps: "Prieros pasos"
-Save your first article: "Guarde su primer artículo"
-And classify it!: "¡Y clasifiquelo!"
-Migrate from an existing service: "Migrar de un servicio existente"
-You're using an other service? We'll help you to retrieve your data on wallabag.: "¿Está usando otro servicio? Le ayudaremos a migrar sus datos a wallabag."
-Migrate from Pocket: "Migrar desde Pocket"
-Migrate from wallabag v1: "Migrar desde wallabag v1"
-Full documentation: "Documentación completa"
-Convert your articles into ePUB or PDF: "Convierta sus artículos a ePub o a PDF"
-See how you can look for an article by using search engine and filters: "Aprenda a utilizar el buscador y los filtros para encontrar el artículo que le interese"
-And so many other articles!: "¡Y muchos más artículos!"
-Support: "Soporte"
-If you need some help, we are here for you.: "Sí necesita ayuda, estamos disponibles para usted."
-On GitHub: "En GitHub"
-By email: "Por email"
-On Gitter: "On Gitter"

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

@@ -1,129 +1,425 @@
-#Login
+security:
-Keep me logged in: 'مرا به خاطر بسپار'
+    login:
-Forgot your password?: ' رمزتان را گم کرده‌اید؟'
+        page_title: 'به wallabag خوش آمدید!'
-Login: 'ورود'
+        keep_logged_in: 'مرا به خاطر بسپار'
-Back to login: 'بازگشت به صفحهٔ ورود'
+        forgot_password: ' رمزتان را گم کرده‌اید؟'
-Send: 'بفرست'
+        submit: 'ورود'
-"Enter your email address below and we'll send you password reset instructions.": "نشانی ایمیل خود را بنویسید تا راهنمای تغییر رمز را برایتان بفرستیم."
+        register: 'نام‌نویسی'
+        username: 'نام کاربری'
+        password: 'رمز'
+        cancel: 'لغو'
+    resetting:
+        description: "نشانی ایمیل خود را بنویسید تا راهنمای تغییر رمز را برایتان بفرستیم."
+    register:
+        page_title: 'حساب بسازید'
+        go_to_account: 'حساب خود را ببینید'
 
-# Menu
+menu:
-unread: 'خوانده‌نشده'
+    left:
-starred: 'برگزیده'
+        unread: 'خوانده‌نشده'
-archive: 'بایگانی'
+        starred: 'برگزیده'
-all: 'همه'
+        archive: 'بایگانی'
-tags: 'برچسب‌ها'
+        all_articles: 'همه'
-config: 'پیکربندی'
+        config: 'پیکربندی'
-howto: 'خودآموز'
+        tags: 'برچسب‌ها'
-logout: 'خروج'
+        internal_settings: 'تنظیمات درونی'
-Filtered: 'فیلترشده'
+        import: 'درون‌ریزی'
-About: 'درباره'
+        howto: 'خودآموز'
+        developer: 'سازندگان'
+        logout: 'خروج'
+        about: 'درباره'
+        search: 'جستجو'
+        save_link: 'ذخیرهٔ یک پیوند'
+        back_to_unread: 'بازگشت به خوانده‌نشده‌ها'
+    top:
+        add_new_entry: 'افزودن مقالهٔ تازه'
+        search: 'جستجو'
+        filter_entries: 'فیلترکردن مقاله‌ها'
+        export: 'برون‌بری'
+    search_form:
+        input_label: 'جستجوی خود را این‌جا بنویسید:'
 
-# Header
+footer:
-Back to unread articles: 'بازگشت به خوانده‌نشده‌ها'
+    wallabag:
-Add a new entry: 'افزودن مقالهٔ تازه'
+        elsewhere: 'wallabag همراه شما'
-Search: 'جستجو'
+        social: 'شبکه‌های اجتماعی'
-Filter entries: 'فیلترکردن مقاله‌ها'
+        powered_by: 'توانمند با'
-Enter your search here: 'جستجوی خود را این‌جا بنویسید:'
+        about: 'درباره'
-Save new entry: 'ذخیرهٔ مقالهٔ تازه'
 
-# Config screen
+config:
-Settings: 'تنظیمات'
+    page_title: 'پیکربندی'
-User information: 'اطلاعات کاربر'
+    tab_menu:
-Password: 'رمز'
+        settings: 'تنظیمات'
-RSS: 'آر-اس-اس'
+        rss: 'آر-اس-اس'
-Add a user: 'افزودن کاربر'
+        user_info: 'اطلاعات کاربر'
-Theme: 'پوسته'
+        password: 'رمز'
-Items per page: 'تعداد مقاله در هر صفحه'
+        rules: 'برچسب‌گذاری خودکار'
-Language: 'زبان'
+        new_user: 'افزودن کاربر'
-Save: 'ذخیره'
+    form:
-RSS token: 'کد آر-اس-اس'
+        save: 'ذخیره'
-Name: 'نام'
+    form_settings:
-Email: 'نشانی ایمیل'
+        theme_label: 'پوسته'
-No token: 'بدون کد'
+        items_per_page_label: 'تعداد مقاله در هر صفحه'
-Reset your token: 'بازنشانی کد'
+        language_label: 'زبان'
-Create your token: 'کد خود را بسازید'
+        reading_speed:
-Rss limit: 'محدودیت آر-اس-اس'
+            label: 'سرعت خواندن'
-RSS links: 'پیوند آر-اس-اس'
+            help_message: 'سرعت خواندن‌تان را با ابزارهای آنلاین تخمین بزنید:'
-'RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.': 'با خوراک آر-اس-اس که wallabag در اختیارتان می‌گذارد، می‌توانید مقاله‌های ذخیره‌شده را در نرم‌افزار آر-اس-اس دلخواه خود بخوانید. برای این کار نخست باید یک کد بسازید.'
+            100_word: 'من تقریباً ۱۰۰ واژه را در دقیقه می‌خوانم'
-Old password: 'رمز قدیمی'
+            200_word: 'من تقریباً ۲۰۰ واژه را در دقیقه می‌خوانم'
-New password: 'رمز تازه'
+            300_word: 'من تقریباً ۳۰۰ واژه را در دقیقه می‌خوانم'
-Repeat new password: 'رمز تازه را دوباره بنویسید'
+            400_word: 'من تقریباً ۴۰۰ واژه را در دقیقه می‌خوانم'
-Username: 'نام کاربری'
+    form_rss:
+        description: 'با خوراک آر-اس-اس که wallabag در اختیارتان می‌گذارد، می‌توانید مقاله‌های ذخیره‌شده را در نرم‌افزار آر-اس-اس دلخواه خود بخوانید. برای این کار نخست باید یک کد بسازید.'
+        token_label: 'کد آر-اس-اس'
+        no_token: 'بدون کد'
+        token_create: 'کد خود را بسازید'
+        token_reset: 'بازنشانی کد'
+        rss_links: 'پیوند آر-اس-اس'
+        rss_link:
+            unread: 'خوانده‌نشده'
+            starred: 'برگزیده'
+            archive: 'بایگانی'
+        rss_limit: 'محدودیت آر-اس-اس'
+    form_user:
+        two_factor_description: "با فعال‌کردن تأیید ۲مرحله‌ای هر بار که اتصال تأییدنشده‌ای برقرار شد، به شما یک کد از راه ایمیل فرستاده می‌شود"
+        name_label: 'نام'
+        email_label: 'نشانی ایمیل'
+        twoFactorAuthentication_label: 'تأیید ۲مرحله‌ای'
+    form_password:
+        old_password_label: 'رمز قدیمی'
+        new_password_label: 'رمز تازه'
+        repeat_new_password_label: 'رمز تازه را دوباره بنویسید'
+    form_rules:
+        if_label: 'اگر'
+        then_tag_as_label: 'این برچسب را بزن'
+        delete_rule_label: 'پاک کن'
+        rule_label: 'قانون'
+        tags_label: 'برچسب‌ها'
+        faq:
+             title: 'پرسش‌های متداول'
+             tagging_rules_definition_title: 'برچسب‌گذاری خودکار یعنی چه؟'
+        #     tagging_rules_definition_description: 'They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.'
+        #     how_to_use_them_title: 'How do I use them?'
+        #     how_to_use_them_description: 'Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »'
+        #     variables_available_title: 'Which variables and operators can I use to write rules?'
+        #     variables_available_description: 'The following variables and operators can be used to create tagging rules:'
+        #     meaning: 'Meaning'
+        #     variable_description:
+        #         label: 'Variable'
+        #         title: 'Title of the entry'
+        #         url: 'URL of the entry'
+        #         isArchived: 'Whether the entry is archived or not'
+        #         isStarred: 'Whether the entry is starred or not'
+        #         content: "The entry's content"
+        #         language: "The entry's language"
+        #         mimetype: "The entry's mime-type"
+        #         readingTime: "The estimated entry's reading time, in minutes"
+        #         domainName: 'The domain name of the entry'
+        #     operator_description:
+        #         label: 'Operator'
+        #         less_than: 'Less than...'
+        #         strictly_less_than: 'Strictly less than...'
+        #         greater_than: 'Greater than...'
+        #         strictly_greater_than: 'Strictly greater than...'
+        #         equal_to: 'Equal to...'
+        #         not_equal_to: 'Not equal to...'
+        #         or: 'One rule OR another'
+        #         and: 'One rule AND another'
+        #         matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
+    form_new_user:
+        username_label: 'نام کاربری'
+        password_label: 'رمز'
+        repeat_new_password_label: 'رمز تازه را دوباره بنویسید'
+        plain_password_label: '????'
+        email_label: 'نشانی ایمیل'
 
-# Entries
+entry:
-'estimated reading time': 'زمان تخمینی برای خواندن'
+    page_titles:
-original: اصلی
+        unread: 'مقاله‌های خوانده‌نشده'
-Toggle mark as read: 'خوانده‌شده/خوانده‌نشده'
+        starred: 'مقاله‌های برگزیده'
-Toggle favorite: 'برگزیده/نابرگزیده'
+        archived: 'مقاله‌های بایگانی‌شده'
-Delete: 'پاک کردن'
+        filtered: 'مقاله‌های فیلترشده'
+    list:
+        number_on_the_page: '{0} هیج مقاله‌ای نیست.|{1} یک مقاله هست.|]1,Inf[ %count% مقاله هست.'
+        reading_time: 'زمان تخمینی برای خواندن'
+        reading_time_minutes: 'زمان تخمینی برای خواندن: %readingTime% min'
+        reading_time_less_one_minute: 'زمان تخمینی برای خواندن: <small class="inferieur">&lt;</small> 1 min'
+        original_article: 'original'
+        toogle_as_read: 'خوانده‌شده/خوانده‌نشده'
+        toogle_as_star: 'برگزیده/نابرگزیده'
+        delete: 'پاک کردن'
+        export_title: 'برون‌بری'
+    filters:
+        title: 'فیلتر'
+        status_label: 'وضعیت'
+        archived_label: 'بایگانی‌شده'
+        starred_label: 'برگزیده'
+        preview_picture_label: 'دارای عکس پیش‌نمایش'
+        preview_picture_help: 'پیش‌نمایش عکس'
+        language_label: 'زبان'
+        reading_time:
+            label: 'زمان خواندن به دقیقه'
+            from: 'از'
+            to: 'تا'
+        domain_label: 'نام دامنه'
+        created_at:
+            label: 'زمان ساخت'
+            from: 'از'
+            to: 'تا'
+        action:
+            clear: 'از نو'
+            filter: 'فیلتر'
+    view:
+        left_menu:
+            back_to_top: 'بازگشت به بالای صفحه'
+            back_to_homepage: 'بازگشت'
+            set_as_read: 'خوانده‌شده'
+            set_as_unread: 'به عنوان خوانده‌نشده علامت بزن'
+            set_as_favorite: 'برگزیده'
+            view_original_article: 'مقالهٔ اصلی'
+            re_fetch_content: 'مقاله‌ها را دوباره دریافت کن'
+            delete: 'پاک کردن'
+            add_a_tag: 'افزودن برچسب'
+            share_content: 'هم‌رسانی'
+            share_email_label: 'نشانی ایمیل'
+            download: 'بارگیری'
+            print: 'چاپ'
+            problem:
+                label: 'مشکلات؟'
+                description: 'آیا مقاله نادرست نشان داده شده؟'
+        edit_title: 'ویرایش عنوان'
+        original_article: 'اصلی'
+        annotations_on_the_entry: '{0} بدون حاشیه|{1} یک حاشیه|]1,Inf[ %nbحاشیه% annotations'
+    new:
+        page_title: 'ذخیرهٔ مقالهٔ تازه'
+        placeholder: 'http://website.com'
+        form_new:
+            url_label: نشانی
+    edit:
+        page_title: 'ویرایش مقاله'
+        title_label: 'عنوان'
+        url_label: 'نشانی'
+        is_public_label: 'عمومی'
+        save_label: 'ذخیره'
 
-# Filters
+about:
-Filters: 'فیلتر'
+    page_title: 'درباره'
-Status: 'وضعیت'
+    top_menu:
-Archived: 'بایگانی‌شده'
+        who_behind_wallabag: 'سازندگان wallabag'
-Starred: 'برگزیده'
+        getting_help: 'گرفتن کمک'
-Preview picture: 'پیش‌نمایش عکس'
+        helping: 'کمک‌کردن به wallabag'
-Has a preview picture: 'دارای عکس پیش‌نمایش'
+        contributors: 'مشارکت‌کنندگان'
-Reading time in minutes: 'زمان خواندن به دقیقه'
+        third_party: 'کتابخانه‌های نرم‌افزاری'
-from: 'از'
+    who_behind_wallabag:
-to: 'تا'
+        developped_by: 'ساختهٔ'
-website.com: 'website.com'
+        website: 'وب‌گاه'
-Domain name: 'نام دامنه'
+        many_contributors: 'و بسیاری دیگر از مشارکت‌کنندگان ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">روی Github</a>'
-Creation date: 'زمان ساخت'
+        project_website: 'وب‌گاه پروژه'
-dd/mm/yyyy: 'dd.mm.yyyy'
+        license: 'پروانه'
-Clear: 'از نو'
+        version: 'نسخه'
-Filter: 'فیلتر'
+    getting_help:
+        documentation: 'راهنما'
+        bug_reports: 'گزارش اشکال‌ها'
+        support: '<a href="https://support.wallabag.org">در وب‌گاه پشتیبانی</a> یا <a href="https://github.com/wallabag/wallabag/issues">روی GitHub</a>'
+    helping:
+        description: 'wallabag رایگان، آزاد، و متن‌باز است. شما می‌توانید به ما کمک کنید:'
+        by_contributing: 'با مشارکت در پروژه:'
+        by_contributing_2: 'فهرست نیازمندی‌های ما در این صفحه است:'
+        by_paypal: 'از راه Paypal'
+    contributors:
+        description: 'از مشارکت شما در برنامهٔ وب wallabag ممنونیم.'
+    third_party:
+        description: 'فهرست کتابخانه‌های نرم‌افزاری که در wallabag به کار رفته‌اند (به همراه پروانهٔ آن‌ها) :'
+        package: 'بسته'
+        license: 'پروانه'
 
-# About
+howto:
-Who is behind wallabag: "سازندگان wallabag"
+    page_title: 'خودآموز'
-Getting help: "گرفتن کمک"
+    page_description: 'راه‌های زیادی برای ذخیرهٔ مقاله‌ها هست:'
-Helping wallabag: "کمک‌کردن به wallabag"
+    top_menu:
-Developed by: "ساختهٔ"
+        browser_addons: 'افزونه برای مرورگرها'
-website: "وب‌گاه"
+        mobile_apps: 'برنامه‌های موبایل'
-And many others contributors ♥: "و بسیاری دیگر از مشارکت‌کنندگان ♥"
+        bookmarklet: 'ابزار علامت‌گذاری صفحه‌ها'
-on GitHub: "روی GitHub"
+    form:
-Project website: "وب‌گاه پروژه"
+        description: 'به کمک این فرم'
-License: "پروانه"
+    browser_addons:
-Version: "نسخه"
+        firefox: 'افزونهٔ فایرفاکس'
-Documentation: "راهنما"
+        chrome: 'افزونهٔ کروم'
-Bug reports: "گزارش اشکال‌ها"
+    mobile_apps:
-On our support website: "در وب‌گاه پشتیبانی"
+        android:
-or: "یا"
+            via_f_droid: 'از راه F-Droid'
-"wallabag is free and opensource. You can help us:": "wallabag رایگان، آزاد، و متن‌باز است. شما می‌توانید به ما کمک کنید:"
+            via_google_play: 'از راه Google Play'
-"by contributing to the project:": "با مشارکت در پروژه:"
+        ios: 'از راه iTunes Store'
-an issue lists all our needs: "فهرست نیازمندی‌های ما در این صفحه است:"
+        windows: 'از راه Microsoft Store'
-via Paypal: "از راه PayPal"
+    bookmarklet:
+        description: 'این پیوند را به نوار بوک‌مارک مرورگرتان بکشید:'
 
-# Howto
+quickstart:
-Form: فرم
+    page_title: 'Quickstart'
-Thanks to this form: "به کمک این فرم"
+    intro:
-Browser addons: "افزونه برای مرورگرها"
+        title: 'به wallabag خوش آمدید!!'
-Mobile apps: "برنامه‌های موبایل"
+        paragraph_1: "به شما کمک خواهیم کرد تا wallabag را بشناسید و با برخی از ویژگی‌های جالبش آشنا شوید"
-Bookmarklet: "ابزار علامت‌گذاری صفحه‌ها"
+        paragraph_2: 'ادامه دهید!'
-Standard Firefox Add-On: "افزونهٔ فایرفاکس"
+    configure:
-Chrome Extension: "افزونهٔ کروم"
+        title: 'برنامه را تنظیم کنید'
-download the application: "برنامه را باربگیرید"
+        language: 'زبان و نمای برنامه را تغییر دهید'
-"Drag &amp; drop this link to your bookmarks bar:": "این پیوند را به نوار بوک‌مارک مرورگرتان بکشید:"
+        rss: 'خوراک آر-اس-اس را فعال کنید'
+        tagging_rules: 'قانون‌های برچسب‌گذاری خودکار مقاله‌هایتان را تعریف کنید'
+    admin:
+        title: 'مدیریت'
+        description: 'به عنوان مدیر، شما دسترسی‌های بیشتری به wallabag دارید. شما می‌توانید:'
+        new_user: 'کاربر تازه‌ای بسازید'
+        analytics: 'تحلیل‌های آماری را تنظیم کنید'
+        sharing: 'گزینه‌های مربوط به هم‌رسانی مقاله‌ها را فعال کنید'
+        export: 'برون‌سپاری را تنظیم کنید'
+        import: 'درون‌ریزی را تنظیم کنید'
+    first_steps:
+        title: 'گام نخست'
+        new_article: 'نخستین مقالهٔ خود را ذخیره کنید'
+        unread_articles: 'و آن را طبقه‌بندی کنید!'
+    migrate:
+        title: 'از سرویس قبلی خود به این‌جا مهاجرت کنید'
+        description: "آیا سرویس دیگری را به‌کار می‌برید؟ داده‌هایتان را به wallabag بیاورید.."
+        pocket: 'مهاجرت از Pocket'
+        wallabag_v1: 'مهاجرت از نسخهٔ یکم wallabag'
+        wallabag_v2: 'مهاجرت از نسخهٔ دوم wallabag'
+    developer:
+        title: 'برنامه‌نویسان'
+        create_application: 'برنامهٔ wallabag خود را بسازید'
+    docs:
+        title: 'راهنمای کامل'
+        annotate: 'روی مقاله‌هایتان یادداشت بگذارید'
+        export: 'مقاله‌هایتان را به قالب ePUB یا PDF دربیاورید'
+        search_filters: 'به کمک موتور جستجو و فیلترها به دنبال مقاله‌هایتان بگردید'
+        fetching_errors: 'اگر مقاله‌ای هنگام ذخیره‌ شدن به مشکل برخورد چه کار کنید؟'
+        all_docs: 'و بسیاری از موضوعات دیگر'
+    support:
+        title: 'پشتیبانی'
+        description: 'به کمک نیاز دارید؟ ما پشتیبان شما هستیم!'
+        github: 'روی گیت‌هاب'
+        email: 'با ایمیل'
+        gitter: 'روی گیتر'
 
-# Flash messages
+tag:
-Information updated: "اطلاعات به‌روز شد"
+    page_title: 'برچسب‌ها'
-"Config saved. Some parameters will be considered after disconnection.": "پیکربندی ذخیره شد. برخی از تنظیمات پس از این که قطع شدید اعمال می‌شود."
+    list:
-RSS information updated: "اطلاعات آر-اس-اس به‌روز شد"
+        number_on_the_page: '{0} هیچ برچسبی نیست.|{1} یک برچسب هست.|]1,Inf[ %count% برچسب هست.'
-Password updated: "رمز به‌روز شد"
-Entry starred: "مقاله برگزیده شد"
-Entry unstarred: "مقاله نابرگزیده شد"
-Entry archived: "مقاله بایگانی شد"
-Entry unarchived: "مقاله از بایگانی درآمد"
-Entry deleted: "مقاله پاک شد"
 
-# Entry
+import:
-Mark as read: 'خوانده‌شده'
+     page_title: 'درون‌ریزی'
-Favorite: 'برگزیده'
+     page_description: 'به درون‌ریز wallabag خوش آمدید. لطفاً سرویس قبلی خود را که می‌خواهید از آن مهاجرت کنید انتخاب کنید.'
-back: 'بازگشت'
+     action:
-original article: 'مقالهٔ اصلی'
+        import_contents: 'درون‌ریزی مقاله‌ها'
-Add a tag: 'افزودن برچسب'
+     form:
-Share: 'هم‌رسانی'
+        mark_as_read_title: 'علامت‌زدن همه به عنوان خوانده‌شده؟'
-Download: 'بارگیری'
+        mark_as_read_label: 'همهٔ مقاله‌های درون‌ریزی شده را به عنوان خوانده‌شده علامت بزن'
-Does this article appear wrong?: "آیا مقاله نادرست نشان داده شده؟"
+        file_label: 'پرونده'
-Problems?: 'مشکلات؟'
+        save_label: 'بارگذاری پرونده'
-Edit title: "ویرایش عنوان"
+     pocket:
+        page_title: 'درون‌ریزی > Pocket'
+        description: "این برنامه همهٔ داده‌های Pocket شما را درون‌ریزی می‌کند. سرویس Pocket اجازه نمی‌دهد که متن مقاله‌ها را درون‌ریزی کنیم، بنابراین wallabag متن مقاله‌ها را دوباره از اینترنت دریافت می‌کند."
+        config_missing:
+           description: "درون‌ریزی از Pocket تنظیم نشده است."
+           admin_message: 'شما باید %keyurls%یک pocket_consumer_key%keyurle% تعریف کنید.'
+           user_message: 'مدیر سرور شما باید یک API Key برای Pocket تعریف کند.'
+        authorize_message: 'شما می‌توانید داده‌هایتان را از حساب Pocket خود درون‌ریزی کنید. روی دکمهٔ زیر کلیک کنید و به برنامه اجازه دهید تا به getpocket.com وصل شود.'
+        connect_to_pocket: 'به Pocket وصل شو و داده‌ها را دریافت کن'
+     wallabag_v1:
+        page_title: 'درون‌ریزی > Wallabag v1'
+        description: 'این برنامه همهٔ داده‌های شما را در نسخهٔ ۱ wallabag درون‌ریزی می‌کند. در صفحهٔ تنظیمات، روی "JSON export" در بخش "Export your wallabag data" کلیک کنید. با این کار شما پرونده‌ای به شکل "wallabag-export-1-xxxx-xx-xx.json" دریافت خواهید کرد.'
+        how_to: 'لطفاً پرونده را انتخاب کنید و روی دکمهٔ زیر کلیک کنید تا بارگذاری و درون‌ریزی شود.'
+     wallabag_v2:
+        page_title: 'درون‌ریزی > Wallabag v2'
+        description: 'این برنامه همهٔ داده‌های شما را در نسخهٔ ۲ wallabag درون‌ریزی می‌کند. به بخش «همهٔ مقاله‌ها» بروید و در بخش «برون‌ریزی» روی "JSON" کلیک کنید. با این کار شما پرونده‌ای به شکل "All articles.json" دریافت خواهید کرد.'
+
+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: 'بازگشت'
+    # client_parameter:
+    #     page_title: 'Developer > Client parameters'
+    #     page_description: 'Here are your client parameters.'
+    #     field_id: 'Client ID'
+    #     field_secret: 'Client secret'
+    #     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: 'بازگشت'
+
+validator:
+    password_must_match: 'رمزها باید یکی باشند'
+    password_too_short: 'رمز شما باید ۸ حرف یا بیشتر باشد'
+    password_wrong_value: 'رمز فعلی را اشتباه وارد کرده‌اید'
+    item_per_page_too_high: 'با این تعداد برنامه به فنا می‌رود'
+    rss_limit_too_hight: 'با این تعداد برنامه به فنا می‌رود'
+
+flashes:
+    config:
+        notice:
+           config_saved: 'پیکربندی ذخیره شد. برخی از تنظیمات پس از این که قطع شدید اعمال می‌شود.'
+           password_updated: 'رمز به‌روز شد'
+           password_not_updated_demo: "در حالت نمایشی نمی‌توانید رمز کاربر را عوض کنید."
+           user_updated: 'اطلاعات به‌روز شد'
+           rss_updated: 'اطلاعات آر-اس-اس به‌روز شد'
+           tagging_rules_updated: 'برچسب‌گذاری خودکار به‌روز شد'
+           tagging_rules_deleted: 'قانون برچسب‌گذاری پاک شد'
+           user_added: 'کابر "%username%" افزوده شد'
+           rss_token_updated: 'کد آر-اس-اس به‌روز شد'
+    entry:
+        notice:
+           entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود'
+           entry_saved: 'مقاله ذخیره شد'
+           entry_updated: 'مقاله به‌روز شد'
+           entry_reloaded: 'مقاله به‌روز شد'
+           entry_reload_failed: 'به‌روزرسانی مقاله شکست خورد'
+           entry_archived: 'مقاله بایگانی شد'
+           entry_unarchived: 'مقاله از بایگانی درآمد'
+           entry_starred: 'مقاله برگزیده شد'
+           entry_unstarred: 'مقاله نابرگزیده شد'
+           entry_deleted: 'مقاله پاک شد'
+    tag:
+        notice:
+           tag_added: 'برچسب افزوده شد'
+    import:
+        notice:
+            failed: 'درون‌ریزی شکست خورد. لطفاً دوباره تلاش کنید.'
+            failed_on_file: 'خطا هنگام پردازش پروندهٔ ورودی. آیا پروندهٔ درون‌ریزی شده سالم است؟'
+            summary: 'گزارش درون‌ریزی: %imported% وارد شد, %skipped% از قبل ذخیره شده بود.'
+    developer:
+        notice:
+            # client_created: 'New client created.'
+            # client_deleted: 'Client deleted'

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

@@ -1,277 +1,425 @@
-#Login
+security:
-Keep me logged in: 'Rester connecté'
+    login:
-Forgot your password?: 'Mot de passe oublié ?'
+        page_title: 'Bienvenue sur wallabag !'
-Login: 'Se connecter'
+        keep_logged_in: 'Rester connecté'
-Back to login: 'Revenir au formulaire de connexion'
+        forgot_password: 'Mot de passe oublié ?'
-Send: 'Envoyer'
+        submit: 'Se connecter'
-"Enter your email address below and we'll send you password reset instructions.": "Saisissez votre adresse e-mail ci-dessous, nous vous enverrons les instructions pour réinitialiser votre mot de passe."
+        register: 'Créer un compte'
-Register: 'Créer un compte'
+        username: "Nom d'utilisateur"
+        password: 'Mot de passe'
+        cancel: 'Annuler'
+    resetting:
+        description: "Saisissez votre adresse e-mail ci-dessous, nous vous enverrons les instructions pour réinitialiser votre mot de passe."
+    register:
+        page_title: 'Se créer un compte'
+        go_to_account: 'Aller sur votre compte'
 
-# Menu
+menu:
-unread: 'Non lus'
+    left:
-starred: 'Favoris'
+        unread: 'Non lus'
-archive: 'Lus'
+        starred: 'Favoris'
-all: 'Tous les articles'
+        archive: 'Lus'
-tags: 'Tags'
+        all_articles: 'Tous les articles'
-config: 'Configuration'
+        config: 'Configuration'
-internal settings: 'Configuration interne'
+        tags: 'Tags'
-import: 'Importer'
+        internal_settings: 'Configuration interne'
-howto: 'Aide'
+        import: 'Importer'
-logout: 'Déconnexion'
+        howto: 'Aide'
-Filtered: 'Articles filtrés'
+        developer: 'Développeur'
-About: 'À propos'
+        logout: 'Déconnexion'
+        about: 'À propos'
+        search: 'Recherche'
+        save_link: 'Sauvegarder un nouvel article'
+        back_to_unread: 'Retour aux articles non lus'
+    top:
+        add_new_entry: 'Sauvegarder un nouvel article'
+        search: 'Rechercher'
+        filter_entries: 'Filtrer les articles'
+        export: 'Exporter'
+    search_form:
+        input_label: 'Saisissez votre terme de recherche'
 
-# Header
+footer:
-Back to unread articles: 'Retour aux articles non lus'
+    wallabag:
-Add a new entry: 'Sauvegarder un nouvel article'
+        elsewhere: 'Emportez wallabag avec vous'
-Search: 'Rechercher'
+        social: 'Social'
-Filter entries: 'Filtrer les articles'
+        powered_by: 'propulsé par'
-Enter your search here: 'Saisissez votre terme de recherche'
+        about: 'À propos'
-Save new entry: 'Sauvegarder un nouvel article'
+    page_title: 'Configuration'
-Export: Exporter
 
-# Config screen
+config:
-Settings: 'Paramètres'
+    tab_menu:
-User information: 'Mon compte'
+        settings: 'Paramètres'
-Password: 'Mot de passe'
+        rss: 'RSS'
-RSS: 'RSS'
+        user_info: 'Mon compte'
-Add a user: 'Créer un compte'
+        password: 'Mot de passe'
-Theme: 'Thème'
+        rules: 'Règles de tag automatiques'
-Items per page: "Nombre d'articles par page"
+        new_user: 'Créer un compte'
-Language: 'Langue'
+    form:
-Save: 'Enregistrer'
+        save: 'Enregistrer'
-RSS token: 'Jeton RSS'
+    form_settings:
-RSS token updated: 'Jeton RSS mis à jour'
+        theme_label: 'Thème'
-Name: 'Nom'
+        items_per_page_label: "Nombre d'articles par page"
-Email: 'Adresse e-mail'
+        language_label: 'Langue'
-No token: 'Aucun jeton généré'
+        reading_speed:
-Reset your token: 'Réinitialisez votre jeton'
+            label: 'Vitesse de lecture'
-Create your token: 'Créez votre jeton'
+            help_message: 'Vous pouvez utiliser un outil en ligne pour estimer votre vitesse de lecture :'
-Rss limit: "Nombre d'articles dans un flux RSS"
+            100_word: 'Je lis environ 100 mots par minute'
-RSS links: 'URL de vos flux RSS'
+            200_word: 'Je lis environ 200 mots par minute'
-"RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.": "Les flux RSS fournis par wallabag vous permettent de lire vos articles sauvegardés dans votre lecteur de flux préféré. Pour pouvoir les utiliser, vous devez d'abord créer un jeton."
+            300_word: 'Je lis environ 300 mots par minute'
-Old password: 'Mot de passe actuel'
+            400_word: 'Je lis environ 400 mots par minute'
-New password: 'Nouveau mot de passe'
+    form_rss:
-Repeat new password: 'Confirmez votre nouveau mot de passe'
+        description: "Les flux RSS fournis par wallabag vous permettent de lire vos articles sauvegardés dans votre lecteur de flux préféré. Pour pouvoir les utiliser, vous devez d'abord créer un jeton."
-Username: "Nom d'utilisateur"
+        token_label: 'Jeton RSS'
-Two factor authentication: "Double authentification"
+        no_token: 'Aucun jeton généré'
-"Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion": "Activer l'authentification double-facteur veut dire que vous allez recevoir un code par email à chaque nouvelle connexion non approuvée."
+        token_create: 'Créez votre jeton'
+        token_reset: 'Réinitialisez votre jeton'
+        rss_links: 'URL de vos flux RSS'
+        rss_link:
+            unread: 'non lus'
+            starred: 'favoris'
+            archive: 'lus'
+        rss_limit: "Nombre d'articles dans le flux"
+    form_user:
+        two_factor_description: "Activer l'authentification double-facteur veut dire que vous allez recevoir un code par email à chaque nouvelle connexion non approuvée."
+        name_label: 'Nom'
+        email_label: 'Adresse e-mail'
+        twoFactorAuthentication_label: 'Double authentification'
+    form_password:
+        old_password_label: 'Mot de passe actuel'
+        new_password_label: 'Nouveau mot de passe'
+        repeat_new_password_label: 'Confirmez votre nouveau mot de passe'
+    form_rules:
+        if_label: 'si'
+        then_tag_as_label: 'alors attribuer les tags'
+        delete_rule_label: 'supprimer'
+        rule_label: 'Règle'
+        tags_label: 'Tags'
+        faq:
+            title: 'FAQ'
+            tagging_rules_definition_title: 'Que signifient les règles de tag automatiques ?'
+            tagging_rules_definition_description: "Ce sont des règles utilisées par wallabag pour classer automatiquement vos nouveaux articles.<br />À chaque fois qu'un nouvel article est ajouté, toutes les règles de tag automatiques seront utilisées afin d'ajouter les tags que vous avez configurés, vous épargnant ainsi l'effort de classifier vos articles manuellement."
+            how_to_use_them_title: 'Comment les utiliser ?'
+            how_to_use_them_description: 'Imaginons que voulez attribuer aux nouveaux articles le tag « <i>lecture courte</i> » lorsque le temps de lecture est inférieur à 3 minutes.<br />Dans ce cas, vous devriez mettre « readingTime &lt;= 3 » dans le champ <i>Règle</i> et « <i>lecture courte</i> » dans le champ <i>Tag</i>.<br />Plusieurs tags peuvent être ajoutés simultanément en les séparant par des virgules : « <i>lecture courte, à lire</i> »<br />Des règles complexes peuvent être créées en utilisant des opérateurs prédéfinis: si « <i>readingTime &gt;= 5 AND domainName = \"github.com\"</i> » alors attribuer les tags « <i>lecture longue, github </i> »'
+            variables_available_title: 'Quelles variables et opérateurs puis-je utiliser pour écrire des règles ?'
+            variables_available_description: 'Les variables et opérateurs suivants peuvent être utilisés pour écrire des règles de tag automatiques :'
+            meaning: 'Signification'
+            variable_description:
+                label: 'Variable'
+                title: "Titre de l'article"
+                url: "URL de l'article"
+                isArchived: "Si l'article est archivé ou non"
+                isStarred: "Si l'article est favori ou non"
+                content: "Le contenu de l'article"
+                language: "La langue de l'article"
+                mimetype: "Le type MIME de l'article"
+                readingTime: "Le temps de lecture estimé de l'article, en minutes"
+                domainName: "Le nom de domaine de l'article"
+            operator_description:
+                label: 'Opérateur'
+                less_than: 'Moins que…...'
+                strictly_less_than: 'Strictement moins que…'
+                greater_than: 'Plus que…'
+                strictly_greater_than: 'Strictement plus que…'
+                equal_to: 'Égal à…'
+                not_equal_to: 'Différent de…'
+                or: "Une règle OU l'autre"
+                and: "Une règle ET l'autre"
+                matches: 'Teste si un <i>sujet</i> correspond à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>title matches "football"</code>'
+    form_new_user:
+        username_label: "Nom d'utilisateur"
+        password_label: 'Mot de passe'
+        repeat_new_password_label: 'Confirmez votre nouveau mot de passe'
+        plain_password_label: 'Mot de passe en clair'
+        email_label: 'Adresse e-mail'
 
-# Tagging rules
+entry:
-Tagging rules: "Règles de tag automatiques"
+    page_titles:
-What does « tagging rules » mean?: "Que signifient les règles de tag automatiques ?"
+        unread: 'Articles non lus'
-"They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.": "Ce sont des règles utilisées par wallabag pour classer automatiquement vos nouveaux articles.<br />À chaque fois qu'un nouvel article est ajouté, toutes les règles de tag automatiques seront utilisées afin d'ajouter les tags que vous avez configurés, vous épargnant ainsi l'effort de classifier vos articles manuellement."
+        starred: 'Articles favoris'
-How do I use them?: "Comment les utiliser ?"
+        archived: 'Articles lus'
-"Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = \"github.com\"</i> » then tag as « <i>long reading, github </i> »": "Imaginons que voulez attribuer aux nouveaux articles le tag « <i>lecture courte</i> » lorsque le temps de lecture est inférieur à 3 minutes.<br />Dans ce cas, vous devriez mettre « readingTime &lt;= 3 » dans le champ <i>Règle</i> et « <i>lecture courte</i> » dans le champ <i>Tag</i>.<br />Plusieurs tags peuvent être ajoutés simultanément en les séparant par des virgules : « <i>lecture courte, à lire</i> »<br />Des règles complexes peuvent être créées en utilisant des opérateurs prédéfinis: si « <i>readingTime &gt;= 5 AND domainName = \"github.com\"</i> » alors attribuer les tags « <i>lecteur longue, github </i> »"
+        filtered: 'Articles filtrés'
-Which variables and operators can I use to write rules?: "Quelles variables et opérateurs puis-je utiliser pour écrire des règles ?"
+    list:
-The following variables and operators can be used to create tagging rules:: "Les variables et opérateurs suivants peuvent être utilisés pour écrire des règles de tag automatiques :"
+        number_on_the_page: "{0} Il n'y a pas d'articles.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles."
-Variable: "Variable"
+        reading_time: 'durée de lecture'
-Meaning: "Signification"
+        reading_time_minutes: 'durée de lecture: %readingTime% min'
-Operator: "Opérateur"
+        reading_time_less_one_minute: 'durée de lecture: <small class="inferieur">&lt;</small> 1 min'
-Title of the entry: "Titre de l'article"
+        original_article: 'original'
-Less than…: "Moins que…"
+        toogle_as_read: 'Marquer comme lu/non lu'
-URL of the entry: "URL de l'article"
+        toogle_as_star: 'Marquer comme favori'
-Strictly less than…: "Strictement moins que…"
+        delete: 'Supprimer'
-Whether the entry is archived or not: "Si l'article est archivé ou non"
+        export_title: 'Exporter'
-Greater than…: "Plus que…"
+    filters:
-Whether the entry is starred or not: "Si l'article est favori ou non"
+        title: 'Filtres'
-Strictly greater than…: "Strictement plus que…"
+        status_label: 'Status'
-The entry's content: "Le contenu de l'article"
+        archived_label: 'Lus'
-Equal to…: "Égal à…"
+        starred_label: 'Favoris'
-The entry's language: "La langue de l'article"
+        preview_picture_label: 'A une photo'
-Not equal to…: "Différent de…"
+        preview_picture_help: 'Photo'
-The entry's mime-type: "Le Type MIME de l'article"
+        language_label: 'Langue'
-One rule or another: "Une règle ou l'autre"
+        reading_time:
-The estimated entry's reading time, in minutes: "Le temps de lecture estimé de l'article, en minutes"
+            label: 'Durée de lecture en minutes'
-One rule and another: "Une règle et l'autre"
+            from: 'de'
-The domain name of the entry: "Le nom de domaine de l'article"
+            to: 'à'
-"Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches \"football\"</code>": "Teste si un <i>sujet</i> correspond à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>title matches \"football\"</code>"
+        domain_label: 'Nom de domaine'
-Rule: "Règle"
+        created_at:
-FAQ: "FAQ"
+            label: 'Date de création'
+            from: 'de'
+            to: 'à'
+        action:
+            clear: 'Effacer'
+            filter: 'Filtrer'
+    view:
+        left_menu:
+            back_to_top: 'Revenir en haut'
+            back_to_homepage: 'Retour'
+            set_as_read: 'Marquer comme lu'
+            set_as_unread: 'Marquer comme non lu'
+            set_as_favorite: 'Mettre en favori'
+            view_original_article: 'Article original'
+            re_fetch_content: 'Recharger le contenu'
+            delete: 'Supprimer'
+            add_a_tag: 'Ajouter un tag'
+            share_content: 'Partager'
+            share_email_label: 'Email'
+            download: 'Télécharger'
+            print: 'Imprimer'
+            problem:
+                label: 'Un problème ?'
+                description: "Est-ce que cet article s'affiche mal ?"
+        edit_title: 'Modifier le titre'
+        original_article: 'original'
+        annotations_on_the_entry: '{0} Aucune annotation|{1} Une annotation|]1,Inf[ %nbAnnotations% annotations'
+    new:
+        page_title: 'Sauvegarder un nouvel article'
+        placeholder: 'http://website.com'
+        form_new:
+            url_label: Url
+    edit:
+        page_title: 'Éditer un article'
+        title_label: 'Titre'
+        url_label: 'Url'
+        is_public_label: 'Public'
+        save_label: 'Enregistrer'
 
-# Entries
+about:
-"estimated reading time: %readingTime% min": "durée de lecture : %readingTime% min"
+    page_title: 'À propos'
-"estimated reading time: %inferior% 1 min": "durée de lecture : %inferior% 1 min"
+    top_menu:
-original: "original"
+        who_behind_wallabag: "L'équipe derrière wallabag"
-Toggle mark as read: 'Marquer comme lu/non lu'
+        getting_help: "Besoin d'aide"
-Toggle favorite: 'Marquer comme favori'
+        helping: 'Aider wallabag'
-Delete: 'Supprimer'
+        contributors: 'Contributeurs'
-"{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.": "{0} Il n'y a pas d'articles.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles."
+        third_party: 'Librairies tierces'
-http://website: "http://siteweb"
+    who_behind_wallabag:
-"{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations": "{0} Aucune annotation|{1} Une annotation|]1,Inf[ %nbAnnotations% annotations"
+        developped_by: 'Développé par'
+        website: 'Site web'
+        many_contributors: 'Et plein de contributeurs ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">sur Github</a>'
+        project_website: 'Site web du projet'
+        license: 'Licence'
+        version: 'Version'
+    getting_help:
+        documentation: 'Documentation'
+        bug_reports: 'Rapport de bugs'
+        support: '<a href="https://support.wallabag.org">Sur notre site de support</a> ou <a href="https://github.com/wallabag/wallabag/issues">sur GitHub</a>'
+    helping:
+        description: 'wallabag est gratuit et opensource. Vous pouvez nous aider :'
+        by_contributing: 'en contribuant au projet :'
+        by_contributing_2: 'un ticket recense tous nos besoins'
+        by_paypal: 'via Paypal'
+    contributors:
+        description: "Merci aux contributeurs de l'application web de wallabag"
+    third_party:
+        description: 'Voici la liste des dépendances utilisées dans wallabag (et leur license) :'
+        package: 'Dépendance'
+        license: 'Licence'
 
-# Edit entry
+howto:
-Edit an entry: "Éditer un article"
+    page_title: 'Aide'
-Title: "Titre"
+    page_description: "Il y a plusieurs façon d'enregistrer un article :"
-Is public: "Public"
+    top_menu:
+        browser_addons: 'Extensions de navigateur'
+        mobile_apps: 'Applications smartphone'
+        bookmarklet: 'Bookmarklet'
+    form:
+        description: 'Grâce à ce formulaire'
+    browser_addons:
+        firefox: 'Extension Firefox'
+        chrome: 'Extension Chrome'
+    mobile_apps:
+        android:
+            via_f_droid: 'via F-Droid'
+            via_google_play: 'via Google Play'
+        ios: 'sur iTunes Store'
+        windows: 'sur Microsoft Store'
+    bookmarklet:
+        description: 'Glissez et déposez ce lien dans votre barre de favoris :'
 
-# tag
+quickstart:
-Tags: Tags
+    page_title: 'Pour bien débuter'
-"{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.": "{0} Il n'y a pas de tag.|{1} Il y a un tag.|]1,Inf[ Il y a %count% tags."
+    intro:
+        title: 'Bienvenue sur wallabag !'
+        paragraph_1: "Nous allons vous accompagner pour vous faire faire le tour de la maison et vous présenter quelques fonctionnalités qui pourraient vous intéresser pour vous approprier cet outil."
+        paragraph_2: 'Suivez-nous !'
+    configure:
+        title: "Configurez l'application"
+        language: "Changez la langue et le design de l'application"
+        rss: 'Activez les flux RSS'
+        tagging_rules: 'Écrivez des règles pour classer automatiquement vos articles'
+    admin:
+        title: 'Administration'
+        description: "En tant qu'adminitrasteur sur wallabag, vous avez des privilèges qui vous permette de :"
+        new_user: 'Créer un nouvel utilisateur'
+        analytics: 'Configurer les statistiques'
+        sharing: 'Activer des paramètres de partages'
+        export: 'Configurer les export'
+        import: 'Configurer les import'
+    first_steps:
+        title: 'Premiers pas'
+        new_article: 'Ajoutez votre premier article'
+        unread_articles: 'Et rangez-le !'
+    migrate:
+        title: 'Migrer depuis un service existant'
+        description: "Vous êtes un ancien utilisateur d'un service existant ? Nous allons vous aider à récupérer vos données sur wallabag."
+        pocket: 'Migrer depuis Pocket'
+        wallabag_v1: 'Migrer depuis wallabag v1'
+        wallabag_v2: 'Migrer depuis wallabag v2'
+    developer:
+        title: 'Pour les développeurs'
+        create_application: 'Créer votre application tierce'
+    docs:
+        title: 'Documentation complète'
+        annotate: 'Annotater votre article'
+        export: 'Convertissez vos articles en ePub ou en PDF'
+        search_filters: "Apprenez à utiliser le moteur de recherche et les filtres pour retrouver l'article qui vous intéresse"
+        fetching_errors: "Que faire si mon article n'est pas correctement récupéré ?"
+        all_docs: "Et encore plein d'autres choses !"
+    support:
+        title: 'Support'
+        description: 'Parce que vous avez peut-être besoin de nous poser une question, nous sommes disponibles pour vous.'
+        github: 'Sur GitHub'
+        email: 'Par e-mail'
+        gitter: 'Sur Gitter'
 
-# Filters
+tag:
-Filters: 'Filtres'
+    page_title: 'Tags'
-Status: 'Statut'
+    list:
-Archived: 'Lu'
+        number_on_the_page: "{0} Il n'y a pas de tag.|{1} Il y a un tag.|]1,Inf[ Il y a %count% tags."
-Starred: 'Favori'
-Preview picture: 'Photo'
-Has a preview picture: 'A une photo'
-Reading time in minutes: 'Durée de lecture en minutes'
-from: 'de'
-to: 'à'
-website.com: 'website.com'
-Domain name: 'Nom de domaine'
-Creation date: 'Date de création'
-dd/mm/yyyy: 'jj/mm/aaaa'
-Clear: 'Effacer'
-Filter: 'Filtrer'
-website.com: "siteweb.com"
 
-# About
+import:
-About: "À propos"
+    page_title: 'Importer'
-Who is behind wallabag: "L'équipe derrière wallabag"
+    page_description: "Bienvenue dans l'outil de migration de wallabag. Choisissez ci-dessous le service depuis lequel vous souhaitez migrer."
-Getting help: "Besoin d'aide"
+    action:
-Helping wallabag: "Aider wallabag"
+        import_contents: 'Importer les contenus'
-Developed by: "Développé par"
+    form:
-website: "Site web"
+        mark_as_read_title: 'Marquer tout comme lu ?'
-And many others contributors ♥: "Et plein de contributeurs ♥"
+        mark_as_read_label: 'Marquer tous les contenus importés comme lus'
-on GitHub: "sur GitHub"
+        file_label: 'Fichier'
-Project website: "Site web du projet"
+        save_label: 'Importer le fichier'
-License: "Licence"
+    pocket:
-Version: "Version"
+        page_title: 'Importer > Pocket'
-Documentation: "Documentation"
+        description: "Cet outil va importer toutes vos données de Pocket. Pocket ne nous autorise pas à récupérer le contenu depuis leur service, donc wallabag doit reparcourir chaque article pour récupérer son contenu."
-Bug reports: "Rapport de bugs"
+        config_missing:
-On our support website: "Sur notre site de support"
+            description: "L'import à partir de Pocket n'est pas configuré."
-or: "ou"
+            admin_message: "Vous devez définir %keyurls%une clé pour l'API Pocket%keyurle%."
-"wallabag is free and opensource. You can help us:": "wallabag est gratuit et opensource. Vous pouvez nous aider :"
+            user_message: "L'administrateur de votre serveur doit définir une clé pour l'API Pocket."
-"by contributing to the project:": "en contribuant au projet :"
+        authorize_message: "Vous pouvez importer vos données depuis votre compte Pocket. Vous n'avez qu'à cliquer sur le bouton ci-dessous et à autoriser wallabag à se connecter à getpocket.com."
-an issue lists all our needs: "un ticket recense tous nos besoins"
+        connect_to_pocket: 'Se connecter à Pocket et importer les données'
-via Paypal: "via Paypal"
+    wallabag_v1:
-Take wallabag with you: "Emportez wallabag avec vous"
+        page_title: 'Importer > Wallabag v1'
-Social: "Social"
+        description: 'Cet outil va importer toutes vos données de wallabag v1. Sur votre page de configuration de wallabag v1, cliquez sur "Export JSON" dans la section "Exporter vos données de wallabag". Vous allez récupérer un fichier "wallabag-export-1-xxxx-xx-xx.json".'
-powered by: "propulsé par"
+        how_to: "Choisissez le fichier de votre export wallabag v1 et cliquez sur le bouton ci-dessous pour l'importer."
-Contributors: "Contributeurs"
+    wallabag_v2:
-Thank you to contributors on wallabag web application: "Merci aux contributeurs de l'application web de wallabag"
+        page_title: 'Importer > Wallabag v2'
-Third-party libraries: Librairies tierces
+        description: "Cet outil va importer tous vos articles d'une autre instance de wallabag v2. Allez dans tous vos articles, puis, sur la barre latérale, cliquez sur \"JSON\". Vous allez récupérer un fichier \"All articles.json\""
-"Here are the list of third-party libraries used in wallabag (with their licenses):": "Voici la liste des dépendances utilisées dans wallabag (et leur license) :"
-Package: Dépendance
-License: Licence
 
-# Howto
+developer:
-Form: "Formulaire"
+    page_title: 'Développeur'
-Thanks to this form: "Grâce à ce formulaire"
+    welcome_message: "Bienvenue sur l'API de wallabag"
-Browser addons: "Extensions de navigateur"
+    documentation: 'Documentation'
-Mobile apps: "Applications smartphone"
+    how_to_first_app: 'Comment créer votre première application'
-Bookmarklet: "Bookmarklet"
+    full_documentation: "Voir la documentation complète de l'API"
-Standard Firefox Add-On: "Extension Firefox"
+    list_methods: "Lister toutes les méthodes de l'API"
-Chrome Extension: "Extension Chrome"
+    clients:
-download the application: "téléchargez l'application"
+        title: 'Clients'
-"Drag &amp; drop this link to your bookmarks bar:": "Glissez et déposez ce lien dans votre barre de favoris :"
+        create_new: 'Créer une nouveau client'
+    existing_clients:
+        title: 'Les clients existants'
+        field_id: 'ID Client'
+        field_secret: 'Clé secrète'
+        field_uris: 'URLs de redirection'
+        field_grant_types: 'Type de privilège accordé'
+        no_client: 'Aucun client pour le moment'
+    remove:
+        warn_message_1: 'Vous avez la possibilité de supprimer un client. Cette action est IRREVERSIBLE !'
+        warn_message_2: "Si vous supprimez un client, toutes les applications qui l'utilisaient ne fonctionneront plus avec votre compte wallabag."
+        action: 'Supprimer ce client'
+    client:
+        page_title: 'Développeur > Nouveau client'
+        page_description: "Vous allez créer un nouveau client. Merci de remplir l'url de redirection vers votre application."
+        form:
+            redirect_uris_label: 'URLs de redirection'
+            save_label: 'Créer un nouveau client'
+        action_back: 'Retour'
+    client_parameter:
+        page_title: 'Développeur > Les paramètres de votre client'
+        page_description: 'Voilà les paramètres de votre client'
+        field_id: 'ID Client'
+        field_secret: 'Clé secrète'
+        back: 'Retour'
+        read_howto: 'Lire "comment créer ma première application"'
+    howto:
+        page_title: 'Développeur > Comment créer votre première application'
+        description:
+            paragraph_1: "Les commandes suivantes utilisent la <a href=\"https://github.com/jkbrzt/httpie\">librarie HTTPie</a>. Assurez-vous qu'elle soit installée avant de l'utiliser."
+            paragraph_2: "Vous avez besoin d'un token pour échanger entre votre application et l'API de wallabag."
+            paragraph_3: 'Pour créer un token, vous devez <a href="%link%">créer un nouveau client</a>.'
+            paragraph_4: 'Maintenant créez votre token (remplacer client_id, client_secret, username et password avec les bonnes valeurs):'
+            paragraph_5: "L'API vous retournera une réponse comme ça :"
+            paragraph_6: "L'access_token doit être utilisé pour faire un appel à l'API. Par exemple :"
+            paragraph_7: "Cet appel va retourner tous les articles de l'utilisateur."
+            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'
 
-# Flash messages
+validator:
-Information updated: "Vos informations personnelles ont bien été mises à jour"
+    password_must_match: 'Les deux mots de passe doivent être les mêmes'
-"Config saved. Some parameters will be considered after disconnection.": "Les paramètres ont bien été mis à jour. Certains seront pris en compte après déconnexion."
+    password_too_short: 'Le mot de passe doit contenir au moins 8 caractères'
-RSS information updated: "La configuration des flux RSS a bien été mise à jour"
+    password_wrong_value: 'Votre mot de passe actuel est faux'
-Password updated: "Votre mot de passe a bien été mis à jour"
+    item_per_page_too_high: "Ca ne va pas plaire à l'application"
-Entry starred: "Article ajouté dans les favoris"
+    rss_limit_too_hight: "Ca ne va pas plaire à l'application"
-Entry unstarred: "Article retiré des favoris"
-Entry archived: "Article marqué comme lu"
-Entry unarchived: "Article marqué comme non lu"
-Entry deleted: "Article supprimé"
-Tagging rule deleted: "Règle supprimée"
-Tagging rules updated: "Règles mises à jour"
-User "%username%" added: 'Utilisateur "%username%" ajouté'
-In demonstration mode, you can't change password for this user.: 'En démo, vous ne pouvez pas changer le mot de passe de cet utilisateur.'
 
-# Entry
+flashes:
-Mark as read: 'Marquer comme lu'
+    config:
-Favorite: 'Mettre en favori'
+        notice:
-back: 'Retour'
+            config_saved: 'Les paramètres ont bien été mis à jour. Certains seront pris en compte après déconnexion.'
-original article: 'Article original'
+            password_updated: 'Votre mot de passe a bien été mis à jour'
-Add a tag: 'Ajouter un tag'
+            password_not_updated_demo: "En démo, vous ne pouvez pas changer le mot de passe de cet utilisateur."
-Share: 'Partager'
+            user_updated: 'Vos informations personnelles ont bien été mises à jour'
-Download: 'Télécharger'
+            rss_updated: 'La configuration des flux RSS a bien été mise à jour'
-Does this article appear wrong?: "Est-ce que cet article s'affiche mal ?"
+            tagging_rules_updated: 'Règles mises à jour'
-Problems?: 'Un problème ?'
+            tagging_rules_deleted: 'Règle supprimée'
-Edit title: "Modifier le titre"
+            user_added: 'Utilisateur "%username%" ajouté'
-Re-fetch content: "Recharger le contenu"
+            rss_token_updated: 'Jeton RSS mis à jour'
-Tag added: "Tag ajouté"
+    entry:
-
+        notice:
-# Import
+            entry_already_saved: 'Article déjà sauvergardé le %date%'
-Welcome to wallabag importer. Please select your previous service that you want to migrate.: "Bienvenue dans l'outil de migration de wallabag. Choisissez ci-dessous le service depuis lequel vous souhaitez migrer."
+            entry_saved: 'Article enregistré'
-"This importer will import all your Pocket data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag.": "Cet outil va importer toutes vos données de Pocket. Pocket ne nous autorise pas à récupérer le contenu depuis leur service, donc wallabag doit reparcourir chaque article pour récupérer son contenu."
+            entry_updated: 'Article mis à jour'
-"This importer will import all your wallabag v1 articles. On your config page, click on \"JSON export\" in the \"Export your wallabag data\" section. You will have a \"wallabag-export-1-xxxx-xx-xx.json\" file.": "Cet outil va importer toutes vos données de wallabag v1. Sur votre page de configuration de wallabag v1, cliquez sur \"Export JSON\" dans la section \"Exporter vos données de wallabag\". Vous allez récupérer un fichier \"wallabag-export-1-xxxx-xx-xx.json\"."
+            entry_reloaded: 'Article rechargé'
-"This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on \"JSON\". You will have a \"All articles.json\" file.": "Cet outil va importer tous vos articles d'une autre instance de wallabag v2. Allez dans tous vos articles, puis, sur la barre latérale, cliquez sur \"JSON\". Vous allez récupérer un fichier \"All articles.json\""
+            entry_reload_failed: "Le rechargement de l'article a échoué"
-"You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.": "Vous pouvez importer vos données depuis votre compte Pocket. Vous n'avez qu'à cliquer sur le bouton ci-dessous et à autoriser wallabag à se connecter à getpocket.com."
+            entry_archived: 'Article marqué comme lu'
-Import > Pocket: "Import > Pocket"
+            entry_unarchived: 'Article marqué comme non lu'
-Pocket import isn't configured.: "L'import à partir de Pocket n'est pas configuré."
+            entry_starred: 'Article ajouté dans les favoris'
-You need to define %keyurls% a pocket_consumer_key %keyurle%.: "Vous devez définir %keyurls% une clé pour l'API Pocket %keyurle%."
+            entry_unstarred: 'Article retiré des favoris'
-Your server admin needs to define an API Key for Pocket.: L'administrateur de votre serveur doit définir une clé pour l'API Pocket."
+            entry_deleted: 'Article supprimé'
-Connect to Pocket and import data: "Se connecter à Pocket et importer les données"
+    tag:
-Please select your wallabag export and click on the below button to upload and import it.: "Choisissez le fichier de votre export wallabag v1 et cliquez sur le bouton ci-dessous pour l'importer."
+        notice:
-File: "Fichier"
+            tag_added: 'Tag ajouté'
-Upload file: "Importer le fichier"
+    import:
-Import contents: "Importer les contenus"
+        notice:
-Import: "Importer"
+            failed: "L'import a échoué, veuillez ré-essayer"
-Import > Wallabag v1: "Importer > Wallabag v1"
+            failed_on_file: "Erreur lors du traitement de l'import. Vérifier votre fichier."
-Import > Wallabag v2: "Importer > Wallabag v2"
+            summary: "Rapport d'import: %imported% importés, %skipped% déjà présent."
-Mark all as read ?: "Marquer tout comme lu ?"
+    developer:
-Mark all imported entries as read: "Marquer tous les contenus importés comme lus"
+        notice:
-
+            client_created: 'Nouveau client créé'
-# Quickstart
+            client_deleted: 'Client supprimé'
-Quickstart: Pour bien débuter
-Welcome to wallabag!: "Bienvenue sur wallabag !"
-We'll accompany you to visit wallabag and show you some features which can interess you.: "Nous allons vous accompagner pour vous faire faire le tour de la maison et vous présenter quelques fonctionnalités qui pourraient vous intéresser pour vous approprier cet outil."
-Follow us!: "Suivez-nous !"
-Configure the application: "Configurez l'application"
-Change language and design: "Changez la langue et le design de l'application"
-Enable RSS feeds: "Activez les flux RSS"
-First steps: "Premiers pas"
-Save your first article: "Ajoutez votre premier article"
-And classify it!: "Et rangez-le !"
-Migrate from an existing service: "Migrer depuis un service existant"
-You're using an other service? We'll help you to retrieve your data on wallabag.: "Vous êtes un ancien utilisateur d'un service existant ? Nous allons vous aider à récupérer vos données sur wallabag."
-Migrate from Pocket: "Migrer depuis Pocket"
-Migrate from wallabag v1: "Migrer depuis wallabag v1"
-Full documentation: "Documentation complète"
-Convert your articles into ePUB or PDF: "Convertissez vos articles en ePub ou en PDF"
-See how you can look for an article by using search engine and filters: "Apprenez à utiliser le moteur de recherche et les filtres pour retrouver l'article qui vous intéresse"
-And so many other articles!: "Et encore plein d'autres choses !"
-Support: "Support"
-If you need some help, we are here for you.: "Parce que vous avez peut-être besoin de nous poser une question, nous sommes disponibles pour vous."
-On GitHub: "Sur GitHub"
-By email: "Par email"
-On Gitter: "Sur Gitter"
-
-# developer
-Developer: Développeur
-Welcome to the wallabag API: "Bienvenue sur l'API de wallabag"
-How to create my first application: "Comment créer votre première application"
-View full API documentation: "Voir la documentation complète de l'API"
-Clients: "Clients"
-Create a new client: "Créer une nouveau client"
-Existing clients: "Les clients existants"
-Client ID: "ID Client"
-Client secret: "Clé secrète"
-Redirect URIs: "URLs de redirection"
-Grant type allowed: "Type de privilège accordé"
-You have the ability to remove this client. This action is IRREVERSIBLE !: "Vous avez la possibilité de supprimer un client. Cette action est IRREVERSIBLE !"
-If you remove it, every app configured with that client won't be able to auth on your wallabag.: "Si vous supprimez un client, toutes les applications qui l'utilisaient ne fonctionneront plus avec votre compte wallabag."
-Remove this client: "Supprimer ce client"
-New client: "Nouveau client"
-You are about to create a new client. Please fill the field below for the redirect URI of your application.: "Vous allez créer un nouveau client. Merci de remplir l'url de redirection vers votre application."
-Back: "Retour"
-Client parameters: "Les paramètres de votre client"
-New client created.: "Nouveau client créé."
-Here are your client parameters.: "Voilà les paramètres de votre client"
-Read the howto "Create my first application": "Lire \"comment créer ma première application\""
-Client deleted: "Client supprimé"
-No client yet.: "Aucun client pour le moment"
-"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.": "Les commandes suivantes utilisent la <a href=\"https://github.com/jkbrzt/httpie\">librarie HTTPie</a>. Assurez-vous qu'elle soit installée avant de l'utiliser."
-You need a token to communicate between your 3rd application and wallabag API.: "Vous avez besoin d'un token pour échanger entre votre application et l'API de wallabag."
-"To create this token, you need <a href=\"%link%\">to create a new client</a>.": "Pour créer un token, vous devez <a href=\"%link%\">créer un nouveau client</a>."
-Now, create your token (replace client_id, client_secret, username and password with the good values):: "Maintenant créez votre token (remplacer client_id, client_secret, username et password avec les bonnes valeurs):"
-The API will return a response like this:: "L'API vous retournera une réponse comme ça:"
-The access_token is useful to do a call to the API endpoint. For example:: "L'access_token doit être utilisé pour faire un appel à l'API. Par exemple :"
-This call will return all the entries for your user.: "Cet appel va retourner tous les articles de l'utilisateur."
-"If you want to see all the API endpoints, you can have a look <a href=\"%link%\">to our API documentation</a>.": "Si vous voulez toutes les méthodes de l'API, jetez un oeil <a href=\"%link%\">à la documentation de l'API</a>."

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

@@ -0,0 +1,425 @@
+security:
+    login:
+        page_title: 'Benvenguda sus wallabag !'
+        keep_logged_in: 'Demorar connectat'
+        forgot_password: 'Senhal doblidat ?'
+        submit: 'Se connectar'
+        register: 'Crear un compte'
+        username: "Nom d'utilizaire"
+        password: 'Senhal'
+        cancel: 'Anullar'
+    resetting:
+        description: "Picatz vòstra adreça de corrièl çai-jos, vos mandarem las instruccions per reïnicializar vòstre senhal."
+    register:
+        page_title: 'Se crear un compte'
+        go_to_account: 'Anar sus vòstre compte'
+
+menu:
+    left:
+        unread: 'Pas legits'
+        starred: 'Favorits'
+        archive: 'Legits'
+        all_articles: 'Tots los articles'
+        config: 'Configuracion'
+        tags: 'Etiquetas'
+        internal_settings: 'Configuracion interna'
+        import: 'Importar'
+        howto: 'Ajuda'
+        developer: 'Desvolopador'
+        logout: 'Déconnexion'
+        about: 'A prepaus'
+        search: 'Cercar'
+        save_link: 'Enregistrar un novèl article'
+        back_to_unread: 'Tornar als articles pas legits'
+    top:
+        add_new_entry: 'Enregistrar un novèl article'
+        search: 'Cercar'
+        filter_entries: 'Filtrar los articles'
+        export: 'Exportar'
+    search_form:
+        input_label: 'Picatz vòstre mot-clau a cercar aquí'
+
+footer:
+    wallabag:
+        elsewhere: 'Emportatz wallabag amb vosaultres'
+        social: 'Social'
+        powered_by: 'propulsat per'
+        about: 'A prepaus'
+    page_title: 'Configuracion'
+
+config:
+    tab_menu:
+        settings: 'Paramètres'
+        rss: 'RSS'
+        user_info: 'Mon compte'
+        password: 'Senhal'
+        rules: "Règlas d'etiquetas automaticas"
+        new_user: 'Crear un compte'
+    form:
+        save: 'Enregistrar'
+    form_settings:
+        theme_label: 'Tèma'
+        items_per_page_label: "Nombre d'articles per pagina"
+        language_label: 'Lenga'
+        reading_speed:
+            label: 'Velocitat  de lectura'
+            help_message: 'Podètz utilizar una aisina en linha per estimar vòstra velocitat de lectura :'
+            100_word: "Legissi a l'entorn de 100 mots per minuta"
+            200_word: "Legissi a l'entorn de 200 mots per minuta"
+            300_word: "Legissi a l'entorn de 300 mots per minuta"
+            400_word: "Legissi a l'entorn de 400 mots per minuta"
+    form_rss:
+        description: "Los fluxes RSS fornits per wallabag vos permeton de legir vòstres articles salvagardats dins vòstre lector de fluxes preferit. Per los poder emplegar, vos cal, d'en primièr crear un geton."
+        token_label: 'Geton RSS'
+        no_token: 'Aucun jeton généré'
+        token_create: 'Pas cap de geton generat'
+        token_reset: 'Reïnicializatz vòstre geton'
+        rss_links: 'URL de vòstres fluxes RSS'
+        rss_link:
+            unread: 'pas legits'
+            starred: 'favorits'
+            archive: 'legits'
+        rss_limit: "Nombre d'articles dins un flux RSS"
+    form_user:
+        two_factor_description: "Activar l'autentificacion doble-factor vòl dire que recebretz un còdi per corrièl per cada novèla connexion pas aprovada."
+        name_label: 'Nom'
+        email_label: 'Adreça de corrièl'
+        twoFactorAuthentication_label: 'Dobla autentificacion'
+    form_password:
+        old_password_label: 'Senhal actual'
+        new_password_label: 'Senhal novèl'
+        repeat_new_password_label: 'Confirmatz vòstre novèl senhal'
+    form_rules:
+        if_label: 'se'
+        then_tag_as_label: 'alara atribuir las etiquetas'
+        delete_rule_label: 'suprimir'
+        rule_label: 'Règla'
+        tags_label: 'Etiquetas'
+        faq:
+            title: 'FAQ'
+            tagging_rules_definition_title: "Qué significa las règlas d'etiquetas automaticas ?"
+            tagging_rules_definition_description: "Son de règlas utilizadas per wallabad per classar automaticament vòstres novèls articles.<br />Cada còp qu'un novèl article es apondut, totas las règlas d'etiquetas automaticas seràn utilizadas per ajustar d'etiquetas qu'avètz configuradas, en vos esparnhant l'esfòrç de classificar vòstres articles manualament."
+            how_to_use_them_title: 'Cossí las utilizar ?'
+            how_to_use_them_description: "Imaginem que volètz atribuir als novèls article l'etiqueta « <i>lectura corta</i> » quand lo temps per legir es inferior a 3 minutas.<br />Dins aquel cas, deuriatz metre « readingTime &lt;= 3 » dins lo camp <i>Règla</i> e « <i>lectura corta</i> » dins lo camp <i>Etiqueta</i>.<br />Mai d'una etiquetas pòdon èsser apondudas simultanèament ne las separant amb de virgulas : « <i>lectura corta, per ligir</i> »<br />De règlas complèxas pòdon èsser creadas en emplegant d'operators predefinits :  se « <i>readingTime &gt;= 5 AND domainName = \"github.com\"</i> » alara atribuir las etiquetas « <i>lectura longa, github </i> »"
+            variables_available_title: 'Quinas variablas e operators pòdi utilizar per escriure de règlas ?'
+            variables_available_description: "Las variablas e operators seguents pòdon èsser utilizats per escriure de règlas d'etiquetas automaticas :"
+            meaning: 'Significacion'
+            variable_description:
+                label: 'Variabla'
+                title: "Títol de l'article"
+                url: "URL de l'article"
+                isArchived: "Se l'article es archivat o pas"
+                isStarred: "Se l'article es favorit o pas"
+                content: "Lo contengut de l'article"
+                language: "La lenga de l'article"
+                mimetype: "Lo tipe MIME de l'article"
+                readingTime: "Lo temps de lectura estimat de l'article, en minutas"
+                domainName: "Lo nom de domeni de l'article"
+            operator_description:
+                label: 'Operator'
+                less_than: 'Mens que…...'
+                strictly_less_than: 'Estrictament mens que…'
+                greater_than: 'Mai que…'
+                strictly_greater_than: 'Estrictament mai que…'
+                equal_to: 'Egal a…'
+                not_equal_to: 'Diferent de…'
+                or: "Una règla O l'autra"
+                and: "Una règla E l'autra"
+                matches: 'Teste se un <i>subjècte</i> correspond a una <i>recerca</i> (non sensibla a la cassa).<br />Exemple : <code>title matches \"football\"</code>'
+    form_new_user:
+        username_label: "Nom d'utilizaire"
+        password_label: 'Senhal'
+        repeat_new_password_label: 'Confirmatz vòstre novèl senhal'
+        plain_password_label: 'Senhal en clar'
+        email_label: 'Adreça de corrièl'
+
+entry:
+    page_titles:
+        unread: 'Articles pas legits'
+        starred: 'Articles favorits'
+        archived: 'Articles legits'
+        filtered: 'Articles filtrats'
+    list:
+        number_on_the_page: "{0} I a pas cap d'article.|{1} I a un article.|]1,Inf[ I a %count% articles."
+        reading_time: 'durada de lectura'
+        reading_time_minutes: 'durada de lectura : %readingTime% min'
+        reading_time_less_one_minute: 'durada de lectura : <small class="inferieur">&lt;</small> 1 min'
+        original_article: 'original'
+        toogle_as_read: 'Marcar coma legit/pas legit'
+        toogle_as_star: 'Marcar coma favorit'
+        delete: 'Suprimir'
+        export_title: 'Exportar'
+    filters:
+        title: 'Filtres'
+        status_label: 'Estatus'
+        archived_label: 'Legits'
+        starred_label: 'Favorits'
+        preview_picture_label: 'A una fotò'
+        preview_picture_help: 'Fotò'
+        language_label: 'Lenga'
+        reading_time:
+            label: 'Durada de lectura en minutas'
+            from: 'de'
+            to: 'per'
+        domain_label: 'Nom de domeni'
+        created_at:
+            label: 'Data de creacion'
+            from: 'de'
+            to: 'per'
+        action:
+            clear: 'Escafar'
+            filter: 'Filtrar'
+    view:
+        left_menu:
+            back_to_top: 'Tornar en naut'
+            back_to_homepage: 'Tornar'
+            set_as_read: 'Marcar coma legit'
+            set_as_unread: 'Marcar coma pas legit'
+            set_as_favorite: 'Metre en favori'
+            view_original_article: 'Article original'
+            re_fetch_content: 'Tornar cargar lo contengut'
+            delete: 'Suprimir'
+            add_a_tag: 'Ajustar una etiqueta'
+            share_content: 'Partatjar'
+            share_email_label: 'Corrièl'
+            download: 'Telecargar'
+            print: 'Imprimir'
+            problem:
+                label: 'Un problèma ?'
+                description: "Marca mal la presentacion d'aqueste article ?"
+        edit_title: 'Modificar lo títol'
+        original_article: 'original'
+        annotations_on_the_entry: "{0} Pas cap d'anotacion|{1} Una anotacion|]1,Inf[ %nbAnnotations% anotacions"
+    new:
+        page_title: 'Enregistrar un novèl article'
+        placeholder: 'http://website.com'
+        form_new:
+            url_label: Url
+    edit:
+        page_title: 'Modificar un article'
+        title_label: 'Títol'
+        url_label: 'Url'
+        is_public_label: 'Public'
+        save_label: 'Enregistrar'
+
+about:
+    page_title: 'A prepaus'
+    top_menu:
+        who_behind_wallabag: "L'equipa darrèr wallabag"
+        getting_help: "Besonh d'ajuda"
+        helping: 'Ajudar wallabag'
+        contributors: 'Contributors'
+        third_party: 'Bibliotècas tèrças'
+    who_behind_wallabag:
+        developped_by: 'Desvolopat per'
+        website: 'Site web'
+        many_contributors: 'E un fum de contributors ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">sur Github</a>'
+        project_website: 'Site web del projète'
+        license: 'Licéncia'
+        version: 'Version'
+    getting_help:
+        documentation: 'Documentacion'
+        bug_reports: 'Rapòrt de bugs'
+        support: "<a href=\"https://support.wallabag.org\">Sus nòstre site d'assisténcia</a> ou <a href=\"https://github.com/wallabag/wallabag/issues\">sur GitHub</a>"
+    helping:
+        description: 'wallabag es a gratuit e opensource. Nos podètz ajudar :'
+        by_contributing: 'en ajudant lo projècte :'
+        by_contributing_2: 'un bilhet recensa totes nòstres besonhs'
+        by_paypal: 'via Paypal'
+    contributors:
+        description: "Mercés als contributors de l'aplicacion web de wallabag"
+    third_party:
+        description: 'Aquí la lista de las dependéncias utilizadas dins wallabag (e lor licéncia) :'
+        package: 'Dependéncia'
+        license: 'Licéncia'
+
+howto:
+    page_title: 'Ajuda'
+    page_description: "I a mai d'un biai d'enregistrar un article :"
+    top_menu:
+        browser_addons: 'Extensions de navigator'
+        mobile_apps: 'Aplicacions mobil'
+        bookmarklet: 'Bookmarklet'
+    form:
+        description: 'Gràcias a aqueste formulari'
+    browser_addons:
+        firefox: 'Extension Firefox'
+        chrome: 'Extension Chrome'
+    mobile_apps:
+        android:
+            via_f_droid: 'via F-Droid'
+            via_google_play: 'via Google Play'
+        ios: 'sus iTunes Store'
+        windows: 'sus Microsoft Store'
+    bookmarklet:
+        description: 'Lisatz-depausatz aqueste ligam dins vòstra barra de favorits :'
+
+quickstart:
+    page_title: 'Per ben començar'
+    intro:
+        title: 'Benvenguda sus wallabag !'
+        paragraph_1: "Anem vos guidar per far lo torn de la proprietat e vos presentar unas fonccionalitats que vos poirián interessar per vos apropriar aquesta aisina."
+        paragraph_2: 'Seguètz-nos '
+    configure:
+        title: "Configuratz l'aplicacio"
+        language: "Cambiatz la lenga e l'estil de l'aplicacion"
+        rss: 'Activatz los fluxes RSS'
+        tagging_rules: 'Escrivètz de règlas per classar automaticament vòstres articles'
+    admin:
+        title: 'Administracion'
+        description: "En qualitat d'adminitrastor sus wallabag, avètz de privilègis que vos permeton de :"
+        new_user: 'Crear un novèl utilizaire'
+        analytics: 'Configurar las estadisticas'
+        sharing: 'Activar de paramètres de partatge'
+        export: 'Configurar los expòrt'
+        import: 'Configurar los impòrt'
+    first_steps:
+        title: 'Primièrs passes'
+        new_article: 'Ajustatz vòstre primièr article'
+        unread_articles: 'E racaptatz-lo !'
+    migrate:
+        title: 'Migrar dempuèi un servici existent'
+        description: "Sètz un ancian utilizaire d'un servici existent ? Vos ajudarem a trapar vòstras donadas sus wallabag."
+        pocket: 'Migrar dempuèi Pocket'
+        wallabag_v1: 'Migrar dempuèi wallabag v1'
+        wallabag_v2: 'Migrar dempuèi wallabag v2'
+    developer:
+        title: 'Pels desvolopadors'
+        create_application: 'Crear vòstra aplicacion tèrça'
+    docs:
+        title: 'Documentacion complèta'
+        annotate: 'Anotatar vòstre article'
+        export: 'Convertissètz vòstres articles en ePub o en PDF'
+        search_filters: "Aprenètz a utilizar lo motor de recèrca e los filtres per retrobar l'article que vos interèssa"
+        fetching_errors: "Qué far se mon article es pas recuperat coma cal ?"
+        all_docs: "E encara plen de causas mai !"
+    support:
+        title: 'Assisténcia'
+        description: 'Perque avètz benlèu besonh de nos pausar una question, sèm disponibles per vosautres.'
+        github: 'Sus GitHub'
+        email: 'Per e-mail'
+        gitter: 'Sus Gitter'
+
+tag:
+    page_title: 'Etiquetas'
+    list:
+        number_on_the_page: "{0} I a pas cap d'etiquetas.|{1} I a una etiqueta.|]1,Inf[ I a %count% etiquetas."
+
+import:
+    page_title: 'Importar'
+    page_description: "Benvenguda sus l'aisina de migracion de wallabag. Causissètz çai-jos lo servici dempuèi lo qual volètz migrar."
+    action:
+        import_contents: 'Importar los contenguts'
+    form:
+        mark_as_read_title: 'Tot marcar coma legit ?'
+        mark_as_read_label: 'Marcar tot los contenguts importats coma legits'
+        file_label: 'Fichièr'
+        save_label: 'Importar lo fichièr'
+    pocket:
+        page_title: 'Importer > Pocket'
+        description: "Aquesta aisina importarà totas vòstras donadas de Pocket. Pocket nos permet pas de recuperar lo contengut dempuèi lor servidor, alara wallabag deu tornar fulhetar cada article per recuperar son contengut."
+        config_missing:
+            description: "L'importacion dempuèi Pocket es pas configurada."
+            admin_message: "Vos cal definir %keyurls% una clau per l'API Pocket %keyurle%."
+            user_message: "L'administrator de vòstre servidor deu definir una clau per l'API Pocket."
+        authorize_message: "Podètz importar vòstras donadas dempuèi vòstre compte Pocket. Vos cal pas que clicar sul boton çai-jos e autorizar wallabag a se connectar a getpocket.com."
+        connect_to_pocket: 'Se connectar a Pocket e importar las donadas'
+    wallabag_v1:
+        page_title: 'Importer > Wallabag v1'
+        description: 'Aquesta aisina importarà totas vòstras donadas de wallabag v1. Sus vòstre pagina de configuracion de wallabag v1, clicatz sus \"Export JSON\" dins la seccion \"Exportar vòstras donadas de wallabag\". Traparatz un fichièr \"wallabag-export-1-xxxx-xx-xx.json\".'
+        how_to: "Causissètz lo fichièr de vòstra exportacion wallabag v1 e clicatz sul boton çai-jos per l'importar."
+    wallabag_v2:
+        page_title: 'Importer > Wallabag v2'
+        description: "Aquesta aisina importarà totas vòstras donadas d'una instància mai de wallabag v2. Anatz dins totes vòstres articles, puèi, sus la barra laterala, clicatz sus \"JSON\". Traparatz un fichièr \"All articles.json\""
+
+developer:
+    page_title: 'Desvolopador'
+    welcome_message: "Benvenguda sus l'API de wallabag"
+    documentation: 'Documentacion'
+    how_to_first_app: 'Cossí crear vòstra primièra aplicacion'
+    full_documentation: "Veire la documentacion completa de l'API"
+    # list_methods: 'List API methods'
+    clients:
+        title: 'Clients'
+        create_new: 'Crear un novèl client'
+    existing_clients:
+        title: 'Los clients existents'
+        field_id: 'ID Client'
+        field_secret: 'Clé secreta'
+        field_uris: 'URLs de redireccion'
+        field_grant_types: 'Tipe de privilègi acordat'
+        no_client: 'Pas cap de client pel moment'
+    remove:
+        warn_message_1: 'Avètz la possibilitat de supriimr un client. Aquesta accion es IRREVERSIBLA !'
+        warn_message_2: "Se suprimissètz un client, totas las aplicacions que l'emplegan foncionaràn pas mai amb vòstre compte wallabag."
+        action: 'Suprimir aqueste client'
+    client:
+        page_title: 'Desvlopador > Novèl client'
+        page_description: "Anatz crear un novèl client. Mercés de cumplir l'url de redireccion cap a vòstra aplicacion."
+        form:
+            redirect_uris_label: 'URLs de redireccion'
+            save_label: 'Crear un novèl client'
+        action_back: 'Retorn'
+    client_parameter:
+        page_title: 'Desvolopador > Los paramètres de vòstre client'
+        page_description: 'Vaquí los paramètres de vòstre client'
+        field_id: 'ID Client'
+        field_secret: 'Clau secreta'
+        back: 'Retour'
+        read_howto: 'Legir \"cossí crear ma primièra aplicacion\"'
+    howto:
+        page_title: 'Desvolopador > Cossí crear ma primièra aplicacion'
+        description:
+            paragraph_1: "Las comandas seguentas utilizan la <a href=\"https://github.com/jkbrzt/httpie\">libraria HTTPie</a>. Asseguratz-vos que siasqueòu installadas abans de l'utilizar."
+            paragraph_2: "Vos cal un geton per escambiar entre vòstra aplicacion e l'API de wallabar."
+            paragraph_3: 'Per crear un geton, vos cal crear <a href=\"%link%\">crear un novèl client</a>.'
+            paragraph_4: 'Ara creatz un geton (remplaçar client_id, client_secret, username e password amb las bonas valors) :'
+            paragraph_5: "L'API vos tornarà una responsa coma aquò :"
+            paragraph_6: "L'access_token deu èsser emplegat per far una requèsta a l'API. Per exemple :"
+            paragraph_7: "Aquesta requèsta tornarà totes los articles de l'utilizaire."
+            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:
+            config_saved: 'Los paramètres son ben estats meses a jorn. Certans seràn aplicats aprèp desconnexion.'
+            password_updated: 'Vòstre senhal es ben estat mes a jorn'
+            password_not_updated_demo: "En demostration, podètz pas cambiar lo senhal d'aqueste utilizaire."
+            user_updated: 'Vòstres informacions personnelas son ben estadas mesas a jorn'
+            rss_updated: 'La configuracion dels fluxes RSS es ben estada mesa a jorn'
+            tagging_rules_updated: 'Règlas misa a jorn'
+            tagging_rules_deleted: 'Règla suprimida'
+            user_added: 'Utilizaire "%username%" apondut'
+            rss_token_updated: 'Geton RSS mes a jorn'
+    entry:
+        notice:
+            entry_already_saved: 'Article ja salvargardat lo %date%'
+            entry_saved: 'Article enregistrat'
+            entry_updated: 'Article mes a jorn'
+            entry_reloaded: 'Article recargat'
+            entry_reload_failed: "Fracàs de l'actualizacion de l'article"
+            entry_archived: 'Article marcat coma legit'
+            entry_unarchived: 'Article marcat coma pas legit'
+            entry_starred: 'Article apondut dins los favorits'
+            entry_unstarred: 'Article quitat dels favorits'
+            entry_deleted: 'Article suprimit'
+    tag:
+        notice:
+            tag_added: 'Etiqueta aponduda'
+    import:
+        notice:
+            failed: "L'importacion a fracassat, mercés de tornar ensajar"
+            failed_on_file: "Errorr pendent du tractament de l'import. Mercés de verificar vòstre fichièr."
+            summary: "Rapòrt d'import: %imported% importats, %skipped% ja presents."
+    developer:
+        notice:
+            client_created: 'Novèl client creat'
+            client_deleted: 'Client suprimit'

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

@@ -1,129 +1,425 @@
-#Login
+security:
-Keep me logged in: 'Zapamiętaj mnie'
+    login:
-Forgot your password?: 'Zapomniałeś hasła'
+        page_title: 'Witaj w wallabag!'
-Login: 'Loguj'
+        keep_logged_in: 'Zapamiętaj mnie'
-Back to login: 'Wróć do logowania'
+        forgot_password: 'Zapomniałeś hasła'
-Send: 'Wyślij'
+        submit: 'Loguj'
-"Enter your email address below and we'll send you password reset instructions.": 'Wpisz swój adres email poniżej. Wyślemy Ci instrukcję resetowania hasła'
+        register: 'Zarejestruj'
+        username: 'Nazwa użytkownika'
+        password: 'Hasło'
+        cancel: 'Anuluj'
+    resetting:
+        description: "Wpisz swój adres email poniżej. Wyślemy Ci instrukcję resetowania hasła"
+    register:
+        page_title: 'Utwórz konto'
+        go_to_account: 'Idź do konta'
 
-# Menu
+menu:
-unread: 'nieprzeczytane'
+    left:
-starred: 'oznaczone gwiazdką'
+        unread: 'Nieprzeczytane'
-archive: 'archiwum'
+        starred: 'Oznaczone gwiazdką'
-all: 'wszystkie'
+        archive: 'Archiwum'
-tags: 'tagi'
+        all_articles: 'Wszystkie'
-config: 'konfiguracja'
+        config: 'Konfiguracja'
-howto: 'howto'
+        tags: 'Tagi'
-logout: 'wyloguj'
+        internal_settings: 'Wewnętrzne ustawienia'
-Filtered: 'Filtrowane'
+        import: 'Importuj'
-About: 'O nas'
+        howto: 'Howto'
+        developer: 'Deweloper'
+        logout: 'Wyloguj'
+        about: 'O nas'
+        search: 'Szukaj'
+        save_link: 'Zapisz link'
+        back_to_unread: 'Powrót do nieprzeczytanych artykułów'
+    top:
+        add_new_entry: 'Dodaj nowy wpis'
+        search: 'Szukaj'
+        filter_entries: 'Filtruj wpisy'
+        export: 'Eksportuj'
+    search_form:
+        input_label: 'Wpisz swoje zapytanie tutaj'
 
-# Header
+footer:
-Back to unread articles: 'Powrót do nieprzeczytanych artykułów'
+    wallabag:
-Add a new entry: 'Dodaj nowy wpis'
+        elsewhere: 'Weż wallabag ze sobą'
-Search: 'Szukaj'
+        social: 'Społeczność'
-Filter entries: 'Filtruj wpisy'
+        powered_by: 'Kontrolowany przez'
-Enter your search here: 'Wpisz swoje zapytanie tutaj:'
+        about: 'O nas'
-Save new entry: 'Zapisz nowy wpis'
 
-# Config screen
+config:
-Settings: 'Ustawienia'
+    page_title: 'Konfiguracja'
-User information: 'Informacje o użytkowniku'
+    tab_menu:
-Password: 'Hasło'
+        settings: 'Ustawienia'
-RSS: 'Kanał RSS'
+        rss: 'Kanał RSS'
-Add a user: 'Dodaj użytkownika'
+        user_info: 'Informacje o użytkowniku'
-Theme: 'Temat'
+        password: 'Hasło'
-Items per page: 'Ilość elementóœ na stronie'
+        rules: 'Zasady tagowania'
-Language: 'Język'
+        new_user: 'Dodaj użytkownika'
-Save: 'Zapisz'
+    form:
-RSS token: 'Token RSS'
+        save: 'Zapisz'
-Name: 'Nazwa'
+    form_settings:
-Email: 'Adres email'
+        theme_label: 'Temat'
-No token: 'Brak tokena'
+        items_per_page_label: 'Ilość elementóœ na stronie'
-Reset your token: 'Zresetuj swojego tokena'
+        language_label: 'Język'
-Create your token: 'Stwórz tokena'
+        reading_speed:
-Rss limit: 'Limit RSS'
+            label: 'Prędkość czytania'
-RSS links: 'Link do RSS'
+            help_message: 'Możesz skorzystać z narzędzi online do określenia twojej prędkości czytania:'
-RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.': 'Kanały RSS prowadzone przez wallabag pozwalają Ci na czytanie twoich zapisanych artykułów w twoium ulubionym czytniku RSS. Musisz najpierw wynegenerować tokena.‌'
+            100_word: 'Czytam ~100 słów na minutę'
-Old password: 'Stare hasło'
+            200_word: 'Czytam ~200 słów na minutę'
-New password: 'Nowe hasło'
+            300_word: 'Czytam ~300 słów na minutę'
-Repeat new password: 'Powtórz nowe hasło'
+            400_word: 'Czytam ~400 słów na minutę'
-Username: 'Nazwa użytkownika'
+    form_rss:
+        description: 'Kanały RSS prowadzone przez wallabag pozwalają Ci na czytanie twoich zapisanych artykułów w twoium ulubionym czytniku RSS. Musisz najpierw wynegenerować tokena.‌'
+        token_label: 'Token RSS'
+        no_token: 'Brak tokena'
+        token_create: 'Stwórz tokena'
+        token_reset: 'Zresetuj swojego tokena'
+        rss_links: 'RSS links'
+        rss_link:
+            unread: 'nieprzeczytane'
+            starred: 'oznaczone gwiazdką'
+            archive: 'archiwum'
+        rss_limit: 'Link do RSS'
+    form_user:
+        two_factor_description: "Włączenie autoryzacji dwuetapowej oznacza, że będziesz otrzymywał maile z kodem przy każdym nowym, niezaufanyum połączeniu"
+        name_label: 'Nazwa'
+        email_label: 'Adres email'
+        twoFactorAuthentication_label: 'Autoryzacja dwuetapowa'
+    form_password:
+        old_password_label: 'Stare hasło'
+        new_password_label: 'Nowe hasło'
+        repeat_new_password_label: 'Powtórz nowe hasło'
+    form_rules:
+        if_label: 'jeżeli'
+        then_tag_as_label: 'wtedy otaguj jako'
+        delete_rule_label: 'usuń'
+        rule_label: 'Reguła'
+        tags_label: 'Tagi'
+        faq:
+            title: 'FAQ'
+            tagging_rules_definition_title: 'Co oznaczają « reguły tagowania » ?'
+            tagging_rules_definition_description: 'Istnieją reguły używane przez wallabag służące do automatycznego tagowania nowych wpisów.<br />Za każdym razem kiedy dodasz nowi wpis, zostaną użyte wszystkie skonfigurowane przez ciebie regułu. Dzięki temu unikniesz konieczności ręcznego ich klasyfikowania.'
+            how_to_use_them_title: 'Jak ich użyć?'
+            how_to_use_them_description: 'Załóżmy, że chcesz otagować nowe wpisy jako « <i>do szybkiego przeczytania</i> » jeżeli czas czytania wynosi mniej niż 3 minuty.<br />W tym przypadku ponienieneś umieścić « czasCzytania &lt;= 3 » w  polu <i>Reguła</i> i « <i><do szybkiego przeczytania/i> » w polu <i>Tagi</i>.<br />Wiele tagów może zostać dodanych jednocześnie rozdzielając je przecinkami: « <i>do szybkiego przeczytania, koniecznie przeczytać</i> »<br />Kompleksowe reguły mogą być napisane przy użyciu operatorów: jeżeli « <i>czasCzytania &gt;= 5 I nazwaDomeny = "github.com"</i> » wtedy otagój jako « <i>dłuższy tekst, github </i> »'
+            variables_available_title: 'Jakich zmiennych i operatorów mogę użyć przy pisaniu reguł?'
+            variables_available_description: 'Następujące zmienne i operatory mogą być użyte przy tworzeniu reguł tagowania:'
+            meaning: 'Znaczenie'
+            variable_description:
+                label: 'Zmienna'
+                title: 'Tytuł wpisu'
+                url: 'Adres URL wpisu'
+                isArchived: 'Czy wpis został zarchiwizowany czy nie'
+                isStarred: 'Czy wpis został oznaczony gwiazdką czy nie'
+                content: 'Zawartość wpisu'
+                language: 'Język wpisu'
+                mimetype: 'Mime-type wpisu'
+                readingTime: 'Szacunkowy czas czytania wpisu w minutach'
+                domainName: 'Nazwa domeny wpisu'
+            operator_description:
+                label: 'Operator'
+                less_than: 'Mniej niż...'
+                strictly_less_than: 'Wyłącznie mniej niż...'
+                greater_than: 'Więcej niż...'
+                strictly_greater_than: 'Wyłącznie więcej niż...'
+                equal_to: 'Równe...'
+                not_equal_to: 'Nierówny...'
+                or: 'Jedna reguła LUB inna'
+                and: 'Jedna reguła I inna'
+                matches: 'Sprawdź czy <i>temat</i> pasuje <i>szukaj</i> (duże lub małe litery).<br />Przykład: <code>tytuł zawiera "piłka nożna"</code>'
+    form_new_user:
+        username_label: 'Nazwa użytkownika'
+        password_label: 'Hasło'
+        repeat_new_password_label: 'Powtórz nowe hasło'
+        plain_password_label: 'Jawne hasło'
+        email_label: 'Adres email'
 
-# Entries
+entry:
-'estimated reading time': 'Szacunkowy czas czytania'
+    page_titles:
-original: 'oryginał'
+        unread: 'Nieprzeczytane wpisy'
-Toggle mark as read: 'Oznacz jako przeczytane'
+        starred: 'Wpisy oznaczone gwiazdką'
-Toggle favorite: 'Oznacz jako ulubione'
+        archived: 'Zarchiwizowane wpisy'
-Delete: 'Usuń'
+        filtered: 'Odfiltrowane wpisy'
+    list:
+        number_on_the_page: '{0} Nie ma wpisów.|{1} Jest jeden wpis.|]1,Inf[ Są %count% wpisy.'
+        reading_time: 'szacunkowy czas czytania'
+        reading_time_minutes: 'szacunkowy czas czytania: %readingTime% min'
+        reading_time_less_one_minute: 'szacunkowy czas czytania: <small class="inferieur">&lt;</small> 1 min'
+        original_article: 'oryginał'
+        toogle_as_read: 'Oznacz jako przeczytane'
+        toogle_as_star: 'Oznacz jako ulubione'
+        delete: 'Usuń'
+        export_title: 'Export'
+    filters:
+        title: 'Filtry'
+        status_label: 'Status'
+        archived_label: 'Zarchiwizowane'
+        starred_label: 'Oznaczone gwiazdką'
+        preview_picture_label: 'Posiada podgląd obrazu'
+        preview_picture_help: 'Podgląd obrazu'
+        language_label: 'Język'
+        reading_time:
+            label: 'Czas czytania w minutach'
+            from: 'od'
+            to: 'do'
+        domain_label: 'Nazwa domeny'
+        created_at:
+            label: 'Czas stworzenia'
+            from: 'od'
+            to: 'do'
+        action:
+            clear: 'Wyczyść'
+            filter: 'Filtruj'
+    view:
+        left_menu:
+            back_to_top: 'Wróć na górę'
+            back_to_homepage: 'Cofnij'
+            set_as_read: 'Oznacz jako przeczytane'
+            set_as_unread: 'Oznacz jako nieprzeczytane'
+            set_as_favorite: 'Ulubione'
+            view_original_article: 'Oryginalny artykuł'
+            re_fetch_content: 'Pobierz ponownie treść'
+            delete: 'Usuń'
+            add_a_tag: 'Dodaj tag'
+            share_content: 'Udostępnij'
+            share_email_label: 'Adres email'
+            download: 'Pobierz'
+            print: 'Drukuj'
+            problem:
+                label: 'Problemy'
+                description: 'Czy ten artykuł wygląda źle?'
+        edit_title: 'Edytuj tytuł'
+        original_article: 'oryginalny'
+        annotations_on_the_entry: '{0} Nie ma adnotacji |{1} Jedna adnotacja |]1,Inf[ %nbAnnotations% adnotacji'
+    new:
+        page_title: 'Zapisz nowy wpis'
+        placeholder: 'http://website.com'
+        form_new:
+            url_label: Url
+    edit:
+        page_title: 'Edytuj wpis'
+        title_label: 'Tytuł'
+        url_label: 'Adres URL'
+        is_public_label: 'Publiczny'
+        save_label: 'Zapisz'
 
-# Filters
+about:
-Filters: 'Filtry'
+    page_title: 'O nas'
-Status: 'Status'
+    top_menu:
-Archived: 'Zarchiwizowane'
+        who_behind_wallabag: 'Kto stoi za wallabag'
-Starred: 'Oznaczone gwiazdką'
+        getting_help: 'Pomoc'
-Preview picture: 'Podgląd obrazu'
+        helping: 'Pomóż wallabag'
-Has a preview picture: 'Posiada podgląd obrazu'
+        contributors: 'Osoby, które pomogły przy projekcie'
-Reading time in minutes: 'Czas czytania w minutach'
+        third_party: 'Biblioteki Third-party'
-from: 'od'
+    who_behind_wallabag:
-to: 'do'
+        developped_by: 'Stworzony przez'
-website.com: 'website.com'
+        website: 'strona internetowa'
-Domain name: 'Nazwa domeny'
+        many_contributors: 'i wielu innych ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">na GitHubie</a>'
-Creation date: 'Czas stworzenia'
+        project_website: 'Stona projektu'
-dd/mm/yyyy: 'dd.mm.yyyy'
+        license: 'Licencja'
-Clear: 'Wyczyść'
+        version: 'Wersja'
-Filter: 'Filtruj'
+    getting_help:
+        documentation: 'Dokumentacja'
+        bug_reports: 'Raportuj błędy'
+        support: '<a href="https://support.wallabag.org">Na naszej stronie wsparcia technicznego</a> lub <a href="https://github.com/wallabag/wallabag/issues">na GitHubie</a>'
+    helping:
+        description: 'wallabag jest darmowy i otwartoźródłowy. Możesz nam pomóc:'
+        by_contributing: 'przez przyłączenie się do projektu:'
+        by_contributing_2: 'lista wszystkich naszych potrzeb'
+        by_paypal: 'przez Paypal'
+    contributors:
+        description: 'Podziękuj osobą, które przyczyniły się do projektu przez aplikację webową'
+    third_party:
+        description: 'Tutaj znajduje się lista Third-party bibliotek użytych w wallabag (z ich licencjami):'
+        package: 'Paczka'
+        license: 'Licencja'
 
-# About
+howto:
-Who is behind wallabag: 'Kto stoi za wallabag'
+    page_title: 'Howto'
-Getting help: 'Pomoc'
+    page_description: 'Sposoby zapisania artykułu:'
-Helping wallabag: 'Pomóż wallabag'
+    top_menu:
-Developed by: 'Stworzony przez'
+        browser_addons: 'Wtyczki dla przeglądarki'
-website: 'strona internetowa'
+        mobile_apps: 'Aplikacje mobilne'
-And many others contributors ♥: ' i wielu innych ♥'
+        bookmarklet: 'Bookmarklet'
-on GitHub: 'na GitHubie'
+    form:
-Project website: 'Stona projektu'
+        description: 'Podziękuj przez ten formularz'
-License: 'Licencja'
+    browser_addons:
-Version: 'Wersja'
+        firefox: 'Standardowe rozszerzenie dla Firefox'
-Documentation: 'Dokumentacja'
+        chrome: 'Rozszerzenie dla Chrome'
-Bug reports: 'Raportuj błędy'
+    mobile_apps:
-On our support website: 'Na naszeej stronie wsparcia technicznego'
+        android:
-or: 'lub'
+            via_f_droid: 'w F-Droid'
-'wallabag is free and opensource. You can help us:': 'wallabag jest darmowy i otwartoźródłowy. Możesz nam pomóc: '
+            via_google_play: 'w Google Play'
-'by contributing to the project:': 'przez przyłączenie się do projektu:'
+        ios: 'w iTunes Store'
-an issue lists all our needs: 'lista wszystkich naszych potrzeb'
+        windows: 'w Microsoft Store'
-via Paypal: 'przez PayPal'
+    bookmarklet:
+        description: 'Przeciągnij i upuść ten link na swój pasek zakładek'
 
-# Howto
+quickstart:
-Form: 'Od'
+    page_title: 'Szybki start'
-Thanks to this form: 'Podziękuj przez ten formularz'
+    intro:
-Browser addons: 'Wtyczki dla przeglądarki'
+         title: 'Witaj w wallabag!'
-Mobile apps: 'Aplikacje mobilne'
+         paragraph_1: "Będziemy ci towarzyszyli w Twojej poznaniu wallabag i pokażemy możliwości, które mogą cię zainteresować."
-Bookmarklet: 'Bookmarklet'
+         paragraph_2: 'Śledź nas!'
-Standard Firefox Add-On: 'Standardowe rozszerzenia dla Firefox'
+    configure:
-Chrome Extension: 'Rozszerzenie dla Chrome'
+         title: 'Konfiguruj aplikację'
-download the application: 'Pobierz aplikację '
+         language: 'Zmień język i wygląd'
-'Drag &amp; drop this link to your bookmarks bar:': 'Przeciągnij i upuść ten link na swój pasek zakładek'
+         rss: 'Włącz kanały RSS'
+         tagging_rules: 'Napisz reguły pozwalające na automatyczne otagowanie twoich artykułów'
+    admin:
+         title: 'Administracja'
+         description: 'Jako administrator wallabag, możesz:'
+         new_user: 'Tworzyć nowego użytkownika'
+         analytics: 'Configure analytics'
+         sharing: 'Włączyć pewne parametry dotyczące udostępniania artykułów'
+         export: 'Skonfigurować eksport'
+         import: 'Skonfigurować import'
+    first_steps:
+        title: 'Pierwsze kroki'
+        new_article: 'Zapisz swój pierwszy artukuł'
+        unread_articles: 'I sklasyfikuj go!'
+    migrate:
+        title: 'Migruj w istniejącej usługi'
+        description: "Używasz innej usługi? Pomożemy ci pobrać twoje dane do wallabag."
+        pocket: 'Migruj z Pocket'
+        wallabag_v1: 'Migruj z wallabag v1'
+        wallabag_v2: 'Migruj z wallabag v2'
+    developer:
+        title: 'Deweloperzy'
+        create_application: 'Stwórz swoją aplikację'
+    docs:
+        title: 'Pełna Dokumentacja'
+        annotate: 'Dadaj adnotację do swojego artykułu'
+        export: 'Konwertuj swoje artykuły do ePUB lub PDF'
+        search_filters: 'Zabacz jak możesz znaleźć artykuł dzięku użyciu silnika wyszukiwarki i filtrów'
+        fetching_errors: 'Co mogę zrobić jeżeli artukuł napotka błędy podczas pobierania?'
+        all_docs: 'I wiele innych artykułów!'
+    support:
+        title: 'Wsparcie'
+        description: 'Jeżeli potrzebujesz pomocy, jesteśmy tutaj dla ciebie.'
+        github: 'na GitHubie'
+        email: 'przez email'
+        gitter: 'na Gitterze'
 
-# Flash messages
+tag:
-Information updated: 'Informacje zaktualizowane'
+    page_title: 'Tagi'
-Config saved. Some parameters will be considered after disconnection.': 'Konfiguracja zapisana. Niektóre parametry zostaną uznane po rozłączeniu'
+    list:
-RSS information updated: 'Informacje RSS zaktualizowane'
+        number_on_the_page: '{0} Nie ma tagów.|{1} Jest jeden tag.|]1,Inf[ Są %count% tagi.'
-Password updated: 'Hasło zaktualizowane'
-Entry starred: 'Wpis oznaczony gwiazdką'
-Entry unstarred: 'Wpis odznaczony gwiazdką'
-Entry archived: 'Wpis dodany do archiwum'
-Entry unarchived: 'Wpis usunięty z archiwum'
-Entry deleted: 'Wpis usunięty'
 
-# Entry
+import:
-Mark as read: 'Oznacz jako przeczytane'
+    page_title: 'Import'
-Favorite: 'Ulubione'
+    page_description: 'Witaj w importerze Wallabag. Wybierz swoją poprzednią usługę, z której chcech migrować.'
-back: 'Cofnij'
+    action:
-original article: 'Oryginalny artykuł'
+        import_contents: 'Import zawartości'
-Add a tag: 'Dodaj tag'
+    form:
-Share: 'Udostępnij'
+        mark_as_read_title: 'Oznaczyć wszystkie jako przeczytane?'
-Download: 'Pobierz'
+        mark_as_read_label: 'Oznacz wszystkie zaimportowane wpisy jako przeczytane'
-Does this article appear wrong?: 'Czy ten artykuł wygląda źle?'
+        file_label: 'Plik'
-Problems?: 'Problemy'
+        save_label: 'Właduj plik'
-Edit title: 'Edytuj tytuł'
+    pocket:
+        page_title: 'Import > Pocket'
+        description: "Ten importer, zaimportuje dane z usługi Pocket. Pocket nie pozwala na nam na pobranie zawartości ze swojej usługi, więc kontent każdego arthykuł\u zostanie ponownie pobrany przez wallabag."
+        config_missing:
+            description: "Import z Pocket nie jest skonfigurowany."
+            admin_message: 'Musisz zdefiniować %keyurls%a pocket_consumer_key%keyurle%.'
+            user_message: 'Admin twojego servera musi zdefiniować API Key dla Pocket.'
+        authorize_message: 'Możesz zaimportować dane ze swojego konta Pocket. Kliknij poniższy przycisk i autoryzuj aplikacje aby połączyć się z getpocket.com.'
+        connect_to_pocket: 'Połącz z Pocket i importuj dane'
+    wallabag_v1:
+        page_title: 'Import > Wallabag v1'
+        description: 'Ten importer, zaimportuje wszystkie twoje artykułu z wallabag v1. Na swojej stronie konfiguracyjnej kliknij "JSON eksport" w sekcji "Eksportuj swoje dane wallabag". Otrzymasz plik "wallabag-export-1-xxxx-xx-xx.json".'
+        how_to: 'Wybierz swój plik eksportu z wallabag i kliknij poniższy przycisk, aby go załadować.'
+    wallabag_v2:
+        page_title: 'Import > Wallabag v2'
+        description: 'Ten importer, zaimportuje wszystkie twoje artykułu z wallabag v2. Idź do wszystkich artykułów, a następnie na panelu exportu kliknij na "JSON". Otrzymasz plik "All articles.json".'
+
+developer:
+    page_title: 'Deweloper'
+    welcome_message: 'Witaj w API wallabag'
+    documentation: 'Dokumentacja'
+    how_to_first_app: 'Jak stworzyć moją pierwszą aplikację'
+    full_documentation: 'Pokaż pełne API'
+    # list_methods: 'List API methods'
+    clients:
+         title: 'Klienci'
+         create_new: 'Utwórz nowego klienta'
+    existing_clients:
+         title: 'Istniejący klienci'
+         field_id: 'Client ID'
+         field_secret: 'Client secret'
+         field_uris: 'Przekieruj URIs'
+         field_grant_types: 'Przyznaj pozwolenie'
+         no_client: 'Nie ma jeszcze klienta.'
+    remove:
+         warn_message_1: 'Masz możliwość usunięcia tego klienta. Ta akcja jest NIEODWRACALNA !'
+         warn_message_2: "Jeżeli go usuniesz, aplikacje skonfigurowane z tym klientem nię będa w stanie autoryzować twojego wallabag."
+         action: 'Usuń tego klienta'
+    client:
+         page_title: 'Deweloper > Nowy klient'
+         page_description: 'Tworzysz nowego klienta. Wypełnij poniższe pole w celu przekierowania URI twojej aplikacji.'
+         form:
+             redirect_uris_label: 'Przekieruj adresy URI'
+             save_label: 'Stwórz nowego klienta'
+         action_back: 'Cofnij'
+    client_parameter:
+         page_title: 'Deweloper > Parametry klienta'
+         page_description: 'Tutaj znajdują się parametry klienta.'
+         field_id: 'Client ID'
+         field_secret: 'Client secret'
+         back: 'Cofnij'
+         read_howto: 'Przeczytaj jak "Stworzyć moją pierwszą aplikację"'
+    howto:
+         page_title: 'Deweloper > Jak stworzyć moją pierwszą aplikację'
+         description:
+            paragraph_1: 'Następujące komendy korzystają <a href="https://github.com/jkbrzt/httpie">Biblioteka HTTPie</a>. Upewnij się, czy zainstalowałeś ją w swoim systemie zanim z niej skorzystasz'
+            paragraph_2: 'Potrzebujesz tokena w celu nawiązania komunikacji między swoją aplikacją a API wallabag.'
+            paragraph_3: 'W celu stworzenia tokena musisz <a href="%link%">stwórz nowego klienta</a>.'
+            paragraph_4: 'Teraz, utwórz tokena (zmień client_id, client_secret, username i password z poprawnymi wartościami):'
+            paragraph_5: 'API powinno zwrócić taką informację:'
+            paragraph_6: 'access_token jest użyteczny do wywołania API endpoint. Na przykład:'
+            paragraph_7: 'To wywołanie zwróci wszystkie twoje wpisy.'
+            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:
+            config_saved: 'Konfiguracja zapisana. Niektóre parametry zostaną uznane po rozłączeniu'
+            password_updated: 'Hasło zaktualizowane'
+            password_not_updated_demo: "In demonstration mode, you can't change password for this user."
+            user_updated: 'Informacje zaktualizowane'
+            rss_updated: 'Informacje RSS zaktualizowane'
+            tagging_rules_updated: 'Reguły tagowania zaktualizowane'
+            tagging_rules_deleted: 'Reguła tagowania usunięta'
+            user_added: 'Użytkownik "%username%" dodany'
+            rss_token_updated: 'Token kanału RSS zaktualizowany'
+    entry:
+        notice:
+            entry_already_saved: 'Wpis już został dodany %date%'
+            entry_saved: 'Wpis zapisany'
+            entry_updated: 'Wpis zaktualizowany'
+            entry_reloaded: 'Wpis ponownie załadowany'
+            entry_reload_failed: 'Błąd ponownego załadowania'
+            entry_archived: 'Wpis dodany do archiwum'
+            entry_unarchived: 'Wpis usunięty z archiwum'
+            entry_starred: 'Wpis oznaczony gwiazdką'
+            entry_unstarred: 'Wpis odznaczony gwiazdką'
+            entry_deleted: 'Wpis usunięty'
+    tag:
+        notice:
+            tag_added: 'Tag dodany'
+    import:
+        notice:
+            failed: 'Nieudany import, prosimy spróbować ponownie.'
+            failed_on_file: 'Błąd podczas ptrzetwarzania pliku. Sprawdż swój importowany plik.'
+            summary: 'Podsumowanie importu: %imported% zaimportowane, %skipped% już zapisane.'
+    developer:
+        notice:
+            client_created: 'Nowy klient utworzony.'
+            client_deleted: 'Klient usunięty'

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

@@ -1,129 +1,425 @@
-#Login
+security:
-Keep me logged in: 'Ține-mă logat'
+    login:
-Forgot your password?: 'Ți-ai uitat parola?'
+        # page_title: 'Welcome to wallabag!'
-Login: 'Logare'
+        keep_logged_in: 'Ține-mă logat'
-Back to login: 'Înapoi la logare'
+        forgot_password: 'Ți-ai uitat parola?'
-Send: 'Trimite'
+        submit: 'Logare'
-"Enter your email address below and we'll send you password reset instructions.": "Introduceți adresa de e-mail, iar noi vă vom trimite instrucțiunile pentru resetarea parolei."
+        # register: 'Register'
+        username: 'Nume de utilizator'
+        password: 'Parolă'
+        # cancel: 'Cancel'
+    resetting:
+        description: "Introduceți adresa de e-mail, iar noi vă vom trimite instrucțiunile pentru resetarea parolei."
+    register:
+        # page_title: 'Create an account'
+        # go_to_account: 'Go to your account'
 
-# Menu
+menu:
-unread: 'necitite'
+    left:
-starred: 'cu steluță'
+        unread: 'Necitite'
-archive: 'arhivă'
+        starred: 'Cu steluță'
-all: 'toate'
+        archive: 'Arhivă'
-tags: 'tag-uri'
+        all_articles: 'Toate'
-config: 'configurație'
+        config: 'Configurație'
-howto: 'cum să'
+        tags: 'Tag-uri'
-logout: 'delogare'
+        # internal_settings: 'Internal Settings'
-Filtered: 'Filtrate'
+        # import: 'Import'
-About: 'Despre'
+        howto: 'Cum să'
+        # developer: 'Developer'
+        logout: 'cum să'
+        about: 'Despre'
+        search: 'Căutare'
+        # save_link: 'Save a link'
+        back_to_unread: 'Înapoi la articolele necitite'
+    top:
+        add_new_entry: 'Introdu un nou articol'
+        search: 'Căutare'
+        filter_entries: 'Filtrează articolele'
+        # export: 'Export'
+    search_form:
+        input_label: 'Introdu căutarea ta'
 
-# Header
+footer:
-Back to unread articles: 'Înapoi la articolele necitite'
+    wallabag:
-Add a new entry: 'Introdu un nou articol'
+        # elsewhere: 'Take wallabag with you'
-Search: 'Căutare'
+        # social: 'Social'
-Filter entries: 'Filtrează articolele'
+        # powered_by: 'powered by'
-Enter your search here: 'Introdu căutarea ta'
+        about: 'Despre'
-Save new entry: 'Salvează un nou articol'
 
-# Config screen
+config:
-Settings: 'Setări'
+    page_title: 'Configurație'
-User information: 'Informații despre utilizator'
+    tab_menu:
-Password: 'Parolă'
+        settings: 'Setări'
-RSS: 'RSS'
+        rss: 'RSS'
-Add a user: 'Crează un utilizator'
+        user_info: 'Informații despre utilizator'
-Theme: 'Temă'
+        password: 'Parolă'
-Items per page: 'Articole pe pagină'
+        # rules: 'Tagging rules'
-Language: 'Limbă'
+        new_user: 'Crează un utilizator'
-Save: 'Salvează'
+    form:
-RSS token: 'RSS-Token'
+        save: 'Salvează'
-Name: 'Nume'
+    form_settings:
-Email: 'E-mail'
+        theme_label: 'Temă'
-No token: 'Fără token'
+        items_per_page_label: 'Articole pe pagină'
-Reset your token: 'Resetează-ți token-ul'
+        language_label: 'Limbă'
-Create your token: 'Crează-ți token'
+        reading_speed:
-Rss limit: 'Limită RSS'
+            # label: 'Reading speed'
-RSS links: 'Link-uri RSS'
+            # help_message: 'You can use online tools to estimate your reading speed:'
-'RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.': 'Feed-urile RSS oferite de wallabag îți permit să-ți citești articolele salvate în reader-ul tău preferat RSS.'
+            # 100_word: 'I read ~100 words per minute'
-Old password: 'Parola veche'
+            # 200_word: 'I read ~200 words per minute'
-New password: 'Parola nouă'
+            # 300_word: 'I read ~300 words per minute'
-Repeat new password: 'Repetă parola'
+            # 400_word: 'I read ~400 words per minute'
-Username: 'Nume de utilizator'
+    form_rss:
+        description: 'Feed-urile RSS oferite de wallabag îți permit să-ți citești articolele salvate în reader-ul tău preferat RSS.'
+        token_label: 'RSS-Token'
+        no_token: 'Fără token'
+        token_create: 'Crează-ți token'
+        token_reset: 'Resetează-ți token-ul'
+        rss_links: 'Link-uri RSS'
+        rss_link:
+            unread: 'unread'
+            starred: 'starred'
+            archive: 'archived'
+        rss_limit: 'Limită RSS'
+    form_user:
+        # two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion"
+        name_label: 'Nume'
+        email_label: 'E-mail'
+        # twoFactorAuthentication_label: 'Two factor authentication'
+    form_password:
+        old_password_label: 'Parola veche'
+        new_password_label: 'Parola nouă'
+        repeat_new_password_label: 'Repeat new password'
+    form_rules:
+        # if_label: 'if'
+        # then_tag_as_label: 'then tag as'
+        # delete_rule_label: 'delete'
+        # rule_label: 'Rule'
+        # tags_label: 'Tags'
+        # faq:
+        #     title: 'FAQ'
+        #     tagging_rules_definition_title: 'What does « tagging rules » mean?'
+        #     tagging_rules_definition_description: 'They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.'
+        #     how_to_use_them_title: 'How do I use them?'
+        #     how_to_use_them_description: 'Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »'
+        #     variables_available_title: 'Which variables and operators can I use to write rules?'
+        #     variables_available_description: 'The following variables and operators can be used to create tagging rules:'
+        #     meaning: 'Meaning'
+        #     variable_description:
+        #         label: 'Variable'
+        #         title: 'Title of the entry'
+        #         url: 'URL of the entry'
+        #         isArchived: 'Whether the entry is archived or not'
+        #         isStarred: 'Whether the entry is starred or not'
+        #         content: "The entry's content"
+        #         language: "The entry's language"
+        #         mimetype: "The entry's mime-type"
+        #         readingTime: "The estimated entry's reading time, in minutes"
+        #         domainName: 'The domain name of the entry'
+        #     operator_description:
+        #         label: 'Operator'
+        #         less_than: 'Less than...'
+        #         strictly_less_than: 'Strictly less than...'
+        #         greater_than: 'Greater than...'
+        #         strictly_greater_than: 'Strictly greater than...'
+        #         equal_to: 'Equal to...'
+        #         not_equal_to: 'Not equal to...'
+        #         or: 'One rule OR another'
+        #         and: 'One rule AND another'
+        #         matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
+    form_new_user:
+        username_label: 'Nume de utilizator'
+        password_label: 'Parolă'
+        repeat_new_password_label: 'Repeat new password'
+        plain_password_label: '????'
+        email_label: 'E-mail'
 
-# Entries
+entry:
-'estimated reading time': 'timp estimat de citire'
+    page_titles:
-original: original
+        # unread: 'Unread entries'
-Toggle mark as read: 'Comută marcat ca citit'
+        # starred: 'Starred entries'
-Toggle favorite: 'Comută marcat ca favorit'
+        # archived: 'Archived entries'
-Delete: 'Șterge'
+        # filtered: 'Filtered entries'
+    list:
+        # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
+        reading_time: 'timp estimat de citire'
+        reading_time_minutes: 'timp estimat de citire: %readingTime% min'
+        reading_time_less_one_minute: 'timp estimat de citire: <small class="inferieur">&lt;</small> 1 min'
+        original_article: 'original'
+        toogle_as_read: 'Comută marcat ca citit'
+        toogle_as_star: 'Comută marcat ca favorit'
+        delete: 'Șterge'
+        # export_title: 'Export'
+    filters:
+        title: 'Filtre'
+        status_label: 'Status'
+        archived_label: 'Arhivat'
+        starred_label: 'Steluțe'
+        preview_picture_label: 'Are o imagine de previzualizare'
+        preview_picture_help: 'Previzualizare imagine'
+        language_label: 'Limbă'
+        reading_time:
+            label: 'Timp de citire în minute'
+            from: 'de la'
+            to: 'către'
+        domain_label: 'Nume domeniu'
+        created_at:
+            label: 'Data creării'
+            from: 'de la'
+            to: 'către'
+        action:
+            clear: 'Șterge'
+            filter: 'Filtru'
+    view:
+        left_menu:
+            # back_to_top: 'Back to top'
+            back_to_homepage: 'Înapoi'
+            set_as_read: 'Marchează ca citit'
+            # set_as_unread: 'Mark as unread'
+            set_as_favorite: 'Favorit'
+            view_original_article: 'Articol original'
+            # re_fetch_content: 'Re-fetch content'
+            delete: 'Șterge'
+            add_a_tag: 'Adaugă un tag'
+            share_content: 'Dă mai departe'
+            share_email_label: 'E-mail'
+            download: 'Descarcă'
+            # print: 'Print'
+            problem:
+                label: 'Probleme?'
+                description: 'Îți pare ciudat articolul?'
+        edit_title: 'Editează titlul'
+        original_article: 'original'
+        # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations'
+    new:
+        page_title: 'Salvează un nou articol'
+        placeholder: 'http://website.com'
+        form_new:
+            url_label: Url
+    edit:
+        # page_title: 'Edit an entry'
+        # title_label: 'Title'
+        url_label: 'Url'
+        # is_public_label: 'Public'
+        save_label: 'Salvează'
 
-# Filters
+about:
-Filters: 'Filtre'
+    page_title: 'Despre'
-Status: 'Status'
+    top_menu:
-Archived: 'Arhivat'
+        who_behind_wallabag: 'Cine e în spatele wallabag'
-Starred: 'Steluțe'
+        getting_help: 'Ajutor'
-Preview picture: 'Previzualizare imagine'
+        helping: 'Cum să ajuți wallabag'
-Has a preview picture: 'Are o imagine de previzualizare'
+        # contributors: 'Contributors'
-Reading time in minutes: 'Timp de citire în minute'
+        # third_party: 'Third-party libraries'
-from: 'de la'
+    who_behind_wallabag:
-to: 'către'
+        developped_by: 'Dezvoltat de'
-website.com: 'website.com'
+        website: 'website'
-Domain name: 'Nume domeniu'
+        many_contributors: 'Și mulți alți contribuitori ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">pe Github</a>'
-Creation date: 'Data creării'
+        project_website: 'Website-ul proiectului'
-dd/mm/yyyy: 'zz/ll/aaaa'
+        license: 'Licență'
-Clear: 'Șterge'
+        version: 'Versiune'
-Filter: 'Filtru'
+    getting_help:
+        documentation: 'Documentație'
+        bug_reports: 'Bug-uri'
+        support: '<a href="https://support.wallabag.org">Pe site-ul nostru de suport</a> sau <a href="https://github.com/wallabag/wallabag/issues">pe GitHub</a>'
+    helping:
+        description: 'wallabag este gratis și Open-Source. Cum ne poți ajuta:'
+        by_contributing: 'contribuind la proiect:'
+        by_contributing_2: 'o problemă ne listează toate nevoile:'
+        by_paypal: 'prin Paypal'
+    contributors:
+        # description: 'Thank you to contributors on wallabag web application'
+    third_party:
+        # description: 'Here are the list of third-party libraries used in wallabag (with their licenses):'
+        # package: 'Package'
+        license: 'Licență'
 
-# About
+howto:
-Who is behind wallabag: "Cine e în spatele wallabag"
+    page_title: 'Cum să'
-Getting help: "Ajutor"
+    # page_description: 'There are several ways to save an article:'
-Helping wallabag: "Cum să ajuți wallabag"
+    top_menu:
-Developed by: "Dezvoltat de"
+        browser_addons: 'Add-On-uri de Browser'
-website: "website"
+        mobile_apps: 'Aplicații mobile'
-And many others contributors ♥: "Și mulți alți contribuitori ♥"
+        bookmarklet: 'Bookmarklet'
-on GitHub: "pe GitHub"
+    form:
-Project website: "Website-ul proiectului"
+        description: 'Mulțumită acestui formular'
-License: "Licență"
+    browser_addons:
-Version: "Versiune"
+        firefox: 'Add-On standard de Firefox'
-Documentation: "Documentație"
+        chrome: 'Extensie Chrome'
-Bug reports: "Bug-uri"
+    mobile_apps:
-On our support website: "Pe site-ul nostru de suport"
+        android:
-or: "sau"
+            via_f_droid: 'prin F-Droid'
-"wallabag is free and opensource. You can help us:": "wallabag este gratis și Open-Source. Cum ne poți ajuta:"
+            via_google_play: 'prin Google Play'
-"by contributing to the project:": "contribuind la proiect:"
+        ios: 'prin iTunes Store'
-an issue lists all our needs: "o problemă ne listează toate nevoile:"
+        windows: 'prin Microsoft Store'
-via Paypal: "prin PayPal"
+    bookmarklet:
+        description: 'Drag &amp; drop acest link în bara de bookmark-uri:'
 
-# Howto
+quickstart:
-Form: Formular
+    # page_title: 'Quickstart'
-Thanks to this form: "Mulțumită acestui formular"
+    # intro:
-Browser addons: "Add-On-uri de Browser"
+    #     title: 'Welcome to wallabag!'
-Mobile apps: "Aplicații mobile"
+    #     paragraph_1: "We'll accompany you to visit wallabag and show you some features which can interest you."
-Bookmarklet: "Bookmarklet"
+    #     paragraph_2: 'Follow us!'
-Standard Firefox Add-On: "Add-On standard de Firefox"
+    # configure:
-Chrome Extension: "Extensie Chrome"
+    #     title: 'Configure the application'
-download the application: "descarcă aplicația"
+    #     language: 'Change language and design'
-"Drag &amp; drop this link to your bookmarks bar:": "Drag &amp; drop acest link în bara de bookmark-uri:"
+    #     rss: 'Enable RSS feeds'
+    #     tagging_rules: 'Write rules to automatically tag your articles'
+    # admin:
+    #     title: 'Administration'
+    #     description: 'As an administrator, you have privileges on wallabag. You can:'
+    #     new_user: 'Create a new user'
+    #     analytics: 'Configure analytics'
+    #     sharing: 'Enable some parameters about article sharing'
+    #     export: 'Configure export'
+    #     import: 'Configure import'
+    # first_steps:
+    #     title: 'First steps'
+    #     new_article: 'Save your first article'
+    #     unread_articles: 'And classify it!'
+    # migrate:
+    #     title: 'Migrate from an existing service'
+    #     description: "Are you using another service? We'll help you to retrieve your data on wallabag."
+    #     pocket: 'Migrate from Pocket'
+    #     wallabag_v1: 'Migrate from wallabag v1'
+    #     wallabag_v2: 'Migrate from wallabag v2'
+    # developer:
+    #     title: 'Developers'
+    #     create_application: 'Create your third application'
+    # docs:
+    #     title: 'Full documentation'
+    #     annotate: 'Annotate your article'
+    #     export: 'Convert your articles into ePUB or PDF'
+    #     search_filters: 'See how you can look for an article by using search engine and filters'
+    #     fetching_errors: 'What can I do if an article encounters errors during fetching?'
+    #     all_docs: 'And so many other articles!'
+    # support:
+    #     title: 'Support'
+    #     description: 'If you need some help, we are here for you.'
+    #     github: 'On GitHub'
+    #     email: 'By email'
+    #     gitter: 'On Gitter'
 
-# Flash messages
+tag:
-Information updated: "Informație actualizată"
+    page_title: 'Tag-uri'
-"Config saved. Some parameters will be considered after disconnection.": "configurație salvată. Unii parametrii vor fi considerați după deconectare."
+    list:
-RSS information updated: "Informație RSS actualizată"
+        # number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
-Password updated: "Parolă actualizată"
-Entry starred: "Articol adăugat la favorite"
-Entry unstarred: "Articol șters de la favorite"
-Entry archived: "Articol arhivat"
-Entry unarchived: "Articol dezarhivat"
-Entry deleted: "Articol șters"
 
-# Entry
+import:
-Mark as read: 'Marchează ca citit'
+    # page_title: 'Import'
-Favorite: 'Favorit'
+    # page_description: 'Welcome to wallabag importer. Please select your previous service that you want to migrate.'
-back: 'înapoi'
+    # action:
-original article: 'articol original'
+    #     import_contents: 'Import contents'
-Add a tag: 'Adaugă un tag'
+    # form:
-Share: 'Dă mai departe'
+    #     mark_as_read_title: 'Mark all as read?'
-Download: 'Descarcă'
+    #     mark_as_read_label: 'Mark all imported entries as read'
-Does this article appear wrong?: "Îți pare ciudat articolul?"
+    #     file_label: 'File'
-Problems?: 'Probleme?'
+    #     save_label: 'Upload file'
-Edit title: "Editează titlul"
+    # pocket:
+    #     page_title: 'Import > Pocket'
+    #     description: "This importer will import all your Pocket data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag."
+    #     config_missing:
+    #         description: "Pocket import isn't configured."
+    #         admin_message: 'You need to define %keyurls%a pocket_consumer_key%keyurle%.'
+    #         user_message: 'Your server admin needs to define an API Key for Pocket.'
+    #     authorize_message: 'You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.'
+    #     connect_to_pocket: 'Connect to Pocket and import data'
+    # wallabag_v1:
+    #     page_title: 'Import > Wallabag v1'
+    #     description: 'This importer will import all your wallabag v1 articles. On your config page, click on "JSON export" in the "Export your wallabag data" section. You will have a "wallabag-export-1-xxxx-xx-xx.json" file.'
+    #     how_to: 'Please select your wallabag export and click on the below button to upload and import it.'
+    # wallabag_v2:
+    #     page_title: 'Import > Wallabag v2'
+    #     description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.'
+
+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: '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:
+            config_saved: 'Configurație salvată. Unii parametrii vor fi considerați după deconectare.'
+            password_updated: 'Parolă actualizată'
+            password_not_updated_demo: "In demonstration mode, you can't change password for this user."
+            user_updated: 'Informație actualizată'
+            rss_updated: 'Informație RSS actualizată'
+            # tagging_rules_updated: 'Tagging rules updated'
+            # tagging_rules_deleted: 'Tagging rule deleted'
+            # user_added: 'User "%username%" added'
+            # rss_token_updated: 'RSS token updated'
+    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_archived: 'Articol arhivat'
+            entry_unarchived: 'Articol dezarhivat'
+            entry_starred: 'Articol adăugat la favorite'
+            entry_unstarred: 'Articol șters de la favorite'
+            entry_deleted: 'Articol șters'
+    tag:
+        notice:
+            # tag_added: 'Tag added'
+    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.'
+    developer:
+        notice:
+            # client_created: 'New client created.'
+            # client_deleted: 'Client deleted'

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

@@ -1,226 +1,425 @@
-# Login
+security:
-Keep me logged in: 'Oturumumu açık tut'
+    login:
-Forgot your password?: 'Şifrenizi mi unuttunuz?'
+        page_title: 'wallabag'
-Login: 'Giriş Yap'
+        keep_logged_in: 'Oturumumu açık tut'
-Back to login: 'Giriş yapma ekranına geri dön'
+        forgot_password: 'Şifrenizi mi unuttunuz?'
-Send: 'Gönder'
+        submit: 'Giriş Yap'
-Register: 'Kayıt Ol'
+        register: 'Kayıt Ol'
+        username: 'Kullanıcı adı'
+        password: 'Şifre'
+        # cancel: 'Cancel'
+    resetting:
+        # description: "Enter your email address below and we'll send you password reset instructions."
+    register:
+        # page_title: 'Create an account'
+        # go_to_account: 'Go to your account'
 
-# Menu
+menu:
-unread: 'Okunmayan'
+    left:
-starred: 'Favoriler'
+        unread: 'Okunmayan'
-archive: 'Arşiv'
+        starred: 'Favoriler'
-all: 'Hepsi'
+        archive: 'Arşiv'
-tags: 'Etiketler'
+        all_articles: 'Hepsi'
-config: 'Yapılandırma'
+        config: 'Yapılandırma'
-import: 'İçe Aktar'
+        tags: 'Etiketler'
-howto: 'Yardım'
+        # internal_settings: 'Internal Settings'
-logout: 'Çıkış Yap'
+        import: 'İçe Aktar'
-Filtered: 'Filtreli'
+        howto: 'Yardım'
-About: 'Hakkımızda'
+        # developer: 'Developer'
+        logout: 'Çıkış Yap'
+        about: 'Hakkımızda'
+        search: 'Ara'
+        # save_link: 'Save a link'
+        back_to_unread: 'Okunmayan makalelere geri dön'
+    top:
+        add_new_entry: 'Yeni bir makale ekle'
+        search: 'Ara'
+        filter_entries: 'Filtrele'
+        export: 'Dışa Aktar'
+    search_form:
+        input_label: 'Aramak istediğiniz herhangi bir şey yazın'
 
-# Header
+footer:
-Back to unread articles: 'Okunmayan makalelere geri dön'
+    wallabag:
-Add a new entry: 'Yeni bir makale ekle'
+        elsewhere: 'wallabag her an seninle'
-Search: 'Ara'
+        social: 'Sosyal'
-Filter entries: 'Filtrele'
+        powered_by: 'powered by'
-Enter your search here: 'Aramak istediğiniz herhangi bir şey yazın'
+        about: 'Hakkımızda'
-Save new entry: 'Yeni makaleyi kaydet'
 
-# Config screen
+config:
-Settings: 'Ayarlar'
+    page_title: 'Yapılandırma'
-User information: 'Kullanıcı bilgileri'
+    tab_menu:
-Tagging rules: "Etiketleme kuralları"
+        settings: 'Ayarlar'
-Password: 'Şifre'
+        rss: 'RSS'
-RSS: 'RSS'
+        user_info: 'Kullanıcı bilgileri'
-Add a user: 'Bir kullanıcı ekle'
+        password: 'Şifre'
-Theme: 'Tema'
+        rules: 'Etiketleme kuralları'
-Items per page: "Sayfa başına makale sayısı"
+        new_user: 'Bir kullanıcı ekle'
-Language: 'Dil'
+    form:
-Save: 'Kaydet'
+        save: 'Kaydet'
-RSS token: 'RSS belirteci (token)'
+    form_settings:
-Name: 'İsim'
+        theme_label: 'Tema'
-Email: 'E-posta'
+        items_per_page_label: 'Sayfa başına makale sayısı'
-No token: 'Belirteç (token) yok'
+        language_label: 'Dil'
-Reset your token: 'Belirteci (token) sıfırla'
+        reading_speed:
-Create your token: 'Yeni belirteç (token) oluştur'
+            # label: 'Reading speed'
-Rss limit: "RSS içeriğinden talep edilecek makale limiti"
+            # help_message: 'You can use online tools to estimate your reading speed:'
-RSS links: 'RSS akış bağlantıları'
+            # 100_word: 'I read ~100 words per minute'
-"RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.": "wallabag RSS akışı kaydetmiş olduğunuz makalelerini favori RSS okuyucunuzda görüntülemenizi sağlar. Bunu yapabilmek için öncelikle belirteç (token) oluşturmalısınız."
+            # 200_word: 'I read ~200 words per minute'
-Old password: 'Eski şifre'
+            # 300_word: 'I read ~300 words per minute'
-New password: 'Yeni şifre'
+            # 400_word: 'I read ~400 words per minute'
-Repeat new password: 'Yeni şifrenin tekrarı'
+    form_rss:
-Username: "Kullanıcı adı"
+        description: 'wallabag RSS akışı kaydetmiş olduğunuz makalelerini favori RSS okuyucunuzda görüntülemenizi sağlar. Bunu yapabilmek için öncelikle belirteç (token) oluşturmalısınız.'
-Two factor authentication: "İki adımlı doğrulama"
+        token_label: 'RSS belirteci (token)'
-"Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion": "İki adımlı doğrulamayı aktifleştirdiğinizde, her yeni güvenilmeyen bağlantılarda size e-posta ile bir kod alacaksınız."
+        no_token: 'Belirteç (token) yok'
-Baggy: "Baggy"
+        token_create: 'Yeni belirteç (token) oluştur'
-Material: "Material"
+        token_reset: 'Belirteci (token) sıfırla'
-English: "İngilizce"
+        rss_links: 'RSS akış bağlantıları'
-Français: "Fransızca"
+        rss_link:
-Deutsch: "Almanca"
+            unread: 'okunmayan'
-Türkçe: "Türkçe"
+            starred: 'favoriler'
+            archive: 'arşiv'
+        rss_limit: 'RSS içeriğinden talep edilecek makale limiti'
+    form_user:
+        two_factor_description: "İki adımlı doğrulamayı aktifleştirdiğinizde, her yeni güvenilmeyen bağlantılarda size e-posta ile bir kod alacaksınız."
+        name_label: 'İsim'
+        email_label: 'E-posta'
+        twoFactorAuthentication_label: 'İki adımlı doğrulama'
+    form_password:
+        old_password_label: 'Eski şifre'
+        new_password_label: 'Yeni şifre'
+        repeat_new_password_label: 'Yeni şifrenin tekrarı'
+    form_rules:
+        # if_label: 'if'
+        # then_tag_as_label: 'then tag as'
+        # delete_rule_label: 'delete'
+        rule_label: 'Kural'
+        tags_label: 'Etiketler'
+        faq:
+            title: 'S.S.S.'
+            tagging_rules_definition_title: '« etiketleme kuralları » ne anlama geliyor?'
+            # tagging_rules_definition_description: 'They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.'
+            how_to_use_them_title: 'Bunu nasıl kullanırım?'
+            # how_to_use_them_description: 'Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »'
+            variables_available_title: 'Kurallar içerisinde hangi değişken ve operatörleri kullanabilirim?'
+            variables_available_description: 'Etiket kuralı oluşturmak istediğinizde aşağıdaki değişken ve operatörleri kullanabilirsin:'
+            meaning: 'Anlamı'
+            variable_description:
+                label: 'Değişken'
+                title: 'Makalenin başlığı'
+                url: 'Makalenin bağlantısı'
+                isArchived: 'Makale arşivlendi mi? Arşivlenmedi mi?'
+                isStarred: 'Makale favorilere eklendi mi? Eklenmedi mi?'
+                content: "Makalenin içeriği"
+                language: "Makalenin dili"
+                mimetype: "Makalenin mime türü"
+                readingTime: "Makalenin dakika cinsinden tahmini okuma süresi"
+                domainName: 'Makalenin bulunduğu internet sitesinin alan adı'
+            operator_description:
+                label: 'Operatör'
+                less_than: 'Küçüktür ve eşittir…'
+                strictly_less_than: 'Küçüktür…'
+                greater_than: 'Büyüktür ve eşittir…'
+                strictly_greater_than: 'Büyüktür…'
+                equal_to: 'Eşittir…'
+                not_equal_to: 'Eşit değildir…'
+                or: 'Bir kural veya birbaşkası'
+                and: 'Bir kural ve diğeri'
+                # matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
+    form_new_user:
+        username_label: 'Kullanıcı adı'
+        password_label: 'Şifre'
+        repeat_new_password_label: 'Yeni şifrenin tekrarı'
+        plain_password_label: '????'
+        email_label: 'E-posta'
 
-# Tagging rules
+entry:
-Rule: "Kural"
+    page_titles:
-Tags: "Etiketler"
+        # unread: 'Unread entries'
-FAQ: "S.S.S."
+        # starred: 'Starred entries'
-Variable: "Değişken"
+        # archived: 'Archived entries'
-Meaning: "Anlamı"
+        # filtered: 'Filtered entries'
-Operator: "Operatör"
+    list:
-"What does « tagging rules » mean?": "« etiketleme kuralları » ne anlama geliyor?"
+        number_on_the_page: '{0} Herhangi bir makale yok.|{1} Burada bir adet makale var.|]1,Inf[ Burada %count% adet makale var.'
-"How do I use them?": "Bunu nasıl kullanırım?"
+        reading_time: 'tahmini okuma süresi'
-"Which variables and operators can I use to write rules?": "Kurallar içerisinde hangi değişken ve operatörleri kullanabilirim?"
+        reading_time_minutes: 'tahmini okuma süresi: %readingTime% min'
-"The following variables and operators can be used to create tagging rules:": "Etiket kuralı oluşturmak istediğinizde aşağıdaki değişken ve operatörleri kullanabilirsin:"
+        reading_time_less_one_minute: 'tahmini okuma süresi: <small class="inferieur">&lt;</small> 1 min'
-Title of the entry: "Makalenin başlığı"
+        original_article: 'orijinal'
-URL of the entry: "Makalenin bağlantısı"
+        toogle_as_read: 'Okundu/okunmadı olarak işaretle'
-The domain name of the entry: "Makalenin bulunduğu internet sitesinin alan adı"
+        toogle_as_star: 'Favorilere ekle/çıkar'
-"The entry's content": "Makalenin içeriği"
+        delete: 'Sil'
-"The entry's language": "Makalenin dili"
+        export_title: 'Dışa Aktar'
-"The entry's mime-type": "Makalenin mime türü"
+    filters:
-"The estimated entry's reading time, in minutes": "Makalenin dakika cinsinden tahmini okuma süresi"
+        title: 'Filtreler'
-"Whether the entry is archived or not": "Makale arşivlendi mi? Arşivlenmedi mi?"
+        status_label: 'Durum'
-"Whether the entry is starred or not": "Makale favorilere eklendi mi? Eklenmedi mi?"
+        archived_label: 'Arşiv'
-"Less than…": "Küçüktür ve eşittir…"
+        starred_label: 'Favori'
-"Strictly less than…": "Küçüktür…"
+        preview_picture_label: 'Resim önizlemesi varsa'
-"Greater than…": "Büyüktür ve eşittir…"
+        preview_picture_help: 'Resim önizlemesi'
-"Strictly greater than…": "Büyüktür…"
+        language_label: 'Dil'
-"Equal to…": "Eşittir…"
+        reading_time:
-"Not equal to…": "Eşit değildir…"
+            label: 'Dakika cinsinden okuma süresi'
-"One rule or another": "Bir kural veya birbaşkası"
+            from: 'başlangıç'
-"One rule and another": "Bir kural ve diğeri"
+            to: 'bitiş'
+        domain_label: 'Alan adı'
+        created_at:
+            label: 'Oluşturulma tarihi'
+            from: 'başlangıç'
+            to: 'bitiş'
+        action:
+            clear: 'Temizle'
+            filter: 'Filtrele'
+    view:
+        left_menu:
+            # back_to_top: 'Back to top'
+            back_to_homepage: 'Back'
+            set_as_read: 'Okundu olarak işaretle'
+            set_as_unread: 'Okunmadı olarak işaretle'
+            set_as_favorite: 'Favorilere ekle/çıkar'
+            view_original_article: 'Orijinal makale'
+            re_fetch_content: 'İçeriği yenile'
+            delete: 'Sil'
+            add_a_tag: 'Bir etiket ekle'
+            share_content: 'Paylaş'
+            share_email_label: 'E-posta'
+            download: 'İndir'
+            # print: 'Print'
+            problem:
+                label: 'Bir sorun mu var?'
+                description: 'Bu makalede herhangi bir yanlışlık mı var?'
+        edit_title: 'Başlığı düzenle'
+        original_article: 'orijinal'
+        # annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations'
+    new:
+        page_title: 'Yeni makaleyi kaydet'
+        placeholder: 'http://website.com'
+        form_new:
+            url_label: Url
+    edit:
+        page_title: 'Makaleyi düzenle'
+        title_label: 'Başlık'
+        url_label: 'Url'
+        is_public_label: 'Herkes tarafından erişime açık olsun mu?'
+        save_label: 'Kaydet'
 
-# Entries
+about:
-'estimated reading time': 'tahmini okuma süresi'
+    page_title: 'Hakkımızda'
-original: "orijinal"
+    top_menu:
-Toggle mark as read: 'Okundu/okunmadı olarak işaretle'
+        who_behind_wallabag: "wallabag'in arkasındakiler"
-Toggle favorite: 'Favorilere ekle/çıkar'
+        getting_help: 'Yardım'
-Delete: 'Sil'
+        helping: 'wallabag destek olun'
+        # contributors: 'Contributors'
+        # third_party: 'Third-party libraries'
+    who_behind_wallabag:
+        developped_by: 'Geliştiriciler'
+        website: 'i̇nternet sitesi'
+        many_contributors: 'Ve katkıda bulunanlar ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">GitHub üzerinde</a>'
+        project_website: 'Proje internet sitesi'
+        license: 'Lisans'
+        version: 'Sürüm'
+    getting_help:
+        documentation: 'Dokümantasyon'
+        bug_reports: 'Sorun bildir'
+        support: '<a href="https://support.wallabag.org">Destek internet sitesinde</a> ya da <a href="https://github.com/wallabag/wallabag/issues">GitHub üzerinde</a>'
+    helping:
+        description: 'wallabag açık kaynak kodlu ve ücretsizdir. Bize destek ol :'
+        by_contributing: 'projemize katkıda bulunun :'
+        by_contributing_2: 'ihtiyacımız olanların listelendiği yapılacaklar listesi'
+        by_paypal: 'PayPal ile'
+    contributors:
+        # description: 'Thank you to contributors on wallabag web application'
+    third_party:
+        # description: 'Here are the list of third-party libraries used in wallabag (with their licenses):'
+        # package: 'Package'
+        license: 'Lisans'
 
-# Filters
+howto:
-Filters: 'Filtreler'
+    page_title: 'Yardım'
-Status: 'Durum'
+    # page_description: 'There are several ways to save an article:'
-Archived: 'Arşiv'
+    top_menu:
-Starred: 'Favori'
+        browser_addons: 'Tarayıcı eklentileri'
-Preview picture: 'Resim önizlemesi'
+        mobile_apps: 'Mobil uygulamalar'
-Has a preview picture: 'Resim önizlemesi varsa'
+        bookmarklet: 'Bookmarklet'
-Reading time in minutes: 'Dakika cinsinden okuma süresi'
+    form:
-from: 'başlangıç'
+        description: 'Yeni makale kaydet'
-to: 'bitiş'
+    browser_addons:
-website.com: 'internet-sitesi.com'
+        firefox: 'Standart Firefox Eklentisi'
-Domain name: 'Alan adı'
+        chrome: 'Chrome Eklentisi'
-Creation date: 'Oluşturulma tarihi'
+    mobile_apps:
-dd/mm/yyyy: 'dd/mm/aaaa'
+        android:
-Clear: 'Temizle'
+            # via_f_droid: 'via F-Droid'
-Filter: 'Filtrele'
+            # via_google_play: 'via Google Play'
+        # ios: 'on the iTunes Store'
+        # windows: 'on the Microsoft Store'
+    bookmarklet:
+        description: "Bu bağlantı ile yer imlerinizi sürükleyip bırakarak wallabag'e ekleyebilirsiniz:"
 
-# About
+quickstart:
-Who is behind wallabag: "wallabag'in arkasındakiler"
+    page_title: 'Hızlı başlangıç'
-Getting help: "Yardım"
+    intro:
-Helping wallabag: "wallabag destek olun"
+        title: 'wallabag'
-Developed by: "Geliştiriciler:"
+        paragraph_1: "wallabag kurduğunuz için teşekkür ederiz. Bu sayfada biz size eşlik edecek ve ilginizi çekecek birkaç özellik göstereceğim."
-website: "İnternet sitesi"
+        paragraph_2: 'Bizi takip edin!'
-And many others contributors ♥: "Ve katkıda bulunanlar ♥"
+    configure:
-on GitHub: "GitHub üzerinde"
+        title: 'Uygulamayı Yapılandırma'
-Project website: "Proje internet sitesi"
+        language: 'Dili ve tasarımı değiştirme'
-License: "Lisans"
+        rss: 'RSS akışını aktifleştirme'
-Version: "Sürüm"
+        # tagging_rules: 'Write rules to automatically tag your articles'
-Documentation: "Dokümantasyon"
+    admin:
-Bug reports: "Sorun bildir"
+        # title: 'Administration'
-On our support website: "Destek internet sitesinde"
+        # description: 'As an administrator, you have privileges on wallabag. You can:'
-or: "ya da"
+        # new_user: 'Create a new user'
-"wallabag is free and opensource. You can help us:": "wallabag açık kaynak kodlu ve ücretsizdir. Bize destek ol :"
+        # analytics: 'Configure analytics'
-"by contributing to the project:": "projemize katkıda bulunun :"
+        # sharing: 'Enable some parameters about article sharing'
-an issue lists all our needs: "ihtiyacımız olanların listelendiği yapılacaklar listesi"
+        # export: 'Configure export'
-via Paypal: "PayPal ile"
+        # import: 'Configure import'
+    first_steps:
+        title: 'İlk adım'
+        new_article: 'İlk makalenizi kaydedin'
+        unread_articles: 'Ve bunu sınıflandırın!'
+    migrate:
+        title: 'Varolan servislerden veri aktarma'
+        description: "Kullanmakta olduğunuz farklı bir hizmet mi var? Biz size yardımcı olacak ve verilerinizi wallabag'e aktarmanıza yardımcı olacağız."
+        pocket: "Pocket üzerindeki verilerinizi wallabag'e aktarın"
+        wallabag_v1: "wallabag v1 üzerindeki verilerinizi wallabag'in yeni sürümüne aktarın"
+        wallabag_v2: "wallabag v2 üzerindeki verilerinizi wallabag'in yeni sürümüne aktarın"
+    developer:
+        # title: 'Developers'
+        # create_application: 'Create your third application'
+    docs:
+        title: 'Dokümantasyon'
+        # annotate: 'Annotate your article'
+        export: 'Makalelerinizi ePUB ya da PDF formatına çevirme'
+        search_filters: 'Makaleleri görüntülemek için arama motorlarını ve filteri kullanma'
+        # fetching_errors: 'What can I do if an article encounters errors during fetching?'
+        all_docs: 'Ve daha fazlası!'
+    support:
+        title: 'Destek'
+        description: 'Eğer yardıma ihtiyacınız varsa, biz her daim senin için burada olacağız.'
+        github: 'GitHub'
+        email: 'E-posta'
+        gitter: 'Gitter'
 
-# Howto
+tag:
-Form: "Form"
+    page_title: 'Etiketler'
-Thanks to this form: "Yeni makale kaydet"
+    list:
-Browser addons: "Tarayıcı eklentileri"
+        number_on_the_page: '{0} Herhangi bir etiket yok.|{1} Burada bir adet etiket var.|]1,Inf[ Burada %count% adet etiket var.'
-Mobile apps: "Mobil uygulamalar"
-Bookmarklet: "Bookmarklet"
-Standard Firefox Add-On: "Standart Firefox Eklentisi"
-Chrome Extension: "Chrome Eklentisi"
-download the application: "uygulamayı indir"
-"Drag &amp; drop this link to your bookmarks bar:": "Bu bağlantı ile yer imlerinizi sürükleyip bırakarak wallabag'e ekleyebilirsiniz:"
-via F-Droid: "F-Droid"
-via Google Play: "Google Play"
-bag it!: "bag it!"
 
-# Flash messages
+import:
-Information updated: "Bilgiler güncellendi"
+    page_title: 'İçe Aktar'
-"Config saved. Some parameters will be considered after disconnection.": "Yapılandırma ayarları kaydedildi. Bazı yapılandırmalar tekrar giriş yaptığınızda aktif olacaktır."
+    page_description: 'wallabag içe aktarma aracına hoşgeldiniz. Lütfen içe aktarmak istediğiiz önceki servisinizi seçin.'
-RSS information updated: "RSS bilgiler güncellendi"
+    action:
-Password updated: "Şifre güncellendi"
+        import_contents: 'İçe Aktar contents'
-Entry starred: "Makale favorilere eklendi"
+    form:
-Entry unstarred: "Makale favorilerden çıkartıldı"
+        # mark_as_read_title: 'Mark all as read?'
-Entry archived: "Makale arşivlendi"
+        # mark_as_read_label: 'Mark all imported entries as read'
-Entry unarchived: "Makale arşivden çıkartıldı"
+        file_label: 'Dosya'
-Entry reloaded: "Makale içeriği yenilendi"
+        save_label: 'Dosyayı yükle'
-Entry deleted: "Makale silindi"
+    pocket:
-Entry saved: "Makale kaydedildi"
+        page_title: 'İçe Aktar > Pocket'
-Tag added: "Etiket eklendi"
+        description: "Bu araç tüm Pocket verinizi içe aktarır. Pocket içeriklerin getirilmesine izin vermez, okunabilen içerikler wallabag tarafından yeniden getirilir."
+        config_missing:
+            # description: "Pocket import isn't configured."
+            # admin_message: 'You need to define %keyurls%a pocket_consumer_key%keyurle%.'
+            # user_message: 'Your server admin needs to define an API Key for Pocket.'
+        authorize_message: 'Pocket hesabınızda verilerinizi içe aktarabilmemiz için öncelikle aşağıdaki butona tıklayın. Daha sonra, getpocket.com üzerindeki uygulamamıza gereken izinleri verin. Hepsi bu kadar!'
+        connect_to_pocket: "Pocket'a bağlanın ve verilerinizi içe aktarın"
+    wallabag_v1:
+        page_title: 'İçe Aktar > Wallabag v1'
+        description: 'Bu araç wallabag v1 üzerindeki tüm makalelerinizi içe aktarır. Yapılandırma sayfasında, "Export your wallabag data" sekmesinden "JSON export" adımını izleyin. Bu adım size "wallabag-export-1-xxxx-xx-xx.json" isimli bir dosya verecektir.'
+        how_to: 'Aşağıdaki butona tıklayarak wallabag v1 tarafından dışa aktarılmış dosyanızı yükleyin.'
+    wallabag_v2:
+        page_title: 'İçe Aktar > Wallabag v2'
+        # description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.'
 
-# Entry
+developer:
-Mark as read: 'Okundu olarak işaretle'
+    # page_title: 'Developer'
-Mark as unread: 'Okunmadı olarak işaretle'
+    # welcome_message: 'Welcome to the wallabag API'
-Favorite: 'Favorilere ekle/çıkar'
+    # documentation: 'Documentation'
-back: 'geri dön'
+    # how_to_first_app: 'How to create my first application'
-original article: 'Orijinal makale'
+    # full_documentation: 'View full API documentation'
-Add a tag: 'Bir etiket ekle'
+    # list_methods: 'List API methods'
-Share: 'Paylaş'
+    # clients:
-Download: 'İndir'
+    #     title: 'Clients'
-Does this article appear wrong?: "Bu makalede herhangi bir yanlışlık mı var?"
+    #     create_new: 'Create a new client'
-Problems?: 'Bir sorun mu var?'
+    # existing_clients:
-Edit title: "Başlığı düzenle"
+    #     title: 'Existing clients'
-"{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.": "{0} Herhangi bir makale yok.|{1} Burada bir adet makale var.|]1,Inf[ Burada %count% adet makale var."
+    #     field_id: 'Client ID'
-"{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.": "{0} Herhangi bir etiket yok.|{1} Burada bir adet etiket var.|]1,Inf[ Burada %count% adet etiket var."
+    #     field_secret: 'Client secret'
-Reload content: "İçeriği yenile"
+    #     field_uris: 'Redirect URIs'
-Edit an entry: "Makaleyi düzenle"
+    #     field_grant_types: 'Grant type allowed'
-Title: "Başlık"
+    #     no_client: 'No client yet.'
-Is public: "Herkes tarafından erişime açık olsun mu?"
+    # 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'
 
-# Import
+validator:
-Import: "İçe Aktar"
+    # password_must_match: 'The password fields must match.'
-"Import > Pocket": "İçe Aktar > Pocket"
+    # password_too_short: 'Password should by at least 8 chars long'
-"Import > Wallabag v1": "İçe Aktar > Wallabag v1"
+    # password_wrong_value: 'Wrong value for your current password'
-Welcome to wallabag importer. Please select your previous service that you want to migrate.: "wallabag içe aktarma aracına hoşgeldiniz. Lütfen içe aktarmak istediğiiz önceki servisinizi seçin."
+    # item_per_page_too_high: 'This will certainly kill the app'
-"This importer will import all your Pocket data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag.": "Bu araç tüm Pocket verinizi içe aktarır. Pocket içeriklerin getirilmesine izin vermez, okunabilen içerikler wallabag tarafından yeniden getirilir."
+    # rss_limit_too_hight: 'This will certainly kill the app'
-"This importer will import all your wallabag v1 articles. On your config page, click on \"JSON export\" in the \"Export your wallabag data\" section. You will have a \"wallabag-export-1-xxxx-xx-xx.json\" file.": "Bu araç wallabag v1 üzerindeki tüm makalelerinizi içe aktarır. Yapılandırma sayfasında, \"Export your wallabag data\" sekmesinden \"JSON export\" adımını izleyin. Bu adım size \"wallabag-export-1-xxxx-xx-xx.json\" isimli bir dosya verecektir."
-"You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.": "Pocket hesabınızda verilerinizi içe aktarabilmemiz için öncelikle aşağıdaki butona tıklayın. Daha sonra, getpocket.com üzerindeki uygulamamıza gereken izinleri verin. Hepsi bu kadar!"
-Connect to Pocket and import data: "Pocket'a bağlanın ve verilerinizi içe aktarın"
-Please select your wallabag export and click on the below button to upload and import it.: "Aşağıdaki butona tıklayarak wallabag v1 tarafından dışa aktarılmış dosyanızı yükleyin."
-File: "Dosya"
-Upload file: "Dosyayı yükle"
-Import contents: "İçerikleri içe aktar"
 
-# Quickstart
+flashes:
-Welcome to wallabag!: "wallabag"
+    config:
-Quickstart: "Hızlı başlangıç"
+        notice:
-We'll accompany you to visit wallabag and show you some features which can interess you.: "wallabag kurduğunuz için teşekkür ederiz. Bu sayfada biz size eşlik edecek ve ilginizi çekecek birkaç özellik göstereceğim."
+            config_saved: 'Yapılandırma ayarları kaydedildi. Bazı yapılandırmalar tekrar giriş yaptığınızda aktif olacaktır.'
-Follow us!: "Bizi takip edin!"
+            password_updated: 'Şifre güncellendi'
-Configure the application: "Uygulamayı Yapılandırma"
+            password_not_updated_demo: "In demonstration mode, you can't change password for this user."
-Change language and design: "Dili ve tasarımı değiştirme"
+            user_updated: 'Bilgiler güncellendi'
-Enable RSS feeds: "RSS akışını aktifleştirme"
+            rss_updated: 'RSS bilgiler güncellendi'
-First steps: "İlk adım"
+            tagging_rules_updated: 'Tagging rules updated'
-Save your first article: "İlk makalenizi kaydedin"
+            tagging_rules_deleted: 'Tagging rule deleted'
-And classify it!: "Ve bunu sınıflandırın!"
+            user_added: 'User "%username%" added'
-Migrate from an existing service: "Varolan servislerden veri aktarma"
+            rss_token_updated: 'RSS token updated'
-You're using an other service? We'll help you to retrieve your data on wallabag.: "Kullanmakta olduğunuz farklı bir hizmet mi var? Biz size yardımcı olacak ve verilerinizi wallabag'e aktarmanıza yardımcı olacağız."
+    entry:
-Migrate from Pocket: "Pocket üzerindeki verilerinizi wallabag'e aktarın"
+        notice:
-Migrate from wallabag v1: "wallabag v1 üzerindeki verilerinizi wallabag'in yeni sürümüne aktarın"
+            entry_already_saved: 'Entry already saved on %date%'
-Full documentation: "Dokümantasyon"
+            entry_saved: 'Makale kaydedildi'
-Convert your articles into ePUB or PDF: "Makalelerinizi ePUB ya da PDF formatına çevirme"
+            # entry_updated: 'Entry updated'
-See how you can look for an article by using search engine and filters: "Makaleleri görüntülemek için arama motorlarını ve filteri kullanma"
+            entry_reloaded: 'Makale içeriği yenilendi'
-And so many other articles!: "Ve daha fazlası!"
+            # entry_reload_failed: 'Failed to reload entry'
-Support: "Destek"
+            entry_archived: 'Makale arşivlendi'
-Social: "Sosyal"
+            entry_unarchived: 'Makale arşivden çıkartıldı'
-If you need some help, we are here for you.: "Eğer yardıma ihtiyacınız varsa, biz her daim senin için burada olacağız."
+            entry_starred: 'Makale favorilere eklendi'
-On GitHub: "GitHub"
+            entry_unstarred: 'Makale favorilerden çıkartıldı'
-By email: "E-posta"
+            entry_deleted: 'Makale silindi'
-On Gitter: "Gitter"
+    tag:
-Export: "Dışa Aktar"
+        notice:
-"http://website": "http://internet-sitesi"
+            tag_added: 'Etiket eklendi'
-Take wallabag with you: "wallabag her an seninle"
+    import:
-about: "hakkımızda"
+        notice:
-powered by: "powered by"
+            # 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.'
+    developer:
+        notice:
+            # client_created: 'New client created.'
+            # client_deleted: 'Client deleted'

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

@@ -1,3 +0,0 @@
-# Config screen
-The password fields must match: 'De indtastede adgangskoder skal være ens'
-Password should by at least 8 chars long: 'Adgangskoden skal være mindst 8 tegn'

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

@@ -1,3 +0,0 @@
-# Config screen
-The password fields must match: 'Las contraseñas no coinciden'
-Password should by at least 8 chars long: 'La contraseña debe tener al menos 8 carácteres'

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

@@ -1,3 +0,0 @@
-# Config screen
-The password fields must match: 'رمزها باید یکی باشند'
-Password should by at least 8 chars long: 'رمز شما باید ۸ حرف یا بیشتر باشد'

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

@@ -1,3 +0,0 @@
-# Config screen
-The password fields must match: 'Les deux mots de passe doivent être les mêmes'
-Password should by at least 8 chars long: 'Le mot de passe doit contenir au moins 8 caractères'

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

@@ -1,3 +0,0 @@
-# Config screen
-The password fields must match: 'Hasło w polach musi być takie same '
-Password should by at least 8 chars long: 'Hasło powinno mieć minimum 8 znaków długości'

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

@@ -1,3 +0,0 @@
-# Config screen
-The password fields must match: 'Câmpurile destinate parolelor trebuie să se potrivească'
-Password should by at least 8 chars long: 'Parola ar trebui să conțină cel puțin 8 caractere'

src/Wallabag/CoreBundle/Resources/views/base.html.twig

@@ -70,10 +70,6 @@
 
         {% block footer %}{% endblock %}
 
-        <div id="warning_message">
-            You're trying wallabag v2, which is in beta version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new one if necessary</a>.
-        </div>
-
         {% if craue_setting('piwik_enabled') %}
             {{ piwik(craue_setting('piwik_host'), craue_setting('piwik_site_id')) }}
         {% endif %}

src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig

@@ -1,9 +1,9 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}Config{% endtrans %}{% endblock %}
+{% block title %}{{ 'config.page_title'|trans }}{% endblock %}
 
 {% block content %}
-    <h2>{% trans %}Wallabag configuration{% endtrans %}</h2>
+    <h2>{{ 'config.tab_menu.settings'|trans }}</h2>
 
     {{ form_start(form.config) }}
         {{ form_errors(form.config) }}
@@ -24,6 +24,18 @@
             </div>
         </fieldset>
 
+        <fieldset class="w500p inline">
+            <div class="row">
+                {{ form_label(form.config.reading_speed) }}
+                {{ form_errors(form.config.reading_speed) }}
+                {{ form_widget(form.config.reading_speed) }}
+                <p>
+                    {{ 'config.form_settings.reading_speed.help_message'|trans }}
+                    <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a>
+                </p>
+            </div>
+        </fieldset>
+
         <fieldset class="w500p inline">
             <div class="row">
                 {{ form_label(form.config.language) }}
@@ -35,13 +47,13 @@
         {{ form_rest(form.config) }}
     </form>
 
-    <h2>{% trans %}RSS configuration{% endtrans %}</h2>
+    <h2>{{ 'config.tab_menu.rss'|trans }}</h2>
 
-    {{ form_start(form.rss) }}
+        {{ form_start(form.rss) }}
         {{ form_errors(form.rss) }}
 
         <div class="row">
-            {% trans %}RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader.{% endtrans %}
+            {{ 'config.form_rss.description'|trans }}
         </div>
 
         <fieldset class="w500p inline">
@@ -50,27 +62,31 @@
                 {% if rss.token %}
                     {{ rss.token }}
                 {% else %}
-                    <em>No token</em>
+                    <em>{{ 'config.form_rss.no_token'|trans }}</em>
                 {% endif %}
                 –
-                <a href="{{ path('generate_token') }}">Regenerate ?</a>
+                <a href="{{ path('generate_token') }}">
+                    {% if rss.token %}
+                        {{ 'config.form_rss.token_reset'|trans }}
+                    {% else %}
+                        {{ 'config.form_rss.token_create'|trans }}
+                    {% endif %}
+                </a>
             </div>
         </fieldset>
 
+        {% if rss.token %}
         <fieldset class="w500p inline">
             <div class="row">
-                <label>Rss links:</label>
+                <label>{{ 'config.form_rss.rss_links'|trans }}</label>
-                {% if rss.token %}
+                <ul>
-                    <ul>
+                    <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">unread</a></li>
-                        <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">unread</a></li>
+                    <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">fav</a></li>
-                        <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">fav</a></li>
+                    <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">archives</a></li>
-                        <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">archives</a></li>
+                </ul>
-                    </ul>
-                {% else %}
-                    <strong>You need to generate a token first.</strong>
-                {% endif %}
             </div>
         </fieldset>
+        {% endif %}
 
         <fieldset class="w500p inline">
             <div class="row">
@@ -83,7 +99,7 @@
         {{ form_rest(form.rss) }}
     </form>
 
-    <h2>{% trans %}User information{% endtrans %}</h2>
+    <h2>{{ 'config.tab_menu.user_info'|trans }}</h2>
 
     {{ form_start(form.user) }}
         {{ form_errors(form.user) }}
@@ -106,7 +122,7 @@
 
         {% if twofactor_auth %}
         <div class="row">
-            {% trans %}Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion{% endtrans %}
+            {{ 'config.form_user.two_factor_description'|trans }}
         </div>
 
         <fieldset class="w500p inline">
@@ -121,7 +137,7 @@
         {{ form_rest(form.user) }}
     </form>
 
-    <h2>{% trans %}Change your password{% endtrans %}</h2>
+    <h2>{{ 'config.tab_menu.password'|trans }}</h2>
 
     {{ form_start(form.pwd) }}
         {{ form_errors(form.pwd) }}
@@ -153,18 +169,21 @@
         {{ form_rest(form.pwd) }}
     </form>
 
-    <h2>{% trans %}Tagging rules{% endtrans %}</h2>
+    <h2>{{ 'config.tab_menu.rules'|trans }}</h2>
 
     <ul>
         {% for tagging_rule in app.user.config.taggingRules %}
         <li>
-            if « {{ tagging_rule.rule }} » then tag as « {{ tagging_rule.tags|join(', ') }} »
+            {{ 'config.form_rules.if_label'|trans }}
-            <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{% trans %}Delete{% endtrans %}" class="tool delete icon-trash icon"></a>
+            « {{ tagging_rule.rule }} »
+            {{ 'config.form_rules.then_tag_as_label'|trans }}
+            « {{ tagging_rule.tags|join(', ') }} »
+            <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}" class="tool delete icon-trash icon"></a>
         </li>
         {% endfor %}
     </ul>
 
-    {{ form_start(form.new_tagging_rule) }}
+        {{ form_start(form.new_tagging_rule) }}
         {{ form_errors(form.new_tagging_rule) }}
 
         <fieldset class="w500p inline">
@@ -186,8 +205,93 @@
         {{ form_rest(form.new_tagging_rule) }}
     </form>
 
+    <div class="row">
+        <div class="input-field col s12">
+            <h3>{{ 'config.form_rules.faq.title'|trans }}</h3>
+
+            <h4>{{ 'config.form_rules.faq.tagging_rules_definition_title'|trans }}</h4>
+            <p class="help">{{ 'config.form_rules.faq.tagging_rules_definition_description'|trans|raw }}</p>
+
+            <h4>{{ 'config.form_rules.faq.how_to_use_them_title'|trans }}</h4>
+            <p class="help">{{ 'config.form_rules.faq.how_to_use_them_description'|trans|raw }}</p>
+
+            <h4>{{ 'config.form_rules.faq.variables_available_title'|trans }}</h4>
+            <p class="help">
+                {{ 'config.form_rules.faq.variables_available_description'|trans }}
+            </p>
+
+            <table class="bordered">
+                <thead>
+                <tr>
+                    <th>{{ 'config.form_rules.faq.variable_description.label'|trans }}</th>
+                    <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
+                    <th>{{ 'config.form_rules.faq.operator_description.label'|trans }}</th>
+                    <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
+                </tr>
+                </thead>
+
+                <tbody>
+                <tr>
+                    <td>title</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.title'|trans }}</td>
+                    <td>&lt;=</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.less_than'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>url</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.url'|trans }}</td>
+                    <td>&lt;</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>isArchived</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td>
+                    <td>&gt;=</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>isStarred</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}</td>
+                    <td>&gt;</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>content</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.content'|trans }}</td>
+                    <td>=</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.equal_to'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>language</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.language'|trans }}</td>
+                    <td>!=</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>mimetype</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}</td>
+                    <td>OR</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.or'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>readingTime</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}</td>
+                    <td>AND</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.and'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>domainName</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.domainName'|trans }}</td>
+                    <td>matches</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
     {% if is_granted('ROLE_SUPER_ADMIN') %}
-    <h2>{% trans %}Add a user{% endtrans %}</h2>
+    <h2>{{ 'config.tab_menu.new_user'|trans }}</h2>
 
     {{ form_start(form.new_user) }}
         {{ form_errors(form.new_user) }}

src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig

@@ -1,6 +1,6 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}New client{% endtrans %}{% endblock %}
+{% block title %}{{ 'developer.client.page_title'|trans }}{% endblock %}
 
 {% block content %}
 <div class="row">
@@ -8,7 +8,7 @@
         <div class="card-panel settings">
 
             <div class="row">
-                <p>{% trans %}You are about to create a new client. Please fill the field below for the redirect URI of your application.{% endtrans %}</p>
+                <p>{{ 'developer.client.page_description'|trans }}</p>
                 {{ form_start(form) }}
                 {{ form_errors(form) }}
 
@@ -18,7 +18,7 @@
                     {{ form_widget(form.redirect_uris) }}
                 </div>
 
-                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{% trans %}Back{% endtrans %}</a>
+                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client.action_back'|trans }}</a>
                 {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
 
                 {{ form_rest(form) }}

src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig

@@ -1,20 +1,20 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}Client parameters{% endtrans %}{% endblock %}
+{% block title %}{{ 'developer.client_parameter.page_title'|trans }}{% endblock %}
 
 {% block content %}
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
             <div class="row">
-                <p>{% trans %}Here are your client parameters.{% endtrans %}</p>
+                <p>{{ 'developer.client_parameter.page_description'|trans }}</p>
                 <ul>
-                    <li>{% trans %}Client ID{% endtrans %}: <strong><pre>{{ client_id }}</pre></strong></li>
+                    <li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li>
-                    <li>{% trans %}Client secret{% endtrans %}: <strong><pre>{{ client_secret }}</pre></strong></li>
+                    <li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li>
                 </ul>
 
-                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{% trans %}Back{% endtrans %}</a>
+                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client_parameter.back'|trans }}</a>
-                <a href="{{ path('developer_howto_firstapp') }}" class="btn waves-effect waves-light">{% trans %}Read the howto "Create my first application"{% endtrans %}</a>
+                <a href="{{ path('developer_howto_firstapp') }}" class="btn waves-effect waves-light">{{ 'developer.client_parameter.read_howto'|trans }}</a>
             </div>
         </div>
     </div>

src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig

@@ -1,6 +1,6 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}How to create my first application{% endtrans %}{% endblock %}
+{% block title %}{{ 'developer.howto.page_title'|trans }}{% endblock %}
 
 {% block css %}
     {{ parent() }}
@@ -13,10 +13,10 @@
         <div class="card-panel settings">
 
             <div class="row">
-                <p>{% trans %}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.{% endtrans %}</p>
+                <p>{{ 'developer.howto.description.paragraph_1'|trans|raw }}</p>
-                <p>{% trans %}You need a token to communicate between your 3rd application and wallabag API.{% endtrans %}</p>
+                <p>{{ 'developer.howto.description.paragraph_2'|trans }}</p>
-                <p>{% trans with {'%link%': path('developer_create_client')} %}To create this token, you need <a href="%link%">to create a new client</a>.{% endtrans %}</p>
+                <p>{{ 'developer.howto.description.paragraph_3'|trans({'%link%': path('developer_create_client')})|raw }}</p>
-                <p>{% trans %}Now, create your token (replace client_id, client_secret, username and password with the good values):{% endtrans %}</p>
+                <p>{{ 'developer.howto.description.paragraph_4'|trans }}</p>
                 <p>
                     <pre><code class="language-bash">http POST http://v2.wallabag.org/oauth/v2/token \
     grant_type=password \
@@ -25,7 +25,7 @@
     username=yourUsername \
     password=yourPassw0rd</code></pre>
                 </p>
-                <p>{% trans %}The API will return a response like this:{% endtrans %}</p>
+                <p>{{ 'developer.howto.description.paragraph_5'|trans }}</p>
                 <p>
                     <pre><code class="language-bash">HTTP/1.1 200 OK
 Cache-Control: no-store, private
@@ -45,14 +45,14 @@ X-Powered-By: PHP/5.5.9-1ubuntu4.13
     "token_type": "bearer"
 }</code></pre>
                 </p>
-                <p>{% trans %}The access_token is useful to do a call to the API endpoint. For example:{% endtrans %}</p>
+                <p>{{ 'developer.howto.description.paragraph_6'|trans }}</p>
                 <p>
                     <pre><code class="language-bash">http GET http://v2.wallabag.org/api/entries.json \
     "Authorization:Bearer ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw"</code></pre>
                 </p>
-                <p>{% trans %}This call will return all the entries for your user.{% endtrans %}</p>
+                <p>{{ 'developer.howto.description.paragraph_7'|trans }}</p>
-                <p>{% trans with {'%link%': path('nelmio_api_doc_index')} %}If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.{% endtrans %}</p>
+                <p>{{ 'developer.howto.description.paragraph_8'|trans({'%link%': path('nelmio_api_doc_index')})|raw }}</p>
-                <p><a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{% trans %}Back{% endtrans %}</a></p>
+                <p><a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.howto.back'|trans }}</a></p>
             </div>
 
         </div>

src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig

@@ -1,6 +1,6 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}Developer{% endtrans %}{% endblock %}
+{% block title %}{{ 'developer.page_title'|trans }}{% endblock %}
 
 {% block content %}
 <div class="row">
@@ -8,21 +8,22 @@
         <div class="card-panel settings">
 
             <div class="row">
-                <h3>{% trans %}Welcome to the wallabag API{% endtrans %}</h3>
+                <h3>{{ 'developer.welcome_message'|trans }}</h3>
 
-                <h4>{% trans %}Documentation{% endtrans %}</h4>
+                <h4>{{ 'developer.documentation'|trans }}</h4>
 
                 <ul>
-                    <li><a href="{{ path('developer_howto_firstapp') }}">{% trans %}How to create my first application{% endtrans %}</a></li>
+                    <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li>
-                    <li><a href="{{ path('nelmio_api_doc_index') }}">{% trans %}View full API documentation{% endtrans %}</a></li>
+                    <li><a href="http://doc.wallabag.org/en/v2/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li>
+                    <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li>
                 </ul>
 
-                <h4>{% trans %}Clients{% endtrans %}</h4>
+                <h4>{{ 'developer.clients.title'|trans }}</h4>
                 <ul>
-                    <li><a href="{{ path('developer_create_client') }}">{% trans %}Create a new client{% endtrans %}</a></li>
+                    <li><a href="{{ path('developer_create_client') }}">{{ 'developer.clients.create_new'|trans }}</a></li>
                 </ul>
 
-                <h4>{% trans %}Existing clients{% endtrans %}</h4>
+                <h4>{{ 'developer.existing_clients.title'|trans }}</h4>
                 {% if clients %}
                     <ul class="collapsible" data-collapsible="expandable">
                         {% for client in clients %}
@@ -31,33 +32,33 @@
                                 <div class="collapsible-body">
                                     <table class="striped">
                                         <tr>
-                                            <td>{% trans %}Client ID{% endtrans %}</td>
+                                            <td>{{ 'developer.existing_clients.field_id'|trans }}</td>
                                             <td><strong><code>{{ client.id }}_{{ client.randomId }}</code></strong></td>
                                         </tr>
                                         <tr>
-                                            <td>{% trans %}Client secret{% endtrans %}</td>
+                                            <td>{{ 'developer.existing_clients.field_secret'|trans }}</td>
                                             <td><strong><code>{{ client.secret }}</code></strong></td>
                                         </tr>
                                         <tr>
-                                            <td>{% trans %}Redirect URIs{% endtrans %}</td>
+                                            <td>{{ 'developer.existing_clients.field_uris'|trans }}</td>
                                             <td><strong><code>{{ client.redirectUris|json_encode() }}</code></strong></td>
                                         </tr>
                                         <tr>
-                                            <td>{% trans %}Grant type allowed{% endtrans %}</td>
+                                            <td>{{ 'developer.existing_clients.field_grant_types'|trans }}</td>
                                             <td><strong><code>{{ client.allowedGrantTypes|json_encode() }}</code></strong></td>
                                         </tr>
                                     </table>
                                     <p>
-                                        {% trans %}You have the ability to remove this client. This action is IRREVERSIBLE !{% endtrans %}<br/>
+                                        {{ 'developer.remove.warn_message_1'|trans }}<br/>
-                                        {% trans %}If you remove it, every app configured with that client won't be able to auth on your wallabag.{% endtrans %}<br/>
+                                        {{ 'developer.remove.warn_message_2'|trans }}<br/>
-                                        <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{% trans %}Remove this client{% endtrans %}</a>
+                                        <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans }}</a>
                                     </p>
                                 </div>
                             </li>
                         {% endfor %}
                     </ul>
                 {% else %}
-                    {% trans %}No client yet.{% endtrans %}
+                    {{ 'developer.existing_clients.no_client'|trans }}
                 {% endif %}
             </div>
 

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

@@ -1,6 +1,6 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}Edit an entry{% endtrans %}{% endblock %}
+{% block title %}{{ 'entry.edit.page_title'|trans }}{% endblock %}
 
 {% block content %}
     {{ form(form) }}

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

@@ -1,13 +1,13 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title "Unread" %}
+{% block title %}{{ 'entry.page_titles.unread'|trans }}{% endblock %}
 
 {% block content %}
     {% block pager %}
         <div class="results">
-            <div class="nb-results">{{ entries.count }} {% trans %}entries{% endtrans %}</div>
+            <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
                 <div class="pagination">
-                <a href="#" id="filter">{% trans %}Filter{% endtrans %}</a>
+                <a href="#" id="filter">{{ 'entry.filters.title'|trans }}</a>
                 {% if entries is not empty %}
                     –
                     {% for p in range(1, entries.nbPages) if entries.nbPages > 1 %}
@@ -20,68 +20,62 @@
         </div>
     {% endblock %}
 
-    {% if entries is empty %}
+    {% for entry in entries %}
-        <div class="messages warning"><p>{% trans %}No articles found.{% endtrans %}</p></div>
+        <div id="entry-{{ entry.id|e }}" class="entry">
-    {% else %}
+            <h2><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></h2>
-        {% for entry in entries %}
-            <div id="entry-{{ entry.id|e }}" class="entry">
-                <h2><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></h2>
-                {% if entry.readingTime > 0 %}
-                    <div class="estimatedTime">
-                        <span class="tool reading-time">
-                            {% trans with {'%readingTime%': entry.readingTime } %}estimated reading time: %readingTime% min{% endtrans %}
-                        </span>
-                    </div>
-                {% else %}
-                    <div class="estimatedTime">
-                        <span class="tool reading-time">
-                        {% trans with {'%inferior%': '<small class="inferieur">&lt;</small>'} %}estimated reading time: %inferior% 1 min{% endtrans %}
-                        </span>
-                    </div>
-                {% endif %}
 
-                <ul class="tools links">
+            {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
-                    <li><a title="{% trans %}Toggle mark as read{% endtrans %}" class="tool icon-check icon {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% trans %}Toggle mark as read{% endtrans %}</span></a></li>
+            <div class="estimatedTime">
-                    <li><a title="{% trans %}toggle favorite{% endtrans %}" class="tool icon-star icon {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{% trans %}toggle favorite{% endtrans %}</span></a></li>
+                    <span class="tool reading-time">
-                    <li><a title="{% trans %}delete{% endtrans %}" class="tool delete icon-trash icon" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{% trans %}delete{% endtrans %}</span></a></li>
+            {% if readingTime > 0 %}
-                    <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.domainName|removeWww }}</span></a></li>
+                {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round}) }}
-                </ul>
+            {% else %}
-                {% if entry.previewPicture is null %}
+                {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
-                    <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
+            {% endif %}
-                {% else %}
+                    </span>
-                    <img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" />
-                {% endif %}
             </div>
-        {% endfor %}
+
-    {% endif %}
+            <ul class="tools links">
+                <li><a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool icon-check icon {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ 'entry.list.toogle_as_read'|trans }}</span></a></li>
+                <li><a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool icon-star icon {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.list.toogle_as_star'|trans }}</span></a></li>
+                <li><a title="{{ 'entry.list.delete'|trans }}" class="tool delete icon-trash icon" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.list.delete'|trans }}</span></a></li>
+                <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.domainName|removeWww }}</span></a></li>
+            </ul>
+            {% if entry.previewPicture is null %}
+                <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
+            {% else %}
+                <img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" />
+            {% endif %}
+        </div>
+    {% endfor %}
 
     <aside id="filter-form" class="">
         <form method="get" action="{{ path('all') }}">
-            <h2>{% trans %}Filters{% endtrans %}</h2>
+            <h2>{{ 'entry.filters.title'|trans }}</h2>
             <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">&times;</a>
 
             <div id="filter-status" class="filter-group">
                 <div class="">
-                    <label>{% trans %}Status{% endtrans %}</label>
+                    <label>{{ 'entry.filters.status_label'|trans }}</label>
                 </div>
                 <div class="input-field">
                     {{ form_widget(form.isArchived) }}
-                    <label for="entry_filter_isArchived">{% trans %}Archived{% endtrans %}</label>
+                    {{ form_label(form.isArchived) }}
                 </div>
 
                 <div class="input-field">
                     {{ form_widget(form.isStarred) }}
-                    <label for="entry_filter_isStarred">{% trans %}Starred{% endtrans %}</label>
+                    {{ form_label(form.isStarred) }}
                 </div>
 
                 <div class="input-field">
                     {{ form_widget(form.previewPicture) }}
-                    <label for="entry_filter_previewPicture">{% trans %}Has a preview picture{% endtrans %}</label>
+                    {{ form_label(form.previewPicture) }}
                 </div>
             </div>
 
             <div id="filter-language" class="filter-group">
-                <label for="entry_filter_language">{% trans %}Language{% endtrans %}</label>
+                {{ form_label(form.language) }}
                 <div class="input-field ">
                     {{ form_widget(form.language) }}
                 </div>
@@ -89,20 +83,20 @@
 
             <div id="filter-reading-time" class="filter-group">
                 <div class="">
-                    <label>{% trans %}Reading time in minutes{% endtrans %}</label>
+                    {{ form_label(form.readingTime) }}
                 </div>
                 <div class="input-field ">
-                    <label for="entry_filter_readingTime_left_number">{% trans %}from{% endtrans %}</label>
+                    <label for="entry_filter_readingTime_left_number">{{ 'entry.filters.reading_time.from'|trans }}</label>
                     {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }}
                 </div>
                 <div class="input-field ">
-                    <label for="entry_filter_readingTime_right_number">{% trans %}to{% endtrans %}</label>
+                    <label for="entry_filter_readingTime_right_number">{{ 'entry.filters.reading_time.to'|trans }}</label>
                     {{ form_widget(form.readingTime.right_number, {'type': 'number'}) }}
                 </div>
             </div>
 
             <div id="filter-domain-name" class="filter-group">
-                <label for="entry_filter_domainName">{% trans %}Domain name{% endtrans %}</label>
+                {{ form_label(form.domainName) }}
                 <div class="input-field ">
                     {{ form_widget(form.domainName, {'type': 'text', 'attr' : {'placeholder': 'website.com'} }) }}
                 </div>
@@ -110,26 +104,25 @@
 
             <div id="filter-creation-date" class="filter-group">
                 <div class="">
-                    <label>{% trans %}Creation date{% endtrans %}</label>
+                    {{ form_label(form.createdAt) }}
                 </div>
                 <div class="input-field ">
-                    <label for="entry_filter_createdAt_left_date" class="active">{% trans %}from{% endtrans %}</label>
+                    <label for="entry_filter_createdAt_left_date" class="active">{{ 'entry.filters.created_at.from'|trans }}</label>
                     {{ form_widget(form.createdAt.left_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.left_date.vars.value} }) }}
                 </div>
                 <div class="input-field ">
-                    <label for="entry_filter_createdAt_right_date" class="active">{% trans %}to{% endtrans %}</label>
+                    <label for="entry_filter_createdAt_right_date" class="active">{{ 'entry.filters.created_at.to'|trans }}</label>
                     {{ form_widget(form.createdAt.right_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.right_date.vars.value} }) }}
                 </div>
             </div>
+
             <div id="filter-buttons" class="filter-group">
-
                 <div class="">
-                    <a href="#!" class="center waves-effect waves-green btn-flat" id="clear_form_filters">{% trans %}Clear{% endtrans %}</a>
+                    <a href="#!" class="center waves-effect waves-green btn-flat" id="clear_form_filters">{{ 'entry.filters.action.clear'|trans }}</a>
                 </div>
 
-                <button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">{% trans %}Filters{% endtrans %}</button>
+                <button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">{{ 'entry.filters.action.filter'|trans }}</button>
-
+            </div>
-                </div>
         </form>
     </aside>
 

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

@@ -18,9 +18,9 @@
                 <description>
                     <![CDATA[
                     {%- if entry.readingTime > 0 -%}
-                        {% trans %}estimated reading time :{% endtrans %} {{ entry.readingTime }} min
+                        {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}
                     {%- else -%}
-                        {% trans %}estimated reading time :{% endtrans %} &lt; 1 min
+                        {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
                     {%- endif %}
 
                     {{ entry.content|raw -}}

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

@@ -5,32 +5,32 @@
 {% block content %}
     <div id="article">
         <header class="mbm">
-            <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{% trans %}Edit title{% endtrans %}">✎</a></h1>
+            <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1>
         </header>
 
         <div id="article_toolbar">
         <ul class="links">
-            <li class="topPosF"><a href="#top" title="{% trans %}Back to top{% endtrans %}" class="tool top icon icon-arrow-up-thick"><span>{% trans %}Back to top{% endtrans %}</span></a></li>
+            <li class="topPosF"><a href="#top" title="{{ 'entry.view.left_menu.back_to_top'|trans }}" class="tool top icon icon-arrow-up-thick"><span>{{ 'entry.view.left_menu.set_as_read'|trans }}</span></a></li>
-            <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li>
+            <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li>
-            <li><a title="{% trans %}Re-fetch content{% endtrans %}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{% trans %}Re-fetch content{% endtrans %}</span></a></li>
+            <li><a title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span></a></li>
-            <li><a title="{% if entry.isArchived == 0 %}{% trans %}Mark as read{% endtrans %}{% else %}{% trans %}Mark as unread{% endtrans %}{% endif %}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% if entry.isArchived == 0 %}{% trans %}Mark as read{% endtrans %}{% else %}{% trans %}Mark as unread{% endtrans %}{% endif %}</span></a></li>
+            <li><a title="{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}</span></a></li>
-            <li><a title="{% trans %}Favorite{% endtrans %}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{% trans %}Toggle favorite{% endtrans %}</span></a></li>
+            <li><a title="{{ 'entry.view.left_menu.set_as_favorite'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_favorite'|trans }}</span></a></li>
-            <li><a id="nav-btn-add-tag" title="{% trans %}Add a tag{% endtrans %}"><span>{% trans %}Tag{% endtrans %}</span></a></li>
+            <li><a id="nav-btn-add-tag" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li>
-            <li><a title="{% trans %}Delete{% endtrans %}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{% trans %}Delete{% endtrans %}</span></a></li>
+            <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li>
-            {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="{% trans %}Tweet{% endtrans %}"><span>{% trans %}Tweet{% endtrans %}</span></a></li>{% endif %}
+            {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %}
-            {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{% trans %}Email{% endtrans %}"><span>{% trans %}Email{% endtrans %}</span></a></li>{% endif %}
+            {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="Email"><span>Email</span></a></li>{% endif %}
-            {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans %}shaarli{% endtrans %}"><span>{% trans %}shaarli{% endtrans %}</span></a></li>{% endif %}
+            {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %}
-            {% if craue_setting('share_diaspora') %}<li><a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="{% trans %}diaspora{% endtrans %}"><span>{% trans %}diaspora{% endtrans %}</span></a></li>{% endif %}
+            {% if craue_setting('share_diaspora') %}<li><a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora"><span>diaspora</span></a></li>{% endif %}
-            {% if craue_setting('carrot') %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="{% trans %}carrot{% endtrans %}"><span>Carrot</span></a></li>{% endif %}
+            {% if craue_setting('carrot') %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot"><span>Carrot</span></a></li>{% endif %}
-            {% if craue_setting('show_printlink') %}<li><a title="{% trans %}Print{% endtrans %}" class="tool icon icon-print" href="javascript: window.print();"><span>{% trans %}Print{% endtrans %}</span></a></li>{% endif %}
+            {% if craue_setting('show_printlink') %}<li><a title="{{ 'entry.view.left_menu.print'|trans }}" class="tool icon icon-print" href="javascript: window.print();"><span>{{ 'entry.view.left_menu.print'|trans }}</span></a></li>{% endif %}
             {% if craue_setting('export_epub') %}<li><a href="?epub&amp;method=id&amp;value={{ entry.id }}" title="Generate ePub file">EPUB</a></li>{% endif %}
             {% if craue_setting('export_mobi') %}<li><a href="?mobi&amp;method=id&amp;value={{ entry.id }}" title="Generate Mobi file">MOBI</a></li>{% endif %}
             {% if craue_setting('export_pdf') %}<li><a href="?pdf&amp;method=id&amp;value={{ entry.id }}" title="Generate PDF file">PDF</a></li>{% endif %}
-            <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans %}Does this article appear wrong?{% endtrans %}" class="tool bad-display icon icon-delete"><span>{% trans %}Does this article appear wrong?{% endtrans %}</span></a></li>
+            <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.label'|trans }}" class="tool bad-display icon icon-delete"><span>{{ 'entry.view.left_menu.problem.label'|trans }}</span></a></li>
         </ul>
     </div>
         {% set nbAnnotations = entry.annotations | length %}
-        <span class="tool link mdi-communication-comment"> {% transchoice nbAnnotations %}{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations{% endtranschoice %}</span>
+        <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
         <aside class="tags">
             {% for tag in entry.tags %}
                 <span class="mdi-action-label-outline">{{ tag.label }}</span> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i>✘</i></a>

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

@@ -1,6 +1,6 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}Save new entry{% endtrans %}{% endblock %}
+{% block title %}{{ 'entry.new.page_title'|trans }}{% endblock %}
 
 {% block content %}
     {{ render(controller( "WallabagCoreBundle:Entry:addEntryForm" )) }}

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

@@ -8,7 +8,7 @@
     {% endif %}
 
     {{ form_label(form.url) }}
-    {{ form_widget(form.url) }}
+    {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.new.placeholder'} }) }}
 
-    <div class="hidden">{{ form_rest(form) }}</div>
+    {{ form_rest(form) }}
 </form>

src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig

@@ -1,57 +1,56 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}About{% endtrans %}{% endblock %}
+{% block title %}{{ 'about.page_title'|trans }}{% endblock %}
 
 {% block content %}
-    <h2>{% trans %}Who is behind wallabag{% endtrans %}</h2>
+    <h2>{{ 'about.top_menu.who_behind_wallabag'|trans }}</h2>
 
     <dl>
-        <dt>{% trans %}Developed by{% endtrans %}</dt>
+        <dt>{{ 'about.who_behind_wallabag.developped_by'|trans }}</dt>
-        <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://cdetc.fr">{% trans %}website{% endtrans %}</a></dd>
+        <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://www.loeuillet.org">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
-        <dd>Thomas Citharel — <a href="https://tcit.fr">{% trans %}website{% endtrans %}</a></dd>
+        <dd>Thomas Citharel — <a href="https://tcit.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
-        <dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{% trans %}website{% endtrans %}</a></dd>
+        <dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
 
-        <dt>{% trans %}And many others contributors ♥{% endtrans %} <a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans %}on Github{% endtrans %}</a></dt>
+        <dt>{{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}</dt>
 
-        <dt>{% trans %}Project website{% endtrans %}</dt>
+        <dt>{{ 'about.who_behind_wallabag.project_website'|trans }}</dt>
         <dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd>
 
-        <dt>{% trans %}License{% endtrans %}: <a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dt>
+        <dt>{{ 'about.who_behind_wallabag.license'|trans }}: <a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dt>
 
-        <dt>{% trans %}Version{% endtrans %}: {{ version }}</dt>
+        <dt>{{ 'about.who_behind_wallabag.version'|trans }}: {{ version }}</dt>
     </dl>
 
-    <h2>{% trans %}Getting help{% endtrans %}</h2>
+    <h2>{{ 'about.top_menu.getting_help'|trans }}</h2>
 
     <dl>
-        <dt>{% trans %}Documentation{% endtrans %}</dt>
+        <dt>{{ 'about.getting_help.documentation'|trans }}</dt>
-        <dd><a href="https://doc.wallabag.org/en">english</a></dd>
+        <dd><a href="http://doc.wallabag.org/en/v2/">english</a></dd>
-        <dd><a href="https://doc.wallabag.org/fr">français</a></dd>
+        <dd><a href="http://doc.wallabag.org/fr/v2/">français</a></dd>
-        <dd><a href="https://doc.wallabag.org/de">deutsch</a></dd>
 
-        <dt>{% trans %}Bug reports{% endtrans %}</dt>
+        <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt>
-        <dd><a href="https://support.wallabag.org">{% trans %}On our support website{% endtrans %}</a> {% trans %}or{% endtrans %} <a href="https://github.com/wallabag/wallabag/issues">{% trans %}on Github{% endtrans %}</a></dd>
+        <dd>{{ 'about.getting_help.support'|trans|raw }}</dd>
     </dl>
 
-    <h2>{% trans %}Helping wallabag{% endtrans %}</h2>
+    <h2>{{ 'about.top_menu.helping'|trans }}</h2>
 
-    <p>{% trans %}wallabag is free and opensource. You can help us:{% endtrans %}</p>
+    <p>{{ 'about.helping.description'|trans }}</p>
 
     <dl>
-        <dt>{% trans %}wallabag is free and opensource. You can help us:{% endtrans %}</dt>
+        <dt>{{ 'about.helping.description'|trans }}</dt>
-        <dd>by contributing to the project: <a href="https://github.com/wallabag/wallabag/issues/1254">an issue lists all our needs</a></dd>
+        <dd>{{ 'about.helping.by_contributing_2'|trans }} <a href="https://github.com/wallabag/wallabag/issues/1254">{{ 'about.helping.by_contributing'|trans }}</a></dd>
-        <dd><a href="{{ paypal_url }}">{% trans %}via Paypal{% endtrans %}</a></dd>
+        <dd><a href="{{ paypal_url }}">{{ 'about.helping.by_paypal'|trans }}</a></dd>
     </dl>
 
-    <h2>{% trans %}Contributors{% endtrans %}</h2>
+    <h2>{{ 'about.top_menu.contributors'|trans }}</h2>
-    <p><a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans %}Thank you to contributors on wallabag web application{% endtrans %}</a></p>
+    <p><a href="https://github.com/wallabag/wallabag/graphs/contributors">{{ 'about.contributors.description'|trans }}</a></p>
 
-    <h2>{% trans %}Third-party libraries{% endtrans %}</h2>
+    <h2>{{ 'about.top_menu.third_party'|trans }}</h2>
-    <p>{% trans %}Here are the list of third-party libraries used in wallabag (with their licenses):{% endtrans %}</p>
+    <p>{{ 'about.third_party.description'|trans }}</p>
-    <table>
+    <table class="striped">
         <tr>
-            <th>{% trans %}Package{% endtrans %}</th>
+            <th>{{ 'about.third_party.package'|trans }}</th>
-            <th>{% trans %}License{% endtrans %}</th>
+            <th>{{ 'about.third_party.license'|trans }}</th>
         </tr>
         <tr><td>behat/transliterator</td><td>Artistic 1.0</td></tr>
         <tr><td>CraueConfigBundle</td><td>MIT</td></tr>

src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig

@@ -1,28 +1,28 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}Howto{% endtrans %}{% endblock %}
+{% block title %}{{ 'howto.page_title'|trans }}{% endblock %}
 
 {% block content %}
-    <h2>{% trans %}Howto{% endtrans %}</h2>
+    <h2>{{ 'howto.page_title'|trans }}</h2>
 
-    <p>{% trans %}There are several ways to save an article:{% endtrans %}</p>
+    <p>{{ 'howto.page_description'|trans }}</p>
     <ul>
-        <li><a href="{{ path('new') }}">{% trans %}Thanks to this form{% endtrans %}</a></li>
+        <li><a href="{{ path('new') }}">{{ 'howto.form.description'|trans }}</a></li>
     </ul>
-    <h3>{% trans %}Browser Addons{% endtrans %}</h3>
+    <h3>{{ 'howto.top_menu.browser_addons'|trans }}</h3>
     <ul>
-        <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans %}Standard Firefox Add-On{% endtrans %}</a></li>
+        <li><a href="https://addons.mozilla.org/firefox/addon/wallabag-v2/" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
-        <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans %}Chrome Extension{% endtrans %}</a></li>
+        <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li>
     </ul>
-    <h3>{% trans %}Mobile Apps{% endtrans %}</h3>
+    <h3>{{ 'howto.top_menu.mobile_apps'|trans }}</h3>
     <ul>
-        <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">via F-Droid</a> {% trans %} or {% endtrans %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">via Google Play</a></li>
+        <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li>
-        <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans %}download the application{% endtrans %}</a></li>
+        <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li>
-        <li>Windows Phone: <a href="http://www.windowsphone.com/en-US/store/app/wallabag/d5226cf1-f422-4e00-996c-88e9c5233332" target="_blank">{% trans %}download the application{% endtrans %}</a></li>
+        <li>Windows Phone: <a href="http://www.windowsphone.com/en-US/store/app/wallabag/d5226cf1-f422-4e00-996c-88e9c5233332" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li>
     </ul>
-    <h3>{% trans %}Bookmarklet{% endtrans %}</h3>
+    <h3>{{ 'howto.top_menu.bookmarklet'|trans }}</h3>
     <p>
-    {% trans %}Drag &amp; drop this link to your bookmarks bar:{% endtrans %}
+    {{ 'howto.bookmarklet.description'|trans }}
     {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %}
 
 {% endblock %}

src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig

@@ -1,55 +1,66 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}Quickstart{% endtrans %}{% endblock %}
+{% block title %}{{ 'quickstart.page_title'|trans }}{% endblock %}
 
 {% block content %}
 
-    <h3>{% trans %}Welcome to wallabag!{% endtrans %}</h3>
+    <h3>{{ 'quickstart.intro.title'|trans }}</h3>
-    <p>{% trans %}We'll accompany you to visit wallabag and show you some features which can interess you.{% endtrans %}</p>
+    <p>{{ 'quickstart.intro.paragraph_1'|trans }}</p>
-    <p>{% trans %}Follow us!{% endtrans %}</p>
+    <p>{{ 'quickstart.intro.paragraph_2'|trans }}</p>
-    <h4>{% trans %}Configure the application{% endtrans %}</h4>
+
+    <h4>{{ 'quickstart.configure.title'|trans }}</h4>
     <ul>
-        <li><a href="{{ path('config') }}">{% trans %}Change language and design{% endtrans %}</a></li>
+        <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li>
-        <li><a href="{{ path('config') }}#set2">{% trans %}Enable RSS feeds{% endtrans %}</a></li>
+        <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.rss'|trans }}</a></li>
-        <li><a href="{{ path('config') }}#set5">{% trans %}Write rules to automatically tag your articles{% endtrans %}</a></li>
+        <li><a href="{{ path('config') }}#set5">{{ 'quickstart.configure.tagging_rules'|trans }}</a></li>
     </ul>
+
     {% if is_granted('ROLE_SUPER_ADMIN') %}
-        <h4>{% trans %}Administration{% endtrans %}</h4>
+    <h4>{{ 'quickstart.admin.title'|trans }}</h4>
-        <p>{% trans %}As a administrator, you have privileges on wallabag. You can:{% endtrans %}</p>
+    <p>{{ 'quickstart.admin.description'|trans }}</p>
-        <ul>
+    <ul>
-            <li><a href="{{ path('config') }}#set6">{% trans %}Create a new user{% endtrans %}</a></li>
+        <li><a href="{{ path('config') }}#set6">{{ 'quickstart.admin.new_user'|trans }}</a></li>
-            <li><a href="{{ path('craue_config_settings_modify') }}#set-analytics">{% trans %}Configure analytics{% endtrans %}</a></li>
+        <li><a href="{{ path('craue_config_settings_modify') }}#set-analytics">{{ 'quickstart.admin.analytics'|trans }}</a></li>
-            <li><a href="{{ path('craue_config_settings_modify') }}#set-entry">{% trans %}Enable some parameters about article sharing{% endtrans %}</a></li>
+        <li><a href="{{ path('craue_config_settings_modify') }}#set-entry">{{ 'quickstart.admin.sharing'|trans }}</a></li>
-            <li><a href="{{ path('craue_config_settings_modify') }}#set-export">{% trans %}Configure export{% endtrans %}</a></li>
+        <li><a href="{{ path('craue_config_settings_modify') }}#set-export">{{ 'quickstart.admin.export'|trans }}</a></li>
-            <li><a href="{{ path('craue_config_settings_modify') }}#set-import">{% trans %}Configure import{% endtrans %}</a></li>
+        <li><a href="{{ path('craue_config_settings_modify') }}#set-import">{{ 'quickstart.admin.import'|trans }}</a></li>
-        </ul>
+    </ul>
     {% endif %}
-    <h4>{% trans %}First steps{% endtrans %}</h4>
+
+    <h4>{{ 'quickstart.first_steps.title'|trans }}</h4>
     <ul>
-        <li><a href="{{ path('new') }}">{% trans %}Save your first article{% endtrans %}</a></li>
+        <li><a href="{{ path('new') }}">{{ 'quickstart.first_steps.new_article'|trans }}</a></li>
-        <li><a href="{{ path('unread') }}">{% trans %}And classify it!{% endtrans %}</a></li>
+        <li><a href="{{ path('unread') }}">{{ 'quickstart.first_steps.unread_articles'|trans }}</a></li>
     </ul>
-    <h4>{% trans %}Migrate from an existing service{% endtrans %}</h4>
+
-    <p>{% trans %}You're using an other service? We'll help you to retrieve your data on wallabag.{% endtrans %}</p>
+    <h4>{{ 'quickstart.migrate.title'|trans }}</h4>
+    <p>{{ 'quickstart.migrate.description'|trans }}</p>
     <ul>
-        <li><a href="{{ path('import_pocket') }}">{% trans %}Migrate from Pocket{% endtrans %}</a></li>
+        <li><a href="{{ path('import_pocket') }}">{{ 'quickstart.migrate.pocket'|trans }}</a></li>
-        <li><a href="{{ path('import_wallabag_v1') }}">{% trans %}Migrate from wallabag v1{% endtrans %}</a></li>
+        <li><a href="{{ path('import_wallabag_v1') }}">{{ 'quickstart.migrate.wallabag_v1'|trans }}</a></li>
-        <li><a href="{{ path('import_wallabag_v2') }}">{% trans %}Migrate from wallabag v2{% endtrans %}</a></li>
+        <li><a href="{{ path('import_wallabag_v2') }}">{{ 'quickstart.migrate.wallabag_v2'|trans }}</a></li>
     </ul>
-    <h4>{% trans %}Full documentation{% endtrans %}</h4>
+
+    <h4>{{ 'quickstart.developer.title'|trans }}</h4>
     <ul>
-        <li><a href="http://doc.wallabag.org/en/v2/user/annotations.html">{% trans %}Annotate your article{% endtrans %}</a></li>
+        <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li>
-        <li><a href="http://doc.wallabag.org/en/v2/user/download_articles.html">{% trans %}Convert your articles into ePUB or PDF{% endtrans %}</a></li>
-        <li><a href="http://doc.wallabag.org/en/v2/user/filters.html">{% trans %}See how you can look for an article by using search engine and filters{% endtrans %}</a></li>
-        <li><a href="http://doc.wallabag.org/en/v2/user/errors_during_fetching.html">{% trans %}What can I do if an article encounters errors during fetching?{% endtrans %}</a></li>
-        <li><a href="http://doc.wallabag.org/">{% trans %}And so many other articles!{% endtrans %}</a></li>
     </ul>
-    <h4>{% trans %}Support{% endtrans %}</h4>
+
-    <p>{% trans %}If you need some help, we are here for you.{% endtrans %}</p>
+    <h4>{{ 'quickstart.docs.title'|trans }}</h4>
     <ul>
-        <li><a href="https://github.com/wallabag/wallabag/issues/">{% trans %}On GitHub{% endtrans %}</a></li>
+        <li><a href="http://doc.wallabag.org/en/v2/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li>
-        <li><a href="mailto:hello@wallabag.org">{% trans %}By email{% endtrans %}</a></li>
+        <li><a href="http://doc.wallabag.org/en/v2/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li>
-        <li><a href="https://gitter.im/wallabag/wallabag">{% trans %}On Gitter{% endtrans %}</a></li>
+        <li><a href="http://doc.wallabag.org/en/v2/user/filters.html">{{ 'quickstart.docs.search_filters'|trans }}</a></li>
+        <li><a href="http://doc.wallabag.org/en/v2/user/errors_during_fetching.html">{{ 'quickstart.docs.fetching_errors'|trans }}</a></li>
+        <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li>
+    </ul>
+
+    <h4>{{ 'quickstart.support.title'|trans }}</h4>
+    <p>{{ 'quickstart.support.description'|trans }}</p>
+    <ul>
+        <li><a href="https://github.com/wallabag/wallabag/issues/">{{ 'quickstart.support.github'|trans }}</a></li>
+        <li><a href="mailto:hello@wallabag.org">{{ 'quickstart.support.email'|trans }}</a></li>
+        <li><a href="https://gitter.im/wallabag/wallabag">{{ 'quickstart.support.gitter'|trans }}</a></li>
     </ul>
 
 {% endblock %}

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

@@ -8,7 +8,6 @@
     {% endif %}
 
     {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
-    {{ form_widget(form.save, { 'attr': {'class': 'btn waves-effect waves-light'}, 'label': 'add tag' }) }}
 
-    <div class="hidden">{{ form_rest(form) }}</div>
+    {{ form_rest(form) }}
 </form>

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

@@ -1,13 +1,15 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title "Tags" %}
+{% block title %}{{ 'tag.page_title'|trans }}{% endblock %}
 
 {% block content %}
-    {% if tags is empty %}
+    <div class="results">
-        <div class="messages warning"><p>{% trans %}No tags found.{% endtrans %}</p></div>
+        <div class="nb-results">{{ 'tag.list.number_on_the_page'|transchoice(tags.count) }}</div>
-    {% else %}
+    </div>
-        {% for tag in tags %}
+
-            {{tag.label}}
+    <ul>
-        {% endfor %}
+    {% for tag in tags %}
-    {% endif %}
+        <li id="tag-{{ tag.id|e }}">{{tag.label}} ({{ tag.entries.getValues | length }})</li>
+    {% endfor %}
+    </ul>
 {% endblock %}

src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig

@@ -33,32 +33,32 @@
 {% block menu %}
     <button id="menu" class="icon icon-menu desktopHide"><span>Menu</span></button>
     <ul id="links" class="links">
-        <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
+        <li><a href="{{ path('unread') }}">{{ 'menu.left.unread'|trans }}</a></li>
-        <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
+        <li><a href="{{ path('starred') }}">{{ 'menu.left.starred'|trans }}</a></li>
-        <li><a href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li>
+        <li><a href="{{ path('archive') }}">{{ 'menu.left.archive'|trans }}</a></li>
-        <li><a href="{{ path('all') }}">{% trans %}all{% endtrans %}</a></li>
+        <li><a href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }}</a></li>
-        <li><a href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li>
+        <li><a href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a></li>
-        <li><a href="{{ path('new') }}">{% trans %}save a link{% endtrans %}</a></li>
+        <li><a href="{{ path('new') }}">{{ 'menu.left.save_link'|trans }}</a></li>
-        <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a>
+        <!--<li style="position: relative;"><a href="javascript: void(null);" id="search">{{ 'menu.left.search'|trans }}</a>
             <div id="search-form" class="messages info popup-form">
                 <form method="get" action="index.php">
-                    <h2>{% trans %}Search{% endtrans %}</h2>
+                    <h2>{{ 'menu.left.search'|trans }}</h2>
                     <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
                     <input type="hidden" name="view" value="search">
-                    <input required placeholder="{% trans %}Enter your search here{% endtrans %}" type="text" name="search" id="searchfield"><br>
+                    <input required placeholder="{{ 'menu.search_form.input_label'|trans }}" type="text" name="search" id="searchfield"><br>
-                    <input id="submit-search" type="submit" value="{% trans %}Search{% endtrans %}">
+                    <input id="submit-search" type="submit" value="{{ 'menu.left.search'|trans }}">
                 </form>
             </div>
-        </li>
+        </li>-->
-        <li><a href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
+        <li><a href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a></li>
         {% if is_granted('ROLE_SUPER_ADMIN') %}
-            <li><a href="{{ path('craue_config_settings_modify') }}">{% trans %}internal settings{% endtrans %}</a></li>
+            <li><a href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a></li>
         {% endif %}
-        <li><a href="{{ path('import') }}">{% trans %}import{% endtrans %}</a></li>
+        <li><a href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a></li>
-        <li><a href="{{ path('howto') }}">{% trans %}howto{% endtrans %}</a></li>
+        <li><a href="{{ path('howto') }}">{{ 'menu.left.howto'|trans }}</a></li>
-        <li><a href="{{ path('developer') }}">{% trans %}Developer{% endtrans %}</a></li>
+        <li><a href="{{ path('developer') }}">{{ 'menu.left.developer'|trans }}</a></li>
-        <li><a href="{{ path('about') }}">{% trans %}about{% endtrans %}</a></li>
+        <li><a href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans }}</a></li>
-        <li><a class="icon icon-power" href="{{ path('fos_user_security_logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
+        <li><a class="icon icon-power" href="{{ path('fos_user_security_logout') }}">{{ 'menu.left.logout'|trans }}</a></li>
     </ul>
 {% endblock %}
 
@@ -66,13 +66,13 @@
     {% for flashMessage in app.session.flashbag.get('notice') %}
         <div class="messages success">
             <a href="#" class="closeMessage">×</a>
-            <p>{{ flashMessage }}</p>
+            <p>{{ flashMessage|trans }}</p>
         </div>
     {% endfor %}
 {% endblock %}
 
 {% block footer %}
     <footer class="w600p center mt3 mb3 smaller txtright">
-        <p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p>
+        <p>{{ 'footer.wallabag.powered_by'|trans }} <a href="http://wallabag.org">wallabag</a></p>
     </footer>
 {% endblock %}

src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig

@@ -1,6 +1,6 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}config{% endtrans %}{% endblock %}
+{% block title %}{{ 'config.page_title'|trans }}{% endblock %}
 
 {% block content %}
 
@@ -11,13 +11,13 @@
                 <div class="row">
                     <div class="div_tabs col s12">
                         <ul class="tabs">
-                            <li class="tab col s3"><a class="active" href="#set1">{% trans %}Settings{% endtrans %}</a></li>
+                            <li class="tab col s3"><a class="active" href="#set1">{{ 'config.tab_menu.settings'|trans }}</a></li>
-                            <li class="tab col s3"><a href="#set2">{% trans %}RSS{% endtrans %}</a></li>
+                            <li class="tab col s3"><a href="#set2">{{ 'config.tab_menu.rss'|trans }}</a></li>
-                            <li class="tab col s3"><a href="#set3">{% trans %}User information{% endtrans %}</a></li>
+                            <li class="tab col s3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li>
-                            <li class="tab col s3"><a href="#set4">{% trans %}Password{% endtrans %}</a></li>
+                            <li class="tab col s3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li>
-                            <li class="tab col s3"><a href="#set5">{% trans %}Tagging rules{% endtrans %}</a></li>
+                            <li class="tab col s3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li>
                             {% if is_granted('ROLE_SUPER_ADMIN') %}
-                            <li class="tab col s3"><a href="#set6">{% trans %}Add a user{% endtrans %}</a></li>
+                            <li class="tab col s3"><a href="#set6">{{ 'config.tab_menu.new_user'|trans }}</a></li>
                             {% endif %}
                         </ul>
                     </div>
@@ -28,9 +28,9 @@
 
                             <div class="row">
                                 <div class="input-field col s12">
+                                    {{ form_label(form.config.theme) }}
                                     {{ form_errors(form.config.theme) }}
                                     {{ form_widget(form.config.theme) }}
-                                    <label class="required">{% trans %}Theme{% endtrans %}</label>
                                 </div>
                             </div>
 
@@ -42,6 +42,18 @@
                                 </div>
                             </div>
 
+                            <div class="row">
+                                <div class="input-field col s12">
+                                    {{ form_label(form.config.reading_speed) }}
+                                    {{ form_errors(form.config.reading_speed) }}
+                                    {{ form_widget(form.config.reading_speed) }}
+                                    <p>
+                                        {{ 'config.form_settings.reading_speed.help_message'|trans }}
+                                        <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a>
+                                    </p>
+                                </div>
+                            </div>
+
                             <div class="row">
                                 <div class="input-field col s12">
                                     {{ form_label(form.config.language) }}
@@ -50,10 +62,8 @@
                                 </div>
                             </div>
 
-                            <div class="hidden">{{ form_rest(form.config) }}</div>
+                            {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
-                            <button class="btn waves-effect waves-light" type="submit" name="action">
+                            {{ form_rest(form.config) }}
-                                {% trans %}Save{% endtrans %}
-                            </button>
                         </form>
                     </div>
 
@@ -63,33 +73,37 @@
 
                             <div class="row">
                                 <div class="input-field col s12">
-                                    {% trans %}RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.{% endtrans %}
+                                    {{ 'config.form_rss.description'|trans }}
                                 </div>
                             </div>
 
                             <div class="row">
                                 <div class="input-field col s12">
-                                    <label>{% trans %}RSS token{% endtrans %}</label>
+                                    <label>{{ 'config.form_rss.token_label'|trans }}</label>
                                     <div>
                                         {% if rss.token %}
                                             {{ rss.token }}
                                         {% else %}
-                                            <em>{% trans %}No token{% endtrans %}</em>
+                                            <em>{{ 'config.form_rss.no_token'|trans }}</em>
                                         {% endif %}
-                                        – <a href="{{ path('generate_token') }}">{% if rss.token %}{% trans %}Reset your token{% endtrans %}{% else %}{% trans %}Create your token{% endtrans %}{% endif %}</a>
+                                        – <a href="{{ path('generate_token') }}">
+                                        {% if rss.token %}
+                                            {{ 'config.form_rss.token_reset'|trans }}
+                                        {% else %}
+                                            {{ 'config.form_rss.token_create'|trans }}
+                                        {% endif %}</a>
                                     </div>
                                 </div>
                             </div>
                             {% if rss.token %}
                             <div class="row">
                                 <div class="input-field col s12">
-                                    <label>{% trans %}RSS links{% endtrans %}</label>
+                                    <label>{{ 'config.form_rss.rss_links'|trans }}</label>
-                                        <ul>
+                                    <ul>
-                                            <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">{% trans %}unread{% endtrans %}</a></li>
+                                        <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.unread'|trans }}</a></li>
-                                            <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">{% trans %}starred{% endtrans %}</a></li>
+                                        <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.starred'|trans }}</a></li>
-                                            <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">{% trans %}archive{% endtrans %}</a></li>
+                                        <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.archive'|trans }}</a></li>
-                                        </ul>
+                                    </ul>
-
                                 </div>
                             </div>
                             {% endif %}
@@ -102,11 +116,8 @@
                                 </div>
                             </div>
 
-                            <div class="hidden">{{ form_rest(form.rss) }}</div>
+                            {{ form_widget(form.rss.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
-                            <button class="btn waves-effect waves-light" type="submit" name="action">
+                            {{ form_rest(form.rss) }}
-                                {% trans %}Save{% endtrans %}
-                            </button>
-
                         </form>
                     </div>
 
@@ -133,7 +144,7 @@
                             {% if twofactor_auth %}
                             <div class="row">
                                 <div class="input-field col s12">
-                                    {% trans %}Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion{% endtrans %}
+                                    {{ 'config.form_user.two_factor_description'|trans }}
                                 </div>
                             </div>
 
@@ -146,11 +157,8 @@
                             </div>
                             {% endif %}
 
-                            <div class="hidden">{{ form_rest(form.user) }}</div>
+                            {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
-                            <button class="btn waves-effect waves-light" type="submit" name="action">
+                            {{ form_rest(form.user) }}
-                                {% trans %}Save{% endtrans %}
-                            </button>
-
                         </form>
                     </div>
 
@@ -182,11 +190,8 @@
                                 </div>
                             </div>
 
-                            <div class="hidden">{{ form_rest(form.pwd) }}</div>
+                            {{ form_widget(form.pwd.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
-                            <button class="btn waves-effect waves-light" type="submit" name="action">
+                            {{ form_rest(form.pwd) }}
-                                {% trans %}Save{% endtrans %}
-                            </button>
-
                         </form>
                     </div>
 
@@ -196,8 +201,11 @@
                                 <ul>
                                     {% for tagging_rule in app.user.config.taggingRules %}
                                     <li>
-                                        if « {{ tagging_rule.rule }} » then tag as « {{ tagging_rule.tags|join(', ') }} »
+                                        {{ 'config.form_rules.if_label'|trans }}
-                                        <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{% trans %}Delete{% endtrans %}">
+                                        « {{ tagging_rule.rule }} »
+                                        {{ 'config.form_rules.then_tag_as_label'|trans }}
+                                        « {{ tagging_rule.tags|join(', ') }} »
+                                        <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}">
                                             <i class="tool grey-text delete mdi-action-delete"></i>
                                         </a>
                                     </li>
@@ -225,106 +233,92 @@
                                 </div>
                             </div>
 
-                            <div class="hidden">{{ form_rest(form.new_tagging_rule) }}</div>
+                            {{ form_widget(form.new_tagging_rule.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
-                            <button class="btn waves-effect waves-light" type="submit" name="action">
+                            {{ form_rest(form.new_tagging_rule) }}
-                                {% trans %}Save{% endtrans %}
-                            </button>
                         </form>
 
                         <div class="row">
                             <div class="input-field col s12">
-                                <h4>{% trans %}FAQ{% endtrans %}</h4>
+                                <h4>{{ 'config.form_rules.faq.title'|trans }}</h4>
 
-                                <h5>{% trans %}What does « tagging rules » mean?{% endtrans %}</h5>
+                                <h5>{{ 'config.form_rules.faq.tagging_rules_definition_title'|trans }}</h5>
+                                <p class="help">{{ 'config.form_rules.faq.tagging_rules_definition_description'|trans|raw }}</p>
+
+                                <h5>{{ 'config.form_rules.faq.how_to_use_them_title'|trans }}</h5>
+                                <p class="help">{{ 'config.form_rules.faq.how_to_use_them_description'|trans|raw }}</p>
+
+                                <h5>{{ 'config.form_rules.faq.variables_available_title'|trans }}</h5>
                                 <p class="help">
-                                    {% trans %}
+                                    {{ 'config.form_rules.faq.variables_available_description'|trans }}
-                                    They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.
-                                    {% endtrans %}
                                 </p>
 
-                                <h5>{% trans %}How do I use them?{% endtrans %}</h5>
+                                <table class="bordered">
-                                <p class="help">
+                                    <thead>
-                                    {% trans %}
+                                        <tr>
-                                    Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »
+                                            <th>{{ 'config.form_rules.faq.variable_description.label'|trans }}</th>
-                                    {% endtrans %}
+                                            <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
-                                </p>
+                                            <th>{{ 'config.form_rules.faq.operator_description.label'|trans }}</th>
+                                            <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
+                                        </tr>
+                                    </thead>
 
-                                <h5>{% trans %}Which variables and operators can I use to write rules?{% endtrans %}</h5>
+                                    <tbody>
-                                <p class="help">
+                                        <tr>
-                                    {% trans %}The following variables and operators can be used to create tagging rules:{% endtrans %}
+                                            <td>title</td>
-
+                                            <td>{{ 'config.form_rules.faq.variable_description.title'|trans }}</td>
-                                    <table>
+                                            <td>&lt;=</td>
-                                        <thead>
+                                            <td>{{ 'config.form_rules.faq.operator_description.less_than'|trans }}</td>
-                                            <tr>
+                                        </tr>
-                                                <th>{% trans %}Variable{% endtrans %}</th>
+                                        <tr>
-                                                <th>{% trans %}Meaning{% endtrans %}</th>
+                                            <td>url</td>
-                                                <th>{% trans %}Operator{% endtrans %}</th>
+                                            <td>{{ 'config.form_rules.faq.variable_description.url'|trans }}</td>
-                                                <th>{% trans %}Meaning{% endtrans %}</th>
+                                            <td>&lt;</td>
-                                            </tr>
+                                            <td>{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}</td>
-                                        </thead>
+                                        </tr>
-
+                                        <tr>
-                                        <tbody>
+                                            <td>isArchived</td>
-                                            <tr>
+                                            <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td>
-                                                <td>title</td>
+                                            <td>&gt;=</td>
-                                                <td>{% trans %}Title of the entry{% endtrans %}</td>
+                                            <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td>
-                                                <td>&lt;=</td>
+                                        </tr>
-                                                <td>{% trans %}Less than…{% endtrans %}</td>
+                                        <tr>
-                                            </tr>
+                                            <td>isStarred</td>
-                                            <tr>
+                                            <td>{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}</td>
-                                                <td>url</td>
+                                            <td>&gt;</td>
-                                                <td>{% trans %}URL of the entry{% endtrans %}</td>
+                                            <td>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}</td>
-                                                <td>&lt;</td>
+                                        </tr>
-                                                <td>{% trans %}Strictly less than…{% endtrans %}</td>
+                                        <tr>
-                                            </tr>
+                                            <td>content</td>
-                                            <tr>
+                                            <td>{{ 'config.form_rules.faq.variable_description.content'|trans }}</td>
-                                                <td>isArchived</td>
+                                            <td>=</td>
-                                                <td>{% trans %}Whether the entry is archived or not{% endtrans %}</td>
+                                            <td>{{ 'config.form_rules.faq.operator_description.equal_to'|trans }}</td>
-                                                <td>=&gt;</td>
+                                        </tr>
-                                                <td>{% trans %}Greater than…{% endtrans %}</td>
+                                        <tr>
-                                            </tr>
+                                            <td>language</td>
-                                            <tr>
+                                            <td>{{ 'config.form_rules.faq.variable_description.language'|trans }}</td>
-                                                <td>isStarred</td>
+                                            <td>!=</td>
-                                                <td>{% trans %}Whether the entry is starred or not{% endtrans %}</td>
+                                            <td>{{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}</td>
-                                                <td>&gt;</td>
+                                        </tr>
-                                                <td>{% trans %}Strictly greater than…{% endtrans %}</td>
+                                        <tr>
-                                            </tr>
+                                            <td>mimetype</td>
-                                            <tr>
+                                            <td>{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}</td>
-                                                <td>content</td>
+                                            <td>OR</td>
-                                                <td>{% trans %}The entry's content{% endtrans %}</td>
+                                            <td>{{ 'config.form_rules.faq.operator_description.or'|trans }}</td>
-                                                <td>=</td>
+                                        </tr>
-                                                <td>{% trans %}Equal to…{% endtrans %}</td>
+                                        <tr>
-                                            </tr>
+                                            <td>readingTime</td>
-                                            <tr>
+                                            <td>{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}</td>
-                                                <td>language</td>
+                                            <td>AND</td>
-                                                <td>{% trans %}The entry's language{% endtrans %}</td>
+                                            <td>{{ 'config.form_rules.faq.operator_description.and'|trans }}</td>
-                                                <td>!=</td>
+                                        </tr>
-                                                <td>{% trans %}Not equal to…{% endtrans %}</td>
+                                        <tr>
-                                            </tr>
+                                            <td>domainName</td>
-                                            <tr>
+                                            <td>{{ 'config.form_rules.faq.variable_description.domainName'|trans }}</td>
-                                                <td>mimetype</td>
+                                            <td>matches</td>
-                                                <td>{% trans %}The entry's mime-type{% endtrans %}</td>
+                                            <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}</td>
-                                                <td>OR</td>
+                                        </tr>
-                                                <td>{% trans %}One rule or another{% endtrans %}</td>
+                                    </tbody>
-                                            </tr>
+                                </table>
-                                            <tr>
-                                                <td>readingTime</td>
-                                                <td>{% trans %}The estimated entry's reading time, in minutes{% endtrans %}</td>
-                                                <td>AND</td>
-                                                <td>{% trans %}One rule and another{% endtrans %}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>domainName</td>
-                                                <td>{% trans %}The domain name of the entry{% endtrans %}</td>
-                                                <td>matches</td>
-                                                <td>
-                                                    {% trans %}
-                                                    Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>
-                                                    {% endtrans %}
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </p>
                             </div>
                         </div>
                     </div>
@@ -366,11 +360,8 @@
                                 </div>
                             </div>
 
-                            <div class="hidden">{{ form_rest(form.new_user) }}</div>
+                            {{ form_widget(form.new_user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
-                            <button class="btn waves-effect waves-light" type="submit" name="action">
+                            {{ form_rest(form.new_user) }}
-                                {% trans %}Add a user{% endtrans %}
-                            </button>
-
                         </form>
                     </div>
                     {% endif %}

src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client.html.twig

@@ -1,6 +1,6 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}New client{% endtrans %}{% endblock %}
+{% block title %}{{ 'developer.client.page_title'|trans }}{% endblock %}
 
 {% block content %}
 <div class="row">
@@ -8,7 +8,7 @@
         <div class="card-panel settings">
 
             <div class="row">
-                <p>{% trans %}You are about to create a new client. Please fill the field below for the redirect URI of your application.{% endtrans %}</p>
+                <p>{{ 'developer.client.page_description'|trans }}</p>
                 {{ form_start(form) }}
                 {{ form_errors(form) }}
 
@@ -18,7 +18,7 @@
                     {{ form_widget(form.redirect_uris) }}
                 </div>
 
-                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{% trans %}Back{% endtrans %}</a>
+                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client.action_back'|trans }}</a>
                 {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
 
                 {{ form_rest(form) }}

src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig

@@ -1,20 +1,20 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}Client parameters{% endtrans %}{% endblock %}
+{% block title %}{{ 'developer.client_parameter.page_title'|trans }}{% endblock %}
 
 {% block content %}
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
             <div class="row">
-                <p>{% trans %}Here are your client parameters.{% endtrans %}</p>
+                <p>{{ 'developer.client_parameter.page_description'|trans }}</p>
                 <ul>
-                    <li>{% trans %}Client ID{% endtrans %}: <strong><pre>{{ client_id }}</pre></strong></li>
+                    <li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li>
-                    <li>{% trans %}Client secret{% endtrans %}: <strong><pre>{{ client_secret }}</pre></strong></li>
+                    <li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li>
                 </ul>
 
-                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{% trans %}Back{% endtrans %}</a>
+                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client_parameter.back'|trans }}</a>
-                <a href="{{ path('developer_howto_firstapp') }}" class="btn waves-effect waves-light">{% trans %}Read the howto "Create my first application"{% endtrans %}</a>
+                <a href="{{ path('developer_howto_firstapp') }}" class="btn waves-effect waves-light">{{ 'developer.client_parameter.read_howto'|trans }}</a>
             </div>
         </div>
     </div>

src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/howto_app.html.twig

@@ -1,6 +1,6 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}How to create my first application{% endtrans %}{% endblock %}
+{% block title %}{{ 'developer.howto.page_title'|trans }}{% endblock %}
 
 {% block css %}
     {{ parent() }}
@@ -13,10 +13,10 @@
         <div class="card-panel settings">
 
             <div class="row">
-                <p>{% trans %}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.{% endtrans %}</p>
+                <p>{{ 'developer.howto.description.paragraph_1'|trans|raw }}</p>
-                <p>{% trans %}You need a token to communicate between your 3rd application and wallabag API.{% endtrans %}</p>
+                <p>{{ 'developer.howto.description.paragraph_2'|trans }}</p>
-                <p>{% trans with {'%link%': path('developer_create_client')} %}To create this token, you need <a href="%link%">to create a new client</a>.{% endtrans %}</p>
+                <p>{{ 'developer.howto.description.paragraph_3'|trans({'%link%': path('developer_create_client')})|raw }}</p>
-                <p>{% trans %}Now, create your token (replace client_id, client_secret, username and password with the good values):{% endtrans %}</p>
+                <p>{{ 'developer.howto.description.paragraph_4'|trans }}</p>
                 <p>
                     <pre><code class="language-bash">http POST http://v2.wallabag.org/oauth/v2/token \
     grant_type=password \
@@ -25,7 +25,7 @@
     username=yourUsername \
     password=yourPassw0rd</code></pre>
                 </p>
-                <p>{% trans %}The API will return a response like this:{% endtrans %}</p>
+                <p>{{ 'developer.howto.description.paragraph_5'|trans }}</p>
                 <p>
                     <pre><code class="language-bash">HTTP/1.1 200 OK
 Cache-Control: no-store, private
@@ -45,14 +45,14 @@ X-Powered-By: PHP/5.5.9-1ubuntu4.13
     "token_type": "bearer"
 }</code></pre>
                 </p>
-                <p>{% trans %}The access_token is useful to do a call to the API endpoint. For example:{% endtrans %}</p>
+                <p>{{ 'developer.howto.description.paragraph_6'|trans }}</p>
                 <p>
                     <pre><code class="language-bash">http GET http://v2.wallabag.org/api/entries.json \
     "Authorization:Bearer ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw"</code></pre>
                 </p>
-                <p>{% trans %}This call will return all the entries for your user.{% endtrans %}</p>
+                <p>{{ 'developer.howto.description.paragraph_7'|trans }}</p>
-                <p>{% trans with {'%link%': path('nelmio_api_doc_index')} %}If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.{% endtrans %}</p>
+                <p>{{ 'developer.howto.description.paragraph_8'|trans({'%link%': path('nelmio_api_doc_index')})|raw }}</p>
-                <p><a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{% trans %}Back{% endtrans %}</a></p>
+                <p><a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.howto.back'|trans }}</a></p>
             </div>
 
         </div>