aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-02-11 16:48:46 +0100
committerJeremy Benoist <j0k3r@users.noreply.github.com>2016-02-11 16:48:46 +0100
commit5db084e05b84ac87179336b96b5db9579fa78c67 (patch)
treec028058ea37c012e898dbdbfe11e84427aac1a39 /src
parent6896ae1dda1e399ce39111b28f8f6fbc1d71e14f (diff)
parentd7807ff5f61ca4de175c20f36ff735d40a993faf (diff)
downloadwallabag-5db084e05b84ac87179336b96b5db9579fa78c67.tar.gz
wallabag-5db084e05b84ac87179336b96b5db9579fa78c67.tar.zst
wallabag-5db084e05b84ac87179336b96b5db9579fa78c67.zip
Merge pull request #1665 from wallabag/v2-translations
lots of diverse translation stuff & some typos
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml51
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig16
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig2
-rw-r--r--src/Wallabag/ImportBundle/Import/WallabagV2Import.php2
-rw-r--r--src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig7
7 files changed, 64 insertions, 18 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index cc814cc4..c7186c34 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -52,12 +52,50 @@ New password: 'Nouveau mot de passe'
52Repeat new password: 'Confirmez votre nouveau mot de passe' 52Repeat new password: 'Confirmez votre nouveau mot de passe'
53Username: "Nom d'utilisateur" 53Username: "Nom d'utilisateur"
54 54
55# Tagging rules
56Tagging rules: "Règles de tag automatiques"
57What does « tagging rules » mean?: "Que signifient les règles de tag automatiques ?"
58"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é, vous épargnant ainsi l'effort de classifier vos articles manuellement."
59How do I use them?: "Comment les utiliser ?"
60"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> »"
61Which variables and operators can I use to write rules?: "Quelles variables et opérateurs puis-je utiliser pour écrire des règles ?"
62The 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 :"
63Variable: "Variable"
64Meaning: "Signification"
65Operator: "Opérateur"
66Title of the entry: "Titre de l'article"
67Less than…: "Moins que…"
68URL of the entry: "URL de l'article"
69Strictly less than…: "Strictement moins que…"
70Whether the entry is archived or not: "Si l'article est archivé ou non"
71Greater than…: "Plus que…"
72Whether the entry is starred or not: "Si l'article est favori ou non"
73Strictly greater than…: "Strictement plus que…"
74The entry's content: "Le contenu de l'article"
75Equal to…: "Égal à…"
76The entry's language: "La langue de l'article"
77Not equal to…: "Différent de…"
78The entry's mime-type: "Le Type MIME de l'article"
79One rule or another: "Une règle ou l'autre"
80The estimated entry's reading time, in minutes: "Le temps de lecture estimé de l'article, en minutes"
81One rule and another: "Une règle et l'autre"
82The domain name of the entry: "Le nom de domaine de l'article"
83"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>"
84Rule: "Règle"
85
55# Entries 86# Entries
56'estimated reading time': 'durée de lecture' 87'estimated reading time': 'durée de lecture'
57original: "original" 88original: "original"
58Toggle mark as read: 'Marquer comme lu/non lu' 89Toggle mark as read: 'Marquer comme lu/non lu'
59Toggle favorite: 'Marquer comme favori' 90Toggle favorite: 'Marquer comme favori'
60Delete: 'Supprimer' 91Delete: 'Supprimer'
92"{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."
93http://website: "http://siteweb"
94
95# Edit entry
96Edit an entry: "Éditer un article"
97Title: "Titre"
98Is public: "Public"
61 99
62# Filters 100# Filters
63Filters: 'Filtres' 101Filters: 'Filtres'
@@ -75,8 +113,10 @@ Creation date: 'Date de création'
75dd/mm/yyyy: 'dd/mm/aaaa' 113dd/mm/yyyy: 'dd/mm/aaaa'
76Clear: 'Effacer' 114Clear: 'Effacer'
77Filter: 'Filtrer' 115Filter: 'Filtrer'
116website.com: "siteweb.com"
78 117
79# About 118# About
119About: "À propos"
80Who is behind wallabag: "L'équipe derrière wallabag" 120Who is behind wallabag: "L'équipe derrière wallabag"
81Getting help: "Besoin d'aide" 121Getting help: "Besoin d'aide"
82Helping wallabag: "Aider wallabag" 122Helping wallabag: "Aider wallabag"
@@ -95,6 +135,10 @@ or: "ou"
95"by contributing to the project:": "en contribuant au projet :" 135"by contributing to the project:": "en contribuant au projet :"
96an issue lists all our needs: "un ticket recense tous nos besoins" 136an issue lists all our needs: "un ticket recense tous nos besoins"
97via Paypal: "via Paypal" 137via Paypal: "via Paypal"
138Take wallabag with you: "Emportez wallabag avec vous"
139Social: "Social"
140powered by: "propulsé par"
141
98 142
99# Howto 143# Howto
100Form: "Formulaire" 144Form: "Formulaire"
@@ -134,8 +178,13 @@ Edit title: "Modifier le titre"
134Welcome on 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." 178Welcome on 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."
135"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." 179"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."
136"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\"." 180"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\"."
181"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 toutes 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\""
137"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." 182"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."
138Connect to Pocket and import data: "Se connecter à Pocket et importer les données." 183Import > Pocket: "Import > Pocket"
184Pocket import isn't configured.: "L'import à partir de Pocket n'est pas configuré."
185You need to define %keyurls% a pocket_consumer_key %keyurle%.: "Vous devez définir %keyurls% une clé pour l'API Pocket %keyurle%."
186Your server admin needs to define an API Key for Pocket.: L'administrateur de votre serveur doit définir une clé pour l'API Pocket."
187Connect to Pocket and import data: "Se connecter à Pocket et importer les données"
139Please 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." 188Please 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."
140File: "Fichier" 189File: "Fichier"
141Upload file: "Importer le fichier" 190Upload file: "Importer le fichier"
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 1cae90a4..e388f2c8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -238,21 +238,14 @@
238 <h5>{% trans %}What does « tagging rules » mean?{% endtrans %}</h5> 238 <h5>{% trans %}What does « tagging rules » mean?{% endtrans %}</h5>
239 <p class="help"> 239 <p class="help">
240 {% trans %} 240 {% trans %}
241 They are rules used by Wallabag to automatically tag new entries.<br /> 241 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.
242 Each time a new entry is added, all the tagging rules will be used to add
243 the tags you configured, thus saving you the trouble to manually classify
244 your entries.
245 {% endtrans %} 242 {% endtrans %}
246 </p> 243 </p>
247 244
248 <h5>{% trans %}How do I use them?{% endtrans %}</h5> 245 <h5>{% trans %}How do I use them?{% endtrans %}</h5>
249 <p class="help"> 246 <p class="help">
250 {% trans %} 247 {% trans %}
251 Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br /> 248 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> »
252 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>
253 field.<br />
254 Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />
255 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> »
256 {% endtrans %} 249 {% endtrans %}
257 </p> 250 </p>
258 251
@@ -290,7 +283,7 @@
290 <td>{% trans %}Greater than…{% endtrans %}</td> 283 <td>{% trans %}Greater than…{% endtrans %}</td>
291 </tr> 284 </tr>
292 <tr> 285 <tr>
293 <td>isStared</td> 286 <td>isStarred</td>
294 <td>{% trans %}Whether the entry is starred or not{% endtrans %}</td> 287 <td>{% trans %}Whether the entry is starred or not{% endtrans %}</td>
295 <td>&gt;</td> 288 <td>&gt;</td>
296 <td>{% trans %}Strictly greater than…{% endtrans %}</td> 289 <td>{% trans %}Strictly greater than…{% endtrans %}</td>
@@ -325,8 +318,7 @@
325 <td>matches</td> 318 <td>matches</td>
326 <td> 319 <td>
327 {% trans %} 320 {% trans %}
328 Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br /> 321 Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>
329 Example: <code>title matches "football"</code>
330 {% endtrans %} 322 {% endtrans %}
331 </td> 323 </td>
332 </tr> 324 </tr>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index 3b7698f3..ac17ccee 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -162,7 +162,7 @@
162 </div> 162 </div>
163 163
164 <div class="input-field col s12"> 164 <div class="input-field col s12">
165 {{ form_widget(form.domainName, {'type': 'text', 'attr' : {'placeholder': 'website.com'} }) }} 165 {{ form_widget(form.domainName, {'type': 'text', 'attr' : {'placeholder': 'website.com' | trans} }) }}
166 <label for="entry_filter_domainName">{% trans %}Domain name{% endtrans %}</label> 166 <label for="entry_filter_domainName">{% trans %}Domain name{% endtrans %}</label>
167 </div> 167 </div>
168 168
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
index 47e3bc78..2de53106 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
@@ -8,7 +8,7 @@
8 <span class="black-text">{{ form_errors(form.url) }}</span> 8 <span class="black-text">{{ form_errors(form.url) }}</span>
9 {% endif %} 9 {% endif %}
10 10
11 {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'http://website'} }) }} 11 {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'http://website' | trans} }) }}
12 12
13 <div class="hidden">{{ form_rest(form) }}</div> 13 <div class="hidden">{{ form_rest(form) }}</div>
14</form> 14</form>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index dff9e612..d7bfa7ae 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -115,7 +115,7 @@
115 <div class="footer-copyright"> 115 <div class="footer-copyright">
116 <div class="container"> 116 <div class="container">
117 <p>{% trans %}powered by{% endtrans %} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p> 117 <p>{% trans %}powered by{% endtrans %} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p>
118 <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{% trans %}about{% endtrans %}</a> 118 <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{% trans %}About{% endtrans %}</a>
119 </div> 119 </div>
120 </div> 120 </div>
121 </footer> 121 </footer>
diff --git a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
index c5c0d5a7..7125eabc 100644
--- a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
+++ b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
@@ -27,7 +27,7 @@ class WallabagV2Import extends WallabagV1Import implements ImportInterface
27 */ 27 */
28 public function getDescription() 28 public function getDescription()
29 { 29 {
30 return 'This importer will import all your wallabag v2 articles. On the export sidebar, click on "JSON". You will have a "Unread articles.json" file.'; 30 return '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.';
31 } 31 }
32 32
33 /** 33 /**
diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
index e0e36f38..8aa5da97 100644
--- a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
@@ -7,7 +7,12 @@
7 <div class="card-panel settings"> 7 <div class="card-panel settings">
8 {% if not has_consumer_key %} 8 {% if not has_consumer_key %}
9 <div class="card-panel red darken-1"> 9 <div class="card-panel red darken-1">
10 {% trans %}Pocket import isn't configured. You need to define pocket_consumer_key.{% endtrans %} 10 {% trans %}Pocket import isn't configured.{% endtrans %}
11 {% if is_granted('ROLE_SUPER_ADMIN') %}
12 {% trans with {'%keyurls%': '<a href="' ~ path('craue_config_settings_modify') ~ '#set-import">', '%keyurle%':'</a>'} %}You need to define %keyurls% a pocket_consumer_key %keyurle%.{% endtrans %}
13 {% else %}
14 {% trans %}Your server admin needs to define an API Key for Pocket.{% endtrans %}
15 {% endif %}
11 </div> 16 </div>
12 {% endif %} 17 {% endif %}
13 18