diff --git a/app/controllers/settings/preferences/base_controller.rb b/app/controllers/settings/preferences/base_controller.rb
index c1f8b49898e..a7dc594a387 100644
--- a/app/controllers/settings/preferences/base_controller.rb
+++ b/app/controllers/settings/preferences/base_controller.rb
@@ -19,6 +19,6 @@ class Settings::Preferences::BaseController < Settings::BaseController
end
def user_params
- params.require(:user).permit(:locale, :time_zone, chosen_languages: [], settings_attributes: UserSettings.keys)
+ params.require(:user).permit(:locale, :time_zone, spoken_languages: [], chosen_languages: [], settings_attributes: UserSettings.keys)
end
end
diff --git a/app/javascript/mastodon/components/status_content.jsx b/app/javascript/mastodon/components/status_content.jsx
index 96452374dcc..d189c9706e4 100644
--- a/app/javascript/mastodon/components/status_content.jsx
+++ b/app/javascript/mastodon/components/status_content.jsx
@@ -13,7 +13,7 @@ import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react'
import { Icon } from 'mastodon/components/icon';
import PollContainer from 'mastodon/containers/poll_container';
import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
-import { autoPlayGif, languages as preloadedLanguages } from 'mastodon/initial_state';
+import { autoPlayGif, spokenLanguages, languages as preloadedLanguages } from 'mastodon/initial_state';
const MAX_HEIGHT = 706; // 22px * 32 (+ 2px padding at the top)
@@ -237,6 +237,10 @@ class StatusContent extends PureComponent {
this.node = c;
};
+ spokenByUser() {
+ return spokenLanguages.includes(this.props.status.get('language'));
+ }
+
render () {
const { status, intl, statusContent } = this.props;
@@ -244,7 +248,7 @@ class StatusContent extends PureComponent {
const renderReadMore = this.props.onClick && status.get('collapsed');
const contentLocale = intl.locale.replace(/[_-].*/, '');
const targetLanguages = this.props.languages?.get(status.get('language') || 'und');
- const renderTranslate = this.props.onTranslate && this.props.identity.signedIn && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('search_index').trim().length > 0 && targetLanguages?.includes(contentLocale);
+ const renderTranslate = this.props.onTranslate && this.props.identity.signedIn && !this.spokenByUser() && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('search_index').trim().length > 0 && targetLanguages?.includes(contentLocale);
const content = { __html: statusContent ?? getStatusContent(status) };
const spoilerContent = { __html: status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml') };
diff --git a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx b/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
index 47e81cf134b..1ada317cf5a 100644
--- a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
@@ -13,7 +13,7 @@ import CancelIcon from '@/material-icons/400-24px/cancel-fill.svg?react';
import SearchIcon from '@/material-icons/400-24px/search.svg?react';
import TranslateIcon from '@/material-icons/400-24px/translate.svg?react';
import { Icon } from 'mastodon/components/icon';
-import { languages as preloadedLanguages } from 'mastodon/initial_state';
+import { spokenLanguages, languages as preloadedLanguages } from 'mastodon/initial_state';
const messages = defineMessages({
changeLanguage: { id: 'compose.language.change', defaultMessage: 'Change language' },
@@ -84,6 +84,9 @@ class LanguageDropdownMenu extends PureComponent {
const { languages, value, frequentlyUsedLanguages } = this.props;
const { searchValue } = this.state;
+ // first show spoken languages and then frequently used
+ const orderedLanguages = spokenLanguages.concat(frequentlyUsedLanguages.filter((item) => spokenLanguages.indexOf(item) < 0));
+
if (searchValue === '') {
return [...languages].sort((a, b) => {
// Push current selection to the top of the list
@@ -93,10 +96,8 @@ class LanguageDropdownMenu extends PureComponent {
} else if (b[0] === value) {
return 1;
} else {
- // Sort according to frequently used languages
-
- const indexOfA = frequentlyUsedLanguages.indexOf(a[0]);
- const indexOfB = frequentlyUsedLanguages.indexOf(b[0]);
+ const indexOfA = orderedLanguages.indexOf(a[0]);
+ const indexOfB = orderedLanguages.indexOf(b[0]);
return ((indexOfA > -1 ? indexOfA : Infinity) - (indexOfB > -1 ? indexOfB : Infinity));
}
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index 60b35cb31ac..d43e6da66cd 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -43,6 +43,7 @@
* @property {boolean=} use_pending_items
* @property {string} version
* @property {string} sso_redirect
+ * @property {string[]} spoken_languages
*/
/**
@@ -118,6 +119,7 @@ export const criticalUpdatesPending = initialState?.critical_updates_pending;
// @ts-expect-error
export const statusPageUrl = getMeta('status_page_url');
export const sso_redirect = getMeta('sso_redirect');
+export const spokenLanguages = getMeta('spoken_languages');
/**
* @returns {string | undefined}
diff --git a/app/models/user.rb b/app/models/user.rb
index 72854569260..95a744a53c9 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -40,6 +40,7 @@
# settings :text
# time_zone :string
# otp_secret :string
+# spoken_languages :string default([]), not null, is an Array
#
class User < ApplicationRecord
@@ -134,6 +135,7 @@ class User < ApplicationRecord
normalizes :locale, with: ->(locale) { I18n.available_locales.exclude?(locale.to_sym) ? nil : locale }
normalizes :time_zone, with: ->(time_zone) { ActiveSupport::TimeZone[time_zone].nil? ? nil : time_zone }
normalizes :chosen_languages, with: ->(chosen_languages) { chosen_languages.compact_blank.presence }
+ normalizes :spoken_languages, with: ->(spoken_languages) { spoken_languages.compact_blank }
has_many :session_activations, dependent: :destroy
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 13f332c95c4..bb8a6bd5ce2 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -29,6 +29,7 @@ class InitialStateSerializer < ActiveModel::Serializer
store[:use_blurhash] = object_account_user.setting_use_blurhash
store[:use_pending_items] = object_account_user.setting_use_pending_items
store[:show_trends] = Setting.trends && object_account_user.setting_trends
+ store[:spoken_languages] = object_account_user.spoken_languages
else
store[:auto_play_gif] = Setting.auto_play_gif
store[:display_media] = Setting.display_media
diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml
index e2888f72129..142f05ec00b 100644
--- a/app/views/settings/preferences/other/show.html.haml
+++ b/app/views/settings/preferences/other/show.html.haml
@@ -44,7 +44,7 @@
label: I18n.t('simple_form.labels.defaults.setting_default_sensitive'),
wrapper: :with_label
- %h4= t 'preferences.public_timelines'
+ %h4= t 'preferences.languages'
.fields-group
= f.input :chosen_languages,
@@ -57,5 +57,16 @@
required: false,
wrapper: :with_block_label
+ .fields-group
+ = f.input :spoken_languages,
+ as: :check_boxes,
+ collection_wrapper_tag: 'ul',
+ collection: filterable_languages,
+ include_blank: false,
+ item_wrapper_tag: 'li',
+ label_method: ->(locale) { native_locale_name(locale) },
+ required: false,
+ wrapper: :with_block_label
+
.actions
= f.button :button, t('generic.save_changes'), type: :submit
diff --git a/config/locales/af.yml b/config/locales/af.yml
index adc9d5dbd5d..1164ca8417a 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -142,7 +142,6 @@ af:
preferences:
other: Ander
posting_defaults: Standaardplasings
- public_timelines: Openbare tydlyne
privacy_policy:
title: Privaatheidsbeleid
rss:
diff --git a/config/locales/an.yml b/config/locales/an.yml
index 637aa8c8b37..a13100fe4d9 100644
--- a/config/locales/an.yml
+++ b/config/locales/an.yml
@@ -1325,7 +1325,6 @@ an:
preferences:
other: Atros
posting_defaults: Configuración per defecto de publicacions
- public_timelines: Linias de tiempo publicas
privacy_policy:
title: Politica de Privacidat
reactions:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 4df24c984c0..0a959779f6f 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1633,7 +1633,6 @@ ar:
preferences:
other: إعدادات أخرى
posting_defaults: التفضيلات الافتراضية للنشر
- public_timelines: الخيوط الزمنية العامة
privacy:
hint_html: "قم بتخصيص الطريقة التي تريد بها أن يُكتَشَف ملفك الشخصي ومنشوراتك. يمكن لمجموعة متنوعة من الميزات في Mastodon أن تساعدك في الوصول إلى جمهور أوسع عند تفعيلها. خذ بعض الوقت لمراجعة هذه الإعدادات للتأكد من أنها تناسب حالة الاستخدام الخاصة بك."
privacy: الخصوصية
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 567e5357ebc..3578c4c3dd3 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -723,7 +723,6 @@ ast:
preferences:
other: Otres preferencies
posting_defaults: Configuración predeterminada del espublizamientu d'artículos
- public_timelines: Llinies de tiempu públiques
privacy:
hint_html: "Personaliza cómo quies que s'atope esti perfil y los sos artículos. Hai una variedá de funciones de Mastodon que puen ayudate a algamar audiencies más grandes cuando s'activen. Dedica un momentu pa revisar estes opciones y asegurate de que s'axusten al to casu."
privacy: Privacidá
diff --git a/config/locales/be.yml b/config/locales/be.yml
index a14ba3d2243..96fae464e1f 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1591,7 +1591,6 @@ be:
preferences:
other: Іншае
posting_defaults: Публікаваць па змаўчанні
- public_timelines: Публічныя стужкі
privacy:
hint_html: "Наладзьце тое, якім чынам ваш профіль і вашы паведамленні могуць быць знойдзеныя. Розныя функцыі ў Mastodon могуць дапамагчы вам ахапіць шырэйшую аўдыторыю. Удзяліце час гэтым наладам, каб пераканацца, што яны падыходзяць вам."
privacy: Прыватнасць
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index c71fab2177e..7b2a5015c26 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1561,7 +1561,6 @@ bg:
preferences:
other: Друго
posting_defaults: По подразбиране за публикации
- public_timelines: Публични хронологии
privacy:
hint_html: "Персонализирайте как искате профилът ви и публикациите ви да се намират. Разнообразие от функции в Mastodon може да ви помогнат да достигнете по-широка публика, когато е включено. Отделете малко време, за да прегледате тези настройки, за да се уверите, че отговарят на вашия случай на употреба."
privacy: Поверителност
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index f3fd91d11f6..14be819020e 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1561,7 +1561,6 @@ ca:
preferences:
other: Altre
posting_defaults: Valors per defecte de publicació
- public_timelines: Línies de temps públiques
privacy:
hint_html: "Personalitza com vols que siguin trobats el teu perfil i els teus tuts. Una varietat de característiques de Mastodon et poden ajudar a arribar a una major audiència quan les actives. Dedica una estona a revisar aquests ajustaments per assegurar que son els que necessites."
privacy: Privacitat
diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml
index 93eea8273f5..e9ededcb997 100644
--- a/config/locales/ckb.yml
+++ b/config/locales/ckb.yml
@@ -866,7 +866,6 @@ ckb:
preferences:
other: هی تر
posting_defaults: بڵاوکردنی بنەڕەتەکان
- public_timelines: هێڵی کاتی گشتی
reactions:
errors:
limit_reached: سنووری کاردانه وه ی جیاواز گه یشت
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 6edbbc95ffb..c5f2c147f51 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -846,7 +846,6 @@ co:
preferences:
other: Altre
posting_defaults: Paramettri predefiniti
- public_timelines: Linee pubbliche
reactions:
errors:
limit_reached: Limita di reazzione sfarente tocca
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 7e0aaaeefb6..7cba885a17a 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1592,7 +1592,6 @@ cs:
preferences:
other: Ostatní
posting_defaults: Výchozí možnosti psaní
- public_timelines: Veřejné časové osy
privacy:
hint_html: "Nastavte si, jak chcete, aby šlo váš profil a vaše příspěvky nalézt. Řada funkcí v Mastodonu vám může po zapnutí pomoci získat širší publikum. Věnujte chvíli kontrole těchto nastavení, aby vyhovovala vašim potřebám."
privacy: Soukromí
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 5f1b0b4bcef..b50cff20d2d 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1646,7 +1646,6 @@ cy:
preferences:
other: Arall
posting_defaults: Rhagosodiadau postio
- public_timelines: Ffrydiau cyhoeddus
privacy:
hint_html: "Cyfaddaswch sut rydych chi am i'ch proffil a'ch postiadau gael eu canfod. Gall amrywiaeth o nodweddion yn Mastodon eich helpu i gyrraedd cynulleidfa ehangach pan fyddwch wedi'ch eu galluogi. Cymerwch eiliad i adolygu'r gosodiadau hyn i sicrhau eu bod yn cyd-fynd â'ch pwrpas defnydd."
privacy: Preifatrwydd
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 004aea520ad..18069924d6b 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1560,7 +1560,6 @@ da:
preferences:
other: Andet
posting_defaults: Standarder for indlæg
- public_timelines: Offentlige tidslinjer
privacy:
hint_html: "Tilpas hvordan din profil og dine indlæg kan findes. En række funktioner i Mastodon kan hjælpe dig med at nå ud til et bredere publikum, hvis du aktiverer dem. Tjek indstillingerne herunder for at sikre, at de passer til dit brugsscenarie."
privacy: Privatliv
diff --git a/config/locales/de.yml b/config/locales/de.yml
index b133cf94bcb..b8833320d27 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1561,7 +1561,6 @@ de:
preferences:
other: Erweitert
posting_defaults: Standardeinstellungen für Beiträge
- public_timelines: Öffentliche Timelines
privacy:
hint_html: "Bestimme, wie dein Profil und deine Beiträge gefunden werden sollen. Eine Vielzahl von Funktionen in Mastodon können dir helfen, eine größere Reichweite zu erlangen, wenn sie aktiviert sind. Nimm dir einen Moment Zeit, um diese Einstellungen zu überprüfen und sicherzustellen, dass sie für deinen Anwendungsfall geeignet sind."
privacy: Datenschutz
diff --git a/config/locales/el.yml b/config/locales/el.yml
index e177bf342af..c471ded045c 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1421,7 +1421,6 @@ el:
preferences:
other: Άλλες
posting_defaults: Προεπιλογές ανάρτησης
- public_timelines: Δημόσιες ροές
privacy_policy:
title: Πολιτική Απορρήτου
reactions:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index a7e6ed7a665..f8214180f86 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1545,7 +1545,6 @@ en-GB:
preferences:
other: Other
posting_defaults: Posting defaults
- public_timelines: Public timelines
privacy:
hint_html: "Customise how you want your profile and your posts to be found. A variety of features in Mastodon can help you reach a wider audience when enabled. Take a moment to review these settings to make sure they fit your use case."
privacy: Privacy
diff --git a/config/locales/en.yml b/config/locales/en.yml
index aab8db18153..d7a93bcb17a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1560,9 +1560,9 @@ en:
too_few_options: must have more than one item
too_many_options: can't contain more than %{max} items
preferences:
+ languages: Languages
other: Other
posting_defaults: Posting defaults
- public_timelines: Public timelines
privacy:
hint_html: "Customize how you want your profile and your posts to be found. A variety of features in Mastodon can help you reach a wider audience when enabled. Take a moment to review these settings to make sure they fit your use case."
privacy: Privacy
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 95e3dd5a8d9..7d18c605538 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1466,7 +1466,6 @@ eo:
preferences:
other: Aliaj aferoj
posting_defaults: Afiŝaj defaŭltoj
- public_timelines: Publikaj templinioj
privacy:
hint_html: "Agordu kiel vi volas ke via profilo kaj viaj afiŝoj estu trovitaj. Diversaj funkcioj en Mastodon povas helpi vin atingi pli larĝan publikon kiam ĝi estas ebligita. Prenu momenton por revizii ĉi tiujn agordojn por certigi, ke ili taŭgas por via uzokazo."
privacy: Privateco
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 8ebe203560a..42b7f808a1f 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1561,7 +1561,6 @@ es-AR:
preferences:
other: Otras opciones
posting_defaults: Configuración predeterminada de mensajes
- public_timelines: Líneas temporales públicas
privacy:
hint_html: "Personalizá cómo querés que sean encontrados tu perfil y tus mensajes. Una variedad de funciones en Mastodon pueden ayudarte a alcanzar una mayor audiencia al estar activada. Tomate un momento para revisar esta configuración para asegurarte de que se ajusta a tu caso."
privacy: Privacidad
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index f39de2b27b1..d847fa5f54d 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1545,7 +1545,6 @@ es-MX:
preferences:
other: Otros
posting_defaults: Configuración por defecto de publicaciones
- public_timelines: Líneas de tiempo públicas
privacy:
hint_html: "Personaliza cómo te gustaría que tu perfil y tus publicaciones sean encontradas. En Mastodon tienes a tu disposición distintas características que pueden ayudarte a llegar a una audiencia más amplia cuando se encuentran activadas. Toma un momento para revisar estos ajustes para asegurarte si cumplen tus necesidades."
privacy: Privacidad
diff --git a/config/locales/es.yml b/config/locales/es.yml
index fbee73ed2ac..71644e73f77 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1545,7 +1545,6 @@ es:
preferences:
other: Otros
posting_defaults: Configuración por defecto de publicaciones
- public_timelines: Líneas de tiempo públicas
privacy:
hint_html: "Personaliza el descubrimiento de tu perfil y tus publicaciones. En Mastodon tienes distintas características que te ayudarán a alcanzar una mayor audiencia si las activas. Tómate un momento para revisar estas configuraciones y asegurarte de que cumplen tus necesidades."
privacy: Privacidad
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 30d75d25ee4..0ebda94c6a0 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1540,7 +1540,6 @@ et:
preferences:
other: Muu
posting_defaults: Postitamise vaikesätted
- public_timelines: Avalikud ajajooned
privacy:
hint_html: "Kohanda, kuidas peaks su postitused ja profiil leitav olema. Mastodonis olevad paljud oskused võimaldavad jõuda sul rohkemate inimesteni, kui need lubada. Võta üks hetk, et vaadata need üle, et veenduda, kas sinu puhul need sobivad."
privacy: Privaatsus
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 67da357e1de..0a936089ab3 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1541,7 +1541,6 @@ eu:
preferences:
other: Denetarik
posting_defaults: Bidalketarako lehenetsitakoak
- public_timelines: Denbora-lerro publikoak
privacy:
hint_html: "Pertsonalizatu nola nahi duzun zure profila eta argitalpenak aurkitzea. Mastodonen hainbat ezaugarri gaituta daudenean lagungarri izan dakizkizuke publiko zabalago batera iristeko. Hartu une bat ezarpen horiek berrikusteko, zure erabilerara egokitzen direla ziurtatzeko."
privacy: Pribatutasuna
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 509d69fcba7..b45a765de39 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1309,7 +1309,6 @@ fa:
preferences:
other: سایر تنظیمات
posting_defaults: تنظیمات پیشفرض انتشار
- public_timelines: خط زمانیهای عمومی
privacy:
hint_html: "شخصیسازی چگونگی پیدا شدن فرستهها و نمایهتان. ویژگیهای متعدّدی در ماستودون میتوانند هنگام به کار افتادن در رسیدن به مخاطبینی گستردهتر یاریتان کنند. کمی وقت برای بازبینی این تنظیمات گذاشته تا مطمئن شوید برایتان مناسبند."
privacy: محرمانگی
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index f3cb791e60d..511f7256fc8 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1561,7 +1561,6 @@ fi:
preferences:
other: Muut
posting_defaults: Julkaisun oletusasetukset
- public_timelines: Julkiset aikajanat
privacy:
hint_html: "Määritä, kuinka haluat profiilisi ja julkaisujesi löytyvän. Mastodonissa on monia ominaisuuksia, joiden käyttöönotto voi auttaa sinua tavoittamaan laajemman yleisön. Käytä hetki tarkistaaksesi, sopivatko nämä asetukset käyttöösi."
privacy: Yksityisyys
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 74b37c759ef..02429d73b6d 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1561,7 +1561,6 @@ fo:
preferences:
other: Annað
posting_defaults: Postingarstillingar
- public_timelines: Almennar tíðarlinjur
privacy:
hint_html: "Tillaga hvussu tú vilt hava tín vanga og tínar postar at blíva funnar Eitt úrval av tættum í Mastodon kunnu hjálpa tær at røkka einum størri skara, tá teir eru settir til. Brúka eina løtu at eftirhyggja hesar stillingar fyri at fáa vissu um at tær eru hóskandi fyri teg."
privacy: Privatlív
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index f297e8bfdea..c54028b9325 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -1536,7 +1536,6 @@ fr-CA:
preferences:
other: Autre
posting_defaults: Paramètres de publication par défaut
- public_timelines: Fils publics
privacy:
hint_html: "Personnalisez la façon dont votre profil et vos messages peuvent être découverts. Mastodon peut vous aider à atteindre un public plus large lorsque certains paramètres sont activés. Prenez le temps de les examiner pour vous assurer qu’ils sont configurés comme vous le souhaitez."
privacy: Confidentialité
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 33cdcd44cc5..ee50661c8b8 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1536,7 +1536,6 @@ fr:
preferences:
other: Autre
posting_defaults: Paramètres de publication par défaut
- public_timelines: Fils publics
privacy:
hint_html: "Personnalisez la façon dont votre profil et vos messages peuvent être découverts. Mastodon peut vous aider à atteindre un public plus large lorsque certains paramètres sont activés. Prenez le temps de les examiner pour vous assurer qu’ils sont configurés comme vous le souhaitez."
privacy: Confidentialité
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 054ae2fab2a..0d14bad607e 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1545,7 +1545,6 @@ fy:
preferences:
other: Oars
posting_defaults: Standertynstellingen foar berjochten
- public_timelines: Iepenbiere tiidlinen
privacy:
hint_html: "Hoe wolle jo dat jo profyl en berjochten fûn wurde kinne? In ferskaat oan funksjes yn Mastodon kinne jo helpe om een grutter publyk te berikken as se ynskeakele binne. Nim de tiid om dizze ynstellingen te besjen, om der wis fan te wêzen dat se oan jo winsken foldogge."
privacy: Privacy
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 57162e2ed1d..0a1cd50378a 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1623,7 +1623,6 @@ ga:
preferences:
other: Eile
posting_defaults: Réamhshocruithe á bpostáil
- public_timelines: Amlínte poiblí
privacy:
hint_html: "Saincheap conas is mian leat do phróifíl agus do phostálacha a fháil. Is féidir le gnéithe éagsúla i Mastodon cabhrú leat teacht ar lucht féachana níos leithne nuair atá tú cumasaithe. Tóg nóiméad chun athbhreithniú a dhéanamh ar na socruithe seo chun a chinntiú go n-oireann siad do do chás úsáide."
privacy: Príobháideacht
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 52b25e28543..286185754e5 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1588,7 +1588,6 @@ gd:
preferences:
other: Eile
posting_defaults: Bun-roghainnean a’ phostaidh
- public_timelines: Loidhnichean-ama poblach
privacy:
hint_html: "Gnàthaich an dòigh air an dèid a’ phròifil ’s na postaichean agad a lorg. Tha grunn ghleusan aig Mastodon a chuidicheas ach an ruig thu èisteachd nas fharsainge nuair a bhios iad an comas. Thoir sùil air na roghainnean seo a dhèanamh cinnteach gum freagair iad ri d’ fheumalachdan."
privacy: Prìobhaideachd
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index d6c00d205ca..99586300f46 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1561,7 +1561,6 @@ gl:
preferences:
other: Outro
posting_defaults: Valores por defecto
- public_timelines: Cronoloxías públicas
privacy:
hint_html: "Personaliza o xeito no que queres que se atope o teu perfil e publicacións. Mastodon ten variedade de ferramentas para axudarche a acadar unha audiencia maior. Dedica un minuto a revisalas e confirma que se axustan ao teu caso persoal."
privacy: Privacidade
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 5a9571da754..716691355f5 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1597,7 +1597,6 @@ he:
preferences:
other: שונות
posting_defaults: ברירות מחדל להודעות
- public_timelines: פידים פומביים
privacy:
hint_html: "ניתן להתאים את הצורה שבה תירצו שיראו את פרופיל המשתמש וההודעות שלכם. מגוון אפשרויות במסטודון יכולות לעזור לכם להיחשף לקהל רחב יותר כאשר תפעילו אותן. הקדישו רגע לבדוק את ההגדרות הללו כדי לוודא שהן מתאימות לכם."
privacy: פרטיות
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index e4f5c1b847b..43d2d27de71 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1561,7 +1561,6 @@ hu:
preferences:
other: Egyéb
posting_defaults: Bejegyzések alapértelmezései
- public_timelines: Nyilvános idővonalak
privacy:
hint_html: "Testreszabható a profil és a bejegyzések megjelenése. A Mastodon számos funkciója segíthet szélesebb közönség elérésében, ha engedélyezve van. Szánj egy percet a beállítások áttekintésére, hogy megbizonyosodj arról, hogy ezek megfelelnek a te felhasználási esetednek."
privacy: Adatvédelem
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index 5042e3f7f06..035584df8ef 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -703,7 +703,6 @@ hy:
preferences:
other: Այլ
posting_defaults: Կանխադիր կարգաւորումներ
- public_timelines: Հանրային հոսք
privacy:
search: Որոնել
privacy_policy:
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 964230d5a57..80f09353c1e 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1545,7 +1545,6 @@ ia:
preferences:
other: Alteres
posting_defaults: Parametros de publication predefinite
- public_timelines: Chronologias public
privacy:
hint_html: "Personalisa como tu vole que tu profilo e tu messages es trovate. Un varietate de functiones in Mastodon pote adjutar te a attinger un plus grande publico quando activate. Prende un momento pro revider iste parametros pro assecurar te que illos se adapta a tu besonios."
privacy: Confidentialitate
diff --git a/config/locales/id.yml b/config/locales/id.yml
index ac42afdb4f7..7dcbf490339 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1300,7 +1300,6 @@ id:
preferences:
other: Lainnya
posting_defaults: Kiriman bawaan
- public_timelines: Linimasa publik
privacy_policy:
title: Kebijakan Privasi
reactions:
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 432e7d031b0..f562f9a3e45 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1537,7 +1537,6 @@ ie:
preferences:
other: Altri
posting_defaults: Predefinitiones por postar
- public_timelines: Public témpor-lineas
privacy:
hint_html: "Customisa qualmen tu vole que tui profil e tui postas posse esser trovat. Mastodon have un varietá de manieres por auxiliar te atinger un auditorie plu grand quande activisat. Prende un moment por reviser ti parametres por far cert que ili concorda tui casu de usation."
privacy: Privatie
diff --git a/config/locales/io.yml b/config/locales/io.yml
index bccdcb3cc5c..dfaea96c708 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -1510,7 +1510,6 @@ io:
preferences:
other: Altra
posting_defaults: Originala postoopcioni
- public_timelines: Publika tempolinei
privacy:
privacy: Privateso
reach: Atingo
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 4aa05fb10cd..3c996795d4e 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1565,7 +1565,6 @@ is:
preferences:
other: Annað
posting_defaults: Sjálfgefin gildi við gerð færslna
- public_timelines: Opinberar tímalínur
privacy:
hint_html: "Sérsníddu hvernig þú vilt að finna megi notandasnið þitt og færslur. Ýmsir eiginleikar í Mastodon geta hjálpað þér að ná til breiðari áheyrendahóps, séu þeir virkjaðir. Taktu þér tíma til að yfirfara þessar stillingar svo að þær henti þér."
privacy: Gagnaleynd
diff --git a/config/locales/it.yml b/config/locales/it.yml
index d552d08a45c..a0026a10116 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1563,7 +1563,6 @@ it:
preferences:
other: Altro
posting_defaults: Predefinite di pubblicazione
- public_timelines: Timeline pubbliche
privacy:
hint_html: "Personalizza il modo in cui vuoi che il tuo profilo e i tuoi post vengano trovati. Una varietà di funzionalità in Mastodon possono aiutarti a raggiungere un pubblico più ampio se abilitato. Prenditi un momento per rivedere queste impostazioni per assicurarti che si adattino al tuo caso d'uso."
privacy: Privacy
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 0eeb055170a..ddd3ff79ac3 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1516,7 +1516,6 @@ ja:
preferences:
other: その他
posting_defaults: デフォルトの投稿設定
- public_timelines: 公開タイムライン
privacy:
hint_html: "プロフィールの見えかたや、ほかのユーザーからの見つかりやすさを設定します。Mastodonには自分のアカウントのことをより多くの人に知ってもらうためのさまざまな機能があり、有効・無効をそれぞれ切り換えられます。使いかたや好みに合わせて調節しましょう。"
privacy: プライバシー
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index 2695127f0a7..1c3e72cb835 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -565,7 +565,6 @@ kk:
preferences:
other: Басқа
posting_defaults: Пост жазу негіздері
- public_timelines: Ашық таймлайндар
reactions:
errors:
limit_reached: Түрлі реакциялар лимиті толды
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 4a1afee8427..983b2af4a67 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1520,7 +1520,6 @@ ko:
preferences:
other: 기타
posting_defaults: 게시물 기본설정
- public_timelines: 공개 타임라인
privacy:
hint_html: "내 프로필과 게시물이 어떻게 발견될지를 제어합니다. 활성화 하면 마스토돈의 다양한 기능들이 내가 더 많은 사람에게 도달할 수 있도록 도와줍니다. 이 설정이 내 용도에 맞는지 잠시 검토하세요."
privacy: 개인정보
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index c24337dd7c0..f5f8defbe5b 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -1322,7 +1322,6 @@ ku:
preferences:
other: Yên din
posting_defaults: Berdestên şandiyê
- public_timelines: Demnameya gelemperî
privacy_policy:
title: Politîka taybetiyê
reactions:
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index d0657e73f99..7c3d298ec4e 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -1537,7 +1537,6 @@ lad:
preferences:
other: Otros
posting_defaults: Konfigurasyon predeterminada de publikasyones
- public_timelines: Linyas de tiempo publikas
privacy:
hint_html: "Personaliza el diskuvrimyento de tu profil y tus publikasyones. En Mastodon tyenes distinktas funksyones ke te ayudaran a alkansar una audiensya mas ancha si las aktivas. Reviza estas opsyones por un momento para estar siguro ke kaven tus nesesidades."
privacy: Privasita
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 5e18751e098..779bb8763f6 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1004,7 +1004,6 @@ lt:
preferences:
other: Kita
posting_defaults: Skelbimo numatytosios nuostatos
- public_timelines: Viešieji laiko skalės
privacy:
hint_html: "Tikrink, kaip nori, kad tavo profilis ir įrašai būtų randami. Įjungus įvairias Mastodon funkcijas, jos gali padėti pasiekti platesnę auditoriją. Akimirką peržiūrėk šiuos nustatymus, kad įsitikintum, jog jie atitinka tavo naudojimo būdą."
privacy: Privatumas
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 5a071eba863..2810764333f 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1553,7 +1553,6 @@ lv:
preferences:
other: Citi
posting_defaults: Publicēšanas noklusējuma iestatījumi
- public_timelines: Publiskās ziņu lentas
privacy:
hint_html: "Pielāgo, kā vēlies atrast savu profilu un ziņas. Dažādas Mastodon funkcijas var palīdzēt sasniegt plašāku auditoriju, ja tās ir iespējotas. Velti laiku, lai pārskatītu šos iestatījumus, lai pārliecinātos, ka tie atbilst tavam lietošanas gadījumam."
privacy: Privātums
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index a778d0c28f1..886e7160e4f 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1480,7 +1480,6 @@ ms:
preferences:
other: Lain-lain
posting_defaults: Penyiaran lalai
- public_timelines: Garis masa awam
privacy:
hint_html: "Sesuaikan cara anda mahu profil anda dan pos anda ditemui. Pelbagai ciri dalam Mastodon boleh membantu anda menjangkau khalayak yang lebih luas apabila didayakan. Luangkan sedikit masa untuk menyemak tetapan ini untuk memastikan ia sesuai dengan kes penggunaan anda."
privacy: Privasi
diff --git a/config/locales/my.yml b/config/locales/my.yml
index f28458360b5..9d98cc6bb4c 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -1483,7 +1483,6 @@ my:
preferences:
other: အခြား
posting_defaults: ပို့စ်တင်ရာတွင် သတ်မှတ်ချက်များ
- public_timelines: အများမြင်စာမျက်နှာ
privacy:
hint_html: "သင့်ပရိုဖိုင်နှင့် သင့်ပို့စ်များကို ရှာဖွေလိုသည့်ပုံစံကို စိတ်ကြိုက်ပြင်ဆင်ပါ။ Mastodon ရှိ အင်္ဂါရပ်များစွာကို ဖွင့်ထားသည့်အခါ ပိုမိုကျယ်ပြန့်သော ပရိသတ်ထံ သင်ရောက်ရှိစေရန် ကူညီပေးနိုင်ပါသည်။ သင့်အသုံးပြုမှုကိစ္စနှင့် ကိုက်ညီကြောင်း သေချာစေရန်အတွက် ဤသတ်မှတ်ချက်များကို ပြန်လည်သုံးသပ်သင့်ပါသည်။"
privacy: ကိုယ်ရေးအချက်အလက်
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index da1684e8a9b..9af6f8027db 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1561,7 +1561,6 @@ nl:
preferences:
other: Overig
posting_defaults: Standaardinstellingen voor berichten
- public_timelines: Openbare tijdlijnen
privacy:
hint_html: "Hoe wil je dat jouw profiel en berichten kunnen worden gevonden? Een verscheidenheid aan functies in Mastodon kunnen je helpen om een groter publiek te bereiken als ze zijn ingeschakeld. Neem rustig de tijd om deze instellingen te bekijken, om er zo zeker van te zijn dat ze aan jouw wensen voldoen."
privacy: Privacy
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index ec77a2edf87..44edc61e94b 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1542,7 +1542,6 @@ nn:
preferences:
other: Anna
posting_defaults: Innleggsstandarder
- public_timelines: Offentlege tidsliner
privacy:
hint_html: "Tilpass korleis du vil at andre skal finna profilen og innlegga dine. Mastodon har fleire funksjonar du kan ta i bruk for å få kontakt med eit større publikum. Sjå gjerne gjennom innstillingane slik at du er sikker på at dei passar til deg og din bruk."
privacy: Personvern
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 537552ea986..33a78081870 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1530,7 +1530,6 @@
preferences:
other: Annet
posting_defaults: Innleggsstandarder
- public_timelines: Offentlige tidslinjer
privacy:
hint_html: "Tilpass hvordan du vil at din profil og dine innlegg skal bli funnet. En rekke funksjoner i Mastodon kan hjelpe deg med å nå et bredere publikum når det er aktivert. Ta deg et øyeblikk til å vurdere disse innstillingene for å forsikre deg om at de passer deg og ditt bruk."
privacy: Personvern
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index d2bea55bd37..bdada367dd5 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -749,7 +749,6 @@ oc:
preferences:
other: Autre
posting_defaults: Valors per defaut de las publicacions
- public_timelines: Fluxes d’actualitats publics
privacy_policy:
title: Politica de confidencialitat
reactions:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 1477396999f..1125c3b24e2 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1613,7 +1613,6 @@ pl:
preferences:
other: Pozostałe
posting_defaults: Domyślne ustawienia wpisów
- public_timelines: Publiczne osie czasu
privacy:
hint_html: "Dostosuj tryb odnajdowania twojego profilu i wpisów. Funkcje Mastodona mogą pomóc ci zwiększać twoją publiczność – przejrzyj te ustawienia i dostosuj je do swojego sposobu użytkowania."
privacy: Prywatność
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 584a9253b81..494695b559e 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1540,7 +1540,6 @@ pt-BR:
preferences:
other: Outro
posting_defaults: Padrões de publicação
- public_timelines: Linhas públicas
privacy:
hint_html: "Personalize como você quer que seu perfil e suas publicações sejam encontrados. Uma variedade de funcionalidades no Mastodon pode ajudar a alcançar um público mais amplo quando habilitado. Reserve um momento para revisar estas configurações para garantir que atendem ao seu caso de uso."
privacy: Privacidade
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index ed6a8a4028c..86bd1c05d5c 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1561,7 +1561,6 @@ pt-PT:
preferences:
other: Outro
posting_defaults: Padrões de publicação
- public_timelines: Cronologias públicas
privacy:
hint_html: "Defina como quer que o seu perfil e as suas publicações sejam encontrados. Várias funcionalidades no Mastodon podem ajudar a alcançar um público mais amplo quando ativadas. Tire um momento para rever estas definições para garantir que se aplicam ao seu caso de uso."
privacy: Privacidade
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 79bc2a275f4..63499a2a7ef 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -643,7 +643,6 @@ ro:
preferences:
other: Altele
posting_defaults: Valori prestabilite de postare
- public_timelines: Fluxuri publice
reactions:
errors:
limit_reached: S-a atins limita diferitelor reacţii
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 5f5b3676fb6..d0155b8fb62 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1581,7 +1581,6 @@ ru:
preferences:
other: Остальное
posting_defaults: Настройки отправки по умолчанию
- public_timelines: Публичные ленты
privacy:
hint_html: "Настройте, как вы хотите, чтобы ваш профиль и ваши сообщения были найдены. Различные функции в Mastodon могут помочь вам охватить более широкую аудиторию, если они включены. Уделите время изучению этих настроек, чтобы убедиться, что они подходят для вашего случая использования."
privacy: Конфиденциальность
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 6f4fd6eb30d..c49038196db 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -1013,7 +1013,6 @@ sc:
preferences:
other: Àteru
posting_defaults: Valores predefinidos de publicatzione
- public_timelines: Lìnias de tempos pùblicas
privacy:
privacy: Riservadesa
search: Chirca
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 7c733b71b50..a0ce225b18a 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -1312,7 +1312,6 @@ sco:
preferences:
other: Ither
posting_defaults: Postin defauts
- public_timelines: Public timelines
privacy_policy:
title: Privacy Policy
reactions:
diff --git a/config/locales/si.yml b/config/locales/si.yml
index 85e242b630f..53497deaf25 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -1176,7 +1176,6 @@ si:
preferences:
other: වෙනත්
posting_defaults: සැමවිට පළ කරන ආකාරය
- public_timelines: ප්රසිද්ධ කාලරේඛා
privacy:
search: සොයන්න
privacy_policy:
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index fee3a6151ad..4fff362356c 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -131,6 +131,7 @@ en:
user:
chosen_languages: When checked, only posts in selected languages will be displayed in public timelines
role: The role controls which permissions the user has
+ spoken_languages: Mastodon will not suggest to translate statuses in the languages that you speak
user_role:
color: Color to be used for the role throughout the UI, as RGB in hex format
highlighted: This makes the role publicly visible
@@ -181,7 +182,7 @@ en:
autofollow: Invite to follow your account
avatar: Profile picture
bot: This is an automated account
- chosen_languages: Filter languages
+ chosen_languages: Filter languages in public timelines
confirm_new_password: Confirm new password
confirm_password: Confirm password
context: Filter contexts
@@ -228,6 +229,7 @@ en:
setting_use_pending_items: Slow mode
severity: Severity
sign_in_token_attempt: Security code
+ spoken_languages: Languages that you can speak
title: Title
type: Import type
username: Username
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index f10815129dd..086bf11bbd3 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1171,7 +1171,6 @@ sk:
preferences:
other: Ostatné
posting_defaults: Východiskové nastavenia príspevkov
- public_timelines: Verejné časové osi
privacy:
privacy: Súkromie
search: Vyhľadávanie
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index f63aadd6c8f..c13bbb0f6df 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1594,7 +1594,6 @@ sl:
preferences:
other: Ostalo
posting_defaults: Privzete nastavitev objavljanja
- public_timelines: Javne časovnice
privacy:
hint_html: "Prilagodite, kako lahko drugi najdejo vaš profil in vaše objave. V Mastodonu obstaja več zmožnosti, ki vam pomagajo doseči širše občinstvo, če so omogočene. Vzemite si čas in preverite, ali te nastavitve ustrezajo vašemu namenu uporabe."
privacy: Zasebnost
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 92e182cfda3..63c8a3bcaf6 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1553,7 +1553,6 @@ sq:
preferences:
other: Tjetër
posting_defaults: Parazgjedhje postimesh
- public_timelines: Rrjedha kohore publike
privacy:
hint_html: "Përshtatni mënyrën se si dëshironi të gjenden prej të tjerëve profili dhe postimet tuaja. Një larmi veçorish të Mastodon-it mund t’ju ndihmojnë të shtriheni në një publik më të gjerë, kur aktivizohen. Ndaluni një çast t’i shqyrtoni këto rregullime, për t’u siguruar se i përshtaten rastit tuaj."
privacy: Privatësi
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index f6e6d4d2a68..31d25f25aaf 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1566,7 +1566,6 @@ sr-Latn:
preferences:
other: Ostalo
posting_defaults: Podrazumevana podešavanja objavljivanja
- public_timelines: Javne vremenske linije
privacy:
hint_html: "Prilagodite način na koji želite da vaš profil i vaše objave budu pronađeni. Različite funkcije u Mastodon-u mogu vam pomoći da dosegnete širu publiku kada su omogućene. Odvojite malo vremena da pregledate ova podešavanja kako biste bili sigurni da odgovaraju vašem slučaju upotrebe."
privacy: Privatnost
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 9bfefde83c0..7841dfbbc23 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1566,7 +1566,6 @@ sr:
preferences:
other: Остало
posting_defaults: Подразумевана подешавања објављивања
- public_timelines: Јавне временске линије
privacy:
hint_html: "Прилагодите начин на који желите да ваш профил и ваше објаве буду пронађени. Различите функције у Mastodon-у могу вам помоћи да досегнете ширу публику када су омогућене. Одвојите мало времена да прегледате ова подешавања како бисте били сигурни да одговарају вашем случају употребе."
privacy: Приватност
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 8054c113558..47a780f8914 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1550,7 +1550,6 @@ sv:
preferences:
other: Annat
posting_defaults: Standardinställningar för inlägg
- public_timelines: Publika tidslinjer
privacy:
hint_html: "Anpassa hur du vill att din profil och dina inlägg ska hittas. En mängd funktioner i Mastodon kan hjälpa dig att nå en bredare publik när den är aktiverad. Ta en stund att granska dessa inställningar för att se att de passar ditt användningsfall."
privacy: Integritet
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 678b5ab638f..cf786928cee 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1519,7 +1519,6 @@ th:
preferences:
other: อื่น ๆ
posting_defaults: ค่าเริ่มต้นการโพสต์
- public_timelines: เส้นเวลาสาธารณะ
privacy:
hint_html: "ปรับแต่งวิธีที่คุณต้องการให้พบโปรไฟล์ของคุณและโพสต์ของคุณ คุณลักษณะที่หลากหลายใน Mastodon สามารถช่วยให้คุณเข้าถึงผู้ชมที่กว้างขึ้นเมื่อเปิดใช้งาน ใช้เวลาสักครู่เพื่อตรวจทานการตั้งค่าเหล่านี้เพื่อให้แน่ใจว่าการตั้งค่าเหมาะสมกับกรณีการใช้งานของคุณ"
privacy: ความเป็นส่วนตัว
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index f561781e59e..bcbf95a42f7 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1545,7 +1545,6 @@ tr:
preferences:
other: Diğer
posting_defaults: Gönderi varsayılanları
- public_timelines: Genel zaman çizelgeleri
privacy:
hint_html: "Profilinizin ve gönderilerinizin nasıl bulunmasını istediğinizi yapılandırın. Mastodon'daki çeşitli özellik etkinleştirildiklerinde çok daha geniş bir izleyici kitlesine ulaşmanıza yardımcı olabilir. Durumunuza uyup uymadığını anlamak için bu ayarlara bir göz atın."
privacy: Gizlilik
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 31ce3e6b798..227023c81f2 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1597,7 +1597,6 @@ uk:
preferences:
other: Інше
posting_defaults: Усталені налаштування дописів
- public_timelines: Глобальні стрічки
privacy:
hint_html: "Налаштуйте, як ви хочете, щоб знаходили ваш профіль і ваші дописи. Різноманітні функції Mastodon можуть допомогти вам охопити ширшу аудиторію, якщо їх увімкнути. Перегляньте ці налаштування, щоб переконатися, що вони підходять для вашого випадку користування."
privacy: Приватність
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index dacaafd7681..459a8f778d4 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1535,7 +1535,6 @@ vi:
preferences:
other: Khác
posting_defaults: Mặc định cho tút
- public_timelines: Bảng tin
privacy:
hint_html: "Tùy chỉnh cách mọi người tìm thấy hồ sơ và các tút của bạn. Nhiều tính năng trong Mastodon có thể giúp bạn tiếp cận nhiều đối tượng hơn khi được bật. Hãy xem lại các cài đặt này để đảm bảo chúng phù hợp với bạn."
privacy: Riêng tư
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index f08142719aa..e56d6773b09 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1535,7 +1535,6 @@ zh-CN:
preferences:
other: 其他
posting_defaults: 发布默认值
- public_timelines: 公共时间轴
privacy:
hint_html: "自定义您希望如何找到您的个人资料和嘟文。启用Mastodon中的各种功能可以帮助您扩大受众范围。请花点时间查看这些设置，确保它们适合您的使用情况。"
privacy: 隐私
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index ddc6571e6da..11fbf50798e 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1511,7 +1511,6 @@ zh-HK:
preferences:
other: 其他
posting_defaults: 發佈預設值
- public_timelines: 公共時間軸
privacy:
hint_html: "自訂個人檔案和帖文被他人找到的方式。啟用 Mastodon 一系列的功能助你觸及更多受眾。花點時間查閱這些設定並確保它符合你的用法。"
privacy: 私隱
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index ef2da39f30b..082b7b50851 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1537,7 +1537,6 @@ zh-TW:
preferences:
other: 其他
posting_defaults: 嘟文預設值
- public_timelines: 公開時間軸
privacy:
hint_html: "自訂您希望如何使您的個人檔案及嘟文被發現。藉由啟用一系列 Mastodon 功能以幫助您觸及更廣的受眾。煩請花些時間確認您是否欲啟用這些設定。"
privacy: 隱私權
diff --git a/db/migrate/20240729134058_add_spoken_languages_to_users.rb b/db/migrate/20240729134058_add_spoken_languages_to_users.rb
new file mode 100644
index 00000000000..ca44e6ad588
--- /dev/null
+++ b/db/migrate/20240729134058_add_spoken_languages_to_users.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddSpokenLanguagesToUsers < ActiveRecord::Migration[7.1]
+ def change
+ add_column :users, :spoken_languages, :string, array: true, null: false, default: []
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d4796079cae..8c9e89fac89 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.1].define(version: 2024_07_24_181224) do
+ActiveRecord::Schema[7.1].define(version: 2024_07_29_134058) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -1205,6 +1205,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_07_24_181224) do
t.text "settings"
t.string "time_zone"
t.string "otp_secret"
+ t.string "spoken_languages", default: [], null: false, array: true
t.index ["account_id"], name: "index_users_on_account_id"
t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
t.index ["created_by_application_id"], name: "index_users_on_created_by_application_id", where: "(created_by_application_id IS NOT NULL)"