From 1e0fe3bb6659bdfe07e13cd35867ed1dc66ff0b1 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 19 Sep 2023 09:18:04 +0200 Subject: [PATCH] Regenerate translation files (#652) --- .../org.fedoraproject.MediaWriter.appdata.xml | 4 +- src/app/qml/DrivePage.qml | 3 +- src/app/qml/MainPage.qml | 1 - src/app/qml/main.qml | 70 +++++++++++++++++- src/translations/fi.qm | Bin 22131 -> 22133 bytes src/translations/ka.qm | Bin 21819 -> 21923 bytes src/translations/ru.qm | Bin 21927 -> 21923 bytes 7 files changed, 73 insertions(+), 5 deletions(-) diff --git a/src/app/data/org.fedoraproject.MediaWriter.appdata.xml b/src/app/data/org.fedoraproject.MediaWriter.appdata.xml index cc63df29..3963218f 100644 --- a/src/app/data/org.fedoraproject.MediaWriter.appdata.xml +++ b/src/app/data/org.fedoraproject.MediaWriter.appdata.xml @@ -71,7 +71,7 @@ Narzędzie do tworzenia dysków USB typu Live z Fedorą Uma ferramenta para criar uma unidade USB "live" com uma edição do Fedora Uma ferramenta para criar uma unidade live USB com uma edição do Fedora - Инструмент для создания live USB-накопителя с версией Fedora + Инструмент для создания Live USB-накопителя с Fedora Nástroj na vytváranie live USB diskov s niektorou edíciou Fedory Orodje za kreiranje živega pogona USB z izdajo Fedore Një mjet për krijim diskthi USB live me një version Fedora @@ -110,7 +110,7 @@

Narzędzie do tworzenia dysków USB typu Live z Fedorą. Fedora Media Writer może zapisywać obrazy na dyskach USB i je pobierać. Oferuje oficjalne edycje (Server, Workstation), dodatkowe obrazy (KDE Plasma, Xfce, Cinnamon…) i obrazy z Fedora Labs (Design Suite, Security Lab…). Dostarcza podstawowe informacje o obrazach, aby pomóc dokonać właściwego wyboru.

Uma ferramenta para criar uma unidade USB de arranque "live" com uma edição do Fedora. O Fedora Media Writer não só pode gravar uma imagem na sua unidade USB, mas esta também pode transferi-las para si. Esta oferece edições oficiais (Servidor, Estação de trabalho), "spins" do Fedora (KDE Plasma Desktop, Xfce Desktop, Cinnamon Desktop,...), e Fedora Labs (Design Suite, Security Lab,...). Esta fornece informação básica sobre cada uma delas para ajudá-lo a fazer a escolha certa.

Uma ferramenta para criar dispositivos inicializáveis live USB com uma edição do Fedora. Não só o Fedora Media Writer pode gravar uma imagem em sua unidade flash, como também pode baixá-la para você. Ele oferece edições oficiais (Server, Workstation), Fedora spins (KDE Plasma Desktop, Xfce Desktop, Cinnamon Desktop, ...) e Fedora Labs (Design Suite, Security Lab, ...). Ele fornece informações básicas sobre cada um deles para ajudá-lo a fazer a escolha certa.

-

Инструмент для создания загрузочных live USB-накопителей с версией Fedora. Fedora Media Writer может не только записать образ на флэш-накопитель, но и загрузить его. Предлагаются официальные версии (Server, Workstation), сборки Fedora (KDE Plasma Desktop, Xfce Desktop, Cinnamon Desktop,...) и Fedora Labs (Design Suite, Security Lab,...). Предоставляется основная информация по каждому из них, помогающая сделать правильный выбор.

+

Инструмент для создания загрузочных Live USB-накопителей с версией Fedora. Fedora Media Writer может не только записать образ на флеш-накопитель, но и загрузить его. Предлагаются официальные версии (Server, Workstation), Fedora Spins (KDE Plasma Desktop, Xfce Desktop, Cinnamon Desktop,...) и Fedora Labs (Design Suite, Security Lab,...). Предоставляется основная информация по каждому из них, помогающая сделать правильный выбор.

Nástroj na vytváranie spúšťateľných live USB diskov s niektorou edíciou Fedory. Fedora Media Writer dokáže nielen zapísať obraz na váš USB kľúč, ale ho pre vás aj stiahnuť. Ponúka oficiálne edície (Server, Workstation), Fedora spiny (Pracovné prostredie KDE, Xfce, Cinnamon, ...) a Laboratóriá Fedora (Design Suite, Security Lab, ...). Poskytuje taktiež základné informácie o každej edícii, aby ste si mohli vybrať tú správnu.

Orodje za ustvarjanje živega zagonskega pogona z izdajo Fedore. Ne samo, da lahko Fedora Media Writer napiše sliko na vaš pogon, ampak jo lahko tudi prenese za vas. Ponuja uradne izdaje (strežnik, delovna postaja), Fedora Spins (KDE Plasma Desktop, XFCE Desktop, Cinnamon Desktop, ...) in Fedora Labs (Design Suite, Security Lab, ...). Ponuja osnovne informacije o vsaki od njih, ki vam bodo pomagale pravilno izbirati.

Një mjet për krijim diskthi USB live me një version Fedora. Fedora Media Writer jo vetëm që mund të shkruajë një pamje te diskthi juaj, mundet edhe ta shkarkojë atë për ju. Ju ofron versione zyrtare (Server, Workstation), degëzime Fedora(Desktop KDE Plasma, Desktop Xfce, Desktop Cinnamon,…), dhe Fedora Labs (Design Suite, Security Lab,...). Furnizon të dhëna bazë rreth secilit prej tyre për t’ju ndihmuar të bëni zgjedhjen e duhur.

diff --git a/src/app/qml/DrivePage.qml b/src/app/qml/DrivePage.qml index 8fade12a..a3bbfc31 100644 --- a/src/app/qml/DrivePage.qml +++ b/src/app/qml/DrivePage.qml @@ -26,7 +26,7 @@ import QtQuick.Dialogs 6.2 Page { id: drivePage - + ColumnLayout { anchors.fill: parent spacing: units.gridUnit @@ -107,6 +107,7 @@ Page { Connections { target: portalFileDialog function onFileSelected(fileName) { + mainWindow.fileName = fileName releases.selectLocalFile(fileName) } } diff --git a/src/app/qml/MainPage.qml b/src/app/qml/MainPage.qml index b880e993..a916de64 100644 --- a/src/app/qml/MainPage.qml +++ b/src/app/qml/MainPage.qml @@ -65,7 +65,6 @@ Page { text: qsTr("Select .iso file") onClicked: { selectedOption = Units.MainSelect.Write - releases.selectLocalFile("") } ButtonGroup.group: radioGroup } diff --git a/src/app/qml/main.qml b/src/app/qml/main.qml index 5a2e228d..6065f623 100644 --- a/src/app/qml/main.qml +++ b/src/app/qml/main.qml @@ -36,6 +36,7 @@ ApplicationWindow { property int selectedOption: Units.MainSelect.Download property QtObject lastRestoreable property bool eraseVariant: false + property string fileName: "" ColumnLayout { id: mainLayout @@ -138,7 +139,6 @@ ApplicationWindow { StateChangeScript { script: { //reset of source on versionPage - selectedOption = Units.MainSelect.Download releases.filterSource = 0 if (stackView.depth > 1) { while (stackView.depth != 1) { @@ -315,5 +315,73 @@ ApplicationWindow { return qsTr("Cancel") return qsTr("Previous") } +<<<<<<< HEAD +======= + + function setNextPage() { + if (selectedPage == Units.Page.MainPage) { + if (selectedOption == Units.MainSelect.Write) { + if (releases.localFile.iso) + releases.selectLocalFile(fileName) + selectedPage = Units.Page.DrivePage + } else if (selectedOption == Units.MainSelect.Restore && drives.lastRestoreable) + selectedPage = Units.Page.RestorePage + else if (selectedOption == Units.MainSelect.Download) + selectedPage = Units.Page.VersionPage + } else if (selectedPage == Units.Page.VersionPage) { + selectedPage += 1 + } else if (selectedPage == Units.Page.DrivePage) { + selectedPage = Units.Page.DownloadPage + if (selectedOption != Units.MainSelect.Write) + releases.variant.download() + if (drives.length) { + drives.selected.setImage(releases.variant) + drives.selected.write(releases.variant) + } + } else if (selectedPage == Units.Page.DownloadPage) { + if (releases.variant.status === Units.DownloadStatus.Finished) { + drives.lastRestoreable = drives.selected + drives.lastRestoreable.setRestoreStatus(Units.RestoreStatus.Contains_Live) + releases.variant.resetStatus() + downloadManager.cancel() + selectedPage = Units.Page.MainPage + } else if ((releases.variant.status === Units.DownloadStatus.Failed && drives.length) || releases.variant.status === Units.DownloadStatus.Failed_Download || (releases.variant.status === Units.DownloadStatus.Failed_Verification && drives.length) || releases.variant.status === Units.DownloadStatus.Ready) { + if (selectedOption != Units.MainSelect.Write) + releases.variant.download() + drives.selected.setImage(releases.variant) + drives.selected.write(releases.variant) + } + } else { + if (lastRestoreable && lastRestoreable.restoreStatus == Units.RestoreStatus.Restored) + selectedPage = Units.Page.MainPage + else + drives.lastRestoreable.restore() + } + } + + function setPreviousPage() { + if (selectedPage == Units.Page.MainPage) + aboutDialog.show() + else if (selectedPage == Units.Page.VersionPage) + selectedPage -= 1 + else if (selectedPage == Units.Page.DrivePage) { + if (selectedOption == Units.MainSelect.Write) + selectedPage = Units.Page.MainPage + else { + selectedPage -= 1 + stackView.pop() + } + } else if (selectedPage == Units.Page.DownloadPage) { + if (releases.variant.status === Units.DownloadStatus.Write_Verifying || releases.variant.status === Units.DownloadStatus.Writing || releases.variant.status === Units.DownloadStatus.Downloading || releases.variant.status === Units.DownloadStatus.Download_Verifying) { + cancelDialog.show() + } else { + releases.variant.resetStatus() + downloadManager.cancel() + mainWindow.selectedPage = Units.Page.MainPage + } + } else + selectedPage = Units.Page.MainPage + } +>>>>>>> 2abdae7 (Add remembering of main select and file name) } diff --git a/src/translations/fi.qm b/src/translations/fi.qm index af69f3c6a4d4f942a8092b19c3cfff84fa439864..2e6932fb35e5367e591ccdf6c18300e8ff27107e 100644 GIT binary patch delta 1109 zcmXw&eN0nl6vm(1+uM8F-nJqiT{mO-w2W;vXu%b6u0YFIg}OPm>D*w-LeXI}WDD6w z*=NLVKvz+84VhHUG}!1m`Gc`7qTrB7kxAT$E^c#SAq1nyBqoj>bF+K@_~m`?x#yhs zInO)S!_4jo;q1Aw^_FO3|eeEYH4^E_bJp~L- zYs|nCK3toj59@!z{2?vCEimq598f&Kc<%avyhSFg7z7Ho`zMUvaarhP3R=5UcI52| zASq4OS27ADPRsi4^a1)I*^sprNFI@BvPiTSvC9VZKvp-KlVAhnlWdWt3dm_^0UN@BlZ?sRChsinC+VW{uV-T^Rwo~GbpqwrIpr}bn$jyV{V|EzOC>s3 z?#;L|%2Lej`SJ>7RdRnNYe_PXMnUGiRl+4I@Tz*F!9u+ zMpSHn5T?^~1-8oc29+Y1-2^;4sTkW#lTBMCF}*zSxlF&&%FDeJ8yDrdKdkhRjZc1V z6ma@^)49u(jOBAD=n#oJBxc;^3tTkkmCd~8o*DG;t!M?-+~@t1Ka&rZ2j*o)Z<}EG z>;uyGoKRdlM=?i*#vt*j>%zW&zoj`ig(FQQSZuY>Q&k2Sb_oM@+kpJN!o^;itE)!1 z#72l&!jz8I8FpcMTRqM7J!N-rp+(Yyh&IYUW*P*RVpJ7o>IhdUbbO z22ePxJ|Fx9u*8V+Lw53NzL*rUkyv|0^B23xejahdR2{G)U99=_0#(~0x-Wf59zG$l z+$Vk-EdVkX#g*7=Y hUtu?@=&i#J?20&+G{fL9B?Bp-GV2CPLOp=36fa&lNbwr6uIf1;KMtk!$AQ)B;k(%eEG)&g$3wupeK>XD1zNk3 z(N}H*9;?Ci3Hq?SAJd1706)X{Pw;^I2c~MO0mz+YLfSqcZ$rbVB@ofHttHWt3eB;% zM}b7Erpq%7B;3+;-R%NQ{hEGz9gsArGIgQKd?y>}d0C$yLndt*^-eW6X zBE5B-JtI)kM<>`w_tSu(nZ5jN8J(t=z0wv7IF_(u_iqDwM-%(^*>h%H*(N3T$EZf){c6F_pi%CtU}&MfVECXR}X zlC-bQhUhdwu8EERcG4U?;<0LKSWKDN;VS~nZ;CyY8-W#j#q;0LT)msb zAvR20B#z0nPG2F8Z`@3CeMi?CCRawwx-gRkIKR|&o2eSx9^GX}47t>$XNKpHPJd3% z=QdGUpX>JtG{}`_^+%S508fTKJoq!PYKL-$wFD~lvl&}~Y>$C?m&!G#7;=NOE?#D6 z-JcG)1`NHyT|lNRafkBBs}3o#%|XrjSh9V(h3r=;6^>N`DJfFhp2fIQr; zvbaXtJ(34x%t|$P9xy1KjQ<{(Ymx?!8Uam`TX~+d1g4@I%0~d{bd+-P2pQ**sNfog zWSfoFozxvq#OS7LqSeEs|%)QuKn{b_P@PLA=rL<%FDjkiiZr0#B$Urn5*+abvQ zNQkbGT^<>yvR3^gUutB5MUs5ePx0-FpIlW#JM6<)gYDr-ZbmQ1!;3P!g{|~%flrx| cm&x<~zZZ5!?~FC*Q2^fq34Gy;^IJ3i11iKZF#rGn diff --git a/src/translations/ka.qm b/src/translations/ka.qm index 7f7e4db78ee751b27f2bea12e22d441a89393fe0..8fe30ef8fe291a75c727932169def1150f8ed8a1 100644 GIT binary patch delta 1248 zcmah{dr(w$6#nkMynFZV-78O#6%cR{S(af1MO=Afii;pcX)Xe2*3KK;GqT5!2QQO(YV}Gs}K(0-5KS!n#@#eUF)1>;cSIm?;O@^b(ox0Pz+a zmg%PnxB8@PFvJe5vdE@iA%E%K`m@1RPWi^Ktia;U@{Q+=Ktz%JsSk*hutna~(FhnH zlOJjJ03j3d&I${#@V5NyKJtCH%g=wJ2OgTM2=yMOro0r1JBhcdMX_d{9SA?KaOhfy zr&nr+2tQw=6q_4?6}8IzIW}O~Ze^vfm4@@GQ#y`QAo-B8dXo`IeNwsifE~!NE1Syt zXhqLR)l6{em@3?*2mGK)c(V)$?olQBT7WEn)s`BPS^18tbc|RrFREUC%LW9FsmgcO z(vBXe4k_J0T!}QnBv(0DbC3rx&9G@MBd}&0yLQ`Msx{8$j}tmnVr?5J9?-xZY;cm= z5Zii-)GQ5b7vDk~EMWVi$WQ%)y%9@!!x!vSfF6iyP>0O$KxDppSKcrn?pN>GLwQ-X z`q&OTE$ObhV}@|tk{q?G(grN*mRe<|st86s(`E&dVmQ@3H(lf=r`b$(;?Hn#(*(2j za7mvNZw0tK&O&`ha*jeLEpH`PlScJ?(zzp%wRHI$?!=BVlD*IM9w1&u7k8n57U$wF zr8LqJc5}D8$wtp;V%i87%W8HhtnfzSKFzmJkibH{=FX$TB(Pn2R_^Mlkt?1SwkKUu6)2ekIvhvk+5hr)fVGivOJT-w-PD z3GHnWs@Lmjdjmq#ca%3(3y1fUU2YP-p0v?*1BHn@PC&m~_~mz=+HMmbbdw)ls!Kmb zI_y&2BV%Oaj_Mu{wE)@4y21-Bq(7o7n*H}8vcJ@|8yksmQ0IDA53JACU6K)D?en_t zO$5v=-wNb*wNENG1^FAr>*7`VzM*$m927^zA#p^!EY*e0ms+!Y+Mf$EMFblD9VFgF zNPAP3iHS915n>Td8Wa+5k&c^mM#Vw$-2bRvr+18Em&G5&YvNTYWu2c?Y7Gxa`7fq4 WxGq3?DZyJRu$uoL)$X!7*uMeH0eR8@ delta 1094 zcmW+!dr(w$7(MsygS&U{1Az_5mB*?evMkC=!UcIIFbfDpL2ZTE%!1NPqp1J-c6orr;u8gdyT8W076~v+ z!aK461pLDo)>Q+6vrLSMOcIuvr0HQG=M$!)$wj8`GK-tMK->_s=%AQY$m+f$-MV&G zzf8PGkFei|*@098yL^~%{L3dUg*wkD$}U@gO&N-^D@Gu4r((|;5+&y=+6GzyW2&N~ z(+h-6CqOi!jalm>qfHRY#FsUuzLNo8)39oW#PbjUrVV^!jh z#D7?;^6hM;3HPf?eXKx|O;xM2&~ScDDn~ax>^P!oC^rHbxvICC?LhYPsAMw(8&sEnO1=LMyQ&4 zoz@a9yy~3<{GJiI91Ao~y3m_!2h!VxzI=gfyM;j?GmUK%K9{Sh{1)NMLE?wZ3S*5F z0b%|S@pI-x=`k0u`LI}Yjregc(U$F@Iz?jTdM_RAtXTQd1m%nFi=J#2upybP7_)-(E7g<|+utlT z6zXYv7o@i9lsD~@+D}p379jmFZ>8%p(%jN8pnpxe^RGZ{pO*d`B^*;MXI&&8E?$0o zhGK$Ce#&5`t6Y~W#(T(rRNlS%_aY0*<$hx;3F_pL(|Vxbcljzyf;=DjXA==~tX06S z;{JJMd5F6?EYN*xV?h7W^`=Po$9ZcWfP48ohLN+-mHPC~$E90|=Ep ADF6Tf diff --git a/src/translations/ru.qm b/src/translations/ru.qm index 9327de3b0bf7b04d5b873c8418e985a9fb188a63..06c7f364a2fffad4d90863cf07112611f18a9e2f 100644 GIT binary patch delta 1452 zcmZ`(YfzMB7(L&9?|0d6Zzwkz7v&n45)@eibVP`S1y*DNsfYr+G(f2vN{mywsVSPc zqN|C@n6jpkx?VPGBrg-9jXDC^GDeYU%4p_jlIAoG(qsFlKkc8h@9y_J&pGEg@3(J1 z=i1LT8|}Lx#5jQ$3Lsb?0yC#VC^Z8?0X__mLde-IC4~L=4=eKQfGXv|SH~5nRn)0kC*E+ry1O)>6(bo+ZM)T)$%)5NuUdwqygE z*HrHvr04ZNtDFap0Lg7C*DG{R->cg5P9G57sOre?CbX(LhB|;TDXMd64%iVn{@*W% z8RNt3Hs077447u~=|P!*VB{^yRY2NhzP8)}L{;*~Bq9`dnD0G71hkC5^3^<2`X~Rr zD*%}OHGga59*`NyKREpvDNp48T1$fi(pX?L2LzsCahJa(hlg0fonv+&qLRJwcq@?bs^y3=vM=x(;!dWwh)vX;CPw2}wx(|i8pNCWFF zY9S({1od7b92MomSbrayygoG73-bdCX-=-NW{2HNyE-EbM(AlblZ6q@Q9vFR)gM%l zrH91mBX@!5P9MhZ@S*vT_$n6&=!(R-!)|h-RIE=J2l)LiuB>eU#`lOD2J3;a6=G}3 zGIFFu>@A}VMc4T-c81s=)JV>G#6kNc3RPIXI9xUh$bC~{c4`5}bn0_Y<--~gWAByIfRJ7B^!=}J8j(5;sS zGsv;gvK+i(H|^dgM?I~ZSRmVzo0d~ZbaGzpAEZ23UeZc9!6k2g@;PN-w7h58RkHp^ z`9M`65Yi`iE|^0hd?H`?fgmdIu20F)$$am%}qLq5pZ5|Tlw^Z%nOcZXl z`a}o~Oqi*@lIc&kXP?4#k0OV|?TV1Kg&1cj>m&+M?oZ0jscs-IQ}LX?4CF6VyzQhQ zbga_fu@W#YSANS;lf@q@cio#Qh1INUE#atszdrJPa}j^_(x?>{K)t3glV?gv4rlOV!F0@^#+ig!&Zb#o{{f delta 1435 zcmZuxYfKbZ7(KId=dru9yCN)zMP-qP(DD>e)T&E)EU+N03e{2+Ee%V3AWE&#y7gUS zi{hXK-B=ZC#m7dv(x#|2qSUAn&|)pd7^@-;wHRL^O{4as`?r%!&fJ-M?|07m&YgxM z+_y)#Z9z^Cga{RQYbFHyGhkXOgo1RyKirF!WCXS)0^@fhbLV*=_Z+g5cL3Uru-DH6 zLPak|40tigjRJQo5EF-YFW1w4?U-FL9Y|Y_;%(mm`6^28HvkEtSpJ3^aE^+_vCD-( z#;0g2iveD@;?_g@FeM7lcNqaOk#igr0NYKj;#m!lx`lI#ZAAE2uDg0N5Kyd{TbBmt z7i(4>qxr_i8ue%ska%3vFpI_$PG}B%d>ydVYg)3~35zu?Pg;OsHqFl|)o@~T{C^LK zi1K3EAwH-z07$CfC-_?dVI*%$ECEvP@a09-q_~oAmWWVfE8lsF2q^yijgzIM^d*$7c?c@+AK6%~aSghnd4Tz}(3quU#eLjOFw-JAsf&_Tj)+K&+9K z-?|OhFR{wH6@YIetE?vreM8Wb#jHzcRRbNS679e5F_ z)#S)Lv2!+MC~UnK$IKDC{Wpr6K(KsZ^=-2L zFZpOm9uU|ow=SAbRx9$Q?T!zEF; zP1;j|R50d!?G39hIsBuJYxg0C$2xUF>JDO@tJ@+`h%)c#_DpgES(!S|#cM!zm9DFi z6pV=0b+@bof>hm~8CtT~rF-bErIZ)wUc^@c$su}fB?$@Kqfd3wIB%(b|JEqlkJF!b zZJ>Duh3!fwg8wL%1}lZ}i4wDY8Jz~_9VNGS5fC1ylyzSqA_m2AWi6%tffw`Il#Ly9 zyy7n?n;#8gxzZR!R{FoKT-<9UrOgKY`B>`Z0z+BFWpePOp=>)j=2K%>oKJ%CLJT!! z9n^xM2DNbyg*C_En!(Zf)5g)Ck)uUfUB-+j#ALk1xZu(~Vz|V(?KmC3l*7i;7Aj!c zVEm(ilt&ku=31UptEQVAoo@Ocl$tvFh;VklsjHT!A4;F;zJm&+_&O-br|At}tUh8{ z+yeDY-DtH)*ro1^8?Fu!>ov@(UQHP0IV)!I+$S_APJ_WoQEI6Wq!uS=J*#v-M3}?b z2sW7|upE|zV8SFem03OZguQ0-u>bp{3bwg?C>yC3iXonAn@g`(m>-K{6PcaaJY#2M jaN!CIpchlvcxGjGc`&ac-9lldV_B(0Pi$d{V-fc+ntpy7