From 30eddaf168484d628519c02c4612ee103002911d Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Feb 2011 14:11:37 -0800
Subject: [PATCH 1/2] Update translator comment for the url shortener "free
 service" marker: free as in open

---
 actions/othersettings.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/actions/othersettings.php b/actions/othersettings.php
index ef2c9f32b0..9b12deaae4 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -106,8 +106,10 @@ class OthersettingsAction extends AccountSettingsAction
             $services[$name]=$name;
             if($value['freeService']){
                 // TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-                // TRANS: user's profile settings. This message has one space at the beginning. Use your
-                // TRANS: language's word separator here if it has one (most likely a single space).
+                // TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
+                // TRANS: information on the shortener site is freely distributable.
+                // TRANS: This message has one space at the beginning. Use your language's word separator
+                // TRANS: here if it has one (most likely a single space).
                 $services[$name].=_(' (free service)');
             }
         }

From 7de1aaf86dda013dab94d5ae4694a3fc80fba6e9 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sun, 13 Feb 2011 00:40:28 +0000
Subject: [PATCH 2/2] Atom - output nickname for atom:name in atom:author

---
 lib/activityobject.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/activityobject.php b/lib/activityobject.php
index f774dd3c8b..5898c6d050 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -546,7 +546,10 @@ class ActivityObject
         if (!empty($this->title)) {
             $name = common_xml_safe_str($this->title);
             if ($tag == 'author') {
-                $xo->element(self::NAME, null, $name);
+                // XXX: Backward compatibility hack -- atom:name should contain
+                // full name here, instead of nickname, i.e.: $name. Change
+                // this in the next version.
+                $xo->element(self::NAME, null, $this->poco->preferredUsername);
             } else {
                 $xo->element(self::TITLE, null, $name);
             }