diff options
| author | zottel <github@zottel.net> | 2012-03-22 09:16:10 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-22 09:16:10 +0100 |
| commit | 3f3c4aec79bf3ceedd551bae7cec7acfd68e3772 (patch) | |
| tree | ae5af3e8b7dda429b744c70ea3fda111c30b15c3 /include/conversation.php | |
| parent | 88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e (diff) | |
| parent | 576eb6cc389d54c29b29b97d3c6d160e61bbf6ca (diff) | |
| download | volse-hubzilla-3f3c4aec79bf3ceedd551bae7cec7acfd68e3772.tar.gz volse-hubzilla-3f3c4aec79bf3ceedd551bae7cec7acfd68e3772.tar.bz2 volse-hubzilla-3f3c4aec79bf3ceedd551bae7cec7acfd68e3772.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/conversation.php')
| -rwxr-xr-x | include/conversation.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php index e9f024c27..5de4fcb51 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -897,8 +897,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$audurl' => t("Please enter an audio link/URL:"), '$term' => t('Tag term:'), '$fileas' => t('File as:'), - '$whereareu' => t('Where are you right now?'), - '$title' => t('Enter a title for this item') + '$whereareu' => t('Where are you right now?') )); |