aboutsummaryrefslogtreecommitdiffstats
path: root/view/fr
diff options
context:
space:
mode:
authorolivierm <olivier@migeot.org>2011-02-23 10:18:11 +0100
committerolivierm <olivier@migeot.org>2011-02-23 10:18:11 +0100
commit3ad7c395fb9a33319531e04673563e7c9983d8f0 (patch)
tree40945bc75aa9ba7703f11f9c5b26f2ea094b3c35 /view/fr
parentfbf0459fb218549f2c0889cc5b01e337c52510ce (diff)
parenta5b80e5d564f6c239510dbee10daf3ff4c314f2e (diff)
downloadvolse-hubzilla-3ad7c395fb9a33319531e04673563e7c9983d8f0.tar.gz
volse-hubzilla-3ad7c395fb9a33319531e04673563e7c9983d8f0.tar.bz2
volse-hubzilla-3ad7c395fb9a33319531e04673563e7c9983d8f0.zip
Merge commit 'mike/master'
Diffstat (limited to 'view/fr')
-rw-r--r--view/fr/netfriend.tpl14
-rw-r--r--view/fr/strings.php3
2 files changed, 3 insertions, 14 deletions
diff --git a/view/fr/netfriend.tpl b/view/fr/netfriend.tpl
deleted file mode 100644
index b041ec49f..000000000
--- a/view/fr/netfriend.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="intro-approve-as-friend-desc">Approve as: </div>
-
-<div class="intro-approve-as-friend-wrapper">
- <label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">Friend</label>
- <input type="radio" name="duplex" id="intro-approve-as-friend-$intro_id" class="intro-approve-as-friend" $friend_selected value="1" />
- <div class="intro-approve-friend-break" ></div>
-</div>
-<div class="intro-approve-as-friend-end"></div>
-<div class="intro-approve-as-fan-wrapper">
- <label class="intro-approve-as-fan-label" for="intro-approve-as-fan-$intro_id">Fan/Admirer</label>
- <input type="radio" name="duplex" id="intro-approve-as-fan-$intro_id" class="intro-approve-as-fan" $fan_selected value="0" />
- <div class="intro-approve-fan-break"></div>
-</div>
-<div class="intro-approve-as-end"></div>
diff --git a/view/fr/strings.php b/view/fr/strings.php
index 8bac6347f..cbcf11ead 100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -262,6 +262,9 @@ $a->strings['Hide Ignored Requests'] = 'Cacher les demandes ignorées';
$a->strings['Claims to be known to you: '] = 'Prétend que vous le connaissez: ';
$a->strings['yes'] = 'oui';
$a->strings['no'] = 'non';
+$a->strings['Approve as: '] = 'Approuver en tant que: ';
+$a->strings['Friend'] = 'Ami';
+$a->strings['Fan/Admirer'] = 'Fan/Admirateur';
$a->strings['Notification type: '] = 'Type de notification: ';
$a->strings['Friend/Connect Request'] = 'Demande de connexion/relation';
$a->strings['New Follower'] = 'Nouvel abonné';