diff options
author | Brion Vibber <brion@pobox.com> | 2010-12-07 10:50:05 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-12-07 10:50:05 -0800 |
commit | 9df856e667a12cd217576263efbc72fff12692d9 (patch) | |
tree | dc8d588e8b01d1ec788c78d6aec10a9b9d26bec6 /plugins/Meteor | |
parent | 01f32e3998b8d031d2a39e2d0506253142b6632e (diff) | |
parent | 4b4b763255ad3b2bff8f18da2bd3927b52a54e55 (diff) |
Merge branch '0.9.x' into merge
Conflicts:
README
actions/hostmeta.php
classes/File_redirection.php
lib/common.php
lib/designsettings.php
lib/router.php
lib/util.php
lib/xmppmanager.php
plugins/OStatus/OStatusPlugin.php
Diffstat (limited to 'plugins/Meteor')
-rw-r--r-- | plugins/Meteor/MeteorPlugin.php | 2 | ||||
-rw-r--r-- | plugins/Meteor/locale/br/LC_MESSAGES/Meteor.po | 38 | ||||
-rw-r--r-- | plugins/Meteor/locale/de/LC_MESSAGES/Meteor.po | 38 | ||||
-rw-r--r-- | plugins/Meteor/meteorupdater.min.js | 1 |
4 files changed, 78 insertions, 1 deletions
diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php index a48c52b56..1bdccae7a 100644 --- a/plugins/Meteor/MeteorPlugin.php +++ b/plugins/Meteor/MeteorPlugin.php @@ -89,7 +89,7 @@ class MeteorPlugin extends RealtimePlugin { $scripts = parent::_getScripts(); $scripts[] = 'http://'.$this->webserver.(($this->webport == 80) ? '':':'.$this->webport).'/meteor.js'; - $scripts[] = common_path('plugins/Meteor/meteorupdater.js'); + $scripts[] = common_path('plugins/Meteor/meteorupdater.min.js'); return $scripts; } diff --git a/plugins/Meteor/locale/br/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/br/LC_MESSAGES/Meteor.po new file mode 100644 index 000000000..3a18c2f91 --- /dev/null +++ b/plugins/Meteor/locale/br/LC_MESSAGES/Meteor.po @@ -0,0 +1,38 @@ +# Translation of StatusNet - Meteor to Breton (Brezhoneg) +# Expored from translatewiki.net +# +# Author: Y-M D +# -- +# This file is distributed under the same license as the StatusNet package. +# +msgid "" +msgstr "" +"Project-Id-Version: StatusNet - Meteor\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-11-30 20:16+0000\n" +"PO-Revision-Date: 2010-11-30 20:19:21+0000\n" +"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-POT-Import-Date: 2010-11-29 19:44:18+0000\n" +"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n" +"X-Translation-Project: translatewiki.net at http://translatewiki.net\n" +"X-Language-Code: br\n" +"X-Message-Group: #out-statusnet-plugin-meteor\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. TRANS: Exception. %1$s is the control server, %2$s is the control port. +#: MeteorPlugin.php:115 +#, php-format +msgid "Couldn't connect to %1$s on %2$s." +msgstr "Dibosupl eo kevreañ ouzh %1$s war %2$s." + +#. TRANS: Exception. %s is the Meteor message that could not be added. +#: MeteorPlugin.php:128 +#, php-format +msgid "Error adding meteor message \"%s\"" +msgstr "" + +#: MeteorPlugin.php:158 +msgid "Plugin to do \"real time\" updates using Comet/Bayeux." +msgstr "" diff --git a/plugins/Meteor/locale/de/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/de/LC_MESSAGES/Meteor.po new file mode 100644 index 000000000..1eeb0372c --- /dev/null +++ b/plugins/Meteor/locale/de/LC_MESSAGES/Meteor.po @@ -0,0 +1,38 @@ +# Translation of StatusNet - Meteor to German (Deutsch) +# Expored from translatewiki.net +# +# Author: The Evil IP address +# -- +# This file is distributed under the same license as the StatusNet package. +# +msgid "" +msgstr "" +"Project-Id-Version: StatusNet - Meteor\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-11-29 15:37+0000\n" +"PO-Revision-Date: 2010-11-29 15:41:33+0000\n" +"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-POT-Import-Date: 2010-10-29 16:12:54+0000\n" +"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n" +"X-Translation-Project: translatewiki.net at http://translatewiki.net\n" +"X-Language-Code: de\n" +"X-Message-Group: #out-statusnet-plugin-meteor\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. TRANS: Exception. %1$s is the control server, %2$s is the control port. +#: MeteorPlugin.php:115 +#, php-format +msgid "Couldn't connect to %1$s on %2$s." +msgstr "Konnte nicht mit %1$s auf %2$s verbinden." + +#. TRANS: Exception. %s is the Meteor message that could not be added. +#: MeteorPlugin.php:128 +#, php-format +msgid "Error adding meteor message \"%s\"" +msgstr "Fehler beim Hinzufügen der Meteor-Nachricht „%s“" + +#: MeteorPlugin.php:158 +msgid "Plugin to do \"real time\" updates using Comet/Bayeux." +msgstr "Plugin für Echtzeit-Aktualisierungen mit Comet/Bayeux." diff --git a/plugins/Meteor/meteorupdater.min.js b/plugins/Meteor/meteorupdater.min.js new file mode 100644 index 000000000..61928ab4f --- /dev/null +++ b/plugins/Meteor/meteorupdater.min.js @@ -0,0 +1 @@ +var MeteorUpdater=function(){return{init:function(c,a,b){Meteor.callbacks.process=function(d){RealtimeUpdate.receive(JSON.parse(d))};Meteor.host=c;Meteor.port=a;Meteor.joinChannel(b,0);Meteor.connect()}}}();
\ No newline at end of file |