Merge pull request #987 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
This commit is contained in:
commit
3473c3c8fc
4 changed files with 10 additions and 4 deletions
|
@ -3,7 +3,7 @@ Changelog
|
|||
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
## [Unreleased]
|
||||
## [2.8.0] - 2019-04-10
|
||||
### Added
|
||||
|
||||
- Add polls ([Gargron](https://github.com/tootsuite/mastodon/pull/10111), [ThibG](https://github.com/tootsuite/mastodon/pull/10155), [Gargron](https://github.com/tootsuite/mastodon/pull/10184), [ThibG](https://github.com/tootsuite/mastodon/pull/10196), [Gargron](https://github.com/tootsuite/mastodon/pull/10248), [ThibG](https://github.com/tootsuite/mastodon/pull/10255), [ThibG](https://github.com/tootsuite/mastodon/pull/10322), [Gargron](https://github.com/tootsuite/mastodon/pull/10138), [Gargron](https://github.com/tootsuite/mastodon/pull/10139), [Gargron](https://github.com/tootsuite/mastodon/pull/10144), [Gargron](https://github.com/tootsuite/mastodon/pull/10145),[Gargron](https://github.com/tootsuite/mastodon/pull/10146), [Gargron](https://github.com/tootsuite/mastodon/pull/10148), [Gargron](https://github.com/tootsuite/mastodon/pull/10151), [ThibG](https://github.com/tootsuite/mastodon/pull/10150), [Gargron](https://github.com/tootsuite/mastodon/pull/10168), [Gargron](https://github.com/tootsuite/mastodon/pull/10165), [Gargron](https://github.com/tootsuite/mastodon/pull/10172), [Gargron](https://github.com/tootsuite/mastodon/pull/10170), [Gargron](https://github.com/tootsuite/mastodon/pull/10171), [Gargron](https://github.com/tootsuite/mastodon/pull/10186), [Gargron](https://github.com/tootsuite/mastodon/pull/10189), [ThibG](https://github.com/tootsuite/mastodon/pull/10200), [rinsuki](https://github.com/tootsuite/mastodon/pull/10203), [Gargron](https://github.com/tootsuite/mastodon/pull/10213), [Gargron](https://github.com/tootsuite/mastodon/pull/10246), [Gargron](https://github.com/tootsuite/mastodon/pull/10265), [Gargron](https://github.com/tootsuite/mastodon/pull/10261), [ThibG](https://github.com/tootsuite/mastodon/pull/10333), [Gargron](https://github.com/tootsuite/mastodon/pull/10352), [ThibG](https://github.com/tootsuite/mastodon/pull/10140), [ThibG](https://github.com/tootsuite/mastodon/pull/10142), [ThibG](https://github.com/tootsuite/mastodon/pull/10141), [ThibG](https://github.com/tootsuite/mastodon/pull/10162), [ThibG](https://github.com/tootsuite/mastodon/pull/10161), [ThibG](https://github.com/tootsuite/mastodon/pull/10158), [ThibG](https://github.com/tootsuite/mastodon/pull/10156), [ThibG](https://github.com/tootsuite/mastodon/pull/10160), [Gargron](https://github.com/tootsuite/mastodon/pull/10185), [Gargron](https://github.com/tootsuite/mastodon/pull/10188), [ThibG](https://github.com/tootsuite/mastodon/pull/10195), [ThibG](https://github.com/tootsuite/mastodon/pull/10208), [Gargron](https://github.com/tootsuite/mastodon/pull/10187), [ThibG](https://github.com/tootsuite/mastodon/pull/10214), [ThibG](https://github.com/tootsuite/mastodon/pull/10209))
|
||||
|
|
|
@ -2,8 +2,9 @@
|
|||
oc:
|
||||
activerecord:
|
||||
attributes:
|
||||
status:
|
||||
owned_poll: Sondatge
|
||||
poll:
|
||||
expires_at: Data limita
|
||||
options: Opcions
|
||||
errors:
|
||||
models:
|
||||
account:
|
||||
|
|
|
@ -41,6 +41,8 @@ oc:
|
|||
name: 'Benlèu que volètz utilizar una d’aquestas causas :'
|
||||
imports:
|
||||
data: Fichièr CSV exportat d’un autre servidor Mastodon
|
||||
invite_request:
|
||||
text: Aquò nos ajudarà per validar vòstra demanda
|
||||
sessions:
|
||||
otp: 'Picatz lo còdi d’autentificacion en dos temps (Two factor code) de vòstra aplicacion mobil o utilizatz un de vòstres còdis de recuperacion :'
|
||||
user:
|
||||
|
@ -118,12 +120,15 @@ oc:
|
|||
must_be_follower: Blocar las notificacions del mond que vos sègon pas
|
||||
must_be_following: Blocar las notificacions del mond que seguètz pas
|
||||
must_be_following_dm: Blocar los messatges del monde que seguètz pas
|
||||
invite_request:
|
||||
text: Perqué volètz vos marcar ?
|
||||
notification_emails:
|
||||
digest: Enviar un corrièl recapitulatiu
|
||||
favourite: Enviar un corrièl quand qualqu’un plaça vòstre estatut en favorit
|
||||
follow: Enviar un corrièl quand qualqu’un vos sèc
|
||||
follow_request: Enviar un corrièl quand qualqu’un demanda de vos sègre
|
||||
mention: Enviar un corrièl quand qualqu’un vos menciona
|
||||
pending_account: Enviar un corrièl quand cal validar un compte novèl
|
||||
reblog: Enviar un corrièl quand qualqu’un tòrna partejar vòstre estatut
|
||||
report: Enviar un corrièl pels nòus senhalaments
|
||||
'no': Non
|
||||
|
|
|
@ -21,7 +21,7 @@ module Mastodon
|
|||
end
|
||||
|
||||
def flags
|
||||
'rc3'
|
||||
''
|
||||
end
|
||||
|
||||
def to_a
|
||||
|
|
Loading…
Reference in a new issue