diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-01 14:59:26 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-01 14:59:26 -0800 |
| commit | 3c4ead4996fe910ac800d4940f429910faf1bb8b (patch) | |
| tree | 0babc46f34999bbdf30eb97e376bcf036c757d74 /plugins/PoweredByStatusNet | |
| parent | bf95fa92b5cd8969c7f695d1e1636aaca6fb77cd (diff) | |
| parent | 7bbdea10327dfd5cd059337e4f2d3d5f21d909da (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
db/08to09.sql
locale/statusnet.po
scripts/update_po_templates.php
Diffstat (limited to 'plugins/PoweredByStatusNet')
| -rw-r--r-- | plugins/PoweredByStatusNet/locale/PoweredByStatusNet.po | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.po index bd39124ef..8f8434a85 100644 --- a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.po +++ b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 15:03-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" @@ -16,16 +16,16 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: PoweredByStatusNetPlugin.php:49 +#: PoweredByStatusNetPlugin.php:50 #, php-format msgid "powered by %s" msgstr "" -#: PoweredByStatusNetPlugin.php:51 +#: PoweredByStatusNetPlugin.php:52 msgid "StatusNet" msgstr "" -#: PoweredByStatusNetPlugin.php:64 +#: PoweredByStatusNetPlugin.php:65 msgid "" "Outputs powered by <a href=\"http://status.net/\">StatusNet</a> after site " "name." |