Commit b5e1cf13 authored by Evan Prodromou's avatar Evan Prodromou

Merge branch '1.0.x'

parents a4ec8bb0 c2db2483

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -274,7 +274,7 @@ class ShowstreamAction extends ProfileAction
// TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
// TRANS: This message contains a Markdown link. Keep "](" together.
$m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
'based on the Free Software [StatusNet](http://status.net/) tool. '),
'based on the Free Software [StatusNet](http://status.net/) tool.'),
$this->user->nickname, $this->user->nickname);
}
$this->elementStart('div', array('id' => 'anon_notice'));
......
......@@ -171,14 +171,14 @@ class VersionAction extends Action
_('StatusNet is free software: you can redistribute it and/or modify '.
'it under the terms of the GNU Affero General Public License as published by '.
'the Free Software Foundation, either version 3 of the License, or '.
'(at your option) any later version. '));
'(at your option) any later version.'));
$this->element('p', null,
// TRANS: Content part of StatusNet version page.
_('This program is distributed in the hope that it will be useful, '.
'but WITHOUT ANY WARRANTY; without even the implied warranty of '.
'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the '.
'GNU Affero General Public License for more details. '));
'GNU Affero General Public License for more details.'));
$this->elementStart('p');
// TRANS: Content part of StatusNet version page.
......
......@@ -15,19 +15,20 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-10-10 13:38+0000\n"
"PO-Revision-Date: 2011-10-10 13:40:09+0000\n"
"POT-Creation-Date: 2011-10-28 14:08+0000\n"
"PO-Revision-Date: 2011-10-28 14:10:28+0000\n"
"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.19alpha (r99397); Translate extension (2011-10-07)\n"
"X-Generator: MediaWiki 1.19alpha (r101121); Translate extension (2011-10-"
"27)\n"
"X-Translation-Project: translatewiki.net at https://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
"99) ? 4 : 5 ) ) ) );\n"
"X-POT-Import-Date: 2011-09-27 23:26:51+0000\n"
"X-POT-Import-Date: 2011-10-10 14:22:23+0000\n"
#. TRANS: Database error message.
#, php-format
......@@ -9662,48 +9663,3 @@ msgstr ""
#, php-format
msgid "Getting backup from file '%s'."
msgstr ""
#~ msgid "Public list cloud"
#~ msgstr "سحابة اللائحات العمومية"
#~ msgid "These are largest lists on %s"
#~ msgstr "هذه هي أكبر اللائحات على %s"
#~ msgid "No one has [listed](%%doc.tags%%) anyone yet."
#~ msgstr "لم [يدرج](%%doc.tags%%) أحد أحدًا إلى الآن."
#~ msgid "Be the first to list someone!"
#~ msgstr "كن الأول من يشترك بلائحة أحد ما !"
#~ msgid ""
#~ "Why not [register an account](%%action.register%%) and be the first to "
#~ "list someone!"
#~ msgstr "لم لا [تسجل حسابا](%%action.register%%) وتكون أول من يدرج شخصا!"
#~ msgid "List cloud"
#~ msgstr "سحابة اللائحات"
#~ msgid "1 person listed"
#~ msgid_plural "%d people listed"
#~ msgstr[0] "لا أحد مدرج"
#~ msgstr[1] "شخص واحد مدرج"
#~ msgstr[2] "شخصان مدرجان"
#~ msgstr[3] "%d أشخاص مدرجون"
#~ msgstr[4] "%d شخصًا مدرجًا"
#~ msgstr[5] "%d شخص مدرج"
#~ msgid "All subscribers"
#~ msgstr "جميع المشتركين"
#~ msgctxt "MENU"
#~ msgid "Badge"
#~ msgstr "شارة"
#~ msgid "One person has repeated this notice."
#~ msgid_plural "%d people have repeated this notice."
#~ msgstr[0] "لم يكرر أحد هذا الإشعار"
#~ msgstr[1] "كرّر شخص واحد هذا الإشعار"
#~ msgstr[2] "كرّر شخصان هذا الإشعار"
#~ msgstr[3] "كرّر %d أشخاص هذا الإشعار"
#~ msgstr[4] "كرّر %d شخصًا هذا الإشعار"
#~ msgstr[5] "كرّر %d شخص هذا الإشعار"
This diff is collapsed.
......@@ -11,17 +11,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-10-10 13:38+0000\n"
"PO-Revision-Date: 2011-10-10 13:40:13+0000\n"
"POT-Creation-Date: 2011-10-28 14:08+0000\n"
"PO-Revision-Date: 2011-10-28 14:10:33+0000\n"
"Language-Team: Bulgarian <https://translatewiki.net/wiki/Portal:bg>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.19alpha (r99397); Translate extension (2011-10-07)\n"
"X-Generator: MediaWiki 1.19alpha (r101121); Translate extension (2011-10-"
"27)\n"
"X-Translation-Project: translatewiki.net at https://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-POT-Import-Date: 2011-09-27 23:26:51+0000\n"
"X-POT-Import-Date: 2011-10-10 14:22:23+0000\n"
#. TRANS: Database error message.
#, php-format
......@@ -9807,29 +9808,3 @@ msgstr ""
#, php-format
msgid "Getting backup from file '%s'."
msgstr ""
#, fuzzy
#~ msgid "Public list cloud"
#~ msgstr "Общ поток, страница %d"
#, fuzzy
#~ msgid "These are largest lists on %s"
#~ msgstr "Това са хората, които четат бележките на %s."
#, fuzzy
#~ msgid "List cloud"
#~ msgstr "Не е открит методът в API."
#~ msgid "All subscribers"
#~ msgstr "Всички абонати"
#, fuzzy
#~ msgctxt "MENU"
#~ msgid "Badge"
#~ msgstr "Табелка"
#, fuzzy
#~ msgid "One person has repeated this notice."
#~ msgid_plural "%d people have repeated this notice."
#~ msgstr[0] "Вече сте повторили тази бележка."
#~ msgstr[1] "Вече сте повторили тази бележка."
......@@ -12,17 +12,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-10-10 13:38+0000\n"
"PO-Revision-Date: 2011-10-10 13:40:15+0000\n"
"POT-Creation-Date: 2011-10-28 14:08+0000\n"
"PO-Revision-Date: 2011-10-28 14:10:35+0000\n"
"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.19alpha (r99397); Translate extension (2011-10-07)\n"
"X-Generator: MediaWiki 1.19alpha (r101121); Translate extension (2011-10-"
"27)\n"
"X-Translation-Project: translatewiki.net at https://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-POT-Import-Date: 2011-09-27 23:26:51+0000\n"
"X-POT-Import-Date: 2011-10-10 14:22:23+0000\n"
#. TRANS: Database error message.
#, php-format
......@@ -133,7 +134,7 @@ msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h. Mar plij adklaskit."
#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
msgid "Not logged in."
msgstr "Nann-kevreet."
msgstr "Digevreet."
#. TRANS: Client error displayed trying to perform an action related to a non-existing profile.
#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
......@@ -9670,40 +9671,3 @@ msgstr "XML direizh, mankout a ra ar wrizienn XRD."
#, php-format
msgid "Getting backup from file '%s'."
msgstr ""
#, fuzzy
#~ msgid "Public list cloud"
#~ msgstr "Koumoulenn a merkoù foran"
#, fuzzy
#~ msgid "These are largest lists on %s"
#~ msgstr "Ar merkoù ziwezhañ evit ar re vrudetañ war %s "
#, fuzzy
#~ msgid "Be the first to list someone!"
#~ msgstr "Bezit an hini gentañ oc'h embann unan !"
#, fuzzy
#~ msgid ""
#~ "Why not [register an account](%%action.register%%) and be the first to "
#~ "list someone!"
#~ msgstr ""
#~ "Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
#~ "gentañ da embann un dra !"
#, fuzzy
#~ msgid "List cloud"
#~ msgstr "N'eo ket bet kavet an implijer."
#~ msgid "All subscribers"
#~ msgstr "An holl goumananterien"
#~ msgctxt "MENU"
#~ msgid "Badge"
#~ msgstr "Badj"
#, fuzzy
#~ msgid "One person has repeated this notice."