diff options
| author | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
|---|---|---|
| committer | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
| commit | b5fad9feefd0f261807222d8a4c42ead6253a65c (patch) | |
| tree | 399cd4a1b79f61530924ea59670af0bdd6cee5be /view/fr/messages.po | |
| parent | 89aea081825ec7b11b00833a9bec2c74900bfcb6 (diff) | |
| parent | b29a968be8df52cd7c9b6d5bebb618534788337c (diff) | |
| download | volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.gz volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.bz2 volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.zip | |
Fix merge conflict
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:" |