diff --git a/config/locales/es.yml b/config/locales/es.yml
index 71379f2..f51a7bd 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1322,7 +1322,7 @@ es:
   button_project_bookmark_delete: Quitar marcador
   field_history_default_tab: Issue's history default tab
   label_issue_history_properties: Property changes
-  label_issue_history_notes: Notes
+  label_issue_history_notes: Notas
   label_last_tab_visited: Last visited tab
   field_unique_id: Unique ID
   text_no_subject: no subject
diff --git a/plugins/redmine_glossary/app/views/glossary_terms/_index_terms.html.erb b/plugins/redmine_glossary/app/views/glossary_terms/_index_terms.html.erb
index 81015f8..7d16448 100644
--- a/plugins/redmine_glossary/app/views/glossary_terms/_index_terms.html.erb
+++ b/plugins/redmine_glossary/app/views/glossary_terms/_index_terms.html.erb
@@ -20,7 +20,7 @@
           <%= term.category.try!(:name) %>
         </td>
         <td class="description">
-          <%= term.description %>
+          <% @paragraphs = Nokogiri::HTML.parse(term.description).css('p') %><%=textilizable @paragraphs.first.inner_html + (@paragraphs.size > 1 ? '<p>…</p>' : '') %>
         </td>
       </tr>
     <% end %>
diff --git a/plugins/redmine_glossary/config/locales/es.yml b/plugins/redmine_glossary/config/locales/es.yml
new file mode 100644
index 0000000..9717f17
--- /dev/null
+++ b/plugins/redmine_glossary/config/locales/es.yml
@@ -0,0 +1,39 @@
+# Spanish strings go here for Rails i18n
+es:
+  label_glossary_terms: Glosario
+  label_glossary_term: Término
+  label_glossary_term_new: Nuevo término
+  label_glossary_term_import_csv: Importar de CSV
+  label_glossary_categories: Categorías
+  label_glossary_category: Categoría
+  label_glossary_category_new: Nueva categoría
+
+  glossary_title: Glosario
+  project_module_glossary: Glosario
+
+  label_view: Ver
+  label_import: Importar
+  label_glossary_index: Índice
+  label_not_categorized: Resto
+  label_grouping: Agrupar
+  label_categorized: Categorías
+  label_glossary_term_plural: Glosario
+
+  index_en: |
+      A B C D E F
+      G H I J K L
+      M N Ñ O P Q
+      R S T U V W
+      X Y Z
+
+  index_rubi: |
+
+
+  permission_view_glossary_terms: Ver glosario
+  permission_manage_glossary_terms: Administrar glosario
+
+  field_name_en: En inglés
+  field_abbr_whole: Acrónimo de
+  field_datatype: Tipo de dato en código
+  field_codename: Abreviatura en código
+  field_rubi: Ruby