Commit 8dbbee92 authored by Evan Prodromou's avatar Evan Prodromou

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

parents 1c87e32c e7662bb1
This diff is collapsed.
This diff is collapsed.
......@@ -295,7 +295,13 @@ class Action extends HTMLOutputter // lawsuit
}
if (Event::handle('StartShowStatusNetScripts', array($this)) &&
Event::handle('StartShowLaconicaScripts', array($this))) {
$this->script('util.min.js');
if (common_config('site', 'minify')) {
$this->script('util.min.js');
} else {
$this->script('util.js');
$this->script('xbImportNode.js');
$this->script('geometa.js');
}
$this->showScriptMessages();
// Frame-busting code to avoid clickjacking attacks.
$this->inlineScript('if (window.top !== window.self) { window.top.location.href = window.self.location.href; }');
......@@ -325,10 +331,10 @@ class Action extends HTMLOutputter // lawsuit
$messages['showmore_tooltip'] = _m('TOOLTIP', 'Show more');
// TRANS: Inline reply form submit button: submits a reply comment.
$messages['reply_submit'] = _m('BUTTON', 'Comment');
$messages['reply_submit'] = _m('BUTTON', 'Reply');
// TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
$messages['reply_comment'] = _m('Add a comment...');
$messages['reply_placeholder'] = _m('Write a reply...');
$messages = array_merge($messages, $this->getScriptMessages());
......
......@@ -63,6 +63,7 @@ $default =
'use_x_sendfile' => false,
'notice' => null, // site wide notice text
'build' => 1, // build number, for code-dependent cache
'minify' => true, // true to use the minified versions of JS files; false to use orig files. Can aid during development
),
'db' =>
array('database' => 'YOU HAVE TO SET THIS IN config.php',
......
......@@ -163,8 +163,7 @@ class MessageForm extends Form
if ($contentLimit > 0) {
$this->out->element('span',
array('id' => 'notice_text-count',
'class' => 'form_note'),
array('class' => 'count'),
$contentLimit);
}
}
......
......@@ -183,8 +183,7 @@ class NoticeForm extends Form
if ($contentLimit > 0) {
$this->out->element('span',
array('id' => 'notice_text-count',
'class' => 'form_note'),
array('class' => 'count'),
$contentLimit);
}
......
......@@ -267,7 +267,7 @@ class ThreadedNoticeListMoreItem extends NoticeListItem
$notice = new Notice();
$notice->conversation = $id;
$n = $notice->count() - 1;
$msg = sprintf(_m('Show all %d comment', 'Show all %d comments', $n), $n);
$msg = sprintf(_m('Show %d reply', 'Show all %d replies', $n), $n);
$this->out->element('a', array('href' => $url), $msg);
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"POT-Creation-Date: 2011-03-03 17:24+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"
......
# 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: 2011-03-03 17:24+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"
#: AccountManagerPlugin.php:112
msgid ""
"The Account Manager plugin implements the Account Manager specification."
msgstr ""
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"POT-Creation-Date: 2011-03-03 17:24+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"
......
# 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: 2011-03-03 17:24+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"
#: aimmanager.php:80
msgid "Send me a message to post a notice"
msgstr ""
#: AimPlugin.php:60
msgid "AIM"
msgstr ""
#: AimPlugin.php:165
msgid ""
"The AIM plugin allows users to send and receive notices over the AIM network."
msgstr ""
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"POT-Creation-Date: 2011-03-03 17:24+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"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"POT-Creation-Date: 2011-03-03 17:24+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"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"POT-Creation-Date: 2011-03-03 17:24+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"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"POT-Creation-Date: 2011-03-03 17:24+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"
......
# Translation of StatusNet - Awesomeness to Portuguese (Português)
# Exported from translatewiki.net
#
# Author: Waldir
# --
# This file is distributed under the same license as the StatusNet package.
#
msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Awesomeness\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-03 17:24+0000\n"
"PO-Revision-Date: 2011-03-03 17:26:39+0000\n"
"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-02-14 17:19:12+0000\n"
"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
"X-Message-Group: #out-statusnet-plugin-awesomeness\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: AwesomenessPlugin.php:56
msgid ""
"The Awesomeness plugin adds additional awesomeness to a StatusNet "
"installation."
msgstr ""
"O plugin de Espectacularidade adiciona espectacularidade adicional a uma "
"instalação de StatusNet."
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"POT-Creation-Date: 2011-03-03 17:24+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"
......@@ -16,20 +16,20 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: BitlyUrlPlugin.php:48
#: BitlyUrlPlugin.php:46
msgid "You must specify a serviceUrl for bit.ly shortening."
msgstr ""
#: BitlyUrlPlugin.php:175
#: BitlyUrlPlugin.php:173
#, php-format
msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
msgstr ""
#: BitlyUrlPlugin.php:216
#: BitlyUrlPlugin.php:214
msgid "bit.ly"
msgstr ""
#: BitlyUrlPlugin.php:217 bitlyadminpanelaction.php:54
#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
msgid "bit.ly URL shortening"
msgstr ""
......
......@@ -10,35 +10,35 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - BitlyUrl\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:20+0000\n"
"POT-Creation-Date: 2011-03-03 17:24+0000\n"
"PO-Revision-Date: 2011-03-03 17:26:40+0000\n"
"Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
"net/wiki/Portal:be-tarask>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"
"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: be-tarask\n"
"X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: BitlyUrlPlugin.php:48
#: BitlyUrlPlugin.php:46
msgid "You must specify a serviceUrl for bit.ly shortening."
msgstr "Вам неабходна пазначыць serviceUrl для сэрвісу скарачэньняў bit.ly."
#: BitlyUrlPlugin.php:175
#: BitlyUrlPlugin.php:173
#, php-format
msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
msgstr ""
"Выкарыстаньне сэрвісу скарачэньня URL-адрасоў <a href=\"http://%1$s/\">%1$s</"
"a>."
#: BitlyUrlPlugin.php:216
#: BitlyUrlPlugin.php:214
msgid "bit.ly"
msgstr "bit.ly"
#: BitlyUrlPlugin.php:217 bitlyadminpanelaction.php:54
#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
msgid "bit.ly URL shortening"
msgstr "Скарачэньне URL-адрасоў bit.ly"
......
......@@ -9,33 +9,33 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - BitlyUrl\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-02-17 10:25+0000\n"
"PO-Revision-Date: 2011-02-17 10:27:59+0000\n"
"POT-Creation-Date: 2011-03-03 17:24+0000\n"
"PO-Revision-Date: 2011-03-03 17:26:40+0000\n"
"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-01-29 22:19:24+0000\n"
"X-Generator: MediaWiki 1.18alpha (r82325); Translate extension (2011-02-01)\n"
"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: BitlyUrlPlugin.php:48
#: BitlyUrlPlugin.php:46
msgid "You must specify a serviceUrl for bit.ly shortening."
msgstr "Heu d'especificar un URL de servei per a l'escurçament de bit.ly"
#: BitlyUrlPlugin.php:175
#: BitlyUrlPlugin.php:173
#, php-format
msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
msgstr ""
"Fa servir el servei d'escurçament d'URL <a href=\"http://%1$s/\">%1$s</a>."
#: BitlyUrlPlugin.php:216
#: BitlyUrlPlugin.php:214
msgid "bit.ly"
msgstr "bit.ly"
#: BitlyUrlPlugin.php:217 bitlyadminpanelaction.php:54
#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
msgid "bit.ly URL shortening"
msgstr "Escurçament d'URL bit.ly"
......
......@@ -10,32 +10,32 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - BitlyUrl\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:20+0000\n"
"POT-Creation-Date: 2011-03-03 17:24+0000\n"
"PO-Revision-Date: 2011-03-03 17:26:40+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: 2011-01-14 13:18:31+0000\n"
"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2011-02-17 11:29:48+0000\n"
"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: BitlyUrlPlugin.php:48
#: BitlyUrlPlugin.php:46
msgid "You must specify a serviceUrl for bit.ly shortening."
msgstr "Du musst eine „serviceUrl“ zur bit.ly-URL-Kürzung angeben."
#: BitlyUrlPlugin.php:175
#: BitlyUrlPlugin.php:173
#, php-format
msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
msgstr "Benutzung des <a href=\"http://%1$s/\">%1$s</a>-URL-Kürzungsdienstes."
#: BitlyUrlPlugin.php:216
#: BitlyUrlPlugin.php:214
msgid "bit.ly"
msgstr "bit.ly"
#: BitlyUrlPlugin.php:217 bitlyadminpanelaction.php:54
#: BitlyUrlPlugin.php:215 bitlyadminpanelaction.php:54
msgid "bit.ly URL shortening"
msgstr "bit.ly-URL-Kürzung"
......
......@@ -9,34 +9,34 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - BitlyUrl\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:20+0000\n"
"POT-Creation-Date: 2011-03-03 17:24+0000\n"
"PO-Revision-Date: 2011-03-03 17:26:40+0000\n"
"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-01-14 13:18:31+0000\n"