diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
| commit | ac27db22c18ee7a82a52cbadb3efe2760b910499 (patch) | |
| tree | aa7002d73dbcd4136033589f1cb135184f4126c1 /view/fr/messages.po | |
| parent | 1a5a5c7edb8697c93f8bababbafa80245378dd7e (diff) | |
| parent | 109cb936632c693d3f24afb9e2ce533797ad1a7f (diff) | |
| download | volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.gz volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.bz2 volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
boot.php
include/dba/dba_driver.php
include/diaspora.php
include/follow.php
include/session.php
include/zot.php
mod/photos.php
mod/ping.php
Diffstat (limited to 'view/fr/messages.po')
| -rw-r--r-- | view/fr/messages.po | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/view/fr/messages.po b/view/fr/messages.po index 79a60534f..d818c67ec 100644 --- a/view/fr/messages.po +++ b/view/fr/messages.po @@ -1859,7 +1859,7 @@ msgstr "Merci d'entrer l'URL d'une video :" #: ../../include/conversation.php:1077 msgid "Please enter an audio link/URL:" -msgstr "Merci d'entrer l'URL d'un contenu audio&nsbp;:" +msgstr "Merci d'entrer l'URL d'un contenu audio :" #: ../../include/conversation.php:1078 msgid "Tag term:" @@ -2672,7 +2672,7 @@ msgstr "Ville natale :" #: ../../include/identity.php:1042 msgid "Tags:" -msgstr "Étiquettes:" +msgstr "Étiquettes :" #: ../../include/identity.php:1044 ../../mod/profiles.php:616 msgid "Political Views:" @@ -2720,7 +2720,7 @@ msgstr "Télévision :" #: ../../include/identity.php:1067 msgid "Film/dance/culture/entertainment:" -msgstr "Cinéma/danse/culture/divertissement&nsbp;:" +msgstr "Cinéma/danse/culture/divertissement :" #: ../../include/identity.php:1069 msgid "Love/Romance:" |