From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Sat, 7 May 2016 17:58:31 +0000 (+0200)
Subject: Merge pull request #2035 from wallabag/prepare-204
X-Git-Tag: 2.0.4~1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=de20470ee19b7504dd6db5878577ff24a005a914;hp=8f705d62afebcdad5cbdb5d2cdd324b2908314e1;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #2035 from wallabag/prepare-204

Prepare wallabag 2.0.4
---

diff --git a/docs/en/developer/translate.rst b/docs/en/developer/translate.rst
index f1a12adf..d412d3e9 100644
--- a/docs/en/developer/translate.rst
+++ b/docs/en/developer/translate.rst
@@ -14,7 +14,7 @@ Translation files
 
 You can find translation files here: https://github.com/wallabag/wallabag/tree/master/src/Wallabag/CoreBundle/Resources/translations.
 
-You have to create ``messages.CODE.yml``, where CODE
+You have to create ``messages.CODE.yml`` and ``validators.CODE.yml``, where CODE
 is the ISO 639-1 code of your language (`see wikipedia <https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes>`__).
 
 Other files to translate:
diff --git a/docs/fr/developer/translate.rst b/docs/fr/developer/translate.rst
index cc5336ee..902c29ad 100644
--- a/docs/fr/developer/translate.rst
+++ b/docs/fr/developer/translate.rst
@@ -15,7 +15,7 @@ Fichiers de traductions
 
 Les principaux fichiers de traduction se trouvent ici : https://github.com/wallabag/wallabag/tree/master/src/Wallabag/CoreBundle/Resources/translations.
 
-Vous devez créer le fichier ``messages.CODE.yml``,
+Vous devez créer les fichiers ``messages.CODE.yml`` et ``validators.CODE.yml``,
 où CODE est le code ISO 639-1 de votre langue (`cf wikipedia <https://fr.wikipedia.org/wiki/Liste_des_codes_ISO_639-1>`__).
 
 Autres fichiers à traduire :
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index d19cf1bf..8d392063 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -380,13 +380,6 @@ developer:
     #         paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
     #     back: 'Back'
 
-validator:
-    password_must_match: 'De indtastede adgangskoder skal være ens'
-    password_too_short: 'Adgangskoden skal være mindst 8 tegn'
-    # password_wrong_value: 'Wrong value for your current password'
-    # item_per_page_too_high: 'This will certainly kill the app'
-    # rss_limit_too_hight: 'This will certainly kill the app'
-
 flashes:
     config:
         notice:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index f1e7b6b8..c7a89492 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -380,13 +380,6 @@ developer:
             paragraph_8: 'Wenn du alle API-Endpunkte sehen willst, werfe einen Blick auf die <a href="%link%">API-Dokumentation</a>.'
         back: 'Zurück'
 
-validator:
-    password_must_match: 'Die Kennwort-Felder müssen übereinstimmen.'
-    password_too_short: 'Kennwort-Mindestlänge von acht Zeichen nicht erfüllt'
-    password_wrong_value: 'Falscher Wert für dein aktuelles Kennwort'
-    item_per_page_too_high: 'Dies wird die Anwendung möglicherweise beenden'
-    rss_limit_too_hight: 'Dies wird die Anwendung möglicherweise beenden'
-
 flashes:
     config:
         notice:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 8f3e4267..1cc42404 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -380,13 +380,6 @@ developer:
             paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
         back: 'Back'
 
-validator:
-    password_must_match: 'The password fields must match.'
-    password_too_short: 'Password should by at least 8 chars long'
-    password_wrong_value: 'Wrong value for your current password'
-    item_per_page_too_high: 'This will certainly kill the app'
-    rss_limit_too_hight: 'This will certainly kill the app'
-
 flashes:
     config:
         notice:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 8acb30d4..e8461247 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -380,13 +380,6 @@ developer:
             paragraph_8: 'Si quiere ver todos los fines de API, se puede ver <a href="%link%">a nuestra documentación API</a>.'
         back: 'Atrás'
 
-validator:
-    password_must_match: 'Las contraseñas no coinciden'
-    password_too_short: 'La contraseña debe tener al menos 8 carácteres'
-    password_wrong_value: 'Entrada equivocada para su contraseña actual'
-    item_per_page_too_high: 'Esto matará la aplicación'
-    rss_limit_too_hight: 'Esto matará la aplicación'
-
 flashes:
     config:
         notice:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 5788e1fd..d34ff8ff 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -380,13 +380,6 @@ developer:
     #         paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
     #     back: 'بازگشت'
 
-validator:
-    password_must_match: 'رمزها باید یکی باشند'
-    password_too_short: 'رمز شما باید ۸ حرف یا بیشتر باشد'
-    password_wrong_value: 'رمز فعلی را اشتباه وارد کرده‌اید'
-    item_per_page_too_high: 'با این تعداد برنامه به فنا می‌رود'
-    rss_limit_too_hight: 'با این تعداد برنامه به فنا می‌رود'
-
 flashes:
     config:
         notice:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 6ff1a3b1..80ba0546 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -380,13 +380,6 @@ developer:
             paragraph_8: "Si vous voulez toutes les méthodes de l'API, jetez un oeil <a href=\"%link%\">à la documentation de l'API</a>."
         back: 'Retour'
 
-validator:
-    password_must_match: 'Les deux mots de passe doivent être les mêmes'
-    password_too_short: 'Le mot de passe doit contenir au moins 8 caractères'
-    password_wrong_value: 'Votre mot de passe actuel est faux'
-    item_per_page_too_high: "Ca ne va pas plaire à l'application"
-    rss_limit_too_hight: "Ca ne va pas plaire à l'application"
-
 flashes:
     config:
         notice:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index ae30fce1..4f3ac090 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -380,13 +380,6 @@ developer:
             paragraph_8: 'Se vuoi visualizzare tutti gli API endpoints, dai una occhiata alla <a href="%link%">documentazione delle API</a>.'
         back: 'Indietro'
 
-validator:
-    password_must_match: 'Le password devono corrispondere.'
-    password_too_short: 'La password deve essere lunga almeno 8 caratteri'
-    password_wrong_value: 'Valore inserito per la password corrente errato'
-    item_per_page_too_high: 'Questo valore è troppo alto'
-    rss_limit_too_hight: 'Questo valore è troppo alto'
-
 flashes:
     config:
         notice:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index bbd813e2..46f58bbf 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -380,13 +380,6 @@ developer:
             paragraph_8: "Se volètz totas las adreças d'accès de l'API, donatz un còp d’uèlh <a href=\"%link%\">a la documentacion de l'API</a>."
         back: 'Retorn'
 
-validator:
-    password_must_match: 'Cal que los dos senhals siasquen los meteisses'
-    password_too_short: 'Lo senhal deu aver almens 8 caractèrs'
-    password_wrong_value: 'Vòstre senhal actual es pas bon'
-    item_per_page_too_high: "Aquò li agradarà pas a l'aplicacion"
-    rss_limit_too_hight: "Aquò li agradarà pas a l'aplicacion"
-
 flashes:
     config:
         notice:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index fb26de89..292749ed 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -380,13 +380,6 @@ developer:
             paragraph_8: 'Jeżeli chcesz wyświetlić wszystkie punkty końcowe API, zobacz <a href="%link%">Dokumentacja naszego API</a>.'
          back: 'Cofnij'
 
-validator:
-    password_must_match: 'Hasło w polach musi być takie same'
-    password_too_short: 'Hasło powinno mieć minimum 8 znaków długości'
-    password_wrong_value: 'Twoje obecne hasło jest błędne'
-    item_per_page_too_high: 'To może spowodować problemy z aplikacją'
-    rss_limit_too_hight: 'To może spowodować problemy z aplikacją'
-
 flashes:
     config:
         notice:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index bb817cb3..45040f35 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -380,13 +380,6 @@ developer:
     #         paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
     #     back: 'Back'
 
-validator:
-    password_must_match: 'Câmpurile destinate parolelor trebuie să se potrivească'
-    password_too_short: 'Parola ar trebui să conțină cel puțin 8 caractere'
-    # password_wrong_value: 'Wrong value for your current password'
-    # item_per_page_too_high: 'This will certainly kill the app'
-    # rss_limit_too_hight: 'This will certainly kill the app'
-
 flashes:
     config:
         notice:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 897cc2f4..8a095a5b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -380,13 +380,6 @@ developer:
     #         paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
     #     back: 'Back'
 
-validator:
-    # password_must_match: 'The password fields must match.'
-    # password_too_short: 'Password should by at least 8 chars long'
-    # password_wrong_value: 'Wrong value for your current password'
-    # item_per_page_too_high: 'This will certainly kill the app'
-    # rss_limit_too_hight: 'This will certainly kill the app'
-
 flashes:
     config:
         notice:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml
new file mode 100644
index 00000000..dfe2c64d
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml
@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'De indtastede adgangskoder skal være ens'
+    password_too_short: 'Adgangskoden skal være mindst 8 tegn'
+#     password_wrong_value: 'Wrong value for your current password'
+#     item_per_page_too_high: 'This will certainly kill the app'
+#     rss_limit_too_hight: 'This will certainly kill the app'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml
new file mode 100644
index 00000000..486cc3e4
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml
@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'Die Kennwort-Felder müssen übereinstimmen.'
+    password_too_short: 'Kennwort-Mindestlänge von acht Zeichen nicht erfüllt'
+    password_wrong_value: 'Falscher Wert für dein aktuelles Kennwort'
+    item_per_page_too_high: 'Dies wird die Anwendung möglicherweise beenden'
+    rss_limit_too_hight: 'Dies wird die Anwendung möglicherweise beenden'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml
new file mode 100644
index 00000000..cdfa46a6
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml
@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'The password fields must match.'
+    password_too_short: 'Password should by at least 8 chars long'
+    password_wrong_value: 'Wrong value for your current password'
+    item_per_page_too_high: 'This will certainly kill the app'
+    rss_limit_too_hight: 'This will certainly kill the app'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
new file mode 100644
index 00000000..ebbff7cf
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'Las contraseñas no coinciden'
+    password_too_short: 'La contraseña debe tener al menos 8 carácteres'
+    password_wrong_value: 'Entrada equivocada para su contraseña actual'
+    item_per_page_too_high: 'Esto matará la aplicación'
+    rss_limit_too_hight: 'Esto matará la aplicación'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml
new file mode 100644
index 00000000..01c62ae0
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml
@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'رمزها باید یکی باشند'
+    password_too_short: 'رمز شما باید ۸ حرف یا بیشتر باشد'
+    password_wrong_value: 'رمز فعلی را اشتباه وارد کرده‌اید'
+    item_per_page_too_high: 'با این تعداد برنامه به فنا می‌رود'
+    rss_limit_too_hight: 'با این تعداد برنامه به فنا می‌رود'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
new file mode 100644
index 00000000..7ecb4acf
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'Les deux mots de passe doivent être les mêmes'
+    password_too_short: 'Le mot de passe doit contenir au moins 8 caractères'
+    password_wrong_value: 'Votre mot de passe actuel est faux'
+    item_per_page_too_high: "Ca ne va pas plaire à l'application"
+    rss_limit_too_hight: "Ca ne va pas plaire à l'application"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml
new file mode 100644
index 00000000..826206f4
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml
@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'Le password devono corrispondere.'
+    password_too_short: 'La password deve essere lunga almeno 8 caratteri'
+    password_wrong_value: 'Valore inserito per la password corrente errato'
+    item_per_page_too_high: 'Questo valore è troppo alto'
+    rss_limit_too_hight: 'Questo valore è troppo alto'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml
new file mode 100644
index 00000000..71b67575
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml
@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'Cal que los dos senhals siasquen los meteisses'
+    password_too_short: 'Lo senhal deu aver almens 8 caractèrs'
+    password_wrong_value: 'Vòstre senhal actual es pas bon'
+    item_per_page_too_high: "Aquò li agradarà pas a l'aplicacion"
+    rss_limit_too_hight: "Aquò li agradarà pas a l'aplicacion"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
new file mode 100644
index 00000000..4f5a3caf
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'Hasło w polach musi być takie same'
+    password_too_short: 'Hasło powinno mieć minimum 8 znaków długości'
+    password_wrong_value: 'Twoje obecne hasło jest błędne'
+    item_per_page_too_high: 'To może spowodować problemy z aplikacją'
+    rss_limit_too_hight: 'To może spowodować problemy z aplikacją'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml
new file mode 100644
index 00000000..2ffbbd4d
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml
@@ -0,0 +1,6 @@
+validator:
+    password_must_match: 'Câmpurile destinate parolelor trebuie să se potrivească'
+    password_too_short: 'Parola ar trebui să conțină cel puțin 8 caractere'
+    # password_wrong_value: 'Wrong value for your current password'
+    # item_per_page_too_high: 'This will certainly kill the app'
+    # rss_limit_too_hight: 'This will certainly kill the app'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml
new file mode 100644
index 00000000..80ab470a
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml
@@ -0,0 +1,6 @@
+validator:
+#     password_must_match: 'The password fields must match.'
+#     password_too_short: 'Password should by at least 8 chars long'
+#     password_wrong_value: 'Wrong value for your current password'
+#     item_per_page_too_high: 'This will certainly kill the app'
+#     rss_limit_too_hight: 'This will certainly kill the app'