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
2011-02-28 15:39:43 -08:00
1504 changed files with 136871 additions and 78532 deletions

View File

@@ -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"

View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - BitlyUrl to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
# Expored from translatewiki.net
# Translation of StatusNet - BitlyUrl to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
# Exported from translatewiki.net
#
# Author: EugeneZelenko
# Author: Jim-by
@@ -10,14 +10,14 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - BitlyUrl\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:20+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: 2010-11-30 20:40:26+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: be-tarask\n"
"X-Message-Group: #out-statusnet-plugin-bitlyurl\n"

View File

@@ -0,0 +1,83 @@
# Translation of StatusNet - BitlyUrl to Catalan (Català)
# Exported from translatewiki.net
#
# Author: Toniher
# --
# This file is distributed under the same license as the StatusNet package.
#
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"
"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-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
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
#, 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
msgid "bit.ly"
msgstr "bit.ly"
#: BitlyUrlPlugin.php:217 bitlyadminpanelaction.php:54
msgid "bit.ly URL shortening"
msgstr "Escurçament d'URL bit.ly"
#: bitlyadminpanelaction.php:65
msgid ""
"URL shortening with bit.ly requires [a bit.ly account and API key](http://"
"bit.ly/a/your_api_key). This verifies that this is an authorized account, "
"and allow you to use bit.ly's tracking features and custom domains."
msgstr ""
"L'escurçament d'URL amb bit.ly necessita [un compte i clau API de bit.ly]"
"(http://bit.ly/a/your_api_key). Això verifica que és un compte autoritzat, i "
"permet fer servir les característiques de seguiment de bit.ly i els dominis "
"personalitzats."
#: bitlyadminpanelaction.php:132
msgid "Invalid login. Max length is 255 characters."
msgstr "Inici de sessió no vàlid. La longitud màxima és de 255 caràcters."
#: bitlyadminpanelaction.php:138
msgid "Invalid API key. Max length is 255 characters."
msgstr "Clau API no vàlida. La longitud màxima és de 255 caràcters."
#: bitlyadminpanelaction.php:191
msgid "Credentials"
msgstr "Credencials"
#: bitlyadminpanelaction.php:199
msgid "Leave these empty to use global default credentials."
msgstr "Deixa-ho en blanc i fes servir les credencials per defecte globals."
#: bitlyadminpanelaction.php:202
msgid "If you leave these empty, bit.ly will be unavailable to users."
msgstr "Si ho deixeu en blanc, el bit.ly no serà disponible per als usuaris."
#: bitlyadminpanelaction.php:209
msgid "Login name"
msgstr "Nom de sessió"
#: bitlyadminpanelaction.php:218
msgid "API key"
msgstr "Clau API"
#: bitlyadminpanelaction.php:236
msgid "Save bit.ly settings"
msgstr "Desa els paràmetres de bit.ly"

View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - BitlyUrl to German (Deutsch)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: Michael
# Author: The Evil IP address
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - BitlyUrl\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:20+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: 2010-11-30 20:40:26+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: #out-statusnet-plugin-bitlyurl\n"

View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - BitlyUrl to French (Français)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: Peter17
# --
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - BitlyUrl\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:20+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-30 20:40:26+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: #out-statusnet-plugin-bitlyurl\n"

View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - BitlyUrl to Galician (Galego)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: Toliño
# --
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - BitlyUrl\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:20+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: 2010-11-30 20:40:26+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: gl\n"
"X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
@@ -29,6 +29,8 @@ msgstr ""
#, php-format
msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
msgstr ""
"Emprega o servizo de abreviación de enderezos URL <a href=\"http://%1$s/\">%1"
"$s</a>."
#: BitlyUrlPlugin.php:216
msgid "bit.ly"

View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - BitlyUrl to Interlingua (Interlingua)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: McDutchie
# --
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - BitlyUrl\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:20+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-30 20:40:26+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: #out-statusnet-plugin-bitlyurl\n"

View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - BitlyUrl to Macedonian (Македонски)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: Bjankuloski06
# --
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - BitlyUrl\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:20+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-30 20:40:26+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-plugin-bitlyurl\n"

View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - BitlyUrl to Norwegian (bokmål) (Norsk (bokmål))
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: Nghtwlkr
# --
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - BitlyUrl\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:20+0000\n"
"Language-Team: Norwegian (bokmål) <http://translatewiki.net/wiki/Portal:no>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2010-11-30 20:40:26+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: #out-statusnet-plugin-bitlyurl\n"

View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - BitlyUrl to Dutch (Nederlands)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: Siebrand
# --
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - BitlyUrl\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:20+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-30 20:40:26+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-plugin-bitlyurl\n"

View File

@@ -1,8 +1,9 @@
# Translation of StatusNet - BitlyUrl to Russian (Русский)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: Eleferen
# Author: Lockal
# Author: Александр Сигачёв
# --
# This file is distributed under the same license as the StatusNet package.
#
@@ -10,13 +11,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - BitlyUrl\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:20+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: 2010-11-30 20:40:26+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
@@ -25,7 +26,7 @@ msgstr ""
#: BitlyUrlPlugin.php:48
msgid "You must specify a serviceUrl for bit.ly shortening."
msgstr ""
msgstr "Вы должны указать serviceUrl для bit.ly сокращений."
#: BitlyUrlPlugin.php:175
#, php-format

View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - BitlyUrl to Ukrainian (Українська)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: Boogie
# --
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - BitlyUrl\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:20+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-30 20:40:26+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: #out-statusnet-plugin-bitlyurl\n"