aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-20 15:26:17 +1100
committerfriendica <info@friendica.com>2014-02-20 15:26:17 +1100
commitc219451702b2e20c100c8b2a32f4dd1f42e82768 (patch)
tree793e2eb49387c4a371229cc70f18c2c3df95485c
parenta29b71547a1ceb12d77617d9b06ba074c1793755 (diff)
parent9715176a56c0b8127e9c5045d26d13402c072ff8 (diff)
downloadvolse-hubzilla-c219451702b2e20c100c8b2a32f4dd1f42e82768.tar.gz
volse-hubzilla-c219451702b2e20c100c8b2a32f4dd1f42e82768.tar.bz2
volse-hubzilla-c219451702b2e20c100c8b2a32f4dd1f42e82768.zip
Merge pull request #324 from tonybaldwin/master
Do not view remote profiles in frames. (changed description for display->settings), in ALL relevant files
-rw-r--r--mod/settings.php2
-rw-r--r--util/messages.po2
-rw-r--r--view/de/messages.po2
-rw-r--r--view/de/strings.php2
-rw-r--r--view/it/messages.po2
-rw-r--r--view/it/strings.php2
6 files changed, 6 insertions, 6 deletions
diff --git a/mod/settings.php b/mod/settings.php
index 6315e95f5..e9f4c9f8d 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -758,7 +758,7 @@ function settings_content(&$a) {
'$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')),
'$itemspage' => array('itemspage', t("Maximum number of conversations to load at any time:"), $itemspage, t('Maximum of 100 items')),
'$nosmile' => array('nosmile', t("Don't show emoticons"), $nosmile, ''),
- '$chanview_full' => array('chanview_full', t('View remote profiles as webpages'), $chanview, t('By default open in a sub-window of your own site')),
+ '$chanview_full' => array('chanview_full', t('Do not view remote profiles in frames'), $chanview, t('By default open in a sub-window of your own site')),
'$theme_config' => $theme_config,
));
diff --git a/util/messages.po b/util/messages.po
index 5b8249a48..da8ce5868 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -5979,7 +5979,7 @@ msgid "Don't show emoticons"
msgstr ""
#: ../../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/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";