Commit 482b80cb authored by Evan Prodromou's avatar Evan Prodromou

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

parents 2eed1e2a 3898500f

Too many changes to show.

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

......@@ -194,12 +194,12 @@ function _m($msg/*, ...*/)
function _mdomain($backtrace)
{
/*
0 =>
0 =>
array
'file' => string '/var/www/mublog/plugins/FeedSub/FeedSubPlugin.php' (length=49)
'line' => int 77
'function' => string '_m' (length=2)
'args' =>
'args' =>
array
0 => &string 'Feeds' (length=5)
*/
......@@ -293,7 +293,7 @@ function get_nice_language_list()
* Check whether a language is right-to-left
*
* @param string $lang language code of the language to check
*
*
* @return boolean true if language is rtl
*/
......@@ -318,6 +318,7 @@ function get_all_languages() {
'af' => array('q' => 0.8, 'lang' => 'af', 'name' => 'Afrikaans', 'direction' => 'ltr'),
'ar' => array('q' => 0.8, 'lang' => 'ar', 'name' => 'Arabic', 'direction' => 'rtl'),
'arz' => array('q' => 0.8, 'lang' => 'arz', 'name' => 'Egyptian Spoken Arabic', 'direction' => 'rtl'),
'be-tarask' => array('q' => 0.5, 'lang' => 'be-tarask', 'name' => 'Belarusian (Taraškievica orthography)', 'direction' => 'ltr'),
'bg' => array('q' => 0.8, 'lang' => 'bg', 'name' => 'Bulgarian', 'direction' => 'ltr'),
'br' => array('q' => 0.8, 'lang' => 'br', 'name' => 'Breton', 'direction' => 'ltr'),
'ca' => array('q' => 0.5, 'lang' => 'ca', 'name' => 'Catalan', 'direction' => 'ltr'),
......@@ -347,6 +348,7 @@ function get_all_languages() {
'ka' => array('q' => 0.8, 'lang' => 'ka', 'name' => 'Georgian', 'direction' => 'ltr'),
'ko' => array('q' => 0.9, 'lang' => 'ko', 'name' => 'Korean', 'direction' => 'ltr'),
'mk' => array('q' => 0.5, 'lang' => 'mk', 'name' => 'Macedonian', 'direction' => 'ltr'),
'ml' => array('q' => 0.5, 'lang' => 'ml', 'name' => 'Malayalam', 'direction' => 'ltr'),
'nb' => array('q' => 0.1, 'lang' => 'nb', 'name' => 'Norwegian (Bokmål)', 'direction' => 'ltr'),
'no' => array('q' => 0.1, 'lang' => 'nb', 'name' => 'Norwegian (Bokmål)', 'direction' => 'ltr'),
'nn' => array('q' => 1, 'lang' => 'nn', 'name' => 'Norwegian (Nynorsk)', 'direction' => 'ltr'),
......
......@@ -15,12 +15,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-04-15 12:10+0000\n"
"PO-Revision-Date: 2012-04-15 12:10:26+0000\n"
"POT-Creation-Date: 2012-04-21 10:18+0000\n"
"PO-Revision-Date: 2012-04-21 10:18: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.20alpha (27b39a6); Translate 2012-04-11\n"
"X-Generator: MediaWiki 1.20alpha (1f0a982); Translate 2012-04-11\n"
"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
"X-Language-Code: ar\n"
"X-Message-Group: #out-statusnet-core\n"
......@@ -8927,6 +8927,9 @@ msgstr "اخرج من الموقع."
msgid "Login to the site."
msgstr "لُج إلى الموقع."
msgid "This profile has been silenced by site moderators"
msgstr ""
#. TRANS: H2 text for user subscription statistics.
msgid "Following"
msgstr "يتابع"
......
......@@ -12,14 +12,14 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-04-15 12:10+0000\n"
"PO-Revision-Date: 2012-04-15 12:10:28+0000\n"
"POT-Creation-Date: 2012-04-21 10:18+0000\n"
"PO-Revision-Date: 2012-04-21 10:18:33+0000\n"
"Language-Team: Belarusian (Taraškievica orthography) <https://translatewiki."
"net/wiki/Portal:be-tarask>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2012-03-11 21:26:16+0000\n"
"X-Generator: MediaWiki 1.20alpha (27b39a6); Translate 2012-04-11\n"
"X-Generator: MediaWiki 1.20alpha (1f0a982); Translate 2012-04-11\n"
"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
"X-Language-Code: be-tarask\n"
"X-Message-Group: #out-statusnet-core\n"
......@@ -8897,6 +8897,9 @@ msgstr ""
msgid "Login to the site."
msgstr ""
msgid "This profile has been silenced by site moderators"
msgstr ""
#. TRANS: H2 text for user subscription statistics.
msgid "Following"
msgstr ""
......
......@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-04-15 12:10+0000\n"
"PO-Revision-Date: 2012-04-15 12:10:31+0000\n"
"POT-Creation-Date: 2012-04-21 10:18+0000\n"
"PO-Revision-Date: 2012-04-21 10:18:38+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.20alpha (27b39a6); Translate 2012-04-11\n"
"X-Generator: MediaWiki 1.20alpha (1f0a982); Translate 2012-04-11\n"
"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
"X-Language-Code: bg\n"
"X-Message-Group: #out-statusnet-core\n"
......@@ -9069,6 +9069,9 @@ msgstr "Излизане от сайта"
msgid "Login to the site."
msgstr "Влизане в сайта"
msgid "This profile has been silenced by site moderators"
msgstr ""
#. TRANS: H2 text for user subscription statistics.
#, fuzzy
msgid "Following"
......
......@@ -12,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-04-15 12:10+0000\n"
"PO-Revision-Date: 2012-04-15 12:10:34+0000\n"
"POT-Creation-Date: 2012-04-21 10:18+0000\n"
"PO-Revision-Date: 2012-04-21 10:18:41+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.20alpha (27b39a6); Translate 2012-04-11\n"
"X-Generator: MediaWiki 1.20alpha (1f0a982); Translate 2012-04-11\n"
"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
"X-Language-Code: br\n"
"X-Message-Group: #out-statusnet-core\n"
......@@ -8951,6 +8951,9 @@ msgstr "Digevreañ diouzh al lec'hienn."
msgid "Login to the site."
msgstr "Kevreañ d'al lec'hienn."
msgid "This profile has been silenced by site moderators"
msgstr ""
#. TRANS: H2 text for user subscription statistics.
msgid "Following"
msgstr "O Heuliañ"
......
......@@ -16,12 +16,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-04-15 12:10+0000\n"
"PO-Revision-Date: 2012-04-15 12:10:36+0000\n"
"POT-Creation-Date: 2012-04-21 10:18+0000\n"
"PO-Revision-Date: 2012-04-21 10:18:44+0000\n"
"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.20alpha (27b39a6); Translate 2012-04-11\n"
"X-Generator: MediaWiki 1.20alpha (1f0a982); Translate 2012-04-11\n"
"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
"X-Language-Code: ca\n"
"X-Message-Group: #out-statusnet-core\n"
......@@ -9002,6 +9002,9 @@ msgstr "Finalitza la sessió del lloc"
msgid "Login to the site."
msgstr "Inicia una sessió al lloc"
msgid "This profile has been silenced by site moderators"
msgstr ""
#. TRANS: H2 text for user subscription statistics.
msgid "Following"
msgstr "Seguint"
......
......@@ -2,6 +2,7 @@
# Exported from translatewiki.net
#
# Author: Brion
# Author: Jezevec
# Author: Koo6
# Author: Kuvaly
# Author: Tchoř
......@@ -15,12 +16,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-04-15 12:10+0000\n"
"PO-Revision-Date: 2012-04-15 12:10:38+0000\n"
"POT-Creation-Date: 2012-04-21 10:18+0000\n"
"PO-Revision-Date: 2012-04-21 10:18:49+0000\n"
"Language-Team: Czech <https://translatewiki.net/wiki/Portal:cs>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.20alpha (27b39a6); Translate 2012-04-11\n"
"X-Generator: MediaWiki 1.20alpha (1f0a982); Translate 2012-04-11\n"
"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
"X-Language-Code: cs\n"
"X-Message-Group: #out-statusnet-core\n"
......@@ -900,7 +901,6 @@ msgstr ""
"vašeho účtu na %4$s jen třetím stranám kterým věříte.."
#. TRANS: Fieldset legend.
#, fuzzy
msgctxt "LEGEND"
msgid "Account"
msgstr "Účet"
......@@ -1006,9 +1006,9 @@ msgstr "Metoda HTTP není podporována."
#. TRANS: Exception thrown requesting an unsupported notice output format.
#. TRANS: %s is the requested output format.
#, fuzzy, php-format
#, php-format
msgid "Unsupported format: %s."
msgstr "Nepodporovaný formát."
msgstr "Nepodporovaný formát: %s ."
#. TRANS: Client error displayed requesting a deleted status.
msgid "Status deleted."
......@@ -1254,9 +1254,8 @@ msgstr "Žádná přezdívka nebo ID."
#. TRANS: Client error displayed trying to approve group membership while not logged in.
#. TRANS: Client error displayed when trying to leave a group while not logged in.
#, fuzzy
msgid "Must be logged in."
msgstr "Nejste přihlášen(a)."
msgstr "Musíte být přihlášen(a)."