diff --git a/locale/ja/translations.suml b/locale/ja/translations.suml
index 2ec6a3fd4..a963b1842 100644
--- a/locale/ja/translations.suml
+++ b/locale/ja/translations.suml
@@ -623,29 +623,25 @@ terms:
             changes: >
                 We reserve the right to modify these Terms of Service at any time.
                 If a change is material we will provide at least 30 days notice prior to any new Terms of Service taking effect.
-    # TODO
     update:
-        header: 'We''ve updated our Terms of Service.'
+        header: '利用規約を更新しました。'
         intro: >
-            Hi! We want to let you know that we've updated our Terms of Service. Here's an overview of the changes:
+            やあ！利用規約を更新したことをお知らせします。変更点の概要は以下の通りです。
         changes:
             - >
-                In January we will start removing unused accounts to prevent username hoarding
-                (if there's both no card and no login for a month).
+                1月からは、ユーザー名の蓄積を防ぐために、未使用のアカウントの削除を開始します。※1ヶ月間カードとログインの両方がない場合
             - >
-                We'd like to provide a safe space for all queer people regardless of age,
-                but we must also respect the law
-                and protect the privacy of people who can't legally consent to processing their data.
-                Now our Terms of Service are explicitly mentioning what has always been the case in accordance to GDPR:
-                you need to be at least 13 years old to create an account,
-                and in case of users aged 13-16 they need have parental consent for us to process their data.
+                年齢に関係なく、すべてのクィアの方々に安全な場所を提供したいと思いますが、法律を守り、
+                自分のデータ処理に法的に同意できない方々のプライバシーを保護することも必要です。
+                現在、当社の利用規約では、GDPR（一般データ保護規則）に基づき、これまでずっとそうであったことを明示的に言及しています。
+                アカウントを作成するには、13歳以上であることが必要です。
+                13歳から16歳までのユーザーには、親権者の同意が必要であることを明確にしています。
             - >
-                To improve accessibility, we have started translating our Terms of Service into all supported languages.
-                Those translations are just auxiliary, the only legally binding version remains English.
+                アクセシビリティを向上させるために、利用規約のすべてのサポートされた言語への翻訳を開始しました。
+                このような翻訳はあくまでも補助的なものであり、法的拘束力を持つのは英語のみです。
             - >
-                Although queerphobia, transphobia, queer exclusionism and trolling
-                have always been understood as violating the Terms of Service under the generic term of “violating social norms”,
-                we're now explicitly listing them as forbidden.
+                クィアフォビア、トランスフォビア、クィア排除主義、荒らしなどは、これまでも「社会的規範の違反」
+                という総称で利用規約違反と理解されていましたが、今後は明確に禁止事項として挙げています。
 
 admin:
     header: '管理パネル'
diff --git a/locale/nl/config.suml b/locale/nl/config.suml
index d4c307348..eb6825890 100644
--- a/locale/nl/config.suml
+++ b/locale/nl/config.suml
@@ -69,6 +69,20 @@ inclusive:
 
 terminology:
     enabled: false
+    published: false    
+    categories: # TODO
+        - 'sexual orientation'
+        - 'romantic orientation'
+        - 'tertiary orientation'
+        - 'gender'
+        - 'gender expression'
+        - 'relationship model'
+        - 'language'
+        - 'attraction'
+        - 'politics'
+        - 'prejudice' 
+
+    route: 'terminology'
 
 names:
     enabled: false
diff --git a/locale/nl/translations.suml b/locale/nl/translations.suml
index 8f8e023e0..a9bb5d844 100644
--- a/locale/nl/translations.suml
+++ b/locale/nl/translations.suml
@@ -170,6 +170,22 @@ nouns:
 
     image: 'Beeld'
 
+community: # TODO
+    header: 'Community'
+    headerLong: 'Queer community'
+
+terminology: # TODO
+    header: 'Terminology'
+    headerLong: 'Dictionary of queer terminology'
+    info:
+        - >
+            A dictionary of terms related to the LGBTQ+ community.
+    term: 'Term'
+    original: 'Etymology'
+    category: 'Category'
+    images: 'Additional images, from outside the flag catalogue'
+    definition: 'Definition'
+
 faq:
     header: 'FAQ'
     headerLong: 'Veelgestelde vragen'
@@ -444,7 +460,7 @@ profile:
         Je kan ook onze website gebruiken om een kaart te genereren, {/@example=zoals deze},
         Die je namen, voornaamwoorden etc. bevat.
         Je kan hier naar verwijzen in je bio of in je email-footer.
-        Just create an account {/account=hier}. # TODO
+        Maak simpelweg {/account=hier} een account aan.
     bannerButton: 'Maak een kaart'
 
     card:
diff --git a/locale/no/translations.suml b/locale/no/translations.suml
index 1d747b4f4..93fb8e518 100644
--- a/locale/no/translations.suml
+++ b/locale/no/translations.suml
@@ -171,6 +171,10 @@ nouns:
 
     image: 'Bilde'
 
+community: # TODO
+    header: 'Community'
+    headerLong: 'Queer community'
+
 terminology:
     header: 'Terminologi'
     headerLong: 'Ordbok av queer terminologi'
@@ -619,9 +623,9 @@ terms:
                 If a change is material we will provide at least 30 days notice prior to any new Terms of Service taking effect.
     # TODO
     update:
-        header: 'We''ve updated our Terms of Service.'
+        header: 'Vi har oppdatert våre vilkår og betingelser.'
         intro: >
-            Hi! We want to let you know that we've updated our Terms of Service. Here's an overview of the changes:
+            Hei! Vi har skrevet dette for å fortelle deg at vi har oppdatert våre vilkar og betingelser:
         changes:
             - >
                 In January we will start removing unused accounts to prevent username hoarding
@@ -798,3 +802,115 @@ flags:
     Trixic: 'Trixisk'
     Two_Spirit: 'To åndelig'
     Xenogender: 'Xenokjønnet'
+
+calendar: # TODO
+    header: 'Calendar'
+    headerLong: 'Queer Calendar'
+    date: '%date% %year%'
+    months:
+        1: 'January'
+        2: 'February'
+        3: 'March'
+        4: 'April'
+        5: 'May'
+        6: 'June'
+        7: 'July'
+        8: 'August'
+        9: 'September'
+        10: 'October'
+        11: 'November'
+        12: 'December'
+    dates:
+        1: 'January %day%'
+        2: 'February %day%'
+        3: 'March %day%'
+        4: 'April %day%'
+        5: 'May %day%'
+        6: 'June %day%'
+        7: 'July %day%'
+        8: 'August %day%'
+        9: 'September %day%'
+        10: 'October %day%'
+        11: 'November %day%'
+        12: 'December %day%'
+    events:
+        pride_month: 'Pride Month'
+        trans_month: 'International Trans Awareness Month'
+        zaimki_birthday: 'Birthday of Pronouns.page'
+        agender_day: 'Agender Pride Day	'
+        asexuality_day: 'International Asexuality Day'
+        bisexuality_day: 'Celebrate Bisexuality Day'
+        drag_day: 'Drag Day'
+        idahobit: 'International Day Against Homophobia, Transphobia and Biphobia'
+        intersex_day: 'Intersex Awareness Day'
+        intersex_remembrance_day: 'Intersex Day of Remembrance'
+        lesbian_day: 'International Lesbian Day'
+        lesbian_visibility_day: 'International Lesbian Visibility Day'
+        coming_out_day: 'Coming Out Day'
+        nonbinary_day: 'International Nonbinary People''s Day'
+        pan_day: 'Pansexual & Panromantic Awareness Day'
+        trans_remembrance_day: 'Transgender Day of Remembrance'
+        trans_visibility_day: 'International Trans Day of Visibility'
+        zero_discrimination_day: 'Zero Discrimination Day'
+        arospec_week: 'Aromantic Spectrum Awareness Week'
+        asexual_week: 'Asexual Awareness Week'
+        bisexual_week: 'Bisexual Awareness Week'
+        pronouns_day: 'Pronouns Day'
+        trans_week: 'Trans Awareness Week'
+        trans_parent_day: 'Trans Parent Day'
+        nonbinary_week: 'Nonbinary Awareness Week'
+        polyamory_day: 'Polyamory Day'
+        homophobia_sport: 'International Day Against Homophobia in Sports'
+        gay_uncles_day: 'Gay Uncles Day'
+        lgbtq_stem: 'LGBTQ+ STEM Day'
+        trans_depathologization: 'International Day of Action for Trans Depathologization'
+        lgbti_book_day: 'International LGBTI Book Day'
+        human_rights_day: 'Human Rights Day'
+        nonbinary_parents_day: 'Nonbinary Parents Day'
+        trans_prisoner: 'Transgender Prisoner Day of Action and Solidarity'
+        xenogender_day: 'Xenogender Visibility Day'
+        genderqueer_day: 'Genderqueer Visibility Day'
+        genderfluid_day: 'Genderfluid Visibility Day'
+        aids_day: 'World AIDS Day'
+        tolerance_day: 'International Day of Tolerance'
+        social_justice_day: 'World Day of Social Justice'
+        stonewall_day: 'Anniversary of Stonewall Riots'
+        domestic_violence: 'LGBTQ Domestic Violence Awareness Day'
+        polysexual_day: 'Polysexual & Polyromantic Visibility Day'
+        orlando_day: 'Pulse Night of Remembrance'
+        aids_memorial: 'International AIDS Candlelight Memorial'
+        health_week: 'LGBT Health Awareness Week'
+        lesbian_visibility_week: 'Lesbian Visibility Week'
+        demigender_day: 'Demigender Awareness Day'
+        pan_pride_day: 'Pansexual Pride Day'
+        transmasculine_day: 'Transmasculine People''s Day'
+        asexual_visibility_day: 'Asexual Visibility Day'
+        bi_health_month: 'Bisexual Health Awareness Month'
+        holocaust_remembrance_day: 'International Holocaust Remembrance Day'
+        family_equality_day: 'International Family Equality Day'
+        aro_month: 'Aromantic Awareness Month'
+        black_ribbon_day: 'Black Ribbon Day'
+        black_queer_week: 'Black Queer History Week'
+        mena_lesbian_day: 'Middle Eastern and North African Lesbian and Queer Women''s Pride Day'
+        hate_crime_awareness_week: 'Hate Crime Awareness Week'
+        deaf_awareness_week: 'Deaf LGBTQ Awareness Week'
+        suicide_prevention_day: 'World Suicide Prevention Day'
+        suicide_prevention_month: 'Suicide Prevention Month'
+        aids_awareness_month: 'AIDS Awareness Month'
+        genderfluid_week: 'Genderfluid Awareness Week'
+        pan_week: 'Pan Week'
+        parents_day: 'Gender Expansive Parents'' Day'
+        hiv_testing_day: 'International HIV Testing Day'
+        freedressing_day: 'Freedressing Awareness Day'
+    banner: 'We''re celebrating'
+    celebrating_custom: 'is celebrated'
+    celebrating_day: 'is celebrated on'
+    celebrating_week: 'is celebrated on'
+    celebrating_month: 'is celebrated in'
+    image:
+        header: 'Download an image'
+    view:
+        grid: 'Grid view'
+        list: 'Events list'
+    link: 'Link'
+    full: 'Full calendar'
diff --git a/locale/ru/translations.suml b/locale/ru/translations.suml
index 78f26fec7..57f6e3892 100644
--- a/locale/ru/translations.suml
+++ b/locale/ru/translations.suml
@@ -650,9 +650,9 @@ terms:
                 Если изменения существенные, мы уведомим вас об этом за 30 календарных дней до того, как новые Условия вступят в силу.
     # TODO
     update:
-        header: 'We''ve updated our Terms of Service.'
+        header: 'Мы обновили Условия предоставления услуг.'
         intro: >
-            Hi! We want to let you know that we've updated our Terms of Service. Here's an overview of the changes:
+            Привет! Оповещаем, что мы обновили пользовательское соглашение:
         changes:
             - >
                 In January we will start removing unused accounts to prevent username hoarding
diff --git a/locale/zh/translations.suml b/locale/zh/translations.suml
index 495e988e3..e40aac206 100644
--- a/locale/zh/translations.suml
+++ b/locale/zh/translations.suml
@@ -156,6 +156,22 @@ nouns:
 
     image: 'Image' # TODO
 
+community: # TODO
+    header: 'Community'
+    headerLong: 'Queer community'
+
+terminology: # TODO
+    header: 'Terminology'
+    headerLong: 'Dictionary of queer terminology'
+    info:
+        - >
+            A dictionary of terms related to the LGBTQ+ community.
+    term: 'Term'
+    original: 'Etymology'
+    category: 'Category'
+    images: 'Additional images, from outside the flag catalogue'
+    definition: 'Definition'
+
 faq:
     header: 'FAQ'
     headerLong: 'Frequently asked questions'
@@ -773,3 +789,114 @@ flags:
     Two_Spirit: '雙靈'
     Xenogender: '外性別'
 
+calendar: # TODO
+    header: 'Calendar'
+    headerLong: 'Queer Calendar'
+    date: '%date% %year%'
+    months:
+        1: 'January'
+        2: 'February'
+        3: 'March'
+        4: 'April'
+        5: 'May'
+        6: 'June'
+        7: 'July'
+        8: 'August'
+        9: 'September'
+        10: 'October'
+        11: 'November'
+        12: 'December'
+    dates:
+        1: 'January %day%'
+        2: 'February %day%'
+        3: 'March %day%'
+        4: 'April %day%'
+        5: 'May %day%'
+        6: 'June %day%'
+        7: 'July %day%'
+        8: 'August %day%'
+        9: 'September %day%'
+        10: 'October %day%'
+        11: 'November %day%'
+        12: 'December %day%'
+    events:
+        pride_month: 'Pride Month'
+        trans_month: 'International Trans Awareness Month'
+        zaimki_birthday: 'Birthday of Pronouns.page'
+        agender_day: 'Agender Pride Day	'
+        asexuality_day: 'International Asexuality Day'
+        bisexuality_day: 'Celebrate Bisexuality Day'
+        drag_day: 'Drag Day'
+        idahobit: 'International Day Against Homophobia, Transphobia and Biphobia'
+        intersex_day: 'Intersex Awareness Day'
+        intersex_remembrance_day: 'Intersex Day of Remembrance'
+        lesbian_day: 'International Lesbian Day'
+        lesbian_visibility_day: 'International Lesbian Visibility Day'
+        coming_out_day: 'Coming Out Day'
+        nonbinary_day: 'International Nonbinary People''s Day'
+        pan_day: 'Pansexual & Panromantic Awareness Day'
+        trans_remembrance_day: 'Transgender Day of Remembrance'
+        trans_visibility_day: 'International Trans Day of Visibility'
+        zero_discrimination_day: 'Zero Discrimination Day'
+        arospec_week: 'Aromantic Spectrum Awareness Week'
+        asexual_week: 'Asexual Awareness Week'
+        bisexual_week: 'Bisexual Awareness Week'
+        pronouns_day: 'Pronouns Day'
+        trans_week: 'Trans Awareness Week'
+        trans_parent_day: 'Trans Parent Day'
+        nonbinary_week: 'Nonbinary Awareness Week'
+        polyamory_day: 'Polyamory Day'
+        homophobia_sport: 'International Day Against Homophobia in Sports'
+        gay_uncles_day: 'Gay Uncles Day'
+        lgbtq_stem: 'LGBTQ+ STEM Day'
+        trans_depathologization: 'International Day of Action for Trans Depathologization'
+        lgbti_book_day: 'International LGBTI Book Day'
+        human_rights_day: 'Human Rights Day'
+        nonbinary_parents_day: 'Nonbinary Parents Day'
+        trans_prisoner: 'Transgender Prisoner Day of Action and Solidarity'
+        xenogender_day: 'Xenogender Visibility Day'
+        genderqueer_day: 'Genderqueer Visibility Day'
+        genderfluid_day: 'Genderfluid Visibility Day'
+        aids_day: 'World AIDS Day'
+        tolerance_day: 'International Day of Tolerance'
+        social_justice_day: 'World Day of Social Justice'
+        stonewall_day: 'Anniversary of Stonewall Riots'
+        domestic_violence: 'LGBTQ Domestic Violence Awareness Day'
+        polysexual_day: 'Polysexual & Polyromantic Visibility Day'
+        orlando_day: 'Pulse Night of Remembrance'
+        aids_memorial: 'International AIDS Candlelight Memorial'
+        health_week: 'LGBT Health Awareness Week'
+        lesbian_visibility_week: 'Lesbian Visibility Week'
+        demigender_day: 'Demigender Awareness Day'
+        pan_pride_day: 'Pansexual Pride Day'
+        transmasculine_day: 'Transmasculine People''s Day'
+        asexual_visibility_day: 'Asexual Visibility Day'
+        bi_health_month: 'Bisexual Health Awareness Month'
+        holocaust_remembrance_day: 'International Holocaust Remembrance Day'
+        family_equality_day: 'International Family Equality Day'
+        aro_month: 'Aromantic Awareness Month'
+        black_ribbon_day: 'Black Ribbon Day'
+        black_queer_week: 'Black Queer History Week'
+        mena_lesbian_day: 'Middle Eastern and North African Lesbian and Queer Women''s Pride Day'
+        hate_crime_awareness_week: 'Hate Crime Awareness Week'
+        deaf_awareness_week: 'Deaf LGBTQ Awareness Week'
+        suicide_prevention_day: 'World Suicide Prevention Day'
+        suicide_prevention_month: 'Suicide Prevention Month'
+        aids_awareness_month: 'AIDS Awareness Month'
+        genderfluid_week: 'Genderfluid Awareness Week'
+        pan_week: 'Pan Week'
+        parents_day: 'Gender Expansive Parents'' Day'
+        hiv_testing_day: 'International HIV Testing Day'
+        freedressing_day: 'Freedressing Awareness Day'
+    banner: 'We''re celebrating'
+    celebrating_custom: 'is celebrated'
+    celebrating_day: 'is celebrated on'
+    celebrating_week: 'is celebrated on'
+    celebrating_month: 'is celebrated in'
+    image:
+        header: 'Download an image'
+    view:
+        grid: 'Grid view'
+        list: 'Events list'
+    link: 'Link'
+    full: 'Full calendar'