diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-20 06:27:46 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-20 06:27:46 +0100 |
| commit | 22f6687f44c4fc6bc1938ea434a5c7a665a53127 (patch) | |
| tree | ff02d6830e37c1082afc8b957e0099dc56da9f19 /include | |
| parent | 059886a1e493451dffddb0fd863cb002930eae9b (diff) | |
| parent | e56633d5b0009fd5430a15fd09633e8f43bdb7dd (diff) | |
| download | volse-hubzilla-22f6687f44c4fc6bc1938ea434a5c7a665a53127.tar.gz volse-hubzilla-22f6687f44c4fc6bc1938ea434a5c7a665a53127.tar.bz2 volse-hubzilla-22f6687f44c4fc6bc1938ea434a5c7a665a53127.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rw-r--r-- | include/features.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index 57dc9d2a2..6cdbb878f 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -944,7 +944,7 @@ function item_photo_menu($item){ $menu = Array( t("View Source") => $vsrc_link, t("Follow Thread") => $sub_link, - t("Stop Following") => $unsub_link, + t("Unfollow Thread") => $unsub_link, t("View Status") => $status_link, t("View Profile") => $profile_link, t("View Photos") => $photos_link, diff --git a/include/features.php b/include/features.php index 74ae7b3d7..4e962b00e 100644 --- a/include/features.php +++ b/include/features.php @@ -60,6 +60,7 @@ function get_features() { array('content_encrypt', t('Even More Encryption'), t('Allow optional encryption of content end-to-end with a shared secret key'),false), array('consensus_tools', t('Enable Voting Tools'), t('Provide a class of post which others can vote on'),false), array('delayed_posting', t('Delayed Posting'), t('Allow posts to be published at a later date'),false), + array('suppress_duplicates', t('Suppress Duplicate Posts/Comments'), t('Prevent posts with identical content to be published with less than two minutes in between submissions.'),true), ), |