Add ability to merge flux

This commit is contained in:
Rebecca Wallander
2026-04-04 12:28:21 +02:00
parent 6fd40158ea
commit 59b1235ac8
6 changed files with 182 additions and 72 deletions

View File

@@ -5115,6 +5115,24 @@ namespace Aaru.Localization {
return ResourceManager.GetString("Flux_data_will_be_copied_as_is_from_primary_image", resourceCulture);
}
}
/// <summary>
/// Looks up localized string similar to Merging flux: primary captures first, then secondary captures appended with renumbered indices...
/// </summary>
public static string Flux_merge_primary_then_secondary_appended {
get {
return ResourceManager.GetString("Flux_merge_primary_then_secondary_appended", resourceCulture);
}
}
/// <summary>
/// Looks up localized string similar to Secondary image is not a flux image; copying flux captures from the primary image only...
/// </summary>
public static string Flux_merge_primary_flux_only_secondary_not_flux_image {
get {
return ResourceManager.GetString("Flux_merge_primary_flux_only_secondary_not_flux_image", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Force geometry, only supported in not tape block media. Specify as C/H/S..

View File

@@ -5452,8 +5452,11 @@ Probadores:
<data name="Will_copy_0_sectors_from_secondary_image" xml:space="preserve">
<value>[slateblue1]Se copiarán [teal]{0}[/] sectores de la imagen secundaria.[/]</value>
</data>
<data name="Flux_data_will_be_copied_as_is_from_primary_image" xml:space="preserve">
<value>[slateblue1]Los datos de flujo se copiarán tal cual de la imagen primaria...[/]</value>
<data name="Flux_merge_primary_then_secondary_appended" xml:space="preserve">
<value>[slateblue1]Combinando flujo: primero capturas de la imagen primaria, luego las de la secundaria con índices renumerados...[/]</value>
</data>
<data name="Flux_merge_primary_flux_only_secondary_not_flux_image" xml:space="preserve">
<value>[slateblue1]La imagen secundaria no es de flujo; copiando solo las capturas de flujo de la imagen primaria...[/]</value>
</data>
<data name="Copying_file_0_of_partition_1" xml:space="preserve">
<value>[slateblue1]Copiando fichero [lime]{0}[/] de partición [teal]{1}[/]...[/]</value>

View File

@@ -5536,8 +5536,11 @@ Do you want to continue?</value>
<data name="Will_copy_0_sectors_from_secondary_image" xml:space="preserve">
<value>[slateblue1]Will copy [teal]{0}[/] sectors from secondary image.[/]</value>
</data>
<data name="Flux_data_will_be_copied_as_is_from_primary_image" xml:space="preserve">
<value>[slateblue1]Flux data will be copied as-is from primary image...[/]</value>
<data name="Flux_merge_primary_then_secondary_appended" xml:space="preserve">
<value>[slateblue1]Merging flux: primary captures first, then secondary captures appended with renumbered indices...[/]</value>
</data>
<data name="Flux_merge_primary_flux_only_secondary_not_flux_image" xml:space="preserve">
<value>[slateblue1]Secondary image is not a flux image; copying flux captures from the primary image only...[/]</value>
</data>
<data name="Copying_file_0_of_partition_1" xml:space="preserve">
<value>[slateblue1]Copying file [lime]{0}[/] of partition [teal]{1}[/]...[/]</value>