425 Commits

Author SHA1 Message Date
Alexander Friedland
25ac9b6cef
Merge pull request #2678 from Human-Connection/2659-text-change-for-signup
Changes Text For SignUp
2020-01-07 21:47:20 +01:00
Moriz Wahl
d4b3afb07f fixes #2659 2020-01-06 17:23:50 +01:00
Erhardt Stiefel
711675d674
Update de.json
Is it ok, if I do the same change for the other languages?
2020-01-01 14:29:48 +01:00
mattwr18
efd4d1f2af
Merge pull request #2563 from Human-Connection/lokalise-2019-12-18_10-06-16
Lokalise: Translations update
2019-12-19 12:27:04 +01:00
Alina Beck
2e26e3f3f9
Apply suggestions from code review
change FAQ link text
2019-12-18 17:36:24 +05:30
lokalise-bot
b70ff73bba Lokalise: update of webapp/locales/ru.json 2019-12-18 10:06:18 +01:00
Alexander Friedland
ed617f8c83
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-17 07:39:26 +01:00
Erhardt Stiefel
92548344ca
Update it.json
I added the missing italian verbs just for the display of "donations" but I see a lot more verbs missing. Does it make sense to translate and  fill in everything which is to be found in en.json ?
2019-12-13 15:04:09 +01:00
Robert Schäfer
6a2ae77b60
Merge pull request #2492 from Human-Connection/erhardtstiefel-patch-9
Update de.json
2019-12-13 13:26:48 +01:00
mattwr18
6815592a3a
Merge pull request #2485 from Human-Connection/lokalise-2019-12-10_21-55-12
Lokalise: Translations update
2019-12-13 13:22:21 +01:00
ogerly
4c93f65ef4 arrrr* forget to save textfiles :| 2019-12-13 09:17:12 +01:00
Robert Schäfer
8099f717c4
Merge pull request #2491 from Human-Connection/erhardtstiefel-patch-8-1
Update en.json
2019-12-13 01:07:08 +01:00
Robert Schäfer
9261f03efb
Merge pull request #2493 from Human-Connection/erhardtstiefel-patch-10
Update es.json
2019-12-13 01:06:30 +01:00
Robert Schäfer
7bc8646954
Merge pull request #2494 from Human-Connection/erhardtstiefel-patch-11
Update fr.json
2019-12-13 01:05:56 +01:00
Erhardt Stiefel
65a51ea471
Update it.json
These two lines added to give the user the chance to delete his posts and/or his comments when deleting his account, too
            "contributionsCount": "Cancellare i miei {count} messaggi",
            "commentedCount": "Cancella i miei {count} commenti",
2019-12-11 13:30:06 +01:00
Erhardt Stiefel
eceae24683
Update fr.json 2019-12-11 13:10:17 +01:00
Erhardt Stiefel
d6442b123e
Update es.json
After a longer discussion I understood just to change the title of the function deleteUserAccount by renaming "name": "Borrar datos", to "name": "Eliminar cuenta de usuario", to solve the bug
2019-12-11 12:56:38 +01:00
Erhardt Stiefel
aed15f0be9
Update de.json
After a longer discussion I understood just to change the title of the function deleteUserAccount by renaming "name": "Daten löschen", to "name": "Benutzerkonto löschen", to solve the bug
2019-12-11 12:28:41 +01:00
Erhardt Stiefel
61862905be
Update en.json
After a longer discussion I understood just to change the title of the function deleteUserAccount by renaming "name": "Delete data", to "name": "Delete user account", to solve 🐛 [Bug] Misleading description on "Delete your account" #2355
2019-12-11 11:19:07 +01:00
Alexander Friedland
b89e081bad
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-11 10:39:55 +01:00
lokalise-bot
f672abfaa9 Lokalise: update of webapp/locales/ru.json 2019-12-10 21:55:16 +01:00
lokalise-bot
08dbfb31c9 Lokalise: update of webapp/locales/es.json 2019-12-10 21:55:15 +01:00
Robert Schäfer
1b787d7687
Merge pull request #2416 from Human-Connection/checkbox_no_comercial_add_to_creatUserAccount
Checkbox 'no comercial + no political account' add to creat user account
2019-12-10 15:21:40 +01:00
Erhardt Stiefel
93e4712002
Update it.json 2019-12-07 18:40:12 +01:00
Alexander Friedland
dee22d33db
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-06 07:21:49 +01:00
mattwr18
085b59bf4d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-12-04 13:23:06 +01:00
Alexander Friedland
8d93956de0
change
change representiere <TO> repräsentiere
2019-12-03 18:47:38 +01:00
ogerly
a5bbb06f77 fix Spec + lint 2019-12-03 18:27:05 +01:00
ogerly
38c58af1f3 add confirm checkboc No Comercial account 2019-12-03 17:57:30 +01:00
Alina Beck
d685ff9e7b translate and style user count 2019-12-03 13:25:20 +03:00
Alina Beck
febabf9303 rename table header translations 2019-12-03 12:25:19 +03:00
roschaefer
58e7f4164d Fix German translation of "Shouts"
Requested by @DennisHack

@Mogge are you "moriz" on our discord who keeps track of translations?
This might be interesting for you, too.
2019-12-02 15:10:09 +01:00
ogerly
19d183e13a Merge https://github.com/Human-Connection/Human-Connection into 1746-Blur_explicit_Image_Content 2019-12-02 13:22:42 +01:00
mattwr18
35c3219460
Merge pull request #2316 from Human-Connection/2170-Change_of_Terms_of_Service
Terms of use extended with dot - no commercial use
2019-12-02 13:10:58 +01:00
roschaefer
74a65a9114 Be more specific "Current status" inst. of "Type" 2019-11-30 02:21:29 +01:00
ogerly
7cdca49b48 Fix lint 2019-11-29 16:04:25 +01:00
mattwr18
107f10edc9 Update table styling 2019-11-29 15:29:11 +01:00
mattwr18
a8a9abb4e4 Refactor/Add new components 2019-11-29 14:02:53 +01:00
lokalise-bot
8a812aaaee Lokalise: update of webapp/locales/pt.json 2019-11-29 11:04:08 +01:00
ogerly
7f3f81822e blur the image ok. 2019-11-28 20:40:35 +01:00
Alexander Friedland
dd0f629691
Merge branch 'master' into 2170-Change_of_Terms_of_Service 2019-11-24 21:52:41 +01:00
Wolfgang Huß
67a5a00704 Clean up 2019-11-23 10:58:16 +01:00
Wolfgang Huß
0b7a0496a2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation
# Conflicts:
#	webapp/locales/de.json
2019-11-23 08:07:53 +01:00
Wolfgang Huß
99af6cbf8a Implement displaying multiple claims in the frontend 2019-11-22 18:40:51 +01:00
lokalise-bot
3e52ee090c Lokalise: update of webapp/locales/ru.json 2019-11-22 12:55:34 +01:00
lokalise-bot
bcd9f0ec93 Lokalise: update of webapp/locales/pt.json 2019-11-22 12:55:32 +01:00
lokalise-bot
32942e1346 Lokalise: update of webapp/locales/it.json 2019-11-22 12:55:30 +01:00
lokalise-bot
7ab1686caa Lokalise: update of webapp/locales/fr.json 2019-11-22 12:55:29 +01:00
lokalise-bot
b5f0e83cb7 Lokalise: update of webapp/locales/es.json 2019-11-22 12:55:27 +01:00
lokalise-bot
d2b3396e9b Lokalise: update of webapp/locales/de.json 2019-11-22 12:55:25 +01:00