diff --git a/src/IDF/Commit.php b/src/IDF/Commit.php
index 0e724ad..aea863c 100644
--- a/src/IDF/Commit.php
+++ b/src/IDF/Commit.php
@@ -235,7 +235,7 @@ class IDF_Commit extends Pluf_Model
 </tr>
 <tr class="extra">
 <td colspan="2">
-<div class="helptext right">'.sprintf(__('Commit&nbsp;%s, by %s'), '<a href="'.$url.'" class="mono">'.$this->scm_id.'</a>', $user).'</div></td></tr>';
+<div class="helptext right">'.sprintf(__('Commit %s, by %s'), '<a href="'.$url.'" class="mono">'.$this->scm_id.'</a>', $user).'</div></td></tr>';
         return Pluf_Template::markSafe($out);
     }
 
diff --git a/src/IDF/Issue.php b/src/IDF/Issue.php
index 8d1ed34..5817775 100644
--- a/src/IDF/Issue.php
+++ b/src/IDF/Issue.php
@@ -211,7 +211,7 @@ class IDF_Issue extends Pluf_Model
         $ic = (in_array($this->status, $request->project->getTagIdsByStatus('closed'))) ? 'issue-c' : 'issue-o';
         $out .= sprintf(__('<a href="%1$s" class="%2$s" title="View issue">Issue %3$d</a>, %4$s'), $url, $ic, $this->id, Pluf_esc($this->summary)).'</td>';
         $out .= "\n".'<tr class="extra"><td colspan="2">
-<div class="helptext right">'.sprintf(__('Creation of <a href="%s" class="%s">issue&nbsp;%d</a>, by %s'), $url, $ic, $this->id, $user).'</div></td></tr>';
+<div class="helptext right">'.sprintf(__('Creation of <a href="%s" class="%s">issue %d</a>, by %s'), $url, $ic, $this->id, $user).'</div></td></tr>';
         return Pluf_Template::markSafe($out);
     }
 
@@ -343,4 +343,4 @@ class IDF_Issue extends Pluf_Model
         }
         Pluf_Translation::loadSetLocale($current_locale);
     }
-}
\ No newline at end of file
+}
diff --git a/src/IDF/IssueComment.php b/src/IDF/IssueComment.php
index dd4edd8..206f9f0 100644
--- a/src/IDF/IssueComment.php
+++ b/src/IDF/IssueComment.php
@@ -177,7 +177,7 @@ class IDF_IssueComment extends Pluf_Model
         }
         $out .= '</td></tr>';
         $out .= "\n".'<tr class="extra"><td colspan="2">
-<div class="helptext right">'.sprintf(__('Comment on <a href="%s" class="%s">issue&nbsp;%d</a>, by %s'), $url, $ic, $issue->id, $user).'</div></td></tr>';
+<div class="helptext right">'.sprintf(__('Comment on <a href="%s" class="%s">issue %d</a>, by %s'), $url, $ic, $issue->id, $user).'</div></td></tr>';
         return Pluf_Template::markSafe($out);
     }
 
diff --git a/src/IDF/Review/Comment.php b/src/IDF/Review/Comment.php
index 762973d..e247808 100644
--- a/src/IDF/Review/Comment.php
+++ b/src/IDF/Review/Comment.php
@@ -138,7 +138,7 @@ class IDF_Review_Comment extends Pluf_Model
         $ic = (in_array($review->status, $request->project->getTagIdsByStatus('closed'))) ? 'issue-c' : 'issue-o';
         $out .= sprintf(__('<a href="%1$s" class="%2$s" title="View review">Review %3$d</a>, %4$s'), $url, $ic, $review->id, Pluf_esc($review->summary)).'</td>';
         $out .= "\n".'<tr class="extra"><td colspan="2">
-<div class="helptext right">'.sprintf(__('Update of <a href="%s" class="%s">review&nbsp;%d</a>, by %s'), $url, $ic, $review->id, $user).'</div></td></tr>';
+<div class="helptext right">'.sprintf(__('Update of <a href="%s" class="%s">review %d</a>, by %s'), $url, $ic, $review->id, $user).'</div></td></tr>';
         return Pluf_Template::markSafe($out);
     }
 
diff --git a/src/IDF/Review/Patch.php b/src/IDF/Review/Patch.php
index a98f49d..4acb772 100644
--- a/src/IDF/Review/Patch.php
+++ b/src/IDF/Review/Patch.php
@@ -150,7 +150,7 @@ class IDF_Review_Patch extends Pluf_Model
         $ic = (in_array($review->status, $request->project->getTagIdsByStatus('closed'))) ? 'issue-c' : 'issue-o';
         $out .= sprintf(__('<a href="%1$s" class="%2$s" title="View review">Review %3$d</a>, %4$s'), $url, $ic, $review->id, Pluf_esc($review->summary)).'</td>';
         $out .= "\n".'<tr class="extra"><td colspan="2">
-<div class="helptext right">'.sprintf(__('Creation of <a href="%s" class="%s">review&nbsp;%d</a>, by %s'), $url, $ic, $review->id, $user).'</div></td></tr>'; 
+<div class="helptext right">'.sprintf(__('Creation of <a href="%s" class="%s">review %d</a>, by %s'), $url, $ic, $review->id, $user).'</div></td></tr>'; 
         return Pluf_Template::markSafe($out);
     }
 
diff --git a/src/IDF/Upload.php b/src/IDF/Upload.php
index 2a78785..6a28c1b 100644
--- a/src/IDF/Upload.php
+++ b/src/IDF/Upload.php
@@ -201,7 +201,7 @@ class IDF_Upload extends Pluf_Model
         $out .= sprintf(__('<a href="%1$s" title="View download">Download %2$d</a>, %3$s'), $url, $this->id, Pluf_esc($this->summary)).'</td>';
         $out .= '</tr>';
         $out .= "\n".'<tr class="extra"><td colspan="2">
-<div class="helptext right">'.sprintf(__('Addition of <a href="%s">download&nbsp;%d</a>, by %s'), $url, $this->id, $user).'</div></td></tr>';
+<div class="helptext right">'.sprintf(__('Addition of <a href="%s">download %d</a>, by %s'), $url, $this->id, $user).'</div></td></tr>';
         return Pluf_Template::markSafe($out);
     }
 
diff --git a/src/IDF/WikiPage.php b/src/IDF/WikiPage.php
index 23340f0..021115b 100644
--- a/src/IDF/WikiPage.php
+++ b/src/IDF/WikiPage.php
@@ -195,7 +195,7 @@ class IDF_WikiPage extends Pluf_Model
         $user = $stag->start($this->get_submitter(), $request, '', false);
         $out .= sprintf(__('<a href="%1$s" title="View page">%2$s</a>, %3$s'), $url, Pluf_esc($this->title), Pluf_esc($this->summary)).'</td>';
         $out .= "\n".'<tr class="extra"><td colspan="2">
-<div class="helptext right">'.sprintf(__('Creation of <a href="%s">page&nbsp;%s</a>, by %s'), $url, Pluf_esc($this->title), $user).'</div></td></tr>'; 
+<div class="helptext right">'.sprintf(__('Creation of <a href="%s">page %s</a>, by %s'), $url, Pluf_esc($this->title), $user).'</div></td></tr>'; 
         return Pluf_Template::markSafe($out);
     }
 
@@ -221,4 +221,4 @@ class IDF_WikiPage extends Pluf_Model
         $tmpl = new Pluf_Template('idf/wiki/feedfragment.xml');
         return $tmpl->render($context);
     }
-}
\ No newline at end of file
+}
diff --git a/src/IDF/templates/idf/register/index.html b/src/IDF/templates/idf/register/index.html
index 8bf676a..a5f9f64 100644
--- a/src/IDF/templates/idf/register/index.html
+++ b/src/IDF/templates/idf/register/index.html
@@ -34,7 +34,7 @@
 <td>
 {if $form.f.terms.errors}{$form.f.terms.fieldErrors}{/if}
 {$form.f.terms|unsafe} <strong>{$form.f.terms.labelTag}</strong><br />
-<span class="helptext">{blocktrans}Read the <a id="showterms" href="#theterms">terms and conditions</a> &ndash; basically <em>"Please be nice, we respect you"</em>.{/blocktrans}</span>
+<span class="helptext">{blocktrans}Read the <a id="showterms" href="#theterms">terms and conditions</a> – basically <em>"Please be nice, we respect you"</em>.{/blocktrans}</span>
 </td>
 </tr>
 <tr>