aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2012-03-22 14:56:23 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2012-03-22 14:56:23 +0100
commitd5a6e7b1767ebc337f31745984f1ce0904b77780 (patch)
tree29355722fb8a3e993884e852a254277c80e90de4 /include/conversation.php
parente193091dfe348c5430c3a303947dbe7a6eced374 (diff)
parent622b25df5f2d1ab21c9e23047bc0c98bfe72bad0 (diff)
downloadvolse-hubzilla-d5a6e7b1767ebc337f31745984f1ce0904b77780.tar.gz
volse-hubzilla-d5a6e7b1767ebc337f31745984f1ce0904b77780.tar.bz2
volse-hubzilla-d5a6e7b1767ebc337f31745984f1ce0904b77780.zip
Merge remote-tracking branch 'friendica/master'
Diffstat (limited to 'include/conversation.php')
-rwxr-xr-xinclude/conversation.php3
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?')
));