diff options
author | Michael Vogel <icarus@dabo.de> | 2012-04-02 22:00:22 +0200 |
---|---|---|
committer | Michael Vogel <icarus@dabo.de> | 2012-04-02 22:00:22 +0200 |
commit | 3dc317dcc62c8e982d964bcae421a1410771d51c (patch) | |
tree | 6e63f4e263a6637656ed24dfb5c36292d442c268 /include/conversation.php | |
parent | a39d8d3f02e5bbd711fde71594c2c787b21ef2e9 (diff) | |
parent | 6dfd55668f39d2cfb27d468cc982471abaad5165 (diff) | |
download | volse-hubzilla-3dc317dcc62c8e982d964bcae421a1410771d51c.tar.gz volse-hubzilla-3dc317dcc62c8e982d964bcae421a1410771d51c.tar.bz2 volse-hubzilla-3dc317dcc62c8e982d964bcae421a1410771d51c.zip |
Merge commit 'upstream/master'
Diffstat (limited to 'include/conversation.php')
-rwxr-xr-x | include/conversation.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php index 5a922b2b5..df92a40ed 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -974,6 +974,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$shortnoloc' => t('clear location'), '$title' => "", '$placeholdertitle' => t('Set title'), + '$category' => "", + '$placeholdercategory' => t('Categories (comma-separated list)'), '$wait' => t('Please wait'), '$permset' => t('Permission settings'), '$shortpermset' => t('permissions'), |