Merge remote-tracking branch 'origin/main'

# Conflicts:
#	yarn.lock

components/Header.vue

@@ -239,6 +239,7 @@
                     || (this.config.census && this.config.census.enabled)
                     || (this.config.inclusive && this.config.inclusive.enabled)
                     || (this.config.people && this.config.people.enabled)
+                    || (this.config.contact && this.config.contact.team && this.config.contact.team.enabled)
                 ) {
                     const extra = [
                         this.config.terminology && this.config.terminology.enabled ? '/' + this.config.terminology.route : '',

components/Profile.vue

@@ -31,7 +31,7 @@
                 </div>
                 <p v-if="profile.age && profile.age >= minAge">
                     <Icon v="birthday-cake"/>
-                    <T>profile.birthday</T><T>quotation.colon</T>
+                    <T v-if="$te('profile.age')">profile.age</T><T v-else>profile.birthday</T><T>quotation.colon</T>
                     {{ profile.age }}
                 </p>
                 <Timezone v-if="profile.timezone" :value="profile.timezone" :static="static"/>
@@ -74,11 +74,11 @@
 
                 <ExpandableList :values="profile.names" :limit="16" class="list-unstyled" :static="static" :expand="expandLinks">
                     <template v-slot="s">
-                        <Opinion :word="convertName(s.el.value)" :opinion="s.el.opinion" :escape="false" :link="config.locale === 'tok' ? `${config.pronouns.prefix}/${s.el.value}` : null" :customOpinions="profile.opinions"/>
+                        <Opinion :word="convertName(s.el.value)" :opinion="s.el.opinion" :escape="false" :link="config.locale === 'tok' && config.pronouns.enabled ? `${config.pronouns.prefix}/${s.el.value}` : null" :customOpinions="profile.opinions"/>
                     </template>
                 </ExpandableList>
             </div>
-            <div v-if="profile.pronouns.length" :class="['col-6', mainRowCount === 3 ? 'col-lg-4' : 'col-lg-6']">
+            <div v-if="profile.pronouns.length && config.pronouns.enabled" :class="['col-6', mainRowCount === 3 ? 'col-lg-4' : 'col-lg-6']">
                 <h3>
                     <Icon v="tags"/>
                     <T>profile.pronouns</T>
@@ -253,7 +253,7 @@
             mainRowCount() {
                 let c = 0;
                 if (this.profile.names.length) { c++; }
-                if (this.profile.pronouns.length) { c++; }
+                if (this.profile.pronouns.length && this.config.pronouns.enabled) { c++; }
                 if (this.profile.links.length) { c++; }
                 return c;
             },

components/SocialConnection.vue

@@ -38,7 +38,7 @@
                 {{connection.name}}
             </span>
             <br class="d-md-none"/>
-            <a :href="(providerOptions.redirectViaHome ? `${homeUrl}/api/user/social-redirect/${provider}/${config.locale}` : `/api/connect/${provider}`) + (providerOptions.instanceRequired ? '?instance=' + connection.name.split('@')[1] : '')"
+            <a :href="(providerOptions.redirectViaHome ? `${homeUrl}/api/user/social-redirect/${provider}/${config.locale}` : `/api/connect/${provider}`) + (providerOptions.instanceRequired ? '?instance=' + connection.name.split('@').slice(-1)[0] : '')"
                class="badge bg-light text-dark border">
                 <Icon v="sync"/>
                 <T>user.socialConnection.refresh</T>

locale/_base/translations.suml

@@ -1209,50 +1209,50 @@ flags_alt:
     _zaimki: 'Logo of pronouns.page: two stylised letters “P”, first one rotated by 180°'
     Abroromantic: 'A rectangular flag with five equal-width horizontal stripes: tealish green, peppermint green, white, pink, and pinkish red; a heart shape in the middle that makes colours on its inside more vibrant and on the outside – subdued'
     Abrosexual: 'A rectangular flag with five equal-width horizontal stripes: tealish green, peppermint green, white, pink, and pinkish red'
-    Achillean: ''
+    Achillean: 'A rectangular flag with three equal width horizontal stripes. The top and bottom are light blue, and the middle is white. In the center is a light green flower with two green leaves on each side of it'
     Agender: 'A rectangular flag with seven equal-width horizontal stripes: black, grey, white, lime green, white, grey, black'
     Alloromantic_Asexual: ''
     Ambiamorous: ''
     Ambiamorous_: ''
     Anarcha-Queer: 'A rectangular flag split along the positive diagonal; upper-left part pink, bottom-right part black'
-    Androgyne: ''
-    Androsexual: ''
-    Aporagender: ''
-    Archaeopronouns: ''
+    Androgyne: 'A rectangular flag with three equal width vertical stripes: pink, purple, blue'
+    Androsexual: 'A rectangular flag with three equal width horizontal stripes: blue, brown, purple'
+    Aporagender: 'A rectangular flag with five equal width horizontal stripes: pink, light purple, yellow, light purple, blue'
+    Archaeopronouns: 'A rectangular flag with three horizontal stripes. The top and bottom stripes are equal width, and are colored grey and yellow respectively. The smaller middle stripe is white.'
     Aroace: 'A rectangular flag with five equal-width horizontal stripes: orange, yellow, white, cyan, dark blue'
     Aromantic: 'A rectangular flag with five equal-width horizontal stripes: green, light green, white, grey, black'
     Aromantic_Allosexual: ''
     Asexual: 'A rectangular flag with four equal-width horizontal stripes: black, grey, white, purple'
-    Autigender: ''
+    Autigender: 'A rectangular flag with five equal width horizontal stripes, creating a gradient from green on top, to dark green on the bottom. In the center is a black infinity symbol.'
     Bear: 'A rectangular flag with seven equal-width horizontal stripes: brown, orange, yellow, bright yellow, white, grey, black; emblem in upper hoist quarter: a black footprint of a bear.'
     Bicurious: ''
-    Bigender: ''
-    Bigender_: ''
+    Bigender: 'A rectangular flag with seven equal width horizontal stripes: dusty dark pink, pink, light purple, white, light purple, blue, dark blue'
+    Bigender_: 'A rectangular flag with five equal width horizontal stripes: pink, yellow, white, purple, blue'
     Biromantic: 'A rectangular flag with the following horizontal stripes: a wide pink, a narrow purple, and a wide blue; a heart shape in the middle that makes colours on its inside more vibrant and on the outside – subdued'
     Bisexual: 'A rectangular flag with the following horizontal stripes: a wide pink, a narrow purple, and a wide blue'
     Butch: 'A rectangular flag with seven equal-width horizontal stripes, forming a gradient from dark grey blue on top, to white in the middle, to purple on the bottom'
     Ceteroromantic: ''
-    Ceterosexual: ''
+    Ceterosexual: 'A rectangular flag with four equal width horizontal stripes: yellow, green, white, black'
     Cis_Ally: 'A rectangular flag with five equal-width horizontal stripes: blue, pink, white, pink, blue; overlaid a black upwards-facing chevron'
     Demiboy: 'A rectangular flag with seven equal-width horizontal stripes: dark grey, light grey, cyan, white, cyan, light grey, dark grey'
-    Demigender: ''
+    Demigender: 'A rectangular flag with seven equal width horizontal stripes: grey, light grey, light yellow, white, light grey, grey'
     Demigirl: 'A rectangular flag with seven equal-width horizontal stripes: dark grey, light grey, pink, white, pink, light grey, dark grey'
     Demiromantic: ''
     Demisexual: ''
-    Diamoric: ''
+    Diamoric: 'A rectangular flag with three equal width horizontal stripes: light green, white, light green. In the center is a crimson flower.'
     Enbian: ''
-    Fa*afafine: ''
-    Femme: ''
+    Fa*afafine: 'A rectangular flag with three equal width vertical stripes: dark red, yellow, dark red. In the center is a red flower.'
+    Femme: 'A rectangular flag with seven equal width horizontal stripes: purple, a lighter purple, pastel purple, white, baby purple, pink, violet'
     Gay: 'A rectangular flag with six equal-width horizontal stripes: red, orange, yellow, green, blue and purple'
     Gay_: 'A rectangular flag with seven equal-width horizontal stripes: dark green, greenish cyan, teal, white, cyan, purply blue, purple'
     Gender_Questioning: ''
-    Genderfae: ''
-    Genderfaun: ''
+    Genderfae: 'A rectangular flag with seven equal width horizontal stripes: green, light green, light yellow, white, pink, purple, violet'
+    Genderfaun: 'A rectangular flag with seven equal width horizontal stripes: orange, yellow, light yellow, white, aqua, blue, purple'
     Genderfluid: 'A rectangular flag with five equal-width horizontal stripes: pink, white, purple, black, blue'
-    Genderflux: ''
-    Genderqueer: ''
+    Genderflux: 'A rectangular flag with six equal width horizontal stripes: pink, a lighter pink, grey, blue, a darker blue, yellow'
+    Genderqueer: 'A rectangular flag with three equal width horizontal stripes: purple, white, green'
     Greyaromantic: ''
-    Greyasexual: ''
+    Greyasexual: 'A rectangular flag with five equal width horizontal stripes: purple, grey, white, grey, purple'
     Gynesexual: ''
     Heteroflexible: 'A rectangular flag with three equal-width horizontal stripes: blue, white and pink; an extra vertical stripe through the middle that’s coloured like a rainbow flag: red, orange, yellow, green, blue, purple'
     Heteroromantic: 'A rectangular flag with three equal-width horizontal stripes: blue, white and pink; a heart shape in the middle that makes colours on its inside more vibrant and on the outside – subdued'
@@ -1263,55 +1263,55 @@ flags_alt:
     Intersex: 'A rectangular flag with a yellow background and a purple circle in the centre'
     Leather_Pride: 'A rectangular flag with nine equal-width horizontal stripes: black, blue, black, blue, white,blue, black, blue, black; emblem in upper hoist quarter: a red heart symbol at an angle'
     Lesbian: 'A rectangular flag with five equal-width horizontal stripes: orangy red, orange, white, light magenta, dark magenta'
-    Lesbian_: 'A rectangular flag with a purple background and black labret in the middle'
+    Lesbian_: 'A rectangular flag with a purple background and black labrys (two-bladed-axe) in the middle'
     Lesbian__: 'A rectangular flag with six equal-width horizontal stripes: red, orange, yellow, green, blue and purple'
     Lesbian___: 'A rectangular flag with four equal-width horizontal stripes: purple, pink, yellow, green'
     Lesbiromantic: 'A rectangular flag with five equal-width horizontal stripes: orangy red, orange, white, light magenta, dark magenta; a heart shape in the middle that makes colours on its inside more vibrant and on the outside – subdued'
     LGBTQ: 'A rectangular flag with six equal-width horizontal stripes: red, orange, yellow, green, blue and purple'
-    Maverique: ''
+    Maverique: 'A rectangular flag with three equal width horizontal stripes: yellow, white, orange'
     Monoamorous: ''
     Monogamous: ''
     Muxe: ''
-    Nebularomantic: ''
-    Neopronouns: ''
-    Neopronouns_: ''
-    Neutrois: ''
+    Nebularomantic: 'A rectangular flag with seven equal width horizontal stripes: dusty dark red, red, light red, white, blue, dusty dark blue, dark blue'
+    Neopronouns: 'A rectangular flag with three horizontal stripes. The top and bottom stripes are equal width, and are colored green and purple respectively. The smaller middle stripe is white.'
+    Neopronouns_: 'A rectangular flag with five equal width horizontal stripes: green, blue, white, light yellow, off orange'
+    Neutrois: 'A rectangular flag with three equal width horizontal stripes: white, green, black'
     Nonbinary: 'A rectangular flag with four equal-width horizontal stripes: yellow, white, purple, black'
     Omniromantic: ''
-    Omnisexual: ''
-    Oriented_Aroace: ''
-    Pangender: ''
+    Omnisexual: 'A rectangular flag with five equal width horizontal stripes: pink, a darker pink, dark purple, bluish purple, light bluish purple'
+    Oriented_Aroace: 'A rectangular flag with four equal width horizontal stripes: dark blue, light dusty blue, white, aqua green'
+    Pangender: 'A rectangular flag with seven equal width horizontal stripes: yellow, light pink, light violet, white, light violet, light pink, yellow'
     Panromantic: ''
-    Pansexual: ''
+    Pansexual: 'A rectangular flag with seven equal width horizontal stripes: pink, yellow, blue'
     Polyamorous: 'A rectangular flag with a background split in two in the shape of a wave: top part crimson, bottom a lighter crimson-pink; emblem in the middle: an ivory white heart composed of the infinity symbol “∞” and a downwards-pointing chevron'
     Polyamorous_: 'A rectangular flag with three equal-width horizontal stripes: blue, red, black; emblem in the middle: a yellow Green letter pi “π”'
     Polyamorous__: 'A rectangular flag with four equal-width horizontal stripes: light green, darker green, light blue and dark blue; emblem: a white heart intertwined with the infinity symbol “∞”'
     Polyamorous___: 'A rectangular flag with three equal-width horizontal stripes: blue, red, black; emblem in the middle: a yellow heart intertwined with the infinity symbol “∞”'
     Polyromantic: ''
-    Polysexual: ''
-    Pomoromantic: ''
-    Pomosexual: ''
+    Polysexual: 'A rectangular flag with three equal width horizontal stripes: pink, green, blue'
+    Pomoromantic: 'A rectangular flag with seven equal width horizontal stripes: pink, light pink, white, light green, white, light pink, pink'
+    Pomosexual: 'A rectangular flag with seven equal width horizontal stripes: pink, light pink, white, light purple, white, light pink, pink'
     Progress_Pride: 'A rectangular flag with six equal-width horizontal stripes: red, orange, yellow, green, blue and purple; a chevron (triangle) on the left side composed of stripes of the following colours (from the left): white, pink, light blue, brown, black'
     Progress_Pride_: 'A rectangular flag with six equal-width horizontal stripes: red, orange, yellow, green, blue and purple; a chevron (triangle) on the left side composed of stripes of the following colours (from the left): yellow with a purple circle, white, pink, light blue, brown, black'
     Queer: 'A rectangular flag with six equal-width horizontal stripes: red, orange, yellow, green, blue and purple'
     Queer_: 'A rectangular flag with ivory white background and two downwards-pointing chevrons: light pink and washed-out purple'
     Queerian: ''
-    Queerplatonic: ''
-    Quoiromantic: ''
-    Sapphic: ''
-    Sapphic_: ''
+    Queerplatonic: 'A rectangular flag with five equal width horizontal stripes: yellow, pink, white, grey, black'
+    Quoiromantic: 'A rectangular flag with four equal width horizontal stripes: black, green, blue, grey'
+    Sapphic: 'A rectangular flag with three equal width horizontal stripes: pink, white, pink. In the center is a purple flower'
+    Sapphic_: 'A rectangular flag with four equal width horizontal stripes: purple, pink, yellow, green'
     Sexuality_Questioning: ''
-    Straight_Ally: 'A rectangular flag with six equal-width horizontal stripes: red, orange, yellow, green, blue and purple; overlaid a black upwards-facing chevron'
+    Straight_Ally: 'A rectangular flag with six equal-width horizontal stripes: red, orange, yellow, green, blue and purple; overlaid a white upwards-facing chevron'
     Toric: ''
     Transfeminine: 'A rectangular flag with seven equal-width horizontal stripes creating a gradient from blue on top, through pink in the middle, to blue on the bottom'
     Transgender: 'A rectangular flag with five equal-width horizontal stripes: blue, pink, white, pink, blue'
     Transmasculine: 'A rectangular flag with seven equal-width horizontal stripes creating a gradient from pink on top, through blue in the middle, to pink on the bottom'
     Transneutral: 'A rectangular flag with seven equal-width horizontal stripes creating a gradient from blue on top, through yellow in the middle, to pink on the bottom'
-    Trigender: ''
+    Trigender: 'A rectangular flag with five equal width horizontal stripes: pink, purple, green, purple, pink'
     Trixic: ''
-    Two_Spirit: ''
+    Two_Spirit: 'A rectangular flag with six equal width horizontal stripes: black, white, yellow, red, blue, green. In the center is a symbol colored black of a sun, along with a symbol colored black of a half-moon'
     Two_Spirit_: ''
-    Xenogender: ''
+    Xenogender: 'A rectangular flag with seven equal width horizontal stripes: red, light red, orange, yellow, blue, violet, purple. In the center is a symbol resembling a four-striped rainbow, the bottom parts being connected by a horizontal line. In the middle of the symbol is an upside down five pointed star.'
 
 calendar:
     header: 'Calendar'

locale/en/translations.suml

@@ -1202,7 +1202,7 @@ ban:
     terms: 'Terms rules broken (required)'
     action: 'Ban this person'
     confirm: 'Are you sure you want to ban @%username%?'
-    confirmUnban: 'Are you sure you want to remove ban (proposals) of @%username%? Keep in mind that it''s probably worth discussing such cases on Teams'
+    confirmUnban: 'Are you sure you want to remove ban (proposals) of @%username%? Keep in mind that it''s probably worth discussing such cases on Discord'
     header: 'Your profile is no longer public.'
     banned: 'Profile not published'
     termsIntro: 'According to our {/terms=Terms of Service}'

locale/pl/config.suml

@@ -1504,6 +1504,23 @@ links:
                 jak ważne są zaimki trans, ale jest to jednak nisza i margines.
             response: >
                 Nasza odpowiedź: {/blog/konserwatywny-prezent=„Miły prezent od konserwatywnej dziennikarki”}
+        -
+            icon: 'newspaper'
+            url: 'https://noizz.pl/lgbt/ojciec-powiedzial-mi-ze-nasza-wiez-zostala-zerwana-jestem-niebinarne/zjzv9ws'
+            headline: 'Ojciec powiedział mi, że nasza więź została zerwana. Jestem niebinarne'
+            extra: ' – <strong>noizz.pl</strong>'
+            quote: >
+                Dopiero kiedy pojawił się Słownik Neutratywów Języka Polskiego, a potem zaczął się rozrastać
+                i coraz więcej osób się o nim dowiadywało, zaczęłom się zastanawiać nad tym,
+                czy może by jednak nie zacząć posługiwać się innymi zaimkami. Myśl o zaimkach pchnęła mnie do tego,
+                żebym zastanowiło się nad swoją tranzycją w tamtym momencie.
+        -
+            icon: 'newspaper'
+            url: 'https://niestatystyczny.pl/2022/05/08/1000-slow-dziennie-rozmowa-z-peterem-v-brettem/'
+            headline: '1000 słów dziennie – rozmowa z Peterem V. Brettem'
+            extra: ' – <strong>niestatystyczny.pl</strong>'
+            quote: >
+                Czy korzystałeś z opracowań na temat tego, jak mówią o sobie osoby niebinarne, np. z pronouns.page?
 
     recommended:
         -

locale/pt/translations.suml

@@ -469,6 +469,7 @@ support:
     description: >
         Se você quiser de doar para o servidor, os domínios, stickers etc., ou simplemente comprar uma cerveja para ês autores,
         podem usar as ligações seguintes:
+    bankAccount: ' Transferência bancária'
 
 user:
     header: 'Conta'
@@ -564,6 +565,9 @@ profile:
         validation:
             userNotFound: 'Este usuário não existe'
             required: 'Relacionamento é um campo obrigatório'
+        removeSelf:
+            confirm: 'Você tem certeza de que quer remover seu perfil do círculo de @%username%?'
+            action: 'Remover-se'
     description: 'Descrição'
     names: 'Nomes'
     pronouns: 'Pronomes'
@@ -603,7 +607,7 @@ profile:
         defaults: 'Restaurar valores padrão'
         propagate: 'Salvar alterações em seus cartões em todas as línguas'
     timezone:
-        time: 'São %time% de um(a) %weekday% no meu fuso horário'
+        time: 'São %time% de um(a) %weekday% dentro do meu fuso horário'
         areas:
             America: 'América'
             Africa: 'África'
@@ -681,6 +685,16 @@ profile:
             respeito com quem visita seu cartão e avise previamente sobre tal conteúdo. Exemplos de Aviso de Conteúdo
             podem ser a "menção ao álcool", " insinuações sexuais", "menção á uma situação queerfóbica"...
         hide: ' Desfocar o cartão'
+        email:
+            content: 'Ume moderadore aplicou o seguinte aviso de conteúdo em seu cartão:'
+            subject: 'Aviso de conteúdo aplicado em seu perfil'
+        display: 'Continuar para o cartão'
+    flagsCustomForm:
+        altExample: 'Um exemplo de como um texto alternativo pode ser fraseado '
+        alt: '(opcional) Texto alternativo descrevendo a aparência da bandeira (veja abaixo)'
+        link: '(opcional) Link para mais informações'
+        description: '(opcional) Uma pequena descrição do rótulo'
+        label: 'Nome do rótulo'
 
 share: 'Compartilhar'
 
@@ -703,6 +717,8 @@ crud:
     validation:
         genericForm: 'A forma submetida é inválida. Corrija os problemas e envie novamente.'
         listMaxLength: 'o número máximo de elementos nessa lista é de %maxlength%.'
+        invalidLink: 'Formato de URL inválido'
+    alt: 'Texto alternativo'
 
 footer:
     license: >
@@ -724,6 +740,7 @@ footer:
             pageviews: 'Vizualizações de página'
             realTimeVisitors: 'Atualmente online'
             users: 'Usuáries registrades'
+            uptime: ' Tempo de atividade'
         month: 'mês'
         current: 'apenas essa versão'
 
@@ -800,7 +817,9 @@ mode:
     light: 'Modo claro'
     automatic: 'Automático'
     dark: 'Modo escuro'
+    accessibility: 'Configurações de acessibilidade'
     reducedColours: 'Cores reduzidas '
+    reducedItems: 'Número reduzido de itens mostrados'
 
 ban:
     reason: 'Razão de ban'
@@ -922,6 +941,12 @@ flags:
     Two_Spirit: 'Dois-espíritos'
     Xenogender: 'Xenogênero'
 
+flags_alt:
+    Progress_Pride_: >
+        Uma bandeira retangular com seis listras horizontais de mesma largura: vermelha, laranja, amarela, verde, azul e
+        roxa; uma divisa (triangular) no lado esquerdo, composta pelas seguintes cores (à partir da esquerda): amarela
+        com um círculo roxo, branca, rosa, azul clara, marrom, preta
+
 calendar:
     header: 'Calendário'
     headerLong: 'Calendário queer'

locale/ru/calendar/events.js

@@ -3,5 +3,5 @@ const {Event, day, week, month, dayYear, EventLevel} = require("../../../src/cal
 module.exports = [
     // --- static date ---
     new Event('Годовщина декриминализации гомосексуальности в России (1993)', '_law', 4, day(29), EventLevel.Day),
-    new Event('Годовщина декриминализации гомосексуальности в беларуси (1994)', '_law', 3, day(1), EventLevel.Day),
+    new Event('Годовщина декриминализации гомосексуальности в Беларуси (1994)', '_law', 3, day(1), EventLevel.Day),
 ];

locale/ru/translations.suml

@@ -534,7 +534,7 @@ support:
     description: >
         Если хотите скинуться на сервер, домены, стикеры и т. д., или просто купить нам пива,
         перейдите по одной из ссылок:
-    bankAccount: 'Bank transfer'  # TODO
+    bankAccount: 'Банковский перевод (IBAN)'
 
 user:
     header: 'Аккаунт'
@@ -554,25 +554,24 @@ user:
             Регистрация позволяет вам управлять своими аккаунтами/карточками ({/@example=как, например, этой}).
         passwordless: 'Сайт не хранит пароли. {https://avris.it/blog/passwords-are-passé=Больше информации}'
         instancePlaceholder: 'инстанция'
-        # TODO
-        domainPlaceholder: 'Domain'
-        deprecated: 'Deprecated'
+        domainPlaceholder: 'Доменное имя'
+        deprecated: 'Устаревший'
         depreciationNotice: >
-            This is not a reliable authentication provider.
-            <a href="%link%" target="_blank" rel="noopener">Check out this link for more details</a>.
-            We highly recommend making sure that you have a different login method available.
+            Это не надежный поставщик аутентификации.
+            <a href="%link%" target="_blank" rel="noopener">Проверьте эту ссылку для более подробной информации</a>.
+            Мы настоятельно рекомендуем использовать другой доступный метод входа.
     code:
         action: 'Подтвердить'
         invalid: 'Неверный код.'
     account:
         changeUsername:
             header: 'Имя пользователикс'
-            action: 'Изменить'  # TODO more explicitly "Change username"
+            action: 'Изменить имя пользователикс'
             invalid: 'Имя пользователикс должно состоять из 4-16 знаков и содержать в себе только цифры, буквы алфавита, точки, дефисы и нижнее подчёркивание.'
             taken: 'Это имя уже занято'
         changeEmail:
             header: 'Адрес электронной почты'
-            action: 'Изменить'  # TODO more explicitly "Change email"
+            action: 'Изменить адрес электронной почты'
             invalid: 'Неверный адрес электронной почты.'
             taken: 'Адрес электронной почты занят.'
         admin: 'Админ'
@@ -624,7 +623,7 @@ profile:
     flagsInfo: 'Перетащите ваши прайд-флаги в эту рамку.'
     flagsCustom: 'Загрузить пользовательский прайд-флаг'
     flagsCustomWarning: 'Этот прайд-флаг был добавлен пользователикс. Команда pronouns.page не несет ответственность за это.'
-    flagsAsterisk: 'This is not a queer identity, but we include it for people who are queer in other ways (eg. straight trans people).' # TODO
+    flagsAsterisk: 'Это не квир-идентичность, но мы включаем ее для людей, которые являются квир-людьми в других отношениях (например, гетеросексуальные трансгендеры).'
     links: 'Ссылки'
     linksRecommended: 'Рекомендуем перейти по этим ссылкам'
     timezone:
@@ -828,8 +827,8 @@ confirm:
     yes: 'Да'
     no: 'Нет, отменить'
     ok: 'Ок'
-    save: 'Save' # TODO
-    dismiss: 'Dismiss' # TODO
+    save: 'Сохранять'
+    dismiss: 'Увольнять'
 
 terms:
     header: 'Условия предоставления услуг'
@@ -889,7 +888,7 @@ terms:
                 misogyny: 'мизогиния'
                 harassment: 'харассмент'
                 impersonation: 'самозванство'
-                selfHarm: 'encouraging self-harm and/or suicide'  # TODO
+                selfHarm: 'поощрение членовредительства и (или) самоубийства'
                 childPornography: 'детская порнография'
                 unlawfulConduct: 'противоправное поведение'
                 misinformation: 'неверная информация'
@@ -898,10 +897,9 @@ terms:
                 trolling: 'троллинг'
                 advertisement: 'реклама'
                 copyright: 'нарушение авторских прав или использование трейд марок'
-            # TODO
             violationsStrict: >
-                We reserve the right to interpret as hate-speech all instances of non-obvious, concealed hate speech
-                (eg. telling some people to “DNI” because of their queer identity, transphobic dogwhistles like “superstraight” or “semibisexual”, etc.).
+                Мы оставляем за собой право интерпретировать как язык ненависти все случаи неочевидного, скрытого языка ненависти.
+                (например, говоря некоторым людям «DNI» (не взаимодействуй) из-за их гендерной идентичность, трансфобных «собачьего свистков», таких как «супернатурал», «супер-гетеро» или «полубисексуал» и т. д.).
             responsibility: >
                 Вы ответственны за любой контент, который публикуете на сервисе.
                 Если вы нарушите эти Условия представления услуг, мы удалим ваш контент без предварительного уведомления, а также можем отозвать ваше право на пользование сервисом.
@@ -998,6 +996,8 @@ mode:
     automatic: 'Автоматический'
     dark: 'Тёмная тема'
     reducedColours: 'Убрать цвета'
+    accessibility: 'Специальные возможности'
+    reducedItems: 'Уменьшить количество отображаемых элементов	'
 
 ban:
     reason: 'Причина блокировки'
@@ -1269,6 +1269,7 @@ calendar:
         nonbinary_week: 'Неделя осведомлённости о небинарности и небинарных'
         lesbian_aunts_day: 'День тёть-лесбиянок'
         autumn_testing_week: 'Неделя осеннего тестирования на ВИЧ в Европе'
+        hiv_aging_awareness_day: 'День осведомленности о ВИЧ/СПИДе при старении'
 
     banner: 'Мы празднуем'
     celebrating_custom: 'празднуется'

locale/tok/config.suml

@@ -3,13 +3,13 @@ locale: 'tok'
 header: true
 
 pronouns:
-    enabled: true
+    enabled: false
     route: 'nimi'
     default: 'ona'
     any: false
     plurals: false
     honorifics: false
-    multiple: false
+    multiple: true
     null: false
     emoji: false
     mirror: false
@@ -59,7 +59,8 @@ people:
 
 # optional, but would be nice to have
 english:
-    enabled: false
+    enabled: true
+    route: 'english'
 
 faq:
     enabled: true
@@ -75,11 +76,15 @@ contact:
         -
             footerName: 'jan Tepo'
             username: 'tbodt'
-            footerAreas: 'ante toki'
+            footerAreas: 'li ante e toki li pali e ilo'
+        -
+            footerName: 'jan Anteja'
+            username: 'Avris'
+            footerAreas: 'li pali e ilo'
         -
             footerName: 'jan Sewe (soweli e wan esun)'
             username: 'GiggyMantis'
-            footerAreas: 'ante toki'
+            footerAreas: 'li ante e toki'
     team:
         enabled: true
         route: 'kulupu-pi-nasin-toki'

locale/tok/pronouns/pronounGroups.tsv

@@ -1,2 +1,2 @@
 name	pronouns	description
-Example names	ona,jan Sewe,jan Tepo,jan Anateja	TODO wording … Pronouns in Toki Pona aren't gendered, but you can share a link to usage of your name in sentences
+nimi jan pu	ona,jan ni,jan Sonja,mama sama Mawijo	lipu pu li kepeken nimi ni tawa jan.

locale/tok/pronouns/pronouns.tsv

@@ -1,5 +1,5 @@
 key	description	normative	pronoun	plural	pluralHonorific	pronounceable	history	thirdForm	smallForm	sourcesInfo
 ona		FALSE	ona	FALSE	FALSE	TRUE
-jan Sewe		FALSE	jan Sewe	FALSE	FALSE	TRUE
-jan Tepo		FALSE	jan Tepo	FALSE	FALSE	TRUE
-jan Anateja		FALSE	jan Anateja	FALSE	FALSE	TRUE
+jan ni		FALSE	jan ni	FALSE	FALSE	TRUE
+jan Sonja		FALSE	jan Sonja	FALSE	FALSE	TRUE
+mama sama Mawijo		FALSE	mama sama Mawijo	FALSE	FALSE	TRUE

locale/tok/translations.suml

@@ -1,70 +1,53 @@
-title: 'Pronouns.page'
+title: 'lipu pi nimi mi'
 domain: 'tok.pronouns.page'
 description: 'Usage examples of personal pronouns and gender neutral language.'
 
 home:
-    link: 'Homepage'
+    link: 'lipu open'
     header: 'Pronouns'
     headerLong: 'List of pronouns'
-    welcome: 'Welcome to pronouns.page!'
+    welcome: 'lipu nimi la kama pona'
     intro: >
-        We're creating a source of information about nonbinary and gender neutral language.
-    why: 'What''s the deal with pronouns?'
+        lipu ni li pana e nimi wile jan e sona tonsi.
+    why: 'lipu li lon tan seme?'
     about:
         - >
-            Pronouns are those words that we use instead of calling someone by their name every time we mention them.
-            Most people use {/he=“he/him”} and {/she=“she/her”}, so we automatically assume which one to call them based on someone's looks.
-            But it's actually not that simple…
+            mi toki e sina la mi wile kepeken nimi sina. sina soweli Kasijona la mi o toki ala e ni: sina jan Punima. mi ni la sina ken pilin nasa li ken pilin ike.
         - >
-            Gender is complicated. Some people “don't look like” their gender.
-            Some prefer being called in a different way from what you'd assume.
-            Some people don't fit into the boxes of “male” or “female” and prefer more neutral language.
-        - >
-            This tool lets you share a link to your pronouns, with example sentences,
-            so that you can show people how you like to be called.
-        - >
-            Why does it matter? Because of simple human decency.
-            You wouldn't call Ashley “Samantha” just because you like that name more
-            or because “she looks like a Samantha to you”.
-            Or even if she <em>does</em> have the name “Samantha” in her birth certificate
-            but she absolutely hates it and prefers to use “Ashley”.
-            And it's the exact same story with pronouns –
-            if you don't want to be rude towards someone, please address them properly.
-            The only difference is that we usually know names, but not pronouns.
-            We introduce ourselves with a name, but not pronouns. Let's change that!
-    pronouns: 'List of popular pronouns'
+            ilo ni la sina ken pana e nimi sina tawa lipu.
+            lipu la ale li ken sona e ni: ona o toki e sina kepeken nimi seme?
+    pronouns: 'nasin nimi jan mute'
     generator:
-        header: 'Generator'
+        header: 'ilo nimi'
         description: >
-            You can also use this tool where you fill out the blanks in sentences
-            and generate a link ready to share with others.
+            sina pana e nimi tawa ni la ilo li toki e jan kepeken nimi ni.
         button: 'Show the generator'
         header2: 'Generate a link'
         base: 'Based on'
         alt: 'You can also enter interchangeable forms in each field separately, eg. <code>him&her</code> = “him” or “her”.'
         pronunciation: 'You can also specify the pronunciation after a pipe character, using IPA, eg. <code>faerself|fɛɹsɛlf</code> = “faerself” pronounced as /fɛɹsɛlf/.'
-    whatisit: 'What''s the deal with pronouns?'
+    whatisit: 'ni li suli tan seme?'
     mission:
-        header: 'Our mission'
-        summary: 'We fight for freedom, respect and inclusiveness in language.'
+        header: 'wile mi'
+        summary: 'nasin toki o pona tawa jan ale.'
         freedom: >
-            <strong>Freedom</strong>
-            – so that everyone can use <em>for themselves</em>
-            whatever pronouns they feel describe them best.
+            <strong>nimi pona o ken.</strong><br>
+            jan ale li ante. <em>ona taso</em> li sona pona e ni: nimi seme li pona tawa ona.
         respect: >
-            <strong>Respect</strong>
-            – so that <em>other people's</em> pronouns are respected.
+            <strong>ale o nimi pona e jan ante.</strong><br>
+            jan li sona e nimi pona ona la ale o pona o kepeken nimi wile ona.
         inclusiveness: >
-            <strong>Inclusiveness</strong>
-            – so that when we're referring to a person we don't know or a group of people,
-            we don't assume their gender and don't exclude them for any reason.
+            <strong>sona ala la nimi o awen pona.</strong><br>
+            ken la mi sona ala e jan e nimi wile ona.
+            ken la mi toki e nasin jan e jan wan ala.
+            nimi o pona lon ni kin.
 
 pronouns:
-    header: 'Pronouns'
-    headerLong: 'Pronouns'
-    examples: 'Example usage in sentences'
+    header: 'nimi'
+    headerLong: 'nimi jan'
+    examples: 'o kepeken lon toki sama ni'
     plural: 'Plural'
-    intro: 'My pronouns are'
+    intro: 'nimi mi li'
     normative: 'Normative'
     alt:
         button: 'Generate a link to interchangeable forms'
@@ -181,8 +164,8 @@ nouns:
     image: 'Picture'
 
 community:
-    header: 'Community'
-    headerLong: 'Queer community'
+    header: 'kulupu'
+    headerLong: 'kulupu tonsi'
 
 terminology:
     header: 'Terminology'
@@ -205,192 +188,24 @@ terminology:
     definition: 'Definition'
 
 faq:
-    header: 'FAQ'
-    headerLong: 'Frequently asked questions'
+    header: 'sona'
+    headerLong: 'sona pi nasin nimi jan'
     questions:
-        nonbinary:
-            question: 'What is nonbinary?'
+        toki-inli:
+            question: 'lipu Pronouns.page li lon tan ni: toki Inli li ike li nasin mije meli e nimi "ona". toki pona li ike ala la lipu ni o toki pona tan seme?'
             answer:
                 - >
-                    Gender is way more complicated than just a simple distinction male/female.
-                    Even from a purely biological standpoint we distinguish chromosomal sex,
-                    genetic sex, hormonal sex, phenotypic sex…
-                    They aren't necessarily congruent with each other, they don't have to be binary.
-                    {https://twitter.com/RebeccaRHelm/status/1207834357639139328=(more info here)}.
-                    And when we get to the cultural aspect, “gender” is a social construct.
-                    Depending on time and location being “a woman” or “a man” can mean having radically different
-                    rights, duties, norms… In Europe men used to wear high heels and stockings,
-                    and native peoples of North America have been recognising a third gender for centuries
-                    {https://gender.wikia.org/wiki/Two-Spirit=(two-spirit)}, etc. etc.
-                - >
-                    Nonbinary is an umbrella term describing the identity of people
-                    who don't fit the binary man/woman distinction.
-                    It includes for instance people who are
-                    {https://gender.wikia.org/wiki/Agender=agender},
-                    {https://gender.wikia.org/wiki/Gender_Fluid=gender fluid},
-                    {https://gender.wikia.org/wiki/Demigirl=demigirls},
-                    {https://gender.wikia.org/wiki/Demiboy=demiboys},
-                    and {https://gender.wikia.org/wiki/Non-binary=many many others}.
-                - >
-                    Nonbinary isn't necessarily something “between” masculinity and femininity. More like “beyond”.
-                    Nonbinary people don't have to be androgynous, don't have to use neutral pronouns, etc.
-                    It's about being free from gender roles, not about creating new ones.
-        why-respect:
-            question: 'Why should I respect some <em>strange</em> pronouns?'
-            answer:
-                - >
-                    Because addressing people in the way they want to be addressed is the basis of social relations.
-                    You wouldn't call Ashley “Samantha”, you wouldn't drop “sir”/“madam” when addressing your supervisor, etc.
-                    And there's people who don't want to be called either “{/he=he}” or “{/she=she}”.
-                    If you don't accept that, it only shows <em>you</em> in bad light.
-                - >
-                    “Strange pronouns” are just a matter of getting used to.
-        made-up:
-            question: 'Those pronouns are made up!'
-            answer:
-                - >
-                    Yes. Yes they are. And so is every single word in every language.
-                    Some words are just older than others.
-        how-to-know:
-            question: 'How do I know how to address someone?'
-            answer:
-                - >
-                    You can just ask! Yes, it might be a bit awkward, but the more we do it, the less awkward it gets.
-                    If we can ask somebody their name, why not their pronouns?
-                - >
-                    (Just please don't phrase it as “are you a boy or a girl?”.
-                    This question implies that there's just two correct answers,
-                    and it suggests unhealthy curiosity about someone's genitals.
-                    Instead, you could just ask “what are your pronouns?” or “how should I refer to you?”)
-                - >
-                    It's also important to normalise simply telling people your pronouns when you introduce yourself.
-                    “Hi, I'm Michæl, {/he=he/him}”. It's not hard – but for trans and nonbinary people it means so much!
-                    It's even easier done online: just put your pronouns (or a link to examples from our website) to your bio.
-                - >
-                    Remember also that many people might use a different name and a different set of pronouns depending on situation.
-                    They might not be out among friends or coworkers yet, but among friends be comfortable living their truth.
-                    Be mindful. You might for instance ask them “which pronouns should I use in front of your boss?”, etc.
-                - >
-                    Some people give multiple pronouns, eg. “{/he&she=he/she}” or “{/they&he=they/he}”.
-                    That means they like all of those forms. Usually, the first one is the preferred one.
-        who-uses-it:
-            question: 'Does anyone even use that?'
-            answer:
-                - >
-                    Yes! Millions of enbies all around the world.
-                    Every pronoun listed here has someone that actually uses it in everyday life.
-        authority:
-            question: 'Are those nonbinary pronouns approved by some kind of authority?'
-            answer:
-                - >
-                    Language is not some kind of god-given, ancient magic set in stone.
-                    It's just a tool that we use to communicate.
-                    When we change as a society, and when the world around us changes,
-                    we adjust the language we use to be able to better describe it.
-                    We're its users, so <em>we're the authority</em> on how we want to use it.
-                - >
-                    Dictionaries take their time to start including those changes,
-                    which doesn't make the change illegitimate in any way.
-                    But eventually the new forms, if used often enough, get included in dictionaries.
-                    {https://www.merriam-webster.com/words-at-play/singular-nonbinary-they=Merriam Webster}, for example,
-                    accepts the use of {/they=singular “they”} as a nonbinary pronoun.
-                - >
-                    You can also read some {https://scholar.google.com/scholar?hl=en&q=neopronouns=academic papers}
-                    on neopronouns.
-        bio:
-            question: 'Why should I put my pronouns in bio on social media?'
-            answer:
-                - >
-                    If you're cis (= not trans) and you use “{/he=he}” or “{/she=she}” matching your gender,
-                    you might think that your pronouns are <em>obvious</em>.
-                    And yeah, maybe that's true – as long as your name is mentioned in the profile (and is traditionally male of female)
-                    or if you have your picture as avatar.
-                    Many people don't – so it's hard to guess how they want to be called.
-                - >
-                    But it's mostly about something more than that: your pronouns might be “obvious”,
-                    but there are people whose pronouns are not.
-                    They want to be addressed correctly, whether or not they “pass” as their gender,
-                    whether or not they have transitioned (or if they want to transition at all).
-                    Nonbinary people usually “don't look nonbinary”, we don't owe anyone androgyny.
-                - >
-                    Sharing our pronouns is very important for trans, nonbinary and gender nonconforming people.
-                    Alas, it also exposes and singles us out.
-                    But if cis people do the same, it means the world for us.
-                    It makes us feel more comfortable, safe and welcome
-                    {https://avris.it/blog/why-everyone-should-have-pronouns-in-their-bio=(more reasons here).}
-        change:
-            question: 'Can I change my pronouns?'
-            answer:
-                - >
-                    Of course! Nobody is surprised when someone changes their views, style, hobbies…
-                    So why would it be strange that they discovered a part of their identity,
-                    stopped liking their name, discovered a label that fits them well, etc.?
-        get-used-to:
-            question: 'Is it strange that I can''t get used to <em>my own</em> new pronouns?'
-            answer:
-                - >
-                    Not at all! After many years of using pronouns congruent with one's gender assigned at birth
-                    it's easy to forget oneself when switching to different ones.
-                - >
-                    Pronouns ≠ gender.
-                    Your gender won't drastically change just because you got confused once when someone called you “them”.
-                    Don't worry. Experiment. See what fits you best.
-        preferred-pronouns:
-            question: 'Why shouldn''t I say “preferred pronouns”?'
-            answer:
-                - >
-                    Because this phrase suggests that someone's pronouns are just a whim.
-                    If someone just “prefers” to be called she, he won't _really_ feel bad, if I call him a “he”, right?
-                    They look like a guy, after all, so it's gonna be easier for me!
-                - >
-                    No! It's our pronouns. Not our “preferred pronouns”. It's our names, not our “preferred names”.
-                    If you care about your trans and nonbinary friends and loved ones, then call them the right way.
-        gender-pronouns:
-            question: 'Why shouldn''t I say “gender pronouns”?'
-            answer:
-                - >
-                    Because gender ≠ pronouns. Pronouns are just grammar.
-                    Nonbinary folks can use binary pronouns, some lesbians use {/he=he/him} for cultural reasons, etc.
-                - >
-                    Simply say “pronouns”.
+                    mi ante e toki la mi ante mute e nasin ilo kin. mi weka e ni: lipu li wile toki e kule mute pi nimi "ona". nasin lipu li kama ni: sina ken toki e nimi sina.
         flags:
-            question: 'Can you add this flag? Can you remove that flag?'
+            question: 'o pana e sitelen kule ni! o weka e sitelen kule ni!'
             answer:
                 - >
-                    No.
-                - >
-                    Maintaining the list of flags and labels is an increasingly time-consuming task for our team.
-                    It's also challenging in terms of filtering out trolls and vandals from valid, good-faith identities.
-                    We don't want to be identity police. And we don't want to spend all our time on managing flags either.
-                    It's a project about language and pronouns, after all, not about flags. They're just a bonus.
-                - >
-                    We did our best to select a list of flags that are the most popular
-                    and, to our best knowledge, generally accepted.
-                    We are not planning to extend or shrink that list.
-                - >
-                    We are aware that a few flags might not be liked by some
-                    (eg. because of a history of TERFs trying to take over a term and make it transphobic,
-                    because of multiple confusing definitions,
-                    or even because of aspects of a life of a mythical character).
-                    We are queer and trans ourselves, we care about our trans siblings.
-                    Unfortunately, it's really hard to make such decisions
-                    when we get messages both from trans people asking to add a flag they honestly identify with,
-                    and also from other trans people asking to remove it because it somehow hurts trans people.
-                    It's not like history of every label is clear or like there's an authoritative source to look it up.
-                    And even if queerphobes try to make some terms hurtful,
-                    we believe in the community's power to reclaim hateful terms.
-                - >
-                    If you don't like a flag, just don't use it.
-                    If your flag is missing, just upload it
-                    (it will be marked as user-generated to mitigate vandalism).
-        custom-pronouns:
-            question: 'My pronouns aren''t listed'
+        mu:
+            question: 'mu?'
             answer:
                 - >
-                    There's a generator on the homepage, you can use it to create a link to any pronoun set you like.
-                - >
-                    You can also just list the five forms using slashes, eg. {/ze/zem/zir/zirs/zirself=ze/zem/zir/zirs/zirself}.
-                    Keep in mind that <strong>all five forms</strong> are required in that case, otherwise the app can only guess what exactly you mean.
+                    mu! mu mu.
+
 
 links:
     header: 'Links'
@@ -400,9 +215,9 @@ links:
     mediaShort: 'Media'
     media: 'Pronouns.page in the media'
 
-    social: 'Social media'
+    social: 'mi lon ma ilo ante'
 
-    languageVersions: 'Other language versions'
+    languageVersions: 'lipu ni li lon toki ante'
 
 people: ~
 
@@ -412,79 +227,78 @@ people: ~
 english:
     header: 'English'
     headerLong: 'An overview in English'
-    headerLonger: 'An overview of <language> nonbinary pronouns'
-    description: 'If you don''t speak <language>, yet still are interested in how this language tries to cope with the omnipresent binaries, we''ve prepared a short overview of those ideas in English.'
+    headerLonger: 'An overview of Toki Pona pronouns'
+    description: 'If you don''t speak Toki Pona, yet still are interested in how this language tries to cope with the omnipresent binaries, we''ve prepared a short overview of those ideas in English.'
     intro:
         - >
-            A summary in English…
+            Toki Pona doesn't have gendered pronouns at all. The pronoun {/li/ona=ona} can refer to anyone and anything. So this version of Pronouns.page makes no mention of pronouns, and is essentially a website for telling people what your name is.
+        - >
+            TODO(tbodt): finish writing this
 
 contact:
-    header: 'Contact'
-    authors: 'Authors of the website'
+    header: 'o toki tawa mi'
+    authors: 'jan ni li pali e lipu'
     groups:
         all: ''
         calendar: 'Queer Calendar Bot'
     faq: >
-        Before you write, check out our {/faq=FAQ} – maybe the answer to your question is already there.
+        sina wile e sona la, nanpa wan la o lukin e {/faq=lipu pi sona suli}. sona wile li lon ala la o toki tawa mi.
     technical: >
         Do you have a technical issue or question? Please include your username and as many details as possible
         (what does the error message say? are you on your phone or a desktop? which browser do you use?
         what steps can we do to reproduce the issue? can you attach a screenshot or a screen recording? etc.)
     hate: >
-        Wanna send us queerphobic hate mail?
-        Just give it up, we're not discussing with trolls.
-        It takes us less time to mute you and put your message in the spam folder than it took you to write it.
+        sina wile toki jaki utala e ike tonsi tawa mi la, o ala.
+        mi toki ala tawa jan ike.
+        sina pali e toki ike sina kepeken tenpo lili, taso mi weka e toki sina e sina kepeken tenpo lili lili.
     language: >
         We're an international team – people who created a specific language version
         might not be the same people who will read your message.
         So, if possible, we'd appreciate, if you contacted us in <strong>English or Polish</strong>.
     team:
-        name: 'The “Neutral Language Council” collective'
-        nameShort: 'Collective'
+        name: 'kulupu pi nasin toki pi kule jan ale'
+        nameShort: 'kulupu pi nasin toki'
         description: >
-            We are a queer collective dedicated to assembling, researching, shaping and promoting
-            gender neutral and nonbinary language.
-            We also support actions towards equality and social justice.
+            mi kulupu li wile e ni: toki li ken toki pona e kule jan ale.
+            nasin toki la mi alasa li pali li pona li pana.
+            kin la mi lukin sewi e kulupu anpa ale.
         extra: []
-        logo: 'Logo of the collective is a combination of the transgender symbol and a speech bubble that symbolises language.'
-        members: 'Current members'
-        member: 'Member of the collective'
+        logo: 'sitelen pi kulupu ni la sitelen tonsi en sitelen toki li wan.'
+        members: 'jan ni li lon kulupu'
+        member: 'li lon kulupu pali pi lipu ni'
         upcoming: 'Upcoming language versions'
         join:
-            header: 'Join us!'
+            header: 'o pali lon kulupu!'
             encouragement: >
-                Do you care about non-binary and gender-neutral language?
-                Do you want to help our collective in promoting it? Cool!
-                Extra help is very welcome!
-            areasIntro: 'Areas in which you might be able to help are for example:'
+                sina wile pona e nasin toki li wile pana e pali tawa kulupu mi la pona mute!
+                mi wile e pali sina!
+            areasIntro: 'mi ken wile e pali ni:'
             areas:
-                - 'expanding and moderating dictionaries and glossaries,'
-                - 'expanding and moderating the list of sources,'
-                - 'creating graphics and social media posts,'
-                - 'replying to direct messages,'
-                - 'moderating profiles,'
-                - 'creating a new language version,'
-                - 'translating,'
-                - 'coordinating the process of adding language versions,'
-                - 'writing blog posts,'
-                - 'programming,'
-                - '…'
+                - 'o pona e lipu nimi o pana e nimi sin'
+                - 'o pona e lipu ni: ona li toki e lipu ante mute'
+                - 'o pana e toki pona e sitelen pona tawa ale lon lipu mi kulupu'
+                - 'jan li toki tawa mi kulupu la o toki tawa ona'
+                - 'o weka e lipu jan ike'
+                - 'o pali e lipu sama kepeken toki ante'
+                - 'o lawa e pali ni: jan li pali e lipu sama kepeken toki ante'
+                - 'o pali e lipu lili lon lipu ni o toki e ijo sin'
+                - 'o pali e ilo'
+                - 'pali ante mute'
             allies: >
-                Some of those things require a perspective of a nonbinary person, others not necessarily.
-                That's why we also invite binary allies.
-            how: 'How to join? Send us an email to {mailto:contact@pronouns.page=contact@pronouns.page}, in which you:'
+                pali mute li wile e sona tonsi la jan tonsi o pali ni. pali ante mute li wile ala e ni la mi ken wile e jan pi tonsi ala.
+            how: 'sina wile kama lon kulupu la, o toki tawa mi kepeken nimi {mailto:contact@pronouns.page=contact@pronouns.page} o toki e ni:'
             application:
-                - 'introduce yourself,'
-                - 'link to your pronouns.page profile,'
-                - 'link to your social media,'
-                - 'say if you have some experience in activist work,'
-                - 'say what you would like to help with.'
+                - 'sina seme?'
+                - 'lipu pronouns.page la lipu sina li lon seme?'
+                - 'sina pana e toki tawa ale lon lipu ante seme?'
+                - 'sina pali ala pali sama ni lon tenpo pini: sina utala tawa pona kulupu?'
+                - 'sina wile pana e pali seme?'
     contribute:
-        header: 'Contribute'
+        header: 'o pana e pali'
         intro: >
-            Pronouns.page is an open-source project created by volunteers.
-            You can add your contribution too! Here's some areas where we'd appreciate your help.
-            Active contributors will be invited to join our team.
+            lipu Pronouns.page li pali kulupu. jan mute li pana e pali tan wile pona tan wile mani ala.
+            sina kin li ken! mi wile e pali ni.
+            sina pali mute la mi ken kama e sina lon kulupu pali mi.
         entries:
             header: 'Add entries'
             description: >
@@ -506,43 +320,44 @@ contact:
                 Technical tasks are managed on {https://gitlab.com/PronounsPage/PronounsPage/-/boards=this kanban board}.
                 Just pick an unassigned task from the “To Do” column, assign it to yourself and start working on it.
                 Don't hesitate to ask questions.
-            footer: 'Technical tasks'
+            footer: 'o pali tawa ilo lipu'
 
 support:
-    header: 'Support'
+    header: 'o pana e mani'
     description: >
-        If you want to chip in for the server, domains, stickers etc., or simply buy the authors a beer,
-        you can use the links below:
-    bankAccount: 'Bank transfer'
+        lipu ni li wile e mani tawa ijo ilo mute.
+        kin la jan pali li ken wile e telo nasa lili.
+        sina wile pana e mani tawa ni la o kepeken nasin ni:
+    bankAccount: 'o pana e mani tan poki mani'
 
 user:
-    header: 'Account'
-    headerLong: 'Your account'
+    header: 'sina'
+    headerLong: 'sina'
     tokenExpired: 'Token has expired. Please refresh the website and try again.'
     tooManyAttempts: 'Too many attempts. Access to your account has been temporarily locked. Please try again later.'
     login:
-        help: 'To log in or create an account you can either use the social media buttons or enter your email in the field below and then confirm the code you will have received in your mailbox.'
-        placeholder: 'Email (or username, if you''re already registered)'
-        action: 'Log in / register'
-        emailSent: 'We''ve sent you <strong>%email%</strong> an email with a 6-digit code. Enter it here. The code is single-use and stays valid for 15 minutes.'
+        help: 'sina ken pana e lon sina tawa ilo kepeken nasin tu. ken la o luka e nena pi ilo ante lon poka. ken la o pana e nimi sina pi ilo Email la ilo li pana e nanpa nasa tawa ni la o pana e nanpa sama tawa ilo.'
+        placeholder: 'ilo Email la nimi sina (ilo ni la sina jo e nimi la ni kin li ken)'
+        action: 'o lon'
+        emailSent: 'mi pana e nanpa nasa luka wan tawa sina <strong>%email%</strong>. o pana e nanpa lon ni. nanpa ni li ken e sina lon tenpo wan taso lon tenpo poka taso.'
         userNotFound: 'User not found.'
         email:
-            subject: 'Your login code is {{code}}'
-            instruction: 'To confirm your email address, enter the following single-use code on the website:'
-            extra: 'If you didn''t order this code, simply ignore this message.'
+            subject: 'nanpa nasa sina li {{code}}'
+            instruction: 'o pana e nanpa ni lon ilo la mi kama sona e sina:'
+            extra: 'sina wile ala e nanpa ni la o weka e lipu ni. ale li pona.'
         why: >
-            Registering lets you manage your cards ({/@example=like this one}).
-        passwordless: 'The website doesn''t store any passwords. {https://avris.it/blog/passwords-are-passé=More info.}'
+            sina kama lon ilo la sina ken pali e lipu sina ({/@example=sama lipu ni}).
+        passwordless: 'ilo li wile ala e ni: sina pali e nimi len open. {https://avris.it/blog/passwords-are-passé=o kama sona e nasin ante mi.}'
         instancePlaceholder: 'Instance'
         domainPlaceholder: 'Domain'
-        deprecated: 'Deprecated'
+        deprecated: 'pakala'
         depreciationNotice: >
             This is not a reliable authentication provider.
             <a href="%link%" target="_blank" rel="noopener">Check out this link for more details</a>.
             We highly recommend making sure that you have a different login method available.
     code:
-        action: 'Validate'
-        invalid: 'Invalid code.'
+        action: 'o lon'
+        invalid: 'nanpa li ike.'
     account:
         changeUsername:
             header: 'Username'
@@ -560,8 +375,8 @@ user:
         admin: 'Admin'
     logout: 'Log out'
     avatar:
-        header: 'Avatar'
-        change: 'Change'
+        header: 'sitelen'
+        change: 'o ante e sitelen'
         failed: 'Please reconnect your social media to fix the missing avatar.'
     deleteAccount: 'Delete account'
     deleteAccountConfirm: 'Are you sure you want to remove your account? This will be irreversible!'
@@ -589,7 +404,7 @@ user:
         disable: 'Disable MFA'
         disableConfirm: 'Are you sure you want to disable MFA?'
     qr:
-        header: 'QR code'
+        header: 'sitelen QR'
         download: 'Download QR code'
     modMessage:
         subject: 'A message from a moderator'
@@ -598,7 +413,7 @@ user:
 
 profile:
     description: 'Description'
-    names: 'Names'
+    names: 'nimi'
     pronouns: 'Pronouns'
     pronounsInfo: >
         You can enter a <strong>pronoun</strong> (eg. “they” or “she/her”)
@@ -610,10 +425,11 @@ profile:
         If your pronouns follow the {/pronouns#nameself=<strong>nameself pattern</strong>},
         you can also use a colon shorthand (eg. “:star”).
     pronounsNotFound: 'Unrecognised format. Please check out the instruction above.'
-    words: 'Words'
+    words: 'nimi ante'
     wordsColumnHeader: 'Column header'
-    birthday: 'Age'
-    birthdayInfo: 'We do not publish your birthday, just the calculated age.'
+    birthday: 'tenpo suno pi sike sin'
+    birthdayInfo: 'mi pana ala e ni tawa lipu sina. mi nanpa e mute pi tenpo sike sina li pana e ni taso.'
+    age: 'mi lon tenpo sike'
     timezone:
         header: 'Timezone'
         placeholder: 'Select your timezone'
@@ -623,19 +439,19 @@ profile:
         detect: 'Detect'
         publishArea: 'Publish the continent in your card'
         publishLocation: 'Publish the area in your card'
-        time: 'It''s %time% on a %weekday% in my timezone'
+        time: 'mi la tenpo ni li %time% lon tenpo suno %weekday%'
         approximate: 'It''s just an approximate location'
         areas:
-            Africa: 'Africa'
-            America: 'America'
-            Antarctica: 'Antarctica'
-            Arctic: 'Arctic'
-            Asia: 'Asia'
-            Atlantic: 'Atlantic'
-            Australia: 'Australia'
-            Europe: 'Europe'
-            Indian: 'Indian'
-            Pacific: 'Pacific'
+            Africa: 'ma Apika'
+            America: 'ma Mewika'
+            Antarctica: 'ma lete Antasika'
+            Arctic: 'ma lete Asika'
+            Asia: 'ma Asija'
+            Atlantic: 'telo Alansi'
+            Australia: 'ma Oselija'
+            Europe: 'ma Elopa'
+            Indian: 'ma Palata'
+            Pacific: 'telo Pasipi'
     flags: 'Flags'
     flagsInfo: 'Drag & drop your pride flags into this frame.'
     flagsCustom: 'Upload custom flags'
@@ -645,34 +461,34 @@ profile:
     linksRecommended: 'We recommend linking to'
     column: 'Column'
     opinions:
-        header: 'Legend/opinions'
-        description: 'Description…'
+        header: 'sitelen pilin'
+        description: 'sona…'
         colours:
-            _: '(Font colour…)'
-            pink: 'Pink'
-            red: 'Red'
-            orange: 'Orange'
-            green: 'Green'
-            blue: 'Blue'
-            grey: 'Grey'
+            _: '(kule…)'
+            pink: 'loje walo'
+            red: 'loje'
+            orange: 'loje jelo'
+            green: 'laso kasi'
+            blue: 'laso telo'
+            grey: 'pimeja'
         styles:
-            _: '(Style…)'
-            bold-italics: 'Bold & italics'
-            bold: 'Bold'
-            italics: 'Italics'
-            small: 'Small'
+            _: '(selo…)'
+            bold-italics: 'wawa en tawa poka'
+            bold: 'wawa'
+            italics: 'poka'
+            small: 'lili'
         validation:
             missingIcon: 'Icon is required'
             missingDescription: 'Description is required'
             duplicateIcon: 'Icon must be unique'
             duplicateDescription: 'Description must be unique'
             invalidOpinion: 'Selected icon was not found in the legend above'
-        custom: 'custom, added by the user:'
+        custom: 'ni li pilin sin tan jan ni:'
     header: 'Cards'
-    list: 'Your cards'
-    init: 'Create a card'
-    show: 'Show'
-    edit: 'Edit'
+    list: 'lipu nimi sina'
+    init: 'o pali e lipu'
+    show: 'o lukin'
+    edit: 'o ante'
     delete: 'Delete'
     deleteConfirm: 'Are you sure you want to delete this card?'
     editor:
@@ -681,27 +497,27 @@ profile:
         defaults: 'Restore defaults'
         propagate: 'Propagate this change to your cards in all languages'
     opinion:
-        yes: 'Yes'
-        jokingly: 'Jokingly'
-        close: 'Only if we''re close'
-        meh: 'Okay'
-        no: 'Nope'
-    bannerButton: 'Create a card'
+        yes: 'pona a'
+        jokingly: 'lon musi taso'
+        close: 'tan jan poka taso'
+        meh: 'ike ala'
+        no: 'ike'
+    bannerButton: 'o lipu e nimi sina e sina'
     card:
-        link: 'Card picture'
-        generate: 'Generate'
-        generating: 'Generation in progress… It could take a few minutes.'
+        link: 'ilo o sitelen e lipu'
+        generate: 'o pali e sitelen'
+        generating: 'ilo li pali… ni li kepeken tenpo.'
     empty: 'This person hasn''t created any cards yet.'
     personal:
-        header: 'Personal'
-        description: 'Only you can see this section'
+        header: 'ijo sina'
+        description: 'sina taso li ken lukin e ni'
     language:
-        header: 'Language'
-        description: '@%username%''s card is also available in the following languages'
+        header: 'toki'
+        description: 'toki ante ni la lipu ni li lon'
         # if your language has declension and it's hard to fit the username in that sentence,
         # just make is 'This card is…'
     circles:
-        header: 'My circle'
+        header: 'jan mi'
         info: >
             In this field you can tag the <strong>people closest to you</strong>, along with information
             which (non-)gendered words you refer to them with (eg. “spouse” vs. “wife” vs. “husband”).
@@ -713,20 +529,23 @@ profile:
         relationship: 'Relationship (eg. “partner”, “best friend”)'
         mutual: 'This connection goes both ways'
         yourMentions:
-            header: 'Your circles mentions'
+            header: 'jan ante ni la sina lon lipu pi jan ona'
             description: >
                 Here's the list of people who added you to their circles.
                 If you add them back, a checkmark [s:shield-check] will appear in both your cards.
         validation:
             userNotFound: 'Such user doesn''t exist'
             required: 'Relationship is a required field'
+        removeSelf:
+            action: 'o weka e mi'
+            confirm: 'sina wile ala wile weka a e sina tan lipu jan pi jan @%username%?'
 
-share: 'Share'
+share: 'o pana e ni tawa jan ante'
 
 crud:
     approve: 'Approve'
     hide: 'Hide'
-    remove: 'Remove'
+    remove: 'o weka e ni'
     removeConfirm: 'Are you sure you want to remove this item?'
     edit: 'Edit'
     add: 'Add'
@@ -745,30 +564,30 @@ crud:
 
 footer:
     license: >
-        {https://gitlab.com/PronounsPage/PronounsPage=Source code} and content are licensed under {/license=OQL}.
-    links: 'Contact, social media'
-    legal: 'Legal'
+         lawa {/license=OQL} li lawa e {https://gitlab.com/PronounsPage/PronounsPage=mama ilo lipu} e toki lipu.
+    links: 'o toki tawa mi'
+    legal: 'toki pi nasin lawa'
     financial: 'Financial transparency'
-    technical: 'Technical'
-    sibling: 'Sibling projects'
+    technical: 'ijo ilo'
+    sibling: 'pali poka'
     stats:
-        header: 'Stats'
-        overall: 'all language versions'
-        current: 'only this version'
+        header: 'nanpa'
+        overall: 'lipu ale pi toki ante'
+        current: 'lipu ni taso'
         keys:
-            users: 'Registered users'
-            cards: 'Cards'
-            visitors: 'Unique visitors'
-            pageviews: 'Page views'
-            realTimeVisitors: 'Currently online'
+            users: 'mi jo e jan'
+            cards: 'mi jo e lipu nimi'
+            visitors: 'mun li sike e ma la jan'
+            pageviews: 'mun la lukin'
+            realTimeVisitors: 'sina lukin e ni la jan ante lukin li'
             visitDuration: 'Avg visit duration'
             uptime: 'Uptime'
             responseTime: 'Avg response time'
-        month: 'month'
+        month: 'li lon lipu ni'
 
 notFound:
-    message: 'Page was not found'
-    back: 'Go back to the homepage'
+    message: 'lipu li lon ala'
+    back: 'o tawa lipu open'
 
 authRequired:
     message: 'You must log in to see this site'
@@ -784,8 +603,8 @@ confirm:
 
 terms:
     header: 'Terms of Service'
-    lastUpdate: 'Last Updated'
-    consent: 'By registering you''re accepting the {/terms=Terms of Service}.'
+    lastUpdate: 'lipu ni li kama ante lon tenpo'
+    consent: 'sina kama lon ilo la {/lawa=nasin lawa mi} li pona tawa sina.'
     #you can leave the terms untranslated, or translate it (copy it from the English version) and include the following disclaimer:
     #translationDisclaimer: >
     #    The following text is just an auxiliary translation.
@@ -877,8 +696,7 @@ terms:
                 will now be explicitly enumerated. See: {https://en.pronouns.page/blog/terms-pedophilia=this blog post}.
 
 privacy:
-    header: 'Privacy Policy'
-    # you can skip translating the rest of the "privacy" section
+    header: 'lipu lawa pi jo sona'
     content:
         intro: >
             This Privacy Policy describes how the Service provided on the website
@@ -887,29 +705,52 @@ privacy:
             The Service is operated by the “Neutral Language Council” collective
             who can be contacted via email:
         effort: >
-            We make every effort to store your data securely and to ensure that any non-public data we store
-            are not seized by or transferred to any third party, except those trusted parties described below.
+            sina pana e toki pi len ala e sona len tawa mi.
+            mi wile jo pona e ni sina.
+            mi pali suli tawa ni.
+            sina pana e ijo la jan ante o kama ala lukin e ona la mi wile len pona e ni sina.
+            sona sina li tawa tan mi tawa kulupu pona ante.
+            mi toki e kulupu pona lon anpa.
         data: >
-            Other than the data that you explicitly post on the Service as Content
-            or share with us implicitly (eg. OAuth access tokens, if you use social login options),
-            no additional private data connected to your account is being stored or processed by the Service.
+            mi awen ala e sona len mute sina.
+            mi jo ala e ona.
+            mi kepeken ala ona.
+            taso mi jo a e sona ni:
+            sina toki e ijo tawa jan ante lon mi la mi jo e ona.
+            sina kama lon sijelo sina kepeken sijelo pi ilo ante la mi jo e nimi len OAuth pi sijelo ni.
         editRemoval: >
-            You may edit or remove any Content you have posted on the Service.
+            sina toki e ijo tawa jan ante lon mi la sina ken ante e ona li ken weka e ona.
         contact: >
-            When you contact us by email we store your email address in order to answer you and to ask you follow-up questions.
+            sina toki tawa mi kepeken ilo Email la mi jo e nimi sina pi ilo Email.
+            ni la mi kin li ken toki tawa sina.
         cookies: >
-            We only use first-party cookies and local storage to keep you logged in and save your preferences.
+            sina lon mi la mi pana e sona lili ni tawa ilo sina:
+            sina jan seme?
+            sina wile e seme lon lipu ni?
+            sina weka tan lipu ni la sona ni li awen lon ilo sina.
+            ni la sina kama sin tawa lipu la sona li awen lon li pona e lipu.
+            ona li lon sin e sijelo sina li pana e wile sina tawa lipu.
+            sona ni li awen lon ilo sina taso.
+            kin kulupu esun ante li pana ala e sona tawa ilo sina tan wile mi.
+            ni la sona sina li awen lon anpa len.
         plausible: >
-            We use <strong>Plausible</strong> to analyse traffic on the website. Such data has no relation to your username, and your IP is anonymised.
-            You can read their privacy policy {https://plausible.io/privacy=<strong>here</strong>}.
+            jan seme li kama lon mi?
+            tenpo kama li seme?
+            mute jan li seme?
+            mi wile sona e ni.
+            mi kepeken ilo <strong>Plausible</strong> tawa ni.
+            ilo li kama jo e sona ni.
+            sona ni li jo ala e nimi sina e nimi IP pi ilo sina.
+            {https://plausible.io/privacy=lipu lawa jo ona ni} li lawa e ilo ni.
         arc: >
             We use <strong>arc.io</strong> to cover the costs of website maintenance without introducing ads.
             You can read more about them and their privacy policy
             {https://arc.io/faq=<strong>here</strong>}.
         hCaptcha: >
-            We use <strong>hCaptcha</strong> to filter out bots and prevent attacks.
-            You can read their privacy policy
-            {https://www.hcaptcha.com/privacy=<strong>here</strong>}.
+            mi wile ala e ni: ilo ike li utala e mi.
+            mi wile weka e ilo ni.
+            mi kepeken ilo <strong>hCaptcha</strong> tawa ni.
+            {https://www.hcaptcha.com/privacy=lipu lawa jo ona ni} li lawa e ilo ni.
         ezoic: >
             In order to fund the project we show ads using a third party technology called <strong>Ezoic</strong>.
             You can opt-in to allow them to personalise your experience.
@@ -917,8 +758,10 @@ privacy:
         logsBackups: >
             Logs and backups are stored for no longer than 18 months.
         gdpr: >
-            Your personal data are protected by the GDPR, which means you have the right
-            to see, correct, update and remove the data we store about you.
+            ma Elopa la lawa jo GDPR li len pona.
+            lawa ni li lawa e sona sina lon mi.
+            lawa ni li ni e sona sina:
+            sina wile la sina ken lukin e ona li ken ante e ona li ken weka e ona.
     consent:
         header: 'Cookie consent'
         required:
@@ -939,7 +782,7 @@ privacy:
         revoke: 'Reset cookie consent settings'
 
 admin:
-    header: 'Admin panel'
+    header: 'ilo lawa'
     user:
         user: 'User'
         createdAt: 'Registration date'
@@ -949,7 +792,7 @@ admin:
         confirmRole: 'Are you sure you want to switch @%username%''s role to "%role%"?'
 
 table:
-    empty: 'Empty…'
+    empty: 'ala…'
     count: 'Count'
     sort: 'Drag to sort'
     scrollUp: 'Scroll to the top'
@@ -963,11 +806,11 @@ api:
 quotation:
     start: '“'
     end: '”'
-    colon: ':'
+    colon: ''
 
 localise:
-    shorter: 'Add more'
-    short: 'Adding language versions'
+    shorter: 'o pana e toki sina'
+    short: 'o pali e lipu ni pi toki sina'
     long: 'Want to create a new language version? Awesome! Please check out'
     longLink: 'this manual!'
 
@@ -980,14 +823,15 @@ error:
     generic: 'Something went wrong, please try again…'
 
 captcha:
-    reason: 'Please prove you''re not a bot to mitigate spam and DDoS attacks.'
-    invalid: 'Invalid CAPTCHA, please try again'
+    reason: 'sina ilo ala ilo? mi wile sona tan ni: ilo mute li lukin jaki mute e lipu ni.'
+    invalid: 'pakala. ken la sina ilo. sina ilo ala la o pali sin.'
 
 mode:
-    light: 'Light mode'
-    automatic: 'Automatic'
-    dark: 'Dark mode'
-    reducedColours: 'Reduced colours'
+    light: 'walo'
+    automatic: 'sama ilo sina'
+    dark: 'pimeja'
+    reducedColours: 'kule o wawa lili'
+    reducedItems: 'ijo o mute suli ala'
 
 ban:
     reason: 'Ban reason'
@@ -1009,7 +853,7 @@ ban:
         please respond to this email and we might get another look in a bigger group.
 
 report:
-    action: 'Report abuse'
+    action: 'lipu ni li ike'
     comment: 'Please explain briefly what''s wrong with this profile'
     confirm: 'Are you sure you want to report @%username%?'
     sent: 'Your report has been sent. Thanks for your help!'
@@ -1018,7 +862,7 @@ report:
 
 translationMode:
     header: 'Translation Mode'
-    action: 'Propose translations'
+    action: 'o toki pona e ilo ni'
     welcome: >
         Is there a translation missing or an existing one needs a correction?
         You can click on the blue button in the bottom right corner to turn the Translation Mode on and off.
@@ -1026,9 +870,9 @@ translationMode:
         in which you can modify the translation and compare it to the English text.
         Remember to click on the button “Commit changes” once you're done.
     logIn: 'You need to be logged in to propose translations'
-    changes: 'Changes'
-    commit: 'Commit changes'
-    revert: 'Revert changes'
+    changes: 'ante'
+    commit: 'o pana e ante'
+    revert: 'o weka e ante'
     pause: 'Pause Translation Mode'
 
 flags:
@@ -1276,5 +1120,5 @@ calendar:
     full: 'Full calendar'
 
 ukraine:
-    header: 'We stand with Ukraine.'
-    link: '{https://supportukrainenow.org=Here''s how you can support it.}'
+    header: 'ma Ukawina o wawa.'
+    link: '{https://supportukrainenow.org=o wawa e ona.}'

locale/tr/config.suml

@@ -3,98 +3,18 @@ locale: 'tr'
 header: true
 
 pronouns:
-    enabled: true
-    route: 'zamirler'
-    default: 'he'
-    any: 'heehangi zamir'
-    plurals: true
-    honorifics: false
-    multiple:
-        name: 'Değiştirilebilir formlar'
-        description: >
-            İkili olmayan birçok kişi, birbirinin yerine birden fazla form kullanır,
-            ve bunlardan herhangi biri olarak adlandırılmaktan rahatsız olmazlar.
-            Bazıları, diğerleri hakkında konuşurken bu formlar arasında gidip gelmeyi sever.
-        examples: ['he&she', 'he&they', 'she&they']
-    null:
-        description: >
-            {/avoiding=Avoiding gendered forms} / {/no-pronouns=no pronouns} / {/null=null pronouns} /
-            {/pronounless=pronounless} / {/nullpronominal=nullpronominal} / {/nameself=nameself}
-        history: >
-            Bazı insanlar zamir kullanmamayı tercih eder, bunun yerine adı, baş harfi,
-            Edilgen sesle zamirleri atlamak veya cümleyi yeniden yapılandırmayı tercih ederler.
-            See: {https://twitter.com/lypomania/status/1290274971642544128=lypomania's guide},
-            {https://lgbta.wikia.org/wiki/Nullpronominal=Nullpronominal on LGBTA Wiki}
-        morphemes:
-            pronoun_subject: '#'
-            pronoun_object: '#'
-            possessive_determiner: '#''s'
-            possessive_pronoun: '#''s'
-            reflexive: '#self'
-        examples: [':Andrea', ':S']
-        template: 'Örneklerden birini açın ve URL''deki adı/baş harfini kendinizinkiyle değiştirin.'
-        routes: ['kaçınmak', 'zamir-yok', 'null', 'zamirsiz', 'boş zamir', 'nameself']
-        ideas:
-            -
-                header: 'Zamirler yerine isim ya da baş harf kullanmak'
-                normative: true
-                examples:
-                    - ['I talked to him yesterday', 'I talked to {/:Sky=Sky} yesterday']
-                    - ['She is really beautiful', '{/:Soph=Soph} is really beautiful']
-                    -
-                        - 'Her graduation starts soon'
-                        - '{/:J=J}''s graduation starts soon'
-            -
-                header: 'Pasif ses'
-                normative: true
-                examples:
-                    - ['He answered the phone', 'The phone was answered']
-                    -
-                        - 'Wen takes good care of her cat'
-                        - 'Wen''s cat is well cared for'
-            -
-                header: 'Cümleyi yeniden ifade etme (dolaylı konuşma)'
-                normative: true
-                examples:
-                    - ['Lior did it all by himself', 'Lior did it all without any help']
-                    - ['Gael talks in his sleep', 'Gael talks while sleeping']
-            -
-                header: 'Bir zamirin tanımlayıcı bir isim veya ifade ile değiştirilmesi'
-                normative: true
-                examples:
-                    - ['She landed the plane safely', 'The pilot landed the plane safely']
-                    - ['This is Lea, she is into painting', 'This is Lea. My friend is into painting']
-                    - ['She argues that…', 'The person who started this discussion argues that…']
-            -
-                header: 'Zamirleri düşürme'
-                normative: true
-                examples:
-                    - ['Did you buy Tex her gift?', 'Did you buy Tex a gift?']
-                    - ['Yes, I bought it for her. I will give it to her tomorrow.', 'Yes, I bought it. I will give it tomorrow.']
-    emoji:
-        description: 'Emojiself zamirleri'
-        history: '{https://lgbta.wikia.org/wiki/Emojiself_Pronouns=Emojiself} online olarak kullanılır ve tellaffuz edilmezler.'
-        morphemes:
-            pronoun_subject: '#'
-            pronoun_object: '#'
-            possessive_determiner: '#''s'
-            possessive_pronoun: '#''s'
-            reflexive: '#self'
-        examples: ['💫', '💙']
-        template: 'Örneklerden birini açın ve URL''deki emojiyi kendi emojinizle değiştirin..'
-    slashes: true
-    others: 'Diğer zamirler'
+    enabled: false
 
 pronunciation:
     enabled: true
     voices:
-        GB:
-            language: 'en-GB'
-            voice: 'Emma'
-            engine: 'neural'
+        TR:
+            language: 'tr-TR'
+            voice: 'Filiz'
+            engine: 'standard'
 
 sources:
-    enabled: true
+    enabled: false
     route: 'kaynaklar'
     submit: true
     mergePronouns: {}
@@ -196,12 +116,20 @@ profile:
     enabled: true
     editorEnabled: true
     defaultWords:
-        - ['[saygı ifadesi yok]',  'yoldaş']
-        - ['kişi', 'adam', 'kadın', 'bayan', 'kanka', 'erkek', 'kız', 'ahbap', 'dost', 'aga', 'aşko', 'kardeş']
-        - ['güzel', 'yakısıklı', 'tatlı', 'ateşli', 'seksi']
-        - ['arkadaş', 'partner', 'erkek arkadaş', 'kız arkadaş', 'neşe arkadaşı', 'koca', 'karı', 'kissmate', 'canım', 'sevgili', 'boo']
+        -
+            header: ~
+            values: ['[saygı ifadesi yok]',  'yoldaş']
+        -
+            header: ~
+            values: ['kişi', 'adam', 'kadın', 'bayan', 'kanka', 'erkek', 'kız', 'ahbap', 'dost', 'aga', 'aşko', 'kardeş']
+        -
+            header: ~
+            values: ['güzel', 'yakısıklı', 'tatlı', 'ateşli', 'seksi']
+        -
+            header: ~
+            values: ['arkadaş', 'partner', 'erkek arkadaş', 'kız arkadaş', 'neşe arkadaşı', 'koca', 'karı', 'kissmate', 'canım', 'sevgili', 'boo']
     flags:
-        defaultPronoun: 'they'
+        defaultPronoun: 'o'
 
 calendar:
     enabled: true

locale/tr/pronouns/morphemes.js

@@ -1,7 +1 @@
-export default [
-    'pronoun_subject',
-    'pronoun_object',
-    'possessive_determiner',
-    'possessive_pronoun',
-    'reflexive',
-];
+export default [];

locale/tr/pronouns/pronounGroups.tsv

@@ -1,5 +1 @@
 key	name	pronouns	description
-normative	Binary forms	she,he	It's worth mentioning that pronouns ≠ gender. One can still be nonbinary while using pronouns that are congruent with (or opposite to) their gender assigned at birth.
-normative-ish	Normative-ish forms	they,they/them/themself,it,one	Those pronouns have been in common use in normative English already, but recently they got a slightly different new usage: describing a single, specific person. If you want to link to plural “they”, use {/they,!5,Plural%20“they”=this link}.
-neopronouns	Popular neopronouns	ae,ey,fae,xe,ze,ze/zir	Unlike the other pronouns, which are officially recognised as “grammatically correct”, albeit used in a different meaning than we're used to, neopronouns are novel. Not being included in dictionaries doesn't make them any worse, though!
-neopronouns	Other neopronouns	co,e,e/em/es,hu,ne,ne/nir,per,s/he,thon,ve,vi,vi/vim,zhe	These neopronouns are less often used than their more popular counterparts, but it doesn't make them any worse (and some of them are historically notable).  Some neopronouns' names are derived from the names of their creators. If your pronoun is not on the list, use the generator below!

locale/tr/pronouns/pronouns.tsv

@@ -1,26 +1,2 @@
-key	description	normative	pronoun_subject	pronoun_object	possessive_determiner	possessive_pronoun	reflexive	plural	pluralHonorific	pronounceable	history	thirdForm	smallForm	sourcesInfo
-he,he/him	Normative “he/him”	TRUE	he	him	his	his	himself	FALSE	FALSE	TRUE
-she,she/her	Normative “she/her”	TRUE	she	her	her	hers	herself	FALSE	FALSE	TRUE
-they,they/them	Singular “they”	TRUE	they	them	their	theirs	themselves	TRUE	TRUE	TRUE	Singular “they” has been used in English to describe an unspecified person since the late 1300s (it's even older than singular “you”!). Nowadays, it's the most popular choice among people who prefer gender neutral forms. It starts being {https://www.merriam-webster.com/words-at-play/singular-nonbinary-they=accepted by dictionaries} too.@It is also common to use {/they/them/themself=“themself”} as a reflexive form.		reflexive	This list of sources includes both the version with {/they=“themselves”} and {/they/them/themselves=“themself”}, as well as those that don't happen to use reflexive.
-they/them/themself	Singular “they”	TRUE	they	them	their	theirs	themself	TRUE	TRUE	TRUE	Singular “they” has been used in English to describe an unspecified person since the late 1300s (it's even older than singular “you”!). Nowadays, it's the most popular choice among people who prefer gender neutral forms. It starts being {https://www.merriam-webster.com/words-at-play/singular-nonbinary-they=accepted by dictionaries} too.@It is also common to use {/they=“themselves”} as a reflexive form.		reflexive	This list of sources includes both the version with {/they=“themselves”} and {/they/them/themselves=“themself”}, as well as those that don't happen to use reflexive.
-it,it/it,it/its	Personal “it”	TRUE	it	it	its	its	itself	FALSE	FALSE	TRUE	Although “it” is normally used for objects, not people, some actually do like being called that way. If someone wants you to call it “it”, it's not offensive – it's actually respectful. But remember that it/its pronouns have a history of transphobic use, so only with people who explicitly wish it.
-one,one/one's	Specific “one”	TRUE	one	one	one's	one's	oneself	FALSE	FALSE	TRUE	“One” is used in formal English when talking about a general or a hypothetical person. Recently people started using “one” also as their personal pronoun.
-ae,æ,ae/aer,æ/ær	Neopronoun “ae” / “æ”	FALSE	ae|eɪ	aer|ɛɹ	aer|ɛɹ	aers|ɛɹz	aerself|ɛɹˈsɛlf	FALSE	FALSE	TRUE	Created by David Lindsay for a 1920 novel <em>A Voyage to Arcturus</em>, where it's used by an alien, third-sex species.
-co,co/cos	Neopronoun “co/cos”	FALSE	co|ko	co|ko	cos|koz	co's|koz	coself|koˈsɛlf	FALSE	FALSE	TRUE	Created by Mary Orovan in 1970, derived from the Indo-European <em>*ko</em>.
-e,e/em/eir	Spivak pronouns	FALSE	e|i	em|ɛm	eir|ɛɹ	eirs|ɛɹz	emself|ɛmˈsɛlf	FALSE	FALSE	TRUE	Coined by Michael Spivak in 1990 for his manual <em>The Joy of TeX</em> to avoid gendering people in the examples.	possessive_determiner
-e/em/es	Neopronoun “e/em/es”	FALSE	e|i	em|ɛm	es|iz	ems|ɛmz	emself|ɛmˈsɛlf	FALSE	FALSE	TRUE	First created in 1890 by James Rogers based on {/he=he} and {/them=them} pronoun sets. Since then multiple versions were created, differing in declension and capitalisation.	possessive_determiner
-ey,ey/em	Elverson pronouns	FALSE	ey|eɪ	em|ɛm	eir|ɛɹ	eirs|ɛɹz	emself|ɛmˈsɛlf	FALSE	FALSE	TRUE	{https://web.archive.org/web/20211130005355/https://research.cristanwilliams.com/2012/02/24/1975-transgender-cross-gender/=Coined by Christine M. Elverson} in 1975 for a contest to create an alternative to the singular {/they=they}. Those forms are created by dropping “th” from “they”.
-fae,fæ,fae/faer,fæ/fær	Neopronoun “fae/faer”	FALSE	fae|feɪ	faer|fɛɹ	faer|fɛɹ	faers|fɛɹz	faerself|fɛɹˈsɛlf	FALSE	FALSE	TRUE	Created in 2014 by Tumblr user shadaras.
-hu,hu/hum	Humanist pronouns	FALSE	hu|hju	hum|hjum	hus|hjuz	hus|hjuz	huself|hjuˈsɛlf	FALSE	FALSE	TRUE	Coined by Sasha Newborn in 1982, based on the word “human”.
-ne,ne/nem	Neopronoun “ne/nem”	FALSE	ne|ni	nem|nəm	nir|nəɹ	nirs|nəɹz	nemself|nəmˈsɛlf	FALSE	FALSE	TRUE
-ne/nir	Neopronoun “ne/nir”	FALSE	ne|ni	nir|nəɹ	nir|nəɹ	nirs|nəɹz	nirself|nəɹˈsɛlf	FALSE	FALSE	TRUE
-per,per/per	Person pronouns	FALSE	per|pəɹ	per|pəɹ	per|pəɹ	pers|pəɹz	perself|pəɹˈsɛlf	FALSE	FALSE	TRUE	Coined by John Clark in an issue of the <em>Newsletter of the American Anthropological Association</em> in 1972, derived from the word “person”.
-s/he,s/he/hir	Neopronoun “s/he”	FALSE	s/he|shi	hir|hɪɹ	hir|hɪɹ	hirs|hɪɹz	hirself|hɪɹˈsɛlf	FALSE	FALSE	TRUE
-thon,thon/thons	Neopronoun “thon”	FALSE	thon|ðɑn	thon|ðɑn	thons|ðɑnz	thon's|ðɑnz	thonself|ðɑnˈsɛlf	FALSE	FALSE	TRUE	Created by Charles Crozat Converse in 1858, thon/thons/thonself is one of the first known examples of creating a gender neutral pronoun. “Thon” is a contraction of “that one”.
-ve,ve/ver	Neopronoun “ve/ver”	FALSE	ve|vi	ver|vəɹ	vis|viz	vers|vəɹz	verself|vəɹˈsɛlf	FALSE	FALSE	TRUE	Used eg. by Greg Egan in <em>Distress</em> (1995) and <em>Diaspora</em> (1998), and by Keri Hulme in <em>The Bone People</em> (1984).
-vi,vi/vir	Neopronoun “vi/vir”	FALSE	vi|vi	vir|viɹ	vis|viz	virs|viɹz	virself|viɹˈsɛlf	FALSE	FALSE	TRUE
-vi/vim	Neopronoun “vi/vim”	FALSE	vi|vi	vim|vɪm	vis|vɪs	vims|vɪms	vimself|vɪmˈsɛlf	FALSE	FALSE	TRUE
-xe,xe/xem	Neopronoun “xe/xem”	FALSE	xe|zi	xem|zɛm	xyr|ziɹ	xyrs|ziɹz	xemself|zɛmˈsɛlf	FALSE	FALSE	TRUE	Coined by Don Rickter in an issue of <em>Unitarian Universalist</em> in 1973.
-ze,ze/hir	Neopronoun “ze/hir”	FALSE	ze|zi	hir|hɪɹ	hir|hɪɹ	hirs|hɪɹz	hirself|hɪɹˈsɛlf	FALSE	FALSE	TRUE
-ze/zir	Neopronoun “ze/zir”	FALSE	ze|zi	zir|zəɹ	zir|zəɹ	zirs|zəɹz	zirself|zəɹˈsɛlf	FALSE	FALSE	TRUE	Based on the German plural 3rd person pronoun <em>sie</em>.
-zhe,zhe/zher	Neopronoun “zhe/zher”	FALSE	zhe|ʒi	zher|ʒəɹ	zher|ʒəɹ	zhers|ʒəɹz	zherself|ʒəɹˈsɛlf	FALSE	FALSE	TRUE
+key	description	normative	plural	pluralHonorific	pronounceable	history	thirdForm	smallForm	sourcesInfo
+o

locale/tr/translations.suml

@@ -14,9 +14,9 @@ home:
         - >
             Zamirler (“pronouns”) bir kişiye seslenirken her defasında ismini söylemek yerine kullanabileceğimiz kelimelerdir.
 
-            Ama bazı dillerde, örnek olarak Türkçede, Zamirler kişinin cinsiyetine bakmaksızın aynıdır,
-            bazılarında ise, mesela İngilizcede farklı insanlar için farklı zamirler, isimler hatta fiiller kullanılır.
-            Çoğu bay ve bayan transcinsiyet kategorisine girmez ve cinsiyetlerine uygun zamirleri kullanmak icin bir şey anlatmalarına gerek kalmaz.
+            Ama bazı dillerde, örnek olarak Türkçede, zamirler kişinin cinsiyetine bakmaksızın aynıdır.
+            İngilizce gibi bazı dillerde ise farklı insanlar için farklı zamirler, isimler hatta fiiller kullanılır.
+            Çoğu bay ve bayan (cinsiyet belirtmek amaçlı değildir!) “transcinsiyet” kategorisine girmez ve cinsiyetlerine uygun zamirleri kullanmak icin bir şey anlatmalarına gerek kalmaz.
             Bunun sonucu olarak birine nasıl hitap edeceğimize, otomatik olarak yalnızca dış görünüşü baz alırız.
             Ancak bu iş aslında o kadar kolay değil.
         - >
@@ -24,11 +24,11 @@ home:
             Bazıları sandığınızın aksine başka bir şekilde hitap edilmeyi ister.
             Bazı insanlar "erkek" ya da "kadın"  kutucuklarına sığmaz. Daha nötr bir dil tercih ederler.
         - >
-            Pronouns Page sayfası, insanların size nasıl hiap etmesinden hoşlandığınızı gösterebilmeniz için zamirlerinizin linkini örnek cümlelerle paylaşabilmenize olanak tanır.          .
+            Pronouns Page sayfası, insanların size nasıl hitap etmesinden hoşlandığınızı gösterebilmeniz için zamirlerinizin linkini örnek cümlelerle paylaşabilmenize olanak tanır.
         - >
             Bu neden önemli? Cevap ortada: basit insan ahlakı.
-            Sırf “Yaren” ismini daha çok sevdiğin için Zeynep'e “Yaren” demezsin. Kimse oyle bir şey yapmaz.
-            Veya, Zeynep sana “bir Yaren gibi” gözüktüğünden ona Zeynep demeyi reddetmezsin.
+            Sırf “Yaren” ismini daha çok sevdiğin için Zeynep'e “Yaren” demezsin. Kimse öyle bir şey yapmaz.
+            Veya, Zeynep sana “bir Yaren gibi” gözüktüğünden ona Zeynep demeyi reddedemezsin.
             Belki doğum sertifikasında "Yaren" ismi <em>olabilir</em>
             Ama o, bu isimden nefret edip “Zeynep” ismini tercih edebilir. Çok acayip bir durum değil.
             Tabii ki bu olay cinsiyet bazlı dillerde daha komplike bir sorun. Ve dilimizde bu sorunu aşmaya çalışmak oldukça önemli. Bir insanın isim, zamir, cinsiyet ve cinsiyet belirten sıfatlardaki tercihlerini önemsemek ve bunlara saygı duymak, ahlak seviyemizi gösterir ve dilimiz de diğer diller kadar önemlidir.
@@ -41,7 +41,7 @@ home:
             en uygun olan zamiri kullanmaya hakki vardir.
         respect: >
             <strong>Saygi</strong>
-            – çünkü <em>diğer kişilerin zamirine</em> saygıyla bakılmalıdır..
+            – çünkü <em>diğer kişilerin zamirine</em> saygıyla bakılmalıdır.
         inclusiveness: >
             <strong>Dahil Olmak, ve Dahil Etmek</strong>
             – cunku bilmediğimiz insanlarin zamirleri tahmin edilemez ve tahmin edilmemelidir.
@@ -50,7 +50,7 @@ home:
 pronouns:
     header: 'Zamirler'
     headerLong: 'Zamirler'
-    examples: 'Cumlede nasil gozukecegini anlamak icin ornek kullanim'
+    examples: 'Cumlede nasil gözükeceğini anlamak icin örnek kullanım'
     plural: 'Birden Çok'
     intro: 'Benim zamirlerim'
     normative: 'Genel Zamirler'
@@ -58,24 +58,24 @@ pronouns:
         button: 'Değiştirilebilir formlar için bir bağlantı yaratin'
         header: 'Değiştirilebilir Formlar'
         raw: 'Değiştirilebilir'
-    generated: 'Bu cinsiyet belirten kelimeler bir jeneratör ile olusturulmustur. Bunlar icin '
+    generated: 'Bu cinsiyet belirten kelimeler bir jeneratör ile olusturulmustur.'
     any:
         header: 'Bütün Cinsiyet Belirten Kelimeler Uygundur'
         short: 'hepsi'
         description: >
-            Bazi kisiler icin hangi cinsiyet belirten kelimeler onemli olsa bile, bazilari bu belirtmelere cok takmaz, ve hepsini uygun bulurlar—
-            tabii, kiminle konusuldugunu konusan anlatabilirse.
-options: 'diger seceneklere de goz atin [share]{/pronouns=here}.'
+            Bazı kişiler için hangi cinsiyet olduğunu belirten kelimeler önemli olsa bile, bazıları bu belirtmeleri çok umursamaz ve hepsini uygun bulurlar—
+            tabii, kiminle konuşulduğunu konuşan anlatabilirse.
+options: 'Diğer seçeneklere de göz atın [paylaş]{/pronouns=burada}.'
 others: 'Diger Turler'
 othersRaw: 'diger'
 or: 'veya'
-grammarTable: 'Tablo'
+grammarTable: 'Dilbilgisi Tablosu'
 
 sources:
     header: 'Kaynaklar'
     headerLong: 'Kültürel Metinlerden Örnekler'
     headerLonger: 'Kültürel Metinlerde Non-Binary Kisiler'
-    subheader: 'Non-binary Text Corpus'
+    subheader: 'Non-binary Text Corpus' # TODO
     toc: 'İçerikler'
     type:
         All: 'Bütün Seçenekler'
@@ -83,44 +83,44 @@ sources:
         Article: 'Literatür ve Makaleler'
         Movie: 'Filmler'
         Series: 'Diziler'
-        Song: 'Muzik'
-        Poetry: 'Siirler'
+        Song: 'Müzik'
+        Poetry: 'Şiirler'
         Game: 'Oyun'
-        Other: 'Diger'
+        Other: 'Diğer'
     submit:
-        header: 'Baska bir örnek eklemek için gonder.'
+        header: 'Baska bir örnek eklemek için gönder.'
         action: 'Gönder'
-        pronouns: 'Hangi cinsiyet belirten kelimeler kullanilmistir?'
-        pronounsInfo: 'Linkteki gibi en basit zamir veya cinsiyet belirten kelimeyi yaz: ör. “they”, “e/em/es”, “he&she”'
+        pronouns: 'Hangi cinsiyet belirten kelimeler kullanılmıştır?'
+        pronounsInfo: 'Linkteki gibi en basit zamir veya cinsiyet belirten kelimeyi yaz: ör. “ben”, “sen”, “onlar”'
         type: 'Kaynak Türü'
         author: 'Yazar'
-        title: 'Baslik'
+        title: 'Başlık'
         extra: 'Ek Bilgi (tercüman, bültenin yazari …)'
-        year: 'Yayinlama Yili (Türkçe Versiyonun)'
+        year: 'Yayınlama Yılı (Türkçe Versiyon İçin)'
         fragments: 'Fragmanlar'
-        fragmentsInfo: 'You can mark the relevant pronouns using square brackets: “Then \[\[they]] saw how \[\[they]] did all of that to \[\[themselves]].”'
+        fragmentsInfo: 'You can mark the relevant pronouns using square brackets: “Then \[\[they]] saw how \[\[they]] did all of that to \[\[themselves]].”' # TODO
         comment: 'Yorum Yap'
         link: 'Icerige Link'
         thanks: 'Katkınız için teşekkürler!'
-        another: 'Baska bir gonderi yap.'
-        moderation: 'Gonderileriniz yayinlanmadan once pronouns.page takimindan onaylanmalidir.'
+        another: 'Başka bir gönderi oluştur.'
+        moderation: 'Gönderileriniz yayınlanmadan önce Pronouns.page ekibi moderasyonu tarafından onaylanmalıdır.'
         key: 'Kaynaklar'
         keyInfo: 'Kaynakları dil sürümleri arasında sözlükle bağlantı kurmak için tanımlayıcı.'
-        images: 'Fotograflar'
-    otherVersions: 'Diger Dillerde'
-    referenced: 'Kullanimlari İçin Örnekler'
+        images: 'Fotoğraflar'
+    otherVersions: 'Diğer Diller'
+    referenced: 'Kullanımları İçin Örnekler'
 
 
 nouns:
     header: 'Sözlük'
-    headerLong: 'Cinsiyet bakimindan tarafsız isimler sözlüğü'
-    headerLonger: 'Cinsiyet Bakimindan Tarafsiz İsim'
-    description: 'Sadece zamir turunde kelimeler degil! Cinsiyet belirten diğer kelime listemizede bakin.'
+    headerLong: 'Cinsiyet Bakımından Nötr İsimler Sözlüğü'
+    headerLonger: 'Cinsiyet Bakımından Nötr İsim'
+    description: 'Sadece zamir olarak belirten kelimeler yok! Cinsiyet belirten diğer kelime listemize de bakın.'
     intro:
         - >
-            Kapsayıcı ve cinsiyetten bağımsız olmak, sadece birinin zamir turu kelimelerine saygı duymak değildir.
+            Kapsayıcı ve cinsiyetten bağımsız olmak, sadece birinin zamir bakımından hitap şekline saygı duymakla sınırlı değildir.
             Ayrıca işlerini, pozisyonlarını, ilişkilerini (vb.)
-            cinsiyetlerini varsayılmayan bir şekilde söyleyebilmektir.
+            cinsiyetlerini varsaymayan bir biçimde söyleyebilmektir.
             Tüm hemşireler “hemşir-e” değildir. Her eş “koca” veya “karı” değildir.
 
         - >
@@ -142,8 +142,8 @@ nouns:
     submit:
         action: 'Gönder'
         actionLong: 'Bir kelime gönder'
-        thanks: 'katkıda bulunduğunuz için teşekkürler!'
-        another: 'Baßka bir kelime gónder'
+        thanks: 'Katkıda bulunduğunuz için teşekkürler!'
+        another: 'Başka bir kelime gönder'
         moderation: 'Gönderimlerin yayınlanmadan önce onaylanması gerekecektir.'
 
     template: 'Şablon kullan'
@@ -176,7 +176,7 @@ terminology:
     term: 'Terim'
     original: 'Etimoloji'
     category: 'Kategori'
-    images: 'ek görseller, bayraklar dışında'
+    images: 'Ek görseller (bayraklar dışında)'
     definition: 'Anlamı'
 
 faq:
@@ -189,7 +189,7 @@ faq:
                 - >
                     Cinsiyet sadece basit bir kadın/erkek'ten daha fazladır.
                     Tamamen biyolojik bir bakış açısından bile kromozomal cinsiyeti ayırt ederiz,
-                    Genetik cinsiyet, hormonal cinsiyet, fenotipik cinsiyet…
+                    genetik cinsiyet, hormonal cinsiyet, fenotipik cinsiyet…
                     Birbirleriyle uyumlu olmaları gerekmez, bu yüzden ikili olmaları gerekmez.
                     {https://twitter.com/RebeccaRHelm/status/1207834357639139328=(daha fazla bilgi)}.
                     Ve kültürel yönüne geldiğimizde, "toplumsal cinsiyet" sosyal bir yapıdır.
@@ -201,132 +201,15 @@ faq:
                     Nonbinary, kadın/erkek taraflarına uymayan insanların
                     kimliğini tanımlayan şemsiye bir terimdir.
                     Örneğin, şu kişileri içerir:
-                    {https://gender.wikia.org/wiki/Agender=agender},
-                    {https://gender.wikia.org/wiki/Gender_Fluid=gender fluid},
-                    {https://gender.wikia.org/wiki/Demigirl=demigirls},
-                    {https://gender.wikia.org/wiki/Demiboy=demiboys},
-                    ve {https://gender.wikia.org/wiki/Non-binary=many many others}.
+                    {https://gender.wikia.org/wiki/Agender=cinsiyetsiz},
+                    {https://gender.wikia.org/wiki/Gender_Fluid=akışkan cinsiyet},
+                    {https://gender.wikia.org/wiki/Demigirl=demikız},
+                    {https://gender.wikia.org/wiki/Demiboy=demierkek},
+                    ve {https://gender.wikia.org/wiki/Non-binary=birçok diğerleri}.
                 - >
                     Nonbinary feminenlik ve maskülenlik "arasında" bir şey değildir. Daha çok "ilerisinde" gibidir.
                     Nonbinary insanlar androjen olmak zorunda değildirler, nötr zamirler kullanmak zorunda değildirler, vb.
-                    Cinsiyet rollerinden ayrı kalmaktır olayı, yenilerini üretmek değil.
-        why-respect:
-            question: 'Neden bazı <em>tuhaf</em> zamirlere saygı duymam gerekli?'
-            answer:
-                - >
-                    Çünkü insanlara nasıl hitap edilmesini istiyorsa öyle hitap etmek toplumsal ilişkilerin temelidir.
-                    Ashley'e "Samantha" demezsiniz, amirinize hitap ederken "efendim"/"hanımefendi" kelimesini çıkarmazsınız vs.
-                    Ve “{/he=he}” ya da “{/she=she}” zamirlerini kullanmayan insanlar vardır.
-                    Ve bunu kabullenmezseniz, bu sadece <em>sizi</em> kötü gösterir.
-                - >
-                    “Tuhaf zamirler” sadece alışmanın bir maddesidir.
-        made-up:
-            question: 'Bu zamirler uydurulmuş!'
-            answer:
-                - >
-                    Evet. Evet öyleler. Tüm dillerdeki tüm kelimeler de öyle.
-                    Sadece bazı kelimeler daha eski.
-        how-to-know:
-            question: 'Birine nasıl sesleniceğimi nasıl bileceğim?'
-            answer:
-                - >
-                    Sorabilirsin! Evet, tuhaf olabilir ama ne kadar çok sorarsak o kadar az tuhaflaşır.
-                    Birine ismini sorabiliyorsak, neden zamirlerini soramayalım?
-                - >
-                    (Sadece "kız mısın erkek mi" cümlesini kullanmayın.
-                    Bu soru sadece iki "doğru" cinsiyetin olduğunu savunur,
-                    ve birinin cinsel alanları hakkında sağlıksız bir merak bulundurur.
-                    Onun yerine “zamirlerin neler?” ya da “sana nasıl hitap edeyim?” sorularını sorabilirsiniz.)
-                - >
-                    Kendinizi tanıtırken insanlara zamirlerinizi söyleyerek normalleştirmek de önemlidir.
-                     “Selam, ben Ahmet, zamirlerim {/he=he/him}”. Gerçekten zor değil – ama trans ve non binary insanlar için çok önemli!
-                     online çok daha kolay: sadece zamirlerini (ya da websitemizdeki örnekleri) biyografine koy.
-                - >
-                    Ayrıca birçok kişinin duruma bağlı olarak farklı bir isim ve farklı bir zamir seti kullanabileceğini unutmayın.
-                    Arkadaş ya da iş arkadaşlarına daha açılmamış olabilirler, ama başka arkadaşlarıyla doğruyu paylaşacak kadar rahat ve yakın hissedebilirler.
-                    Akıllı olun. Emin olmak için şu soruyu sorabilirsiniz, “müdürünün önünde hangi zamirleri kullanayım?”, vs.
-                - >
-                    Bazı insanlar birden çok zamir kullanır, örn. “{/he&she=he/she}” ya da “{/they&he=they/he}”.
-                    Bu, kullandıkları zamirlerin her formunu beğendikleri anlamına gelir. Çoğunlukla ilk olan tercih edilendir.
-        who-uses-it:
-            question: 'Bunu kullanan var mı ki?'
-            answer:
-                - >
-                    Elbette! Milyonlarca non-binary kişi dünya çapında kullanıyor.
-                    Burda kullanılan her zamiri gerçek hayatta birileri kullanıyor.
-        authority:
-            question: 'Bu nonbinary zamirler bir topluluk tarafından falan mı onaylanıyor?'
-            answer:
-                - >
-                    Dil, tanrı vergisi, taşa kazınmış kadim bir sihir değildir.
-                    Sadece iletişim için kullandığımız bir alettir.
-                    Bir toplum olarak değiştiğimizde, ve etrafımızdaki dünya değiştiğinde,
-                    Dil üzerinde oynamalar yaparız ki bazı şeyleri daha iyi betimleyebilelim.
-                    Dilin kullanıcıları biziz, yani onu kullanma konusunda <em>topluluk da biziz</em>.
-                - >
-                    Sözlükler bu değişiklikleri dahil etmeye başlamak için zaman harcarlar,
-                    ve bu olayları hiçbir yönden gayrimeşru yapmaz.
-                    Ama yeni formlar, eğer onları daha çok kullanîrsak, sözlüklere eklenicekler.
-                    {https://www.merriam-webster.com/words-at-play/singular-nonbinary-they=Merriam Webster}, örnek olarak,
-                    {/they=singular “they”} zamirini non-binary bir zamir olarak kabul eder.
-                - >
-                    Ayrıca neopronounlar ûzerine yazılan bu yazıyı da okuyabilirsiniz.{https://scholar.google.com/scholar?hl=en&q=neopronouns=academic papers}
-        bio:
-            question: 'Neden zamirlerimi sosyal medya profillerime koymalıyım?'
-            answer:
-                - >
-                    Cis bir bireyseniz (= not trans) ve cinsiyetinize uygun olarak “{/he=he}” ya da “{/she=she}” zamirlerini kullanıyorsanız,
-                    zamirlerinizin <em>belli</em> olduğunu düşünebilirsiniz.
-                    Ve evet, belki de bu doğrudur – isminiz biyografinizde varsa (ve geleneksel olarak bir kadın ya da erkek ismiyse)
-                     ya da profil fotoğrafınızda kendi resminiz varsa.
-                    Çoğu insan değildir – bu yüzden nasıl seslenilmek isteyeceklerini tahmin edemeyiz.
-                - >
-                    Ama bu çoğunlukla bindan daha fazladır: sizin zamirleriniz belki “belli” olabilir,
-                    ama zamirleri belli olmayan çok insan var.
-                    Doğru belli edilmek istenirler, cinsiyetleri olarak “geçebilseler” bile,
-                    cinsiyet değiştirdilerse (ya da değiştirmek isteseler bile).
-                    Nonbinary insanlar genellikle “nonbinary gözükmezler”, hiç kimseye androjenlik borcumuz yok.
-                - >
-                    Zamirlerimizi paylaşmak trans, non binary ve doğum cinsiyeti uyumsuz insanlar için önemlidir.
-                    Ne yazık ki, aynı zamanda bizi ifşa ediyor ve ayırıyor.
-                    Ama eğer cis insanlar da aynısını yaparsa, bu bize dünyaları verir.
-                    Daha hoş karşılanmış, rahat ve mutlu hissetmemize sebep olur.
-                    {https://avris.it/blog/why-everyone-should-have-pronouns-in-their-bio=(daha fazla nedenleri).}
-        change:
-            question: 'Zamirlerimi değiştirebilir miyim?'
-            answer:
-                - >
-                    Elbette! Birinin görüşü, tarzı, hobileri değişince kimse şaşırmaz…
-                    Öyleyse kimliklerinin bir parçasını keşfetmeleri neden garip olsun ki,
-                    isminizi beğenmeyi bıraktınız, kendinize uyan bir etiket mi keşfettiniz vs.?
-        get-used-to:
-            question: '<em>kendi</em> yeni zamirlerim?’e alışamamam garip mi?'
-            answer:
-                - >
-                    Hiç de değil! Doğumda atanan zamirlerin yıllar boyu kullanımı sonrası
-                    farklı olanları kullanırken kendini adapte etmesi zordur..
-                - >
-                    zamir ≠ cinsiyet.
-                    Biri sizi “them” diye çağırınca ve bu sizin kafanızı karıştırıp sorgulamanıza sebep olduysa bu cinsiyetinizi büyük ölçüde değiştirmiyor.
-                    Korkma. Deneyimle. Sana en çok uyanı bul.
-        preferred-pronouns:
-            question: 'Neden “tercih edilen zamirler” dememeliyim?'
-            answer:
-                - >
-                    Çünkü bu cümle birinin zamirinin yalnızca bir heves olduğunu belirtiyor.
-                    Eğer biri she olarak çağırılmayı “tercih ediyorsa”, eğer ben o kişiye “he” diye seslenirsem o kişi _gerçekten_ kötü hissetmeyecek, değil mi?
-                    Tam anlamıyla bir erkek gibi görünüyor bu yüzden benim için ona böyle seslenmem daha kolay!
-                - >
-                    Hayır! Bunlar bizim zamirlerimiz. Bizim “tercih ettiğimiz zamirler” değil. Bunlar bizim isimlerimiz, bizim “tercih ettiğimiz isimler” değil.
-                    Eğer sen de nonbinary ve trans sevdiklerini önemsiyorsan, onları doğru yollarla çağır.
-        gender-pronouns:
-            question: 'Neden “cinsiyet zamiri” dememeliyim?'
-            answer:
-                - >
-                    Çünkü cinsiyet ≠ zamir. Zamirler sadece dil bilgisidir.
-                    Nonbinary kişiler ikili zamirler kullanabilir, bazı lezbiyenler {/he=he/him} zamirlerini kullanabilir.
-                - >
-                    Sadece “zamir” de.
+                    Olayı cinsiyet rollerinden ayrı kalmaktır, yenilerini üretmek değil.
         flags:
             question: 'Bu bayrağı ekleyebilir misiniz? Bu bayrağı kaldırabilir misiniz?'
             answer:
@@ -354,14 +237,6 @@ faq:
                     Eğer bir bayrağı sevmiyorsan onu kullanma.
                     Eğer bir bayrak kayıpsa/eksikse onu kendin yükle.
                     (vandalizmi azaltmak için yüklediğin bayrakların kullanıcı tarafından eklendiği özel olarak belirtilir).
-        custom-pronouns:
-            question: 'Benim zamirlerim listede yok.'
-            answer:
-                - >
-                    Anasayfada bir jeneratör var, onu istediğin herhangi bir zamir setini oluşturup bağlamak için kullanabilirsin.
-                - >
-                    Ayrıca eğik çizgiler kullanarak bir zamirin 5 farklı formunu listeleyebilirsin, örn. {/ze/zem/zir/zirs/zirself=ze/zem/zir/zirs/zirself}.
-                    Bu durumda o zamirin 5 farklı formunu da yazman gerekir, aksi takdirde uygulama neyi kast ettiğiniz hakkında yalnızca tahminde bulunabilir.
         business:
             question: 'Bir işletme misiniz?'
             answer:
@@ -413,8 +288,8 @@ contact:
                 Bizler ayrıca sosyal adalet ve eşitlik çerçevesindeki hareketleri destekliyoruz.
 
         extra:
-            - '{/blog/project-history=Short history of the project}'
-            - '{/blog/why-the-name=Why the name?}'
+            - '{/blog/project-history=Projenin kısa tarihi}'
+            - '{/blog/why-the-name=Neden bu isim?}'
         logo: 'Kolektifin logosu, trans sembolü ve ili sembolize eden konuşma balonunun bir araya gelmiş halidir.'
         members: 'Mevcut üyeler'
         member: 'Kolektif üyesi'
@@ -444,7 +319,7 @@ contact:
             how: 'Nasıl katılabilirim? Bu adresten bize bir mail yolla. {mailto:contact@pronouns.page=contact@pronouns.page}, içinde de:'
             application:
                 - 'Kendini tanıt,'
-                - 'pronouns.page profilini bırak,'
+                - 'Pronouns.page profilini bırak,'
                 - 'Sosyal medyanı bırak,'
                 - 'Eğer daha önce deneyimin olduysa söyle,'
                 - 'Neye yardım etmek istediğini söyle.'
@@ -496,13 +371,13 @@ user:
         why: >
             Hesabına giriş yapman kartlarını yönetebilmene/onları düzenleyebilmene olanak sağlar ({/@example=tıpkı bunun gibi}).
         passwordless: 'Bu websitesi hiçbir şifreyi kaydetmez. {https://avris.it/blog/passwords-are-passé=More info.}'
-        instancePlaceholder: 'Instance'
-        domainPlaceholder: 'Domain'
-        deprecated: 'Deprecated'
+        instancePlaceholder: 'Instance' # TODO
+        domainPlaceholder: 'Alan adı'
+        deprecated: 'Kullanımdan kaldırıldı'
         depreciationNotice: >
-            This is not a reliable authentication provider.
-            <a href="%link%" target="_blank" rel="noopener">Check out this link for more details</a>.
-            We highly recommend making sure that you have a different login method available.
+            Bu, güvenli bir kimlik doğrulama sağlayıcısı değil.
+            <a href="%link%" target="_blank" rel="noopener">Daha fazla ayrıntı için bu bağlantıya göz atın</a>.
+            Farklı bir oturum açma yöntemi kullanmanızı önemle tavsiye ederiz.
     code:
         action: 'Geçerli'
         invalid: 'Geçersiz kod.'
@@ -512,6 +387,7 @@ user:
             action: 'Değiştir'
             invalid: 'Kullanıcı adı 4-16 karakter uzunluğunda olmalı ve yalnızca sayılar, harfler, nokta, tire ve alt tire içermelidir.'
             taken: 'Bu kullanıcı adı alınmış.'
+            # TODO
             nonascii: >
                 Warning: if you decide for a username that contains non-ASCII characters,
                 keep in mind that in some contexts the link to your profile will be encoded as a less friendly string: “@%encoded%”.
@@ -525,7 +401,7 @@ user:
     avatar:
         header: 'Avatar'
         change: 'Değiştir'
-        failed: 'Please reconnect your social media to fix the missing avatar.'
+        failed: 'Eksik avatarı düzeltmek için lütfen sosyal medyanızı yeniden bağlayın.'
     deleteAccount: 'Hesabı sil'
     deleteAccountConfirm: 'Hesabını kaldırmak istediğinden emin misin? Bunun geri dönüşü olmayacak!'
     socialConnection:
@@ -535,29 +411,29 @@ user:
         disconnect: 'Bağlantıyı kes'
         disconnectConfirm: 'Bu bağlantıyı kaldırmak istediğine emin misin? (Her zaman e-posta hesabını kullanarak giriş yapabilirsin %email%)'
     mfa:
-        header: 'Multi-factor authentication'
+        header: 'Çok faktörlü kimlik doğrulma (MFA)'
         init: >
-            Scan this QR code (or enter the text code below) in your TOTP authenticator app (eg. {https://authy.com/=Authy})
-            and then enter the initial token that gets generated.
+            TOTP kimlik doğrulayıcı uygulamanızda (ör. {https://authy.com/=Authy}) bu QR kodunu tarayın (veya aşağıdaki metin kodunu girin)
+            ve ardından oluşturulan ilk belirteci girin.
         recovery:
-            header: 'Recovery code'
+            header: 'Kurtarma kodu'
             save: >
-                Save the following recovery codes in a safe place.
-                You'll be able to use them to bypass MFA in case you ever lose your authentication device.
-            saved: 'OK, I''ve saved them!'
-            enter: 'Enter recovery code'
-        cancel: 'Cancel login'
-        enabled: 'Enabled'
-        enable: 'Enable MFA'
-        disable: 'Disable MFA'
-        disableConfirm: 'Are you sure you want to disable MFA?'
+                Aşağıdaki kurtarma kodlarını güvenli bir yere kaydedin.
+                Kimlik doğrulama cihazınızı kaybetmeniz durumunda MFA'yı atlamak için bunları kullanabileceksiniz.
+            saved: 'Tamam, onları kurtardım!'
+            enter: 'Kurtarma kodunu girin'
+        cancel: 'Girişi iptal et'
+        enabled: 'Etkinleştirilmiş'
+        enable: 'MFA''yı etkinleştir'
+        disable: 'MFA''yı devre dışı bırak'
+        disableConfirm: 'MFA''yı devre dışı bırakmak istediğinizden emin misiniz?'
     qr:
-        header: 'QR code'
-        download: 'Download QR code'
+        header: 'QR kod'
+        download: 'QR kodunu indir'
     modMessage:
-        subject: 'A message from a moderator'
-        intro: 'Hi! One of our moderators has sent you the following message:'
-        respond: 'If you want to respond, you can simply reply to this email.'
+        subject: 'Moderatörden mesaj'
+        intro: 'Merhaba! Moderatörlerimizden biri size şu mesajı gönderdi:'
+        respond: 'Yanıt vermek istiyorsanız, bu e-postayı yanıtlamanız yeterlidir.'
 
 profile:
     description: 'Açıklama'
@@ -574,36 +450,37 @@ profile:
         çift nokta da kullanabilirsin (eg. “:star”).
     pronounsNotFound: 'Bilinmeyen format. Lütfen yukarıdaki talimatları okuyun.'
     words: 'Kelimeler'
-    wordsColumnHeader: 'Column header'
+    wordsColumnHeader: 'Sütun başlığı'
     birthday: 'Yaş'
     birthdayInfo: 'Yaşını yayınlamayacağız. Sadece yaşının hesaplabini yaptik.'
     timezone:
-        header: 'Timezone'
-        placeholder: 'Select your timezone'
+        header: 'Saat dilimi'
+        placeholder: 'Saat diliminizi seçin'
+        # TODO
         info: >
             If you fill out this field, your card will tell people <strong>what time it is where you live</strong>.
             Optionally, you can also chose to publish your approximate location.
-        detect: 'Detect'
-        publishArea: 'Publish the continent in your card'
-        publishLocation: 'Publish the area in your card'
-        time: 'It''s %time% on a %weekday% in my timezone'
-        approximate: 'It''s just an approximate location'
+        detect: 'Tespit etmek'
+        publishArea: 'Kıtayı kartınızda yayınlayın'
+        publishLocation: 'Alanı kartınızda yayınlayın'
+        time: 'Benim saat dilimimde %weekday% günü saat %time%'
+        approximate: 'Bu sadece yaklaşık bir konumdur'
         areas:
-            Africa: 'Africa'
-            America: 'America'
-            Antarctica: 'Antarctica'
-            Arctic: 'Arctic'
-            Asia: 'Asia'
-            Atlantic: 'Atlantic'
-            Australia: 'Australia'
-            Europe: 'Europe'
-            Indian: 'Indian'
-            Pacific: 'Pacific'
+            Africa: 'Afrika'
+            America: 'Amerika'
+            Antarctica: 'Antarktika'
+            Arctic: 'Arktik'
+            Asia: 'Asya'
+            Atlantic: 'Atlantik'
+            Australia: 'Avustralya'
+            Europe: 'Avrupa'
+            Indian: 'Hint'
+            Pacific: 'Pasifik'
     flags: 'Bayraklar'
     flagsInfo: 'Onur bayraklarınızı bu çerçeveye tutup bırakın.'
     flagsCustom: 'Kendi bayrağını yükle'
     flagsCustomWarning: 'Bu bayrak bir kullanıcı tarafından yüklenmiştir. pronouns.page takımı bundan sorumle değildir.'
-    flagsAsterisk: 'This is not a queer identity, but we include it for people who are queer in other ways (eg. straight trans people).'
+    flagsAsterisk: 'This is not a queer identity, but we include it for people who are queer in other ways (eg. straight trans people).' # TODO
     flagsCustomForm:
         label: 'Label name'
         description: '(optional) A short description of the label'
@@ -613,7 +490,7 @@ profile:
     links: 'Linkler'
     linksRecommended: 'Buralara bağlamanızı tavsiye ediyoruz'
     verifiedLinks:
-        header: 'Verified links'
+        header: 'Doğrulanmış bağlantılar'
         info: >
             The links that one puts publicly in one's profile will be marked with the shield icon,
             if they are verified by logging in using the given authentication provider,
@@ -621,32 +498,32 @@ profile:
             Our links also include a <code>rel="me"</code> tag, so that external websites can verify your card the other way round too.
     column: 'Kolon'
     opinions:
-        header: 'Legend/opinions'
-        description: 'Description…'
+        header: 'Legend/opinions' # TODO
+        description: 'Açıklama…'
         colours:
-            _: '(Font colour…)'
-            pink: 'Pink'
-            red: 'Red'
-            orange: 'Orange'
-            green: 'Green'
-            blue: 'Blue'
-            grey: 'Grey'
+            _: '(Yazı rengi…)'
+            pink: 'Pembe'
+            red: 'Kırmızı'
+            orange: 'Turuncu'
+            green: 'Yeşil'
+            blue: 'Mavi'
+            grey: 'Gri'
         styles:
-            _: '(Style…)'
-            bold-italics: 'Bold & italics'
-            bold: 'Bold'
-            italics: 'Italics'
-            small: 'Small'
+            _: '(Yazı stili…)'
+            bold-italics: 'Kalın ve italik'
+            bold: 'Kalın'
+            italics: 'Italik'
+            small: 'Küçük'
         validation:
-            missingIcon: 'Icon is required'
-            missingDescription: 'Description is required'
-            duplicateIcon: 'Icon must be unique'
-            duplicateDescription: 'Description must be unique'
+            missingIcon: 'Simge gerekli'
+            missingDescription: 'Açıklama gerekli'
+            duplicateIcon: 'Simge benzersiz olmalıdır'
+            duplicateDescription: 'Açıklama benzersiz olmalıdır'
             invalidOpinion: 'Selected icon was not found in the legend above'
-        custom: 'custom, added by the user:'
+        custom: 'Özel:'
     expendableList:
-        more: '… and %count% more items'
-        show: '(click to show)'
+        more: '… ve %count% ürün daha'
+        show: '(göstermek için tıklayın)'
     header: 'Kartlar'
     list: 'Kartların'
     init: 'Kart oluştur'
@@ -676,13 +553,11 @@ profile:
         generating: 'Oluşturuluyor… Birkaç dakika sürebilir.'
     empty: 'Bu kişi daha hiç kart yaratmamış.'
     personal:
-        header: 'Personal'
-        description: 'Only you can see this section'
+        header: 'Kişisel'
+        description: 'Bu bölümü sadece siz görebilirsiniz'
     language:
-        header: 'Language'
-        description: '@%username%''s card is also available in the following languages'
-        # if your language has declension and it's hard to fit the username in that sentence,
-        # just make is 'This card is…'
+        header: 'Dil'
+        description: '@%username%''in kartı aşağıdaki dillerde de mevcuttur'
     circles:
         header: 'My circle'
         info: >
@@ -704,17 +579,17 @@ profile:
             userNotFound: 'Such user doesn''t exist'
             required: 'Relationship is a required field'
     sensitive:
-        header: 'Content warning'
+        header: 'İçerik Uyarısı'
         info: >
             Some content might be allowed by our {/terms=Terms of Service},
             but still not be appropriate for minors, be potentially triggering for people with traumas, etc.
             Please be respectful to people visiting your card and warn them in advance.
             Examples of CW could be “mention of alcohol”, “sexual innuendos”, “mention of a queerphobic situation”…
-        display: 'Continue to the card'
-        hide: 'Blur out the card'
+        display: 'Karta devam et'
+        hide: 'Kartı bulanıklaştır'
         email:
-            subject: 'Content warning applied on your profile'
-            content: 'A moderator has applied the following content warnings to your card:'
+            subject: 'Profilinize uygulanan içerik uyarısı'
+            content: 'Bir moderatör, kartınıza aşağıdaki içerik uyarılarını uyguladı:'
 
 share: 'Paylaş'
 
@@ -733,23 +608,23 @@ crud:
     loginRequired: 'Bir girdi açmak için {/account=Kayıt ol}'
     copy: 'Bağlantı kopyala'
     download: 'İndir'
-    loadAll: 'Load all…'
+    loadAll: 'Hepsini yükle…'
     validation:
-        genericForm: 'The submitted form is invalid. Correct the issues and send it again.'
-        listMaxLength: 'The maximum number of elements in this list is %maxlength%.'
-        invalidLink: 'Invalid URL format'
-    alt: 'Alt text'
+        genericForm: 'Gönderilen form geçersiz. Sorunları düzeltin ve tekrar gönderin.'
+        listMaxLength: 'Bu listedeki maksimum öğe sayısı %maxlength%''dur.'
+        invalidLink: 'Geçersiz URL biçimi'
+    alt: 'Alternatif metin'
 
 footer:
     license: >
-        {https://gitlab.com/PronounsPage/PronounsPage=Source code} and content are licensed under {/license=OQL}.
+        {https://gitlab.com/PronounsPage/PronounsPage=Kaynak kodu} ve içerik {/license=OQL} kapsamında lisanslanmıştır.
     links: 'İletişim, sosyal medya, destek'
-    legal: 'Legal'
-    financial: 'Financial transparency'
-    technical: 'Technical'
-    sibling: 'Sibling projects'
+    legal: 'Yasal'
+    financial: 'Mali şeffaflık'
+    technical: 'Teknik'
+    sibling: 'Kardeş projeler'
     stats:
-        header: 'Stats'
+        header: 'İstatistikler'
         overall: 'all language versions'
         current: 'only this version'
         keys:

locale/vi/config.suml

@@ -23,7 +23,8 @@ pronouns:
             Có người không muốn dùng bất cứ danh xưng nào, thay vào đó là tên, tên viết tắt/kí hiệu,
             việc lược bỏ danh xưng bằng cấu trúc câu bị động, hoặc thay đổi cấu trúc câu nói.
         morphemes:
-            base_pronoun: '#'
+            3rd_person: '#'
+            2nd_person: '#'
         examples: [':Vanh', ':A']
         template: 'Bạn chỉ cần mở một trong các ví dụ trên và thay thế tên/tên tắt ở link bằng tên bạn.'
         routes: ['tránh', 'bỏ-danh-xưng', 'tên']

locale/vi/translations.suml

@@ -615,7 +615,7 @@ profile:
         Bạn có thể nhập một <strong>danh xưng</strong> (ví dụ “anh ấy” hoặc “cô ấy”)
         hoặc một <strong>đường link</strong> (ví dụ “https://vi.pronouns.page/:Vanh”).
         Bạn cũng có thể dùng {/pronouns#generator=<strong>trình tạo danh xưng</strong>} để điền vào câu với các danh xưng tùy ý.
-        Nếu danh xưng của bạn là {/pronouns#nameself=<strong>tên</strong>},
+        Nếu danh xưng của bạn là {/tránh=<strong>tên</strong>},
         bạn cũng có thể sử dụng dấu hai chấm (ví dụ “:Vanh”).
     pronounsNotFound: 'Định dạng không được chấp nhận. Vui lòng xem hướng dẫn ở trên.'
     words: 'Đại từ'
@@ -740,6 +740,9 @@ profile:
         validation:
             userNotFound: 'Người dùng không tồn tại'
             required: 'Mối quan hệ là trường bắt buộc'
+        removeSelf:
+            action: 'Xóa hồ sơ của bạn'
+            confirm: 'Bạn có chắc chắn muốn xóa hồ sơ của bạn khỏi vòng bạn bè của @%username% không?'
     sensitive:
         header: 'Cảnh báo nội dung'
         info: >
@@ -1026,6 +1029,8 @@ mode:
     automatic: 'Tự động'
     dark: 'Chế độ tối'
     reducedColours: 'Giảm màu'
+    accessibility: 'Cài đặt trợ năng'
+    reducedItems: 'Giảm số mục hiển thị'
 
 ban:
     reason: 'Lí do cấm'
@@ -1070,7 +1075,7 @@ translationMode:
     pause: 'Tạm dừng Chế độ dịch thuật'
 
 flags:
-    Abroromantic: 'Linh hoại tình cảm'
+    Abroromantic: 'Linh hoạt tình cảm'
     Abrosexual: 'Linh hoạt tính dục'
     Achillean: 'Achilles'
     Alloromantic_Asexual: 'Hữu ái vô tính'

locale/zh/translations.suml

@@ -159,21 +159,21 @@ nouns:
 
     image: '圖像'
 
-community: # TODO
+community:
     header: '社羣'
-    headerLong: 'Queer community'
+    headerLong: '酷兒社區'
 
-terminology: # TODO
-    header: 'Terminology'
-    headerLong: 'Dictionary of queer terminology'
+terminology:
+    header: '術語'
+    headerLong: '酷兒術語詞典'
     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'
+            與LGBTQ+社區相關的術語詞典。
+    term: '術語'
+    original: '術語'
+    category: '類別'
+    images: '其他圖片，來自旗幟目錄之外'
+    definition: '定義'
 
 faq:
     header: '常見問題'
@@ -491,7 +491,7 @@ profile:
     flagsInfo: '將您的驕傲旗幟拖放到此框架中.'
     flagsCustom: '上傳自定義旗幟'
     flagsCustomWarning: '此旗幟是由一名用戶上傳的，pronouns.page團隊不為此負責'
-    flagsAsterisk: 'This is not a queer identity, but we include it for people who are queer in other ways (eg. straight trans people).' # TODO
+    flagsAsterisk: '這不是酷兒身份，但我們將其包含為了其他方面很酷兒的人（例如異性戀跨性別者）中。'
     links: '鏈接'
     linksRecommended: '我們建議鏈接至'
     verifiedLinks:
@@ -540,13 +540,12 @@ profile:
             invalidOpinion: '未能在以上的圖例找到已選擇的圖示'
         custom: '用戶自定義的圖示:'
 
-    #TODO
-    #banner: >
-    #    You can also use our website to create a card, {/@example=like this one},
-    #    containing your names, pronouns, pride flags, liked words, etc.
-    #    Then you can link to it in your bio or email footer.
-    #    Just create an account {/account=here}.
-    #bannerButton: '創造名片'
+    banner: >
+        您還可以使用我們的網站創建一張卡片，{/@example=例如這張卡片}，
+        包含你的名字、代詞、驕傲旗幟、喜歡的詞等的卡片。
+        然後你可以在你的簡歷或電子郵件頁腳中鏈接到它。
+        只需在{/account=這裡創建一個帳戶}.
+    bannerButton: '創造名片'
     card:
         link: '名片圖片'
         generate: '生成'
@@ -576,6 +575,9 @@ profile:
         validation:
             userNotFound: '用戶並不存在'
             required: '必須填寫關係'
+        removeSelf:
+            action: '刪除你自己'
+            confirm: '您確定要從@%username%的圈子中刪除您的個人資料嗎？'
 
 share: '分享'
 
@@ -604,7 +606,7 @@ footer:
         {https://gitlab.com/PronounsPage/PronounsPage=原始碼}及內容採用{/license=OQL}條款授權。
     links: '聯絡我們'
     legal: '法律相關'
-    financial: '財務報告' # TODO: could also be 財政透明
+    financial: '財務報告'
     technical: '技術相關'
     sibling: '相關專案'
     stats:
@@ -699,6 +701,8 @@ mode:
     automatic: '自動'
     dark: '黑暗模式'
     reducedColours: '減少顏色'
+    accessibility: '輔助功能設置'
+    reducedItems: '減少物品數量' # TODO bad wording
 
 ban:
     reason: '封禁原因'
@@ -724,7 +728,7 @@ report:
     comment: '請簡述資料有什麼問題'
     confirm: '您確定要舉報@%username%嗎？'
     sent: '您的舉報已被傳送。感謝您的幫助！'
-    terms: 'Keep in mind what''s forbidden according to our {/terms=Terms of Service}' # TODO
+    terms: '請記住我們的{/terms=服務條款}禁止的內容'
     hoarding: '請不要舉報“用戶名稱囤積”的行為。我們會定時刪除沒有名片的用戶，您的報告並不會加快此過程。'
 
 translationMode:

package.json

@@ -21,7 +21,7 @@
     "avris-sorter": "^0.0.3",
     "aws-sdk": "^2.799.0",
     "body-parser": "^1.19.0",
-    "canvas": "^2.6.1",
+    "canvas": "^2.11.0",
     "cookie-parser": "^1.4.5",
     "cookie-universal-nuxt": "^2.1.4",
     "dotenv": "^8.2.0",
@@ -55,7 +55,7 @@
     "speakeasy": "^2.0.0",
     "sql-template-strings": "^2.2.2",
     "sqlite": "^4.0.12",
-    "sqlite3": "^5.0.0",
+    "sqlite3": "^5.1.4",
     "suml-loader": "^0.1.1",
     "twitter": "^1.7.1",
     "ulid": "^2.3.0",

routes/profileEditor.vue

@@ -17,7 +17,7 @@
         </div>
 
         <form @submit.prevent="save" :class="[saving ? 'saving' : '']">
-            <TabsNav :tabs="['opinions', 'names', 'pronouns', 'description', 'flags', 'links', 'birthday', 'timezone', 'words', 'circle', 'sensitive', $isGranted() ? 'admin' : undefined]"
+            <TabsNav :tabs="['opinions', 'names', config.pronouns.enabled ? 'pronouns' : undefined, 'description', 'flags', 'links', 'birthday', 'timezone', 'words', 'circle', 'sensitive', $isGranted() ? 'admin' : undefined]"
                      pills showheaders navclass="mb-3 border-bottom-0">
                 <template v-slot:admin-header>
                     <Icon v="user-cog"/>

server/routes/grantOverrides.js

@@ -6,7 +6,6 @@ import SQL from 'sql-template-strings';
 import fetch from 'node-fetch';
 import assert from 'assert';
 import { handleErrorAsync } from "../../src/helpers";
-import queryString from 'query-string';
 
 const normalizeDomainName = (domain) => {
     const url = new URL('https://' + domain.replace(/^https?:\/\//, ''));
@@ -140,7 +139,7 @@ router.get('/user/social/indieauth', handleErrorAsync(async (req, res, next) =>
         },
     }).then(res => res.text());
 
-    const profile = queryString.parse(response);
+    const profile = JSON.parse(response);
 
     if (!profile || !profile.me) { next(); return; }