diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts index 5c7f69fd1..c31cde6d6 100644 --- a/lang/calamares_ca.ts +++ b/lang/calamares_ca.ts @@ -346,7 +346,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. Go &back - Vés &enrere + Ves &enrere diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts index b95f9c596..ad5f7cf6b 100644 --- a/lang/calamares_da.ts +++ b/lang/calamares_da.ts @@ -107,7 +107,7 @@ Set up - + Sæt op @@ -267,7 +267,7 @@ The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + %1-opsætningsprogrammet er ved at foretage ændringer til din disk for at opsætte %2.<br/><strong>Det vil ikke være muligt at fortryde ændringerne.</strong> @@ -303,7 +303,8 @@ Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Vil du virkelig annullere den igangværende opsætningsproces? +Opsætningsprogrammet vil stoppe og alle ændringer vil gå tabt. @@ -414,7 +415,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. Gathering system information... - Indsamler systeminformation... + Indsamler systeminformation ... @@ -465,7 +466,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + %1 vil blive skrumpet til %2 MiB og en ny %3 MiB partition vil blive oprettet for %4. @@ -708,12 +709,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. Create new %2MiB partition on %4 (%3) with file system %1. - + Opret en ny %2 MiB partition på %4 (%3) med %1-filsystem. Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Opret en ny <strong>%2 MiB</strong> partition på <strong>%4</strong> (%3) med <strong>%1</strong>-filsystem. @@ -1106,12 +1107,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <h1>Færdig.</h1><br/>%1 er blevet opsat på din computer.<br/>Du kan nu begynde at bruge dit nye system. <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <html><head/><body><p>Når boksen er tilvalgt, vil dit system genstarte med det samme når du klikker på <span style="font-style:italic;">Færdig</span> eller lukker opsætningsprogrammet.</p></body></html> @@ -1121,7 +1122,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <html><head/><body><p>Når boksen er tilvalgt, vil dit system genstarte med det samme når du klikker på <span style="font-style:italic;">Færdig</span> eller lukker installationsprogrammet.</p></body></html> @@ -1167,12 +1168,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Formatér partition %1 (filsystem: %2, størrelse: %3 MiB) på %4. Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatér <strong>%3 MiB</strong> partition <strong>%1</strong> med <strong>%2</strong>-filsystem. @@ -1190,22 +1191,22 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. has at least %1 GiB available drive space - + har mindst %1 GiB ledig plads på drevet There is not enough drive space. At least %1 GiB is required. - + Der er ikke nok ledig plads på drevet. Mindst %1 GiB er påkrævet. has at least %1 GiB working memory - + har mindst %1 GiB hukkommelse The system does not have enough working memory. At least %1 GiB is required. - + Systemet har ikke nok arbejdshukommelse. Mindst %1 GiB er påkrævet. @@ -1230,7 +1231,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. The setup program is not running with administrator rights. - + Opsætningsprogrammet kører ikke med administratorrettigheder. @@ -1256,7 +1257,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. OEM Batch Identifier - + OEM-batchidentifikator @@ -1476,7 +1477,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. &Change... - &Skift... + &Skift ... @@ -1489,7 +1490,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. Loading location data... - Indlæser placeringsdata... + Indlæser placeringsdata ... @@ -1533,17 +1534,17 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. Ba&tch: - + Ba&tch: <html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html> - + <html><head/><body><p>Indtast en batchidentifikator her. Det gemmes på målsystemet.</p></body></html> <html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html> - + <html><head/><body><h1>OEM-konfiguration</h1><p>Calamares bruger OEM-indstillingerne under konfigurering af målsystemet.</p></body></html> @@ -1556,7 +1557,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. Set the OEM Batch Identifier to <code>%1</code>. - + Indstil OEM-batchidentifikatoren til <code>%1</code>. @@ -2040,7 +2041,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. Gathering system information... - Indsamler systeminformation... + Indsamler systeminformation ... @@ -2500,12 +2501,12 @@ Output: Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>. - + Ændr størrelse af <strong>%2 MiB</strong> partition <strong>%1</strong> til <strong>%3 MiB</strong>. Resizing %2MiB partition %1 to %3MiB. - + Ændrer størrelsen på %2 MiB partition %1 til %3 MiB. @@ -2545,17 +2546,17 @@ Output: This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + Computeren imødekommer ikke minimumsystemkravene for at opsætte %1.<br/>Opsætningen kan ikke fortsætte. <a href="#details">Detaljer ...</a> This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - Computeren imødekommer ikke minimumsystemkravene for at installere %1.<br/>Installationen kan ikke fortsætte. <a href="#details">Detaljer...</a> + Computeren imødekommer ikke minimumsystemkravene for at installere %1.<br/>Installationen kan ikke fortsætte. <a href="#details">Detaljer ...</a> This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + Computeren imødekommer ikke nogle af de anbefalede systemkrav for at opsætte %1.<br/>Opsætningen kan fortsætte, men nogle funktionaliteter kan være deaktiveret. @@ -2583,7 +2584,7 @@ Output: Scanning storage devices... - Skanner lagerenheder... + Skanner lagerenheder ... @@ -2661,7 +2662,7 @@ Output: Set flags on %1MiB %2 partition. - + Sæt flag på %1 MiB %2 partition. @@ -2676,22 +2677,22 @@ Output: Clear flags on %1MiB <strong>%2</strong> partition. - + Ryd flag på %1 MiB <strong>%2</strong> partition. Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Flag %1 MiB <strong>%2</strong> partition som <strong>%3</strong>. Clearing flags on %1MiB <strong>%2</strong> partition. - + Rydder flag på %1 MiB <strong>%2</strong> partition. Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Sætter flag <strong>%3</strong> på %1 MiB <strong>%2</strong> partition. @@ -2837,7 +2838,7 @@ Output: This is an overview of what will happen once you start the setup procedure. - + Dette er et overblik over hvad der vil ske når du starter opsætningsprocessen. @@ -2961,7 +2962,7 @@ Output: <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>Hvis mere end én person bruger computeren, kan du oprette flere konti efter opsætningen.</small> diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts index dd7fc3523..919a4d03e 100644 --- a/lang/calamares_de.ts +++ b/lang/calamares_de.ts @@ -107,7 +107,7 @@ Set up - + Einrichten @@ -466,7 +466,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + %1 wird auf %2MiB verkleinert und eine neue Partition mit einer Größe von %3MiB wird für %4 erstellt werden. @@ -709,12 +709,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Create new %2MiB partition on %4 (%3) with file system %1. - + Erstelle eine neue Partition mit einer Größe von %2MiB auf %4 (%3) mit dem Dateisystem %1. Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Erstelle eine neue Partition mit einer Größe von <strong>%2MiB</strong> auf <strong>%4</strong> (%3) mit dem Dateisystem <strong>%1</strong>. @@ -1168,12 +1168,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Formatiere Partition %1 (Dateisystem: %2, Grösse: %3 MiB) auf %4. Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Formatiere <strong>%3MiB</strong> Partition <strong>%1</strong> mit Dateisystem strong>%2</strong>. @@ -1191,22 +1191,22 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. has at least %1 GiB available drive space - + mindestens %1 GiB freien Festplattenplatz hat There is not enough drive space. At least %1 GiB is required. - + Der Speicherplatz auf der Festplatte ist unzureichend. Es wird mindestens %1 GiB benötigt. has at least %1 GiB working memory - + mindestens %1 GiB Arbeitsspeicher hat The system does not have enough working memory. At least %1 GiB is required. - + Das System hat nicht genug Arbeitsspeicher. Es wird mindestens %1GiB benötigt. @@ -1257,22 +1257,22 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. OEM Batch Identifier - + OEM Chargenkennung Could not create directories <code>%1</code>. - + Es konnten keine Verzeichnisse <code>%1</code> erstellt werden. Could not open file <code>%1</code>. - + Datei <code>%1</code> konnte nicht geöffnet werden. Could not write to file <code>%1</code>. - + Konnte nicht in die Datei <code>%1</code> schreiben. @@ -1534,17 +1534,17 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Ba&tch: - + S&tapel: <html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html> - + <html><head/><body><p>Geben Sie hier eine Chargenkennung ein. Diese wird im Zielsystem gespeichert.</p></body></html> <html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html> - + <html><head/><body><h1>OEM-Konfiguration</h1><p>Calamares verwendet OEM-Einstellungen bei der Konfiguration des Zielsystems.</p></body></html> @@ -1552,12 +1552,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. OEM Configuration - + OEM-Konfiguration Set the OEM Batch Identifier to <code>%1</code>. - + Stellen Sie die OEM-Batch-Identifikation auf <code>%1</code>. @@ -2501,12 +2501,12 @@ Ausgabe: Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>. - + Partition <strong>%1</strong> von <strong>%2MiB</strong> auf <strong>%3MiB</strong> vergrößern. Resizing %2MiB partition %1 to %3MiB. - + Ändere die Größe der Partition %1 von %2MiB auf %3MiB. @@ -2662,7 +2662,7 @@ Ausgabe: Set flags on %1MiB %2 partition. - + Setze Markierungen für %1MiB %2 Partition. @@ -2677,22 +2677,22 @@ Ausgabe: Clear flags on %1MiB <strong>%2</strong> partition. - + Markierungen für %1MiB <strong>%2</strong> Partition entfernen. Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. - + Markiere %1MiB <strong>%2</strong> Partition als <strong>%3</strong>. Clearing flags on %1MiB <strong>%2</strong> partition. - + Lösche Markierungen für %1MiB <strong>%2</strong> Partition. Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. - + Setze Markierungen <strong>%3</strong> für %1MiB <strong>%2</strong> Partition. diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts index 4641523a9..5b1556a12 100644 --- a/lang/calamares_es_MX.ts +++ b/lang/calamares_es_MX.ts @@ -107,7 +107,7 @@ Set up - + Preparar @@ -120,12 +120,12 @@ Job failed (%1) - + Trabajo fallido (%1) Programmed job failure was explicitly requested. - + Falla del trabajo programado fue solicitado explícitamente. @@ -141,7 +141,7 @@ Example job (%1) - + Trabajo de ejemplo. (%1) @@ -205,7 +205,7 @@ System-requirements checking is complete. - + Chequeo de requerimientos del sistema completado. @@ -231,7 +231,7 @@ Cancel setup without changing the system. - + Cancelar la configuración sin cambiar el sistema. @@ -242,7 +242,7 @@ Setup Failed - + Fallo en la configuración. @@ -262,22 +262,22 @@ Continue with installation? - + ¿Continuar con la instalación? The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + El %1 programa de instalación esta a punto de realizar cambios a su disco con el fin de establecer %2.<br/><strong>Usted no podrá deshacer estos cambios.</strong> &Set up now - + &Configurar ahora &Set up - + &Configurar @@ -287,12 +287,12 @@ Setup is complete. Close the setup program. - + Configuración completa. Cierre el programa de instalación. Cancel setup? - + ¿Cancelar la configuración? @@ -303,7 +303,8 @@ Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + ¿Realmente desea cancelar el actual proceso de configuración? +El programa de instalación se cerrará y todos los cambios se perderán. @@ -396,7 +397,7 @@ El instalador terminará y se perderán todos los cambios. %1 Setup Program - + %1 Programa de instalación @@ -465,7 +466,7 @@ El instalador terminará y se perderán todos los cambios. %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + %1 será reducido a %2MiB y una nueva %3MiB partición se creará para %4. @@ -509,27 +510,27 @@ El instalador terminará y se perderán todos los cambios. No Swap - + Sin Swap Reuse Swap - + Reutilizar Swap Swap (no Hibernate) - + Swap (sin hibernación) Swap (with Hibernate) - + Swap (con hibernación) Swap to file - + Swap a archivo @@ -709,12 +710,12 @@ El instalador terminará y se perderán todos los cambios. Create new %2MiB partition on %4 (%3) with file system %1. - + Crear nueva %2MiB partición en %4 (%3) con el sistema de archivos %1. Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - + Crear nueva<strong>%2MiB</strong> partición en<strong>%2MiB</strong> (%3) con el sistema de archivos <strong>%1</strong>. @@ -821,7 +822,7 @@ El instalador terminará y se perderán todos los cambios. Create Volume Group - + Crear Grupo de Volumen @@ -829,22 +830,22 @@ El instalador terminará y se perderán todos los cambios. Create new volume group named %1. - + Crear nuevo grupo de volumen llamado %1. Create new volume group named <strong>%1</strong>. - + Crear nuevo grupo de volumen llamado <strong>%1</strong>. Creating new volume group named %1. - + Creando nuevo grupo de volumen llamado %1. The installer failed to create a volume group named '%1'. - + El instalador no pudo crear un grupo de volumen llamado '%1'. @@ -2839,7 +2840,7 @@ Salida This is an overview of what will happen once you start the setup procedure. - + Esta es una descripción general de lo que sucederá una vez que comience el procedimiento de configuración. @@ -2963,12 +2964,12 @@ Salida <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>Si más de una persona usará esta computadora, puede crear múltiples cuentas después de la configuración</small> <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> - + <small>Si más de una persona usará esta computadora, puede crear varias cuentas después de la instalación.</small> @@ -3015,27 +3016,27 @@ Salida Create Volume Group - + Crear Grupo de Volumen List of Physical Volumes - + Lista de volúmenes físicos Volume Group Name: - + Nombre de Grupo de volumen: Volume Group Type: - + Tipo de Grupo de volumen: Physical Extent Size: - + Tamaño de la extensión física: @@ -3045,12 +3046,12 @@ Salida Total Size: - + Tamaño total: Used Size: - + Tamaño usado: @@ -3060,7 +3061,7 @@ Salida Quantity of LVs: - + Cantidad de LVs: @@ -3084,7 +3085,7 @@ Salida Select language - + Seleccione el idioma @@ -3109,17 +3110,17 @@ Salida <h1>Welcome to the Calamares setup program for %1.</h1> - + <h1>Bienvenido al programa de instalación Calamares para %1.</h1> <h1>Welcome to %1 setup.</h1> - + <h1>Bienvenido a la configuración %1</h1> About %1 setup - + Acerca de la configuración %1 diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts index 434cf5ba7..21af2c84c 100644 --- a/lang/calamares_fi_FI.ts +++ b/lang/calamares_fi_FI.ts @@ -514,7 +514,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. Reuse Swap - Kierrätä välimustia + Kierrätä välimuistia diff --git a/lang/python/da/LC_MESSAGES/python.mo b/lang/python/da/LC_MESSAGES/python.mo index 7786d48e3..60e2bdda8 100644 Binary files a/lang/python/da/LC_MESSAGES/python.mo and b/lang/python/da/LC_MESSAGES/python.mo differ diff --git a/lang/python/da/LC_MESSAGES/python.po b/lang/python/da/LC_MESSAGES/python.po index 29bf712b5..271154843 100644 --- a/lang/python/da/LC_MESSAGES/python.po +++ b/lang/python/da/LC_MESSAGES/python.po @@ -48,7 +48,7 @@ msgstr "Fejl ved konfiguration" #: src/modules/initramfscfg/main.py:95 src/modules/openrcdmcryptcfg/main.py:79 #: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 msgid "No partitions are defined for 
{!s}
to use." -msgstr "" +msgstr "Der er ikke angivet nogle partitioner som 
{!s}
skal bruge." #: src/modules/services-systemd/main.py:35 msgid "Configure systemd services" @@ -96,7 +96,7 @@ msgstr "Afmonter filsystemer." #: src/modules/unpackfs/main.py:41 msgid "Filling up filesystems." -msgstr "" +msgstr "Udfylder filsystemer." #: src/modules/unpackfs/main.py:159 msgid "rsync failed with error code {}." @@ -215,6 +215,7 @@ msgstr "Konfigurerer mkinitcpio." #: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" +"Der er ikke angivet noget rodmonteringspunkt som 
{!s}
skal bruge." #: src/modules/initcpio/main.py:33 msgid "Creating initramfs with mkinitcpio." @@ -229,6 +230,8 @@ msgid "" "Process 
mkinitcpio
failed with error code {!s}. The command was " "
{!s}
." msgstr "" +"Processen 
mkinitcpio
mislykkedes med fejlkoden {!s}. Kommandoen " +"blev 
{!s}
." #: src/modules/luksopenswaphookcfg/main.py:35 msgid "Configuring encrypted swap." @@ -369,6 +372,7 @@ msgstr "Fejl ved opsætning af krypteret rootfs" #: src/modules/luksbootkeyfile/main.py:75 msgid "Rootfs partition {!s} is LUKS but no passphrase found." msgstr "" +"Rootfs-partitionen {!s} er LUKS men der blev ikke fundet nogen adgangskode." #: src/modules/fstab/main.py:38 msgid "Writing fstab." diff --git a/lang/python/de/LC_MESSAGES/python.mo b/lang/python/de/LC_MESSAGES/python.mo index 6123e84f8..d0f2e4e58 100644 Binary files a/lang/python/de/LC_MESSAGES/python.mo and b/lang/python/de/LC_MESSAGES/python.mo differ diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po index ad2fb4916..dd59b4958 100644 --- a/lang/python/de/LC_MESSAGES/python.po +++ b/lang/python/de/LC_MESSAGES/python.po @@ -42,7 +42,7 @@ msgstr "Partitionen mounten." #: src/modules/fstab/main.py:316 src/modules/localecfg/main.py:144 #: src/modules/networkcfg/main.py:48 msgid "Configuration Error" -msgstr "" +msgstr "Konfigurationsfehler" #: src/modules/mount/main.py:151 src/modules/initcpiocfg/main.py:188 #: src/modules/luksopenswaphookcfg/main.py:96 src/modules/rawfs/main.py:172 @@ -50,6 +50,7 @@ msgstr "" #: src/modules/luksbootkeyfile/main.py:52 src/modules/fstab/main.py:313 msgid "No partitions are defined for 
{!s}
to use." msgstr "" +"Es sind keine Partitionen für 
{!s}
zur Verwendung definiert." #: src/modules/services-systemd/main.py:35 msgid "Configure systemd services" @@ -216,6 +217,7 @@ msgstr "mkinitcpio konfigurieren." #: src/modules/localecfg/main.py:145 src/modules/networkcfg/main.py:49 msgid "No root mount point is given for 
{!s}
to use." msgstr "" +"Es ist kein Root-Mount-Punkt für 
{!s}
zur Verwendung angegeben." #: src/modules/initcpio/main.py:33 msgid "Creating initramfs with mkinitcpio." @@ -223,13 +225,15 @@ msgstr "Erstelle initramfs mit mkinitcpio." #: src/modules/initcpio/main.py:47 msgid "Process Failed" -msgstr "" +msgstr "Prozess fehlgeschlagen" #: src/modules/initcpio/main.py:48 msgid "" "Process 
mkinitcpio
failed with error code {!s}. The command was " "
{!s}
." msgstr "" +"Der Prozess 
mkinitcpio
ist mit dem Fehlercode {!s} " +"fehlgeschlagen. Der Befehl war 
{!s}
." #: src/modules/luksopenswaphookcfg/main.py:35 msgid "Configuring encrypted swap." diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index bc782c1c5..508581b4e 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -228,16 +228,16 @@ ViewManager::currentStepIndex() const } /** @brief Is the given step at @p index an execution step? - * + * * Returns true if the step is an execution step, false otherwise. * Also returns false if the @p index is out of range. */ static inline bool stepIsExecute( const ViewStepList& steps, int index ) { - return + return ( 0 <= index ) && - ( index < steps.count() ) && + ( index < steps.count() ) && ( qobject_cast< ExecutionViewStep* >( steps.at( index ) ) != nullptr ); } @@ -249,7 +249,7 @@ ViewManager::next() if ( step->isAtEnd() ) { const auto* const settings = Calamares::Settings::instance(); - + // Special case when the user clicks next on the very last page in a view phase // and right before switching to an execution phase. // Depending on Calamares::Settings, we show an "are you sure" prompt or not. @@ -303,7 +303,7 @@ void ViewManager::updateButtonLabels() { const auto* const settings = Calamares::Settings::instance(); - + QString next = settings->isSetupMode() ? tr( "&Set up" ) : tr( "&Install" ); @@ -332,7 +332,7 @@ ViewManager::updateButtonLabels() if ( settings->disableCancel() ) m_quit->setVisible( false ); // In case we went back from final updateCancelEnabled( !settings->disableCancel() && !( stepIsExecute( m_steps, m_currentStep ) && settings->disableCancelDuringExec() ) ); - + m_quit->setText( tr( "&Cancel" ) ); m_quit->setToolTip( quit ); } @@ -366,37 +366,36 @@ ViewManager::back() bool ViewManager::confirmCancelInstallation() { const auto* const settings = Calamares::Settings::instance(); - + + // When we're at the very end, then it's always OK to exit. + if ( m_currentStep == m_steps.count() -1 && m_steps.last()->isAtEnd() ) + return true; + + // Not at the very end, cancel/quit might be disabled if ( settings->disableCancel() ) return false; if ( settings->disableCancelDuringExec() && stepIsExecute( m_steps, m_currentStep ) ) return false; - - // If it's NOT the last page of the last step, we ask for confirmation - if ( !( m_currentStep == m_steps.count() -1 && - m_steps.last()->isAtEnd() ) ) - { - QString title = settings->isSetupMode() - ? tr( "Cancel setup?" ) - : tr( "Cancel installation?" ); - QString question = settings->isSetupMode() - ? tr( "Do you really want to cancel the current setup process?\n" - "The setup program will quit and all changes will be lost." ) - : tr( "Do you really want to cancel the current install process?\n" - "The installer will quit and all changes will be lost." ); - QMessageBox mb( QMessageBox::Question, - title, - question, - QMessageBox::Yes | QMessageBox::No, - m_widget ); - mb.setDefaultButton( QMessageBox::No ); - mb.button( QMessageBox::Yes )->setText( tr( "&Yes" ) ); - mb.button( QMessageBox::No )->setText( tr( "&No" ) ); - int response = mb.exec(); - return response == QMessageBox::Yes; - } - else // Means we're at the end, no need to confirm. - return true; + + // Otherwise, confirm cancel/quit. + QString title = settings->isSetupMode() + ? tr( "Cancel setup?" ) + : tr( "Cancel installation?" ); + QString question = settings->isSetupMode() + ? tr( "Do you really want to cancel the current setup process?\n" + "The setup program will quit and all changes will be lost." ) + : tr( "Do you really want to cancel the current install process?\n" + "The installer will quit and all changes will be lost." ); + QMessageBox mb( QMessageBox::Question, + title, + question, + QMessageBox::Yes | QMessageBox::No, + m_widget ); + mb.setDefaultButton( QMessageBox::No ); + mb.button( QMessageBox::Yes )->setText( tr( "&Yes" ) ); + mb.button( QMessageBox::No )->setText( tr( "&No" ) ); + int response = mb.exec(); + return response == QMessageBox::Yes; } void diff --git a/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.mo b/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.mo index 11a10df01..988a78d7e 100644 Binary files a/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.mo and b/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.mo differ diff --git a/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po b/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po index e67dc081f..19f669849 100644 --- a/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po +++ b/src/modules/dummypythonqt/lang/ca/LC_MESSAGES/dummypythonqt.po @@ -4,16 +4,16 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Davidmp , 2017 +# Davidmp , 2019 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-05 11:34-0400\n" +"POT-Creation-Date: 2019-05-10 19:18-0400\n" "PO-Revision-Date: 2016-12-16 12:18+0000\n" -"Last-Translator: Davidmp , 2017\n" +"Last-Translator: Davidmp , 2019\n" "Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,7 +39,7 @@ msgstr "La tasca Dummy PythonQt" #: src/modules/dummypythonqt/main.py:186 msgid "This is the Dummy PythonQt Job. The dummy job says: {}" -msgstr "Sóc la tasca Dummy PythonQt. La tasca diu el següent: {}" +msgstr "Soc la tasca Dummy PythonQt. La tasca diu el següent: {}" #: src/modules/dummypythonqt/main.py:190 msgid "A status message for Dummy PythonQt Job." diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp index c49bb9538..4bffa8221 100644 --- a/src/modules/finished/FinishedPage.cpp +++ b/src/modules/finished/FinishedPage.cpp @@ -39,7 +39,7 @@ FinishedPage::FinishedPage( QWidget* parent ) : QWidget( parent ) , ui( new Ui::FinishedPage ) - , m_restartSetUp( false ) + , m_mode( FinishedViewStep::RestartMode::UserUnchecked ) { ui->setupUi( this ); @@ -83,6 +83,8 @@ FinishedPage::setRestart( FinishedViewStep::RestartMode mode ) { using Mode = FinishedViewStep::RestartMode; + m_mode = mode; + ui->restartCheckBox->setVisible( mode != Mode::Never ); ui->restartCheckBox->setEnabled( mode != Mode::Always ); ui->restartCheckBox->setChecked( ( mode == Mode::Always ) || ( mode == Mode::UserChecked ) ); @@ -99,17 +101,21 @@ FinishedPage::setRestartNowCommand( const QString& command ) void FinishedPage::setUpRestart() { - cDebug() << "FinishedPage::setUpRestart()"; - if ( !m_restartSetUp ) - { - connect( qApp, &QApplication::aboutToQuit, - this, [this] - { - if ( ui->restartCheckBox->isVisible() && - ui->restartCheckBox->isChecked() ) - QProcess::execute( "/bin/sh", { "-c", m_restartNowCommand } ); - } ); - } + cDebug() << "FinishedPage::setUpRestart(), Quit button" + << "setup=" << FinishedViewStep::modeName( m_mode ) + << "command=" << m_restartNowCommand; + + connect( qApp, &QApplication::aboutToQuit, + [this]() + { + if ( ui->restartCheckBox->isVisible() && + ui->restartCheckBox->isChecked() ) + { + cDebug() << "Running restart command" << m_restartNowCommand; + QProcess::execute( "/bin/sh", { "-c", m_restartNowCommand } ); + } + } + ); } diff --git a/src/modules/finished/FinishedPage.h b/src/modules/finished/FinishedPage.h index 9954e6fa0..25b776ead 100644 --- a/src/modules/finished/FinishedPage.h +++ b/src/modules/finished/FinishedPage.h @@ -49,9 +49,8 @@ protected: private: Ui::FinishedPage* ui; + FinishedViewStep::RestartMode m_mode; QString m_restartNowCommand; - - bool m_restartSetUp; }; #endif // FINISHEDPAGE_H diff --git a/src/modules/finished/FinishedViewStep.cpp b/src/modules/finished/FinishedViewStep.cpp index d5c3c3f69..f5c0935c3 100644 --- a/src/modules/finished/FinishedViewStep.cpp +++ b/src/modules/finished/FinishedViewStep.cpp @@ -156,10 +156,10 @@ FinishedViewStep::onActivate() } -QList< Calamares::job_ptr > +Calamares::JobList FinishedViewStep::jobs() const { - return QList< Calamares::job_ptr >(); + return Calamares::JobList(); } void @@ -210,4 +210,11 @@ FinishedViewStep::setConfigurationMap( const QVariantMap& configurationMap ) m_notifyOnFinished = CalamaresUtils::getBool( configurationMap, "notifyOnFinished", false ); } +QString FinishedViewStep::modeName(FinishedViewStep::RestartMode m) +{ + bool ok = false; + return modeNames().find( m, ok ); // May be QString() +} + + CALAMARES_PLUGIN_FACTORY_DEFINITION( FinishedViewStepFactory, registerPlugin(); ) diff --git a/src/modules/finished/FinishedViewStep.h b/src/modules/finished/FinishedViewStep.h index 314f6acc6..7b3881099 100644 --- a/src/modules/finished/FinishedViewStep.h +++ b/src/modules/finished/FinishedViewStep.h @@ -41,6 +41,8 @@ public: UserChecked, ///< @brief Show button, starts checked Always ///< @brief Show button, can't change, checked }; + /// @brief Returns the config-name of the given restart-mode @p m + static QString modeName( RestartMode m ); explicit FinishedViewStep( QObject* parent = nullptr ); virtual ~FinishedViewStep() override; @@ -57,7 +59,7 @@ public: void onActivate() override; - QList< Calamares::job_ptr > jobs() const override; + Calamares::JobList jobs() const override; void setConfigurationMap( const QVariantMap& configurationMap ) override;