Merge branch '1.0.x' into schema-x

Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
This commit is contained in:
Brion Vibber
2010-10-25 13:14:33 -07:00
215 changed files with 46699 additions and 23597 deletions

View File

@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OStatus\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-10-18 18:35+0000\n"
"PO-Revision-Date: 2010-10-18 18:43:41+0000\n"
"POT-Creation-Date: 2010-10-23 18:02+0000\n"
"PO-Revision-Date: 2010-10-23 18:05:48+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-10-09 14:36:36+0000\n"
"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
"X-POT-Import-Date: 2010-10-18 20:30:46+0000\n"
"X-Generator: MediaWiki 1.17alpha (r75280); 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-ostatus\n"
@@ -184,7 +184,7 @@ msgstr "Допис %s не має змісту."
#. TRANS: Shown when a notice is longer than supported and/or when attachments are present.
#: classes/Ostatus_profile.php:592
msgid "Show more"
msgstr "Дивитись далі"
msgstr "Розгорнути"
#. TRANS: Exception. %s is a profile URL.
#: classes/Ostatus_profile.php:785