GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.9.x' into 1.0.x

Browse Source 
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
parent babdc430f9 061c8d959b
commit b7d0746694
1504 changed files with 136871 additions and 78532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Sitemap/locale/Sitemap.pot
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"

10
plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po
View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - Sitemap to Breton (Brezhoneg)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: Fulup
# Author: Y-M D
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Sitemap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:56+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:51:23+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:21:54+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2011-01-14 23:54:28+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-sitemap\n"

92
plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po Normal file
View File

@@ -0,0 +1,92 @@
# Translation of StatusNet - Sitemap 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 - Sitemap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-02-14 16:01+0000\n"
"PO-Revision-Date: 2011-02-14 16:10:09+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:28:26+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-sitemap\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANS: Title for sitemap.
#: sitemapadminpanel.php:53
msgid "Sitemap"
msgstr "Sitemap"
#. TRANS: Instructions for sitemap.
#: sitemapadminpanel.php:64
msgid "Sitemap settings for this StatusNet site"
msgstr "Sitemap-Einstellungen dieser StatusNet-Website"
#. TRANS: Field label.
#: sitemapadminpanel.php:167
msgid "Google key"
msgstr "Google-Schlüssel"
#. TRANS: Title for field label.
#: sitemapadminpanel.php:169
msgid "Google Webmaster Tools verification key."
msgstr "Google Webmaster-Tools-Verifikationsschlüssel."
#. TRANS: Field label.
#: sitemapadminpanel.php:175
msgid "Yahoo key"
msgstr "Yahoo-Schlüssel"
#. TRANS: Title for field label.
#: sitemapadminpanel.php:177
msgid "Yahoo! Site Explorer verification key."
msgstr "„Yahoo! Site Explorer“-Verifikationsschlüssel"
#. TRANS: Field label.
#: sitemapadminpanel.php:183
msgid "Bing key"
msgstr "Bing-Schlüssel"
#. TRANS: Title for field label.
#: sitemapadminpanel.php:185
msgid "Bing Webmaster Tools verification key."
msgstr "Bing Webmaster-Tools-Verifikationsschlüssel."
#. TRANS: Submit button text to save sitemap settings.
#: sitemapadminpanel.php:200
msgctxt "BUTTON"
msgid "Save"
msgstr "Speichern"
#. TRANS: Submit button title to save sitemap settings.
#: sitemapadminpanel.php:204
msgid "Save sitemap settings."
msgstr "Sitemap-Einstellungen speichern."
#. TRANS: Menu item title/tooltip
#: SitemapPlugin.php:211
msgid "Sitemap configuration"
msgstr "Sitemap-Konfiguration"
#. TRANS: Menu item for site administration
#: SitemapPlugin.php:213
msgctxt "MENU"
msgid "Sitemap"
msgstr "Sitemap"
#. TRANS: Plugin description.
#: SitemapPlugin.php:238
msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google."
msgstr ""
"Dieses Plugin ermöglicht die Erstellung von Sitemaps für Bing, Yahoo! und "
"Google."

10
plugins/Sitemap/locale/fr/LC_MESSAGES/Sitemap.po
View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - Sitemap to French (Français)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: Peter17
# --
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Sitemap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:56+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:51:23+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:21:54+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2011-01-14 23:54:28+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-sitemap\n"

14
plugins/Sitemap/locale/ia/LC_MESSAGES/Sitemap.po
View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - Sitemap to Interlingua (Interlingua)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: McDutchie
# --
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Sitemap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:56+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:51:23+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:21:54+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2011-01-14 23:54:28+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-sitemap\n"
@@ -24,7 +24,7 @@ msgstr ""
#. TRANS: Title for sitemap.
#: sitemapadminpanel.php:53
msgid "Sitemap"
msgstr "Mappa de sito"
msgstr "Mappa del sito"
#. TRANS: Instructions for sitemap.
#: sitemapadminpanel.php:64
@@ -81,7 +81,7 @@ msgstr "Configuration de mappa de sito"
#: SitemapPlugin.php:213
msgctxt "MENU"
msgid "Sitemap"
msgstr "Mappa de sito"
msgstr "Mappa del sito"
#. TRANS: Plugin description.
#: SitemapPlugin.php:238

10
plugins/Sitemap/locale/mk/LC_MESSAGES/Sitemap.po
View File

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

10
plugins/Sitemap/locale/nl/LC_MESSAGES/Sitemap.po
View File

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

10
plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po
View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - Sitemap to Russian (Русский)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: MaxSem
# --
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Sitemap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:56+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:51:24+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-07 21:21:54+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2011-01-14 23:54:28+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-sitemap\n"

10
plugins/Sitemap/locale/tl/LC_MESSAGES/Sitemap.po
View File

@@ -1,5 +1,5 @@
# Translation of StatusNet - Sitemap to Tagalog (Tagalog)
# Expored from translatewiki.net
# Exported from translatewiki.net
#
# Author: AnakngAraw
# --
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Sitemap\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: 2010-12-16 15:12:56+0000\n"
"POT-Creation-Date: 2011-01-29 21:45+0000\n"
"PO-Revision-Date: 2011-01-29 21:51:24+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-07 21:21:54+0000\n"
"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2011-01-14 23:54:28+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-sitemap\n"

10
plugins/Sitemap/locale/uk/LC_MESSAGES/Sitemap.po
View File

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