resolve file inclusion conflicts w/ multiple plugins, improve the typo checker

[friendica.git] / view / intros.tpl

diff --git a/view/intros.tpl b/view/intros.tpl
index 30198beb850407026130112d71b0796b4bac555e..4534f2191692a718159c9ad8f28742bc697b15a5 100644 (file)
--- a/view/intros.tpl
+++ b/view/intros.tpl
@@ -1,15 +1,15 @@
 
 <div class="intro-wrapper" id="intro-$contact_id" >
 
-<p class="intro-desc">Notification type: $notify_type</p>
+<p class="intro-desc">$str_notifytype $notify_type</p>
 <div class="intro-fullname" id="intro-fullname-$contact_id" >$fullname</div>
 <a class="intro-url-link" id="intro-url-link-$contact_id" href="$url" ><img id="photo-$contact_id" class="intro-photo" src="$photo" width="175" height=175" name="$fullname" alt="fullname" /></a>
 <div class="intro-knowyou">$knowyou</div>
 <div class="intro-note" id="intro-note-$contact_id">$note</div>
 <div class="intro-wrapper-end" id="intro-wrapper-end-$contact_id"></div>
 <form class="intro-form" action="notifications/$intro_id" method="post">
-<input class="intro-submit-ignore" type="submit" name="submit" value="Ignore" />
-<input class="intro-submit-discard" type="submit" name="submit" value="Discard" />
+<input class="intro-submit-ignore" type="submit" name="submit" value="$ignore" />
+<input class="intro-submit-discard" type="submit" name="submit" value="$discard" />
 </form>
 <div class="intro-form-end"></div>
 
@@ -20,7 +20,7 @@
 
 $dfrn_text
 
-<input class="intro-submit-approve" type="submit" name="submit" value="Approve" />
+<input class="intro-submit-approve" type="submit" name="submit" value="$approve" />
 </form>
 </div>
 <div class="intro-end"></div>