typo 4.0.3 → 4.1

data/app/views/admin/trackbacks/show.rhtml

@@ -1,14 +1,14 @@
-  <% @page_heading = "Trackbacks for #{ link_to h(@article.title), :controller => 'content', :action => 'show', :id => @article }" %>
+  <% @page_heading = _("Trackbacks for") + " #{ link_to h(@article.title), :controller => '/admin/content', :action => 'show', :id => @article }" %>
 
   <% content_for('tasks') do %>
-    <%= task_edit 'Edit this trackback', @trackback.id %>
+    <%= task_edit _('Edit this trackback'), @trackback.id %>
   <% end %>
 
   <div class="form">
-    <label>Blog name:</label> <span class="static"><%=h @trackback.blog_name %></span><br/>
-    <label>Title:</label> <span class="static"><%=h @trackback.title %></span><br/>
-    <label>URL:</label> <span class="static"><%=h @trackback.url %></span><br/>
-    <label>IP Address:</label> <span class="static"><%=h @trackback.ip %></span><br/>
-    <label>Created at:</label> <span class="static"><%=h @trackback.created_at %></span><br/>
-    <label>Excerpt:</label> <span class="static"><%=h @trackback.excerpt %></span><br/>
+    <label><%= _("Blog name")%>:</label> <span class="static"><%=h @trackback.blog_name %></span><br/>
+    <label><%= _("Title")%>:</label> <span class="static"><%=h @trackback.title %></span><br/>
+    <label><%= _("Url")%>:</label> <span class="static"><%=h @trackback.url %></span><br/>
+    <label><%= _("IP")%>:</label> <span class="static"><%=h @trackback.ip %></span><br/>
+    <label><%= _("Created at")%>:</label> <span class="static"><%=h @trackback.created_at %></span><br/>
+    <label><%= _("Body")%>:</label> <span class="static"><%=h @trackback.excerpt %></span><br/>
   </div>

data/app/views/admin/users/_form.rhtml

@@ -1,47 +1,47 @@
 <%= error_messages_for 'user' %>
 <!--[form:user]-->
 <p>
-  <label for="user_login">Login:</label><br />
+  <label for="user_login"><%= _("Login")%>:</label><br />
   <%= text_field 'user', 'login'  %>
 </p>
 <p>
-  <label for="user_login">Display Name:</label><br/>
+  <label for="user_login"><%= _("Display Name")%>:</label><br/>
   <%= text_field 'user', 'name'  %>
 </p>
 <p>
-<label for="user_email">Email:</label> <small>(this will be shown publically if supplied)</small><br/>
+<label for="user_email"><%= _("Email")%>:</label> <small>(this will be shown publically if supplied)</small><br/>
 <%= text_field 'user', 'email'  %>
 </p>
 <p>
-<label for="user_jabber">Jabber:</label> <small>(this can be blank)</small><br/>
+<label for="user_jabber"><%= _("Jabber")%>:</label> <small>(this can be blank)</small><br/>
 <%= text_field 'user', 'jabber'  %>
 </p>
 <p>
-  <label for="user_password">Password:</label><br />
+  <label for="user_password"><%= _("Password")%>:</label><br />
   <%= password_field_tag 'user[password]', '', :id => 'user_password', :size => 30 %>
 </p>
 <p>
-  <label for="user_password">Confirmation:</label><br />
+  <label for="user_password"><%= _("Password confirmation")%>:</label><br />
   <%= password_field 'user', 'password_confirmation'  %>
 </p>
 
 <p>
-  <label for="user_notify_via_email">Send notification messages via email?</label><br />
+  <label for="user_notify_via_email"><%= _("Send notification messages via email")%>?</label><br />
   <%= check_box 'user', 'notify_via_email'  %>
 </p>
 
 <p>
-  <label for="user_notify_via_jabber">Send notification messages via jabber?</label><br />
+  <label for="user_notify_via_jabber"><%= _("Send notification messages via jabber")%>?</label><br />
   <%= check_box 'user', 'notify_via_jabber'  %>
 </p>
 
 <p>
-  <label for="user_notify_on_new_articles">Send notification messages when new articles are posted?</label><br />
+  <label for="user_notify_on_new_articles"><%= _("Send notification messages when new articles are posted")%>?</label><br />
   <%= check_box 'user', 'notify_on_new_articles'  %>
 </p>
 
 <p>
-  <label for="user_notify_on_comments">Send notification messages when comments are posted?</label><br />
+  <label for="user_notify_on_comments"><%= _("Send notification messages when comments are posted")%>?</label><br />
   <%= check_box 'user', 'notify_on_comments'  %>
 </p>
 

data/app/views/admin/users/_user.rhtml

@@ -1,9 +1,9 @@
 <div class="user">
   <h4><%= link_to h(user.login), {:action => "show", :id => user.id} %></h4>
-	<p>Number of Articles: <%= Article.count "user_id = #{user.id}"  %></p>
-	<p>Number of Comments: <%= Comment.count "user_id = #{user.id}"  %></p>
-	<p>Notified<% if user.notify_via_email? %> via email<% end %>: 
-	  <%= "new articles" if user.notify_on_new_articles? %>
-	  <%= "comments" if user.notify_on_comments? %></p>
-  <p><%= link_to 'Edit', :action => 'edit', :id => user  %><strong> |</strong> <%= link_to 'Delete', :action => 'destroy', :id => user %></p>
+        <p><%= _("Number of Articles")%>: <%= Article.count :conditions => "user_id = #{user.id}"  %></p>
+        <p><%= _("Number of Comments")%>: <%= Comment.count :conditions => "user_id = #{user.id}"  %></p>
+        <p><%= _("Notified") %> <% if user.notify_via_email? %> <%= _("via email") %> <% end %>:
+          <%= "new articles" if user.notify_on_new_articles? %>
+          <%= "comments" if user.notify_on_comments? %></p>
+  <p><%= link_to _('Edit'), :action => 'edit', :id => user  %><strong> |</strong> <%= link_to _('Delete'), :action => 'destroy', :id => user %></p>
 </div>

data/app/views/admin/users/destroy.rhtml

@@ -1,14 +1,14 @@
-  <% @page_heading = 'Users' %>
+  <% @page_heading = _('Users') %>
 
   <% content_for('tasks') do %>
-    <%= task_show 'Show this user', @user.id %>
-  <% end %> 
+    <%= task_show _('Show this user'), @user.id %>
+  <% end %>
 
-  <h3>Really delete user "<%= @user.name || @user.login %>" ?</h3>
+  <h3><%= _("Really delete user")%> "<%= @user.name || @user.login %>" ?</h3>
   <br/>
 
 
-  <%= start_form_tag %>
+  <% form_tag do %>
   <%= hidden_field "user", "id" %>
-  <%= confirm_delete("Yes...") %>
-  <%= end_form_tag %>
+  <%= confirm_delete(_("Yes") + "...") %>
+  <% end %>

data/app/views/admin/users/edit.rhtml

@@ -1,9 +1,13 @@
-  <% @page_heading = 'Users' %>
+  <% @page_heading = _('Edit User') %>
+  <% content_for('tasks') do %>
+  <%= tab _("New User"), :controller=>"users", :action=>"new"%>
+  <%= task_overview %>
+  <% end%>
 
-  <%= start_form_tag :action=>"edit", :id => @user.id %>
+  <% form_tag :action=>"edit", :id => @user.id do %>
 
-  <h3>Editing user</h3>
-  <div class="form">	
+  <h3><%= _("Editing user")%></h3>
+  <div class="form">
     <%= render_partial "form" %>
   </div>
 
@@ -11,4 +15,4 @@
     <%= save %> or <%= cancel %>
   </div>
 
-  <%= end_form_tag %>
+  <% end %>

data/app/views/admin/users/list.rhtml

@@ -1,7 +1,7 @@
-  <% @page_heading = 'Users' %>
+  <% @page_heading = _('Manage Users') %>
 
   <% content_for('tasks') do %>
-    <%= task_new 'Add new user' %>
+    <%= task_new _('Add new user') %>
   <% end %> 
   <div id="users">	
     <%= render :partial => 'user', :collection => @users  %>

data/app/views/admin/users/new.rhtml

@@ -1,15 +1,17 @@
-  <% @page_heading = 'Users' %>
+  <% @page_heading = _('New User') %>
+  <% content_for('tasks') do %>
+  <%= task_overview %>
+  <% end%>
+  <h3><%= _("Creating user")%></h3>
 
-  <h3>Creating user</h3>
+  <% form_tag :action=>"new" do %>
 
-  <%= start_form_tag :action=>"new" %>
-
-  <div class="form">	
+  <div class="form">
     <%= render_partial "form" %>
   </div>
 
   <div id="operations">
-    <%= save %> or <%= cancel %>  
+    <%= save %> or <%= cancel %>
   </div>
 
-  <%= end_form_tag %>
+  <% end %>

data/app/views/admin/users/show.rhtml

@@ -1,4 +1,4 @@
-  <% @page_heading = "User: #{@user.name}" %>
+  <% @page_heading = _("User") + ": #{@user.name}" %>
 
   <% content_for('tasks') do %>
     <%= task_new 'Create new user' %>
@@ -6,19 +6,19 @@
   <% end %> 
 
   <div class="form">	
-    <label>Name:</label> <span class="static"><%=h @user.name %></span><br/>
-    <label>Login:</label> <span class="static"><%=h @user.login %></span><br/>
-    <label>Email:</label> <span class="static"><%=h @user.email %></span><br/>
-    <label>Jabber:</label> <span class="static"><%=h @user.jabber %></span><br/>
-    <label>Notify via email:</label> <span class="static"><%= @user.notify_via_email? ? "yes" : "no" %></span><br/>
-    <label>Notify via jabber:</label> <span class="static"><%= @user.notify_via_jabber? ? "yes" : "no" %></span><br/>
-    <label>Notify on new articles:</label> <span class="static"><%= @user.notify_on_new_articles? ? "yes" : "no" %></span><br/>
-    <label>Notify on new comments:</label> <span class="static"><%= @user.notify_on_comments? ? "yes" : "no" %></span><br/>
+    <label><%= _("Name")%>:</label> <span class="static"><%=h @user.name %></span><br/>
+    <label><%= _("Login")%>:</label> <span class="static"><%=h @user.login %></span><br/>
+    <label><%= _("Email")%>:</label> <span class="static"><%=h @user.email %></span><br/>
+    <label><%= _("Jabber")%>:</label> <span class="static"><%=h @user.jabber %></span><br/>
+    <label><%= _("Notify via email")%>:</label> <span class="static"><%= @user.notify_via_email? ? _("yes") : _("no") %></span><br/>
+    <label><%= _("Notify via jabber")%>:</label> <span class="static"><%= @user.notify_via_jabber? ? _("yes") : _("no") %></span><br/>
+    <label><%= _("Notify on new articles")%>:</label> <span class="static"><%= @user.notify_on_new_articles? ? _("yes") : _("no") %></span><br/>
+    <label><%= _("Notify on new comments")%>:</label> <span class="static"><%= @user.notify_on_comments? ? _("yes") : _("no") %></span><br/>
     
   </div>
 
 
   <div class="list">
-    <h2>User's articles</h2>
+    <h2><%= _("User's articles")%></h2>
     <%= render :partial => 'admin/content/articles' %>
   </div>

data/app/views/articles/_article.rhtml

@@ -1,4 +1,4 @@
-<h2><%= article_link article.title, article %></h2>
-<p class="auth">Posted by <%= author_link(article) %>
+<h2><%= link_to_permalink article,article.title %></h2>
+<p class="auth"><%= _("Posted by")%> <%= author_link(article) %>
 <%= js_distance_of_time_in_words_to_now article.published_at %></p>
-<%= article.body_html %>
+<%= html article, :body %>

data/app/views/articles/_comment.rhtml

@@ -2,9 +2,9 @@
   <%= admin_tools_for comment %>
   <a name="comment-<%= comment.id %>"></a>
   <%= gravatar_tag(comment.email) if this_blog.use_gravatar and comment.email %>
-  <cite><strong><%= link_to_unless(comment.url.blank?, h(comment.author), comment.url) %></strong> </cite> said <%= distance_of_time_in_words comment.article.published_at, comment.created_at %> later:<br />
-  <%= comment.full_html %>
+  <cite><strong><%= link_to_unless(comment.url.blank?, h(comment.author), comment.url) %></strong> </cite> <%= _("said")%> <%= distance_of_time_in_words comment.article.published_at, comment.created_at %> later:<br />
+  <%= comment.generate_html(:body) %>
   <% unless comment.published -%>
-    <div class="spamwarning">This comment has been flagged for moderator approval.  It won't appear on this blog until the author approves it.</div>
+    <div class="spamwarning"><%= _("This comment has been flagged for moderator approval.  It won't appear on this blog until the author approves it")%>.</div>
   <% end -%>
 </li>

data/app/views/articles/_comment_box.rhtml

@@ -14,19 +14,19 @@
   <a name="respond"></a>
   <table cellpadding="4" cellspacing="0" class="frm-tbl">
     <tr>
-      <td><p><label for="comment_author">Your name</label></p></td>
+      <td><p><label for="comment_author"><%= _("Your name")%></label></p></td>
       <td> <%= text_field "comment", "author", :size => 20 %> <small><%= link_to_function("(leave url/email &#187;)", "Element.toggle('guest_url'); Element.toggle('guest_email')") %></small></td>
     </tr>
     <tr id="guest_url" style="display:none;">
-      <td><p><label for="comment_url">Your blog</label></p></td>
+      <td><p><label for="comment_url"><%= _("Your blog")%></label></p></td>
       <td> <%= text_field "comment", "url" %></td>
     </tr>
     <tr id="guest_email" style="display:none;">
-      <td><p><label for="comment_email">Your email</label></p></td>
+      <td><p><label for="comment_email"><%= _("Your email")%></label></p></td>
       <td> <%= text_field "comment", "email" %></td>
     </tr>
     <tr>
-      <td><p><label for="comment_body">Your message</label></p></td>
+      <td><p><label for="comment_body"><%= _("Your message")%></label></p></td>
       <td valign="top" colspan="2">
         <%= text_area "comment", "body" %>
       </td>
@@ -34,8 +34,8 @@
     <tr>
       <td colspan="2" id="frm-btns">
       <span id="comment_loading" style="display:none;"><%= image_tag "spinner.gif" %></span>&nbsp;&nbsp;
-      <%= markup_help_popup TextFilter.find_by_name(config[:comment_text_filter]), "Comment Markup Help" %>
-      <a href="#" onclick="new Ajax.Updater('preview', '<%= url_for :action => 'comment_preview' %>',  {asynchronous:true, evalScripts:true, parameters:Form.serialize('commentform'), onComplete:function(request){Element.show('preview')}}); return false;">Preview comment</a>      
+      <%= markup_help_popup TextFilter.find_by_name(this_blog.comment_text_filter), _("Comment Markup Help") %>
+      <a href="#" onclick="new Ajax.Updater('preview', '<%= url_for :action => 'comment_preview' %>',  {asynchronous:true, evalScripts:true, parameters:Form.serialize('commentform'), onComplete:function(request){Element.show('preview')}}); return false;"><%= _("Preview comment")%></a>      
       <input type="submit" name="submit" id="form-submit-button" value="submit" class="button" />
       </td>
     </tr>

data/app/views/articles/_trackback.rhtml

@@ -1,7 +1,7 @@
 <li id="trackback-<%= trackback.id %>"<%= onhover_show_admin_tools(:trackback, trackback.id) %>>
   <%= admin_tools_for trackback %>
   <a name="trackback-<%= trackback.id %>"></a>
-  From <strong><%= trackback.blog_name %></strong><br />
+  <%= _("From")%> <strong><%= trackback.blog_name %></strong><br />
   <a href="<%= trackback.url %>" rel="nofollow"><%=h trackback.title %></a><br/>
   <%= trackback.excerpt %>
 </li>

data/app/views/articles/archives.rhtml

@@ -1,6 +1,6 @@
 <% if @articles.to_a.empty? -%>
 <div class="post">
-<p>No articles found...</p>
+<p><%= _("No articles found")%>...</p>
 </div>
 <% else
      currentmonth = 0
@@ -13,9 +13,9 @@
            <% end -%>
   <div class="archivepost">
   <%= article.published_at.mday %> -
-  <%= article_link h(article.title), article %>
+  <%= link_to_permalink(article,h(article.title)) %>
   <% if !article.categories.empty? %> posted in
-  <%= article.categories.collect {|c| link_to c.name, :controller=>"articles", :action=>"category", :id=>c.name }.join(", ") -%>
+  <%= article.categories.collect {|c| link_to_permalink c,c.name }.join(", ") -%>
   <% end -%>
  </div>
 <% end

data/app/views/articles/comment_preview.rhtml

@@ -1,3 +1,3 @@
 <%= gravatar_tag(@comment.email) if this_blog.use_gravatar and @comment.email %>
-<cite><strong><%=h @comment[:author] %></strong></cite>  is about to say:<br />
-<%= @comment.full_html %>
+<cite><strong><%=h @comment[:author] %></strong></cite>  <%= _("is about to say")%>:<br />
+<%= @comment.html %>

data/app/views/articles/groupings.rhtml

@@ -9,6 +9,6 @@
 <% end -%>
 </ul>
 <% else -%>
-<p>There are <%= @grouping_class.to_s.underscore.pluralize %>.</p>
+<p><%= _("There are")%> <%= @grouping_class.to_s.underscore.pluralize %>.</p>
 <% end -%>
 </div>

data/app/views/articles/index.rhtml

@@ -1,11 +1,11 @@
 <% for article in @articles -%>
  <div class="post">
   <%= render_partial "article", article %>
-  <%= article_link "Read more...", article if article.extended? %>
+  <%= link_to_permalink article, _("Read more") + "..." if article.extended? %>
   <p class="meta"><%= article_links article %></p>
   </div>
 <% end -%>
 
 <% unless @pages.item_count <= this_blog.limit_article_display %>
-  <p id="pagination">Older posts: <%= pagination_links @pages, :params => { :action => @controller.action_name } %></p>
+  <p id="pagination"><%= _("Older posts")%>: <%= pagination_links @pages, :params => { :action => @controller.action_name } %></p>
 <% end -%>

data/app/views/articles/read.rhtml

@@ -5,11 +5,11 @@
 <rdf:Description
     rdf:about=""
 <% if @article.allow_pings? -%>
-    trackback:ping="<%= server_url_for :controller=>"articles", :action=>"trackback", :id=>@article %>"
+    trackback:ping="<%= @article.trackback_url %>"
 <% end -%>
     dc:title="<%=h @article.title.gsub(/-+/, '-') %>"
-    dc:identifier="<%= article_url(@article, false) %>"
-    dc:description="<%=h strip_html(@article.full_html[0..255]).gsub(/-+/, '-') %>"
+    dc:identifier="<%= @article.permalink_url %>"
+    dc:description="<%=h (html(@article).strip_html[0..255]).gsub(/-+/, '-') %>"
     dc:creator="<%= h @article.author %>"
     dc:date="<%= @article.updated_at.xmlschema %>" />
 </rdf:RDF>
@@ -19,23 +19,23 @@
   <%= link_to("edit", { :controller => "admin/content", :action => "edit", :id => @article },
         :class => "admintools", :style => "display: none", :id => "admin_article") %>
   <h2><%=h @article.title %></h2>
-  <p class="auth">Posted by <%= author_link(@article) %>
+  <p class="auth"><%= _("Posted by")%> <%= author_link(@article) %>
   <%= js_distance_of_time_in_words_to_now @article.published_at.utc %></p>
-  <%= @article.full_html %>
+  <%= html(@article) %>
 </div>
 <p class="meta">
   <%= article_links @article %>
 </p>
 
-<% if @article.allow_comments? or @article.comments.size > 0 -%>
+<% if @article.allow_comments? or @article.published_comments.size > 0 -%>
   <a name="comments"></a><h4 class="blueblk">Comments</h4>
   <% unless @article.comments_closed? -%>
     <p class="postmetadata alt">
-      <small><a href="#respond">Leave a response</a></small>
+      <small><a href="#respond"><%= _("Leave a response")%></a></small>
     </p>
   <% end -%>
   <ol class="comment-list" id="commentList">
-  <% if @article.comments.blank? %>
+  <% if @article.published_comments.blank? %>
     <li id="dummy_comment" style="display: none"></li>
   <% else %>
     <%= render(:partial => "comment", :collection => @article.published_comments) %>
@@ -44,21 +44,21 @@
 <% end -%>
 
 <% if @article.allow_pings? -%>
-  <a name="trackbacks"></a><h4 class="blueblk">Trackbacks</h4>
+  <a name="trackbacks"></a><h4 class="blueblk"><%= _("Trackbacks")%></h4>
   <p>
-    Use the following link to trackback from your own site:<br/>
-    <span class="light-bg"><%= server_url_for :controller=>"articles", :action=>"trackback", :id=>@article.id %></span>
+    <%= _("Use the following link to trackback from your own site")%>:<br/>
+    <span class="light-bg"><%= @article.trackback_url %></span>
     </p>
   <%= content_tag(:ol,
         render(:partial => "trackback", :collection => @article.published_trackbacks),
-        :id => 'trackbackList', :class => 'trackback-list') unless @article.trackbacks.blank? %>
+        :id => 'trackbackList', :class => 'trackback-list') unless @article.published_trackbacks.blank? %>
 <% end -%>
 
 <p class="postmetadata alt">
   <small>
-  <a href="<%= xml_url :action=>'feed', :type=>'article', :format => 'rss20', :id => @article %>" title="RSS Feed">RSS feed for this post</a>
+  <a href="<%= url_for :controller => 'xml', :action=>'feed', :type=>'article', :format => 'rss20', :id => @article %>" title="RSS Feed"><%= _("RSS feed for this post")%></a>
 <% if @article.allow_pings? -%>
-  <a href="<%= server_url_for :controller=>"articles", :action=>"trackback", :id => @article.id %>" >trackback uri</a>
+  <a href="<%= @article.trackback_url %>" ><%= _("trackback uri")%></a>
 <% end -%>
   </small>
 </p>
@@ -66,5 +66,5 @@
 <% unless @article.comments_closed? -%>
   <%= render :partial => 'comment_box' %>
 <% else -%>
-  <p>Comments are disabled</p>
+  <p><%= _("Comments are disabled")%></p>
 <% end -%>

data/app/views/articles/view_page.rhtml

@@ -1,3 +1,3 @@
 <div id="viewpage" >
-  <%= @page.full_html %>
+  <%= html @page %>
 </div>

data/app/views/layouts/administration.rhtml

@@ -16,28 +16,23 @@
           <div id="header">
 
           <div id="info">
-            <%= link_to "settings", :controller=>"/admin/general", :action => 'index' %> |
             <%= current_user_notice rescue nil %> |
-            <%= link_to 'your blog &raquo;', :controller => "/articles" %>
+            <%= link_to _('your blog') + '&raquo;', :controller => "/articles" %>
 
           </div>
-            <h1><%= link_to "Typo admin - #{this_blog.blog_name rescue nil}", :controller => "/admin/general" %></h1>
+            <h1><%= link_to _("Typo admin") + " - #{this_blog.blog_name rescue nil}", :controller => "/admin/general" %></h1>
           </div>
         <!-- /HEADER -->
 
 
         <div id="tabs-container">
           <ul id="tabs">
-            <%= tab "Articles", :controller=>"/admin/content", :action => 'index' %>
-            <%= tab "Pages", :controller=>"/admin/pages", :action => 'index' %>
-            <%= tab "Feedback", :controller=>"/admin/feedback", :action => 'index' %>
-            <%= tab "Categories", :controller=>"/admin/categories", :action => 'index' %>
-            <%= tab "Blacklist", :controller=>"/admin/blacklist", :action => 'index' %>
-            <%= tab "Sidebar", :controller=>"/admin/sidebar", :action => 'index' %>
-            <%= tab "Themes", :controller=>"/admin/themes", :action => 'index' %>
-            <%= tab "Users", :controller=>"/admin/users", :action => 'index' %>
-            <%= tab "Resources", :controller=>"/admin/resources", :action => 'index' %>
-            <%= tab "Filters", :controller=>"/admin/textfilters", :action => 'index' %>
+            <%= tab _("Publish"), :controller=>"/admin/content", :action => 'new' %>
+            <%= tab _("Manage"), :controller=>"/admin/content/list", :action => 'index' %>
+            <%= tab _("Discuss"), :controller=>"/admin/feedback", :action => 'index' %>
+            <%= tab _("Design"), :controller=>"/admin/themes", :action => 'index' %>
+            <%= tab _("Users"), :controller=>"/admin/users", :action => 'index' %>
+            <%= tab _("Settings"), :controller=>"/admin/", :action => 'index' %>
           </ul>
         </div>
 
@@ -53,12 +48,11 @@
           <div id="main">
             <h2><%= @page_heading %></h2>
 
-            <% if not first_render =~ /general|login|signup|logout|sidebar|themes/ %>
+            <% if not first_render =~ /general|login|signup|logout/ %>
        <div class="tasks">
-              <h3>Things you can do</h3>
+              <h3><%= _("Things you can do") %></h3>
               <ul>
                 <%= @content_for_tasks %>
-          <%= task_overview unless first_render =~ /\/list$/ %>
          </ul>
          <div style="clear:both;"></div>
             </div>
@@ -68,7 +62,7 @@
           </div>
         </div>
         <div id="footer">
-            Typo <%=h TYPO_VERSION %>
+            Typo <%=h TYPO_VERSION %> <%= _("with %s Famfamfam iconset %s", '<a href="http://famfamfam.com/">', '</a>') %>
         </div>
         </div>
         </body>