aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2012-01-06 00:42:06 -0800
committerfabrixxm <fabrix.xm@gmail.com>2012-01-06 00:42:06 -0800
commitad02af4e8fe88566ea6255af3fabac6393b1c916 (patch)
treefe66ebfe8ea6a61e2da151766af733a44366c2ff /include/conversation.php
parentcfe8094b458c62cbab0b79dd957c31dbf60a26c4 (diff)
parenta5a6719283bd246e78427cff82aad951a3db310d (diff)
downloadvolse-hubzilla-ad02af4e8fe88566ea6255af3fabac6393b1c916.tar.gz
volse-hubzilla-ad02af4e8fe88566ea6255af3fabac6393b1c916.tar.bz2
volse-hubzilla-ad02af4e8fe88566ea6255af3fabac6393b1c916.zip
Merge pull request #23 from fabrixxm/master
Theme works
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php18
1 files changed, 12 insertions, 6 deletions
diff --git a/include/conversation.php b/include/conversation.php
index d4d6a5569..4a53060e3 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -813,8 +813,7 @@ function status_editor($a,$x, $notes_cid = 0) {
'$audurl' => t("Please enter an audio link/URL:"),
'$term' => t('Tag term:'),
'$whereareu' => t('Where are you right now?'),
- '$title' => t('Enter a title for this item'),
- '$addtitle' => t('click here to add a title')
+ '$title' => t('Enter a title for this item')
));
@@ -858,15 +857,24 @@ function status_editor($a,$x, $notes_cid = 0) {
'$action' => 'item',
'$share' => (($x['button']) ? $x['button'] : t('Share')),
'$upload' => t('Upload photo'),
+ '$shortupload' => t('upload photo'),
'$attach' => t('Attach file'),
+ '$shortattach' => t('attach file'),
'$weblink' => t('Insert web link'),
+ '$shortweblink' => t('web link'),
'$video' => t('Insert video link'),
+ '$shortvideo' => t('video link'),
'$audio' => t('Insert audio link'),
+ '$shortaudio' => t('audio link'),
'$setloc' => t('Set your location'),
+ '$shortsetloc' => t('set location'),
'$noloc' => t('Clear browser location'),
- '$title' => t('Set title'),
+ '$shortnoloc' => t('clear location'),
+ '$title' => "",
+ '$placeholdertitle' => t('Set title'),
'$wait' => t('Please wait'),
'$permset' => t('Permission settings'),
+ '$shortpermset' => t('permissions'),
'$ptyp' => (($notes_cid) ? 'note' : 'wall'),
'$content' => '',
'$post_id' => '',
@@ -882,8 +890,6 @@ function status_editor($a,$x, $notes_cid = 0) {
'$acl' => $x['acl'],
'$bang' => $x['bang'],
'$profile_uid' => $x['profile_uid'],
- '$addtitle' => t('click here to add a title')
-
));
return $o;
@@ -958,4 +964,4 @@ function find_thread_parent_index($arr,$x) {
if($v['id'] == $x['parent'])
return $k;
return false;
-} \ No newline at end of file
+}