diff options
| author | Fabio Comuni <fabio@krik.localdomain> | 2012-01-02 15:32:37 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabio@krik.localdomain> | 2012-01-02 15:32:37 +0100 |
| commit | be2fd56aae51ee02b6e40dedd4383e1ebddc752e (patch) | |
| tree | 1795fb34e182f51b6adc4f05204cea45da4bca69 /include/conversation.php | |
| parent | 4b095665791424bd2f5c4c494a2d14ec6c07aeba (diff) | |
| parent | 0dce36bdbce7482329105e2c1ef4f3c8b3043803 (diff) | |
| download | volse-hubzilla-be2fd56aae51ee02b6e40dedd4383e1ebddc752e.tar.gz volse-hubzilla-be2fd56aae51ee02b6e40dedd4383e1ebddc752e.tar.bz2 volse-hubzilla-be2fd56aae51ee02b6e40dedd4383e1ebddc752e.zip | |
Merge branch 'master' of github.com:fabrixxm/friendica
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index fae57c565..f4dd01dde 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -856,13 +856,21 @@ 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'), '$ptyp' => (($notes_cid) ? 'note' : 'wall'), |