From aace1aac2488cf69883c29375faed1cffb84dc72 Mon Sep 17 00:00:00 2001
From: Marc Beyerlin <marc@beyerlin.net>
Date: Wed, 17 Dec 2008 17:39:19 +0100
Subject: [PATCH] I18n: Added more German translations

---
 app/views/passwords/new.html.erb   |    2 +-
 app/views/passwords/reset.html.erb |   14 ++++++++------
 config/locales/de-DE.yml           |    9 ++++-----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/views/passwords/new.html.erb b/app/views/passwords/new.html.erb
index 899c730..0c6d3d3 100644
--- a/app/views/passwords/new.html.erb
+++ b/app/views/passwords/new.html.erb
@@ -6,7 +6,7 @@
     <legend><%= t('passwords.label.your_email_address') %></legend>
     <ol>
       <li>
-        <%= f.label :email, t('activerecord.attributes.password.email') %>
+        <%= f.label :email, t('activerecord.attributes.user.email') %>
         <%= f.text_field :email %>
       </li>
     </ol>
diff --git a/app/views/passwords/reset.html.erb b/app/views/passwords/reset.html.erb
index 3e38a4a..e03f92d 100644
--- a/app/views/passwords/reset.html.erb
+++ b/app/views/passwords/reset.html.erb
@@ -1,23 +1,25 @@
-<%= title "Reset Your Password", :h2 %>
+<%= title t('passwords.title.reset_password'), :h2 %>

 <% form_for :user, :url => { :action => 'update_after_forgetting' } do |f| %>
   <%= f.error_messages %>
-  <p>Please enter a new password and confirm it.</p>
+
+  <p><%= t('passwords.label.enter_new_password') %></p>
+
   <fieldset>
-    <legend>Update Password</legend>
+    <legend><%= t('passwords.label.update_password') %></legend>
     <ol>
       <li>
-        <%= f.label :password %>
+        <%= f.label :password, t('activerecord.attributes.user.password') %>
         <%= f.password_field :password %>
       </li>
       <li>
-        <%= f.label :password_confirmation %>
+        <%= f.label :password_confirmation, t('activerecord.attributes.user.password_confirmation') %>
         <%= f.password_field :password_confirmation %>
       </li>
     </ol>
   </fieldset>
   <%= hidden_field_tag :reset_code, params[:reset_code] %>
   <div class="buttons">
-    <%= f.submit "Submit" %>
+    <%= f.submit t('app.button.submit') %>
   </div>
 <% end %>
diff --git a/config/locales/de-DE.yml b/config/locales/de-DE.yml
index e2b8480..0eb1bfe 100644
--- a/config/locales/de-DE.yml
+++ b/config/locales/de-DE.yml
@@ -27,10 +27,13 @@ de-DE:
   passwords:
     title:
       forgot_password: "Passwort vergessen?"
+      reset_password: "Passwort zurücksetzten"

     label:
       your_email_address: "Deine E-Mail Adresse an die wir weitere Instruktionen schicken ?"
-
+      update_password: "Dein neues Passwort"
+      enter_new_password: "Bitte ändere hier Dein Passwort und bestätige es."
+
     flash:
       link_sent: "Zum ändern Deines Passwortes klicke auf den Link in der E-Mail die wir an {{email}} gesendet haben."
       url_invalid: "Die URL zum ändern Deines Passwortes ist ungültig."
@@ -92,10 +95,6 @@ de-DE:
         remember_me: "Auf diesem Computer angemeldet bleiben"
         openid_url: "Deine OpenId URL"

-      password:
-        email: "E-Mail"
-        user: "Benutzer"
-
     errors:
       messages:
         no_user_for_email: "konnte nicht gefunden werden"
\ No newline at end of file
--
1.5.4.4+GitX