Merge pull request #3302 from movilla/new_login

Translation new make something /stream [ci skip]

app/views/aspects/_aspect_stream.haml

@@ -6,7 +6,7 @@
   = stream.title
 
 - if current_user.beta?
-  = link_to "Make something", "#composer", :rel => "facebox", :class => "button primary", :style => "display: block; margin: 20px 10px; margin-bottom: 30px; padding: 10px; text-align:center; font-weight: bold;"
+  = link_to t('.make_something'), "#composer", :rel => "facebox", :class => "button primary", :style => "display: block; margin: 20px 10px; margin-bottom: 30px; padding: 10px; text-align:center; font-weight: bold;"
 
   #composer{:style => "display:none;"}
     %iframe{:src => '/posts/new', :height => 500, :width => 980, :style => "border:none;"}
@@ -24,4 +24,4 @@
   %span.loader.hidden
 
 - if current_user.contacts.size < 2
-  = render 'aspects/no_contacts_message'
+  = render 'aspects/no_contacts_message'

app/views/sessions/new.html.erb

@@ -11,7 +11,7 @@
         <fieldset>
           <div class="control-group">
               <label class="control-label" for="user_username">
-                USERNAME
+                <%= t('registrations.new.username') %>
               </label>
 
               <div class="controls">
@@ -21,7 +21,7 @@
 
           <div class="control-group">
             <label class="control-label" for="user_password">
-                PASSWORD
+                <%= t('registrations.new.password') %>
             </label>
 
             <div class="controls">
@@ -30,7 +30,7 @@
           </div>
         </fieldset>
 
-        <%= f.submit "Sign In", :class => "new-btn" %>
+        <%= f.submit t('devise.sessions.new.sign_in'), :class => "new-btn" %>
   <% end %>
 
   <% if display_password_reset_link? %>
@@ -44,4 +44,4 @@
       <br/>
       <%= link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name) %>
   <% end %>
-</div>
+</div>

config/locales/diaspora/en.yml

@@ -262,6 +262,7 @@ en:
     aspect_stream:
       stay_updated: "Stay Updated"
       stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
+      make_something: "Make something"
 
   aspect_memberships:
     destroy: