From 15a42a4074238631f262b8b507df6fc0b86af162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Dembowski?= <pawel.dembowski@gmail.com>
Date: Sun, 21 Nov 2021 01:42:54 +0000
Subject: [PATCH 1/4] [en] Update events.js

---
 locale/en/events.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/en/events.js b/locale/en/events.js
index 79758c134..c89fb585e 100644
--- a/locale/en/events.js
+++ b/locale/en/events.js
@@ -53,7 +53,7 @@ module.exports = [
     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']),
     new Event('Missing and Murdered Indigenous Women, Girls, and {/terminology#two%20spirit=Two Spirit} Awareness Day', 'Two Spirit', 5, day(5), EventLevel.Day, ['two spirit']),
-    
+    new Event('Gender Expansive Parents'' Day (US)', null, 12, day(6), EventLevel.Day,
 
     // dynamic date
     new Event('Wear it Purple Day (Australia)', null, 8, function* (monthDays) {

From 4d86ef91782e0dcc47a91cc64a861578a537671a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Dembowski?= <pawel.dembowski@gmail.com>
Date: Sun, 21 Nov 2021 05:32:02 +0000
Subject: [PATCH 2/4] Update events.js

---
 locale/_/events.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/_/events.js b/locale/_/events.js
index b93a2b9af..1ff9b7900 100644
--- a/locale/_/events.js
+++ b/locale/_/events.js
@@ -38,7 +38,7 @@ module.exports = [
     new Event('trans_prisoner', 'Transgender', 1, day(22), EventLevel.Day, ['transgender']),
     new Event('xenogender_day', 'Xenogender', 5, day(15), EventLevel.Day, ['xenogender']),
     new Event('genderqueer_day', 'Genderqueer', 4, day(25), EventLevel.Day, ['genderqueer']),
-    new Event('genderfluid_day', 'Genderfluid', 6, day(16), EventLevel.Day, ['genderfluid']),
+    new Event('genderfluid_day', 'Genderfluid', 6, day(16), EventLevel.Day, ['genderfluid', 'demifluid']),
     new Event('aids_day', null, 12, day(1), EventLevel.Day),
     new Event('tolerance_day', null, 11, day(16), EventLevel.Day),
     new Event('social_justice_day', null, 2, day(20), EventLevel.Day, ['progress pride']),
@@ -46,7 +46,7 @@ module.exports = [
     new Event('domestic_violence', null, 5, day(25), EventLevel.Day, ['lgbtq']),
     new Event('polysexual_day', 'Polysexual', 7, day(26), EventLevel.Day, ['polysexual', 'polyromantic']),
     new Event('orlando_day', null, 6, day(12), EventLevel.Day, ['homophobia']),
-    new Event('demigender_day', 'Demigender', 12, day(15), EventLevel.Day, ['demigender']),
+    new Event('demigender_day', 'Demigender', 12, day(15), EventLevel.Day, ['demigender', 'demiboy', 'demigirl', 'deminonbinary', 'demineutrois', 'demifluid']),
     new Event('pan_pride_day', 'Pansexual', 12, day(8), EventLevel.Day, ['pansexual']),
     new Event('transmasculine_day', 'Transmasculine', 2, day(20), EventLevel.Day, ['trans man', 'transmasculine']),
     new Event('asexual_visibility_day', 'Asexual', 5, day(8), EventLevel.Day, ['asexual', 'asexual spectrum']),

From 9a4e31e82928a71327d5f1cc168fd2395a5fa589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Dembowski?= <pawel.dembowski@gmail.com>
Date: Sun, 21 Nov 2021 05:49:23 +0000
Subject: [PATCH 3/4] [ru] Update GrammarTables.vue

---
 locale/ru/pronouns/GrammarTables.vue | 73 ++++++++++++++++------------
 1 file changed, 41 insertions(+), 32 deletions(-)

diff --git a/locale/ru/pronouns/GrammarTables.vue b/locale/ru/pronouns/GrammarTables.vue
index 619769390..9a80e3d66 100644
--- a/locale/ru/pronouns/GrammarTables.vue
+++ b/locale/ru/pronouns/GrammarTables.vue
@@ -9,22 +9,22 @@
             <table class="table table-sm">
                 <thead>
                 <tr>
-                    <th>Mianownik</th>
-                    <th>Dopełniacz</th>
-                    <th>Celownik</th>
-                    <th>Biernik</th>
-                    <th>Narzędnik</th>
-                    <th>Miejscownik</th>
+                    <th>именительный</th>
+                    <th>родительный</th>
+                    <th>дательный</th>
+                    <th>винительный</th>
+                    <th>творительный</th>
+                    <th>предложный</th>
                 </tr>
                 </thead>
                 <tbody>
                 <tr>
-                    <td><Morpheme :pronoun="selectedPronoun" morpheme="pronoun_n" :counter="counter"/></td>
-                    <td><Morpheme :pronoun="selectedPronoun" morpheme="pronoun_g" :counter="counter"/> / <Morpheme :pronoun="selectedPronoun" morpheme="pronoun_g_acc" :counter="counter"/></td>
-                    <td><Morpheme :pronoun="selectedPronoun" morpheme="pronoun_d" :counter="counter"/></td>
-                    <td><Morpheme :pronoun="selectedPronoun" morpheme="pronoun_a" :counter="counter"/></td>
-                    <td><Morpheme :pronoun="selectedPronoun" morpheme="pronoun_i" :counter="counter"/></td>
-                    <td><Morpheme :pronoun="selectedPronoun" morpheme="pronoun_l" :counter="counter"/></td>
+                    <td><Morpheme :pronoun="selectedPronoun" morpheme="nominative" :counter="counter"/></td>
+                    <td><Morpheme :pronoun="selectedPronoun" morpheme="genitive" :counter="counter"/> / <Morpheme :pronoun="selectedPronoun" morpheme="pronoun_g_acc" :counter="counter"/></td>
+                    <td><Morpheme :pronoun="selectedPronoun" morpheme="dative" :counter="counter"/></td>
+                    <td><Morpheme :pronoun="selectedPronoun" morpheme="accusative" :counter="counter"/></td>
+                    <td><Morpheme :pronoun="selectedPronoun" morpheme="instrumental" :counter="counter"/></td>
+                    <td><Morpheme :pronoun="selectedPronoun" morpheme="prepositional" :counter="counter"/></td>
                 </tr>
                 </tbody>
             </table>
@@ -34,30 +34,39 @@
             <table class="table table-sm">
                 <thead>
                 <tr>
-                    <th>1 os.</th>
-                    <th>2 os.</th>
-                    <th>3 os.</th>
-                    <th>Przymiotniki</th>
+                    <th>творительный с предлогом</th>
+                    <th>родительный с предлогом</th>
+                    <th>Possessive</th>
+                    <th>Definitive</th>
                 </tr>
                 </thead>
                 <tbody>
                 <tr>
-                    <td>
-                        <Morpheme :pronoun="selectedPronoun" morpheme="verb_middle_inter" :counter="counter"
-                                  prepend="–"
-                                  :append="selectedPronoun.isPlural(counter) ? 'śmy' : 'm'"
-                                  :appendPr="selectedPronoun.isPlural(counter) ? 'ɕmɨ' : 'm'"
-                        />
-                    </td>
-                    <td>
-                        <Morpheme :pronoun="selectedPronoun" morpheme="verb_middle_inter" :counter="counter"
-                                  prepend="–"
-                                  :append="selectedPronoun.isPlural(counter) ? 'ście' : 'ś'"
-                                  :appendPr="selectedPronoun.isPlural(counter) ? 'ɕʨ̑ɛ' : 'ɕ'"
-                        />
-                    </td>
-                    <td><Morpheme :pronoun="selectedPronoun" morpheme="verb_end_about" :counter="counter" prepend="–"/></td>
-                    <td><Morpheme :pronoun="selectedPronoun" morpheme="adjective_n" :counter="counter" prepend="–"/></td>
+                    <td><Morpheme :pronoun="selectedPronoun" morpheme="instrumental_with_preposition" :counter="counter"/></td>
+                    <td><Morpheme :pronoun="selectedPronoun" morpheme="genitive_with_preposition" :counter="counter"/> / <Morpheme :pronoun="selectedPronoun" morpheme="pronoun_g_acc" :counter="counter"/></td>
+                    <td><Morpheme :pronoun="selectedPronoun" morpheme="possessive" :counter="counter"/></td>
+                    <td><Morpheme :pronoun="selectedPronoun" morpheme="definitive" :counter="counter"/></td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+
+        <div class="table-responsive">
+            <table class="table table-sm">
+                <thead>
+                <tr>
+                    <th>Nonreflexive verb past</th>
+                    <th>Reflexive verb past</th>
+                    <th>Short adjective</th>
+                    <th>Adjective</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                    <td><Morpheme :pronoun="selectedPronoun" morpheme="nonreflexive_verb_past" :counter="counter" prepend="–"/></td>
+                    <td><Morpheme :pronoun="selectedPronoun" morpheme="reflexive_verb_past" :counter="counter" prepend="–"/></td>
+                    <td><Morpheme :pronoun="selectedPronoun" morpheme="short_adjective" :counter="counter" prepend="–"/></td>
+                    <td><Morpheme :pronoun="selectedPronoun" morpheme="adjective" :counter="counter" prepend="–"/></td>
                 </tr>
                 </tbody>
             </table>

From d0c901fedc01e4d81d73d327cdc805dc6d2a48dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Dembowski?= <pawel.dembowski@gmail.com>
Date: Sun, 21 Nov 2021 05:52:07 +0000
Subject: [PATCH 4/4] [ru] Update GrammarTables.vue

---
 locale/ru/pronouns/GrammarTables.vue | 29 ++++++----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/locale/ru/pronouns/GrammarTables.vue b/locale/ru/pronouns/GrammarTables.vue
index 9a80e3d66..fbff68db8 100644
--- a/locale/ru/pronouns/GrammarTables.vue
+++ b/locale/ru/pronouns/GrammarTables.vue
@@ -20,37 +20,16 @@
                 <tbody>
                 <tr>
                     <td><Morpheme :pronoun="selectedPronoun" morpheme="nominative" :counter="counter"/></td>
-                    <td><Morpheme :pronoun="selectedPronoun" morpheme="genitive" :counter="counter"/> / <Morpheme :pronoun="selectedPronoun" morpheme="pronoun_g_acc" :counter="counter"/></td>
+                    <td><Morpheme :pronoun="selectedPronoun" morpheme="genitive" :counter="counter"/></td> / <td><Morpheme :pronoun="selectedPronoun" morpheme="genitive_with_preposition" :counter="counter"/>
                     <td><Morpheme :pronoun="selectedPronoun" morpheme="dative" :counter="counter"/></td>
                     <td><Morpheme :pronoun="selectedPronoun" morpheme="accusative" :counter="counter"/></td>
-                    <td><Morpheme :pronoun="selectedPronoun" morpheme="instrumental" :counter="counter"/></td>
+                    <td><Morpheme :pronoun="selectedPronoun" morpheme="instrumental" :counter="counter"/></td> / <td><Morpheme :pronoun="selectedPronoun" morpheme="instrumental_with_preposition" :counter="counter"/></td>
                     <td><Morpheme :pronoun="selectedPronoun" morpheme="prepositional" :counter="counter"/></td>
                 </tr>
                 </tbody>
             </table>
         </div>
 
-        <div class="table-responsive">
-            <table class="table table-sm">
-                <thead>
-                <tr>
-                    <th>творительный с предлогом</th>
-                    <th>родительный с предлогом</th>
-                    <th>Possessive</th>
-                    <th>Definitive</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr>
-                    <td><Morpheme :pronoun="selectedPronoun" morpheme="instrumental_with_preposition" :counter="counter"/></td>
-                    <td><Morpheme :pronoun="selectedPronoun" morpheme="genitive_with_preposition" :counter="counter"/> / <Morpheme :pronoun="selectedPronoun" morpheme="pronoun_g_acc" :counter="counter"/></td>
-                    <td><Morpheme :pronoun="selectedPronoun" morpheme="possessive" :counter="counter"/></td>
-                    <td><Morpheme :pronoun="selectedPronoun" morpheme="definitive" :counter="counter"/></td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-
         <div class="table-responsive">
             <table class="table table-sm">
                 <thead>
@@ -59,6 +38,8 @@
                     <th>Reflexive verb past</th>
                     <th>Short adjective</th>
                     <th>Adjective</th>
+                    <th>Possessive</th>
+                    <th>Definitive</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -67,6 +48,8 @@
                     <td><Morpheme :pronoun="selectedPronoun" morpheme="reflexive_verb_past" :counter="counter" prepend="–"/></td>
                     <td><Morpheme :pronoun="selectedPronoun" morpheme="short_adjective" :counter="counter" prepend="–"/></td>
                     <td><Morpheme :pronoun="selectedPronoun" morpheme="adjective" :counter="counter" prepend="–"/></td>
+                    <td><Morpheme :pronoun="selectedPronoun" morpheme="possessive" :counter="counter"/></td>
+                    <td><Morpheme :pronoun="selectedPronoun" morpheme="definitive" :counter="counter"/></td>                    
                 </tr>
                 </tbody>
             </table>