Merge branch 'develop' into fix_episodes_list_item_loading_b

4 files changed, 51 insertions, 27 deletions

diff --git a/app/src/main/assets/developers.csv b/app/src/main/assets/developers.csv
index cff15ee38..a2c54723d 100644
--- a/app/src/main/assets/developers.csv
+++ b/app/src/main/assets/developers.csv
@@ -1,35 +1,36 @@
 ByteHamster;5811634;Maintainer
 danieloeh;968613;Original creator of AntennaPod (retired)
-mfietz;6860662;Maintainer
+mfietz;6860662;Maintainer (retired)
 TomHennen;5216560;Maintainer (retired)
 orionlee;250644;Contributor
 domingos86;9538859;Contributor
+tonytamsf;149837;Contributor
 andersonvom;69922;Contributor
+damoasda;46045854;Contributor
 TacoTheDank;32376686;Contributor
 shortspider;5712543;Contributor
 ebraminio;833473;Contributor
+asdoi;36813904;Contributor
 spacecowboy;223655;Contributor
 patheticpat;16046;Contributor
-tonytamsf;149837;Contributor
 brad;1614;Contributor
 Cj-Malone;10121513;Contributor
 maxbechtold;9162198;Contributor
-asdoi;36813904;Contributor
 gaul;848247;Contributor
 qkolj;6667105;Contributor
+keunes;11229646;Maintainer
 pachecosf;46357909;Contributor
 gerardolgvr;20119298;Contributor
 bws9000;262625;Contributor
 ahangarha;11241315;Contributor
-damoasda;46045854;Contributor
 hannesa2;3314607;Contributor
-keunes;11229646;Contributor
 rharriso;570910;Contributor
 xgouchet;818706;Contributor
 sevenmaster;12869538;Contributor
 TheRealFalcon;153674;Contributor
-jas14;569991;Contributor
+Slinger;75751;Contributor
 johnjohndoe;144518;Contributor
+jas14;569991;Contributor
 udif;809640;Contributor
 malockin;12814657;Contributor
 dirkmueller;1029152;Contributor
@@ -49,6 +50,7 @@ deandreamatias;21011641;Contributor
 MeirAtIMDDE;4421079;Contributor
 egsavage;126165;Contributor
 ligi;111600;Contributor
+Xeitor;8825715;Contributor
 dreiss;4121;Contributor
 liesen;26872;Contributor
 nereocystis;2257107;Contributor
@@ -70,30 +72,43 @@ SosoTughushi;19908097;Contributor
 fabolhak;20029691;Contributor
 archibishop;36948493;Contributor
 alifeflow;24603829;Contributor
+avirajrsingh;69088913;Contributor
 toggles;14695;Contributor
 matdb;48329535;Contributor
+damlayildiz;56313500;Contributor
 kingargyle;177042;Contributor
 dsmith47;14109426;Contributor
 hannesaa2;18496079;Contributor
 jhunnius;9149031;Contributor
 ShadowIce;59123;Contributor
+Niffler;8172446;Contributor
 raghulj;57007;Contributor
 raghulrm;5362986;Contributor
 mamehacker;16738348;Contributor
 skitt;2128935;Contributor
 wseemann;2296196;Contributor
+markamaze;17114678;Contributor
+mohitshah3111999;42018918;Contributor
+moralesg;14352147;Contributor
 mr-intj;6268767;Contributor
 tuxayo;2678215;Contributor
 schlch;56929215;Contributor
 alimemonzx;44647595;Contributor
+dev-darrell;52300159;Contributor
+jmdouglas;10855634;Contributor
 olivoto;15932680;Contributor
+PtilopsisLeucotis;54054883;Contributor
+abhinavg1997;60095795;Contributor
 alanorth;191754;Contributor
 alexte;7724992;Contributor
 andrey-krutov;1488973;Contributor
 arantius;84729;Contributor
+BoJacobs;25435640;Contributor
+chetan882777;36985543;Contributor
 chrissicool;232590;Contributor
 cszucko;1810383;Contributor
 CWftw;1498303;Contributor
+connectety;26038710;Contributor
 danielm5;66779;Contributor
 ariedov;958646;Contributor
 brettle;118192;Contributor
@@ -107,17 +122,21 @@ Kaligule;3586246;Contributor
 kvithayathil;1056073;Contributor
 luiscruz;1080714;Contributor
 mlasson;5814258;Contributor
+schwedenmut;9077622;Contributor
 M-arcel;56698158;Contributor
 msoose;30473690;Contributor
 mo;7117;Contributor
 mdeveloper20;2319126;Contributor
-Slinger;75751;Contributor
 mschuetz;108637;Contributor
+max-wittig;6639323;Contributor
 MolarAmbiguity;10541979;Contributor
 mounirlamouri;573590;Contributor
+nikhil097;35090769;Contributor
+panoreak;25068506;Contributor
+patrickjkennedy;8617261;Contributor
 ortylp;470439;Contributor
-PtilopsisLeucotis;54054883;Contributor
 ramzan;55637406;Contributor
+iamrichR;44210678;Contributor
 SamWhited;512573;Contributor
 selivan;1208989;Contributor
 sonnayasomnambula;7716779;Contributor
@@ -126,13 +145,17 @@ shantanahardy;26757164;Contributor
 danners;116551;Contributor
 corecode;177979;Contributor
 vimsick;20211590;Contributor
+lyallemma;25173082;Contributor
 edent;837136;Contributor
 atrus6;357881;Contributor
+heyyviv;56256802;Contributor
 waylife;3348620;Contributor
 amhokies;3124968;Contributor
 andrewc1;19559401;Contributor
 axq;5077221;Contributor
+binarytoto;75904760;Contributor
+chrk2205;44704035;Contributor
 fossterer;4236021;Contributor
-jmdouglas;10855634;Contributor
 lightonflux;1377943;Contributor
 minusf;3632883;Contributor
+zawad2221;32180355;Contributor
diff --git a/app/src/main/assets/licenses.xml b/app/src/main/assets/licenses.xml
index 4f0255182..b6e12cf54 100644
--- a/app/src/main/assets/licenses.xml
+++ b/app/src/main/assets/licenses.xml
@@ -4,7 +4,7 @@
         name="AntennaPod"
         author="The AntennaPod team"
         website="https://github.com/AntennaPod/AntennaPod/"
-        license="MIT"
+        license="GPL-3.0"
         licenseText="LICENSE.txt" />
     <library
         name="AntennaPod-AudioPlayer"
diff --git a/app/src/main/assets/special_thanks.csv b/app/src/main/assets/special_thanks.csv
index 348e3208e..ab44bd7f4 100644
--- a/app/src/main/assets/special_thanks.csv
+++ b/app/src/main/assets/special_thanks.csv
@@ -1,3 +1,4 @@
 221 Pixels;Logo design;https://avatars2.githubusercontent.com/u/58243143?s=60&v=4
+Anxhelo Lushka;Website design;https://avatars2.githubusercontent.com/u/25004151?s=60&v=4
 ByteHamster;Forum admin;https://avatars2.githubusercontent.com/u/5811634?s=60&v=4
 Keunes;Communications;https://avatars2.githubusercontent.com/u/11229646?s=60&v=4
diff --git a/app/src/main/assets/translators.csv b/app/src/main/assets/translators.csv
index a7d289963..fddad789b 100644
--- a/app/src/main/assets/translators.csv
+++ b/app/src/main/assets/translators.csv
@@ -1,45 +1,45 @@
-Arabic;abuzar3.khalid, keunes, nabilMaghura, rex07
+Arabic;abuzar3.khalid, badarotti, keunes, nabilMaghura, rex07, shubbar
 Asturian (ast_ES);enolp
 Basque;gaztainalde, keunes, Osoitz, pospolos
 Breton;Belvar, keunes
 Bulgarian;keunes, solusitor
-Catalan;carles.llacer, dvd1985, exort12, javiercoll, keunes, Kintu, lambdani, marcmetallextrem, xc70
-Chinese (zh_CN);brnme, cyril3, Felix2yu, gaohongyuan, Guaidaodl, Huck0, iconteral, jhxie, jxj2zzz79pfp9bpo, keunes, kyleehee, molisiye, owen8877, RainSlide, Sak94664, spice2wolf, tupunco, wongsyrone, yangyang, yiqiok
+Catalan;carles.llacer, dvd1985, exort12, IvanAmarante, javiercoll, keunes, Kintu, lambdani, marcmetallextrem, xc70
+Chinese (zh_CN);brnme, cyril3, Felix2yu, gaohongyuan, Guaidaodl, Huck0, iconteral, jhxie, jxj2zzz79pfp9bpo, keunes, kyleehee, molisiye, owen8877, RainSlide, RangerNJU, Sak94664, spice2wolf, tupunco, wongsyrone, yangyang, yiqiok
 Chinese (zh_TW);bobchao, ijliao, keunes, mapobi, pggdt, ymhuang0808
 Czech (cs_CZ);anotheranonymoususer, elich, Hanzmeister, svetlemodry, Thomaash
-Danish;jhertel, keunes, SebastianKiwiDk, twikedk
+Danish;JFreak, jhertel, keunes, SebastianKiwiDk, twikedk
 Dutch;e2jk, keunes, rwv, Vistaus
 Estonian;Eraser, keunes, mahfiaz
 Finnish;Ban3, keunes, Sahtor
 French;ChaoticMind, clombion, Cornegidouille, e2jk, keunes, lacouture, LouFex, Matth78, Poussinou, sterylmreep
 Galician;antiparvos, pikamoku, Raichely
-German;ByteHamster, ceving, dadosch, DerSilly, elkangaroo, enz, f_grubm, finsterwalder, HolgerJeromin, kalei, keunes, mfietz, Quiss42, repat, ypid
+German;_Er, ByteHamster, ceving, dadosch, DerSilly, elkangaroo, enz, f_grubm, finsterwalder, hbilke, HolgerJeromin, JoeMcFly, kalei, keunes, mfietz, pudeeh, Quiss42, repat, tomte, tweimer, Willhelm, ypid
 Modern Greek (1453-);AnimaRain, antonist, keunes, pavlosv
 Hebrew (he_IL);amir.dafnyman, E1i9, mongoose4004, pinkasey, rellieberman, Yaron
-Hindi (hi_IN);keunes, purple.coder, siddhusengar
-Hungarian;hurrikan, keunes, lna91, marthynw, meskobalazs, naren93
+Hindi (hi_IN);keunes, purple.coder, siddhusengar, thelazyoxymoron
+Hu;hurrikan, keunes, lna91, marthynw, meskobalazs, naren93
 Icelandic;keunes, marthjod
 Indonesian;dbrw, keunes, levirs565
-Italian (it_IT);aalex70, allin, Bonnee, dontknowcris, giuseppep, Guybrush88, ilmanzo, keunes, m.chinni, marco_pag, neonsoftware, niccord, theloca95
+Italian (it_IT);aalex70, allin, alvami, Bonnee, dontknowcris, giuseppep, Guybrush88, ilmanzo, keunes, m.chinni, marco_pag, neonsoftware, niccord, salorock, theloca95
 Japanese;keunes, KotaKato, Naofumi, sh3llc4t, TranslatorG
 Kannada (kn_IN);chiraag.nataraj, keunes, thejeshgn
-Korean;changwoo, keunes, libliboom
+Ko;changwoo, keunes, libliboom
 Lithuanian;keunes, naglis
 Macedonian;krisfremen
 Malayalam;joice, keunes, rashivkp
-Norwegian Bokmål (nb_NO);abstrakct, bablecopherye, corkie, heraldo, jakobkg, keunes, kongk, sevenmaster, timbast
-Persian;ahangarha, danialbehzadi, ebraminio, F7D, hamidrezabayat76, keunes, sinamoghaddas
-Polish (pl_PL);hiro2020, Iwangelion, keunes, lomapur, mandlus, maniexx, Mephistofeles, shark103, tyle
+Norwegian Bokmål (nb_NO);abstrakct, ahysing, bablecopherye, corkie, forteller, heraldo, jakobkg, keunes, kongk, sevenmaster, timbast
+Persian;ahangarha, danialbehzadi, ebadi, ebraminio, F7D, hamidrezabayat76, keunes, sinamoghaddas
+Polish (pl_PL);befeleme, hiro2020, Iwangelion, keunes, lomapur, mandlus, maniexx, Mephistofeles, shark103, tyle
 Portuguese;emansije, keunes, smarquespt
 Portuguese (pt_BR);alexupits, alysonborges, andersonvom, arua, caioau, carlo_valente, castrors, edman, keunes, lipefire, mbaltar, olivoto, rogervezaro, RubeensVinicius, SamWilliam
 Romanian (ro_RO);corneliu.e, fuzzmz, keunes, ralienpp
-Russian (ru_RU);btimofeev, Duke_Raven, gammja, homocomputeris, IgorPolyakov, keunes, mercutiy, null, overmind88, Platun0v, PtilopsisLeucotis, s.chebotar, un_logic, Vladryyu, whereisthetea
-Slovak;ati3, keunes, tiborepcek
+Russian (ru_RU);ashed, btimofeev, Duke_Raven, gammja, homocomputeris, IgorPolyakov, keunes, mercutiy, null, overmind88, Platun0v, PtilopsisLeucotis, s.chebotar, un_logic, Vladryyu, whereisthetea
+Slovak;ati3, keunes, marulinko, tiborepcek
 Slovenian (sl_SI);keunes, panter23
-Spanish;AleksSyntek, andersonvom, andrespelaezp, deandreamatias, dvd1985, Fitoschido, frandavid100, hard_ware, javiercoll, keunes, LatinSuD, leogrignafini, tres.14159, vfmatzkin, wakutiteo
+Spanish;AleksSyntek, andersonvom, andrespelaezp, deandreamatias, dvd1985, elojodepajaro, Fitoschido, frandavid100, hard_ware, javiercoll, keunes, LatinSuD, leogrignafini, rafael.osuna, tres.14159, vfmatzkin, wakutiteo
 Swahili (macrolanguage);keunes, kmtra
 Swedish (sv_SE);bpnilsson, keunes, nilso, TwoD
 Telugu;keunes, veeven
-Turkish;brsata, Erdy, keunes, overbite, Slsdem
-Ukrainian (uk_UA);IndibidAbulya, keunes, older, paul_sm, sergiyr, zhenya97
+Turkish;AhmedDuran, brsata, Erdy, keunes, overbite, Slsdem
+Ukrainian (uk_UA);keunes, older, paul_sm, sergiyr, zhenya97
 Vietnamese;abnvolk, keunes, ppanhh