Merge branch 'master' into bump-version-3-6-0

client/coral-embed-stream/src/components/LoadMore.js

@@ -9,11 +9,8 @@ class LoadMore extends React.Component {
     if (!count) {
       return t('framework.show_all_replies');
     }
-    if (count === 1) {
-      return t('framework.show_1_more_reply');
-    }
 
-    return t('framework.show_x_more_replies', count);
+    return t('framework.show_more_replies');
   }
 
   render () {

locales/en.yml

@@ -233,15 +233,14 @@ en:
       msg: "Your account is currently suspended because your username has been deemed inappropriate. To restore your account please enter a new username. Please contact us if you have any questions."
     my_comments: "My Comments"
     my_profile: "My profile"
-    new_count: "View {0} new {1}"
+    new_count: "View {0} more {1}"
     profile: Profile
     show_all_comments: "Show all comments"
     success_bio_update: "Your biography has been updated"
     success_name_update: "Your username has been updated"
     success_update_settings: "The changes you have made have been applied to the comment stream on this article"
     show_all_replies: Show all replies
-    show_1_more_reply: Show 1 more reply
-    show_x_more_replies: Show {0} more replies
+    show_more_replies: Show more replies
     view_more_comments: "view more comments"
     view_reply: "view reply"
   from_settings_page: "From the Profile Page you can see your comment history."

locales/es.yml

@@ -231,15 +231,14 @@ es:
       msg: "Tu cuenta está suspendida porque tu nombre de usuario ha sido considerado no apropiado para el espacio. Para recuperar la cuenta, por favor ingresar un nuevo nombre de usuario. Contáctanos si tienes alguna pregunta."
     my_comments: "Mis Comentarios"
     my_profile: "Mi perfil"
-    new_count: "Ver {0} {1} nuevo"
+    new_count: "Ver {0} más {1} "
     profile: Perfil
     show_all_comments: "Mostrar todos los comentarios"
     success_bio_update: "Tu biografia fue actualizada"
     success_name_update: "Tu nombre de usuario ha sido actualizado"
     success_update_settings: "La configuración de este articulo fue actualizada"
     show_all_replies: "Mostrar todas las respuestas"
-    show_1_more_reply: "Mostrar 1 respuesta más"
-    show_x_more_replies: "Mostrar {0} respuestas más"
+    show_more_replies: "Mostrar más respuestas"
     view_more_comments: "Ver más comentarios"
     view_reply: "ver respuesta"
   from_settings_page: "Desde la página de configuración puedes ver tu historia de comentarios."

locales/fr.yml

@@ -190,7 +190,7 @@ fr:
       msg: "Votre compte est actuellement suspendu car votre nom d'utilisateur a été jugé inapproprié. Pour restaurer votre compte, entrez un nouveau nom d'utilisateur. Contactez-nous si vous avez des questions."
     my_comments: "Mes commentaires"
     my_profile: "Mon profil"
-    new_count: "Voir {0} nouveau {1}"
+    new_count: "Voir {0} plus {1}"
     profile: Profil
     show_all_comments: "Afficher tous les commentaires"
     success_bio_update: "Votre biographie a été mise à jour"

locales/pt_BR.yml

@@ -233,8 +233,7 @@ pt_BR:
     success_name_update: "Seu nome de usuário foi atualizado"
     success_update_settings: "As alterações que você fez foram aplicadas no hilo de comentários neste artigo"
     show_all_replies: Exibir todas as respostas
-    show_1_more_reply: Exibir mais 1 resposta
-    show_x_more_replies: Exibir mais {0} respostas
+    show_more_replies: Exibir mais respostas
     view_more_comments: "ver mais comentários"
     view_reply: "ver resposta"
   from_settings_page: "Na página de Perfil, você pode ver seu histórico de comentários."