Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
This commit is contained in:
commit
c6d4612f49
@ -5,6 +5,6 @@
|
|||||||
* Pause ~ retain up to 50-100 most recent notices
|
* Pause ~ retain up to 50-100 most recent notices
|
||||||
* Add geo data
|
* Add geo data
|
||||||
* Make it work for Conversation page (perhaps a little tricky)
|
* Make it work for Conversation page (perhaps a little tricky)
|
||||||
* IE is updating the counter in document title all the time (Not sure if this is still an issue)
|
* IE is updating the counter in document title all the time (Not sure if this
|
||||||
|
is still an issue)
|
||||||
* Reconsider the timestamp approach
|
* Reconsider the timestamp approach
|
||||||
|
|
||||||
|
@ -43,7 +43,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
|
|||||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||||
* @link http://status.net/
|
* @link http://status.net/
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class RealtimePlugin extends Plugin
|
class RealtimePlugin extends Plugin
|
||||||
{
|
{
|
||||||
protected $replyurl = null;
|
protected $replyurl = null;
|
||||||
|
53
plugins/Realtime/locale/Realtime.pot
Normal file
53
plugins/Realtime/locale/Realtime.pot
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
# SOME DESCRIPTIVE TITLE.
|
||||||
|
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||||
|
# This file is distributed under the same license as the PACKAGE package.
|
||||||
|
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||||
|
#
|
||||||
|
#, fuzzy
|
||||||
|
msgid ""
|
||||||
|
msgstr ""
|
||||||
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
"POT-Creation-Date: 2010-11-02 19:46+0000\n"
|
||||||
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
"Content-Type: text/plain; charset=CHARSET\n"
|
||||||
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
|
||||||
|
#. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
|
||||||
|
#: RealtimePlugin.php:339
|
||||||
|
msgctxt "BUTTON"
|
||||||
|
msgid "Play"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#. TRANS: Tooltip for realtime view "play" button.
|
||||||
|
#: RealtimePlugin.php:341
|
||||||
|
msgctxt "TOOLTIP"
|
||||||
|
msgid "Play"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#. TRANS: Text label for realtime view "pause" button
|
||||||
|
#: RealtimePlugin.php:343
|
||||||
|
msgctxt "BUTTON"
|
||||||
|
msgid "Pause"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#. TRANS: Tooltip for realtime view "pause" button
|
||||||
|
#: RealtimePlugin.php:345
|
||||||
|
msgctxt "TOOLTIP"
|
||||||
|
msgid "Pause"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
|
||||||
|
#: RealtimePlugin.php:347
|
||||||
|
msgctxt "BUTTON"
|
||||||
|
msgid "Pop up"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#. TRANS: Tooltip for realtime view "popup" button.
|
||||||
|
#: RealtimePlugin.php:349
|
||||||
|
msgctxt "TOOLTIP"
|
||||||
|
msgid "Pop up in a window"
|
||||||
|
msgstr ""
|
@ -35,7 +35,6 @@ width:70%;
|
|||||||
margin-left:1%;
|
margin-left:1%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#notices_primary {
|
#notices_primary {
|
||||||
position:relative;
|
position:relative;
|
||||||
}
|
}
|
||||||
@ -75,4 +74,3 @@ line-height:1.2;
|
|||||||
#showstream #notices_primary {
|
#showstream #notices_primary {
|
||||||
margin-top: 18px;
|
margin-top: 18px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user