From ac25cf56fbaedbb0f7b7d7b838fe8874d4efccc5 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 12 Jun 2017 17:33:02 +0100 Subject: [PATCH 01/12] Fix broken riot.im link on homepage For want of a quote the something something Also add noopeners --- src/components/structures/HomePage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/structures/HomePage.js b/src/components/structures/HomePage.js index e1e700f21e..2311cc1f30 100644 --- a/src/components/structures/HomePage.js +++ b/src/components/structures/HomePage.js @@ -46,8 +46,8 @@ module.exports = React.createClass({ translate: function(s) { s = sanitizeHtml(_t(s)); // ugly fix for https://github.com/vector-im/riot-web/issues/4243 - s = s.replace(/Riot\.im/, 'Riot.im'); - s = s.replace(/\[matrix\]/, '[matrix]'); + s = s.replace(/Riot\.im/, 'Riot.im'); + s = s.replace(/\[matrix\]/, '[matrix]'); return s; }, From c43b30f2fd2d4d2ed2a373d4cafda89d84c5bb5d Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 12 Jun 2017 16:49:09 +0100 Subject: [PATCH 02/12] Missing bracket in translation --- src/i18n/strings/nl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index 70860d27e7..1b497ff3ad 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -102,7 +102,7 @@ "View Source": "Bekijk bron", "When I'm invited to a room": "Wanneer ik uitgenodigt wordt naar een kamer", "World readable": "Door iedereen leesbaar", - "You cannot delete this image. (%(code)s)": "Je kunt deze afbeelding niet verwijderen. %(code)s)", + "You cannot delete this image. (%(code)s)": "Je kunt deze afbeelding niet verwijderen. (%(code)s)", "You cannot delete this message. (%(code)s)": "Je kunt dit bericht niet verwijderen. (%(code)s)", "You are not receiving desktop notifications": "Je ontvangt momenteel geen desktop notificaties", "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Je hebt ze mogelijk ingesteld in een andere client dan Riot. Je kunt ze niet aanpassen in Riot maar ze zijn wel actief", From 0b83baeaf499d4ed426f875bde2e5858df6e6a88 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 12 Jun 2017 17:54:58 +0100 Subject: [PATCH 03/12] Don't show the tooltips when filtering rooms Fixes https://github.com/vector-im/riot-web/issues/4281 --- src/components/structures/RoomSubList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js index 2740c6a400..092ed9cca0 100644 --- a/src/components/structures/RoomSubList.js +++ b/src/components/structures/RoomSubList.js @@ -530,7 +530,7 @@ var RoomSubList = React.createClass({ var label = this.props.collapsed ? null : this.props.label; let content; - if (this.state.sortedList.length == 0) { + if (this.state.sortedList.length == 0 && !this.props.searchFilter) { content = this.props.emptyContent; } else { content = this.makeRoomTiles(); From dfd9f7c27b86f43697c95a417c84c7ec3b02e307 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 13 Jun 2017 10:06:10 +0100 Subject: [PATCH 04/12] New icons for riot-ios & riot-translations --- res/home/rooms/riot-ios.png | Bin 3828 -> 5324 bytes res/home/rooms/riot-translations.png | Bin 146 -> 8409 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/home/rooms/riot-ios.png b/res/home/rooms/riot-ios.png index 83306f7cb8bae371ca455a6ff601a89fe624cf8e..6a0c598fe579a63739302ec951760936f69da3f4 100644 GIT binary patch literal 5324 zcmV;-6f^6IP)@t6Wn-dSG0|vZ;hCdJ zR)dBmsU%9wT53$~o{0tmYBprEfQsg!n-#eV21Gys6}XR?J9EzI?r;A%GaztL;GVe; z^;b1@tLB{P?)&}v>;C%tzU~Iz#*l)Bx&ea(aywkP?Zip6d-v~5xm?ym-JrJw+z!`b z@LQ#m4Ij9!D_$%3g;zY7`oF7FF)Y+D0g&suR4$kGwddY2kEQh}33*m6s;eNXYr}>? z5DeG=)rPvUuf>~z0CM4y=XvIu&v$sE%W+13!OBagb$2B0#2-KBLHB*r&-bh z0S9o@5@4=(C|of#d0xh{-#NAxm-2?hQ(aa zasqtzWmE8X-0OcZGjY^e8t8EHb{<5;6(hR0cRe0F-@RUMtwmp>D{cdTGRgpA-+pIj zd)#}=FaT5A=u%j#V|&)gOi@Nbsp#oQMVlD`n!Smpg< zFBz}JtyeDW*uHMpCsXOnSs-&783Bd?Gec=dVz&$F>KfR^wZ3kj< zJ{EFX^z}?8^C4AJU}6MO-2lYYtcX}NIA(wuAhIn> zSi(j^}1T=;Jv&D=5ankJL?+T(onMg?z;?U}95Mk#X zbl&y^cC6m2t(*FdLC8R|}(Axab7`|%$ z1Mb5OO<)Ytkd!C^uIq|Ysl*Ew{e0r_ADHq~dR%5)*cX5V9iF+%07*jF6JpK6KcKdw z3SkStK<_a|CAV+C+$Af2FxAmD5iB?cR!MLvLq{pQ%RFPsLI${kYLC|%Laqpgh)R;7kHZ3z5 zh)8PI3;plmDkx3xOm_b=yu^BB+bOsg{N5@a@Jz!{Sf(vd(C zRs;hi0GV#-C~yFXVAaDQ%-Gpa9usB2U;t*2djFm} znRVJuIdxTAo6d^=?9KMJYzRuu7gUaYH@nvEMz(DXND^4_fcgvxf(bOjt^jn1%ZLGk zp&ctF6{#f?PiXtxl?$)z!o97lE;(jn`D4@4bqIFWK$h6+K0XpO)&fyALUn5ogd@S+ z+O-igYsYe=rfBi0H=JL*a^aO-Zim}ahh^fbwQJojbalQ8VTl3F0?Z8INc3*pjoQmq zkVP$Bn=-@LmLu8WHShS?_|FzkJ~?z7#)l{E$;+}qBLk8(UzE3L;w-txqH@N z+saL_a}LOoV8abEu+OLYJxPL{cd+Z}SI~LelTdvTglw%lh8V`SY%t@;mtJte&d$!k zOR)!CZ+it+$^zLEXtD5P%f}Xxj-Kw>wCy&?T>7QbR=Zf0ue#g6ilF?BLis**jf9~=Zt|O4$274(Z&UjFQ^Sg{?Op0r8LL) zoDJr9ypMXrhOdV}wt(GOXtjLE=?6v+2HX8(@HXi+LX808AXd}0!23OWi(%+?Ne%~j zGgBkHxofDJFyfMPlSG{5%K(Y(L)C`2Gyx1W+~%Aasy4j22p}AhB~OIO0ML1K`=Aeu zBbxxCJ(D>b1}g(rdo3vv^!kJlkcRkx4+qiZYQ#R1E>curd}> z<1%o@rXW)itPP?{2v&U1U=9I7>4+_9A0PIJ(*RJR;18-yM%-Bu@s39W6)5D7Yr|3R zn}{(p#vy%79x^4s4CuN-^~GLvKf4pJKDizBSNk9{R%3g|e&vCTge5}`t^lxn)~o`f z-#1%>5k&wAf(bQ5%EFX$XW-Z~Cc|klDjIOg=@FynKl#Lt_9%%1WglvY|A z>piHYzg0$ApLu3!P;y~L1OW^N8-uCElh8JGEL0@|$v3cYnxIB-zbC-a@1KO@KRq3~ zrVh-qBZx>xI^3nMz3$@gd~xMUPtBb@xBsIL62!14AkGn07=Ow{OgL>4qDmMG|8UEZ z0;(^<if}jJ9+~hXA^ZXP0P531c8Dn4!r=a=Yum6Yd-g~=y=gd~^6&Th85D|=KVn)fZyohmXh6@1F!!jSe7{h{(Wj7=^4W`1?)&_u`*!`qF}bdxoDGHSiYf zi(yRw0I)G|#%AIeb3!o#YLq+mqM67{%=N2T1R^4$NQZTsoP5{Iz3-ZdnE{U2Vi#v^PUz|EigF%1)&NUB9K;_sWGt6zy$QG8p~@5JA-y zIAJ$gJQPKkF#A|c`sfryec?V@5DPyoLlr)<`^Bx_`r&VW7&IRx*NPE900}~EM-@gV zze9$IphAr)pP7NS6UIW<8>T5kThfw|4qpw~e16dri=xI>rNsS1!`DTs;4Q8y{|^@PXk@02(1%DX?wj=Diu$34w$jUw zZ6%qpxN*Wjg0(cBJHC!*%HH=fQCB&F!-^M@>GCNW9CzxG0yCsEtONN zJ9;k#!w4zN!1l!USGSQty>1*k^{-1__(OYy<0!Vo$R6GVG(ZrJ z>$(D+urLeF4HTliy`8)5Xdb${KbFpCPYtRy4N8s#5M-^=r}JY*ec&kWzMhEYHLRk< z7H1=Z048S7^Nic!8n3)3GG$z5;StpruYdH5I#iDeOQy8a13IVZ01!m2(x;tN`r2Qv zTeR8o0mMw|mhxHurM(~J?@B8w+86W!JAgs;H^g%v1oku<%KgkzF+OC{5G4_$8R0Jwkx6A?$Oz7*7hS8c~3PJGW3%X+nDgrvEPpLt|bu~^heEYRKz1b~Q) z&%P|q?0B9d^;OHZ1Q8{g#Xv+9MGf-vdKxOBr_+c2?VfVVqiJ| zlu#OQkt2eDLp|Z#BhLV!3ub+Mr)D#kjbSMSCp8~1GsQ)5763{p4Id3?9yd>HYDz1B z2VVA`2rzN=kbgsDd}ev!j5C&p_2B!NQF#d@W112X6A=ig13)Q(JdMN%*b_Yx_I72W zst_c2faeV`AR`q5kedOZ{SY_N6#-N5eW|n7ylQvvlbKw`LK5=<14M!u*Z?4b0VqKN z;?t#=x+iYk2&N5ESWG-1ON0dp5$UjE3;GiP6v~A|E3e_JDIR}%%@F;Qj-oyx<$z67 z217_ehOr6&%EL(m0H9DPi$#kTMG)qGDJ1a#k~x{#IMN1){^vVO=529Z_pq)XEEkK~ zXO~^s)ptr^6CW81 zOe9zt1+cjl06IH654*P&0pqhT*Ub3vg1(;0Z*%#a#pcL{B4#$3d{!7`?m7R24{q}P zWX_aJlmHK&DHIA~!2{oYkqv*#wrl~yVP6lz%qrt#EM?T~^OxPY(sf;NMClF(WJE7cOT4b60w7Hi%4=7goyleIbTX-9s=ZZ!IXakv5(zsu zDvzKZJYTQXK6}y3k38zLFN>7i7S@*DqSW}y*PP>>D}-=Kh}n*GuY=l%6t^WvT^?;F_=k6GRi~*vHXG)Klsf4zZ-EloLeYbePaa>cZx&Z`RK-1 zEw-$q4(7=qzlb%>4f!PNu+4gbw6hwcke#QrIwEsUm`_Hlx)e4lL}Ru6n5I!ZsiYl(x64$0%;5PALu_&pg@8C z3H?wMXi_v^iWW!<6e*gZ0b0a%B1M+02lb@H_iLBCdzZWS&dlkDyQC_vCrWyc{wZE#3X8yphU28RT-!689ya7a)a91_$9 zhXl33Awg{*zK~X;uVx4UA^i7Z(Pe_dl^x<^FGhfoUv%#mhyVx(05OIoOJLU)tMu4g zX{E^!lHo=HX+TEEcb@C8Ylw`45Kod4cKC~8syiM;M4{JgZB#Z^OSNh}XeuH?(vI>o zjY{5I&orxq%piiH_CqK17tT;RkW68=hZPFgKZtz=woCKJNO^5Ru0uWH( z1ETx-mvVpfT{$@!_U0g5$$}svK-{j@FMo1_5E(*yOJvA#<<`dVzx@OHKH0nvA^;fA zL&wQ}@a@d|-$KC;f}{8Zh3<3X(yjHiEh$BZc94vc?$FZBk>y#%C0a&6&OvMAdCsZR z@^^j@GnuXrx0nRA0`r#l*{3&<^A4P6&vyYOsaIC6NYWk5XYGIhj8ol%OwM`dJ?P1I zmm{lbesi^?HAx;VQ)XnEB2j8U@7jXq4npVA`Z-29tZn#z|99?pzAHw@y2w#nf)D|q zR`GVG^C%!fAxhPNeR|0x)2%7o76gog-}G+YKJr(8Es8}T1K0(QVwykzAo6{M7^W)` zKnOsjbG^VA0s%rdeh`eoL_%$BZ2axtm`VkplUbuZ;tw&}S$IWViXtLu&GS9Eue`49 zYSnh)i%>3=Np2hkEupKXJ-_ z;*UuX0iaP%!y|Mf^Fsj0oN7sxN&$De>_Gs42t@iPKTaMU!F0xwqnHFC00hdpa~-C? z3`RvN+zu|~5R8*o)mJae;b9vyHbI)?PDTA!Hi zUa@Z9#sCdbX^s3QI*Hh3tTJiSXoBxgE`C0H^h`b7E1KH`&!~!$K}3~E<;zQ>E3*Ls z_}g)6)ses$R4V4d9G^N7dz4uaL{z+rsVq3BDAnnyvrK%Gys@lMheo&h}Q+f3_n*Bp0 zoZU_W0rMNl2X}fd|2*~JmKKsQ%yAFCsEi1KzkT^~&iB!A;?4I~1SN)xLLf>B06>uR z){b2KFTXI<95|}7y(A(pe{qXypv-i75ivxDC}$e=Hhk|nhmUbu?<*x5E(;S13tDaB*uX~VU|EC zn}*_pF;a@E6@ZvES*svjyLv+{Ew+aD%L&Fzt(xu~%)ItSJOfr9KZzUmztnz zRj#bWHeeT|hXw>{l=5XJh`gN4Wn&w#3euUGDJm8o1?iU%h|p}XiSgFw=;+GUGj(s~ z#;5m!kZkND5P%3@Gfwhl7o>08(#y+T8DfM0fT$I!U~h$pkdctYIRIgdMmRUsO8V$A z0RV=8M>b&PLCxhgHNS`n`&kT;4AV+wdKyC`LEnIOQvkrXJ!f+@u`(}eTZT(Q7TJ{; zH161#XH3K4`t$Cj=lw;M_>ZX?Wvn zxAOH3g`!j810om$iG=g*4>6g10c$ao0vs8WAOb)pRC6UWbg%yeBf}eYLIivir&~s~ z=DHp*F+23i=>FggURp>l-7=kIr;JgpmO4HoA-?v*Y8GqE%?I-j<1978a-R^3=Pm&5 zj;H6g1}$;T!?80*fAI+hJ~7rlWD{j4rlR%jaaef}OS&SRf*1rb#vAqWnR7vLgx5Xl zu-1o&fgcPFm)^WE__Kf4j{Cd_${5u>_w_gA=%|fY&nlD7y>{A+4S|R=#2A^S@h^k# zL!{k(#`t!9Yx-;<2}i1{0SbhD)qDhuL8Iwhcptz@TV>}#sT2!*5K-kXz=#?=vF)Up ziL8JjM5gt_p_!~{CQut>`|QmkLJ+{<5T7`1sr9r=6z3Q9+G^BHnh?1Psz-{tD45YP z+GS*X?%eMg8~@c$^}d_ej8S7d^Ji}ZVrPQUXTmB-d$;bY`T58}nlaYc_D*nkT|iUC zaDGDM+Arse0{0!9f?lF7=#RsVrW-^MdT_d zeeIpp=CZT4Y<8DBh!6yFbhP)+KWhDI2df~RJ#&hN2cjp6$Vkg%&q~nohV{P98>5BX z{N4Ab?|ll$T9Fu$n$5)f-(fvHUD0&ft;KqB1SVD{O=)Ba<2RWTTmC|bT=}(ZVRih~ zvC@4dT|_X|ig@b+pPcHJ3ePS`udSQ)b(E0_B4i?Hrdi+i(J2u$+wNIE#|~HiQf@f4 zI-gmZQ+|;A=DYm#*_S}02mnO2YqN2JGyou?@{lK7E1) z`{HHNfB-~U*a~VJwM14}Xr>830IeHYSS|GpP?P$B{Oso`4lWs#2v=*`{C?Aaix8Xq@@cGa_i(oZeu9Hyi%l z>knpLJKjYnvXj4jc1z@NNJ{1ZXS@DcPL0Uc-Y(drM8kmBC#!(2X-OuJp-$X4B< z^VvAtK1yN#Ae)}qT^}&zJNew5ZL-u&Bcf9J_O-cJzY-W!|n_(}o++pf?p5k@w-zR6#%!F(iXeAvM7jc_>cJ6dyY37P?Ds!NM5B|%@OR ze{Z?BFZW_Rh?Js0wT}OH4nznP>HVwGh(JWCOmcjB_|COCyMacWvue5KRqN?&Dqi`_ zE|b1;T`w<1&Vv{;o|j~<{KozpGT}fgjt-PJDx0fi(eaV$r-6tnP+O&1I-B~!^+5nZ zX-lnb#3@d9pA6{HKV> zNjQ@;V>d3}v2r2+t>SDhg|HxqvCQci8Y)BkUF$4g4a>ifZgmN{C zbPz!)-j^2>lK|~E_8z6z6GIQ~EJmI6jWKRAk?YOCPT-G$UC6AKyUi=%_v-YNeAI_w2bD&UkG3g2hTVJp9y~ z7hn4Z_)Qdyxo)^szwZxAx=0$NlyAKQB3fNNbfQ!yIrYl8QW~huctJ$1H5dHEs}r0@ z7f0`bozfl=jN#KKO|wz^r|+9agQe2|yK~b{=E@itW2#kA9Lj$0BP{gC*fkG1>L2PO zLwByvX>G#mz-Z6iA&3x;iNFuslzZ~*WICI&tOs@D%Bivzn2_}845T^!yg-3EsQ qwZS1lZE#3X8yphU28RT-!T$qEf`uj-&gkl diff --git a/res/home/rooms/riot-translations.png b/res/home/rooms/riot-translations.png index ee0f85589570374f5e1dec95ff7867a6c731f7bf..2ae95836e70a2e56e5f666be9bbee8b3053a62f2 100644 GIT binary patch literal 8409 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 Date: Tue, 13 Jun 2017 10:52:06 +0100 Subject: [PATCH 05/12] Merge pull request #4290 from RiotTranslateBot/weblate-riot-web-riot-web Update from Weblate. --- src/i18n/strings/el.json | 10 +-- src/i18n/strings/en_US.json | 31 ++++++- src/i18n/strings/fr.json | 29 ++++++- src/i18n/strings/nl.json | 158 +++++++++++++++++++++++++----------- 4 files changed, 173 insertions(+), 55 deletions(-) diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json index cbb2a819cf..c060f3bdb3 100644 --- a/src/i18n/strings/el.json +++ b/src/i18n/strings/el.json @@ -20,7 +20,7 @@ "Download this file": "Λήψη αρχείου", "Enable audible notifications in web client": "Ενεργοποίηση ηχητικών ειδοποιήσεων", "Enable email notifications": "Ενεργοποίηση ειδοποιήσεων μέσω μηνυμάτων ηλ. αλληλογραφίας", - "Enable notifications for this account": "Ενεργοποίηση ειδοποιήσεων γι' αυτό το λογαριασμό", + "Enable notifications for this account": "Ενεργοποίηση ειδοποιήσεων για τον λογαριασμό", "Enter keywords separated by a comma:": "Πρόσθεσε λέξεις κλειδιά χωρισμένες με κόμμα:", "Error": "Σφάλμα", "#example": "#παράδειγμα", @@ -31,7 +31,7 @@ "customServer_text": "Μπορείτε να χρησιμοποιήσετε τις προσαρμοσμένες ρυθμίσεις για να εισέλθετε σε άλλους διακομιστές Matrix επιλέγοντας μια διαφορετική διεύθυνση για το διακομιστή.
Αυτό σας επιτρέπει να χρησιμοποιήσετε την εφαρμογή Riot με έναν υπάρχοντα λογαριασμό σε διαφορετικό διακομιστή.

Επίσης μπορείτε να επιλέξετε ένα διαφορετικό διακομιστή ταυτότητας αλλά δεν θα έχετε τη δυνατότητα να προσκαλέσετε άλλους χρήστες ή να σας προσκαλέσουν μέσω μηνυμάτων ηλεκτρονικής αλληλογραφίας.", "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s μέσω %(browserName)s σε %(osName)s", "All messages (loud)": "Όλα τα μηνύματα (δυνατά)", - "delete the alias.": "διαγραφή ψευδώνυμου.", + "delete the alias.": "διέγραψε το ψευδώνυμο.", "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Διαγραφή του ψευδώνυμου %(alias)s και αφαίρεση του %(name)s από το ευρετήριο;", "Dismiss": "Απόρριψη", "Failed to add tag %(tagName)s to room": "Δεν ήταν δυνατή η προσθήκη της ετικέτας %(tagName)s στο δωμάτιο", @@ -39,7 +39,7 @@ "Failed to join the room": "Δεν ήταν δυνατή η σύνδεση στο δωμάτιο", "Favourite": "Αγαπημένο", "Files": "Αρχεία", - "Filter room names": "Φίλτραρε τα δωμάτια", + "Filter room names": "Φιλτράρισμα δωματίων", "Forward Message": "Προώθηση", " from room": " από το δωμάτιο", "Guests can join": "Επισκέπτες μπορούν να συνδεθούν", @@ -150,7 +150,7 @@ "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Ισως να έχετε κάνει τις ρυθμίσεις σε άλλη εφαρμογή εκτός του Riot. Δεν μπορείτε να τις αλλάξετε μέσω του Riot αλλά ισχύουν κανονικά", "Couldn't find a matching Matrix room": "Δεν βρέθηκε κάποιο δωμάτιο", "Drop here %(toAction)s": "Απόθεση εδώ %(toAction)s", - "Failed to": "Αποτυχία να", + "Failed to": "Απέτυχε να", "Failed to get public room list": "Δεν ήταν δυνατή η λήψη της λίστας με τα δημόσια δωμάτια", "Failed to set direct chat tag": "Δεν ήταν δυνατός ο χαρακτηρισμός της συνομιλίας ως 1-προς-1", "powered by Matrix": "βασισμένο στο πρωτόκολλο Matrix", @@ -196,5 +196,5 @@ "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Προκειμένου να διαγνωστούν προβλήματα, τα αρχεία καταγραφής από αυτόν τον πελάτη θα σταλούν με αυτήν την αναφορά σφάλματος. Αν προτιμάτε να στείλετε μόνο το παραπάνω κείμενο, απενεργοποιήστε:", "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Με τον τρέχον περιηγητή, η εμφάνιση και η αίσθηση της εφαρμογής ενδέχεται να είναι εντελώς εσφαλμένη και ορισμένες ή όλες οι λειτουργίες ενδέχεται να μην λειτουργούν. Εάν θέλετε να το δοκιμάσετε ούτως ή άλλως μπορείτε να συνεχίσετε, αλλά είστε μόνοι σας σε ό, τι αφορά τα προβλήματα που μπορεί να αντιμετωπίσετε!", "Failed to set Direct Message status of room": "Δεν ήταν δυνατός ο ορισμός της κατάστασης Direct Message του δωματίου", - "Support for those using, running and writing other bridges": "Υποστήριξη ηια τους χρήστες που χρησιμοποιούν ή αναπτύσσουν εφαρμογές ενσωμάτωσης για το Matrix" + "Support for those using, running and writing other bridges": "Υποστήριξη για τους χρήστες που χρησιμοποιούν ή αναπτύσσουν εφαρμογές ενσωμάτωσης για το Matrix" } diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json index 8500886541..63fadbe006 100644 --- a/src/i18n/strings/en_US.json +++ b/src/i18n/strings/en_US.json @@ -167,5 +167,34 @@ " (HTTP status %(httpStatus))": "(HTTP status %(httpStatus))", "Welcome to Riot.im": "Welcome to Riot.im", "Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentralised, encrypted chat & collaboration powered by [matrix]", - "Chat with Riot Bot": "Chat with Riot Bot" + "Chat with Riot Bot": "Chat with Riot Bot", + "Search the room directory": "Search the room directory", + "Get started with some tips from Riot Bot!": "Get started with some tips from Riot Bot!", + "General discussion about Matrix and Riot": "General discussion about Matrix and Riot", + "Discussion of all things Matrix!": "Discussion of all things Matrix!", + "Matrix technical discussions": "Matrix technical discussions", + "Running Matrix services": "Running Matrix services", + "Community-run support for Synapse": "Community-run support for Synapse", + "Admin support for Dendrite": "Admin support for Dendrite", + "Announcements about Synapse releases": "Announcements about Synapse releases", + "Support for those using and running matrix-appservice-irc": "Support for those using and running matrix-appservice-irc", + "Building services on Matrix": "Building services on Matrix", + "Support for those using the Matrix spec": "Support for those using the Matrix spec", + "Design and implementation of E2E in Matrix": "Design and implementation of E2E in Matrix", + "Implementing VR services with Matrix": "Implementing VR services with Matrix", + "Implementing VoIP services with Matrix": "Implementing VoIP services with Matrix", + "Discussion of the Identity Service API": "Discussion of the Identity Service API", + "Support for those using, running and writing other bridges": "Support for those using, running and writing other bridges", + "Contributing code to Matrix and Riot": "Contributing code to Matrix and Riot", + "Dev chat for the Riot/Web dev team": "Dev chat for the Riot/Web dev team", + "Dev chat for the Dendrite dev team": "Dev chat for the Dendrite dev team", + "Co-ordination for Riot/Web translators": "Co-ordination for Riot/Web translators", + "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!", + "You have successfully set a password!": "You have successfully set a password!", + "You can now return to your account after signing out, and sign in on other devices.": "You can now return to your account after signing out, and sign in on other devices.", + "Please set a password!": "Please set a password!", + "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices.", + "Riot/Android & matrix-android-sdk chat": "Riot/Android & matrix-android-sdk chat", + "Riot/Web & Desktop chat": "Riot/Web & Desktop chat", + "Riot/iOS & matrix-ios-sdk chat": "Riot/iOS & matrix-ios-sdk chat" } diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 47fb52532c..c57a6d17d3 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -10,7 +10,7 @@ "Create new room": "Créer un nouveau salon", "Couldn't find a matching Matrix room": "Impossible de trouver un salon Matrix", "Custom Server Options": "Options de serveur personnalisées", - "delete the alias.": "Supprimer l'alias.", + "delete the alias.": "supprimer l'alias.", "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Supprimer l'alias %(alias)s du salon et supprimer %(name)s du répertoire ?", "Direct Chat": "Conversation Directe", "Directory": "Répertoire", @@ -118,7 +118,7 @@ "Guests can join": "Ouvert aux visiteurs", " to room": " au salon", "Advanced notification settings": "Paramètres de notification avancés", - "customServer_text": "Vous pouvez utiliser l'option de serveur personnalisé pour vous connectez à d'autres serveurs Matrix, en spécifiant une adresse de homerserver différente.
Cela permet d'utiliser Riot avec un compte existant sur un homeserverdifférent.

Vous pouvez aussi indiquer un serveur d'identité personnel mais vous ne pourrez plus inviter des utilisateurs par email, ou être invité par email.", + "customServer_text": "Vous pouvez utiliser l'option de serveur personnalisé pour vous connectez à d'autres serveurs Matrix, en spécifiant une adresse de homerserver différente.
Cela permet d'utiliser Riot avec un compte existant sur un homeserver différent.

Vous pouvez aussi indiquer un serveur d'identité personnel mais vous ne pourrez plus inviter des utilisateurs par email, ou être invité par email.", "Notifications on the following keywords follow rules which can’t be displayed here:": "Les notifications pour les mots-clés suivant répondent à des critères qui ne peuvent pas être affichés ici :", "Collapse panel": "Cacher le panneau", "Expand panel": "Dévoiler le panneau", @@ -161,5 +161,28 @@ "Waiting for response from server": "En attente d’une réponse du serveur", "You are Rioting as a guest. Register or sign in to access more rooms and features!": "Vous utilisez Riot en tant que visiteur. Enregistrez vous ou identifiez vous pour accéder à plus de salons et de fonctionnalités !", "You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel en partage d’écran.", - "OK": "OK" + "OK": "OK", + "Failed to change password. Is your password correct?": "Échec du changement de mot de passe. Votre mot de passe est-il correct ?", + "You have successfully set a password!": "Vous avez paramétré un mot de passe avec succès !", + "Continue": "Continuer", + "Please set a password!": "Veuillez paramétrer un mot de passe !", + "You can now return to your account after signing out, and sign in on other devices.": "Vous pouvez maintenant revenir sur votre compte après vous être déconnecté, et vous identifier sur d'autres appareils.", + "This will allow you to return to your account after signing out, and sign in on other devices.": "Cela vous permettra de retourner sur votre compte après vous être déconnecté, et de vous identifier sur d'autres appareils.", + "Welcome to Riot.im": "Bienvenue sur Riot.im", + " (HTTP status %(httpStatus))": "(statut HTTP %(httpStatus))", + "Login": "S'identifier", + "Chat with Riot Bot": "Discussion avec le Robot Riot", + "Search the room directory": "Rechercher dans le répertoire de salon", + "Get started with some tips from Riot Bot!": "Démarrer avec quelques astuces du Robot Riot !", + "Riot/Android & matrix-android-sdk chat": "Discussions Riot/Android & matrix-android-sd", + "Riot/iOS & matrix-ios-sdk chat": "Discussions Riot/iOS & matrix-ios-sdk", + "General discussion about Matrix and Riot": "Discussion générale sur Matrix et Riot", + "Riot/Web & Desktop chat": "Discussions Riot/Web & Desktop", + "Running Matrix services": "Exécution de services Matrix", + "Admin support for Dendrite": "Support admin pour Dendrite", + "Announcements about Synapse releases": "Communiqués sur les nouvelles versions de Synapses", + "Matrix technical discussions": "Discussions techniques sur Matrix", + "Community-run support for Synapse": "Support communautaire sur Synape", + "Support for those using and running matrix-appservice-irc": "Support pour ceux qui utilisent et exécutent matrix-appservice-irc", + "Building services on Matrix": "" } diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index 1b497ff3ad..d9e459d551 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -1,42 +1,42 @@ { - "Add an email address above to configure email notifications": "Voeg een email adres toe om email notificaties te ontvangen", - "Advanced notification settings": "Geavanceerde notificatie instellingen", + "Add an email address above to configure email notifications": "Voeg een e-mailadres toe om e-mailmeldingen te ontvangen", + "Advanced notification settings": "Geavanceerde meldingsinstellingen", "All messages": "Alle berichten", "All messages (loud)": "Alle berichten (luid)", - "All notifications are currently disabled for all targets.": "Alle notificaties zijn op het moment uitgeschakeld voor alle doelen.", - "An error occurred whilst saving your email notification preferences.": "Er is een fout ontstaan tijdens het opslaan van jouw email notificatie voorkeuren.", - "Call invitation": "Audio gesprek uitnodiging", - "Cancel Sending": "Annuleren verzending", - "Can't update user notification settings": "Het is niet gelukt om de gebruiker notificatie instellingen bij te werken", + "All notifications are currently disabled for all targets.": "Alle meldingen zijn momenteel uitgeschakeld voor alle doelen.", + "An error occurred whilst saving your email notification preferences.": "Er is een fout ontstaan tijdens het opslaan van uw e-mailmeldingsvoorkeuren.", + "Call invitation": "Oproep-uitnodiging", + "Cancel Sending": "Versturen annuleren", + "Can't update user notification settings": "Het is niet gelukt om de meldingsinstellingen van de gebruiker bij te werken", "Close": "Sluiten", - "Create new room": "Maak een nieuwe kamer", + "Create new room": "Een nieuwe kamer maken", "Couldn't find a matching Matrix room": "Het is niet gelukt om een bijbehorende Matrix kamer te vinden", - "Custom Server Options": "Aangepaste server instellingen", - "customServer_text": "Je kunt de aangepaste server instellingen gebruiken om in te loggen bij andere Matrix servers door een andere home server URL in te voeren.
Dit maakt het mogelijk om Riot te gebruiken met een bestaand Matrix account op een andere home server.

Je kunt ook een aangepaste identiteit server instellen, maar het is dan niet mogelijk om gebruikers uit te nodigen met behulp van een email adres of zelf uitgenodigt te worden met een email adres.", + "Custom Server Options": "Aangepaste serverinstellingen", + "customServer_text": "U kunt de aangepaste serverinstellingen gebruiken om in te loggen bij andere Matrix-servers door een andere homeserver-URL in te voeren.
Dit maakt het mogelijk om Riot te gebruiken met een bestaand Matrix-account op een andere homeserver.

U kunt ook een aangepaste identiteitsserver instellen, maar het is dan niet mogelijk om gebruikers uit te nodigen met behulp van een e-mailadres of zelf uitgenodigd te worden met een e-mailadres.", "delete the alias.": "verwijder de alias.", - "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Verwijder de alias %(alias)s en verwijder %(name)s uit de map?", - "Direct Chat": "Privé gesprek", - "Directory": "Kamer lijst", + "Delete the room alias %(alias)s and remove %(name)s from the directory?": "De alias %(alias)s verwijderen en %(name)s uit de kamerlijst verwijderen?", + "Direct Chat": "Privégesprek", + "Directory": "Kamerlijst", "Dismiss": "Afwijzen", "Download this file": "Download dit bestand", - "Enable audible notifications in web client": "Zet notificaties aan in de web client", - "Enable desktop notifications": "Zet desktop notificaties aan", - "Enable email notifications": "Zet email notificaties aan", - "Enable notifications for this account": "Zet notificaties aan voor dit account", - "Enable them now": "Zet ze nu aan", + "Enable audible notifications in web client": "Meldingen in de webclient aanzetten", + "Enable desktop notifications": "Desktopmeldingen aanzetten", + "Enable email notifications": "E-mailmeldingen aanzetten", + "Enable notifications for this account": "Meldingen voor dit account aanzetten", + "Enable them now": "Deze nu aanzetten", "Enter keywords separated by a comma:": "Voeg trefwoorden toe, gesplitst door een komma:", "Error": "Fout", - "Error saving email notification preferences": "Fout bij het opslaan van de email notificatie voorkeuren", + "Error saving email notification preferences": "Fout bij het opslaan van de meldingsvoorkeuren voor e-mail", "#example": "#voorbeeld", "Failed to": "Mislukt om", "Failed to add tag %(tagName)s to room": "Mislukt om de label %(tagName)s aan de kamer toe te voegen", - "Failed to change settings": "Het is mislukt om de instellingen te wijzigen", - "Failed to forget room %(errCode)s": "Het is mislukt om de kamer te vergeten %(errCode)s", - "Failed to update keywords": "Het is mislukt om de trefwoorden bij te werken", - "Failed to get protocol list from Home Server": "Het is mislukt om de protocol lijst op te halen van de home server", - "Failed to get public room list": "Het is mislukt om de lijst van publieke kamers op te halen", - "Failed to join the room": "Het is mislukt om de kamer toe te treden", - "Failed to remove tag %(tagName)s from room": "Het is mislukt om de label %(tagName)s van de kamer te verwijderen", + "Failed to change settings": "Instellingen wijzigen mislukt", + "Failed to forget room %(errCode)s": "Kamer vergeten mislukt %(errCode)s", + "Failed to update keywords": "Sleutelwoorden bijwerken mislukt", + "Failed to get protocol list from Home Server": "Protocollijst ophalen van de homeserver mislukt", + "Failed to get public room list": "Lijst met publieke kamers ophalen mislukt", + "Failed to join the room": "Kamer binnengaan mislukt", + "Failed to remove tag %(tagName)s from room": "Label %(tagName)s van de kamer verwijderen mislukt", "Failed to set direct chat tag": "Het is mislukt om de privé chat label weg te halen", "Favourite": "Favoriet", "Fetching third party location failed": "Het ophalen van de locatie van de derde partij is mislukt", @@ -54,38 +54,38 @@ "Mentions only": "Alleen vermeldingen", "Messages containing my display name": "Berichten die mijn weergavenaam bevatten", "Messages containing my user name": "Berichten die mijn gebruikersnaam bevatten", - "Messages in group chats": "Berichten in groep gesprekken", - "Messages in one-to-one chats": "Berichten in één-op-één gesprekken", + "Messages in group chats": "Berichten in groepsgesprekken", + "Messages in one-to-one chats": "Berichten in één-op-één-gesprekken", "Messages sent by bot": "Berichten verzonden bij een bot", "more": "meer", "Mute": "Dempen", "No rooms to show": "Geen kamers om te laten zien", "Noisy": "Luidruchtig", "Notification targets": "Notificatie doelen", - "Notifications": "Notificaties", + "Notifications": "Meldingen", "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificaties op de volgende trefwoorden volgen regels die hier niet kunnen worden laten zien:", "Notify for all other messages/rooms": "Informeer mij voor alle andere berichten/kamers", "Notify me for anything else": "Informeer mij voor al het andere", "Off": "Uit", "On": "Aan", "Operation failed": "Actie mislukt", - "Permalink": "Permalink", - "Please Register": "Registreer alsjeblieft", - "powered by Matrix": "aangedreven door Matrix", - "Quote": "Quote", + "Permalink": "Permanente link", + "Please Register": "Registreer alstublieft", + "powered by Matrix": "mogelijk gemaakt door Matrix", + "Quote": "Citaat", "Reject": "Afwijzen", - "Remove %(name)s from the directory?": "Verwijder %(name)s uit de kamer lijst?", - "Remove": "Verwijder", - "remove %(name)s from the directory.": "verwijder %(name)s uit de kamer lijst.", - "Remove from Directory": "Verwijder uit de kamer lijst", + "Remove %(name)s from the directory?": "%(name)s uit de kamerlijst verwijderen?", + "Remove": "Verwijderen", + "remove %(name)s from the directory.": "verwijder %(name)s uit de kamerlijst.", + "Remove from Directory": "Uit de kamerlijst verwijderen", "Resend": "Opnieuw verzenden", "Riot does not know how to join a room on this network": "Riot weet niet hoe het moet toetreden tot een kamer op dit netwerk", - "Room directory": "Kamer lijst", + "Room directory": "Kamerlijst", "Room not found": "De kamer is niet gevonden", - "Search for a room": "Zoek naar een kamer", + "Search for a room": "Een kamer zoeken", "Settings": "Instellingen", "Source URL": "Bron URL", - "Start chat": "Start gesprek", + "Start chat": "Gesprek starten", "The Home Server may be too old to support third party networks": "De home server is misschien te oud om netwerken van derde partijen te ondersteunen", "There are advanced notifications which are not shown here": "Er zijn geavanceerde notificaties die hier niet worden laten zien", "The server may be unavailable or overloaded": "De server is misschien niet beschikbaar of overbeladen", @@ -95,7 +95,7 @@ "Unable to join network": "Het is mislukt om toe te treden tot dit netwerk", "Unable to look up room ID from server": "Het is mislukt om de kamer ID op te halen van de server", "Unhide Preview": "Zichtbaar maken preview", - "unknown error code": "niet bekende foutcode", + "unknown error code": "onbekende foutcode", "Unnamed room": "Kamer zonder naam", "Uploaded on %(date)s by %(user)s": "Geüpload op %(date)s door %(user)s", "View Decrypted Source": "Bekijk gedecodeerde bron", @@ -115,11 +115,77 @@ "Saturday": "Zaterdag", "Today": "Vandaag", "Yesterday": "Gisteren", - "Welcome page": "Welkom pagina", - "Drop here %(toAction)s": "%(toAction)s hier naar toe verplaatsen", + "Welcome page": "Welkomstpagina", + "Drop here %(toAction)s": "%(toAction)s hier naartoe verplaatsen", "Failed to set Direct Message status of room": "Het is mislukt om de directe berichten status van de kamer in te stellen", "Redact": "Redigeren", - "A new version of Riot is available.": "Nieuwe Riot versie is beschikbaar.", - "All Rooms": "Alle Kamers", - "Cancel": "Annuleer" + "A new version of Riot is available.": "Nieuwe Riot-versie is beschikbaar.", + "All Rooms": "Alle kamers", + "Cancel": "Annuleren", + "Safari and Opera work too.": "Safari en Opera werken ook.", + "Changelog": "Logboek van wijzigingen", + "Collapse panel": "Paneel inklappen", + "Collecting app version information": "App-versieinformatie verzamelen", + "Collecting logs": "Logboeken verzamelen", + "Describe your problem here.": "Beschrijf uw probleem hier.", + "Expand panel": "Paneel uitklappen", + "Failed to send report: ": "Rapport verzenden mislukt: ", + "Forward Message": "Bericht doorsturen", + "Hide panel": "Paneel verbergen", + " (HTTP status %(httpStatus))": "(HTTP-status %(httpStatus))", + "I understand the risks and wish to continue": "Ik begrijp de risico's en wil graag verder gaan", + "Login": "Aanmelden", + "Loading bug report module": "Bugrapporteermodule laden", + "Messages containing keywords": "Berichten die sleutelwoorden bevatten", + "Please install Chrome or Firefox for the best experience.": "Installeer Chrome of Firefox voor de beste ervaring.", + "Report a bug": "Een bug rapporteren", + "Riot Desktop on %(platformName)s": "Riot Desktop op %(platformName)s", + "Riot is not supported on mobile web. Install the app?": "Riot wordt niet ondersteund op het mobiele web. De app installeren?", + "Search": "Zoeken", + "Search…": "Zoeken…", + "Send": "Versturen", + "Send logs": "Logboeken versturen", + "Sorry, your browser is not able to run Riot.": "Sorry, uw browser werkt niet met Riot.", + "This Room": "Deze ruimte", + "Unavailable": "Niet beschikbaar", + "Unknown device": "Onbekend apparaat", + "Update": "Bijwerken", + "Uploading report": "Rapport uploaden", + "What's New": "Wat is er nieuw", + "What's new?": "Wat is er nieuw?", + "Waiting for response from server": "Wachten op antwoord van de server", + "You are Rioting as a guest. Register or sign in to access more rooms and features!": "U gebruikt Riot als gast. Registreren of aanmelden om voor meer ruimtes en functies!", + "OK": "OK", + "You need to be using HTTPS to place a screen-sharing call.": "U moet HTTPS gebruiken om een oproep met schermdelen te kunnen starten.", + "Welcome to Riot.im": "Welkom bij Riot.im", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Gedecentaliseerd en versleuteld chatten & samenwerking mogelijk gemaakt door [matrix]", + "Search the room directory": "De kamerlijst doorzoeken", + "Chat with Riot Bot": "Met Riot Bot chatten", + "Get started with some tips from Riot Bot!": "Begin met enkele tips van Riot-bot!", + "General discussion about Matrix and Riot": "Algemene discussie over Matrix en Riot", + "Discussion of all things Matrix!": "Discussie over alle Matrix-dingen!", + "Riot/Web & Desktop chat": "Riot/Web & Desktop-chat", + "Riot/iOS & matrix-ios-sdk chat": "Riot/iOS & matrix-ios-sdk-chat", + "Riot/Android & matrix-android-sdk chat": "Riot/Android & matrix-android-sdk-chat", + "Matrix technical discussions": "Technische discussies over Matrix", + "Running Matrix services": "Matrixdiensten beheren", + "Community-run support for Synapse": "Synapse-ondersteuning vanuit de gemeenschap", + "Admin support for Dendrite": "Beheerondersteuning voor Dendrite", + "Announcements about Synapse releases": "Aankondigingen over Synapse-uitgaven", + "Support for those using and running matrix-appservice-irc": "Ondersteuning voor hen die matrix-appservice-irc gebruiken en beheren", + "Building services on Matrix": "Diensten op Matrix bouwen", + "Support for those using the Matrix spec": "Ondersteuning voor hen die de Matrix-specificatie gebruiken", + "Contributing code to Matrix and Riot": "Code bijdragen aan Matrix en Riot", + "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Veel ruimtes bestaan al in Matrix, gelinkt aan bestaande netwerken (Slack, IRC, Gitter enz.) of onafhankelijk. Bekijk de kamerlijst!", + "Failed to change password. Is your password correct?": "Wachtwoord wijzigen mislukt. Is uw wachtwoord juist?", + "You have successfully set a password!": "U heeft met succes een wachtwoord ingesteld!", + "You can now return to your account after signing out, and sign in on other devices.": "U kunt nu terugkeren naar uw account nadat u bent afgemeld, en aanmelden op andere apparaten.", + "Continue": "Doorgaan", + "Please set a password!": "Stel een wachtwoord in!", + "This will allow you to return to your account after signing out, and sign in on other devices.": "Hiermee kunt u naar uw account terugkeren nadat u zich heeft afgemeld, en aanmelden op andere apparaten.", + "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s op %(osName)s", + "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Beschrijf de bug. Wat deed u? Wat verwachtte u? Wat gebeurde er in werkelijkheid?", + "Please describe the bug and/or send logs.": "Beschrijf de bug en/of verstuur logboeken.", + "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot gebrukt veel geavanceerde browserfuncties, waarvan enkele niet of experimenteel in uw webbrowser beschikbaar zijn.", + "Co-ordination for Riot/Web translators": "Coördinatie voor Riot/Web-vertalers" } From cd8dc5f178fd9d4d5adf16c0eac6eb0421474ca4 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Wed, 14 Jun 2017 09:30:08 +0100 Subject: [PATCH 06/12] Ask for email address after setting password for the first time This is so that the user can reset their password. --- .../views/dialogs/SetPasswordDialog.js | 73 ++++++++++++------- src/skins/vector/css/_components.scss | 1 + .../views/dialogs/_SetEmailDialog.scss | 36 +++++++++ 3 files changed, 83 insertions(+), 27 deletions(-) create mode 100644 src/skins/vector/css/vector-web/views/dialogs/_SetEmailDialog.scss diff --git a/src/components/views/dialogs/SetPasswordDialog.js b/src/components/views/dialogs/SetPasswordDialog.js index 47e13a1782..3e34d8b4b1 100644 --- a/src/components/views/dialogs/SetPasswordDialog.js +++ b/src/components/views/dialogs/SetPasswordDialog.js @@ -17,7 +17,42 @@ limitations under the License. import React from 'react'; import sdk from 'matrix-react-sdk'; import { _t } from 'matrix-react-sdk/lib/languageHandler'; +import Modal from 'matrix-react-sdk/lib/Modal'; +const WarmFuzzy = function(props) { + const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog'); + let title = _t('You have successfully set a password!'); + if (props.didSetEmail) { + title = _t('You have successfully set a password and an email address!'); + } + const advice = _t('You can now return to your account after signing out, and sign in on other devices.'); + let extraAdvice = null; + if (!props.didSetEmail) { + extraAdvice = _t('Remember, you can always set an email address in user settings if you change your mind.'); + } + + return +
+

+ { advice } +

+

+ { extraAdvice } +

+
+
+ +
+ ; +}; /** * Prompt the user to set a password @@ -33,13 +68,19 @@ export default React.createClass({ getInitialState: function() { return { error: null, - success: false, }; }, - _onPasswordChanged: function() { - this.setState({ - success: true, + componentWillMount: function() { + console.info('SetPasswordDialog component will mount'); + }, + + _onPasswordChanged: function(res) { + Modal.createDialog(WarmFuzzy, { + didSetEmail: res.didSetEmail, + onFinished: () => { + this._onContinueClicked(); + }, }); }, @@ -66,29 +107,6 @@ export default React.createClass({ const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog'); const ChangePassword = sdk.getComponent('views.settings.ChangePassword'); - if (this.state.success) { - return ( - -
-

- { _t('You can now return to your account after signing out, and sign in on other devices.') } -

-
-
- -
- - ); - } - return (
diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss index 4637530b56..4c4d7cc2a6 100644 --- a/src/skins/vector/css/_components.scss +++ b/src/skins/vector/css/_components.scss @@ -71,6 +71,7 @@ @import "./vector-web/views/context_menus/_MessageContextMenu.scss"; @import "./vector-web/views/context_menus/_RoomTileContextMenu.scss"; @import "./vector-web/views/dialogs/_ChangelogDialog.scss"; +@import "./vector-web/views/dialogs/_SetEmailDialog.scss"; @import "./vector-web/views/dialogs/_SetPasswordDialog.scss"; @import "./vector-web/views/directory/_NetworkDropdown.scss"; @import "./vector-web/views/elements/_ImageView.scss"; diff --git a/src/skins/vector/css/vector-web/views/dialogs/_SetEmailDialog.scss b/src/skins/vector/css/vector-web/views/dialogs/_SetEmailDialog.scss new file mode 100644 index 0000000000..588f10c9cb --- /dev/null +++ b/src/skins/vector/css/vector-web/views/dialogs/_SetEmailDialog.scss @@ -0,0 +1,36 @@ +/* +Copyright 2017 Vector Creations Ltd + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +.mx_SetEmailDialog_email_input { + border-radius: 3px; + border: 1px solid $input-border-color; + padding: 9px; + color: $input-fg-color; + background-color: $primary-bg-color; + font-size: 15px; + width: 100%; + max-width: 280px; + margin-bottom: 10px; +} + +.mx_SetEmailDialog_email_input:focus { + outline: none; + box-shadow: none; + border: 1px solid $accent-color; +} + +.mx_SetEmailDialog_email_input_placeholder { +} From 58a323b391725938dbaea0128557677807d9ae8c Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Tue, 13 Jun 2017 18:31:35 +0100 Subject: [PATCH 07/12] i18n for setting email after password flow --- src/i18n/strings/en_EN.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index cb50de9556..bdf0c08222 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -196,5 +196,7 @@ "You can now return to your account after signing out, and sign in on other devices.": "You can now return to your account after signing out, and sign in on other devices.", "Continue": "Continue", "Please set a password!": "Please set a password!", - "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices." + "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices.", + "You have successfully set a password and an email address!": "You have successfully set a password and an email address!", + "Remember, you can always set an email address in user settings if you change your mind.": "Remember, you can always set an email address in user settings if you change your mind." } From c3ef2f86d69c33c2408b02c964982984b372fe3c Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 14 Jun 2017 10:55:42 +0100 Subject: [PATCH 08/12] Merge pull request #4305 from RiotTranslateBot/weblate-riot-web-riot-web Update from Weblate. --- src/i18n/strings/de_DE.json | 4 +++- src/i18n/strings/el.json | 20 ++++++++-------- src/i18n/strings/eo.json | 46 ++++++++++++++++++++++++++++++++++++- src/i18n/strings/fr.json | 33 ++++++++++++++++++-------- 4 files changed, 83 insertions(+), 20 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index dfd84ecbd8..3a08540910 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -205,5 +205,7 @@ "This will allow you to return to your account after signing out, and sign in on other devices.": "Dies erlaubt dir, dich wieder an deinem Konto anzumelden, nachdem du dich abgemeldet hast.", "Dev chat for the Dendrite dev team": "Entwickler-Chat für das Dendrite-Entwickler-Team", "General discussion about Matrix and Riot": "Allgemeine Diskussion über Matrix und Riot", - " (HTTP status %(httpStatus))": "(HTTP Status %(httpStatus))" + " (HTTP status %(httpStatus))": "(HTTP-Status %(httpStatus))", + "You have successfully set a password and an email address!": "Du hast erfolgreich ein Passwort und eine E-Mail-Adresse gesetzt!", + "Remember, you can always set an email address in user settings if you change your mind.": "Denk daran, dass du in den Benutzereinstellungen jederzeit eine E-Mail-Adresse setzen kannst." } diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json index c060f3bdb3..333a999760 100644 --- a/src/i18n/strings/el.json +++ b/src/i18n/strings/el.json @@ -21,7 +21,7 @@ "Enable audible notifications in web client": "Ενεργοποίηση ηχητικών ειδοποιήσεων", "Enable email notifications": "Ενεργοποίηση ειδοποιήσεων μέσω μηνυμάτων ηλ. αλληλογραφίας", "Enable notifications for this account": "Ενεργοποίηση ειδοποιήσεων για τον λογαριασμό", - "Enter keywords separated by a comma:": "Πρόσθεσε λέξεις κλειδιά χωρισμένες με κόμμα:", + "Enter keywords separated by a comma:": "Προσθέστε λέξεις κλειδιά χωρισμένες με κόμμα:", "Error": "Σφάλμα", "#example": "#παράδειγμα", "Expand panel": "Μεγιστοποίηση καρτέλας", @@ -86,7 +86,7 @@ "Update": "Ενημέρωση", "Enable desktop notifications": "Ενεργοποίηση ειδοποιήσεων στην επιφάνεια εργασίας", "Error saving email notification preferences": "Σφάλμα κατά την αποθήκευση των προτιμήσεων", - "Failed to send report: ": "Απέτυχε η αποστολή της αναφοράς: ", + "Failed to send report: ": "Δεν ήταν δυνατή η αποστολή της αναφοράς: ", "Loading bug report module": "Φόρτωση μονάδας αναφοράς σφαλμάτων", "Mentions only": "Μόνο αναφορές", "Messages containing my display name": "Μηνύματα που περιέχουν το όνομα μου", @@ -167,11 +167,11 @@ "Get started with some tips from Riot Bot!": "Ξεκινήστε με μερικές συμβουλές από το Riot Bot!", "General discussion about Matrix and Riot": "Γενική συζήτηση σχετικά με Matrix και Riot", "Discussion of all things Matrix!": "Συζήτηση για όλα τα πράγματα του Matrix!", - "Riot/Web & Desktop chat": "Συνομιλία για Riot/Web & Desktop", - "Riot/iOS & matrix-ios-sdk chat": "Συνομιλία για Riot/iOS & matrix-ios-sdk", - "Riot/Android & matrix-android-sdk chat": "Συνομιλία για Riot/Android & matrix-android-sdk", + "Riot/Web & Desktop chat": "Συζήτηση για το Riot/Web & Desktop", + "Riot/iOS & matrix-ios-sdk chat": "Συζήτηση για το Riot/iOS & matrix-ios-sdk", + "Riot/Android & matrix-android-sdk chat": "Συζήτηση για το Riot/Android & matrix-android-sdk", "Matrix technical discussions": "Τεχνικές συζητήσεις σχετικά με το Matrix", - "Running Matrix services": "Εκτέλεση υπηρεσιών Matrix", + "Running Matrix services": "Χρησιμοποιώντας τις υπηρεσίες του Matrix", "Community-run support for Synapse": "Κοινοτική υποστήριξη για το Synapse", "Admin support for Dendrite": "Υποστήριξη διαχειριστή για το Dendrite", "Announcements about Synapse releases": "Ανακοινώσεις σχετικά με τις εκδόσεις του Synapse", @@ -183,8 +183,8 @@ "Implementing VoIP services with Matrix": "Υλοποίηση υπηρεσίων VoIP με το Matrix", "Discussion of the Identity Service API": "Συζήτηση σχετικά με το Identity Service API", "Contributing code to Matrix and Riot": "Συνεισφορά κώδικα στο Matrix και Riot", - "Dev chat for the Riot/Web dev team": "Συνομιλία για την ομάδα ανάπτυξης του Riot/Web", - "Dev chat for the Dendrite dev team": "Συνομιλία για την ομάδα ανάπτυξης του Dendrite", + "Dev chat for the Riot/Web dev team": "Συζήτηση με την ομάδα ανάπτυξης του Riot/Web", + "Dev chat for the Dendrite dev team": "Συζήτηση με την ομάδα ανάπτυξης του Dendrite", "Co-ordination for Riot/Web translators": "Συντονισμός για μεταφραστές του Riot/Web", "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Αρκετά δωμάτια υπάρχουν ήδη στο Matrix, συνδεδεμένα σε υπάρχοντα δίκτυα (Slack, IRC, Gitter κ.λπ) ή αυτόνομα. Ρίξτε μια ματιά στο ευρετήριο!", "Failed to change password. Is your password correct?": "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης. Είναι σωστός ο κωδικός πρόσβασης;", @@ -196,5 +196,7 @@ "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Προκειμένου να διαγνωστούν προβλήματα, τα αρχεία καταγραφής από αυτόν τον πελάτη θα σταλούν με αυτήν την αναφορά σφάλματος. Αν προτιμάτε να στείλετε μόνο το παραπάνω κείμενο, απενεργοποιήστε:", "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Με τον τρέχον περιηγητή, η εμφάνιση και η αίσθηση της εφαρμογής ενδέχεται να είναι εντελώς εσφαλμένη και ορισμένες ή όλες οι λειτουργίες ενδέχεται να μην λειτουργούν. Εάν θέλετε να το δοκιμάσετε ούτως ή άλλως μπορείτε να συνεχίσετε, αλλά είστε μόνοι σας σε ό, τι αφορά τα προβλήματα που μπορεί να αντιμετωπίσετε!", "Failed to set Direct Message status of room": "Δεν ήταν δυνατός ο ορισμός της κατάστασης Direct Message του δωματίου", - "Support for those using, running and writing other bridges": "Υποστήριξη για τους χρήστες που χρησιμοποιούν ή αναπτύσσουν εφαρμογές ενσωμάτωσης για το Matrix" + "Support for those using, running and writing other bridges": "Υποστήριξη για τους χρήστες που χρησιμοποιούν ή αναπτύσσουν εφαρμογές ενσωμάτωσης για το Matrix", + "You have successfully set a password and an email address!": "Ο κωδικός πρόσβασης και η διεύθυνση ηλεκτρονικής αλληλογραφίας ορίστηκαν επιτυχώς!", + "Remember, you can always set an email address in user settings if you change your mind.": "Να θυμάστε ότι μπορείτε πάντα να ορίσετε μια διεύθυνση ηλεκτρονικής αλληλογραφίας στις ρυθμίσεις χρήστη αν αλλάξετε γνώμη." } diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json index 9e26dfeeb6..49ccc6e60f 100644 --- a/src/i18n/strings/eo.json +++ b/src/i18n/strings/eo.json @@ -1 +1,45 @@ -{} \ No newline at end of file +{ + "A new version of Riot is available.": "Nova versio de \"Riot\" haveblas.", + "All messages": "Ĉiuj mesaĝoj", + "All messages (loud)": "Ĉiuj mesaĝoj (lauta)", + "All Rooms": "Ĉiuj babilejoj", + "Cancel": "Nuligu", + "Create new room": "Kreu novan babilejon", + "delete the alias.": "Forviŝu la alinomon.", + "Describe your problem here.": "Priskribu vian problemon ĉi-tie.", + "Direct Chat": "Rekta babilejo", + "Directory": "Dosierujo", + "Dismiss": "Eksigu", + "Download this file": "Elŝutu ĉi-tiun dosieron", + "#example": "#ekzemplo", + "Files": "Dosieroj", + "Forget": "Forgesu", + " from room": " el babilejo", + "Guests can join": "Gastoj povas aliĝi", + "Guest users can't invite users. Please register to invite.": "Gasta uzantoj ne povas inviti uzantojn. Bonvolu registri por inviti.", + "I understand the risks and wish to continue": "Mi komprenas la riskoj kaj volas daŭrigi", + "Invite to this room": "Invitu al ĉi-tiun babilejon", + "Keywords": "Ŝlosilvortoj", + "Leave": "Lasu", + "Low Priority": "Malalta prioritato", + "Messages containing my display name": "Mesaĝoj enhavantaj mia ekrano nomo", + "Messages containing keywords": "Mesaĝoj enhavantaj ŝlosilovortoj", + "Messages containing my user name": "Mesaĝoj enhavantaj mia uzantnomo", + "Messages in group chats": "Mesaĝoj en grupaj babilejoj", + "Mute": "Silentigu", + "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Bonvolu priskribi la cimon. Kion vi faris? Kion vi atendis okazi? Kion fakte okazis?", + "Please install Chrome or Firefox for the best experience.": "Bonvolu instali \"Chrome\" aŭ \"Firefox\" por la plej bona sperto.", + "Please Register": "Bonvolu registri", + "powered by Matrix": "funkciigata de \"Matrix\"", + "Quote": "Citu", + "Reject": "Malakceptu", + "Resend": "Resendu", + "Room directory": "Babilejo dosierujo", + "Room not found": "Babilejon ne trovis", + "Search": "Serĉu", + "Search…": "Serĉu…", + "Search for a room": "Serĉu por babilejon", + "Send": "Sendu", + "Start chat": "Komencu babilo", + "This Room": "Ĉi-tiu Babilejo" +} diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index c57a6d17d3..f1f2c33a6c 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -85,7 +85,7 @@ "more": "plus", "Mute": "Couper le son", "No rooms to show": "Aucun salon à afficher", - "Noisy": "Sonore", + "Noisy": "Activer le son", "Notification targets": "Appareils recevant les notifications", "Notifications": "Notifications", "Notifications on the following keywords follow rules which can’t be displayed here": "Les mots-clés suivants suivent des règles de notification qui ne peuvent être affichées ici", @@ -133,7 +133,7 @@ "A new version of Riot is available.": "Une nouvelle version de Riot est disponible.", "All Rooms": "Tous les salons", "Cancel": "Annuler", - "Changelog": "Journal des modif.", + "Changelog": "Journal des modif", "Collecting app version information": "Récupération des info de version de l’application", "Collecting logs": "Récupération des traces", "Describe your problem here.": "Décrivez votre problème ici.", @@ -159,30 +159,45 @@ "What's New": "Nouveautés", "What's new?": "Nouveautés ?", "Waiting for response from server": "En attente d’une réponse du serveur", - "You are Rioting as a guest. Register or sign in to access more rooms and features!": "Vous utilisez Riot en tant que visiteur. Enregistrez vous ou identifiez vous pour accéder à plus de salons et de fonctionnalités !", + "You are Rioting as a guest. Register or sign in to access more rooms and features!": "Vous utilisez Riot en tant que visiteur. Enregistrez-vous ou identifiez-vous pour accéder à plus de salons et de fonctionnalités !", "You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel en partage d’écran.", "OK": "OK", "Failed to change password. Is your password correct?": "Échec du changement de mot de passe. Votre mot de passe est-il correct ?", "You have successfully set a password!": "Vous avez paramétré un mot de passe avec succès !", "Continue": "Continuer", - "Please set a password!": "Veuillez paramétrer un mot de passe !", + "Please set a password!": "Veuillez définir un mot de passe !", "You can now return to your account after signing out, and sign in on other devices.": "Vous pouvez maintenant revenir sur votre compte après vous être déconnecté, et vous identifier sur d'autres appareils.", "This will allow you to return to your account after signing out, and sign in on other devices.": "Cela vous permettra de retourner sur votre compte après vous être déconnecté, et de vous identifier sur d'autres appareils.", "Welcome to Riot.im": "Bienvenue sur Riot.im", " (HTTP status %(httpStatus))": "(statut HTTP %(httpStatus))", "Login": "S'identifier", - "Chat with Riot Bot": "Discussion avec le Robot Riot", + "Chat with Riot Bot": "Discussion avec Riot Bot", "Search the room directory": "Rechercher dans le répertoire de salon", - "Get started with some tips from Riot Bot!": "Démarrer avec quelques astuces du Robot Riot !", + "Get started with some tips from Riot Bot!": "Démarrer avec quelques astuces de Riot Bot !", "Riot/Android & matrix-android-sdk chat": "Discussions Riot/Android & matrix-android-sd", "Riot/iOS & matrix-ios-sdk chat": "Discussions Riot/iOS & matrix-ios-sdk", "General discussion about Matrix and Riot": "Discussion générale sur Matrix et Riot", "Riot/Web & Desktop chat": "Discussions Riot/Web & Desktop", - "Running Matrix services": "Exécution de services Matrix", + "Running Matrix services": "Execution de services Matrix", "Admin support for Dendrite": "Support admin pour Dendrite", - "Announcements about Synapse releases": "Communiqués sur les nouvelles versions de Synapses", + "Announcements about Synapse releases": "Communiqués sur les nouvelles versions de Synapse", "Matrix technical discussions": "Discussions techniques sur Matrix", "Community-run support for Synapse": "Support communautaire sur Synape", "Support for those using and running matrix-appservice-irc": "Support pour ceux qui utilisent et exécutent matrix-appservice-irc", - "Building services on Matrix": "" + "Building services on Matrix": "Développement de services sur Matrix", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Discussion & collaboration décentralisées et encryptées propulsé par [matrix]", + "Discussion of all things Matrix!": "Discussion de tous les sujets Matrix !", + "Support for those using the Matrix spec": "Support pour les utilisateurs de la spec Matrix", + "Design and implementation of E2E in Matrix": "Définition et implémentation de la crypto dans Matrix", + "Implementing VR services with Matrix": "Implémentation de de services de réalité virtuelle avec Matrix", + "Implementing VoIP services with Matrix": "Implémentation de de services de voix sur IP avec Matrix", + "Discussion of the Identity Service API": "Discussion sur l’API du Service Identité", + "Support for those using, running and writing other bridges": "Support pour les utilisateurs, administrateurs et développeurs de passerelles", + "Contributing code to Matrix and Riot": "Contribuer à Matrix et Riot", + "Dev chat for the Riot/Web dev team": "Forum pour les discussions sur les développements de Riot/Web", + "Dev chat for the Dendrite dev team": "Forum pour les discussion sur les développements de Dendrite", + "Co-ordination for Riot/Web translators": "Coordination des traducteurs de Riot/Web", + "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Beaucoup de salons existent déjà dans Matrix, liés à des réseaux existants (Slsck, IRC, Gitter etc) ou indépendants. Jetez un oeil au répertoire !", + "You have successfully set a password and an email address!": "Vous avez configuré un mot de passe et une adresse e-mail avec succès !", + "Remember, you can always set an email address in user settings if you change your mind.": "Souvenez-vous que vous pourrez toujours définir une adresse e-mail dans la configuration utilisateur si vous changez d’avis." } From f9795232e092e5509204f9b482c70f5c3cfe5f18 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 14 Jun 2017 11:19:43 +0100 Subject: [PATCH 09/12] react-sdk 0.9.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 51c366b1e6..429737faf4 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "highlight.js": "^9.0.0", "linkifyjs": "^2.1.3", "matrix-js-sdk": "0.7.11", - "matrix-react-sdk": "0.9.3", + "matrix-react-sdk": "0.9.4", "modernizr": "^3.1.0", "pako": "^1.0.5", "q": "^1.4.1", From 9325eef650a6483c906c3093d45dfce3bfc5a8de Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 14 Jun 2017 11:20:05 +0100 Subject: [PATCH 10/12] v0.11.1 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 0e08efd5c7..35ea86a116 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.11.0", + "version": "0.11.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 90cff5d7bf69883afd66c5cbb95ced13b960dd00 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 14 Jun 2017 11:21:27 +0100 Subject: [PATCH 11/12] Prepare changelog for v0.11.1 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28b978c544..d8a39fd688 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +Changes in [0.11.1](https://github.com/vector-im/riot-web/releases/tag/v0.11.1) (2017-06-14) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.0...v0.11.1) + + * Update to react-sdk 0.9.4 to prompt to set an + email address when setting a password and make + DM guessing smarter. + Changes in [0.11.0](https://github.com/vector-im/riot-web/releases/tag/v0.11.0) (2017-06-12) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.0-rc.2...v0.11.0) From 4edd21ba8ae75369573c53769c032f529f9417ad Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 14 Jun 2017 11:21:27 +0100 Subject: [PATCH 12/12] v0.11.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 429737faf4..ec4b827d38 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.11.0", + "version": "0.11.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "repository": {