aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-05-29 17:51:36 -0700
committerzotlabs <mike@macgirvin.com>2018-05-29 17:51:36 -0700
commit7d088c8d565e0ac88f6640b69518a1aba323b20f (patch)
tree3fefa8ce2930c634bacdf6086f3f5822facb4f0a /view
parented3d3b6f27452969164f35fee3cf7955733b503e (diff)
parentdcd5f0007717d8c2f10e3c58c941ca64f2824878 (diff)
downloadvolse-hubzilla-7d088c8d565e0ac88f6640b69518a1aba323b20f.tar.gz
volse-hubzilla-7d088c8d565e0ac88f6640b69518a1aba323b20f.tar.bz2
volse-hubzilla-7d088c8d565e0ac88f6640b69518a1aba323b20f.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view')
-rw-r--r--view/fr/hmessages.po6
-rw-r--r--view/fr/hstrings.php4
2 files changed, 5 insertions, 5 deletions
diff --git a/view/fr/hmessages.po b/view/fr/hmessages.po
index a830d06ef..c5263c2df 100644
--- a/view/fr/hmessages.po
+++ b/view/fr/hmessages.po
@@ -15,7 +15,7 @@ msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-23 11:34+0200\n"
-"PO-Revision-Date: 2018-05-06 07:46+0000\n"
+"PO-Revision-Date: 2018-05-26 07:06+0000\n"
"Last-Translator: Philip Wittamore <philip@wittamore.com>\n"
"Language-Team: French (http://www.transifex.com/Friendica/red-matrix/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -6943,7 +6943,7 @@ msgstr "À propos&nbsp;:"
#: ../../include/conversation.php:1052 ../../include/channel.php:1376
#: ../../include/connections.php:110
msgid "Connect"
-msgstr "Ajouter/Suivre"
+msgstr "Lier"
#: ../../Zotlabs/Module/Directory.php:339
msgid "Public Forum:"
@@ -12750,7 +12750,7 @@ msgstr "Saisir nom ou centre d'intérêt"
#: ../../include/contact_widgets.php:21
msgid "Connect/Follow"
-msgstr "Ajouter/Suivre"
+msgstr "Lier et suivre"
#: ../../include/contact_widgets.php:22
msgid "Examples: Robert Morgenstein, Fishing"
diff --git a/view/fr/hstrings.php b/view/fr/hstrings.php
index f7fd25224..cdf233584 100644
--- a/view/fr/hstrings.php
+++ b/view/fr/hstrings.php
@@ -1485,7 +1485,7 @@ App::$strings["Location:"] = "Emplacement&nbsp;:";
App::$strings["Description:"] = "Description&nbsp;:";
App::$strings["Hometown:"] = "Ville natale&nbsp;:";
App::$strings["About:"] = "À propos&nbsp;:";
-App::$strings["Connect"] = "Ajouter/Suivre";
+App::$strings["Connect"] = "Lier";
App::$strings["Public Forum:"] = "Forum public&nbsp;:";
App::$strings["Keywords: "] = "Mots-clefs&nbsp;:";
App::$strings["Don't suggest"] = "Ne pas suggérer";
@@ -2868,7 +2868,7 @@ App::$strings["%d invitation available"] = array(
);
App::$strings["Find Channels"] = "Trouver des canaux";
App::$strings["Enter name or interest"] = "Saisir nom ou centre d'intérêt";
-App::$strings["Connect/Follow"] = "Ajouter/Suivre";
+App::$strings["Connect/Follow"] = "Lier et suivre";
App::$strings["Examples: Robert Morgenstein, Fishing"] = "Exemples: Guillaume Martin, Course à pieds";
App::$strings["Random Profile"] = "Un profil au hasard";
App::$strings["Invite Friends"] = "Inviter des amis";