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

diff --git a/lib/noticeform.php b/lib/noticeform.php
index 5545d03ae98e5355daa2740e1e74850715f1fd6a..02e35a8d79bd50d16e26d6a7806499ca011c31db 100644 (file)
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -209,9 +209,9 @@ class NoticeForm extends Form
 
                 $this->out->elementStart('div', array('id' => 'notice_data-geo_wrap',
                                                       'title' => common_local_url('geocode')));
-                $this->out->checkbox('notice_data-geo', _('Share my location.'), true);
+                $this->out->checkbox('notice_data-geo', _('Share my location'), true);
                 $this->out->elementEnd('div');
-                $this->out->inlineScript(' var NoticeDataGeoShareDisable_text = "'._('Do not share my location.').'";'.
+                $this->out->inlineScript(' var NoticeDataGeoShareDisable_text = "'._('Do not share my location').'";'.
                 ' var NoticeDataGeoInfoMinimize_text = "'._('Hide this info').'";');
             }