pulled strings from one more template

diff --git a/mod/notifications.php b/mod/notifications.php
index 49157c4442dd4bf16fb891a274481159d1b28a93..93ca82bb0ccfb0d999096bd94db5f187090368c8 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -108,6 +108,9 @@ function notifications_content(&$a) {
                                        '$intro_id' => $rr['intro_id'],
                                        '$friend_selected' => $friend_selected,
                                        '$fan_selected' => $fan_selected,
+                                       '$approve_as' => t('Approve as: '),
+                                       '$as_friend' => t('Friend'),
+                                       '$as_fan' => t('Fan/Admirer')
                                ));
                        }                       
 

diff --git a/util/strings.php b/util/strings.php
index 8dabb064d2ce5d820b0cf1eeb7e1f78904911b3c..747d8ef48f85cd9fd7663a62d2b47db2f0c6e338 100644 (file)
--- a/util/strings.php
+++ b/util/strings.php
@@ -276,6 +276,9 @@ $a->strings['Hide Ignored Requests'] = 'Hide Ignored Requests';
 $a->strings['Claims to be known to you: '] = 'Claims to be known to you: ';
 $a->strings['yes'] = 'yes';
 $a->strings['no'] = 'no';
+$a->strings['Approve as: '] = 'Approve as: ';
+$a->strings['Friend'] = 'Friend';
+$a->strings['Fan/Admirer'] = 'Fan/Admirer';
 $a->strings['Notification type: '] = 'Notification type: ';
 $a->strings['Friend/Connect Request'] = 'Friend/Connect Request';
 $a->strings['New Follower'] = 'New Follower';

diff --git a/view/de/netfriend.tpl b/view/de/netfriend.tpl
deleted file mode 100644 (file)
index 79a7a09..0000000
--- a/view/de/netfriend.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="intro-approve-as-friend-desc">Genehmigen als: </div>
-
-<div class="intro-approve-as-friend-wrapper">
-       <label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">Freund</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/Verehrer</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/de/strings.php b/view/de/strings.php
index ef6892e8d06ac511b32784e469f111b4a393bc3b..cc031960664887c7a1a2e433f9a4e87c336e035d 100644 (file)
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -274,6 +274,9 @@ $a->strings['Hide Ignored Requests'] = 'Verberge ignorierte Anfragen';
 $a->strings['Claims to be known to you: '] = 'Behauptet dich zu kennen: ';
 $a->strings['yes'] = 'ja';
 $a->strings['no'] = 'nein';
+$a->strings['Approve as: '] = 'Genehmigen als: ';
+$a->strings['Friend'] = 'Freund';
+$a->strings['Fan/Admirer'] = 'Fan/Verehrer';
 $a->strings['Notification type: '] = 'Benachrichtigungs Typ: ';
 $a->strings['Friend/Connect Request'] = 'Kontakt-/Freundschaftsanfrage';
 $a->strings['New Follower'] = 'Neuer Bewunderer';

diff --git a/view/en/netfriend.tpl b/view/en/netfriend.tpl
deleted file mode 100644 (file)
index b041ec4..0000000
--- a/view/en/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/netfriend.tpl b/view/fr/netfriend.tpl
deleted file mode 100644 (file)
index b041ec4..0000000
--- 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 8bac6347f98d5831ca6135c19adb1943633a0584..cbcf11ead85036656df1618135f0a8b166df16a2 100644 (file)
--- 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é';

diff --git a/view/it/netfriend.tpl b/view/it/netfriend.tpl
deleted file mode 100644 (file)
index d1cdf1a..0000000
--- a/view/it/netfriend.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="intro-approve-as-friend-desc">Approva come: </div>
-
-<div class="intro-approve-as-friend-wrapper">
-       <label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">Amico</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/Ammiratore</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/it/strings.php b/view/it/strings.php
index d04e021675875cbd535695284c614d340f14183e..2b4a84d052802b2d11e025315d930e86a96f7821 100644 (file)
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -236,6 +236,9 @@ $a->strings['Hide Ignored Requests'] = 'Nascondi richieste ignorate';
 $a->strings['Claims to be known to you: '] = 'Dice di conoscerti: ';
 $a->strings['yes'] = 'si';
 $a->strings['no'] = 'no';
+$a->strings['Approve as: '] = 'Approva come: ';
+$a->strings['Friend'] = 'Amico';
+$a->strings['Fan/Admirer'] = 'Fan/Admiratore';
 $a->strings['Notification type: '] = 'Tipo di notifica: ';
 $a->strings['Friend/Connect Request'] = 'Richiesta Amicizia/Connessione';
 $a->strings['New Follower'] = 'Nuovo Seguace';

diff --git a/view/netfriend.tpl b/view/netfriend.tpl
new file mode 100644 (file)
index 0000000..c2a92ce
--- /dev/null
+++ b/view/netfriend.tpl
@@ -0,0 +1,14 @@
+<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">$as_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">$as_fan</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>