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/nn.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/nn.yml')
-rw-r--r-- | config/locales/nn.yml | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/config/locales/nn.yml b/config/locales/nn.yml index 5218270da..14f9b95ad 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -74,10 +74,8 @@ nn: posts_tab_heading: Tut posts_with_replies: Tut og svar roles: - admin: Administrator bot: Robot group: Gruppe - moderator: Moderator unavailable: Profil ikkje tilgjengeleg unfollow: Slutt å fylgja admin: @@ -96,7 +94,6 @@ nn: avatar: Bilete by_domain: Domene change_email: - changed_msg: Konto-e-posten er endra! current_email: Noverande e-post label: Byt e-post new_email: Ny e-post @@ -173,12 +170,6 @@ nn: reset: Attstill reset_password: Attstill passord resubscribe: Ting på nytt - role: Løyve - roles: - admin: Administrator - moderator: Ordstyrer - staff: Personell - user: Brukar search: Søk search_same_email_domain: Andre brukarar med same e-postdomene search_same_ip: Andre brukarar med same IP @@ -529,9 +520,6 @@ nn: deletion: desc_html: Tillat alle å sletta kontoen sin title: Åpne kontosletting - min_invite_role: - disabled: Ingen - title: Tillat innbydingar frå require_invite_text: desc_html: Når registreringer krever manuell godkjenning, må du føye «Hvorfor vil du bli med?» tekstinput obligatoriske i stedet for valgfritt title: Krev nye brukere for å oppgi en grunn for å delta @@ -543,9 +531,6 @@ nn: title: Registreringsmodus show_known_fediverse_at_about_page: desc_html: Begrenser den offentlige tidslinjen som er knyttet til landingssiden når den er deaktivert, og viser bare lokalt innhold - show_staff_badge: - desc_html: Vis personalmerke på ei brukarside - title: Vis personalmerke site_description: desc_html: Vises som et avsnitt på forsiden og brukes som en meta-tagg. Du kan bruke HTML-tagger, spesielt <code><a></code> og <code><em></code>. title: Tenarskilding |