From 1b4827bc7bfe38204689726fe1761893201d92fe Mon Sep 17 00:00:00 2001
From: William Theaker <william.theaker@gmail.com>
Date: Sat, 19 Mar 2011 02:16:24 -0400
Subject: [PATCH 1/2] 16px wrench icon

---
 .../images/icons/monotone_wrench_settings.png   | Bin 565 -> 521 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/images/icons/monotone_wrench_settings.png b/public/images/icons/monotone_wrench_settings.png
index 0a18126bc26f6364099f6e2f219f92f072f22b32..d8b8b26c09613f7e068e77965513c0c5b24a47de 100644
GIT binary patch
delta 471
zcmV;|0Vw{p1c?M8iBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyk3k}x*
z01ejxLMWSfkwz$ghDk(0R5*>5k-tkqQ546&=id9Uv9(2Bl896I1~&;2d4qpIL_-lY
zH0AgTqD9b#prxdssrnaMMFK&Pw>b1bL6;o*wKxSnPebp?GhS*3E}VM~_j5n@Tw-Pb
zfUfJSkx1l>h+Z^JyJ@%E&sZRYpY;3v-grE=iKxiTwqY258w&w+U0?Axold91%vS)G
zT-U8G1Q?A*chP8cGf?{g03u4JQmN&607XQvMD!4g#nzNkkWwCdy{~vYKAdadsS<#a
zx1`sLbi3WsT)<#3cml8m;O%#lh^%xvU7iIX{~L*j5{ZNk;9b+Ss+4kDN(m_?lv0&O
zqj3~!;3v#~%#P#q9LE_ZlgS+b_ko_3$z(!JCI%t;!Z3_mDdnzb0U<=CUawD?h|tqN
zw~lSw-ecz50MyFma#JRM0{mySTCII%z7CWv(=;cLnE)TsY&H)7Tn1`Zp-?CTGiDGL
z*=+Vg2yy7oL@9MT*B}_RTCE7++}nP-uKNgP{`blr=kq6~X|6Lfz5#=Hxk$U9g>L`=
N002ovPDHLkV1nhZ&A$Ku

delta 515
zcmV+e0{s1n1hoVqiBL{Q4GJ0x0000DNk~Le0000K0000K2nGNE0F8+q4Ur)l3lU8K
z01-_Az&T)Jkwz$gvPnciR5*>TlD%tFVHC!H=gm80D0I*&fqYycglIJ1lTNjC@*i+=
zb8&E~*rkFMI#k6)=<FY2)5%%VdkIPI%_7-K5JAKxIWD>IB8KMP`oMwrc@FQ7!{Lak
z@;_x=BO>B?-Y4LJh<p)|SCh%)TN0pgjjF1(_66_@cp@Ty=hbTUR$^c-m)nYiFbprO
zwL8FfU~@j7A14MHV-AbO;$9p^Q8WWCmiB%UV7$Yhs`|cAC~Rc2*%Qz6-T{?m?{^ZQ
zs4Dq<ep^I(B7!jn5y5%?0Jg(0{JIX%08FRTGho%OHjOc#E0s!f?FnO*N~K+6%%deF
zD<Y4bNoUr7+MOT>`fCIKR=He07Lk|n8jLZsOeXWt_x<x#f6S@|Komv$B68$J*A|P#
zX}w;*mkJ0l9*+-z*G_a@RZkm@#@$pvfYE4l2pl-kma6ue&1NkX5MVeQ9s&C<6zH|v
z?K`P}0E5Bct%&S7(G6AYbvm8fsek}M5PSfhJJC%_RXyu=yVX=c0N?jNipVn{zPXGs
zCJUF`;bm&IT2EE=jjHbU`~3g_RlQQxYPAj5UunXB=?_@j!$K+L>oEWT002ovPDHLk
FV1g&w<pKZz


From a05c9b001077442b92eecbc80bc631b1b046b4c9 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Sat, 19 Mar 2011 14:04:11 +0100
Subject: [PATCH 2/2] fixed a translation, keep up the new format in en.yml,
 set pagination labels in application controller

---
 app/controllers/application_controller.rb |  4 ++++
 app/views/conversations/index.haml        |  2 +-
 config/initializers/will_paginate.rb      |  6 ------
 config/locales/diaspora/en.yml            | 13 +++++++------
 4 files changed, 12 insertions(+), 13 deletions(-)
 delete mode 100644 config/initializers/will_paginate.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 50435f6ea..034eef546 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -67,7 +67,11 @@ class ApplicationController < ActionController::Base
     else
       I18n.locale = request.compatible_language_from AVAILABLE_LANGUAGE_CODES
     end
+
+    WillPaginate::ViewHelpers.pagination_options[:previous_label] = "&laquo; #{I18n.t('previous')}"
+    WillPaginate::ViewHelpers.pagination_options[:next_label] = "#{I18n.t('next')} &raquo;"
   end
+
   def clear_gc_stats
     GC.clear_stats if GC.respond_to?(:clear_stats)
   end
diff --git a/app/views/conversations/index.haml b/app/views/conversations/index.haml
index 1214816b5..1285cdd70 100644
--- a/app/views/conversations/index.haml
+++ b/app/views/conversations/index.haml
@@ -17,7 +17,7 @@
     %h3
       .right
         = link_to t('.new_message'), new_conversation_path, :class => 'button', :rel => 'facebox'
-      Inbox
+      = t('.inbox')
 
   #conversation_inbox
     - if @conversations.count > 0
diff --git a/config/initializers/will_paginate.rb b/config/initializers/will_paginate.rb
deleted file mode 100644
index bc3d0e0d5..000000000
--- a/config/initializers/will_paginate.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-#   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
-WillPaginate::ViewHelpers.pagination_options[:previous_label] = "&laquo; #{I18n.t('previous')}"
-WillPaginate::ViewHelpers.pagination_options[:next_label] = "#{I18n.t('next')} &raquo;"
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 8c10aaeba..e8544e406 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -184,6 +184,7 @@ en:
       no_conversation_selected: "no conversation selected"
       create_a_new_message: "create a new message"
       no_messages: "no messages"
+      inbox: "Inbox"
     show:
       reply: "reply"
       delete: "delete and block conversation"
@@ -406,12 +407,6 @@ en:
   posts:
     doesnt_exist: "that post does not exist!"
 
-  tags:
-    show:
-      posts_tagged_with: "Posts tagged with #%{tag}"
-      nobody_talking: "Nobody is talking about %{tag} yet."
-      people_tagged_with: "People tagged with %{tag}"
-
   profiles:
     edit:
       your_public_profile: "Your public profile"
@@ -560,6 +555,12 @@ en:
     show_comments: "show all comments"
     hide_comments: "hide comments"
 
+  tags:
+    show:
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
+
   users:
     edit:
       export_data: "Export Data"