Merge pull request #324 from tonybaldwin/master

Do not view remote profiles in frames. (changed description for display->settings), in ALL relevant files

4 files changed, 4 insertions, 4 deletions

diff --git a/view/de/messages.po b/view/de/messages.po
index 7acbdcdd2..f98726f4d 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -5994,7 +5994,7 @@ msgid "Don't show emoticons"
 msgstr "Emoticons nicht zeigen"
 
 #: ../../mod/settings.php:761
-msgid "View remote profiles as webpages"
+msgid "Do not view remote profiles in frames"
 msgstr ""
 
 #: ../../mod/settings.php:761
diff --git a/view/de/strings.php b/view/de/strings.php
index ac1abc8f7..4001d78be 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -1410,7 +1410,7 @@ $a->strings["Minimum of 10 seconds, no maximum"] = "Minimum 10 Sekunden, kein Ma
 $a->strings["Maximum number of conversations to load at any time:"] = "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:";
 $a->strings["Maximum of 100 items"] = "Maximum: 100 Beiträge";
 $a->strings["Don't show emoticons"] = "Emoticons nicht zeigen";
-$a->strings["View remote profiles as webpages"] = "";
+$a->strings["Do not view remote profiles in frames"] = "";
 $a->strings["By default open in a sub-window of your own site"] = "";
 $a->strings["Nobody except yourself"] = "Niemand außer Dir selbst";
 $a->strings["Only those you specifically allow"] = "Nur die, denen Du es explizit erlaubst";
diff --git a/view/it/messages.po b/view/it/messages.po
index 6d05e46dd..98d531562 100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -5988,7 +5988,7 @@ msgid "Don't show emoticons"
 msgstr "Non mostrare le emoticons"
 
 #: ../../mod/settings.php:761
-msgid "View remote profiles as webpages"
+msgid "Do not view remote profiles in frames"
 msgstr "Visualizza gli altri profili come normali pagine web"
 
 #: ../../mod/settings.php:761
diff --git a/view/it/strings.php b/view/it/strings.php
index 060273ef2..42b91f2fa 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -1410,7 +1410,7 @@ $a->strings["Minimum of 10 seconds, no maximum"] = "Minimo 10 secondi, nessun li
 $a->strings["Maximum number of conversations to load at any time:"] = "Massimo numero di conversazioni da mostrare ogni volta:";
 $a->strings["Maximum of 100 items"] = "Massimo 100";
 $a->strings["Don't show emoticons"] = "Non mostrare le emoticons";
-$a->strings["View remote profiles as webpages"] = "Visualizza gli altri profili come normali pagine web";
+$a->strings["Do not view remote profiles in frames"] = "Visualizza gli altri profili come normali pagine web";
 $a->strings["By default open in a sub-window of your own site"] = "Se non selezionato, i profili degli altri utenti sono mostrati dentro un riquadro nella pagina";
 $a->strings["Nobody except yourself"] = "Nessuno tranne te";
 $a->strings["Only those you specifically allow"] = "Solo chi riceve il mio permesso";