Merge branch 'master' into feature-customized-default-locale
This commit is contained in:
Eugen
GitHub
commit
ef7240169a
9 changed files with 50 additions and 7 deletions
|
|
@ -47,6 +47,16 @@ SMTP_FROM_ADDRESS=notifications@example.com
|
|||
# S3_PROTOCOL=http
|
||||
# S3_HOSTNAME=192.168.1.123:9000
|
||||
|
||||
# S3 (Minio Config (optional) Please check Minio instance for details)
|
||||
# S3_ENABLED=true
|
||||
# S3_BUCKET=
|
||||
# AWS_ACCESS_KEY_ID=
|
||||
# AWS_SECRET_ACCESS_KEY=
|
||||
# S3_REGION=
|
||||
# S3_PROTOCOL=https
|
||||
# S3_HOSTNAME=
|
||||
# S3_ENDPOINT=
|
||||
|
||||
# Optional alias for S3 if you want to use Cloudfront or Cloudflare in front
|
||||
# S3_CLOUDFRONT_HOST=
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
<p>Tervetuloa <%= @resource.email %>!</p>
|
||||
|
||||
<p>Voit vahvistaa Mastodon tilisi klikkaamalla alla olevaa linkkiä:</p>
|
||||
|
||||
<p><%= link_to 'Varmista tilini', confirmation_url(@resource, confirmation_token: @token) %></p>
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
Tervetuloa <%= @resource.email %>!
|
||||
|
||||
Voit vahvistaa Mastodon tilisi klikkaamalla alla olevaa linkkiä:
|
||||
|
||||
<%= confirmation_url(@resource, confirmation_token: @token) %>
|
||||
3
app/views/user_mailer/password_change.fi.html.erb
Normal file
3
app/views/user_mailer/password_change.fi.html.erb
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
<p>Hei <%= @resource.email %>!</p>
|
||||
|
||||
<p>Lähetämme tämän viestin ilmoittaaksemme että salasanasi on vaihdettu.</p>
|
||||
3
app/views/user_mailer/password_change.fi.text.erb
Normal file
3
app/views/user_mailer/password_change.fi.text.erb
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
Hei <%= @resource.email %>!
|
||||
|
||||
Lähetämme tämän viestin ilmoittaaksemme että salasanasi on vaihdettu.
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<p>Hei <%= @resource.email %>!</p>
|
||||
|
||||
<p>Joku on pyytänyt salasanvaihto Mastodonissa. Voit tehdä sen allaolevassa linkissä.</p>
|
||||
|
||||
<p><%= link_to 'Vaihda salasanani', edit_password_url(@resource, reset_password_token: @token) %></p>
|
||||
|
||||
<p>Jos et pyytänyt vaihtoa, poista tämä viesti.</p>
|
||||
<p>Salasanaasi ei vaihdeta ennen kuin menet ylläolevaan linkkiin ja luot uuden.</p>
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
Hei <%= @resource.email %>!
|
||||
|
||||
Joku on pyytänyt salasanvaihto Mastodonissa. Voit tehdä sen allaolevassa linkissä.
|
||||
|
||||
<%= edit_password_url(@resource, reset_password_token: @token) %>
|
||||
|
||||
Jos et pyytänyt vaihtoa, poista tämä viesti.
|
||||
Salasanaasi ei vaihdeta ennen kuin menet ylläolevaan linkkiin ja luot uuden.
|
||||
|
|
@ -16,18 +16,18 @@ fi:
|
|||
chronology: Aikajana on kronologisessa järjestyksessä
|
||||
ethics: 'Eettinen suunnittelu: ei mainoksia, no seurantaa'
|
||||
gifv: GIFV settejä ja lyhyitä videoita
|
||||
privacy: Julkaisu kohtainen yksityisyys aseuts
|
||||
privacy: Julkaisu kohtainen yksityisyys asetus
|
||||
public: Julkiset aikajanat
|
||||
features_headline: Mikä erottaa Mastodonin muista
|
||||
get_started: Aloita käyttö
|
||||
links: Linkit
|
||||
other_instances: muuhun palvelimeen
|
||||
other_instances: Muut palvelimet
|
||||
source_code: Lähdekoodi
|
||||
status_count_after: statusta
|
||||
status_count_before: Ovat luoneet
|
||||
terms: Ehdot
|
||||
user_count_after: käyttäjää
|
||||
user_count_before: Koti käyttäjälle
|
||||
user_count_after: käyttäjälle
|
||||
user_count_before: Koti
|
||||
accounts:
|
||||
follow: Seuraa
|
||||
followers: Seuraajat
|
||||
|
|
@ -130,8 +130,8 @@ fi:
|
|||
authorized_apps: Valtuutetut ohjelmat
|
||||
back: Takaisin Mastodoniin
|
||||
edit_profile: Muokkaa profiilia
|
||||
export: Datan vienti
|
||||
import: Datan tuonti
|
||||
export: Vie dataa
|
||||
import: Tuo dataa
|
||||
preferences: Ominaisuudet
|
||||
settings: Asetukset
|
||||
two_factor_auth: Kaksivaiheinen tunnistus
|
||||
|
|
|
|||
|
|
@ -36,8 +36,9 @@ While Mastodon is compatible with GNU social in terms of server to server commun
|
|||
|
||||
Because Mastodon has been created from a blank slate, it is much simpler to have the API mirror internal structures as closely as possible, rather than build an emulation layer. Secondly, the GNU social client API is actually a half-way implementation of the legacy Twitter API - that's the reason why it works with some older Twitter client apps. However, many of those apps are not maintained anymore, the GNU social API does not actually keep up with the real Twitter API and never fully implemented all its features; at the same time, the Twitter API was never meant for a federated service and so obscures some of the functionality.
|
||||
|
||||
|
||||
#### How is Mastodon funded?
|
||||
|
||||
Development of Mastodon and hosting of mastodon.social is funded through my [Patreon (also BTC/PayPal donations)](https://www.patreon.com/user?u=619786). Beyond that, I am not interested in VC funding, monetizing, advertising, or anything of that sort. I could offer setup/maintenance services on demand.
|
||||
|
||||
The software is free and open source and communities should host their own servers if they can, that way the costs are more or less distributed. Obviously it'd be hard for me to pay the bills if literally everyone decided to use the mastodon.social instance only.
|
||||
The software is free and open source and communities should host their own servers if they can, that way the costs are more or less distributed. Obviously it'd be hard for me to pay the bills if literally everyone decided to use the mastodon.social instance only.
|
||||
|
|
|
|||
Loading…
Reference in a new issue