diff --git a/locale/en/events.js b/locale/en/events.js
index eacc823c3..39429e2a0 100644
--- a/locale/en/events.js
+++ b/locale/en/events.js
@@ -5,11 +5,11 @@ module.exports = [
     new Event('LGBT History Month (UK/Hungary/Netherlands)', 'Progress Pride', 2, month, EventLevel.Month),
     new Event('LGBT History Month (US/Canada/Australia)', 'Progress Pride', 10, month, EventLevel.Month),
     new Event('LGBT History Month (Ireland/Germany)', 'Progress Pride', 5, month, EventLevel.Month),
-    new Event('Trans Visibility Month (Brazil)', 'Transgender', 1, month, EventLevel.Month, ['transgender']),
-    new Event('Lesbian Visibility Month (Brazil)', 'Lesbian', 8, month, EventLevel.Month, ['lesbian']),
+    new Event('{/terminology#transgender=Trans} Visibility Month (Brazil)', 'Transgender', 1, month, EventLevel.Month, ['transgender']),
+    new Event('{/terminology#lesbian=Lesbian} Visibility Month (Brazil)', 'Lesbian', 8, month, EventLevel.Month, ['lesbian']),
     new Event('Diversity Month (Uruguay)', 'LGBTQ', 9, month, EventLevel.Month),
-    new Event('Asexual Visibility Month (Brazil)', 'Asexual', 10, month, EventLevel.Month, ['asexual', 'asexual spectrum']),
-    new Event('Transgender History Month (US)', 'Transgender', 8, month, EventLevel.Month, ['transgender']),
+    new Event('{/terminology#asexual=Asexual} Visibility Month (Brazil)', 'Asexual', 10, month, EventLevel.Month, ['asexual', 'asexual spectrum']),
+    new Event('{/terminology#transgender=Transgender} History Month (US)', 'Transgender', 8, month, EventLevel.Month, ['transgender']),
 
     // static date
     new Event('Harvey Milk Day', null, 5, day(22), EventLevel.Day),
@@ -40,18 +40,19 @@ module.exports = [
     new Event('{https://www.cdc.gov/hiv/library/awareness/nwghaad.html=Women and Girls HIV/AIDS Awareness Day} (US)', null, 3, day(10), EventLevel.Day),
     new Event('{https://www.cdc.gov/hiv/library/awareness/nnhaad.html=Native HIV/AIDS Awareness Day} (US)', null, 3, day(20), EventLevel.Day),
     new Event('{https://www.hiv.gov/events/awareness-days/hiv-long-term-survivors-day=HIV Long-Term Survivors Awareness Day} (US)', null, 6, day(5), EventLevel.Day),
-    new Event('Trans Visibility Day (Brazil)', 'Transgender', 1, day(29), EventLevel.Day, ['transgender']),
-    new Event('National Gay Pride Day (Brazil)', 'LGBTQ', 3, day(25), EventLevel.Day),
-    new Event('Lesbian Visibility Day (Brazil)', 'Lesbian', 8, day(29), EventLevel.Day, ['lesbian']),
-    new Event('Lesbian Rebelliousness Day (Latin America)', 'Lesbian_', 10, day(13), EventLevel.Day, ['lesbian']),
-    new Event('Lesbian Visibility Day (Chile)', 'Lesbian', 7, day(9), EventLevel.Day, ['lesbian']),
-    new Event('Lesbian Visibility Day (Argentina)', 'Lesbian', 3, day(7), EventLevel.Day, ['lesbian']),
-    new Event('Lesbian Visibility Day (Paraguay)', 'Lesbian', 9, day(16), EventLevel.Day, ['lesbian']),
+    new Event('{/terminology#transgender=Trans} Visibility Day (Brazil)', 'Transgender', 1, day(29), EventLevel.Day, ['transgender']),
+    new Event('National {/terminology#pride=Gay Pride} Day (Brazil)', 'LGBTQ', 3, day(25), EventLevel.Day),
+    new Event('{/terminology#lesbian=Lesbian} Visibility Day (Brazil)', 'Lesbian', 8, day(29), EventLevel.Day, ['lesbian']),
+    new Event('{/terminology#lesbian=Lesbian} Rebelliousness Day (Latin America)', 'Lesbian_', 10, day(13), EventLevel.Day, ['lesbian']),
+    new Event('{/terminology#lesbian=Lesbian} Visibility Day (Chile)', 'Lesbian', 7, day(9), EventLevel.Day, ['lesbian']),
+    new Event('{/terminology#lesbian=Lesbian} Visibility Day (Argentina)', 'Lesbian', 3, day(7), EventLevel.Day, ['lesbian']),
+    new Event('{/terminology#lesbian=Lesbian} Visibility Day (Paraguay)', 'Lesbian', 9, day(16), EventLevel.Day, ['lesbian']),
     new Event('Day of Activism for Sexual Diversity (Argentina)', 'LGBTQ', 8, day(20), EventLevel.Day),
-    new Event('Trans Rights Day (Argentina)', 'Transgender', 3, day(18), EventLevel.Day, ['transgender']),
-    new Event('Nonbinary People\'s Day (Poland)', 'Nonbinary', 3, day(9), EventLevel.Day, ['nonbinary']),
-    new Event('LGBTQ Visibility Day (Russia)', 'LGBTQ', 10, day(7), EventLevel.Day),
+    new Event('{/terminology#transgender=Trans} Rights Day (Argentina)', 'Transgender', 3, day(18), EventLevel.Day, ['transgender']),
+    new Event('{/terminology#nonbinary=Nonbinary} People\'s Day (Poland)', 'Nonbinary', 3, day(9), EventLevel.Day, ['nonbinary']),
+    new Event('{/terminology#lgbtq=LGBTQ} Visibility Day (Russia)', 'LGBTQ', 10, day(7), EventLevel.Day),
     new Event('{https://en.wikipedia.org/wiki/Matthew_Shepard=Matthew Shepard} Day of Remembrance', null, 10, day(12), EventLevel.Day),
+    new Event('{/terminology#transgender=Trans-}, {/terminology#travesti=Travesti} and {{/terminology#nonbinary=Non-Binary} Visibility Day (Paraguay)', 'Transgender', 10, day(15), EventLevel.Day, ['transgender', 'nonbinary', 'travesti']),
 
     // dynamic date
     new Event('Wear it Purple Day (Australia)', null, 8, function* (monthDays) {
diff --git a/locale/en/translations.suml b/locale/en/translations.suml
index 9a55cc8bc..d9985716e 100644
--- a/locale/en/translations.suml
+++ b/locale/en/translations.suml
@@ -711,7 +711,7 @@ calendar:
         lesbian_visibility_week: '{/terminology#lesbian=Lesbian} Visibility Week'
         demigender_day: '{/terminology#demigender=Demigender} Awareness Day'
         pan_pride_day: '{/terminology#pansexual=Pansexual} Pride Day'
-        transmasculine_day: '{/terminology#trans%20man=Transmasculine} People''s Day'
+        transmasculine_day: '{/terminology#transmasculine=Transmasculine} People''s Day'
         asexual_visibility_day: '{/terminology#asexual=Asexual} Visibility Day'
         bi_health_month: '{/terminology#bisexual=Bisexual} Health Awareness Month'
         holocaust_remembrance_day: 'International Holocaust Remembrance Day'
diff --git a/locale/es/events.js b/locale/es/events.js
index c9223122a..b81677c2d 100644
--- a/locale/es/events.js
+++ b/locale/es/events.js
@@ -33,6 +33,7 @@ module.exports = [
     new Event('Día de Concientización sobre el VIH/SIDA entre los Jóvenes (EE.UU.)', null, 4, day(10), EventLevel.Day),
     new Event('Día de Concientización sobre el VIH/SIDA entre las Mujeres y Niñas (EE.UU.)', null, 3, day(10), EventLevel.Day),
     new Event('Día de Concientización para los Sobrevivientes a Largo Plazo del VIH (EE.UU.)', null, 6, day(5), EventLevel.Day),
+    new Event('Día de la Visibilidad Trans-, Travesti y No Binarie (Paraguay)', 'Transgender', 10, day(15), EventLevel.Day, ['transgender', 'travesti', 'nonbinary']),
 
     // one-off events
     new Event('{https://www.facebook.com/marchadelorgulloar/=Marcha del Orgullo Buenos Aires} (Argentina)', 'LGBTQ', 11, dayYear(6, 2021), EventLevel.Day),