Skip to content

Commit

Permalink
Merge branch 'main' into remove-kbin-link
Browse files Browse the repository at this point in the history
  • Loading branch information
melroy89 authored Jul 15, 2024
2 parents cd10658 + e9864e3 commit dfc87f4
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/02-admin/01-installation/docker.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Docker Installation

> [!NOTE]
> Docker installation is currently not adviced for production use. Try the [Bare Metal installation](./bare_metal.md) instead.
> Docker installation is currently not advised for production use. Try the [Bare Metal installation](./bare_metal.md) instead.
## System Requirements

Expand Down
8 changes: 7 additions & 1 deletion translations/messages.de.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ mod_remove_your_post: Ein Moderator hat deinen Beitrag entfernt
removed: Entfernt von einem Moderator
deleted: Vom Author gelöscht
post: Beitrag
send_message: Nachricht senden
send_message: Direktnachricht senden
message: Nachricht
left: Links
right: Rechts
Expand Down Expand Up @@ -875,3 +875,9 @@ from: von
someone: Jemand
cake_day: Kuchen-Tag
last_updated: Letzte Aktualisierung
magazine_log_entry_unpinned: hat angehefteten Eintrag entfernt
and: und
back: Zurück
magazine_log_entry_pinned: hat Eintrag angeheftet
direct_message: Direktnachricht
manually_approves_followers: Genehmigt Follower manuell
33 changes: 32 additions & 1 deletion translations/messages.gl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ post: Publicación
ban_expired: Caducou o veto
infinite_scroll: Desprazamento sen fin
purge: Purgar
send_message: Enviar mensaxe
send_message: Enviar mensaxe directa
message: Mensaxe
show_top_bar: Mostrar barra superior
sticky_navbar: Barra nav. pegañenta
Expand Down Expand Up @@ -732,3 +732,34 @@ inactive: Inactivo
type_search_term: Escribe termo a buscar
federation_enabled: A federación está activada
registrations_enabled: Permítese a creación de contas
account_deletion_button: Eliminar Conta
account_deletion_immediate: Eliminar inmediatamente
errors.server500.title: 500 Erro Interno do Servidor
private_instance: Forzar ás usuarias a iniciar sesión antes de poder ver calquera
contido
delete_account_desc: Eliminar a conta, incluíndo as respostas doutras usuarias nas
conversas, publicacións e comentarios creados.
schedule_delete_account: Programar a eliminación
remove_schedule_delete_account: Desbotar a eliminación programada
remove_schedule_delete_account_desc: Borrar a eliminación programada. Todo o contido
volverá a estar dispoñible e a usuaria poderá iniciar sesión.
2fa.setup_error: Erro ao activar o 2FA para a conta
2fa.user_active_tfa.title: A usuaria ten o 2FA activo
password_and_2fa: Contrasinal e 2FA
flash_account_settings_changed: Cambiaronse correctamente os axustes da conta. Debes
volver a iniciar sesión.
show_subscriptions: Mostrar subscricións
subscription_sort: Orde
sidebars_same_side: En barras laterais no mesmo lado
subscription_sidebar_pop_out_right: Mover a unha barra lateral separada na dereita
subscription_sidebar_pop_out_left: Mover a unha barra lateral separada na esquerda
errors.server500.description: Desculpa, pero algo fallou pola nosa parte. Se continúas
a ver este erro intenta contactar coa administración da instancia. Se a instancia
non funciona en absoluto entón mira %link_start%outras instancias Mbin%link_end%
ata que resolvamos o problema.
schedule_delete_account_desc: Programa a eliminación desta conta en 30 días. Así ocultarás
á usuaria e aos seus contidos e evitarás que a usuaria poida iniciar sesión.
alphabetically: Alfabético
subscriptions_in_own_sidebar: Nunha barra lateral separada
account_deletion_description: Vaise eliminar a túa conta en 30 días a non ser que
ti a elimines antes. A conta non pode restablecerse unha vez foi eliminada.

0 comments on commit dfc87f4

Please sign in to comment.