aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-10-11 18:24:37 -0700
committerFriendika <info@friendika.com>2011-10-11 18:24:37 -0700
commit557a7d0cec31a36d12898429c479c71671833dfd (patch)
treeab1781533e91b63b86a2ef726c65092ad8009efb /include/conversation.php
parentcaf18164f0f7bd336e61d4393dabf6d93c739879 (diff)
downloadvolse-hubzilla-557a7d0cec31a36d12898429c479c71671833dfd.tar.gz
volse-hubzilla-557a7d0cec31a36d12898429c479c71671833dfd.tar.bz2
volse-hubzilla-557a7d0cec31a36d12898429c479c71671833dfd.zip
stuff
- background the external network notifications (Facebook, Twitter, Statusnet) - add vimeo support - consolidate editor video options (insert video, regardless of source) - add "Connector Settings" page purely for configuring connectors - moved mailbox settings to Connectors - Move the "Connect/Follow" dialogue out of "find people" and move to top. - Add "Find People" dialogue - minor theme edits on duepuntozero and testbubble to make all this stuff work - A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos.
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php10
1 files changed, 4 insertions, 6 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 18f6d080b..29fa77902 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -745,9 +745,8 @@ function status_editor($a,$x, $notes_cid = 0) {
'$nickname' => $x['nickname'],
'$ispublic' => t('Visible to <strong>everybody</strong>'),
'$linkurl' => t('Please enter a link URL:'),
- '$utubeurl' => t('Please enter a YouTube link:'),
- '$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"),
- '$audurl' => t("Please enter an audio\x28.ogg\x29 link/URL:"),
+ '$vidurl' => t("Please enter a video link/URL:"),
+ '$audurl' => t("Please enter an audio link/URL:"),
'$whereareu' => t('Where are you right now?'),
'$title' => t('Enter a title for this item')
));
@@ -795,9 +794,8 @@ function status_editor($a,$x, $notes_cid = 0) {
'$upload' => t('Upload photo'),
'$attach' => t('Attach file'),
'$weblink' => t('Insert web link'),
- '$youtube' => t('Insert YouTube video'),
- '$video' => t('Insert Vorbis [.ogg] video'),
- '$audio' => t('Insert Vorbis [.ogg] audio'),
+ '$video' => t('Insert video link'),
+ '$audio' => t('Insert audio link'),
'$setloc' => t('Set your location'),
'$noloc' => t('Clear browser location'),
'$title' => t('Set title'),