diff options
| author | friendica <info@friendica.com> | 2013-12-22 13:51:08 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-22 13:51:08 -0800 |
| commit | 42361588e9f8ad5a110406a11fd23e7a719c5bd4 (patch) | |
| tree | 8b0ada0fe0b3a165547dc9efe6ae8116ecd244e8 /include/conversation.php | |
| parent | 77fdb4a1eee6d7e2d3b0d3d50896a0100eccf373 (diff) | |
| parent | 30219b5bda724375c10006c33e5754d3f5d1d044 (diff) | |
| download | volse-hubzilla-42361588e9f8ad5a110406a11fd23e7a719c5bd4.tar.gz volse-hubzilla-42361588e9f8ad5a110406a11fd23e7a719c5bd4.tar.bz2 volse-hubzilla-42361588e9f8ad5a110406a11fd23e7a719c5bd4.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php index 0bb13a17e..d602174b0 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1142,6 +1142,8 @@ function status_editor($a,$x,$popup=false) { '$feature_encrypt' => ((feature_enabled($x['profile_uid'],'content_encrypt') && (! $webpage)) ? 'block' : 'none'), '$encrypt' => t('Encrypt text'), '$cipher' => $cipher, + '$expiryModalOK' => t('OK'), + '$expiryModalCANCEL' => t('Cancel'), )); |