Merge remote-tracking branch 'upstream/pull/4736'

[rails.git] / config / locales / ca.yml

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 25dcfb15f98776715bb7391ddd611035459326b1..bf3413725ddb055670492710731f613d55eb1a4b 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -43,6 +43,7 @@
 # Author: Somenxavier
 # Author: Ssola
 # Author: Toniher
 # Author: Somenxavier
 # Author: Ssola
 # Author: Toniher

+# Author: VerusPhoebusApollo

 # Author: Vfc
 # Author: XVEC
 # Author: Yupik
 # Author: Vfc
 # Author: XVEC
 # Author: Yupik


@@ -576,6 +577,7 @@ ca:
     show:
       title: Diari de %{user} | %{title}
       user_title: Diari de %{user}
     show:
       title: Diari de %{user} | %{title}
       user_title: Diari de %{user}

+      discussion: Discussió

       leave_a_comment: Feu un comentari
       login_to_leave_a_comment_html: '%{login_link} per a fer un comentari'
       login: Inicia sessió
       leave_a_comment: Feu un comentari
       login_to_leave_a_comment_html: '%{login_link} per a fer un comentari'
       login: Inicia sessió