Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca

2 files changed, 27 insertions, 37 deletions

diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index 3f45cc9b0..0527ff290 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -294,7 +294,7 @@ ca:
       send_an_invitation: "Envia una invitació"
       send_invitation: "Envia una invitació"
       aspect: "Aspecte"
-      already_invited: "Ja convidat"
+      already_invited: "Les persones següents no han acceptat la vostra invitació:"
       resend: "Torna-la a enviar"
     check_token:
       not_found: "No s'ha trobat el testimoni de la invitació"
@@ -312,6 +312,7 @@ ca:
       code: "codi"
       admin: "administra"
       view_all: "Mostra-ho tot"
+      recent_notifications: "Notificacions recents"
     application:
       powered_by: "FUNCIONA AMB DIÀSPORA*"
       whats_new: "què és nou?"
@@ -413,39 +414,28 @@ ca:
 
 
   notifier:
+    email_sent_by_diaspora: "Aquest correu electrònic ha sigut enviat per Diàspora. Si voleu deixar de rebre correus com aquest,"
+    click_here: "feu clic aquí"
     hello: "Hola %{name}!"
-    love: "Amb amor,"
     thanks: "Gràcies,"
-    diaspora: "el robot del correu del Diàspora"
-    manage_your_email_settings: "gestioneu els paràmetres del correu"
+    to_change_your_notification_settings: "per canviar els paràmetres del correu"
     single_admin:
       subject: "Un missatge sobre el vostre compte de Diàspora:"
       admin: "L'administrador de Diàspora"
     started_sharing:
       subject: "%{name} ha començat a compartir amb vosaltres al Diàspora*"
       sharing: "ha començat a compartir amb vosaltres!"
-      sign_in: "Identifiqueu-vos aquí"
+      view_profile: "Visualitza el perfil de %{name}"
     comment_on_post:
-      subject: "%{name} ha comentat la vostra publicació."
-      commented: "ha comentat la vostra publicació:"
-      sign_in: "Identifiqueu-vos per a mostrar-ho."
-    also_commented:
-      subject: "%{name} també ha comentat la publicació de %{post_author}."
-      commented: "també ha comentat la publicació de %{post_author}:"
-      sign_in: "Identifiqueu-vos per a mostrar-ho."
+      reply: "Contesta o visualitza la publicació de %{name} >"
     mentioned:
       subject: "%{name} t'ha mencionat al Diàspora*"
       mentioned: "t'ha mencionat en una publicació:"
-      sign_in: "Identifiqueu-vos per a mostrar-ho."
     private_message:
-      subject: "%{name} us ha enviat un missatge privat al Diàspora*"
-      private_message: "us ha enviat un missatge privat:"
-      message_subject: "Assumpte: %{subject}"
-      sign_in: "Identifiqueu-vos per a mostrar-ho."
+      reply_to_or_view: "Contesta o visualitza aquesta conversa >"
     liked:
-      subject: "A %{name} li ha agradat la vostra publicació"
-      liked: "A %{name} li ha agradat la vostra publicació: "
-      sign_in: "Entreu per a veure-ho"
+      liked: "A %{name} li ha agradat la vostra publicació"
+      view_post: "visualitza la publicació >"
 
 
   people:
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 24a291caf..a753ddbd3 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -423,8 +423,8 @@ en:
         liked: "%{name} just liked your post"
         view_post: "View post >"
     confirm_email:
-        subject: "Please activate your new e-mail address %{unconfirmed_email}"
-        click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+        subject: "Please activate your new email address %{unconfirmed_email}"
+        click_link: "To activate your new email address %{unconfirmed_email}, please click this link:"
   people:
     zero: "no people"
     one: "1 person"
@@ -546,7 +546,7 @@ en:
     new:
       sign_up: "Sign up"
       sign_up_for_diaspora: "Sign up for Diaspora"
-      enter_email: "Enter an e-mail"
+      enter_email: "Enter an email"
       enter_username: "Pick a username (only letters, numbers, and underscores)"
       enter_password: "Enter a password"
       enter_password_again: "Enter the same password as before"
@@ -656,7 +656,7 @@ en:
       invites_closed: "Invites are currently closed on this Diaspora pod"
       invite_your_friends: "Invite your friends"
       from_facebook: "From Facebook"
-      by_email: "By Email"
+      by_email: "By email"
     reshare:
       reshare: "Reshare"
     public_explain:
@@ -737,10 +737,10 @@ en:
     edit:
       export_data: "Export Data"
       close_account: "Close Account"
-      change_language: "Change Language"
-      change_password: "Change Password"
-      change_email: "Change E-Mail"
-      new_password: "New Password"
+      change_language: "Change language"
+      change_password: "Change password"
+      change_email: "Change email"
+      new_password: "New password"
       current_password: "Current password"
       download_xml: "download my xml"
       download_photos: "download my photos"
@@ -755,7 +755,7 @@ en:
       private_message: "...you receive a private message?"
       liked: "...someone likes your post?"
       change: "Change"
-      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Until you follow this link and activate the new address, we will continue to use your original address %{email}."
     destroy: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
     getting_started:
       welcome: "Welcome to Diaspora!"
@@ -774,18 +774,18 @@ en:
         find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
         skip: "Skip"
     update:
-      password_changed: "Password Changed.  You can now log in with your new password."
-      password_not_changed: "Password Change Failed"
-      language_changed: "Language Changed"
-      language_not_changed: "Language Change Failed"
+      password_changed: "Password changed.  You can now log in with your new password."
+      password_not_changed: "Password change failed"
+      language_changed: "Language changed"
+      language_not_changed: "Language change failed"
       email_notifications_changed: "Email notifications changed"
-      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
-      unconfirmed_email_not_changed: "E-Mail Change Failed"
+      unconfirmed_email_changed: "Email changed. Needs activation."
+      unconfirmed_email_not_changed: "Email change failed"
     public:
       does_not_exist: "User %{username} does not exist!"
     confirm_email:
-      email_confirmed: "E-Mail %{email} activated"
-      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
+      email_confirmed: "Email %{email} activated"
+      email_not_confirmed: "Email could not be activated. Wrong link?"
 
   webfinger:
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"