diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-07-17 22:07:20 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-07-17 22:07:20 +0200 |
commit | cd87d7dcef814ad86fb15334680cb0e3232437a9 (patch) | |
tree | 63db8838568ea440bb3cb9797cdbaf5c4952e9e7 /config/locales/lt.yml | |
parent | 9094c2f52c24e1c00b594e7c11cd00e4a07eb431 (diff) | |
parent | c3f0621a59a74d0e20e6db6170894871c48e8f0f (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
- `.env.production.sample`: Our sample config file is very different from upstream since it is much more complete. Upstream added documentation for a few env variables. Copied the new variables/documentation from upstream. - `app/lib/feed_manager.rb`: Upstream added a timeline type (hashtags), while glitch-soc already had an extra one (direct messages). Not really a conflict but textually close changes. Ported upstream's changes. - `app/models/custom_emoji.rb`: Upstream upped the custom emoji size limit, while glitch-soc had configurable limits. Upped the default limits accordingly. - `streaming/index.js`: Upstream reworked how hastags were normalized. Minor conflict due to glitch-soc's handling of instance-local posts. Ported upstream's changes.
Diffstat (limited to 'config/locales/lt.yml')
-rw-r--r-- | config/locales/lt.yml | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 5846f7d5d..96119216d 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -35,9 +35,7 @@ lt: posts_tab_heading: Tootai posts_with_replies: Tootai ir atsakymai roles: - admin: Administratorius bot: Bot'as - moderator: Moderatorius unfollow: Nesekti admin: account_actions: @@ -52,7 +50,6 @@ lt: avatar: Profilio nuotrauka by_domain: Domenas change_email: - changed_msg: Paskyros el paštas sėkmingai pakeistas! current_email: Dabartinis el paštas label: Pakeisti el pašto adresą new_email: Naujas el pašto adresas @@ -112,12 +109,6 @@ lt: reset: Iš naujo reset_password: Atkurti slaptažodį resubscribe: Per prenumeruoti - role: Leidimai - roles: - admin: Administratorius - moderator: Moderatorius - staff: Personalas - user: Vartotojas search: Ieškoti shared_inbox_url: Bendroji gautųjų URL show: @@ -297,15 +288,9 @@ lt: deletion: desc_html: Leisti visiems ištrinti savo paskyrą title: Atidaryti paskyros trynimą - min_invite_role: - disabled: Nei vienas - title: Leisti pakvietimus show_known_fediverse_at_about_page: desc_html: Kai įjungta, rodys įrašus iš visos žinomos fedi-visatos. Kitokiu atvėju, rodys tik lokalius įrašus. title: Rodyti žinoma fedi-visatos laiko juosta peržiūroje - show_staff_badge: - desc_html: Rodyti personalo ženklelį vartotojo puslapyje - title: Rodyti personalo ženklelį site_description: desc_html: Introdukcinis paragrafas pagrindiniame puslapyje. Apibūdink, kas padaro šį Mastodon serverį išskirtiniu ir visa kita, kas svarbu. Nebijok naudoti HTML žymes, pavyzdžiui <code> < a ></code> bei <code><em></code>. title: Serverio apibūdinimas @@ -449,7 +434,6 @@ lt: title: Keisti filtrą errors: invalid_context: Jokio arba netinkamas pateiktas kontekstas - invalid_irreversible: Negrąžinamas filtras veikia tik namų ir priminimų kontekste index: delete: Ištrinti title: Filtrai |