Commit graph

2028 commits

Author SHA1 Message Date
4e2b7854bf fix typo 2022-02-01 01:08:11 -03:00
8f8906793b unified email spelling and typos 2022-02-01 01:08:11 -03:00
b68e21f9e4 latest changes, all "E-Mail" with non-brk hyphen 2022-02-01 01:08:11 -03:00
88c804f8ad reviewed review 2022-02-01 01:08:11 -03:00
669839a081 review 2022-02-01 01:08:11 -03:00
1d9fbccb25 perks: german translation
donation: adding hyphen
2022-02-01 01:08:11 -03:00
68f95e6eb3 Add AJ to Core Team section 2022-01-05 19:03:35 -03:00
924c2d0b74 xmpp bridges in French (#314)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #314
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2022-01-04 15:27:24 +00:00
20d0245945 Merge pull request 'I fixed some Typos in SERVICES > XMPP > DE!' (#309) from 220102_Services_XMPP_DE_TypoFixes into master
Reviewed-on: #309
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
2022-01-03 13:50:54 +00:00
bb66558025 Merge branch '220102_Services_XMPP_DE_TypoFixes' of https://git.disroot.org/Disroot/Website into 220102_Services_XMPP_DE_TypoFixes 2022-01-03 14:41:27 +01:00
5aa75bd709 review incl small changes 2022-01-03 14:13:58 +01:00
5cc2c25f08 Complete ly new translation of this area.
I am not 100% sure concerning conversations.png, please check, whether 
that name is correct.
2022-01-03 14:13:58 +01:00
e41923b0a1 I fixed some Typos in SERVICES > XMPP > DE!
Remaining Questions (general, not translation related):
a) „bau-haus.net“ still up to date?

b) bot.disroot.org: What's that? Explication is rather rare. „get in 
touch with us“? Which way?
2022-01-03 14:13:58 +01:00
b5b17fef42 Merge pull request 'Modified MX record address EN/ES/FR/IT' (#312) from FIX_Custom.domain.MX into master
Reviewed-on: #312
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2022-01-03 10:45:40 +00:00
d6ef5d268c Modified MX record address EN/ES/FR/IT 2022-01-03 01:01:50 -03:00
f5195ac720 Merge pull request 'minor fixes & cryptpad translation' (#306) from de_shadowsword_minor01 into master
Reviewed-on: #306
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2022-01-03 02:13:22 +00:00
4abac36346 Merge branch 'master' into de_shadowsword_minor01 2022-01-03 02:10:32 +00:00
a50c790f5e Remove conflict file 2022-01-02 23:09:53 -03:00
a613e5993f updated after review 2022-01-02 23:24:12 +01:00
l3o
e56254ee18 it-news03-2021 (#307)
I translated the disnews number 3 into Italian

Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: #307
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2022-01-02 22:35:59 +01:00
e2496c22a6 review incl small changes 2022-01-02 21:40:45 +01:00
6a8721d111 review (typos + suggestions) 2022-01-02 21:00:17 +01:00
17929e7f2f Complete ly new translation of this area.
I am not 100% sure concerning conversations.png, please check, whether 
that name is correct.
2022-01-02 19:49:16 +01:00
f21effdc34 I fixed some Typos in SERVICES > XMPP > DE!
Remaining Questions (general, not translation related):
a) „bau-haus.net“ still up to date?

b) bot.disroot.org: What's that? Explication is rather rare. „get in 
touch with us“? Which way?
2022-01-02 12:55:06 +01:00
l3o
a79e479325 it-news03-2021 (#307)
I translated the disnews number 3 into Italian

Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: #307
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2022-01-02 07:34:45 +00:00
220488b87d minor fixes & cryptpad translation 2022-01-01 22:40:56 +01:00
daefec2d20 Merge pull request '20211231_Blog4Mewyear_DE' (#302) from 20211231_Blog4Mewyear_DE into master
Reviewed-on: #302
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
2021-12-31 20:55:39 +00:00
4ab26c3c7e Merge branch 'master' into 20211231_Blog4Mewyear_DE 2021-12-31 20:54:38 +00:00
1e2ad2caf0 Merge pull request 'typo in blog post' (#301) from blogpost_typo into master
Reviewed-on: #301
2021-12-31 15:50:39 +00:00
5cf029aed9
typo in blog post 2021-12-31 16:50:12 +01:00
47f7b3f5d6 fix faq quotation marks (#299)
Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #299
Co-authored-by: avg_joe <avg_joe@no-reply@disroot.org>
Co-committed-by: avg_joe <avg_joe@no-reply@disroot.org>
2021-12-31 15:48:03 +00:00
1508ec9d02 4 Typos corrected 2021-12-31 15:57:57 +01:00
800f4feb53 Merge pull request 'fix-german-translation-for-donation' (#297) from fix-german-translation-for-donation into master
Reviewed-on: #297
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-12-31 10:37:07 +00:00
120421a3ad German Translation for Hyppy New Year Blog Post. Related to #294 2021-12-31 11:08:54 +01:00
86533aff10 Merge branch 'master' into fix-german-translation-for-donation 2021-12-31 10:05:12 +00:00
l3o
7526b0c38c translated into italian perks page (#298)
I translated perks page into Italian
I corrected a small typo (a space) in the Italian text of newsletter # 4

Co-authored-by: Alan <alan@alanleoni.ch>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #298
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
2021-12-31 07:54:20 +00:00
46fc1b63b7 Merge pull request 'DisNews#4 Fixes' (#293) from disnews_4_FIX into master
Reviewed-on: #293
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2021-12-30 19:25:21 +00:00
84ea839d23
Merge branch 'master' into disnews_4_FIX 2021-12-30 20:16:39 +01:00
47f42d96e5 Merge branch 'fix-german-translation-for-donation' of https://git.disroot.org/Disroot/Website into fix-german-translation-for-donation 2021-12-30 16:09:04 +01:00
61c30a673d avg_joe 2021-12-30 16:08:38 +01:00
ee5c0a783f avg_joe 2021-12-30 16:05:42 +01:00
407f5e1864 Update vagrant again! (#285)
I added the default Disroot's yaml config files, added some info + delete the default vagrant files/folder we get with new installation.

I destroyed vagrant and reinstalled several times, it worked  perfectly each time.

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #285
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-12-30 11:32:55 -03:00
9dac4063de Fix lot of errors with forms (#295)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #295
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-12-30 11:32:55 -03:00
067d94f2c4 Merge branch 'fix-german-translation-for-donation' of https://git.disroot.org/Disroot/Website into fix-german-translation-for-donation 2021-12-30 14:37:20 +01:00
9a6a8674d6 missed it 2021-12-30 14:35:32 +01:00
51598aaed0 fix about change de 2021-12-30 14:35:32 +01:00
19c3f476c8 inital commit trans don ger 2021-12-30 14:35:32 +01:00
99d913b3f2 missed it 2021-12-30 14:34:12 +01:00
b5d760623b fix about change de 2021-12-30 14:32:50 +01:00
dba372135b Merge branch 'fix-german-translation-for-donation' of https://git.disroot.org/Disroot/Website into fix-german-translation-for-donation 2021-12-30 14:29:02 +01:00