diff options
| author | friendica <info@friendica.com> | 2014-02-20 15:26:17 +1100 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-02-20 15:26:17 +1100 |
| commit | c219451702b2e20c100c8b2a32f4dd1f42e82768 (patch) | |
| tree | 793e2eb49387c4a371229cc70f18c2c3df95485c /mod | |
| parent | a29b71547a1ceb12d77617d9b06ba074c1793755 (diff) | |
| parent | 9715176a56c0b8127e9c5045d26d13402c072ff8 (diff) | |
| download | volse-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
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/settings.php | 2 |
1 files changed, 1 insertions, 1 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, )); |