Merge branch '0.9.x' into 1.0.x
Conflicts: actions/confirmaddress.php actions/emailsettings.php actions/hostmeta.php actions/imsettings.php actions/login.php actions/profilesettings.php actions/showgroup.php actions/smssettings.php actions/urlsettings.php actions/userauthorization.php actions/userdesignsettings.php classes/Memcached_DataObject.php index.php lib/accountsettingsaction.php lib/action.php lib/common.php lib/connectsettingsaction.php lib/designsettings.php lib/personalgroupnav.php lib/profileaction.php lib/userprofile.php plugins/ClientSideShorten/ClientSideShortenPlugin.php plugins/Facebook/FBConnectSettings.php plugins/Facebook/FacebookPlugin.php plugins/NewMenu/NewMenuPlugin.php plugins/NewMenu/newmenu.css
This commit is contained in:
Zach Copley
@@ -121,12 +121,12 @@ class UserFlagPlugin extends Plugin
|
||||
/**
|
||||
* Add a 'flag' button to profile page
|
||||
*
|
||||
* @param Action &$action The action being called
|
||||
* @param Action $action The action being called
|
||||
* @param Profile $profile Profile being shown
|
||||
*
|
||||
* @return boolean hook result
|
||||
*/
|
||||
function onEndProfilePageActionsElements(&$action, $profile)
|
||||
function onEndProfilePageActionsElements($action, $profile)
|
||||
{
|
||||
$this->showFlagButton($action, $profile,
|
||||
array('action' => 'showstream',
|
||||
|
||||
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
|
||||
"POT-Creation-Date: 2011-01-29 21:45+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 - UserFlag\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
|
||||
"PO-Revision-Date: 2010-12-16 15:13:12+0000\n"
|
||||
"POT-Creation-Date: 2011-01-14 10:29+0000\n"
|
||||
"PO-Revision-Date: 2011-01-14 10:34:16+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-07 21:20:38+0000\n"
|
||||
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
|
||||
"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
|
||||
"X-Generator: MediaWiki 1.18alpha (r80246); 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-userflag\n"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Translation of StatusNet - UserFlag to Catalan (Català)
|
||||
# Expored from translatewiki.net
|
||||
# Exported from translatewiki.net
|
||||
#
|
||||
# Author: Toniher
|
||||
# --
|
||||
@@ -9,13 +9,13 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: StatusNet - UserFlag\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
|
||||
"PO-Revision-Date: 2010-12-16 15:13:12+0000\n"
|
||||
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
|
||||
"PO-Revision-Date: 2011-01-29 21:51:38+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: 2010-11-07 21:20:38+0000\n"
|
||||
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
|
||||
"X-POT-Import-Date: 2011-01-14 13:22:21+0000\n"
|
||||
"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
|
||||
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
|
||||
"X-Language-Code: ca\n"
|
||||
"X-Message-Group: #out-statusnet-plugin-userflag\n"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Translation of StatusNet - UserFlag to French (Français)
|
||||
# Expored from translatewiki.net
|
||||
# Exported from translatewiki.net
|
||||
#
|
||||
# Author: Peter17
|
||||
# --
|
||||
@@ -9,13 +9,13 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: StatusNet - UserFlag\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
|
||||
"PO-Revision-Date: 2010-12-16 15:13:12+0000\n"
|
||||
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
|
||||
"PO-Revision-Date: 2011-01-29 21:51:38+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: 2010-11-07 21:20:38+0000\n"
|
||||
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
|
||||
"X-POT-Import-Date: 2011-01-14 13:22:21+0000\n"
|
||||
"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
|
||||
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
|
||||
"X-Language-Code: fr\n"
|
||||
"X-Message-Group: #out-statusnet-plugin-userflag\n"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Translation of StatusNet - UserFlag to Interlingua (Interlingua)
|
||||
# Expored from translatewiki.net
|
||||
# Exported from translatewiki.net
|
||||
#
|
||||
# Author: McDutchie
|
||||
# --
|
||||
@@ -9,13 +9,13 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: StatusNet - UserFlag\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
|
||||
"PO-Revision-Date: 2010-12-16 15:13:12+0000\n"
|
||||
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
|
||||
"PO-Revision-Date: 2011-01-29 21:51:38+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: 2010-11-07 21:20:38+0000\n"
|
||||
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
|
||||
"X-POT-Import-Date: 2011-01-14 13:22:21+0000\n"
|
||||
"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
|
||||
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
|
||||
"X-Language-Code: ia\n"
|
||||
"X-Message-Group: #out-statusnet-plugin-userflag\n"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Translation of StatusNet - UserFlag to Macedonian (Македонски)
|
||||
# Expored from translatewiki.net
|
||||
# Exported from translatewiki.net
|
||||
#
|
||||
# Author: Bjankuloski06
|
||||
# --
|
||||
@@ -9,13 +9,13 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: StatusNet - UserFlag\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
|
||||
"PO-Revision-Date: 2010-12-16 15:13:12+0000\n"
|
||||
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
|
||||
"PO-Revision-Date: 2011-01-29 21:51:38+0000\n"
|
||||
"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-POT-Import-Date: 2010-11-07 21:20:38+0000\n"
|
||||
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
|
||||
"X-POT-Import-Date: 2011-01-14 13:22:21+0000\n"
|
||||
"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
|
||||
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
|
||||
"X-Language-Code: mk\n"
|
||||
"X-Message-Group: #out-statusnet-plugin-userflag\n"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Translation of StatusNet - UserFlag to Dutch (Nederlands)
|
||||
# Expored from translatewiki.net
|
||||
# Exported from translatewiki.net
|
||||
#
|
||||
# Author: Siebrand
|
||||
# --
|
||||
@@ -9,13 +9,13 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: StatusNet - UserFlag\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
|
||||
"PO-Revision-Date: 2010-12-16 15:13:12+0000\n"
|
||||
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
|
||||
"PO-Revision-Date: 2011-01-29 21:51:38+0000\n"
|
||||
"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-POT-Import-Date: 2010-11-07 21:20:38+0000\n"
|
||||
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
|
||||
"X-POT-Import-Date: 2011-01-14 13:22:21+0000\n"
|
||||
"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
|
||||
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
|
||||
"X-Language-Code: nl\n"
|
||||
"X-Message-Group: #out-statusnet-plugin-userflag\n"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Translation of StatusNet - UserFlag to Portuguese (Português)
|
||||
# Expored from translatewiki.net
|
||||
# Exported from translatewiki.net
|
||||
#
|
||||
# Author: GTNS
|
||||
# --
|
||||
@@ -9,13 +9,13 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: StatusNet - UserFlag\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
|
||||
"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
|
||||
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
|
||||
"PO-Revision-Date: 2011-01-29 21:51:38+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: 2010-11-07 21:20:38+0000\n"
|
||||
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
|
||||
"X-POT-Import-Date: 2011-01-14 13:22:21+0000\n"
|
||||
"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
|
||||
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
|
||||
"X-Language-Code: pt\n"
|
||||
"X-Message-Group: #out-statusnet-plugin-userflag\n"
|
||||
|
||||
112
plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po
Normal file
112
plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po
Normal file
@@ -0,0 +1,112 @@
|
||||
# Translation of StatusNet - UserFlag to Russian (Русский)
|
||||
# Exported from translatewiki.net
|
||||
#
|
||||
# Author: Byulent
|
||||
# --
|
||||
# This file is distributed under the same license as the StatusNet package.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: StatusNet - UserFlag\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
|
||||
"PO-Revision-Date: 2011-01-29 21:51:38+0000\n"
|
||||
"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-POT-Import-Date: 2011-01-14 13:22:21+0000\n"
|
||||
"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
|
||||
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
|
||||
"X-Language-Code: ru\n"
|
||||
"X-Message-Group: #out-statusnet-plugin-userflag\n"
|
||||
"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
|
||||
"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
|
||||
|
||||
#. TRANS: Title for page with a list of profiles that were flagged for review.
|
||||
#: adminprofileflag.php:125
|
||||
msgid "Flagged profiles"
|
||||
msgstr "Отмеченные профили"
|
||||
|
||||
#. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...).
|
||||
#: adminprofileflag.php:242
|
||||
msgid "Moderate"
|
||||
msgstr "Модерировать"
|
||||
|
||||
#. TRANS: Message displayed on a profile if it has been flagged.
|
||||
#. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
|
||||
#. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
|
||||
#: adminprofileflag.php:388
|
||||
#, php-format
|
||||
msgid "Flagged by %1$s and %2$d other"
|
||||
msgid_plural "Flagged by %1$s and %2$d others"
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
msgstr[2] ""
|
||||
|
||||
#. TRANS: Message displayed on a profile if it has been flagged.
|
||||
#. TRANS: %s is a comma separated list of at most 5 user nicknames that flagged.
|
||||
#: adminprofileflag.php:392
|
||||
#, php-format
|
||||
msgid "Flagged by %s"
|
||||
msgstr "Отмечено %s"
|
||||
|
||||
#. TRANS: AJAX form title for a flagged profile.
|
||||
#: flagprofile.php:125
|
||||
msgid "Flagged for review"
|
||||
msgstr "Помечен для просмотра"
|
||||
|
||||
#. TRANS: Body text for AJAX form when a profile has been flagged for review.
|
||||
#. TRANS: Message added to a profile if it has been flagged for review.
|
||||
#: flagprofile.php:129 UserFlagPlugin.php:173
|
||||
msgid "Flagged"
|
||||
msgstr "Отмеченные"
|
||||
|
||||
#. TRANS: Plugin description.
|
||||
#: UserFlagPlugin.php:294
|
||||
msgid ""
|
||||
"This plugin allows flagging of profiles for review and reviewing flagged "
|
||||
"profiles."
|
||||
msgstr ""
|
||||
"Этот плагин позволяет отмечать профили для осмотра и просматривать "
|
||||
"отмеченные профили."
|
||||
|
||||
#. TRANS: Server exception given when flags could not be cleared.
|
||||
#: clearflag.php:105
|
||||
#, php-format
|
||||
msgid "Couldn't clear flags for profile \"%s\"."
|
||||
msgstr "Не снимать отметки для профиля %s"
|
||||
|
||||
#. TRANS: Title for AJAX form to indicated that flags were removed.
|
||||
#: clearflag.php:129
|
||||
msgid "Flags cleared"
|
||||
msgstr "Отметки сняты"
|
||||
|
||||
#. TRANS: Body element for "flags cleared" form.
|
||||
#: clearflag.php:133
|
||||
msgid "Cleared"
|
||||
msgstr "Снято"
|
||||
|
||||
#. TRANS: Form title for flagging a profile for review.
|
||||
#: flagprofileform.php:78
|
||||
msgid "Flag"
|
||||
msgstr "Отметить"
|
||||
|
||||
#. TRANS: Form description.
|
||||
#: flagprofileform.php:89
|
||||
msgid "Flag profile for review."
|
||||
msgstr "Профиль помечен для просмотра"
|
||||
|
||||
#. TRANS: Server exception.
|
||||
#: User_flag_profile.php:160
|
||||
#, php-format
|
||||
msgid "Couldn't flag profile \"%d\" for review."
|
||||
msgstr "Невозможно отметить профиль %d для просмотра."
|
||||
|
||||
#. TRANS: Form title for action on a profile.
|
||||
#: clearflagform.php:76
|
||||
msgid "Clear"
|
||||
msgstr "Очистить"
|
||||
|
||||
#: clearflagform.php:88
|
||||
msgid "Clear all flags"
|
||||
msgstr "Очистить все флаги"
|
||||
@@ -1,5 +1,5 @@
|
||||
# Translation of StatusNet - UserFlag to Ukrainian (Українська)
|
||||
# Expored from translatewiki.net
|
||||
# Exported from translatewiki.net
|
||||
#
|
||||
# Author: Boogie
|
||||
# --
|
||||
@@ -9,13 +9,13 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: StatusNet - UserFlag\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
|
||||
"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
|
||||
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
|
||||
"PO-Revision-Date: 2011-01-29 21:51:38+0000\n"
|
||||
"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-POT-Import-Date: 2010-11-07 21:20:38+0000\n"
|
||||
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
|
||||
"X-POT-Import-Date: 2011-01-14 13:22:21+0000\n"
|
||||
"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
|
||||
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
|
||||
"X-Language-Code: uk\n"
|
||||
"X-Message-Group: #out-statusnet-plugin-userflag\n"
|
||||
|
||||
Reference in New Issue
Block a user