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 - Imap to Breton (Brezhoneg)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: Y-M D
# --
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Imap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:56+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-29 19:42:07+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2011-01-10 18:26:02+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: br\n"
"X-Message-Group: #out-statusnet-plugin-imap\n"

View File

@@ -0,0 +1,59 @@
# Translation of StatusNet - Imap to German (Deutsch)
# Exported from translatewiki.net
#
# Author: Fujnky
# Author: Michael
# --
# This file is distributed under the same license as the StatusNet package.
#
msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Imap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-02-14 16:01+0000\n"
"PO-Revision-Date: 2011-02-14 16:08:16+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-01-29 22:24:04+0000\n"
"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: #out-statusnet-plugin-imap\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: imapmailhandler.php:30
msgid "Error"
msgstr "Fehler"
#: imapmanager.php:51
msgid ""
"ImapManager should be created using its constructor, not the using the "
"static get method."
msgstr ""
"ImapManager sollte durch seinen Konstruktor erstellt werden, nicht durch die "
"statische get-Methode."
#: ImapPlugin.php:54
msgid "A mailbox must be specified."
msgstr "Ein Postfach muss angegeben werden."
#: ImapPlugin.php:57
msgid "A user must be specified."
msgstr "Ein Benutzer muss angegeben werden."
#: ImapPlugin.php:60
msgid "A password must be specified."
msgstr "Ein Passwort muss angegeben werden."
#: ImapPlugin.php:63
msgid "A poll_frequency must be specified."
msgstr "Eine Abfragefrequenz muss angegeben werden."
#: ImapPlugin.php:103
msgid ""
"The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for "
"incoming mail containing user posts."
msgstr ""
"Das IMAP-Plugin ermöglicht es StatusNet, ein POP- oder IMAP-Postfach auf "
"empfangene E-Mails mit Benutzer-Posts zu überprüfen."

View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - Imap to French (Français)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: Peter17
# Author: Verdy p
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Imap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:56+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-29 19:42:07+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2011-01-10 18:26:02+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-imap\n"

View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - Imap to Interlingua (Interlingua)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: McDutchie
# --
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Imap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:56+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-29 19:42:07+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2011-01-10 18:26:02+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-imap\n"

View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - Imap to Macedonian (Македонски)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: Bjankuloski06
# --
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Imap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:56+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-29 19:42:07+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2011-01-10 18:26:02+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-imap\n"

View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - Imap 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 - Imap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:56+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-29 19:42:07+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2011-01-10 18:26:02+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-imap\n"

View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - Imap to Dutch (Nederlands)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: Siebrand
# --
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Imap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:56+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-29 19:42:07+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2011-01-10 18:26:02+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-imap\n"

View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - Imap to Russian (Русский)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: Eleferen
# Author: Сrower
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Imap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:56+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-29 19:42:07+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2011-01-10 18:26:02+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-imap\n"

View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - Imap to Tagalog (Tagalog)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: AnakngAraw
# --
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Imap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:56+0000\n"
"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2010-11-29 19:42:07+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2011-01-10 18:26:02+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: tl\n"
"X-Message-Group: #out-statusnet-plugin-imap\n"

View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - Imap to Ukrainian (Українська)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: Boogie
# --
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Imap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:56+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-29 19:42:07+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2011-01-10 18:26:02+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-imap\n"

View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - Imap to Simplified Chinese (‪中文(简体))
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: ZhengYiFeng
# --
@@ -9,14 +9,14 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Imap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:49:56+0000\n"
"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
"hans>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2010-11-29 19:42:07+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2011-01-10 18:26:02+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: zh-hans\n"
"X-Message-Group: #out-statusnet-plugin-imap\n"