Regenerate translation files (FedoraQt#652)

src/app/data/org.fedoraproject.MediaWriter.appdata.xml

@@ -71,7 +71,7 @@
  <summary xml:lang="pl">Narzędzie do tworzenia dysków USB typu Live z Fedorą</summary>
  <summary xml:lang="pt">Uma ferramenta para criar uma unidade USB "live" com uma edição do Fedora</summary>
  <summary xml:lang="pt-br">Uma ferramenta para criar uma unidade live USB com uma edição do Fedora</summary>
- <summary xml:lang="ru">Инструмент для создания live USB-накопителя с версией Fedora</summary>
+ <summary xml:lang="ru">Инструмент для создания Live USB-накопителя с Fedora</summary>
  <summary xml:lang="sk">Nástroj na vytváranie live USB diskov s niektorou edíciou Fedory</summary>
  <summary xml:lang="sl">Orodje za kreiranje živega pogona USB z izdajo Fedore</summary>
  <summary xml:lang="sq">Një mjet për krijim diskthi USB live me një version Fedora</summary>
@@ -110,7 +110,7 @@
  <p xml:lang="pl">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.</p>
  <p xml:lang="pt">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.</p>
  <p xml:lang="pt-br">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.</p>
- <p xml:lang="ru">Инструмент для создания загрузочных live USB-накопителей с версией Fedora. Fedora Media Writer может не только записать образ на флэш-накопитель, но и загрузить его. Предлагаются официальные версии (Server, Workstation), сборки Fedora (KDE Plasma Desktop, Xfce Desktop, Cinnamon Desktop,...) и Fedora Labs (Design Suite, Security Lab,...). Предоставляется основная информация по каждому из них, помогающая сделать правильный выбор.</p>
+ <p xml:lang="ru">Инструмент для создания загрузочных Live USB-накопителей с версией Fedora. Fedora Media Writer может не только записать образ на флеш-накопитель, но и загрузить его. Предлагаются официальные версии (Server, Workstation), Fedora Spins (KDE Plasma Desktop, Xfce Desktop, Cinnamon Desktop,...) и Fedora Labs (Design Suite, Security Lab,...). Предоставляется основная информация по каждому из них, помогающая сделать правильный выбор.</p>
  <p xml:lang="sk">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.</p>
  <p xml:lang="sl">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.</p>
  <p xml:lang="sq">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.</p>

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)
  }
  }

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
  }

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)
 }