diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-09 12:17:22 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-09 12:17:22 +0000 |
| commit | e553905ba7915c4b20cbe35f7a3c7e1d8ca4c913 (patch) | |
| tree | b369353417ce808523ab50295eaec0a1314a1a7a | |
| parent | 447d7e612753d69f043e08ebb228b21e411c8b4a (diff) | |
| parent | c1a41181c52216de9ebeecebf418e6d50172139b (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
59 files changed, 632 insertions, 105 deletions
diff --git a/.env.production.sample b/.env.production.sample index f169e9b35..2af3ebb4c 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -11,7 +11,7 @@ DB_PASS= DB_PORT=5432 # Optional ElasticSearch configuration # ES_ENABLED=true -# ES_HOST=localhost +# ES_HOST=es # ES_PORT=9200 # Federation diff --git a/AUTHORS.md b/AUTHORS.md new file mode 100644 index 000000000..c4bbb6014 --- /dev/null +++ b/AUTHORS.md @@ -0,0 +1,450 @@ +Mastodon is available on [GitHub](https://github.com/tootsuite/mastodon) +and provided thanks to the work of the following contributors: + +* [Gargron](https://github.com/Gargron) +* [ykzts](https://github.com/ykzts) +* [mjankowski](https://github.com/mjankowski) +* [akihikodaki](https://github.com/akihikodaki) +* [unarist](https://github.com/unarist) +* [yiskah](https://github.com/yiskah) +* [m4sk1n](https://github.com/m4sk1n) +* [nolanlawson](https://github.com/nolanlawson) +* [sorin-davidoi](https://github.com/sorin-davidoi) +* [abcang](https://github.com/abcang) +* [ThibG](https://github.com/ThibG) +* [lynlynlynx](https://github.com/lynlynlynx) +* [alpaca-tc](https://github.com/alpaca-tc) +* [nclm](https://github.com/nclm) +* [ineffyble](https://github.com/ineffyble) +* [jeroenpraat](https://github.com/jeroenpraat) +* [blackle](https://github.com/blackle) +* [Quent-in](https://github.com/Quent-in) +* [JantsoP](https://github.com/JantsoP) +* [nullkal](https://github.com/nullkal) +* [yookoala](https://github.com/yookoala) +* [ysksn](https://github.com/ysksn) +* [ashfurrow](https://github.com/ashfurrow) +* [eramdam](https://github.com/eramdam) +* [mayaeh](https://github.com/mayaeh) +* [zunda](https://github.com/zunda) +* [ticky](https://github.com/ticky) +* [masarakki](https://github.com/masarakki) +* [Wonderfall](https://github.com/Wonderfall) +* [matteoaquila](https://github.com/matteoaquila) +* [rkarabut](https://github.com/rkarabut) +* [stephenburgess8](https://github.com/stephenburgess8) +* [Kjwon15](https://github.com/Kjwon15) +* [Artoria2e5](https://github.com/Artoria2e5) +* [yukimochi](https://github.com/yukimochi) +* [marrus-sh](https://github.com/marrus-sh) +* [krainboltgreene](https://github.com/krainboltgreene) +* [renatolond](https://github.com/renatolond) +* [BoFFire](https://github.com/BoFFire) +* [clworld](https://github.com/clworld) +* [danhunsaker](https://github.com/danhunsaker) +* [patf](https://github.com/patf) +* [Quenty31](https://github.com/Quenty31) +* [MitarashiDango](https://github.com/MitarashiDango) +* [Aldarone](https://github.com/Aldarone) +* [JeanGauthier](https://github.com/JeanGauthier) +* [kschaper](https://github.com/kschaper) +* [takayamaki](https://github.com/takayamaki) +* [adbelle](https://github.com/adbelle) +* [evanminto](https://github.com/evanminto) +* [mabkenar](https://github.com/mabkenar) +* [MightyPork](https://github.com/MightyPork) +* [beatrix-bitrot](https://github.com/beatrix-bitrot) +* [yhirano55](https://github.com/yhirano55) +* [camponez](https://github.com/camponez) +* [aschmitz](https://github.com/aschmitz) +* [fpiesche](https://github.com/fpiesche) +* [gandaro](https://github.com/gandaro) +* [johnsudaar](https://github.com/johnsudaar) +* [trebmuh](https://github.com/trebmuh) +* [Sylvhem](https://github.com/Sylvhem) +* [lindwurm](https://github.com/lindwurm) +* [voidsatisfaction](https://github.com/voidsatisfaction) +* [neetshin](https://github.com/neetshin) +* [valentin2105](https://github.com/valentin2105) +* [hikari-no-yume](https://github.com/hikari-no-yume) +* [Angristan](https://github.com/Angristan) +* [seefood](https://github.com/seefood) +* [jackjennings](https://github.com/jackjennings) +* [hcmiya](https://github.com/hcmiya) +* [nightpool](https://github.com/nightpool) +* [salvadorpla](https://github.com/salvadorpla) +* [expenses](https://github.com/expenses) +* [walf443](https://github.com/walf443) +* [JoelQ](https://github.com/JoelQ) +* [mistydemeo](https://github.com/mistydemeo) +* [dunn](https://github.com/dunn) +* [xqus](https://github.com/xqus) +* [pfm-eyesightjp](https://github.com/pfm-eyesightjp) +* [fakenine](https://github.com/fakenine) +* [tsuwatch](https://github.com/tsuwatch) +* [victorhck](https://github.com/victorhck) +* [puckipedia](https://github.com/puckipedia) +* [contraexemplo](https://github.com/contraexemplo) +* [kazu9su](https://github.com/kazu9su) +* [Komic](https://github.com/Komic) +* [diomed](https://github.com/diomed) +* [rainyday](https://github.com/rainyday) +* [kadiix](https://github.com/kadiix) +* [kodacs](https://github.com/kodacs) +* [ProgVal](https://github.com/ProgVal) +* [sterdev](https://github.com/sterdev) +* [TheKinrar](https://github.com/TheKinrar) +* [AA4ch1](https://github.com/AA4ch1) +* [alexgleason](https://github.com/alexgleason) +* [cpytel](https://github.com/cpytel) +* [northerner](https://github.com/northerner) +* [hnrysmth](https://github.com/hnrysmth) +* [hugogameiro](https://github.com/hugogameiro) +* [JohnD28](https://github.com/JohnD28) +* [znz](https://github.com/znz) +* [Naouak](https://github.com/Naouak) +* [rtucker](https://github.com/rtucker) +* [reneklacan](https://github.com/reneklacan) +* [KScl](https://github.com/KScl) +* [SerCom-KC](https://github.com/SerCom-KC) +* [tcitworld](https://github.com/tcitworld) +* [geta6](https://github.com/geta6) +* [goofy-bz](https://github.com/goofy-bz) +* [happycoloredbanana](https://github.com/happycoloredbanana) +* [leopku](https://github.com/leopku) +* [SansPseudoFix](https://github.com/SansPseudoFix) +* [tomfhowe](https://github.com/tomfhowe) +* [noraworld](https://github.com/noraworld) +* [fvh-P](https://github.com/fvh-P) +* [178inaba](https://github.com/178inaba) +* [devkral](https://github.com/devkral) +* [alyssais](https://github.com/alyssais) +* [kodnaplakal](https://github.com/kodnaplakal) +* [stalker314314](https://github.com/stalker314314) +* [huertanix](https://github.com/huertanix) +* [genesixx](https://github.com/genesixx) +* [fhemberger](https://github.com/fhemberger) +* [halkeye](https://github.com/halkeye) +* [treby](https://github.com/treby) +* [d6rkaiz](https://github.com/d6rkaiz) +* [jpdevries](https://github.com/jpdevries) +* [rndm-stranger](https://github.com/rndm-stranger) +* [saper](https://github.com/saper) +* [nevillepark](https://github.com/nevillepark) +* [ornithocoder](https://github.com/ornithocoder) +* [pierreozoux](https://github.com/pierreozoux) +* [ramlmn](https://github.com/ramlmn) +* [harukasan](https://github.com/harukasan) +* [stamak](https://github.com/stamak) +* [Eychics](https://github.com/Eychics) +* [thor-the-norseman](https://github.com/thor-the-norseman) +* [0x70b1a5](https://github.com/0x70b1a5) +* [gled-rs](https://github.com/gled-rs) +* [R0ckweb](https://github.com/R0ckweb) +* [esetomo](https://github.com/esetomo) +* [foxiehkins](https://github.com/foxiehkins) +* [sdukhovni](https://github.com/sdukhovni) +* [unsmell](https://github.com/unsmell) +* [chriswmartin](https://github.com/chriswmartin) +* [vahnj](https://github.com/vahnj) +* [ikuradon](https://github.com/ikuradon) +* [AndreLewin](https://github.com/AndreLewin) +* [redtachyons](https://github.com/redtachyons) +* [thurloat](https://github.com/thurloat) +* [aaribaud](https://github.com/aaribaud) +* [estuans](https://github.com/estuans) +* [dissolve](https://github.com/dissolve) +* [PurpleBooth](https://github.com/PurpleBooth) +* [bradurani](https://github.com/bradurani) +* [wavebeem](https://github.com/wavebeem) +* [bruwalfas](https://github.com/bruwalfas) +* [foxsan48](https://github.com/foxsan48) +* [wchristian](https://github.com/wchristian) +* [muffinista](https://github.com/muffinista) +* [cdutson](https://github.com/cdutson) +* [farlistener](https://github.com/farlistener) +* [DavidLibeau](https://github.com/DavidLibeau) +* [SirCmpwn](https://github.com/SirCmpwn) +* [MasterGroosha](https://github.com/MasterGroosha) +* [Fjoerfoks](https://github.com/Fjoerfoks) +* [fmauNeko](https://github.com/fmauNeko) +* [gloaec](https://github.com/gloaec) +* [greysteil](https://github.com/greysteil) +* [unstabler](https://github.com/unstabler) +* [potato4d](https://github.com/potato4d) +* [h-izumi](https://github.com/h-izumi) +* [ErikXXon](https://github.com/ErikXXon) +* [ian-kelling](https://github.com/ian-kelling) +* [foozmeat](https://github.com/foozmeat) +* [jasonrhodes](https://github.com/jasonrhodes) +* [asm](https://github.com/asm) +* [jviide](https://github.com/jviide) +* [crakaC](https://github.com/crakaC) +* [tkbky](https://github.com/tkbky) +* [Kazhnuz](https://github.com/Kazhnuz) +* [alimony](https://github.com/alimony) +* [mig5](https://github.com/mig5) +* [ndarville](https://github.com/ndarville) +* [Abzol](https://github.com/Abzol) +* [xPaw](https://github.com/xPaw) +* [raymestalez](https://github.com/raymestalez) +* [sim6](https://github.com/sim6) +* [ekiru](https://github.com/ekiru) +* [Technowix](https://github.com/Technowix) +* [ThomasLeister](https://github.com/ThomasLeister) +* [mcat-ee](https://github.com/mcat-ee) +* [tototoshi](https://github.com/tototoshi) +* [VirtuBox](https://github.com/VirtuBox) +* [kaniini](https://github.com/kaniini) +* [vayan](https://github.com/vayan) +* [yannicka](https://github.com/yannicka) +* [ikasoumen](https://github.com/ikasoumen) +* [zacanger](https://github.com/zacanger) +* [amazedkoumei](https://github.com/amazedkoumei) +* [anon5r](https://github.com/anon5r) +* [codl](https://github.com/codl) +* [barzamin](https://github.com/barzamin) +* [fhalna](https://github.com/fhalna) +* [haoyayoi](https://github.com/haoyayoi) +* [ik11235](https://github.com/ik11235) +* [kawax](https://github.com/kawax) +* [007lva](https://github.com/007lva) +* [matsurai25](https://github.com/matsurai25) +* [mecab](https://github.com/mecab) +* [nicobz25](https://github.com/nicobz25) +* [oliverkeeble](https://github.com/oliverkeeble) +* [pinfort](https://github.com/pinfort) +* [rbaumert](https://github.com/rbaumert) +* [usagi-f](https://github.com/usagi-f) +* [vidarlee](https://github.com/vidarlee) +* [vjackson725](https://github.com/vjackson725) +* [wxcafe](https://github.com/wxcafe) +* [rinsuki](https://github.com/rinsuki) +* [cygnan](https://github.com/cygnan) +* [Awea](https://github.com/Awea) +* [halcy](https://github.com/halcy) +* [bounshi](https://github.com/bounshi) +* [8398a7](https://github.com/8398a7) +* [857b](https://github.com/857b) +* [unascribed](https://github.com/unascribed) +* [Aguay-val](https://github.com/Aguay-val) +* [knu](https://github.com/knu) +* [alxrcs](https://github.com/alxrcs) +* [console-cowboy](https://github.com/console-cowboy) +* [pointlessone](https://github.com/pointlessone) +* [a2](https://github.com/a2) +* [0xa](https://github.com/0xa) +* [virtualpain](https://github.com/virtualpain) +* [sapphirus](https://github.com/sapphirus) +* [amandavisconti](https://github.com/amandavisconti) +* [ameliavoncat](https://github.com/ameliavoncat) +* [ilpianista](https://github.com/ilpianista) +* [andydrop](https://github.com/andydrop) +* [schas002](https://github.com/schas002) +* [jumbosushi](https://github.com/jumbosushi) +* [ayumin](https://github.com/ayumin) +* [BaptisteGelez](https://github.com/BaptisteGelez) +* [bzg](https://github.com/bzg) +* [benediktg](https://github.com/benediktg) +* [blakebarnett](https://github.com/blakebarnett) +* [bradj](https://github.com/bradj) +* [brycied00d](https://github.com/brycied00d) +* [carlosjs23](https://github.com/carlosjs23) +* [cgxxx](https://github.com/cgxxx) +* [chrisheninger](https://github.com/chrisheninger) +* [chris-martin](https://github.com/chris-martin) +* [DoubleMalt](https://github.com/DoubleMalt) +* [Moosh-be](https://github.com/Moosh-be) +* [Motoma](https://github.com/Motoma) +* [chriswk](https://github.com/chriswk) +* [csu](https://github.com/csu) +* [kklleemm](https://github.com/kklleemm) +* [monsterpit-daggertooth](https://github.com/monsterpit-daggertooth) +* [watilde](https://github.com/watilde) +* [daprice](https://github.com/daprice) +* [dar5hak](https://github.com/dar5hak) +* [kant](https://github.com/kant) +* [singingwolfboy](https://github.com/singingwolfboy) +* [davidcelis](https://github.com/davidcelis) +* [yipdw](https://github.com/yipdw) +* [debanshuk](https://github.com/debanshuk) +* [dblandin](https://github.com/dblandin) +* [aranaur](https://github.com/aranaur) +* [d3vgru](https://github.com/d3vgru) +* [Elizafox](https://github.com/Elizafox) +* [ericblade](https://github.com/ericblade) +* [mikoim](https://github.com/mikoim) +* [siuying](https://github.com/siuying) +* [hattori6789](https://github.com/hattori6789) +* [algernon](https://github.com/algernon) +* [Fastbyte01](https://github.com/Fastbyte01) +* [myfreeweb](https://github.com/myfreeweb) +* [gfaivre](https://github.com/gfaivre) +* [Fiaxhs](https://github.com/Fiaxhs) +* [reedcourty](https://github.com/reedcourty) +* [anneau](https://github.com/anneau) +* [HellPie](https://github.com/HellPie) +* [Habu-Kagumba](https://github.com/Habu-Kagumba) +* [hinaloe](https://github.com/hinaloe) +* [suzukaze](https://github.com/suzukaze) +* [Hiromi-Kai](https://github.com/Hiromi-Kai) +* [musashino205](https://github.com/musashino205) +* [iwaim](https://github.com/iwaim) +* [valrus](https://github.com/valrus) +* [IMcD23](https://github.com/IMcD23) +* [yi0713](https://github.com/yi0713) +* [immae](https://github.com/immae) +* [iblech](https://github.com/iblech) +* [jack-michaud](https://github.com/jack-michaud) +* [Floppy](https://github.com/Floppy) +* [loomchild](https://github.com/loomchild) +* [docjkl](https://github.com/docjkl) +* [TrollDecker](https://github.com/TrollDecker) +* [jmontane](https://github.com/jmontane) +* [jonathanklee](https://github.com/jonathanklee) +* [jguerder](https://github.com/jguerder) +* [Jehops](https://github.com/Jehops) +* [joshuap](https://github.com/joshuap) +* [Tiwy57](https://github.com/Tiwy57) +* [xuv](https://github.com/xuv) +* [Jnsll](https://github.com/Jnsll) +* [j0k3r](https://github.com/j0k3r) +* [KEINOS](https://github.com/KEINOS) +* [futoase](https://github.com/futoase) +* [abjectio](https://github.com/abjectio) +* [mkody](https://github.com/mkody) +* [connyduck](https://github.com/connyduck) +* [k0ta0uchi](https://github.com/k0ta0uchi) +* [KrzysiekJ](https://github.com/KrzysiekJ) +* [leowzukw](https://github.com/leowzukw) +* [lmorchard](https://github.com/lmorchard) +* [cacheflow](https://github.com/cacheflow) +* [ldidry](https://github.com/ldidry) +* [jemus42](https://github.com/jemus42) +* [lfuelling](https://github.com/lfuelling) +* [Grabacr07](https://github.com/Grabacr07) +* [mistermantas](https://github.com/mistermantas) +* [wirehack7](https://github.com/wirehack7) +* [marvinkopf](https://github.com/marvinkopf) +* [otsune](https://github.com/otsune) +* [m-blc](https://github.com/m-blc) +* [matt-auckland](https://github.com/matt-auckland) +* [mattjmattj](https://github.com/mattjmattj) +* [mtparet](https://github.com/mtparet) +* [maximeborges](https://github.com/maximeborges) +* [minacle](https://github.com/minacle) +* [michaeljdeeb](https://github.com/michaeljdeeb) +* [Themimitoof](https://github.com/Themimitoof) +* [cyweo](https://github.com/cyweo) +* [M1dgard](https://github.com/M1dgard) +* [mike-burns](https://github.com/mike-burns) +* [verymilan](https://github.com/verymilan) +* [milmazz](https://github.com/milmazz) +* [Mnkai](https://github.com/Mnkai) +* [mitchhentges](https://github.com/mitchhentges) +* [moritzheiber](https://github.com/moritzheiber) +* [mouse-reeve](https://github.com/mouse-reeve) +* [lae](https://github.com/lae) +* [Nanamachi](https://github.com/Nanamachi) +* [ngerakines](https://github.com/ngerakines) +* [vonneudeck](https://github.com/vonneudeck) +* [Ninetailed](https://github.com/Ninetailed) +* [k24](https://github.com/k24) +* [noiob](https://github.com/noiob) +* [kwaio](https://github.com/kwaio) +* [norayr](https://github.com/norayr) +* [joyeusenoelle](https://github.com/joyeusenoelle) +* [OlivierNicole](https://github.com/OlivierNicole) +* [Otakan951](https://github.com/Otakan951) +* [fahy](https://github.com/fahy) +* [Pangoraw](https://github.com/Pangoraw) +* [pwoolcoc](https://github.com/pwoolcoc) +* [peterkeen](https://github.com/peterkeen) +* [petzah](https://github.com/petzah) +* [ignisf](https://github.com/ignisf) +* [rfwatson](https://github.com/rfwatson) +* [rfreebern](https://github.com/rfreebern) +* [sylph01](https://github.com/sylph01) +* [staticsafe](https://github.com/staticsafe) +* [snwh](https://github.com/snwh) +* [skoji](https://github.com/skoji) +* [ScienJus](https://github.com/ScienJus) +* [larkinscott](https://github.com/larkinscott) +* [imolein](https://github.com/imolein) +* [blinry](https://github.com/blinry) +* [Noiwex](https://github.com/Noiwex) +* [yuki764](https://github.com/yuki764) +* [shnjp](https://github.com/shnjp) +* [ernix](https://github.com/ernix) +* [rosylilly](https://github.com/rosylilly) +* [shouko](https://github.com/shouko) +* [sossii](https://github.com/sossii) +* [StefOfficiel](https://github.com/StefOfficiel) +* [svetlik](https://github.com/svetlik) +* [dereckson](https://github.com/dereckson) +* [theboss](https://github.com/theboss) +* [takp](https://github.com/takp) +* [tkusano](https://github.com/tkusano) +* [TheInventrix](https://github.com/TheInventrix) +* [shug0](https://github.com/shug0) +* [Fortyseven](https://github.com/Fortyseven) +* [tobypinder](https://github.com/tobypinder) +* [tomosm](https://github.com/tomosm) +* [TomoyaShibata](https://github.com/TomoyaShibata) +* [TrashMacNugget](https://github.com/TrashMacNugget) +* [treyssatvincent](https://github.com/treyssatvincent) +* [optikfluffel](https://github.com/optikfluffel) +* [vmincev](https://github.com/vmincev) +* [waldyrious](https://github.com/waldyrious) +* [tahnok](https://github.com/tahnok) +* [YDrogen](https://github.com/YDrogen) +* [YOSHIOKAEiichiro](https://github.com/YOSHIOKAEiichiro) +* [S-YOU](https://github.com/S-YOU) +* [YaQ00](https://github.com/YaQ00) +* [yanakend](https://github.com/yanakend) +* [orzFly](https://github.com/orzFly) +* [chansuke](https://github.com/chansuke) +* [yuntan](https://github.com/yuntan) +* [LogicalDash](https://github.com/LogicalDash) +* [ZiiX](https://github.com/ZiiX) +* [benklop](https://github.com/benklop) +* [caasi](https://github.com/caasi) +* [caesarologia](https://github.com/caesarologia) +* [chrolis](https://github.com/chrolis) +* [cormojs](https://github.com/cormojs) +* [cpsdqs](https://github.com/cpsdqs) +* [d0p1s4m4](https://github.com/d0p1s4m4) +* [evilny0](https://github.com/evilny0) +* [febrezo](https://github.com/febrezo) +* [fsubal](https://github.com/fsubal) +* [dikky1218](https://github.com/dikky1218) +* [gentarok](https://github.com/gentarok) +* [hakoai](https://github.com/hakoai) +* [chaosbunker](https://github.com/chaosbunker) +* [isati](https://github.com/isati) +* [jkap](https://github.com/jkap) +* [jirayudech](https://github.com/jirayudech) +* [jukper](https://github.com/jukper) +* [karlyeurl](https://github.com/karlyeurl) +* [kedamaDQ](https://github.com/kedamaDQ) +* [kuro5hin](https://github.com/kuro5hin) +* [maxypy](https://github.com/maxypy) +* [marcus-herrmann](https://github.com/marcus-herrmann) +* [mshrtkch](https://github.com/mshrtkch) +* [muan](https://github.com/muan) +* [rch850](https://github.com/rch850) +* [roikale](https://github.com/roikale) +* [rysiekpl](https://github.com/rysiekpl) +* [saturday06](https://github.com/saturday06) +* [scriptjunkie](https://github.com/scriptjunkie) +* [seekr](https://github.com/seekr) +* [syui](https://github.com/syui) +* [tackeyy](https://github.com/tackeyy) +* [tmyt](https://github.com/tmyt) +* [utam0k](https://github.com/utam0k) +* [vpzomtrrfrt](https://github.com/vpzomtrrfrt) +* [walfie](https://github.com/walfie) +* [y-temp4](https://github.com/y-temp4) +* [ymmtmdk](https://github.com/ymmtmdk) + +This document is provided for informational purposes only. Since it is only updated once per release, the version you are looking at may be currently out of date. To see the full list of contributors, consider looking at the [git history](https://github.com/tootsuite/mastodon/graphs/contributors) instead. diff --git a/app/javascript/mastodon/components/media_gallery.js b/app/javascript/mastodon/components/media_gallery.js index 71436500a..9310e7c96 100644 --- a/app/javascript/mastodon/components/media_gallery.js +++ b/app/javascript/mastodon/components/media_gallery.js @@ -168,11 +168,13 @@ class Item extends React.PureComponent { } if (originalWidth > originalHeight) { - imageStyle.height = '100%'; - imageStyle.width = 'auto'; + imageStyle.height = '100%'; + imageStyle.width = 'auto'; + imageStyle.minWidth = '100%'; } else { - imageStyle.height = 'auto'; - imageStyle.width = '100%'; + imageStyle.height = 'auto'; + imageStyle.width = '100%'; + imageStyle.minHeight = '100%'; } imageStyle.top = vShift; diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index 6e0b4456c..6267b1d71 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -1,9 +1,9 @@ { "account.block": "@{name} blocken", "account.block_domain": "Alles von {domain} verstecken", - "account.blocked": "Blocked", + "account.blocked": "Blockiert", "account.disclaimer_full": "Das Profil wird möglicherweise unvollständig wiedergegeben.", - "account.domain_blocked": "Domain hidden", + "account.domain_blocked": "Domain versteckt", "account.edit_profile": "Profil bearbeiten", "account.follow": "Folgen", "account.followers": "Folgende", @@ -15,9 +15,9 @@ "account.moved_to": "{name} ist umgezogen auf:", "account.mute": "@{name} stummschalten", "account.mute_notifications": "Benachrichtigungen von @{name} verbergen", - "account.muted": "Muted", + "account.muted": "Stummgeschaltet", "account.posts": "Beiträge", - "account.posts_with_replies": "Toots with replies", + "account.posts_with_replies": "Beiträge mit Antworten", "account.report": "@{name} melden", "account.requested": "Warte auf Erlaubnis. Klicke zum Abbrechen", "account.share": "Profil von @{name} teilen", @@ -40,7 +40,7 @@ "column.favourites": "Favoriten", "column.follow_requests": "Folgeanfragen", "column.home": "Startseite", - "column.lists": "Lists", + "column.lists": "Listen", "column.mutes": "Stummgeschaltete Profile", "column.notifications": "Mitteilungen", "column.pins": "Angeheftete Beiträge", @@ -54,7 +54,7 @@ "column_header.unpin": "Lösen", "column_subheading.navigation": "Navigation", "column_subheading.settings": "Einstellungen", - "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.", + "compose_form.hashtag_warning": "Dieser Beitrag wird nicht unter einen dieser Hashtags sichtbar sein, solange er ungelistet ist. Bei einer Suche kann er nicht gefunden werden.", "compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Wer dir folgen will, kann das jederzeit tun und dann auch deine privaten Beiträge sehen.", "compose_form.lock_disclaimer.lock": "gesperrt", "compose_form.placeholder": "Worüber möchtest du schreiben?", @@ -69,7 +69,7 @@ "confirmations.delete.confirm": "Löschen", "confirmations.delete.message": "Bist du dir sicher, dass du diesen Beitrag löschen möchtest?", "confirmations.delete_list.confirm": "Delete", - "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?", + "confirmations.delete_list.message": "Bist du dir sicher, dass du diese Liste permanent löschen möchtest?", "confirmations.domain_block.confirm": "Die ganze Domain verbergen", "confirmations.domain_block.message": "Bist du dir wirklich sicher, dass du die ganze Domain {domain} verbergen willst? In den meisten Fällen reichen ein paar gezielte Blocks aus.", "confirmations.mute.confirm": "Stummschalten", @@ -115,35 +115,35 @@ "keyboard_shortcuts.back": "zurück navigieren", "keyboard_shortcuts.boost": "boosten", "keyboard_shortcuts.column": "einen Status in einer der Spalten fokussieren", - "keyboard_shortcuts.compose": "to focus the compose textarea", - "keyboard_shortcuts.description": "Description", + "keyboard_shortcuts.compose": "um das Textfeld zu fokussieren", + "keyboard_shortcuts.description": "Beschreibung", "keyboard_shortcuts.down": "sich in der Liste hinunter bewegen", - "keyboard_shortcuts.enter": "to open status", - "keyboard_shortcuts.favourite": "favorisieren", - "keyboard_shortcuts.heading": "Keyboard Shortcuts", + "keyboard_shortcuts.enter": "um den Status zu öffnen", + "keyboard_shortcuts.favourite": "um zu favorisieren", + "keyboard_shortcuts.heading": "Tastenkombinationen", "keyboard_shortcuts.hotkey": "Hotkey", - "keyboard_shortcuts.legend": "diese Übersicht anzeigen", - "keyboard_shortcuts.mention": "Autor_in erwähnen", - "keyboard_shortcuts.reply": "antworten", - "keyboard_shortcuts.search": "die Suche fokussieren", - "keyboard_shortcuts.toot": "einen neuen Toot beginnen", - "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", + "keyboard_shortcuts.legend": "um diese Übersicht anzuzeigen", + "keyboard_shortcuts.mention": "um Autor_in zu erwähnen", + "keyboard_shortcuts.reply": "um zu antworten", + "keyboard_shortcuts.search": "um die Suche zu fokussieren", + "keyboard_shortcuts.toot": "um einen neuen Toot zu beginnen", + "keyboard_shortcuts.unfocus": "um das Textfeld/die Suche nicht mehr zu fokussieren", "keyboard_shortcuts.up": "sich in der Liste hinauf bewegen", "lightbox.close": "Schließen", "lightbox.next": "Weiter", "lightbox.previous": "Zurück", - "lists.account.add": "Add to list", - "lists.account.remove": "Remove from list", + "lists.account.add": "Zur Liste hinzufügen", + "lists.account.remove": "Von der Liste entfernen", "lists.delete": "Delete list", - "lists.edit": "Edit list", - "lists.new.create": "Add list", - "lists.new.title_placeholder": "New list title", - "lists.search": "Search among people you follow", - "lists.subheading": "Your lists", + "lists.edit": "Liste bearbeiten", + "lists.new.create": "Liste hinzufügen", + "lists.new.title_placeholder": "Neuer Titel der Liste", + "lists.search": "Suche nach Leuten denen du folgst", + "lists.subheading": "Deine Listen", "loading_indicator.label": "Wird geladen …", "media_gallery.toggle_visible": "Sichtbarkeit umschalten", "missing_indicator.label": "Nicht gefunden", - "missing_indicator.sublabel": "This resource could not be found", + "missing_indicator.sublabel": "Die Ressource konnte nicht gefunden werden", "mute_modal.hide_notifications": "Benachrichtigungen von diesem Account verbergen?", "navigation_bar.blocks": "Blockierte Profile", "navigation_bar.community_timeline": "Lokale Zeitleiste", @@ -152,7 +152,7 @@ "navigation_bar.follow_requests": "Folgeanfragen", "navigation_bar.info": "Über diese Instanz", "navigation_bar.keyboard_shortcuts": "Tastenkombinationen", - "navigation_bar.lists": "Lists", + "navigation_bar.lists": "Listen", "navigation_bar.logout": "Abmelden", "navigation_bar.mutes": "Stummgeschaltete Profile", "navigation_bar.pins": "Angeheftete Beiträge", @@ -175,7 +175,7 @@ "notifications.column_settings.sound": "Ton abspielen", "onboarding.done": "Fertig", "onboarding.next": "Weiter", - "onboarding.page_five.public_timelines": "Die lokale Zeitleiste zeigt alle Beiträge von Leuten, die auch auf {domain} sind. Das gesamte bekannte Netz zeigt Beiträge von allen, denen von Leuten auf {domain} gefolgt wird. Zusammen sind sie die öffentlichen Zeitleisten. In ihnen kannst du viel Neues entdecken!", + "onboarding.page_five.public_timelines": "Die lokale Zeitleiste zeigt alle Beiträge von Leuten, die auch auf {domain} sind. Das gesamte bekannte Netz zeigt Beiträge von allen, denen von Leuten auf {domain} gefolgt wird. Zusammen sind sie die öffentlichen Zeitleisten, ein guter Weg, um neue Leute zu finden.", "onboarding.page_four.home": "Die Startseite zeigt dir Beiträge von Leuten, denen du folgst.", "onboarding.page_four.notifications": "Wenn jemand mit dir interagiert, bekommst du eine Mitteilung.", "onboarding.page_one.federation": "Mastodon ist ein soziales Netzwerk, das aus unabhängigen Servern besteht. Diese Server nennen wir auch Instanzen.", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index 0e5e22749..4f465bf40 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -1,9 +1,9 @@ { "account.block": "Bloki @{name}", "account.block_domain": "Kaŝi ĉion de {domain}", - "account.blocked": "Blocked", + "account.blocked": "Blokita", "account.disclaimer_full": "Subaj informoj povas reflekti la profilon de la uzanto nekomplete.", - "account.domain_blocked": "Domain hidden", + "account.domain_blocked": "Domajno kaŝita", "account.edit_profile": "Redakti profilon", "account.follow": "Sekvi", "account.followers": "Sekvantoj", @@ -15,7 +15,7 @@ "account.moved_to": "{name} moviĝis al:", "account.mute": "Silentigi @{name}", "account.mute_notifications": "Silentigi sciigojn el @{name}", - "account.muted": "Muted", + "account.muted": "Silentigita", "account.posts": "Mesaĝoj", "account.posts_with_replies": "Mesaĝoj kun respondoj", "account.report": "Signali @{name}", @@ -53,7 +53,7 @@ "column_header.show_settings": "Montri agordojn", "column_header.unpin": "Depingli", "column_subheading.navigation": "Navigado", - "column_subheading.settings": "Agordoj", + "column_subheading.settings": "Agordado", "compose_form.hashtag_warning": "Ĉi tiu mesaĝo ne estos listigita per ajna kradvorto. Nur publikaj mesaĝoj estas serĉeblaj per kradvortoj.", "compose_form.lock_disclaimer": "Via konta ne estas {locked}. Iu ajn povas sekvi vin por vidi viajn mesaĝojn nur por sekvantoj.", "compose_form.lock_disclaimer.lock": "ŝlosita", @@ -219,7 +219,7 @@ "report.target": "Signali {target}", "search.placeholder": "Serĉi", "search_popout.search_format": "Detala serĉo", - "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.", + "search_popout.tips.full_text": "Simplaj tekstoj montras la mesaĝojn, kiujn vi skribis, stelumis, diskonigis, aŭ en kiuj vi estis menciita, sed ankaŭ kongruajn uzantnomojn, montratajn nomojn, kaj kradvortojn.", "search_popout.tips.hashtag": "kradvorto", "search_popout.tips.status": "mesaĝoj", "search_popout.tips.text": "Simpla teksto montras la kongruajn afiŝitajn nomojn, uzantnomojn kaj kradvortojn", @@ -242,7 +242,7 @@ "status.mute_conversation": "Silentigi konversacion", "status.open": "Grandigi ĉi tiun mesaĝon", "status.pin": "Alpingli en la profilo", - "status.pinned": "Pinned toot", + "status.pinned": "Alpinglita mesaĝo", "status.reblog": "Diskonigi", "status.reblogged_by": "{name} diskonigis", "status.reply": "Respondi", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index 77f4a0cca..4df1ef30f 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -3,7 +3,7 @@ "account.block_domain": "Tout masquer venant de {domain}", "account.blocked": "Bloqué", "account.disclaimer_full": "Les données ci-dessous peuvent ne pas refléter ce profil dans sa totalité.", - "account.domain_blocked": "Domain hidden", + "account.domain_blocked": "Domaine caché", "account.edit_profile": "Modifier le profil", "account.follow": "Suivre", "account.followers": "Abonné⋅e⋅s", diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index 9f7cebf6b..05c84fd37 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -1,9 +1,9 @@ { "account.block": "@{name}을 차단", "account.block_domain": "{domain} 전체를 숨김", - "account.blocked": "Blocked", + "account.blocked": "차단 됨", "account.disclaimer_full": "여기 있는 정보는 유저의 프로파일을 정확히 반영하지 못 할 수도 있습니다.", - "account.domain_blocked": "Domain hidden", + "account.domain_blocked": "도메인 숨겨짐", "account.edit_profile": "프로필 편집", "account.follow": "팔로우", "account.followers": "팔로워", @@ -15,9 +15,9 @@ "account.moved_to": "{name}는 계정을 이동했습니다:", "account.mute": "@{name} 뮤트", "account.mute_notifications": "@{name}의 알림을 뮤트", - "account.muted": "Muted", + "account.muted": "뮤트 됨", "account.posts": "게시물", - "account.posts_with_replies": "Toots with replies", + "account.posts_with_replies": "툿과 답장", "account.report": "@{name} 신고", "account.requested": "승인 대기 중. 클릭해서 취소하기", "account.share": "@{name}의 프로파일 공유", @@ -211,9 +211,9 @@ "relative_time.minutes": "{number}분 전", "relative_time.seconds": "{number}초 전", "reply_indicator.cancel": "취소", - "report.forward": "Forward to {target}", - "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?", - "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:", + "report.forward": "{target}에 포워드 됨", + "report.forward_hint": "이 계정은 다른 서버에 있습니다. 익명화 된 사본을 해당 서버에도 전송할까요?", + "report.hint": "신고는 당신의 서버 스태프에게 전송 됩니다. 왜 이 계정을 신고하는 지에 대한 설명을 아래에 작성할 수 있습니다:", "report.placeholder": "코멘트", "report.submit": "신고하기", "report.target": "문제가 된 사용자", @@ -224,9 +224,9 @@ "search_popout.tips.status": "툿", "search_popout.tips.text": "단순한 텍스트 검색은 관계된 프로필 이름, 유저 이름 그리고 해시태그를 표시합니다", "search_popout.tips.user": "유저", - "search_results.accounts": "People", - "search_results.hashtags": "Hashtags", - "search_results.statuses": "Toots", + "search_results.accounts": "사람", + "search_results.hashtags": "해시태그", + "search_results.statuses": "툿", "search_results.total": "{count, number}건의 결과", "standalone.public_title": "지금 이런 이야기를 하고 있습니다…", "status.block": "@{name} 차단", @@ -242,7 +242,7 @@ "status.mute_conversation": "이 대화를 뮤트", "status.open": "상세 정보 표시", "status.pin": "고정", - "status.pinned": "Pinned toot", + "status.pinned": "고정 된 툿", "status.reblog": "부스트", "status.reblogged_by": "{name}님이 부스트 했습니다", "status.reply": "답장", @@ -263,7 +263,7 @@ "upload_area.title": "드래그 & 드롭으로 업로드", "upload_button.label": "미디어 추가", "upload_form.description": "시각장애인을 위한 설명", - "upload_form.focus": "Crop", + "upload_form.focus": "크롭", "upload_form.undo": "재시도", "upload_progress.label": "업로드 중...", "video.close": "동영상 닫기", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index ccf3cefc2..509382670 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -1,9 +1,9 @@ { "account.block": "Blokkeer @{name}", "account.block_domain": "Negeer alles van {domain}", - "account.blocked": "Blocked", + "account.blocked": "Geblokkeerd", "account.disclaimer_full": "De informatie hieronder kan mogelijk een incompleet beeld geven van dit gebruikersprofiel.", - "account.domain_blocked": "Domain hidden", + "account.domain_blocked": "Domein verborgen", "account.edit_profile": "Profiel bewerken", "account.follow": "Volgen", "account.followers": "Volgers", @@ -15,7 +15,7 @@ "account.moved_to": "{name} is verhuisd naar:", "account.mute": "Negeer @{name}", "account.mute_notifications": "Negeer meldingen van @{name}", - "account.muted": "Muted", + "account.muted": "Genegeerd", "account.posts": "Toots", "account.posts_with_replies": "Toots met reacties", "account.report": "Rapporteer @{name}", @@ -219,7 +219,7 @@ "report.target": "Rapporteer {target}", "search.placeholder": "Zoeken", "search_popout.search_format": "Geavanceerd zoeken", - "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.", + "search_popout.tips.full_text": "Gebruik gewone tekst om te zoeken naar toots die jij hebt geschreven, als favoriet markeerde, hebt geboost of waarin jij bent vermeldt, en ook om te zoeken naar gebruikersnamen, weergavenamen en hashtags.", "search_popout.tips.hashtag": "hashtag", "search_popout.tips.status": "toot", "search_popout.tips.text": "Gebruik gewone tekst om te zoeken op weergavenamen, gebruikersnamen en hashtags", @@ -242,7 +242,7 @@ "status.mute_conversation": "Negeer conversatie", "status.open": "Toot volledig tonen", "status.pin": "Aan profielpagina vastmaken", - "status.pinned": "Pinned toot", + "status.pinned": "Vastgemaakte toot", "status.reblog": "Boost", "status.reblogged_by": "{name} boostte", "status.reply": "Reageren", diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index fa36bb890..6406dbea6 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -3,7 +3,7 @@ "account.block_domain": "Esconder tudo de {domain}", "account.blocked": "Bloqueado", "account.disclaimer_full": "As informações abaixo podem refletir o perfil do usuário de maneira incompleta.", - "account.domain_blocked": "Domain hidden", + "account.domain_blocked": "Domínio escondido", "account.edit_profile": "Editar perfil", "account.follow": "Seguir", "account.followers": "Seguidores", diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index b76753899..bb86165ad 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -3,7 +3,7 @@ "account.block_domain": "Ukryť všetko z {domain}", "account.blocked": "Blokovaný/á", "account.disclaimer_full": "Inofrmácie nižšie nemusia byť úplným odrazom uživateľovho účtu.", - "account.domain_blocked": "Domain hidden", + "account.domain_blocked": "Doména ukrytá", "account.edit_profile": "Upraviť profil", "account.follow": "Následovať", "account.followers": "Sledujúci", diff --git a/config/locales/ca.yml b/config/locales/ca.yml index ca353bba7..09ddb9a3e 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -359,6 +359,7 @@ ca: your_token: El teu identificador d'accés auth: agreement_html: En inscriure't, acceptes seguir <a href="%{rules_path}">els nostres termes del servei</a> i <a href="%{terms_path}">la nostra política de privadesa</a>. + change_password: Contrasenya confirm_email: Confirmar correu electrònic delete_account: Suprimeix el compte delete_account_html: Si vols suprimir el compte pots <a href="%{path}">fer-ho aquí</a>. Se't demanarà confirmació. @@ -375,6 +376,7 @@ ca: cas: CAS saml: SAML register: Registre + register_elsewhere: Registra't en un altre servidor resend_confirmation: Torna a enviar el correu de confirmació reset_password: Restableix la contrasenya security: Seguretat diff --git a/config/locales/de.yml b/config/locales/de.yml index e55ad151a..6233d299e 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -60,7 +60,7 @@ de: destroyed_msg: Moderationsnotiz erfolgreich gelöscht! accounts: are_you_sure: Bist du sicher? - by_domain: Domain + by_domain: Domäne confirm: Bestätigen confirmed: Bestätigt demote: Degradieren @@ -273,6 +273,9 @@ de: contact_information: email: Öffentliche E-Mail-Adresse username: Profilname für die Kontaktaufnahme + hero: + desc_html: Wird auf der Startseite angezeigt. Mindestens 600x100px sind empfohlen. Wenn es nicht gesetzt wurde, wird das Instanz-Thumbnail dafür verwendet + title: Bild für Startseite peers_api_enabled: desc_html: Domain-Namen dieser Instanz, die im Fediverse gefunden wurden title: Veröffentliche Liste von gefundenen Instanzen @@ -289,6 +292,9 @@ de: open: desc_html: Allen erlauben, ein Konto zu erstellen title: Registrierung öffnen + show_known_fediverse_at_about_page: + desc_html: Wenn aktiviert, wird es alle Beiträge aus dem bereits bekannten Teil des Fediversums auf der Startseite anzeigen. Andernfalls werden lokale Beitrage der Instanz angezeigt. + title: Verwende öffentliche Zeitleiste für die Vorschau show_staff_badge: desc_html: Zeige Mitarbeiter-Badge auf Benutzerseite title: Zeige Mitarbeiter-Badge @@ -349,10 +355,12 @@ de: invalid_url: Die angegebene URL ist ungültig regenerate_token: Zugangs-Token neu erstellen token_regenerated: Zugangs-Token neu erstellt - warning: Sei mit diesen Daten sehr vorsichtig! Teile sie mit niemandem. + warning: Sei mit diesen Daten sehr vorsichtig. Teile sie mit niemandem! your_token: Dein Zugangs-Token auth: agreement_html: Indem du dich registrierst, erklärst du dich mit den Regeln, die <a href="%{rules_path}">auf dieser Instanz gelten</a> und der <a href="%{terms_path}">Datenschutzerklärung</a> einverstanden. + change_password: Passwort + confirm_email: E-Mail bestätigen delete_account: Konto löschen delete_account_html: Falls du dein Konto löschen willst, kannst du <a href="%{path}">hier damit fortfahren</a>. Du wirst um Bestätigung gebeten werden. didnt_get_confirmation: Keine Bestätigungs-Mail erhalten? @@ -362,7 +370,13 @@ de: logout: Abmelden migrate_account: Ziehe zu einem anderen Account um migrate_account_html: Wenn du es wünschst diesen Account zu einem anderen umzuziehen, dann kannst du <a href="%{path}">es hier einstellen</a>. + or: oder + or_log_in_with: Oder anmelden mit + providers: + cas: CAS + saml: SAML register: Registrieren + register_elsewhere: Registrieren auf einem anderen Server resend_confirmation: Bestätigungs-Mail erneut versenden reset_password: Passwort zurücksetzen security: Sicherheit @@ -412,6 +426,13 @@ de: title: Diese Seite ist kaputt noscript_html: Bitte aktiviere JavaScript, um die Mastodon-Web-Anwendung zu verwenden. Alternativ kannst du auch eine der <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">nativen Mastodon-Anwendungen</a> für deine Plattform probieren. exports: + archive_takeout: + date: Datum + download: Dein Archiv herunterladen + hint_html: Du kannst ein Archiv deiner <strong>Beiträge und hochgeladenen Medien</strong> anfragen. Die exportieren Daten werden im ActivityPub-Format gespeichert, dass lesbar mit jeder Software ist, die das Format unterstützt. + in_progress: Stelle dein Archiv zusammen... + request: Dein Archiv anfragen + size: Größe blocks: Du hast blockiert csv: CSV follows: Du folgst @@ -527,7 +548,9 @@ de: trillion: T unit: '' pagination: + newer: Neuer next: Vorwärts + older: Älter prev: Zurück truncate: "…" preferences: @@ -652,6 +675,10 @@ de: setup: Einrichten wrong_code: Der eingegebene Code war ungültig! Stimmen Serverzeit und Gerätezeit? user_mailer: + backup_ready: + explanation: Du hast ein vollständiges Backup von deinem Mastodon-Account angefragt. Es kann jetzt heruntergeladen werden! + subject: Dein Archiv ist bereit zum Download + title: Archiv-Download welcome: edit_profile_action: Profil einstellen edit_profile_step: Du kannst dein Profil anpassen, indem du einen Avatar oder ein Titelbild hochlädst oder deinen Anzeigenamen änderst und mehr. Wenn du deine Follower vorher überprüfen möchtest, bevor sie dir folgen können, dann kannst du dein Profil sperren. @@ -673,4 +700,5 @@ de: users: invalid_email: Ungültige E-Mail-Adresse invalid_otp_token: Ungültiger Zwei-Faktor-Authentisierungs-Code + seamless_external_login: Du bist angemeldet über einen Drittanbieter-Dienst, weswegen Passwort- und E-Maileinstellungen nicht verfügbar sind. signed_in_as: 'Angemeldet als:' diff --git a/config/locales/devise.pt-BR.yml b/config/locales/devise.pt-BR.yml index bf9b66792..5f47bc901 100644 --- a/config/locales/devise.pt-BR.yml +++ b/config/locales/devise.pt-BR.yml @@ -13,7 +13,7 @@ pt-BR: locked: A sua conta está bloqueada. not_found_in_database: "%{authentication_keys} ou senha inválida." timeout: A sua sessão expirou. Por favor, entre novamente para continuar. - unauthenticated: Você precisa entrar ou registar-se antes de continuar. + unauthenticated: Você precisa entrar ou cadastrar-se antes de continuar. unconfirmed: Você precisa confirmar o seu endereço de e-mail antes de continuar. mailer: confirmation_instructions: diff --git a/config/locales/devise.tr.yml b/config/locales/devise.tr.yml index ade23769d..fb819978f 100644 --- a/config/locales/devise.tr.yml +++ b/config/locales/devise.tr.yml @@ -3,7 +3,7 @@ tr: simple_form: hints: defaults: - avatar: En fazla 2MB olacak şekilde PNG, GIF veya JPG formatında yükleyiniz. 120x120px büyüklüğüne indirgenecektir + avatar: En fazla 2MB olacak şekilde PNG, GIF veya JPG formatında yükleyiniz. 400x400px büyüklüğüne indirgenecektir display_name: "%{count} karakter kaldı" header: En fazla 2MB olacak şekilde PNG, GIF veya JPG formatında yükleyiniz. 700x335px büyüklüğüne indirgenecektir. locked: Takipçilerinizi manuel olarak kabul etmenizi ve gönderilerinizi varsayılan olarak sadece takipçilerinizin göreceği şekilde paylaşmanızı sağlar. diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 6daa1caed..8bc2aaa41 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -275,6 +275,7 @@ eo: username: Kontakta uzantnomo hero: desc_html: Montrata en la ĉefpaĝo. Almenaŭ 600x100px rekomendita. Kiam ne agordita, la bildeto de la nodo estos uzata + title: Kapbildo peers_api_enabled: desc_html: Nomoj de domajnoj, kiujn ĉi tiu nodo renkontis en la fediverse title: Publikigi liston de malkovritaj nodoj @@ -358,6 +359,7 @@ eo: your_token: Via alira ĵetono auth: agreement_html: Per registriĝo, vi konsentas kun <a href="%{rules_path}">la reguloj de la nodo</a> kaj <a href="%{terms_path}">niaj uzkondiĉoj</a>. + change_password: Pasvorto confirm_email: Konfirmi retadreson delete_account: Forigi konton delete_account_html: Se vi deziras forigi vian konton, vi povas <a href="%{path}">fari tion ĉi tie</a>. Vi bezonos konfirmi vian peton. @@ -368,11 +370,13 @@ eo: logout: Elsaluti migrate_account: Movi al alia konto migrate_account_html: Se vi deziras alidirekti ĉi tiun konton al alia, vi povas <a href="%{path}">agordi ĝin ĉi tie</a>. + or: aŭ or_log_in_with: Aŭ ensaluti per providers: cas: CAS saml: SAML register: Registriĝi + register_elsewhere: Registriĝi en alia servilo resend_confirmation: Resendi la instrukciojn por konfirmi reset_password: Ŝanĝi pasvorton security: Sekureco @@ -438,9 +442,9 @@ eo: storage: Aŭdovidaĵa konservado followers: domain: Domajno - explanation_html: Se vi volas esti certa pri la privateco de viaj mesaĝoj, vi bezonas esti atenta pri tiuj, kiuj sekvas vin. <strong>Viaj privataj mesaĝoj estas liveritaj al ĉiuj nodoj, kie vi havas sekvantojn</strong>. Eble vi ŝatus kontroli ilin, kaj forigi sekvantojn, se vi ne fidas, ke via privateco estos respektita de la teamo aŭ de la programo de ĉi tiuj nodoj. + explanation_html: Se vi volas esti certa pri la privateco de viaj mesaĝoj, vi bezonas esti atenta pri tiuj, kiuj sekvas vin. <strong>Viaj privataj mesaĝoj estas liveritaj al ĉiuj nodoj, kie vi havas sekvantojn</strong>. Eble vi ŝatus kontroli ilin, kaj forigi la sekvantojn de la nodoj, kie vi ne certas ĉu via privateco estos respektita de la tiea teamo aŭ programo. followers_count: Nombro de sekvantoj - lock_link: Ŝlosi vian konton + lock_link: Ŝlosu vian konton purge: Forigi el la sekvantoj success: one: Forigado de sekvantoj el iu domajno... @@ -748,6 +752,7 @@ eo: backup_ready: explanation: Vi petis kompletan arkivon de via Mastodon-konto. Ĝi nun pretas por elŝutado! subject: Via arkivo estas preta por elŝutado + title: Arkiva elŝuto welcome: edit_profile_action: Agordi profilon edit_profile_step: Vi povas proprigi vian profilon per alŝuto de profilbildo, fonbildo, ŝanĝo de via afiŝita nomo kaj pli. Se vi ŝatus kontroli novajn sekvantojn antaŭ ol ili rajtas sekvi vin, vi povas ŝlosi vian konton. diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 2753b76dd..0dc0bc306 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -299,7 +299,7 @@ fr: desc_html: Montrer un badge de responsable sur une page utilisateur title: Montrer un badge de responsable site_description: - desc_html: Paragraphe introductif sur la page d'accueil et dans les balises meta. Vous pouvez utiliser des balises HTML, en particulier <code><a></code> et <code><em></code>. + desc_html: Paragraphe introductif sur la page d'accueil et dans les méta-balises. Vous pouvez utiliser des balises HTML, en particulier <code><a></code> et <code><em></code>. title: Description du site site_description_extended: desc_html: Affichée sur la page d’informations complémentaires du site<br>Vous pouvez utiliser des balises HTML @@ -359,6 +359,7 @@ fr: your_token: Votre jeton d’accès auth: agreement_html: En vous inscrivant, vous souscrivez <a href="%{rules_path}">aux règles de l’instance</a> et à <a href="%{terms_path}">nos conditions d’utilisation</a>. + change_password: Mot de passe confirm_email: Confirmer mon adresse mail delete_account: Supprimer le compte delete_account_html: Si vous désirez supprimer votre compte, vous pouvez <a href="%{path}">cliquer ici</a>. Il vous sera demandé de confirmer cette action. @@ -375,6 +376,7 @@ fr: cas: CAS saml: SAML register: S’inscrire + register_elsewhere: S'inscrire sur un autre serveur resend_confirmation: Envoyer à nouveau les consignes de confirmation reset_password: Réinitialiser le mot de passe security: Sécurité diff --git a/config/locales/gl.yml b/config/locales/gl.yml index ca02ea693..30b68d7d6 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -359,6 +359,7 @@ gl: your_token: O seu testemuño de acceso auth: agreement_html: Rexistrándose acorda seguir <a href="%{rules_path}">as normas da instancia</a> e <a href="%{terms_path}">os termos do servizo</a>. + change_password: Contrasinal confirm_email: Confirmar correo-e delete_account: Eliminar conta delete_account_html: Se desexa eliminar a súa conta, pode <a href="%{path}">facelo aquí</a>. Pediráselle confirmación. @@ -375,6 +376,7 @@ gl: cas: CAS saml: SAML register: Rexistro + register_elsewhere: Rexístrese en outro servidor resend_confirmation: Voltar a enviar intruccións de confirmación reset_password: Restablecer contrasinal security: Seguridade diff --git a/config/locales/ja.yml b/config/locales/ja.yml index eeba6f7e9..50047bca2 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -359,6 +359,7 @@ ja: your_token: アクセストークン auth: agreement_html: 登録すると <a href="%{rules_path}">インスタンスのルール</a> と <a href="%{terms_path}">利用規約</a> に従うことに同意したことになります。 + change_password: パスワード confirm_email: メールアドレスの確認 delete_account: アカウントの削除 delete_account_html: アカウントを削除したい場合、<a href="%{path}">こちら</a> から手続きが行えます。削除する前に、確認画面があります。 @@ -375,6 +376,7 @@ ja: cas: CAS saml: SAML register: 登録する + register_elsewhere: 他のインスタンスで新規登録 resend_confirmation: 確認メールを再送する reset_password: パスワードを再発行 security: セキュリティ @@ -662,7 +664,7 @@ ja: stream_entries: click_to_show: クリックして表示 pinned: 固定されたトゥート - reblogged: さんにブーストされました + reblogged: さんがブースト sensitive_content: 閲覧注意 terms: body_html: | diff --git a/config/locales/nl.yml b/config/locales/nl.yml index be8ebb637..c041fc585 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -359,6 +359,7 @@ nl: your_token: Jouw toegangscode auth: agreement_html: Wanneer je op registreren klikt ga je akkoord met het opvolgen van <a href="%{rules_path}">de regels van deze server</a> en <a href="%{terms_path}">onze gebruikersvoorwaarden</a>. + change_password: Wachtwoord confirm_email: E-mail bevestigen delete_account: Account verwijderen delete_account_html: Wanneer je jouw account graag wilt verwijderen, kan je dat <a href="%{path}">hier doen</a>. We vragen jou daar om een bevestiging. @@ -375,6 +376,7 @@ nl: cas: CAS saml: SAML register: Registreren + register_elsewhere: Op een andere server registreren resend_confirmation: Verstuur de bevestigingsinstructies nogmaals reset_password: Wachtwoord opnieuw instellen security: Beveiliging diff --git a/config/locales/pl.yml b/config/locales/pl.yml index c11e90462..a09db429b 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -360,6 +360,7 @@ pl: your_token: Twój token dostępu auth: agreement_html: Rejestrując się, oświadczasz, że zapoznałeś się z <a href="%{rules_path}">informacjami o instancji</a> i <a href="%{terms_path}">zasadami korzystania z usługi</a>. + change_password: Hasło confirm_email: Potwierdź adres e-mail delete_account: Usunięcie konta delete_account_html: Jeżeli chcesz usunąć konto, <a href="%{path}">przejdź tutaj</a>. Otrzymasz prośbę o potwierdzenie. @@ -376,6 +377,7 @@ pl: cas: CAS saml: SAML register: Rejestracja + register_elsewhere: Zarejestruj się na innym serwerze resend_confirmation: Ponownie prześlij instrukcje weryfikacji reset_password: Zresetuj hasło security: Bezpieczeństwo diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 72ef6cbb6..a58eb8702 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -359,6 +359,7 @@ pt-BR: your_token: Seu token de acesso auth: agreement_html: Ao se cadastrar você concorda em seguir <a href="%{rules_path}">as regras da instância</a> e <a href="%{terms_path}">os nossos termos de serviço</a>. + change_password: Senha confirm_email: Confirmar e-mail delete_account: Excluir conta delete_account_html: Se você deseja excluir a sua conta, você pode <a href="%{path}">prosseguir para cá</a>. Uma confirmação será requisitada. @@ -375,6 +376,7 @@ pt-BR: cas: CAS saml: SAML register: Cadastrar-se + register_elsewhere: Cadastrar-se em um outro servidor resend_confirmation: Reenviar instruções de confirmação reset_password: Redefinir senha security: Segurança diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml index 2459f6da6..414f0c342 100644 --- a/config/locales/simple_form.ar.yml +++ b/config/locales/simple_form.ar.yml @@ -3,7 +3,7 @@ ar: simple_form: hints: defaults: - avatar: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير 2MB. سيتم تصغيره إلى 120x120px + avatar: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير 2MB. سيتم تصغيره إلى 400x400px digest: تُرسَل إليك بعد مُضيّ مدة مِن خمول نشاطك و فقط إذا ما تلقيت رسائل شخصية مباشِرة أثناء فترة غيابك مِن الشبكة header: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير 2MB. سيتم تصغيره إلى 700x335px locked: يتطلب منك الموافقة يدويا على طلبات المتابعة diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml index 2ea70d51c..720a8391d 100644 --- a/config/locales/simple_form.bg.yml +++ b/config/locales/simple_form.bg.yml @@ -3,7 +3,7 @@ bg: simple_form: hints: defaults: - avatar: PNG, GIF или JPG. До 2MB. Ще бъде смалена до 120x120 пиксела + avatar: PNG, GIF или JPG. До 2MB. Ще бъде смалена до 400x400 пиксела display_name: До 30 символа header: PNG, GIF или JPG. До 2MB. Ще бъде смалена до 700x335 пиксела locked: Изисква ръчно одобрение на последователите. По подразбиране, публикациите са достъпни само до последователи. diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml index bd4f7fae4..300da45a5 100644 --- a/config/locales/simple_form.ca.yml +++ b/config/locales/simple_form.ca.yml @@ -3,7 +3,7 @@ ca: simple_form: hints: defaults: - avatar: PNG, GIF o JPG. Màxim 2MB. S'escalarà a 120x120px + avatar: PNG, GIF o JPG. Màxim 2MB. S'escalarà a 400x400px digest: Només s'envia després d'un llarg període d'inactivitat amb un resum de les mencions que has rebut en la teva absència display_name: one: <span class="name-counter">1</span> càracter restant diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml index 851a5f019..5a65173be 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -3,7 +3,7 @@ de: simple_form: hints: defaults: - avatar: PNG, GIF oder JPG. Maximal 2 MB. Wird auf 120×120 px herunterskaliert + avatar: PNG, GIF oder JPG. Maximal 2 MB. Wird auf 400×400 px herunterskaliert digest: Wenn du lange Zeit inaktiv bist, wird dir eine Zusammenfassung von Erwähnungen in deiner Abwesenheit zugeschickt display_name: one: <span class="name-counter">1</span> Zeichen verbleibt diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index c958431d3..7ffa59f46 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -3,7 +3,7 @@ en: simple_form: hints: defaults: - avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 120x120px + avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 400x400px digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence display_name: one: <span class="name-counter">1</span> character left diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml index dfdd05b05..17862f916 100644 --- a/config/locales/simple_form.eo.yml +++ b/config/locales/simple_form.eo.yml @@ -3,7 +3,7 @@ eo: simple_form: hints: defaults: - avatar: Formato PNG, GIF aŭ JPG. Ĝis 2MB. Estos malgrandigita al 120x120px + avatar: Formato PNG, GIF aŭ JPG. Ĝis 2MB. Estos malgrandigita al 400x400px digest: Sendita nur post longa tempo de neaktiveco, kaj nur se vi ricevis personan mesaĝon en via foresto display_name: one: <span class="name-counter">1</span> signo restas diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml index e714ec20d..5d6a9e3d2 100644 --- a/config/locales/simple_form.es.yml +++ b/config/locales/simple_form.es.yml @@ -3,7 +3,7 @@ es: simple_form: hints: defaults: - avatar: PNG, GIF o JPG. Máximo 2MB. Será escalado a 120x120px + avatar: PNG, GIF o JPG. Máximo 2MB. Será escalado a 400x400px digest: Solo enviado tras un largo periodo de inactividad y solo si usted ha recibido mensajes personales durante su ausencia display_name: one: <span class="name-counter">1</span> caracter restante diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml index 8ca4378b1..f692cd780 100644 --- a/config/locales/simple_form.fi.yml +++ b/config/locales/simple_form.fi.yml @@ -3,7 +3,7 @@ fi: simple_form: hints: defaults: - avatar: PNG, GIF tai JPG. Korkeintaan 2MB. Skaalataan kokoon 120x120px + avatar: PNG, GIF tai JPG. Korkeintaan 2MB. Skaalataan kokoon 400x400px display_name: Korkeintaan 30 merkkiä header: PNG, GIF tai JPG. Korkeintaan 2MB. Skaalataan kokoon 700x335px locked: Vaatii sinun manuaalisesti hyväksymään seuraajat ja asettaa julkaisujen yksityisyyden vain seuraajille diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml index 4d5af1b5d..71674199d 100644 --- a/config/locales/simple_form.fr.yml +++ b/config/locales/simple_form.fr.yml @@ -3,7 +3,7 @@ fr: simple_form: hints: defaults: - avatar: Au format PNG, GIF ou JPG. 2 Mo maximum. Sera réduit à 120x120px + avatar: Au format PNG, GIF ou JPG. 2 Mo maximum. Sera réduit à 400x400px digest: Uniquement envoyé après une longue période d’inactivité et uniquement si vous avez reçu des messages personnels pendant votre absence display_name: one: <span class="name-counter">1</span> caractère restant diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml index 57eaf5016..4dcdd0459 100644 --- a/config/locales/simple_form.gl.yml +++ b/config/locales/simple_form.gl.yml @@ -3,7 +3,7 @@ gl: simple_form: hints: defaults: - avatar: PNG, GIF ou JPG. Como moito 2MB. Será reducida ate 120x120px + avatar: PNG, GIF ou JPG. Como moito 2MB. Será reducida ate 400x400px digest: Enviar só tras un longo período de inactividade e só si recibeu algunha mensaxe personal na súa ausencia display_name: one: <span class="name-counter">1</span> caracter restante diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml index 604236a73..20cf1029e 100644 --- a/config/locales/simple_form.he.yml +++ b/config/locales/simple_form.he.yml @@ -3,7 +3,7 @@ he: simple_form: hints: defaults: - avatar: PNG, GIF או JPG. מקסימום 2MB. גודל התמונה יוקטן ל-120x120px + avatar: PNG, GIF או JPG. מקסימום 2MB. גודל התמונה יוקטן ל-400x400px digest: נשלח לאחר תקופה ארוכה של אי-פעילות עם סיכום איזכורים שקיבלת בהעדרך display_name: one: נותרה אות<span class="name-counter">אחת</span> diff --git a/config/locales/simple_form.hr.yml b/config/locales/simple_form.hr.yml index 3010423a7..2506c8d92 100644 --- a/config/locales/simple_form.hr.yml +++ b/config/locales/simple_form.hr.yml @@ -3,7 +3,7 @@ hr: simple_form: hints: defaults: - avatar: PNG, GIF ili JPG. Najviše 2MB. Bit će smanjen na 120x120px + avatar: PNG, GIF ili JPG. Najviše 2MB. Bit će smanjen na 400x400px display_name: Najviše 30 znakova header: PNG, GIF ili JPG. Najviše 2MB. Bit će smanjen na 700x335px locked: traži te da ručno odobriš sljedbenike i postavlja privatnost postova na dostupnu samo sljedbenicima diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml index 9239205cd..6ec39aa79 100644 --- a/config/locales/simple_form.hu.yml +++ b/config/locales/simple_form.hu.yml @@ -3,7 +3,7 @@ hu: simple_form: hints: defaults: - avatar: PNG, GIF vagy JPG. Maximum 2MB. Át lesz méretezve 120x120 pixelre + avatar: PNG, GIF vagy JPG. Maximum 2MB. Át lesz méretezve 400x400 pixelre digest: Csak hosszú távollét esetén küldve és csak ha személyes üzenetet kaptál távollétedben display_name: one: <span class="name-counter">1</span>karakter maradt diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml index b00b4ef4f..6b2868e02 100644 --- a/config/locales/simple_form.id.yml +++ b/config/locales/simple_form.id.yml @@ -3,7 +3,7 @@ id: simple_form: hints: defaults: - avatar: PNG, GIF atau JPG. Maksimal 2MB. Ukuran dikecilkan menjadi 120x120px + avatar: PNG, GIF atau JPG. Maksimal 2MB. Ukuran dikecilkan menjadi 400x400px display_name: Maksimal 30 karakter header: PNG, GIF atau JPG. Maksimal 2MB. Ukuran dikecilkan menjadi 700x335px locked: Anda harus menerima permintaan pengikut secara manual dan setting privasi postingan akan diubah khusus untuk pengikut diff --git a/config/locales/simple_form.io.yml b/config/locales/simple_form.io.yml index 92c19ded2..60b578a12 100644 --- a/config/locales/simple_form.io.yml +++ b/config/locales/simple_form.io.yml @@ -3,7 +3,7 @@ io: simple_form: hints: defaults: - avatar: En la formato PNG, GIF o JPG. Til 2Mo. Esos mikrigita a 120x120px + avatar: En la formato PNG, GIF o JPG. Til 2Mo. Esos mikrigita a 400x400px display_name: 30 signi maxime header: En la formato PNG, GIF o JPG. Til 2Mo. Esos mikrigita a 700x335px locked: Tu devos aprobar omna demandi di sequado, e tua mesaji esos senchanje nur por tua sequanti. diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml index af6f30e61..b2fcef109 100644 --- a/config/locales/simple_form.it.yml +++ b/config/locales/simple_form.it.yml @@ -3,7 +3,7 @@ it: simple_form: hints: defaults: - avatar: PNG, GIF o JPG. Al massimo 2MB. Sarà ridotto a 120x120px + avatar: PNG, GIF o JPG. Al massimo 2MB. Sarà ridotto a 400x400px display_name: Al massimo 30 characters header: PNG, GIF or JPG. Al massimo 2MB. Sarà ridotto a 700x335px locked: Richiede la tua approvazione per i nuovi seguaci e rende i nuovi post automaticamente visibili solo ai seguaci diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index fe27ae72a..d11430338 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -3,7 +3,7 @@ ja: simple_form: hints: defaults: - avatar: 2MBまでのPNGやGIF、JPGが利用可能です。120x120pxまで縮小されます + avatar: 2MBまでのPNGやGIF、JPGが利用可能です。400x400pxまで縮小されます digest: 長期間使用していない場合と不在時に返信を受けた場合のみ送信されます display_name: あと<span class="name-counter">%{count}</span>文字入力できます。 header: 2MBまでのPNGやGIF、JPGが利用可能です。 700x335pxまで縮小されます diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml index 6e6ea08a4..e49bfd9f9 100644 --- a/config/locales/simple_form.ko.yml +++ b/config/locales/simple_form.ko.yml @@ -3,7 +3,7 @@ ko: simple_form: hints: defaults: - avatar: PNG, GIF 혹은 JPG. 최대 2MB. 120x120px로 다운스케일 될 것임 + avatar: PNG, GIF 혹은 JPG. 최대 2MB. 400x400px로 다운스케일 될 것임 digest: 오랫동안 활동하지 않았을 때 받은 멘션들에 대한 요약 받기 display_name: one: <span class="name-counter">1</span> 글자 남음 diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml index f87f39055..9876230b3 100644 --- a/config/locales/simple_form.nl.yml +++ b/config/locales/simple_form.nl.yml @@ -3,7 +3,7 @@ nl: simple_form: hints: defaults: - avatar: PNG, GIF of JPG. Maximaal 2MB. Wordt teruggeschaald naar 120x120px + avatar: PNG, GIF of JPG. Maximaal 2MB. Wordt teruggeschaald naar 400x400px digest: Wordt alleen na een lange periode van inactiviteit verzonden en alleen wanneer je tijdens jouw afwezigheid persoonlijke berichten ontvangt display_name: one: <span class="name-counter">1</span> teken over diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml index ab00f34d2..48710cabd 100644 --- a/config/locales/simple_form.no.yml +++ b/config/locales/simple_form.no.yml @@ -3,7 +3,7 @@ simple_form: hints: defaults: - avatar: PNG, GIF eller JPG. Maksimalt 2 MB. Vil bli nedskalert til 120x120px + avatar: PNG, GIF eller JPG. Maksimalt 2 MB. Vil bli nedskalert til 400x400px digest: Kun sendt etter en lang periode med inaktivitet og bare dersom du har mottatt noen personlige meldinger mens du var borte display_name: one: <span class="name-counter">1</span> tegn igjen diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml index aa26d036d..addca75ce 100644 --- a/config/locales/simple_form.oc.yml +++ b/config/locales/simple_form.oc.yml @@ -3,7 +3,7 @@ oc: simple_form: hints: defaults: - avatar: PNG, GIF o JPG. Maximum 2 Mo. Serà retalhat en 120x120px + avatar: PNG, GIF o JPG. Maximum 2 Mo. Serà retalhat en 400x400px digest: Solament enviat aprèp un long moment d’inactivitat e solament s’avètz recebut de messatges personals pendent vòstra abséncia display_name: one: Demòra encara <span class="name-counter">1</span> caractèr diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml index 9876f67b0..4f9594e6f 100644 --- a/config/locales/simple_form.pl.yml +++ b/config/locales/simple_form.pl.yml @@ -3,7 +3,7 @@ pl: simple_form: hints: defaults: - avatar: PNG, GIF lub JPG. Maksymalnie 2MB. Zostanie zmniejszony do 120x120px + avatar: PNG, GIF lub JPG. Maksymalnie 2MB. Zostanie zmniejszony do 400x400px digest: Wysyłane tylko po długiej nieaktywności, jeżeli w tym czasie otrzymaleś jakąś wiadomość bezpośrednią display_name: few: Pozostały <span class="name-counter">%{count}</span> znaki. diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml index 85dc418bd..0c22b2608 100644 --- a/config/locales/simple_form.pt-BR.yml +++ b/config/locales/simple_form.pt-BR.yml @@ -3,7 +3,7 @@ pt-BR: simple_form: hints: defaults: - avatar: PNG, GIF or JPG. Arquivos de até 2MB. Eles serão diminuídos para 120x120px + avatar: PNG, GIF or JPG. Arquivos de até 2MB. Eles serão diminuídos para 400x400px digest: Enviado após um longo período de inatividade com um resumo das menções que você recebeu em sua ausência display_name: one: <span class="name-counter">1</span> caracter restante diff --git a/config/locales/simple_form.pt.yml b/config/locales/simple_form.pt.yml index 1a2f19fc5..67fed495c 100644 --- a/config/locales/simple_form.pt.yml +++ b/config/locales/simple_form.pt.yml @@ -3,7 +3,7 @@ pt: simple_form: hints: defaults: - avatar: PNG, GIF or JPG. Arquivos até 2MB. Vão ser reduzidos para 120x120px + avatar: PNG, GIF or JPG. Arquivos até 2MB. Vão ser reduzidos para 400x400px digest: Enviado após um longo período de inatividade e apenas se foste mencionado na tua ausência display_name: one: <span class="name-counter">1</span> caracter restante diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml index e34140b7c..5c4df2189 100644 --- a/config/locales/simple_form.ru.yml +++ b/config/locales/simple_form.ru.yml @@ -3,7 +3,7 @@ ru: simple_form: hints: defaults: - avatar: PNG, GIF или JPG. Максимально 2MB. Будет уменьшено до 120x120px + avatar: PNG, GIF или JPG. Максимально 2MB. Будет уменьшено до 400x400px digest: Отсылается после долгого периода неактивности с общей информацией упоминаний, полученных в Ваше отсутствие display_name: few: Осталось <span class="name-counter">%{count}</span> символа diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml index 7312f565c..dd3651ee3 100644 --- a/config/locales/simple_form.sk.yml +++ b/config/locales/simple_form.sk.yml @@ -3,7 +3,7 @@ sk: simple_form: hints: defaults: - avatar: PNG, GIF alebo JPG. Maximálne 2MB. Bude zmenšený na 120x120px + avatar: PNG, GIF alebo JPG. Maximálne 2MB. Bude zmenšený na 400x400px digest: Odoslané iba v prípade dlhodobej neprítomnosti, a len ak ste obdŕžali nejaké osobné správy kým ste boli preč display_name: one: Ostáva vám <span class="name-counter">1</span> znak diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml index d811377c3..30f7eada7 100644 --- a/config/locales/simple_form.sr-Latn.yml +++ b/config/locales/simple_form.sr-Latn.yml @@ -3,7 +3,7 @@ sr-Latn: simple_form: hints: defaults: - avatar: PNG, GIF ili JPG. Najviše 2MB. Biće smanjena na 120x120px + avatar: PNG, GIF ili JPG. Najviše 2MB. Biće smanjena na 400x400px digest: Poslato posle dužeg perioda neaktivnosti sa pregledom svih bitnih stvari koje ste dobili dok ste bili odsutni display_name: few: <span class="name-counter">%{count}</span> karaktera preostala diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml index 4e3599e5f..3345f7b41 100644 --- a/config/locales/simple_form.sr.yml +++ b/config/locales/simple_form.sr.yml @@ -3,7 +3,7 @@ sr: simple_form: hints: defaults: - avatar: PNG, GIF или JPG. Највише 2MB. Биће смањена на 120x120px + avatar: PNG, GIF или JPG. Највише 2MB. Биће смањена на 400x400px digest: Послато после дужег периода неактивности са прегледом свих битних ствари које сте добили док сте били одсутни display_name: few: <span class="name-counter">%{count}</span> карактера преостала diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml index 5f71c7571..8ef7bb064 100644 --- a/config/locales/simple_form.sv.yml +++ b/config/locales/simple_form.sv.yml @@ -3,7 +3,7 @@ sv: simple_form: hints: defaults: - avatar: Högst 2 MB. Kommer nedskalas till 120x120px + avatar: Högst 2 MB. Kommer nedskalas till 400x400px digest: Skickas endast efter en lång period av inaktivitet och endast om du har fått några personliga meddelanden i din frånvaro display_name: one: <span class="name-counter">1</span> tecken kvar diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml index 87c673600..575b6a9f4 100644 --- a/config/locales/simple_form.th.yml +++ b/config/locales/simple_form.th.yml @@ -3,7 +3,7 @@ th: simple_form: hints: defaults: - avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 120x120px + avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 400x400px display_name: one: <span class="name-counter">1</span> character left other: <span class="name-counter">%{count}</span> characters left diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml index 0e171b793..c827aac46 100644 --- a/config/locales/simple_form.tr.yml +++ b/config/locales/simple_form.tr.yml @@ -3,7 +3,7 @@ tr: simple_form: hints: defaults: - avatar: En fazla 2MB olacak şekilde PNG, GIF veya JPG formatında yükleyiniz. 120x120px büyüklüğüne indirgenecektir + avatar: En fazla 2MB olacak şekilde PNG, GIF veya JPG formatında yükleyiniz. 400x400px büyüklüğüne indirgenecektir display_name: <span class="name-counter">%{count}</span> karakter kaldı header: En fazla 2MB olacak şekilde PNG, GIF veya JPG formatında yükleyiniz. 700x335px büyüklüğüne indirgenecektir. locked: Takipçilerinizi manuel olarak kabul etmenizi ve gönderilerinizi varsayılan olarak sadece takipçilerinizin göreceği şekilde paylaşmanızı sağlar. diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml index ff7f2d4ca..7bc3ee4b8 100644 --- a/config/locales/simple_form.uk.yml +++ b/config/locales/simple_form.uk.yml @@ -3,7 +3,7 @@ uk: simple_form: hints: defaults: - avatar: PNG, GIF, або JPG. Максимум - 2МБ. Буде зменшено до 120x120px + avatar: PNG, GIF, або JPG. Максимум - 2МБ. Буде зменшено до 400x400px display_name: 'Залишилося символів: <span class="name-counter">%{count}</span>' header: PNG, GIF, або JPG. Максимум - 2МБ. Буде зменшено до 700x335px locked: Буде вимагати від Вас самостійного підтверждення підписників, змінить приватність постів за замовчуванням на "тільки для підписників" diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml index 4eb993e52..825275756 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -3,7 +3,7 @@ zh-CN: simple_form: hints: defaults: - avatar: 文件大小限制 2MB，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 120×120px + avatar: 文件大小限制 2MB，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 400×400px digest: 仅在你长时间未登录，且收到了私信时发送 display_name: 还能输入 <span class="name-counter">%{count}</span> 个字符 header: 文件大小限制 2MB，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 700×335px diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml index 762629610..1e545da88 100644 --- a/config/locales/simple_form.zh-HK.yml +++ b/config/locales/simple_form.zh-HK.yml @@ -3,7 +3,7 @@ zh-HK: simple_form: hints: defaults: - avatar: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 2MB，會縮裁成 120x120px + avatar: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 2MB，會縮裁成 400x400px display_name: 最多 30 個字元 header: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 2MB，會縮裁成 700x335px locked: 你必須人手核准每個用戶對你的關注請求，而你的文章私隱會被預設為「只有關注你的人能看」 diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml index b5edaea72..c7c5a37f0 100644 --- a/config/locales/simple_form.zh-TW.yml +++ b/config/locales/simple_form.zh-TW.yml @@ -3,7 +3,7 @@ zh-TW: simple_form: hints: defaults: - avatar: 支援 PNG, GIF 或 JPG 圖片，檔案大小上限為 2MB，會被縮小為 120x120px + avatar: 支援 PNG, GIF 或 JPG 圖片，檔案大小上限為 2MB，會被縮小為 400x400px display_name: 最多 30 個字元 header: 支援 PNG, GIF 或 JPG 圖片，檔案大小上限為 2MB，會被縮小為 700x335px locked: 您必須手動核准每個使用者對您的關注請求，而您的文章隱私預設為「只有關注您的人能看」 diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 4fa745d5a..860431f1d 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -3,8 +3,8 @@ sk: about: about_hashtag_html: Toto sú verejné toot príspevky otagované <strong>#%{tagom}</strong>. Ak máš účet niekde vo fediverse, môžeš ich používať. about_mastodon_html: Mastodon je sociálna sieť založená na otvorených webových protokoloch. Jej zrojový kód je otvorený a je decentralizovaná podobne ako email. - about_this: O instancii - closed_registrations: Registrácie sú momentálne uzatvorené. Avšak, existujú ďalšie Mastodon inštancie kde si môžete založiť účet a získať prístup do tej istej siete z tamaď. + about_this: O tejto instancii + closed_registrations: Registrácie sú momentálne uzatvorené. Avšak, môžeš nájsť nejaký iný Mastodon server kde si založ účet a získaj tak prístup do presne tej istej siete, odtiaľ. contact: Kontakt contact_missing: Nezadané contact_unavailable: Neuvedené @@ -359,6 +359,7 @@ sk: your_token: Váš prístupový token auth: agreement_html: V rámci registrácie súhlasíte, že sa budete riadiť <a href="%{rules_path}"> 1 pravidlami tejto instancie</a> 2 a taktiež <a href="%{terms_path}"> 3 našími servisnými podmienkami </a> 4. + change_password: Heslo confirm_email: Potvrdiť email delete_account: Vymazať účet delete_account_html: Pokiaľ si želáte vymazať svoj účet, môžete tak <a href="%{path}"> 1 urobiť tu</a> 2. Budete požiadaný/á o potvrdenie tohto kroku. @@ -375,6 +376,7 @@ sk: cas: CAS saml: SAML register: Zaregistrovať sa + register_elsewhere: Zaregistruj sa na inom serveri resend_confirmation: Poslať potvrdzujúce pokyny znovu reset_password: Resetovať heslo security: Zabezpečenie @@ -608,6 +610,7 @@ sk: open_in_web: Otvor v okne prehliadača over_character_limit: limit počtu %{max} znakov bol presiahnutý pin_errors: + limit: Už ste si pripli ten najvyšší možný počet príspevkov ownership: Nemožno pripnúť príspevok od niekoho iného private: Neverejné príspevky nemôžu byť pripnuté show_more: Ukáž viac @@ -622,9 +625,26 @@ sk: click_to_show: Klikni pre zobrazenie pinned: Pripnutý toot reblogged: vyzdvihnutý + sensitive_content: Senzitívny obsah + terms: + title: Podmienky užívania, a pravidlá o súkromí pre %{instance} + two_factor_authentication: + setup: Nastavenie user_mailer: + backup_ready: + explanation: Vyžiadal/a si si úplnú zálohu tvojho Mastodon účtu. Táto záloha je teraz pripravená na stiahnutie! + subject: Tvoj archív je pripravený na stiahnutie + title: Odber archívu welcome: + edit_profile_action: Nastav profil + explanation: Tu nájdeš nejaké tipy do začiatku + final_action: Začni prispievať final_step: 'Začnite písať! Aj bez následovníkov budú vaše verejné správy videné ostatnými, napríklad na lokálnej osi a pod haštagmi. Môžete sa ostatným predstaviť pod haštagom #introductions.' + review_preferences_action: Zmeniť nastavenia + subject: Vitaj na Mastodone + tip_local_timeline: Lokálna os je celkový pohľad na aktivitu užívateľov %{instance}. Toto sú tvoji najbližší susedia! + tip_mobile_webapp: Pokiaľ ti prehliadač ponúkne možnosť pridať Mastodon na tvoju obrazovku, môžeš potom dostávať notifikácie skoro ako z natívnej aplikácie! + title: Vitaj na palube, %{name}! users: invalid_email: Emailová adresa je neplatná invalid_otp_token: Neplatný kód pre dvojfaktorovú autentikáciu diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 9155702ac..3ba96731d 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -21,7 +21,7 @@ module Mastodon end def flags - 'rc3' + '' end def to_a diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake index 0b011bf57..d6c9e2d01 100644 --- a/lib/tasks/mastodon.rake +++ b/lib/tasks/mastodon.rake @@ -286,6 +286,14 @@ namespace :mastodon do File.write(Rails.root.join('.env.production'), "# Generated with mastodon:setup on #{Time.now.utc}\n\n" + env.each_pair.map { |key, value| "#{key}=#{value}" }.join("\n") + "\n") + if using_docker + prompt.ok 'Below is your configuration, save it to an .env.production file outside Docker:' + prompt.say "\n" + prompt.say File.read(Rails.root.join('.env.production')) + prompt.say "\n" + prompt.ok 'It is also saved within this container so you can proceed with this wizard.' + end + prompt.say "\n" prompt.say 'Now that configuration is saved, the database schema must be loaded.' prompt.warn 'If the database already exists, this will erase its contents.' |