Merge branch 'master' into releng

nabaztag2018 · Feb 4, 2020 · 4a92731 · 4a92731
2 parents 5f1110e + b0e5e4d
commit 4a92731
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 49 deletions.
diff --git a/nab8balld/locale/fr_FR/LC_MESSAGES/django.po b/nab8balld/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-22 09:59+0100\n"
+"POT-Creation-Date: 2020-02-04 12:17+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -22,16 +22,18 @@ msgid "Magic 8 Ball"
 msgstr "Gourou"
 
 #: templates/nab8balld/settings.html:10
-msgid "Enable"
-msgstr "Réveiller"
+msgid "Wake up the guru"
+msgstr "Réveiller le gourou"
 
 #: templates/nab8balld/settings.html:16
 msgid ""
-"To use Magic 8 Ball, click and hold the button, says 'Tell me rabbit' then "
-"ask your question and release the button for the answer."
+"To use Magic 8 Ball, think about something you want to ask to the rabbit, "
+"then click and hold the button, say 'Tell me rabbit' and release the button "
+"for the answer."
 msgstr ""
-"Pour poser une question (courte !) au Gourou : appuyez sur le bouton, dites 'Dis lapin' puis "
-"posez votre question, relachez et attendez que le Gourou vous réponde."
+"Pour poser une question au Gourou : réflechissez à votre question, puis quand vous êtes prêt, appuyez sur le bouton, dites "
+"'T'en penses quoi Nabaztag ?', relachez et attendez la "
+"réponse."
 
 #: templates/nab8balld/settings.html:21
 msgid "Save"
@@ -41,40 +43,3 @@ msgstr "Enregistrer"
 msgid "Reset"
 msgstr "Annuler"
 
-#~ msgid "Air quality"
-#~ msgstr "Qualité de l'air"
-
-#~ msgid ""
-#~ "Air quality information is provided based on your IP adress. You can "
-#~ "select the type of information you want : Agregated index or just PM 2.5"
-#~ msgstr ""
-#~ "La qualité de l'air est donnée en fonction de votre adresse IP. Vous "
-#~ "pouvez sélectionner le type d'information que vous souhaitez utiliser : "
-#~ "Index agrégé ou simplement les particules fines (PM 2.5)"
-
-#~ msgid ""
-#~ "You can also ask your rabbit by saying such things as 'What is the air "
-#~ "quality today ?'"
-#~ msgstr ""
-#~ "Vous pouvez aussi demander à votre lapin en disant 'Qualité de l'air'."
-
-#~ msgid "Index"
-#~ msgstr "Indice"
-
-#~ msgid "Do not display"
-#~ msgstr "Ne pas afficher"
-
-#~ msgid "AQI"
-#~ msgstr "AQI"
-
-#~ msgid "PM 2.5"
-#~ msgstr "PM 2.5"
-
-#~ msgid "Forecast"
-#~ msgstr "Prévision"
-
-#~ msgid "Today"
-#~ msgstr "Aujourd'hui"
-
-#~ msgid "Unknown server error"
-#~ msgstr "Erreur inconnue du serveur"
diff --git a/nab8balld/templates/nab8balld/settings.html b/nab8balld/templates/nab8balld/settings.html
@@ -13,7 +13,7 @@ <h5 class="card-title">{% trans "Magic 8 Ball" %}</h5>
           <input name="enabled" type="hidden" value="{% if config.enabled %}true{% else %}false{% endif %}" />
         </div>
       </div>
-      <p>{% trans "To use Magic 8 Ball, click and hold the button, says 'Tell me rabbit' then ask your question and release the button for the answer." %}</p>
+      <p>{% trans "To use Magic 8 Ball, think about something you want to ask to the rabbit, then click and hold the button, say 'Tell me rabbit' and release the button for the answer." %}</p>
     </div>
     <div class="card-footer">
       <div class="row mb-2">

diff --git a/nabairqualityd/locale/fr_FR/LC_MESSAGES/django.po b/nabairqualityd/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-15 14:30+0100\n"
+"POT-Creation-Date: 2020-02-04 12:20+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -24,11 +24,12 @@ msgstr "Qualité de l'air"
 #: templates/nabairqualityd/settings.html:9
 msgid ""
 "Air quality information is provided based on your IP adress. You can select "
-"the type of information you want : Agregated index or just PM 2.5"
+"the type of information you want : Agregated index or just PM 2.5. Select "
+"Disable to disable the visual animation."
 msgstr ""
 "La qualité de l'air est donnée en fonction de votre adresse IP. Vous pouvez "
 "sélectionner le type d'information que vous souhaitez utiliser : Index "
-"agrégé ou simplement les particules fines (PM 2.5)"
+"agrégé ou simplement les particules fines (PM 2.5). Pour désactiver l'animation lumineuse, sélectionnez Aucun."
 
 #: templates/nabairqualityd/settings.html:10
 msgid ""

diff --git a/nabairqualityd/templates/nabairqualityd/settings.html b/nabairqualityd/templates/nabairqualityd/settings.html
@@ -6,7 +6,7 @@
       <h5 class="card-title">{% trans "Air quality" %} - {{ config.localisation }}</h5>
     </div>
     <div class="card-body">
-        <p>{% trans "Air quality information is provided based on your IP adress. You can select the type of information you want : Agregated index or just PM 2.5" %}</p>
+        <p>{% trans "Air quality information is provided based on your IP adress. You can select the type of information you want : Agregated index or just PM 2.5. Select Disable to disable the visual animation." %}</p>
         <p>{% trans "You can also ask your rabbit by saying such things as 'What is the air quality today ?'" %}</p>
 
       <div class="form-group row">