Conflicts: - `.github/dependabot.yml`: Changed upstream, while we modified it in glitch-soc to not get spammed by dependabot. Kept it removed. - `README.md`: Changed upstream, which has a very different version. Discarded upstream changes.main
Claire
2 years ago
@ -1,43 +0,0 @@
|
||||
name: Build container image
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches:
|
||||
- 'main'
|
||||
tags:
|
||||
- '*'
|
||||
pull_request:
|
||||
paths:
|
||||
- .github/workflows/build-image.yml
|
||||
- Dockerfile
|
||||
jobs:
|
||||
build-image:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: docker/setup-qemu-action@v1
|
||||
- uses: docker/setup-buildx-action@v1
|
||||
- uses: docker/login-action@v1
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ github.repository_owner }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
if: github.event_name != 'pull_request'
|
||||
- uses: docker/metadata-action@v3
|
||||
id: meta
|
||||
with:
|
||||
images: ghcr.io/${{ github.repository_owner }}/mastodon
|
||||
flavor: |
|
||||
latest=true
|
||||
tags: |
|
||||
type=edge,branch=main
|
||||
type=match,pattern=v(.*),group=0
|
||||
type=ref,event=pr
|
||||
- uses: docker/build-push-action@v2
|
||||
with:
|
||||
context: .
|
||||
platforms: linux/amd64,linux/arm64
|
||||
push: ${{ github.event_name != 'pull_request' }}
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/mastodon:latest
|
||||
cache-to: type=inline
|
||||
|
Before Width: | Height: | Size: 650 B After Width: | Height: | Size: 639 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 8.7 KiB After Width: | Height: | Size: 8.8 KiB |
@ -0,0 +1 @@
|
||||
en-GB:
|
||||
@ -1 +1,164 @@
|
||||
---
|
||||
af:
|
||||
activerecord:
|
||||
attributes:
|
||||
doorkeeper/application:
|
||||
name: Toepassing naam
|
||||
redirect_uri: Herlei URI
|
||||
scopes: Bestekke
|
||||
website: Toepassing webtuiste
|
||||
errors:
|
||||
models:
|
||||
doorkeeper/application:
|
||||
attributes:
|
||||
redirect_uri:
|
||||
fragment_present: kan nie 'n vragment bevat nie.
|
||||
invalid_uri: moet 'n geldige URI wees.
|
||||
relative_uri: moet 'n absolute URI wees.
|
||||
secured_uri: moet 'n HTTPS/SSL URI wees.
|
||||
doorkeeper:
|
||||
applications:
|
||||
buttons:
|
||||
authorize: Magtig
|
||||
cancel: Kanselleer
|
||||
destroy: Vernietig
|
||||
edit: Redigeer
|
||||
submit: Dien in
|
||||
confirmations:
|
||||
destroy: Is jy seker?
|
||||
edit:
|
||||
title: Redigeer toepassing
|
||||
form:
|
||||
error: Oeps! Hersien jou vorm vir moontlike foute
|
||||
help:
|
||||
native_redirect_uri: Gebruik %{native_redirect_uri} vir plaaslike toetse
|
||||
redirect_uri: Gebruik een lyn per URI
|
||||
scopes: Verdeel omvang-grense met spasies. Los dit leeg om verstek omvange te gebruik.
|
||||
index:
|
||||
application: Toepassing
|
||||
callback_url: Terugroep URL
|
||||
delete: Wis uit
|
||||
empty: Jy het geen toepassings nie.
|
||||
name: Naam
|
||||
new: Nuwe toepassing
|
||||
scopes: Omvange
|
||||
show: Vertoon
|
||||
title: Jou toepassings
|
||||
new:
|
||||
title: Nuwe toepassing
|
||||
show:
|
||||
actions: Aksies
|
||||
application_id: Kliënt sleutel
|
||||
callback_urls: Terugroep URL'e
|
||||
scopes: Omvange
|
||||
secret: Kliënt geheim
|
||||
title: 'Toepassing: %{name}'
|
||||
authorizations:
|
||||
buttons:
|
||||
authorize: Magtig
|
||||
deny: Weier
|
||||
error:
|
||||
title: "'n Fout het plaasgevind"
|
||||
new:
|
||||
prompt_html: "%{client_name} wil toegang hê tot jou rekening. Dit is a derde party toepassing. <strong>Indien jy dit nie vertrou nie, moet dit nie bemagtig word nie.</strong>"
|
||||
review_permissions: Hersien toestemming
|
||||
title: Benodig magtiging
|
||||
show:
|
||||
title: Kopieër hierdie magtigings kode en plaas dit in die toepassing.
|
||||
authorized_applications:
|
||||
buttons:
|
||||
revoke: Herroep
|
||||
confirmations:
|
||||
revoke: Is jy seker?
|
||||
index:
|
||||
authorized_at: Bemagtig op %{date}
|
||||
description_html: Hierdie is toepassings wat deur middel van die API toegang tot jou rekening kan verkry. As daar enige toepassings is wat jy nie herken nie, of 'n toepassing is wat wangedra, kan die bemagtiging herroep word.
|
||||
last_used_at: Laas gebruik op %{date}
|
||||
never_used: Noot gebruik nie
|
||||
scopes: Magtiging
|
||||
superapp: Intern
|
||||
title: Jou gemagtigde toepassings
|
||||
errors:
|
||||
messages:
|
||||
access_denied: Die hulpbron eienaar of magtigingsbediener het die aansoek afgekeur.
|
||||
credential_flow_not_configured: Hulpbron Eienaar Wagwoord Geloofsbrewe vloei het gefaal omdat Doorkeeper.configure.resource_owner_from_credentials nie opgestel is nie.
|
||||
flash:
|
||||
applications:
|
||||
create:
|
||||
notice: Toepassing geskep.
|
||||
destroy:
|
||||
notice: Toepassing uitgewis.
|
||||
update:
|
||||
notice: Toepassing opdateer.
|
||||
authorized_applications:
|
||||
destroy:
|
||||
notice: Toepassing herroep.
|
||||
grouped_scopes:
|
||||
access:
|
||||
read: Slegs-lees toegang
|
||||
read/write: Lees en skryf toegang
|
||||
write: Slegs-skryf toegang
|
||||
title:
|
||||
accounts: Rekeninge
|
||||
admin/accounts: Administrasie van rekeninge
|
||||
admin/all: Alle administratiewe funksies
|
||||
admin/reports: Administrasie van rapporteringe
|
||||
all: Alles
|
||||
blocks: Blokkeringe
|
||||
bookmarks: Boekmerke
|
||||
conversations: Gesprekke
|
||||
crypto: End-tot-end enkripsie
|
||||
favourites: Gunstelinge
|
||||
filters: Filters
|
||||
follow: Verhoudinge
|
||||
lists: Lyste
|
||||
media: Media aanhegsels
|
||||
mutes: Dempinge
|
||||
notifications: Kennisgewings
|
||||
push: Stoot kennisgewings
|
||||
reports: Rapporteringe
|
||||
search: Soek
|
||||
statuses: Plasings
|
||||
layouts:
|
||||
admin:
|
||||
nav:
|
||||
applications: Toepassings
|
||||
oauth2_provider: OAuth2 Verskaffer
|
||||
application:
|
||||
title: Benodig OAuth bemagtiging
|
||||
scopes:
|
||||
admin:read: lees alle data op die bediener
|
||||
admin:read:accounts: lees sensitiewe inligting vanaf alle rekeninge
|
||||
admin:read:reports: lees sensitiewe inligting van alle verslae end aangeklaagde rekeninge
|
||||
admin:write: verander alle data op die bediener
|
||||
admin:write:accounts: voer modereer aksies uit op rekeninge
|
||||
admin:write:reports: voer modereer aksies uit op verslae
|
||||
crypto: gebruik end-tot-end enkripsie
|
||||
follow: verander rekening verhoudinge
|
||||
push: ontvang jou stootkennisgewings
|
||||
read: lees die data van al jou rekeninge
|
||||
read:accounts: sien rekening inligting
|
||||
read:blocks: sien blokeringe
|
||||
read:bookmarks: sien jou boekmerke
|
||||
read:favourites: sien jou gunstelinge
|
||||
read:filters: sien jou filters
|
||||
read:lists: sien jou lyste
|
||||
read:mutes: sien jou stilmake
|
||||
read:notifications: sien jou kennisgewinge
|
||||
read:reports: sien jou rapporteringe
|
||||
read:search: soek namens jou
|
||||
read:statuses: sien alle plasings
|
||||
write: verander alle data van jou rekening
|
||||
write:accounts: verander jou profiel
|
||||
write:blocks: blokeer rekeninge en domeine
|
||||
write:bookmarks: boekmerk plasings
|
||||
write:conversations: demp en wis gesprekke uit
|
||||
write:favourites: merk gunsteling plasings
|
||||
write:filters: skep filters
|
||||
write:follows: volg mense
|
||||
write:lists: skep lyste
|
||||
write:media: laai meda lêers op
|
||||
write:mutes: demp mense en gesprekke
|
||||
write:notifications: maak jou kennisgewings skoon
|
||||
write:reports: rapporteer ander mense
|
||||
write:statuses: publiseer plasings
|
||||
|
||||