Change wording

app/views/registrations/_new.erb

@@ -8,33 +8,33 @@
       <div>
         <section>
           <p>
-            <label for="user_username"><%= t("registrations.new.enter_username") %></label>
+            <label for="user_username"><%= t("registrations.new.username") %></label>
           </p>
           <p>
-            <input type="text" id="user_username" name="user[username]" value="<%= @user.username %>" class="form-control" placeholder="<%= t("registrations.new.username") %>" pattern="[A-Za-z0-9_.\-]+" required />@<%= AppConfig.pod_uri.host %>
+            <input type="text" id="user_username" name="user[username]" value="<%= @user.username %>" class="form-control" pattern="[A-Za-z0-9_.\-]+" required />@<%= AppConfig.pod_uri.host %>
           </p>
           <p class="advice"><%= t("registrations.new.username_advice") %></p>
         </section>
         <section>
           <p>
-            <label for="user_email"><%= t("registrations.new.enter_email") %></label>
+            <label for="user_email"><%= t("registrations.new.email") %></label>
           </p>
           <p>
-            <input type="email" id="user_email" name="user[email]" value="<%= @user.email %>" class="form-control" placeholder="<%= t("registrations.new.email") %>" required />
+            <input type="email" id="user_email" name="user[email]" value="<%= @user.email %>" class="form-control" required />
           </p>
           <p class="advice"><%= t("registrations.new.email_advice") %></p>
         </section>
         <section>
           <p>
-            <label for="user_password"><%= t("registrations.new.enter_password") %></label>
+            <label for="user_password"><%= t("registrations.new.password") %></label>
           </p>
           <p>
             <input type="password" id="user_password" name="user[password]" class="form-control" minlength="6" required />
           </p>
         </section>
         <section>
           <p>
-            <label for="user_password_confirmation"><%= t("registrations.new.enter_password_again") %></label>
+            <label for="user_password_confirmation"><%= t("registrations.new.password_confirmation") %></label>
           </p>
           <p>
             <input type="password" id="user_password_confirmation" name="user[password_confirmation]" class="form-control" minlength="6" required />

config/locales/diaspora/en.yml

@@ -1093,21 +1093,17 @@ en:
     new:
       title: "Join the diaspora* community!"
       subtitle: "You're about to create an account on %{podname}. A single account is enough to reach the whole diaspora* network. You don't need to create a new account here if you already have one on another pod."
-      enter_email: "Enter your email address"
-      enter_username: "Pick a username (only letters, numbers, _ and -)"
-      enter_password: "Enter a password (six character minimum)"
-      enter_password_again: "Enter the same password as before"
       sign_up: "Create account"
       email: "Email"
       email_advice: "Your e-mail will never be shared with anyone and will only be used to enable you to recover your account and to send notifications."
       username: "Username"
-      username_advice: "Your username is unique and allows others to find you in the network. It can't be changed once set."
+      username_advice: "Your username is unique and allows others to find you in the network. It can't be changed once set. Only letters, numbers, _ and -."
       password: "Password"
       password_confirmation: "Password confirmation"
       submitting: "Submitting..."
       terms: "By creating an account you accept the %{terms_link}."
       terms_link: "terms of service"
-      import_indication: "You already have a diaspora* account and you want to migrate it on %{podname}? Please sign up first and then go to the user settings page to import your previous account."
+      import_indication: "Do you want to migrate an existing diaspora* account to %{podname}? If so, sign up first and then go to the user settings page to import your previous account."
     create:
       success: "You’ve joined diaspora*!"
     closed:
@@ -1420,7 +1416,7 @@ en:
 
   simple_captcha:
     placeholder: "Enter the image value"
-    label: "Enter the code in the box:"
+    label: "Captcha"
     message:
       default: "The secret code did not match with the image"
       user: "The secret image and code were different"