diff options
author | Brion Vibber <brion@pobox.com> | 2010-10-04 12:54:36 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-10-04 12:54:36 -0700 |
commit | 59119482ca34540bd7f0a2a1aa994de1d5328ea2 (patch) | |
tree | 864fdc9dda3da54a78d868339c32479b5296b6d0 /plugins/FirePHP/locale/FirePHP.pot | |
parent | 2db8aa3ec3f6804f8f16efe754aafb149f4035c9 (diff) | |
parent | 1652ded48c9c62c40157a5142e5231adbc574ddb (diff) |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
Diffstat (limited to 'plugins/FirePHP/locale/FirePHP.pot')
-rw-r--r-- | plugins/FirePHP/locale/FirePHP.pot | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/FirePHP/locale/FirePHP.pot b/plugins/FirePHP/locale/FirePHP.pot index fa16f283e..056d788c6 100644 --- a/plugins/FirePHP/locale/FirePHP.pot +++ b/plugins/FirePHP/locale/FirePHP.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"POT-Creation-Date: 2010-10-03 19:53+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" @@ -16,6 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: FirePHPPlugin.php:66 +#: FirePHPPlugin.php:68 msgid "The FirePHP plugin writes StatusNet's log output to FirePHP." msgstr "" |