We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 8104b1f7 authored by Evan Prodromou's avatar Evan Prodromou

Merge branch '1.0.x' into testing

parents 4989fc72 0ed9000f

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -145,7 +145,7 @@ class AllAction extends ProfileAction
$message .= sprintf(_('You can try to [nudge %1$s](../%2$s) from their profile or [post something to them](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
}
} else {
// TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
// TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
// TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
$message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to them.'), $this->user->nickname);
}
......
......@@ -293,7 +293,7 @@ class EditpeopletagAction extends Action
if (!$result) {
common_log_db_error($this->group, 'UPDATE', __FILE__);
// TRANS: TRANS: Server error displayed when updating a list fails.
// TRANS: Server error displayed when updating a list fails.
$this->serverError(_('Could not update list.'));
}
......
......@@ -295,6 +295,7 @@ class NewApplicationAction extends Action
$app->uploadLogo();
} catch (Exception $e) {
$app->query('ROLLBACK');
// TRANS: Form validation error messages displayed when uploading an invalid application logo.
$this->showForm(_('Invalid image.'));
return;
}
......
......@@ -175,7 +175,7 @@ class NewmessageAction extends Action
return;
} else if ($user->id == $this->other->id) {
// TRANS: Client error displayed trying to send a direct message to self.
$this->clientError(_('Don\'t send a message to yourself; ' .
$this->clientError(_('Do not send a message to yourself; ' .
'just say it to yourself quietly instead.'), 403);
return;
}
......
......@@ -629,7 +629,7 @@ class MessageCommand extends Command
return;
} else if ($this->user->id == $other->id) {
// TRANS: Error text shown when trying to send a direct message to self.
$channel->error($this->user, _('Don\'t send a message to yourself; just say it to yourself quietly instead.'));
$channel->error($this->user, _('Do not send a message to yourself; just say it to yourself quietly instead.'));
return;
}
$message = Message::saveNew($this->user->id, $other->id, $this->text, $channel->source());
......
......@@ -141,7 +141,7 @@ class MessageForm extends Form
unset($mutual_users);
if (count($mutual) == 1) {
// TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
// TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
$mutual[0] = _('No mutual subscribers.');
}
......
......@@ -192,8 +192,7 @@ class PluginListItem extends Widget
} else {
return array('name' => $this->plugin,
// TRANS: Plugin description for a disabled plugin.
'rawdescription' => _m('plugin-description',
'(Plugin descriptions unavailable when disabled.)'));
'rawdescription' => _m('plugin-description','(The plugin description is unavailable when a plugin has been disabled.)'));
}
}
......
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.
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-06-05 18:54+0000\n"
"POT-Creation-Date: 2011-06-18 15:54+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"
......
......@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - APC\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-05 18:54+0000\n"
"PO-Revision-Date: 2011-06-05 18:54:52+0000\n"
"POT-Creation-Date: 2011-06-18 15:54+0000\n"
"PO-Revision-Date: 2011-06-18 15:55:05+0000\n"
"Language-Team: Asturian <http://translatewiki.net/wiki/Portal:ast>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
"X-Generator: MediaWiki 1.19alpha (r89517); Translate extension (2011-06-02)\n"
"X-POT-Import-Date: 2011-06-05 21:49:10+0000\n"
"X-Generator: MediaWiki 1.19alpha (r90318); Translate extension (2011-06-02)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ast\n"
"X-Message-Group: #out-statusnet-plugin-apc\n"
......
......@@ -9,14 +9,14 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - APC\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-05 18:54+0000\n"
"PO-Revision-Date: 2011-06-05 18:54:52+0000\n"
"POT-Creation-Date: 2011-06-18 15:54+0000\n"
"PO-Revision-Date: 2011-06-18 15:55:05+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-04-13 13:56:51+0000\n"
"X-Generator: MediaWiki 1.19alpha (r89517); Translate extension (2011-06-02)\n"
"X-POT-Import-Date: 2011-06-05 21:49:10+0000\n"
"X-Generator: MediaWiki 1.19alpha (r90318); Translate extension (2011-06-02)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: be-tarask\n"
"X-Message-Group: #out-statusnet-plugin-apc\n"
......
......@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - APC\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-05 18:54+0000\n"
"PO-Revision-Date: 2011-06-05 18:54:52+0000\n"
"POT-Creation-Date: 2011-06-18 15:54+0000\n"
"PO-Revision-Date: 2011-06-18 15:55:05+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: 2011-04-13 13:56:51+0000\n"
"X-Generator: MediaWiki 1.19alpha (r89517); Translate extension (2011-06-02)\n"
"X-POT-Import-Date: 2011-06-05 21:49:10+0000\n"
"X-Generator: MediaWiki 1.19alpha (r90318); Translate extension (2011-06-02)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: #out-statusnet-plugin-apc\n"
......
......@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - APC\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-05 18:54+0000\n"
"PO-Revision-Date: 2011-06-05 18:54:52+0000\n"
"POT-Creation-Date: 2011-06-18 15:54+0000\n"
"PO-Revision-Date: 2011-06-18 15:55:05+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-04-13 13:56:51+0000\n"
"X-Generator: MediaWiki 1.19alpha (r89517); Translate extension (2011-06-02)\n"
"X-POT-Import-Date: 2011-06-05 21:49:10+0000\n"
"X-Generator: MediaWiki 1.19alpha (r90318); Translate extension (2011-06-02)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: #out-statusnet-plugin-apc\n"
......
......@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - APC\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-05 18:54+0000\n"
"PO-Revision-Date: 2011-06-05 18:54:52+0000\n"
"POT-Creation-Date: 2011-06-18 15:54+0000\n"
"PO-Revision-Date: 2011-06-18 15:55:06+0000\n"
"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
"X-Generator: MediaWiki 1.19alpha (r89517); Translate extension (2011-06-02)\n"
"X-POT-Import-Date: 2011-06-05 21:49:10+0000\n"
"X-Generator: MediaWiki 1.19alpha (r90318); Translate extension (2011-06-02)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: #out-statusnet-plugin-apc\n"
......
......@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - APC\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-05 18:54+0000\n"
"PO-Revision-Date: 2011-06-05 18:54:52+0000\n"
"POT-Creation-Date: 2011-06-18 15:54+0000\n"
"PO-Revision-Date: 2011-06-18 15:55:06+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-04-13 13:56:51+0000\n"
"X-Generator: MediaWiki 1.19alpha (r89517); Translate extension (2011-06-02)\n"
"X-POT-Import-Date: 2011-06-05 21:49:10+0000\n"
"X-Generator: MediaWiki 1.19alpha (r90318); Translate extension (2011-06-02)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: #out-statusnet-plugin-apc\n"
......
......@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - APC\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-05 18:54+0000\n"
"PO-Revision-Date: 2011-06-05 18:54:52+0000\n"
"POT-Creation-Date: 2011-06-18 15:54+0000\n"
"PO-Revision-Date: 2011-06-18 15:55:06+0000\n"
"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
"X-Generator: MediaWiki 1.19alpha (r89517); Translate extension (2011-06-02)\n"
"X-POT-Import-Date: 2011-06-05 21:49:10+0000\n"
"X-Generator: MediaWiki 1.19alpha (r90318); Translate extension (2011-06-02)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: gl\n"
"X-Message-Group: #out-statusnet-plugin-apc\n"
......
......@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - APC\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-05 18:54+0000\n"
"PO-Revision-Date: 2011-06-05 18:54:53+0000\n"
"POT-Creation-Date: 2011-06-18 15:54+0000\n"
"PO-Revision-Date: 2011-06-18 15:55:06+0000\n"
"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
"X-Generator: MediaWiki 1.19alpha (r89517); Translate extension (2011-06-02)\n"
"X-POT-Import-Date: 2011-06-05 21:49:10+0000\n"
"X-Generator: MediaWiki 1.19alpha (r90318); Translate extension (2011-06-02)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: he\n"
"X-Message-Group: #out-statusnet-plugin-apc\n"
......
......@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - APC\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-05 18:54+0000\n"
"PO-Revision-Date: 2011-06-05 18:54:53+0000\n"
"POT-Creation-Date: 2011-06-18 15:54+0000\n"
"PO-Revision-Date: 2011-06-18 15:55:06+0000\n"
"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
"X-Generator: MediaWiki 1.19alpha (r89517); Translate extension (2011-06-02)\n"
"X-POT-Import-Date: 2011-06-05 21:49:10+0000\n"
"X-Generator: MediaWiki 1.19alpha (r90318); Translate extension (2011-06-02)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: #out-statusnet-plugin-apc\n"
......
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-06-05 18:54+0000\n"
"POT-Creation-Date: 2011-06-18 15:54+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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment