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

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

Browse Source 
Conflicts:
	db/08to09.sql
	locale/statusnet.po
	scripts/update_po_templates.php
This commit is contained in:
Brion Vibber
2010-03-01 14:59:26 -08:00
parent bf95fa92b5 7bbdea1032
commit 3c4ead4996
13 changed files with 782 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Sample/locale/Sample.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-02-24 16:33-0800\n"
"POT-Creation-Date: 2010-03-01 14:58-0800\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"