Skip to content

Commit

Permalink
More text modifications + nabbalocky&help links
Browse files Browse the repository at this point in the history
  • Loading branch information
Olivier committed Dec 18, 2019
1 parent ea8b7e1 commit b234e78
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 26 deletions.
19 changes: 8 additions & 11 deletions nabmastodond/locale/fr_FR/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-12-17 10:10+0100\n"
"POT-Creation-Date: 2019-12-17 14:57+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"
Expand Down Expand Up @@ -36,8 +36,8 @@ msgid "Kindred soul"
msgstr "Âme sœur"

#: templates/nabmastodond/settings.html:25
msgid "friend@botsin.space"
msgstr ""
msgid "friend@mstdn.fr"
msgstr "ami(e)@mstdn.fr"

#: templates/nabmastodond/settings.html:25
msgid "Friend address"
Expand Down Expand Up @@ -175,11 +175,11 @@ msgid ""
"(Mastodon is a sort of decentralized Twitter - and Open Source). Currently "
"your Nabaztag is not connected to Mastodon."
msgstr ""
"Comme on a décidé que Nabaztag n'habiterait plus jamais dans le cloud mais que nous aimons bien la "
"communion d'oreilles (notamment), nous utilisons <a href='https://"
"fr.wikipedia.org/wiki/Mastodon_(r%C3%A9seau_social)'>Mastodon</a> pour connecter les lapins entre eux. "
"<b>En ce moment, votre Nabaztag n'est pas connecté à Mastodon</b>."

"Comme on a décidé que Nabaztag n'habiterait plus jamais dans le cloud mais "
"que nous aimons bien la communion d'oreilles (notamment), nous utilisons <a "
"href='https://fr.wikipedia.org/wiki/Mastodon_(r%C3%A9seau_social)'>Mastodon</"
"a> pour connecter les lapins entre eux. <b>En ce moment, votre Nabaztag "
"n'est pas connecté à Mastodon</b>."

#: templates/nabmastodond/settings.html:259
msgid ""
Expand Down Expand Up @@ -231,8 +231,5 @@ msgctxt "button"
msgid "Disconnect"
msgstr "Déconnexion"

#~ msgid "[email protected]"
#~ msgstr "ami(e)@mstdn.fr"

#~ msgid "Not connected to Mastodon."
#~ msgstr "Pas connecté à Mastodon."
47 changes: 32 additions & 15 deletions nabweb/locale/fr_FR/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-12-17 11:38+0100\n"
"POT-Creation-Date: 2019-12-18 10:13+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"
Expand Down Expand Up @@ -76,15 +76,19 @@ msgstr "Information système"
msgid "Upgrade"
msgstr "Mise à jour"

#: templates/nabweb/_base.html:44
#: templates/nabweb/_base.html:31
msgid "Help!"
msgstr "Aide !"

#: templates/nabweb/_base.html:45
msgid "Upgrading"
msgstr "Mise à jour"

#: templates/nabweb/_base.html:47
#: templates/nabweb/_base.html:48
msgid "Please wait while upgrading pynab..."
msgstr "Veuillez patienter pendant la mise à jour de pynab"

#: templates/nabweb/_base.html:81
#: templates/nabweb/_base.html:79
#, fuzzy
#| msgid "Unknown server error (LOL)"
msgid "Unknown server error"
Expand Down Expand Up @@ -124,20 +128,33 @@ msgstr ""
#: templates/nabweb/index.html:13
msgid ""
"You can trigger some services with your voice. The processing is done "
"locally and you need to push the button long enough to hear a 'bip' (keep the button pushed), then "
"wait a couple of seconds (We'll have a look at this later!) then speak and "
"when you're done just release the button. Your service should be played "
"shortly!"
"locally and you need to push the button long enough to hear a 'bip' (keep "
"the button pushed), then wait a couple of seconds (We'll have a look at this "
"later!) then speak and when you're done just release the button. Your "
"service should be played shortly!"
msgstr ""
"Vous pouvez aussi déclencher certains services en demandant à Nabaztag. La reconnaissance "
"vocale est effectuée localement et il vous faut appuyer sur le bouton (en le maintenant appuyé), attendre le 'bip', attendre encore quelques secondes "
"(oui c'est un bug) puis parler. Relacher quand vous n'avez plus rien à dire et attendez que Nabaztag vous réponde."
"Vous pouvez aussi déclencher certains services en demandant à Nabaztag. La "
"reconnaissance vocale est effectuée localement et il vous faut appuyer sur "
"le bouton (en le maintenant appuyé), attendre le 'bip', attendre encore "
"quelques secondes (oui c'est un bug) puis parler. Relacher quand vous n'avez "
"plus rien à dire et attendez que Nabaztag vous réponde."

#: templates/nabweb/index.html:14
msgid ""
"And don't forget to try <a href='http://nabaztag.local:8081' "
"target='_new'>Nabblocky</a> and learn how to code with Nabaztag. It's "
"fantastic."
msgstr ""
"Et n'oubliez pas d'essayer <a href='http://nabaztag.local:8081' "
"target='_new'>Nabblocky</a>. Pour tous ceux qui veulent apprendre à développer avec Nabaztag. "
"C'est fantastique !"


#: templates/nabweb/index.html:24 templates/nabweb/index.html:29
#: templates/nabweb/index.html:26 templates/nabweb/index.html:31
msgid "Language"
msgstr "Langue"

#: templates/nabweb/index.html:27
#: templates/nabweb/index.html:29
msgid ""
"The language is used by services with recorded sounds. U.S. English and "
"British English are based on distinct voices."
Expand All @@ -146,11 +163,11 @@ msgstr ""
"Typiquement, l'américain et le britannique utilisent des voix différentes. "
"le Japonais est intéressant."

#: templates/nabweb/index.html:42
#: templates/nabweb/index.html:44
msgid "Save"
msgstr "Enregistrer"

#: templates/nabweb/index.html:43
#: templates/nabweb/index.html:45
msgid "Reset"
msgstr "Annuler"

Expand Down
1 change: 1 addition & 0 deletions nabweb/templates/nabweb/_base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<li><a class="nav-link{% if request.path == '/services/' %} active{% endif %}" href="{% if request.path == '/services/' %}#{% else %}/services/{% endif %}">{% trans "Services" %}{% if request.path == '/services/' %} <span class="sr-only">{% trans "(current)" %}</span>{% endif %}</a></li>
<li><a class="nav-link{% if request.path == '/system-info/' %} active{% endif %}" href="{% if request.path == '/system-info/' %}#{% else %}/system-info/{% endif %}">{% trans "System Information" %}{% if request.path == '/system-info/' %} <span class="sr-only">{% trans "(current)" %}</span>{% endif %}</a></li>
<li><a class="nav-link upgrade-link{% if request.path == '/upgrade/' %} active{% endif %}" href="{% if request.path == '/upgrade/' %}#{% else %}/upgrade/{% endif %}">{% trans "Upgrade" %} <span class="badge badge-info"></span>{% if request.path == '/upgrade/' %} <span class="sr-only">{% trans "(current)" %}</span>{% endif %}</a></li>
<li><a class="nav-link" href="https://tagtagtag.fr/forum" target="_new">{% trans "Help!" %} </a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a class="nav-link pull-right" href="https://github.com/nabaztag2018/pynab" target="_blank" aria-label="GitHub"><img src="{% static "nabweb/images/GitHub-Mark-32px.png" %}" title="GitHub" width="20" height="20" /></a></li>
Expand Down
2 changes: 2 additions & 0 deletions nabweb/templates/nabweb/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ <h1 class="display-3">{% trans "Nabaztag configuration" %}</h1>
<p>{% trans "Eventually, explore top navigation bar to configure <a href='/settings/'>Nabaztag services</a>, <a href='/upgrade/'>upgrade software</a> or even visit the <a target='_blank' href='https://github.com/nabaztag2018/pynab'>GitHub repository</a> to start hacking, adding features or simply report bugs." %}</p>

<p>{% trans "You can trigger some services with your voice. The processing is done locally and you need to push the button long enough to hear a 'bip' (keep the button pushed), then wait a couple of seconds (We'll have a look at this later!) then speak and when you're done just release the button. Your service should be played shortly!" %}</p>
<p>{% trans "And don't forget to try <a href='http://nabaztag.local:8081' target='_new'>Nabblocky</a> and learn how to code with Nabaztag. It's fantastic." %}</p>



</div>
Expand Down

0 comments on commit b234e78

Please sign in to comment.