Merge branch 'master' into dev/netservices

Change-Id: I1eb6c2ea2fd0d794ad6378eab8bbb80ce46dfbb8

3rdparty/docker/bootstrap/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM docker.io/debian:bullseye-slim
 
 ENV DEBIAN_FRONTEND="noninteractive"
 

3rdparty/docker/bootstrap/Makefile

@@ -1,4 +1,5 @@
 ENGINE=docker
+VER=bullseye-slim-1
 #ENGINE=podman
 
 # Example mounting source code directory into container
@@ -7,16 +8,16 @@ SOURCES=$(HOME)/Code
 EXTRA=-v $(SOURCES)/haiku:/work/src/haiku -v $(SOURCES)/buildtools:/work/src/buildtools
 
 default:
-	${ENGINE} build . --no-cache -t docker.io/haiku/bootstrap
+	${ENGINE} build . --no-cache -t docker.io/haiku/bootstrap:${VER}
 clean:
-	${ENGINE} ps -q --filter=ancestor=docker.io/haiku/bootstrap | xargs -I {} ${ENGINE} kill {}
+	${ENGINE} ps -q --filter=ancestor=docker.io/haiku/bootstrap:${VER} | xargs -I {} ${ENGINE} kill {}
-	${ENGINE} ps -a -q --filter=ancestor=docker.io/haiku/bootstrap | xargs -I {} ${ENGINE} rm {}
+	${ENGINE} ps -a -q --filter=ancestor=docker.io/haiku/bootstrap:${VER} | xargs -I {} ${ENGINE} rm {}
 	${ENGINE} volume rm bootstrap_work
 prep:
-	${ENGINE} run -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap prep
+	${ENGINE} run -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap:${VER} prep
 crosstools:
-	${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap crosstools
+	${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap:${VER} crosstools
 bootstrap:
-	${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap bootstrap
+	${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap:${VER} bootstrap
 enter:
-	${ENGINE} run -it -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap /bin/bash -l
+	${ENGINE} run -it -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work:exec ${EXTRA} docker.io/haiku/bootstrap:${VER} /bin/bash -l

3rdparty/pulkomandy/unbootstrap.sh

@@ -14,7 +14,7 @@ for package in ../packages/*.hpkg
 do
 	echo --- Processing $package ---
 	echo Cleaning work directory...
-	rm -r *
+	rm -rf *
 	echo Extracting package...
 	package extract $package
 	echo Converting .PackageInfo...

3rdparty/vagrant/README.md

@@ -0,0 +1,48 @@
+# Haiku Vagrant boxes
+
+> Haiku, Inc. has access to draft a new release at Vagrant
+
+https://app.vagrantup.com/haiku-os
+
+## Creating libvirt box
+
+Create base image:
+```qemu-image -f qcow2 libvirt/box.img 8G```
+
+Install Haiku:
+```qemu-system-x86_64 --enable-kvm -hda libvirt/box.img -cdrom <haiku.iso> -m 1G```
+
+Boot Haiku:
+```qemu-system-x86_64 --enable-kvm -hda libvirt/box.img -m 1G```
+
+Update software:
+```
+pkgman update
+<reboot>
+pkgman install vim
+```
+
+Install vagrant public key:
+```
+mkdir ~/config/settings/ssh
+wget https://raw.githubusercontent.com/hashicorp/vagrant/main/keys/vagrant.pub -O ~/config/settings/ssh/authorized_keys
+chmod 700 ~/config/settings/ssh
+chmod 600 ~/config/settings/ssh/authorized_keys
+```
+
+Rename "user" to "vagrant" by editing /etc/passwd. Change "user" to "vagrant"
+
+### Packaging libvirt
+
+```
+cd libvirt
+tar cvzf ../libvirt.box *
+```
+
+## Creating VirtualBox box
+
+```
+qemu-image convert -f qcow2 -O vmdk libvirt/box.img virtualbox/box-0001.vmdk
+cd virtualbox
+tar cvzf ../virtualbox.box *
+```

3rdparty/vagrant/Vagrantfile

@@ -0,0 +1,7 @@
+#
+# Example Vagrantfile to launch a haiku image
+#
+Vagrant.configure("2") do |config|
+  config.vm.box = "haiku-os/r1beta3-x86_64"
+  config.vm.box_version = "20220216"
+end

3rdparty/vagrant/libvirt/Vagrantfile

@@ -0,0 +1,12 @@
+Vagrant.configure("2") do |config|
+  config.vm.provider :libvirt do |libvirt|
+    libvirt.driver = "kvm"
+    libvirt.host = ""
+    libvirt.memory = 1024
+    libvirt.cpus = 2
+    libvirt.input :type => "tablet", :bus => "usb"
+	libvirt.video_type = "qxl"
+	libvirt.graphics_type = "spice"
+    libvirt.machine_arch = "x86_64"
+  end
+end

3rdparty/vagrant/libvirt/info.json

@@ -0,0 +1,4 @@
+{
+  "author": "Haiku, Inc.",
+  "homepage": "https://haiku-os.org"
+}

3rdparty/vagrant/libvirt/metadata.json

@@ -0,0 +1,5 @@
+{
+"provider"		: "libvirt",
+"format"		: "qcow2",
+"virtual_size"	:	8
+}

3rdparty/vagrant/virtualbox/Vagrantfile

@@ -0,0 +1,11 @@
+Vagrant::Config.run do |config|
+  # This Vagrantfile is auto-generated by `vagrant package` to contain
+  # the MAC address of the box. Custom configuration should be placed in
+  # the actual `Vagrantfile` in this box.
+  config.vm.base_mac = "0800274992E3"
+end
+
+# Load include vagrant file if it exists after the auto-generated
+# so it can override any of the settings
+include_vagrantfile = File.expand_path("../include/_Vagrantfile", __FILE__)
+load include_vagrantfile if File.exist?(include_vagrantfile)

3rdparty/vagrant/virtualbox/box.ovf

@@ -0,0 +1,145 @@
+<?xml version="1.0"?>
+<Envelope ovf:version="1.0" xml:lang="en-US" xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vbox="http://www.virtualbox.org/ovf/machine">
+  <References>
+    <File ovf:id="file1" ovf:href="box-disk001.vmdk"/>
+  </References>
+  <DiskSection>
+    <Info>List of the virtual disks used in the package</Info>
+    <Disk ovf:capacity="8589934592" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" vbox:uuid="a95a6679-1fc8-49f8-b6b0-9fa7cd9f1b75"/>
+  </DiskSection>
+  <NetworkSection>
+    <Info>Logical networks used in the package</Info>
+    <Network ovf:name="NAT">
+      <Description>Logical network used by this appliance.</Description>
+    </Network>
+  </NetworkSection>
+  <VirtualSystem ovf:id="haiku-r1b3-x86_64">
+    <Info>A virtual machine</Info>
+    <OperatingSystemSection ovf:id="102">
+      <Info>The kind of installed guest operating system</Info>
+      <Description>Other_64</Description>
+      <vbox:OSType ovf:required="false">Other_64</vbox:OSType>
+    </OperatingSystemSection>
+    <VirtualHardwareSection>
+      <Info>Virtual hardware requirements for a virtual machine</Info>
+      <System>
+        <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
+        <vssd:InstanceID>0</vssd:InstanceID>
+        <vssd:VirtualSystemIdentifier>haiku-r1b3-x86_64</vssd:VirtualSystemIdentifier>
+        <vssd:VirtualSystemType>virtualbox-2.2</vssd:VirtualSystemType>
+      </System>
+      <Item>
+        <rasd:Caption>2 virtual CPU</rasd:Caption>
+        <rasd:Description>Number of virtual CPUs</rasd:Description>
+        <rasd:ElementName>2 virtual CPU</rasd:ElementName>
+        <rasd:InstanceID>1</rasd:InstanceID>
+        <rasd:ResourceType>3</rasd:ResourceType>
+        <rasd:VirtualQuantity>2</rasd:VirtualQuantity>
+      </Item>
+      <Item>
+        <rasd:AllocationUnits>MegaBytes</rasd:AllocationUnits>
+        <rasd:Caption>1024 MB of memory</rasd:Caption>
+        <rasd:Description>Memory Size</rasd:Description>
+        <rasd:ElementName>1024 MB of memory</rasd:ElementName>
+        <rasd:InstanceID>2</rasd:InstanceID>
+        <rasd:ResourceType>4</rasd:ResourceType>
+        <rasd:VirtualQuantity>1024</rasd:VirtualQuantity>
+      </Item>
+      <Item>
+        <rasd:Address>0</rasd:Address>
+        <rasd:Caption>sataController0</rasd:Caption>
+        <rasd:Description>SATA Controller</rasd:Description>
+        <rasd:ElementName>sataController0</rasd:ElementName>
+        <rasd:InstanceID>3</rasd:InstanceID>
+        <rasd:ResourceSubType>AHCI</rasd:ResourceSubType>
+        <rasd:ResourceType>20</rasd:ResourceType>
+      </Item>
+      <Item>
+        <rasd:Address>0</rasd:Address>
+        <rasd:Caption>usb</rasd:Caption>
+        <rasd:Description>USB Controller</rasd:Description>
+        <rasd:ElementName>usb</rasd:ElementName>
+        <rasd:InstanceID>4</rasd:InstanceID>
+        <rasd:ResourceType>23</rasd:ResourceType>
+      </Item>
+      <Item>
+        <rasd:AddressOnParent>3</rasd:AddressOnParent>
+        <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
+        <rasd:Caption>sound</rasd:Caption>
+        <rasd:Description>Sound Card</rasd:Description>
+        <rasd:ElementName>sound</rasd:ElementName>
+        <rasd:InstanceID>5</rasd:InstanceID>
+        <rasd:ResourceSubType>ensoniq1371</rasd:ResourceSubType>
+        <rasd:ResourceType>35</rasd:ResourceType>
+      </Item>
+      <Item>
+        <rasd:AddressOnParent>0</rasd:AddressOnParent>
+        <rasd:Caption>disk1</rasd:Caption>
+        <rasd:Description>Disk Image</rasd:Description>
+        <rasd:ElementName>disk1</rasd:ElementName>
+        <rasd:HostResource>/disk/vmdisk1</rasd:HostResource>
+        <rasd:InstanceID>6</rasd:InstanceID>
+        <rasd:Parent>3</rasd:Parent>
+        <rasd:ResourceType>17</rasd:ResourceType>
+      </Item>
+      <Item>
+        <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
+        <rasd:Caption>Ethernet adapter on 'NAT'</rasd:Caption>
+        <rasd:Connection>NAT</rasd:Connection>
+        <rasd:ElementName>Ethernet adapter on 'NAT'</rasd:ElementName>
+        <rasd:InstanceID>7</rasd:InstanceID>
+        <rasd:ResourceType>10</rasd:ResourceType>
+      </Item>
+    </VirtualHardwareSection>
+    <vbox:Machine ovf:required="false" version="1.18-linux" uuid="{93d1f24d-7107-485a-994c-85db13d3ff8e}" name="haiku-r1b3-x86_64" OSType="Other_64" snapshotFolder="Snapshots" lastStateChange="2020-07-03T13:23:10Z">
+      <ovf:Info>Complete VirtualBox machine configuration in VirtualBox format</ovf:Info>
+      <ExtraData>
+        <ExtraDataItem name="GUI/LastCloseAction" value="PowerOff"/>
+        <ExtraDataItem name="GUI/LastNormalWindowPosition" value="280,274,1024,821"/>
+      </ExtraData>
+      <Hardware>
+        <CPU count="2">
+          <PAE enabled="true"/>
+          <LongMode enabled="true"/>
+          <HardwareVirtExLargePages enabled="false"/>
+        </CPU>
+        <Memory RAMSize="1024"/>
+        <HID Pointing="USBTablet"/>
+        <Boot>
+          <Order position="1" device="HardDisk"/>
+          <Order position="2" device="None"/>
+          <Order position="3" device="None"/>
+          <Order position="4" device="None"/>
+        </Boot>
+        <Display VRAMSize="10"/>
+        <VideoCapture file="." fps="25"/>
+        <BIOS>
+          <IOAPIC enabled="true"/>
+          <SmbiosUuidLittleEndian enabled="true"/>
+        </BIOS>
+        <USB>
+          <Controllers>
+            <Controller name="OHCI" type="OHCI"/>
+          </Controllers>
+        </USB>
+        <Network>
+          <Adapter slot="0" enabled="true" MACAddress="0800274992E3" type="virtio">
+            <NAT/>
+          </Adapter>
+        </Network>
+        <AudioAdapter driver="Pulse" enabled="true" enabledOut="true"/>
+        <Clipboard/>
+        <GuestProperties>
+          <GuestProperty name="/VirtualBox/HostInfo/GUI/LanguageID" value="en_US" timestamp="1593782383102601000" flags=""/>
+        </GuestProperties>
+        <StorageControllers>
+          <StorageController name="AHCI" type="AHCI" PortCount="1" useHostIOCache="false" Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3">
+            <AttachedDevice type="HardDisk" hotpluggable="false" port="0" device="0">
+              <Image uuid="{a95a6679-1fc8-49f8-b6b0-9fa7cd9f1b75}"/>
+            </AttachedDevice>
+          </StorageController>
+        </StorageControllers>
+      </Hardware>
+    </vbox:Machine>
+  </VirtualSystem>
+</Envelope>

3rdparty/vagrant/virtualbox/info.json

@@ -0,0 +1,4 @@
+{
+  "author": "Haiku, Inc.",
+  "homepage": "https://haiku-os.org"
+}

3rdparty/vagrant/virtualbox/metadata.json

@@ -0,0 +1 @@
+{"provider":"virtualbox"}

build/jam/ArchitectureRules

@@ -48,6 +48,11 @@ rule ArchitectureSetup architecture
 		# TODO: These should be included in Clang's compiler specs.
 		ccBaseFlags += -fPIC ;
 		HAIKU_LINKFLAGS_$(architecture) += -shared ;
+
+		# lld doesn't currently implement R_RISCV_ALIGN relaxation
+		if $(cpu) = riscv64 {
+			ccBaseFlags += -mno-relax ;
+		}
 	}
 	ccBaseFlags += $(archFlags) ;
 
@@ -267,7 +272,7 @@ rule KernelArchitectureSetup architecture
 
 		case x86 :
 			HAIKU_KERNEL_PLATFORM ?= bios_ia32 ;
-			HAIKU_BOOT_TARGETS += bios_ia32 pxe_ia32 ;
+			HAIKU_BOOT_TARGETS += bios_ia32 efi pxe_ia32 ;
 			HAIKU_ANYBOOT_LEGACY = 1 ;
 
 			HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
@@ -657,33 +662,10 @@ rule ArchitectureSetupWarnings architecture
 	EnableWerror src add-ons bluetooth ;
 	EnableWerror src add-ons decorators ;
 	EnableWerror src add-ons disk_systems ;
-	EnableWerror src add-ons input_server devices ;
+	EnableWerror src add-ons input_server ;
-	EnableWerror src add-ons input_server filters ;
-	EnableWerror src add-ons input_server methods pen ;
-	EnableWerror src add-ons input_server methods t9 ;
 	EnableWerror src add-ons kernel bluetooth ;
-	EnableWerror src add-ons kernel bus_managers acpi ;
+	EnableWerror src add-ons kernel bus_managers ;
-	EnableWerror src add-ons kernel bus_managers agp_gart ;
+	EnableWerror src add-ons kernel busses ;
-	EnableWerror src add-ons kernel bus_managers ata ;
-	EnableWerror src add-ons kernel bus_managers config_manager ;
-	EnableWerror src add-ons kernel bus_managers firewire ;
-	EnableWerror src add-ons kernel bus_managers ide ;
-	EnableWerror src add-ons kernel bus_managers isa ;
-	EnableWerror src add-ons kernel bus_managers pci ;
-	EnableWerror src add-ons kernel bus_managers ps2 ;
-	EnableWerror src add-ons kernel bus_managers random ;
-	EnableWerror src add-ons kernel bus_managers scsi ;
-	EnableWerror src add-ons kernel bus_managers tty ;
-	EnableWerror src add-ons kernel bus_managers usb ;
-	EnableWerror src add-ons kernel bus_managers virtio ;
-	EnableWerror src add-ons kernel busses agp_gart ;
-	EnableWerror src add-ons kernel busses ata ;
-#	EnableWerror src add-ons kernel busses i2c ;
-#	EnableWerror src add-ons kernel busses mmc ;
-#	EnableWerror src add-ons kernel busses random ;
-	EnableWerror src add-ons kernel busses scsi ;
-	EnableWerror src add-ons kernel busses usb ;
-#	EnableWerror src add-ons kernel busses virtio ;
 	EnableWerror src add-ons kernel console ;
 	EnableWerror src add-ons kernel cpu ;
 	EnableWerror src add-ons kernel debugger ;
@@ -728,24 +710,7 @@ rule ArchitectureSetupWarnings architecture
 	EnableWerror src add-ons kernel power ;
 	EnableWerror src add-ons locale ;
 	EnableWerror src add-ons mail_daemon ;
-	EnableWerror src add-ons media media-add-ons demultiplexer ;
+	EnableWerror src add-ons media media-add-ons ;
-	EnableWerror src add-ons media media-add-ons dvb ;
-	EnableWerror src add-ons media media-add-ons esound_sink ;
-	EnableWerror src add-ons media media-add-ons finepix_webcam ;
-	EnableWerror src add-ons media media-add-ons firewire_dv ;
-	EnableWerror src add-ons media media-add-ons legacy ;
-	EnableWerror src add-ons media media-add-ons mixer ;
-	EnableWerror src add-ons media media-add-ons multi_audio ;
-	EnableWerror src add-ons media media-add-ons opensound ;
-	EnableWerror src add-ons media media-add-ons radeon ;
-	EnableWerror src add-ons media media-add-ons reader ;
-	EnableWerror src add-ons media media-add-ons tone_producer_demo ;
-	EnableWerror src add-ons media media-add-ons usb_vision ;
-	EnableWerror src add-ons media media-add-ons usb_webcam ;
-	EnableWerror src add-ons media media-add-ons video_mixer ;
-	EnableWerror src add-ons media media-add-ons video_producer_demo ;
-	EnableWerror src add-ons media media-add-ons videowindow ;
-	EnableWerror src add-ons media media-add-ons writer ;
 	EnableWerror src add-ons media plugins ape_reader ;
 	EnableWerror src add-ons media plugins au_reader ;
 #	EnableWerror src add-ons media plugins ffmpeg ;
@@ -773,10 +738,12 @@ rule ArchitectureSetupWarnings architecture
 	EnableWerror src add-ons translators wonderbrush ;
 	EnableWerror src add-ons print ;
 	EnableWerror src bin desklink ;
+	EnableWerror src bin listusb ;
 	EnableWerror src bin multiuser ;
 	EnableWerror src bin package ;
 	EnableWerror src bin package_repo ;
 	EnableWerror src bin pkgman ;
+	EnableWerror src bin writembr ;
 	EnableWerror src libs bsd ;
 	EnableWerror src apps ;
 	EnableWerror src kits ;

build/jam/BuildSetup

@@ -555,8 +555,10 @@ SetPlatformCompatibilityFlagVariables TARGET_PLATFORM : TARGET : target ;
 # Haiku architecture is undefined on host-only builds
 # set here to host arch to prevent recusive loops.
 if $(HAIKU_HOST_BUILD_ONLY) = 1 {
+	Echo "Host tools build for $(HOST_ARCH)" ;
 	HAIKU_ARCH = $(HOST_ARCH) ;
 	HAIKU_KERNEL_ARCH = $(HOST_ARCH) ;
+	HAIKU_KERNEL_ARCH_DIR = $(HAIKU_KERNEL_ARCH) ;
 }
 
 # Set TARGET_* variables either from HAIKU_* or HOST_* depending on the
@@ -624,6 +626,8 @@ for var in $(archDependentBuildVars)_$(TARGET_PACKAGING_ARCHS) {
 
 TARGET_BOOT_LIBGCC		= $(HAIKU_BOOT_LIBGCC_$(TARGET_PACKAGING_ARCH)) ;
 TARGET_BOOT_LIBSUPC++	= $(HAIKU_BOOT_LIBSUPC++_$(TARGET_PACKAGING_ARCH)) ;
+TARGET_BOOT_32_LIBGCC		= $(HAIKU_BOOT_32_LIBGCC_$(TARGET_PACKAGING_ARCH)) ;
+TARGET_BOOT_32_LIBSUPC++	= $(HAIKU_BOOT_32_LIBSUPC++_$(TARGET_PACKAGING_ARCH)) ;
 
 TARGET_KERNEL_PLATFORM	?= $(HAIKU_KERNEL_PLATFORM) ;
 

build/jam/ImageRules

@@ -1574,7 +1574,7 @@ actions BuildFloppyBootImage1
 	fi
 	$(RM) $(<)
 	# make an empty image
-	dd if=/dev/zero of=$(<) bs=1k count=$(FLOPPY_IMAGE_SIZE)
+	dd if=/dev/zero of=$(<) bs=1024 count=$(FLOPPY_IMAGE_SIZE)
 	# add haiku_loader
 	dd if=$(>[1]) of=$(<) conv=notrunc
 	# add the boot drivers tgz archive
@@ -1701,6 +1701,9 @@ rule BuildEfiSystemPartition image : efiLoader
 			Exit "Error: Unknown EFI architecture!" ;
 	}
 
+	# public efi keys for efi bios trust
+	EFIKEYS on $(image) = [ FDirName $(HAIKU_TOP) data boot efi keys ] ;
+
 	BuildEfiSystemPartition1 $(image) : $(fatshell) $(macVolumeIcon) $(efiLoader) ;
 }
 
@@ -1720,7 +1723,15 @@ actions BuildEfiSystemPartition1
 
 	${FATFS} --initialize "$(<)" 'Haiku ESP'
 	echo "mkdir myfs/EFI" | ${FATFS} $(<)
+	echo "mkdir myfs/KEYS" | ${FATFS} $(<)
 	echo "mkdir myfs/EFI/BOOT" | ${FATFS} $(<)
+
 	echo "cp :${LOADER} myfs/EFI/BOOT/$(EFINAME)" | ${FATFS} $(<)
 	echo "cp :${EFIICON} myfs/.VolumeIcon.icns" | ${FATFS} $(<)
+
+	# Copy UEFI signing keys and a README for end users
+	echo "cp :$(EFIKEYS)/README.md myfs/KEYS/README.md" | ${FATFS} $(<)
+	for i in auth cer crt; do
+		echo "cp :$(EFIKEYS)/DB.$i myfs/KEYS/DB.$i" | ${FATFS} $(<)
+	done
 }

build/jam/SystemLibraryRules

@@ -121,9 +121,13 @@ rule TargetBootLibsupc++ asPath
 
 	if $(TARGET_PLATFORM) = haiku {
 		if $(TARGET_PACKAGING_ARCH) = x86_64 {
-			# we need to use the 32-bit libsupc++.a built by the cross-compiler
+			if $(TARGET_BOOT_PLATFORM) = efi {
-			return $(TARGET_BOOT_LIBSUPC++) ;
+				# we need to use the 64-bit libsupc++.a built by the cross-compiler
-
+				return $(TARGET_BOOT_LIBSUPC++) ;
+			} else {
+				# we need to use the 32-bit libsupc++.a built by the cross-compiler
+				return $(TARGET_BOOT_32_LIBSUPC++) ;
+			}
 			# TODO: ideally, we would build this as part of gcc_syslibs_devel,
 			#       but that isn't currently possible, as that would require
 			#       32-bit support (libraries and glue-code) on x86_64-Haiku.
@@ -239,9 +243,13 @@ rule TargetBootLibgcc architecture : asPath
 
 	if $(TARGET_PLATFORM) = haiku {
 		if $(architecture) = x86_64 {
-			# we need to use the 32-bit libgcc.a built by the cross-compiler
+			if $(TARGET_BOOT_PLATFORM) = efi {
-			return $(TARGET_BOOT_LIBGCC) ;
+				# we need to use the 64-bit libgcc.a built by the cross-compiler
-
+				return $(TARGET_BOOT_LIBGCC) ;
+			} else {
+				# we need to use the 32-bit libgcc.a built by the cross-compiler
+				return $(TARGET_BOOT_32_LIBGCC) ;
+			}
 			# TODO: ideally, we would build this as part of gcc_syslibs_devel,
 			#       but that isn't currently possible, as that would require
 			#       32-bit support (libraries and glue-code) on x86_64-Haiku.

build/jam/images/FloppyBootImage

@@ -26,7 +26,7 @@ if $(NET_BOOT) = 1 {
 }
 
 SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
-	acpi@x86,x86_64 ata config_manager dpc pci
+	acpi@x86,x86_64 ata dpc pci
 	isa@x86,x86_64 scsi $(USB_ONLY)usb fdt@arm
 ] ;
 SYSTEM_ADD_ONS_FILE_SYSTEMS =

build/jam/images/MMCImage

@@ -62,7 +62,7 @@ actions BuildUBootSDImage1
 	MMC_SIZE=`expr $(SDIMAGE_OS_SIZE) \* 1024 + ${BOOT_SIZE}`
 
 	# Build "boot" disk
-	dd if=/dev/zero of=$(1) bs=1K count=${BOOT_SIZE}
+	dd if=/dev/zero of=$(1) bs=1024 count=${BOOT_SIZE}
 
 	# generate u-boot environment variables
 	echo 'os=haiku' > uEnv.txt
@@ -122,7 +122,7 @@ actions BuildEfiSDImage1
 	MMC_SIZE=`expr $(SDIMAGE_OS_SIZE) \* 1024 + ${BOOT_SIZE}`
 
 	# Build "boot" disk
-	dd if=/dev/zero of=$(1) bs=1K count=${BOOT_SIZE}
+	dd if=/dev/zero of=$(1) bs=1024 count=${BOOT_SIZE}
 
 	# generate u-boot environment variables
 	echo 'os=haiku' > uEnv.txt

build/jam/images/NetBootArchive

@@ -20,7 +20,7 @@ SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures
 ] ;
 SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
 	pci isa@x86 ata
-	scsi config_manager agp_gart
+	scsi agp_gart
 ] ;
 SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs packagefs ;
 

build/jam/images/definitions/minimum

@@ -196,8 +196,8 @@ SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures
 		atheros813x atheros81xx attansic_l1 attansic_l2
 		broadcom440x broadcom570x
 		dec21xxx
-		emulex_oce
 		ipro100 ipro1000
+		intel22x
 		jmicron2x0
 		marvell_yukon
 		nforce
@@ -224,7 +224,6 @@ SYSTEM_ADD_ONS_DRIVERS_SENSOR = [ FFilterByBuildFeatures
 
 SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
 	acpi@x86,x86_64 agp_gart@x86,x86_64 ata
-	config_manager
 	i2c@x86,x86_64 isa@x86,x86_64
 	mmc
 	scsi

build/jam/images/definitions/regular

@@ -9,7 +9,7 @@ SYSTEM_BIN += [ FFilterByBuildFeatures
 	dpms
 	FirstBootPrompt
 	<bin>i2c@x86,x86_64 installsound
-	mail mail2mbox mbox2mail media_client mkdos mount_nfs
+	mail mail2mbox mbox2mail media_client mount_nfs
 	play recover screenshot setcontrollook setdecor spamdbm
 	translate
 	WindowShade
@@ -110,8 +110,8 @@ SYSTEM_ADD_ONS_DRIVERS_BT_H2 +=
 ;
 
 SYSTEM_ADD_ONS_ACCELERANTS += [ FFilterByBuildFeatures
-	ati.accelerant
 	x86,x86_64 @{
+		ati.accelerant
 		intel_810.accelerant intel_extreme.accelerant
 		matrox.accelerant
 		nvidia.accelerant
@@ -206,8 +206,8 @@ SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD +=
 ;
 
 SYSTEM_ADD_ONS_DRIVERS_GRAPHICS += [ FFilterByBuildFeatures
-	ati
 	x86,x86_64 @{
+		ati
 		intel_810 intel_extreme
 		matrox
 		nvidia

build/jam/packages/Haiku

@@ -84,7 +84,6 @@ AddDriversToPackage audio old		: $(SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD) ;
 AddDriversToPackage bluetooth h2	: $(SYSTEM_ADD_ONS_DRIVERS_BT_H2) ;
 AddDriversToPackage midi			: $(SYSTEM_ADD_ONS_DRIVERS_MIDI) ;
 AddDriversToPackage bus				: usb_raw ;
-AddDriversToPackage disk floppy		: pc_floppy@x86 ;
 AddDriversToPackage disk usb		: usb_disk ;
 AddDriversToPackage disk virtual	: nbd ;
 AddDriversToPackage dvb				: cx23882 ;
@@ -195,7 +194,6 @@ AddFilesToPackage data KeyboardLayouts ThinkPad
 AddBootModuleSymlinksToPackage
 	acpi@x86,x86_64 ahci ata ata_adapter
 	bfs
-	config_manager
 	dpc
 	efi_gpt
 	generic_ide_pci

build/jam/packages/HaikuBootstrap

@@ -69,7 +69,6 @@ AddDriversToPackage audio hmulti	: $(SYSTEM_ADD_ONS_DRIVERS_AUDIO) ;
 AddDriversToPackage audio old		: $(SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD) ;
 AddDriversToPackage midi			: $(SYSTEM_ADD_ONS_DRIVERS_MIDI) ;
 AddDriversToPackage bus				: usb_raw ;
-AddDriversToPackage disk floppy		: pc_floppy@x86 ;
 AddDriversToPackage disk usb		: usb_disk ;
 AddDriversToPackage disk virtual	: nbd ;
 AddDriversToPackage graphics		: $(SYSTEM_ADD_ONS_DRIVERS_GRAPHICS) ;
@@ -161,7 +160,7 @@ AddFilesToPackage data KeyboardLayouts ThinkPad
 
 # boot module links
 AddBootModuleSymlinksToPackage
-	acpi@x86,x86_64 ata pci isa@x86,x86_64 config_manager dpc
+	acpi@x86,x86_64 ata pci isa@x86,x86_64 dpc
 	scsi usb
 	openpic@ppc
 	ata_adapter locked_pool scsi_periph

build/jam/packages/UserlandFS

@@ -45,4 +45,11 @@ SEARCH on $(fuseHeaders)
 	= [ FDirName $(HAIKU_TOP) headers private userlandfs fuse ] ;
 AddFilesToPackage develop headers userlandfs fuse : $(fuseHeaders) ;
 
+# Pkg-config file (for ease of use with software designed for the original FUSE)
+
+local fusePkgConfig = fuse.pc ;
+fusePkgConfig = $(fusePkgConfig:G=userlandfs!fuse) ;
+SEARCH on $(fusePkgConfig) = [ FDirName $(HAIKU_TOP) data develop ] ;
+AddFilesToPackage develop lib pkgconfig : $(fusePkgConfig) ;
+
 BuildHaikuPackage $(userlandFSPackage) : userland_fs ;

build/jam/repositories/HaikuPorts/arm

@@ -4,46 +4,48 @@ RemotePackageRepository HaikuPorts
 	:
 	# architecture "any" packages
 	be_book-2008_10_26-3
-	ca_root_certificates-2019_01_23-1
+	ca_root_certificates-2021_07_05-1
 	gnu_efi_kernel-3.0.10-1
-	haikuporter-1.2.2-2
+	haikuporter-1.2.5-1
-	noto-20170920-3
+	noto-20200106-1
 	timgmsoundfont-fixed-5
 	wqy_microhei-0.2.0~beta-4
 	:
 	# repository architecture packages
 	# primary architecture (arm)
 	bash-4.4.023-1
-	binutils-2.28.1_2017_08_05-1
+	binutils-2.36.1_2021_09_21-2
 	bison-3.0.5-1
 	coreutils-8.22-1
 	curl-7.40.0-1
 	curl_devel-7.40.0-1
-	expat-2.1.0-1
+	expat-2.4.1-1
-	expat_devel-2.1.0-1
+	expat_devel-2.4.1-1
 	findutils-4.6.0-1
 	flex-2.5.35-1
 	freetype-2.6.3-1
 	freetype_devel-2.6.3-1
 	gawk-3.1.8-2
-	gcc_syslibs_devel-8.3.0_2019_05_24-1
+	gcc_syslibs_devel-11.2.0_2021_07_28-4
-	gcc_syslibs-8.3.0_2019_05_24-1
+	gcc_syslibs-11.2.0_2021_07_28-4
 	grep-2.14-1
-	icu-57.1-2
+	icu-67.1-2
-	icu_devel-57.1-2
+	icu_devel-67.1-2
 	less-451-1
 	libsolv-0.3.0_haiku_2014_12_22-1
 	libsolv_devel-0.3.0_haiku_2014_12_22-1
 	m4-1.4.16-1
-	make-4.1-2
+	make-4.3-1
 	mawk-1.3.4-1
-	ncurses6-6.0-1
+	ncurses6-6.2-1
-	ncurses6_devel-6.0-1
+	ncurses6_devel-6.2-1
-	python-2.7.6-1
+	python-3.9.1-1
 	sed-4.2.1-1
 	texinfo-4.13a-1
 	zlib-1.2.11-1
 	zlib_devel-1.2.11-1
+	zstd-1.5.0-2
+	zstd_devel-1.5.0-2
 	:
 	# source packages
 	bash
@@ -65,6 +67,7 @@ RemotePackageRepository HaikuPorts
 	sed
 	texinfo
 	zlib
+	zstd
 	:
 	# debuginfo packages
 	;

build/jam/repositories/HaikuPorts/riscv64

@@ -14,30 +14,30 @@ RemotePackageRepository HaikuPorts
 	# repository architecture packages
 	# primary architecture (riscv64)
 	bash-4.4.023-1
-	binutils-2.28.1_2017_08_05-1
+	binutils-2.36.1_2021_09_21-2
 	bison-3.0.5-1
 	coreutils-8.22-1
 	curl-7.40.0-1
 	curl_devel-7.40.0-1
-	expat-2.1.0-1
+	expat-2.4.1-1
-	expat_devel-2.1.0-1
+	expat_devel-2.4.1-1
 	findutils-4.6.0-1
 	flex-2.5.35-1
 	freetype-2.6.3-1
 	freetype_devel-2.6.3-1
 	gawk-3.1.8-2
-	gcc-8.3.0_2019_05_24-4
+	gcc-11.2.0_2021_07_28-3
-	gcc_syslibs_devel-8.3.0_2019_05_24-4
+	gcc_syslibs_devel-11.2.0_2021_07_28-3
-	gcc_syslibs-8.3.0_2019_05_24-4
+	gcc_syslibs-11.2.0_2021_07_28-3
-	icu-57.2-2
+	icu-67.1-2
-	icu_devel-57.2-2
+	icu_devel-67.1-2
 	less-451-1
 	libsolv-0.3.0_haiku_2014_12_22-1
 	libsolv_devel-0.3.0_haiku_2014_12_22-1
 	m4-1.4.16-1
-	make-4.1-2
+	make-4.3-1
-	ncurses6-6.0-1
+	ncurses6-6.2-1
-	ncurses6_devel-6.0-1
+	ncurses6_devel-6.2-1
 	python-2.7.6-1
 	sed-4.2.1-1
 	texinfo-4.13a-1

build/jam/repositories/HaikuPortsCross/arm

@@ -6,13 +6,13 @@ BootstrapPackageRepository HaikuPortsCross
 	noto-20170202-7
 	:
 	# repository architecture packages (stage 0)
-	gcc_bootstrap-8.3.0_2019_05_24-6
+	gcc_bootstrap-11.2.0_2021_07_28-5
-	gcc_bootstrap_syslibs-8.3.0_2019_05_24-6
+	gcc_bootstrap_syslibs-11.2.0_2021_07_28-5
-	gcc_bootstrap_syslibs_devel-8.3.0_2019_05_24-6
+	gcc_bootstrap_syslibs_devel-11.2.0_2021_07_28-5
 	:
 	# repository architecture packages (stage 1)
 	bash_bootstrap-4.4.023-1
-	binutils_bootstrap-2.36.1_2021_09_21-1
+	binutils_bootstrap-2.36.1_2021_09_21-2
 	bison_bootstrap-3.0.5-1
 	coreutils_bootstrap-8.22-1
 	curl_bootstrap-7.40.0-1
@@ -25,13 +25,13 @@ BootstrapPackageRepository HaikuPortsCross
 	freetype_bootstrap_devel-2.6.3-1
 	gawk_bootstrap-3.1.8-2
 	grep_bootstrap-2.14-1
-	icu_bootstrap-67.1-2
+	icu_bootstrap-57.2-1
-	icu_bootstrap_devel-67.1-2
+	icu_bootstrap_devel-57.2-1
 	less_bootstrap-451-1
 	m4_bootstrap-1.4.16-1
 	make_bootstrap-4.3-1
-	ncurses6_bootstrap-6.0-1
+	ncurses6_bootstrap-6.2-1
-	ncurses6_bootstrap_devel-6.0-1
+	ncurses6_bootstrap_devel-6.2-1
 	libffi_bootstrap-3.3-1
 	python_bootstrap-3.9.1-1
 	sed_bootstrap-4.2.1-1

build/jam/repositories/HaikuPortsCross/riscv64

@@ -6,35 +6,37 @@ BootstrapPackageRepository HaikuPortsCross
 	noto-20170202-7
 	:
 	# repository architecture packages (stage 0)
-	gcc_bootstrap-8.3.0_2021_02_27-1
+	gcc_bootstrap-11.2.0_2021_07_28-3
-	gcc_bootstrap_syslibs-8.3.0_2021_02_27-1
+	gcc_bootstrap_syslibs-11.2.0_2021_07_28-3
-	gcc_bootstrap_syslibs_devel-8.3.0_2021_02_27-1
+	gcc_bootstrap_syslibs_devel-11.2.0_2021_07_28-3
 	:
 	# repository architecture packages (stage 1)
 	bash_bootstrap-4.4.023-1
-	binutils_bootstrap-2.28.1_2017_08_05-1
+	binutils_bootstrap-2.36.1_2021_09_21-2
 	bison_bootstrap-3.0.5-1
 	coreutils_bootstrap-8.22-1
 	curl_bootstrap-7.40.0-1
 	curl_bootstrap_devel-7.40.0-1
-	expat_bootstrap-2.1.0-1
+	expat_bootstrap-2.4.1-1
-	expat_bootstrap_devel-2.1.0-1
+	expat_bootstrap_devel-2.4.1-1
 	findutils_bootstrap-4.6.0-1
 	flex_bootstrap-2.5.35-1
 	freetype_bootstrap-2.6.3-1
 	freetype_bootstrap_devel-2.6.3-1
 	gawk_bootstrap-3.1.8-2
 	grep_bootstrap-2.14-1
-	icu_bootstrap-57.2-2
+	icu_bootstrap-67.1-2
-	icu_bootstrap_devel-57.2-2
+	icu_bootstrap_devel-67.1-2
 	less_bootstrap-451-1
 	m4_bootstrap-1.4.16-1
-	make_bootstrap-4.1-2
+	make_bootstrap-4.3-1
-	ncurses6_bootstrap-6.0-1
+	ncurses6_bootstrap-6.2-1
-	ncurses6_bootstrap_devel-6.0-1
+	ncurses6_bootstrap_devel-6.2-1
 	python_bootstrap-2.7.6-1
 	sed_bootstrap-4.2.1-1
 	texinfo_bootstrap-4.13a-1
+	zstd_bootstrap-1.5.0-2
+	zstd_bootstrap_devel-1.5.0-2
 	zlib_bootstrap-1.2.11-1
 	zlib_bootstrap_devel-1.2.11-1
 	:
@@ -63,6 +65,7 @@ BootstrapPackageRepository HaikuPortsCross
 	python_bootstrap
 	sed_bootstrap
 	texinfo_bootstrap
+	zstd_bootstrap
 	zlib_bootstrap
 	:
 	# debuginfo packages

configure

@@ -93,6 +93,7 @@ options:
                               specify the path to a GDB source dir, to build
                               GDB for each arch we build the cross-tools for.
   --use-stack-protector       Build with stack protection enabled
+  --efi-signing-key           Private keyfile to sign any EFI bootloaders
 
 environment variables:
   CC                          The host compiler. Defaults to "gcc".
@@ -313,18 +314,24 @@ standard_gcc_settings()
 	local bootLibgcc
 	local bootLibSupCxx
 	local bootCxxHeaders
+	local boot32Libgcc
+	local boot32LibSupCxx
+	local boot32CxxHeaders
 	case $gccMachine in
 		x86_64-*)
 			# Boot loader is 32-bit, need the 32-bit libs and c++ config
-			bootLibgcc=`$gcc -m32 -print-file-name=libgcc.a`
+			boot32Libgcc=`$gcc -m32 -print-file-name=libgcc.a`
-			bootLibSupCxx=`$gcc -m32 -print-file-name=libsupc++.a`
+			boot32LibSupCxx=`$gcc -m32 -print-file-name=libsupc++.a`
+			bootLibgcc=`$gcc -print-file-name=libgcc.a`
+			bootLibSupCxx=`$gcc -print-file-name=libsupc++.a`
 
 			local headersBase=$gccdir/../../../..
 			local headers=$headersBase/$gccMachine/include/c++/$gccRawVersion
 			if [ ! -d $headers ]; then
 				headers=$headersBase/include/c++/$gccRawVersion
 			fi
-			bootCxxHeaders="$headers/$gccMachine/32"
+			boot32CxxHeaders="$headers/$gccMachine/32"
+			bootCxxHeaders="$headers/$gccMachine"
 			;;
 	esac
 
@@ -354,6 +361,9 @@ standard_gcc_settings()
 	set_variable HAIKU_BOOT_CXX_HEADERS_DIR_$targetArch "$bootCxxHeaders"
 	set_variable HAIKU_BOOT_LIBSUPCXX_$targetArch "$bootLibSupCxx"
 	set_variable HAIKU_BOOT_LIBGCC_$targetArch $bootLibgcc
+	set_variable HAIKU_BOOT_32_CXX_HEADERS_DIR_$targetArch "$boot32CxxHeaders"
+	set_variable HAIKU_BOOT_32_LIBSUPCXX_$targetArch "$boot32LibSupCxx"
+	set_variable HAIKU_BOOT_32_LIBGCC_$targetArch $boot32Libgcc
 	set_variable HAIKU_USE_GCC_GRAPHITE_$targetArch $useGraphite
 
 	standard_gcc_settings_targetArch=$targetArch
@@ -804,6 +814,11 @@ while [ $# -gt 0 ] ; do
 		--no-xattr)		HAIKU_HOST_USE_XATTR_REF=0; shift 1;;
 		--with-gdb)	gdbSources=$2; shift 2;;
 		--use-stack-protector)	HAIKU_USE_STACK_PROTECTOR=1; shift 1;;
+		--efi-signing-key)
+			assertparam "$1" $#
+			HAIKU_EFI_SIGNING_KEY="$2"
+			shift 2
+			;;
 		*)				echo Invalid argument: \`$1\'; exit 1;;
 	esac
 done
@@ -1112,6 +1127,7 @@ HAIKU_PORTS					?= ${HAIKU_PORTS} ;
 HAIKU_PORTS_CROSS			?= ${HAIKU_PORTS_CROSS} ;
 HAIKU_IS_BOOTSTRAP			?= ${HAIKU_IS_BOOTSTRAP} ;
 
+HAIKU_BOOT_EFI_PRIVATE_KEYFILE	?= ${HAIKU_EFI_SIGNING_KEY} ;
 EOF
 
 for targetArch in $HAIKU_PACKAGING_ARCHS; do
@@ -1125,6 +1141,8 @@ for targetArch in $HAIKU_PACKAGING_ARCHS; do
 		HAIKU_GCC_LIB_DIR			HAIKU_GCC_LIB_DIR
 		HAIKU_BOOT_LIBGCC			HAIKU_BOOT_LIBGCC
 		HAIKU_BOOT_LIBSUPC++		HAIKU_BOOT_LIBSUPCXX
+		HAIKU_BOOT_32_LIBGCC		HAIKU_BOOT_32_LIBGCC
+		HAIKU_BOOT_32_LIBSUPC++		HAIKU_BOOT_32_LIBSUPCXX
 		HAIKU_AR					HAIKU_AR
 		HAIKU_LD					HAIKU_LD
 		HAIKU_OBJCOPY				HAIKU_OBJCOPY
@@ -1150,6 +1168,7 @@ for targetArch in $HAIKU_PACKAGING_ARCHS; do
 	# lines so that jam doesn't hit the maximum line length.
 	variables="
 		HAIKU_BOOT_C++_HEADERS_DIR	HAIKU_BOOT_CXX_HEADERS_DIR
+		HAIKU_BOOT_32_C++_HEADERS_DIR	HAIKU_BOOT_32_CXX_HEADERS_DIR
 		"
 	set -- $variables
 	while [ $# -ge 2 ]; do

data/boot/efi/keys/DB.crt

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDEzCCAfugAwIBAgIUX+q+28/np8o/Vg64GrIN8CEcEA8wDQYJKoZIhvcNAQEL
+BQAwGTEXMBUGA1UEAwwOSGFpa3UsIEluYy4gREIwHhcNMjIwMjA2MTk1MTQzWhcN
+NDIwMjA2MTk1MTQzWjAZMRcwFQYDVQQDDA5IYWlrdSwgSW5jLiBEQjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKn6b6J60zU5L+UPXhHbJ2epyoQ+YKAo
+6L7gmk79nBFOqidX10wfBFijZxdPvBeGHlMpmukjdgGNbOHKqYrYLsJHhrd/IZ+T
+TMSa+ZD2d+2dSgn+jYQji3mOVnrb2xemRo9+IDiC37cEVAmOO1t5E0NmyM2rm2p0
+HeShbLbcg+78mpgs3mDTzWbq4p7VRVdxjDI1i7108aaf2dVpDbh3Q0ipO9YEoTQq
+3cXUeQ4IiR7FFzPlEZHSViSi3Fieg4GTHjkhZG3HLHYGEuR/B8lA9+S4uvYCiV8n
+t/NVC6osnUBCKyl+00gLLohQGkNGDZXGZNwcIH9tls/AHysoNPrpI98CAwEAAaNT
+MFEwHQYDVR0OBBYEFNganI/FIKluRVA+9LbrNDAZSjJBMB8GA1UdIwQYMBaAFNga
+nI/FIKluRVA+9LbrNDAZSjJBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+BQADggEBAAGz7qdUBHtk30JlB3M+z6Z78tIfz288SV+eekO+rl+8Fo+M+qSB6OrO
+j1VcUSEQgbLFqoJz9haoEyUxXP8g/XWNx5n9gbPWZQHwva1AN9PHw4modF1XDCAV
+N1F3pQ1atz3K+fOZWU6peDyoQEKI2szAtNycoV7x5SXFPybyyC4yPCW3ijou9sxW
+D8jPECU+6RTh93pFptL+/KPFcLOi5ihCyMApqjNSvOox6m0LFUxCSpBJIk0QBOPQ
+PHDAiSkkQaOHfA/5AnU/iyedsBYBlnY40drY4DGEntRG5yiMhvRjfmFfEufujCiZ
+OVrndpb+VY6W5EzvGusu3HeSaMywj8w=
+-----END CERTIFICATE-----

data/boot/efi/keys/README.md

@@ -0,0 +1,37 @@
+# Haiku UEFI Keys
+
+The EFI keys in this directory can be used to boot Haiku in UEFI Secure Mode.
+The Haiku, Inc. key must be appended to your EFI BIOS trusted keychain to function.
+
+> This is only needed when you're booting in EFI Secure Boot mode! It's probably
+> easier to disable EFI Secure Boot in most cases.
+
+## Installing UEFI Keys
+
+To trust Haiku's EFI bootloader, you'll need to append our DB key to your BIOS's
+DB keychain.
+
+> Ensure the Haiku installation media is inserted / plugged into your computer.
+
+Real world examples:
+
+* Dell XPS 13 Laptop (Dell BIOS)
+  * Boot laptop, press F2 to enter BIOS
+  * Settings -> Secure Boot -> Secure Boot Enable
+    * Verify Secure Boot is enabled, otherwise this does nothing.
+  * Settings -> Secure Boot -> Expert Key Management
+    * "Enable Custom Mode" checked
+    * Press "Reset All Keys"
+    * Choose db, then press "Append from File"
+    * Navigate to the Haiku USB installation media
+    * EFI -> KEYS -> DB.auth
+
+* Framework Laptop (InsydeH20 BIOS)
+  * Boot laptop, press F2 to enter BIOS
+  * Security -> Secure Boot
+  * Enforce Secure Boot enabled
+  * DB Options -> Enroll Signature -> PKCS7
+  * Haiku ESP -> KEYS -> DB.cer
+  * (you can leave the "Owner_GUID" blank)
+  * Enroll DB.cer -> Yes
+  * F10, Save and Exit

data/boot/u-boot/boot-arm.scr.txt

@@ -11,9 +11,8 @@ test -e ${media} 0 ${loader} && echo "Found ${loader} on ${media} 0!"
 echo "Loading bootloader..."
 fatload ${media} 0 ${kernel_addr_r} ${loader}
 test -e ${media} 0 haiku_floppyboot.ub && fatload ${media} 0 ${ramdisk_addr_r} haiku_floppyboot.ub
-env exists dtb && echo "Using custom DTB..." && fatload ${media} 0 ${fdt_addr_r} ${dtb} && fdt addr ${fdt_addr_r}
+env exists dtb && echo "Using custom DTB..." && fatload ${media} 0 ${fdt_addr_r} ${dtb}
-env exists dtb || echo "Using internal DTB..." && fdt addr ${fdtcontroladdr}
+env exists dtb || echo "Using internal DTB..." && setenv fdt_addr_r ${fdtcontroladdr}
-test "${platform}" = "efi" && echo "Launching EFI loader..." && bootefi ${kernel_addr_r}
+test "${platform}" = "efi" && echo "Launching EFI loader..." && bootefi ${kernel_addr_r} ${fdt_addr_r}
-test "${platform}" = "u-boot" && env exists dtb && echo "Launching ub loader..." && bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdtcontroladdr}
+test "${platform}" = "u-boot" && echo "Launching ub loader..." && bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
-test "${platform}" = "u-boot" && env exists dtb || echo "Launching ub loader (w/custom fdt)..." && bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
 echo "Haiku u-boot script fell through!" && exit

data/catalogs/add-ons/disk_systems/bfs/it.catkeys

@@ -1,6 +1,6 @@
 1	italian	x-vnd.Haiku-BFSAddOn	1570987954
 Enable query support	BFS_Initialize_Parameter		Attiva supporto per le interrogazioni
-Disabling query support may speed up certain file system operations, but should\nonly be used if one is absolutely certain that one will not need queries.\nAny volume that is intended for booting Haiku must have query support enabled.	BFS_Initialize_Parameter		Disabilitare il supporto alle interrogazioni può velocizzare alcune operazioni sul file system, ma dovrebbe\nessere utilizzato solo se si è completamente sicuri di non averne bisogno.\nOgni disco che potrebbe essere utilizzato per avviare Haiku deve avere il supporto alle interrogazioni abilitato.
+Disabling query support may speed up certain file system operations, but should\nonly be used if one is absolutely certain that one will not need queries.\nAny volume that is intended for booting Haiku must have query support enabled.	BFS_Initialize_Parameter		Disabilitare il supporto alle interrogazioni può velocizzare alcune operazioni sul file system, ma dovrebbe\nessere utilizzato solo se si è completamente sicuri di non averne bisogno.\nOgni disco atto ad avviare Haiku deve avere il supporto alle interrogazioni abilitato.
 Name:	BFS_Initialize_Parameter		Nome:
 8192 (Mostly large files)	BFS_Initialize_Parameter		8192 (Per file di grandi dimensioni)
 2048 (Recommended)	BFS_Initialize_Parameter		2048 (Raccomandato)

data/catalogs/add-ons/disk_systems/bfs/tr.catkeys

@@ -1,6 +1,6 @@
 1	turkish	x-vnd.Haiku-BFSAddOn	1570987954
 Enable query support	BFS_Initialize_Parameter		Sorgu desteğini etkinleştir
-Disabling query support may speed up certain file system operations, but should\nonly be used if one is absolutely certain that one will not need queries.\nAny volume that is intended for booting Haiku must have query support enabled.	BFS_Initialize_Parameter		Sorgulama desteğini devre dışı bırakmak bazı dosya sistemi işlemlerini hızlandırabilir, ancak\nyalnızca sorgulamaya gerek duymayacağınızdan eminseniz kullanılmalıdır.\nHaiku'yu önyüklemek için kullanacağınız bölümde sorgulama desteği etkin durumda olmalıdır.
+Disabling query support may speed up certain file system operations, but should\nonly be used if one is absolutely certain that one will not need queries.\nAny volume that is intended for booting Haiku must have query support enabled.	BFS_Initialize_Parameter		Sorgulama desteğini devre dışı bırakmak bazı dosya sistemi işlemlerini hızlandırabilir; ancak\nyalnızca sorgulamaya gerek duymayacağınızdan eminseniz kullanılmalıdır.\nHaiku'yu önyüklemek için kullanacağınız bölümde sorgulama desteği etkin durumda olmalıdır.
 Name:	BFS_Initialize_Parameter		Ad:
 8192 (Mostly large files)	BFS_Initialize_Parameter		8192 (Çoğunlukla büyük dosyalar)
 2048 (Recommended)	BFS_Initialize_Parameter		2048 (Önerilen)

data/catalogs/add-ons/disk_systems/bfs/zh_Hans.catkeys

@@ -1,6 +1,6 @@
 1	english	x-vnd.Haiku-BFSAddOn	1570987954
 Enable query support	BFS_Initialize_Parameter		启用查询支持
-Disabling query support may speed up certain file system operations, but should\nonly be used if one is absolutely certain that one will not need queries.\nAny volume that is intended for booting Haiku must have query support enabled.	BFS_Initialize_Parameter		禁用查询支持可能会加速某些文件系统操作，\n但这样做时你应该绝对肯定你不需要查询功能．\n任何用于启动 Haiku 的卷必须启用查询支持．
+Disabling query support may speed up certain file system operations, but should\nonly be used if one is absolutely certain that one will not need queries.\nAny volume that is intended for booting Haiku must have query support enabled.	BFS_Initialize_Parameter		禁用查询支持会加速某些文件系统操作，\n这样做时你应该确定你不需要查询功能。\n任何用于启动 Haiku 的卷必须启用查询支持。
 Name:	BFS_Initialize_Parameter		名称：
 8192 (Mostly large files)	BFS_Initialize_Parameter		8192（大文件使用）
 2048 (Recommended)	BFS_Initialize_Parameter		2048（推荐使用）

data/catalogs/add-ons/input_server/devices/keyboard/tr.catkeys

@@ -5,7 +5,7 @@ Open Terminal	Team monitor		Uçbirim'i aç
 {0, plural,one{Hold CONTROL+ALT+DELETE for # second to reboot.}other{Hold CONTROL+ALT+DELETE for # seconds to reboot.}}	Team monitor		{0, plural, other{Yeniden başlatmak için CTRL+ALT+DEL'i # saniye basılı tutun.}}
 Restart the desktop	Team monitor		Masaüstü'nü yeniden başlat
 Force reboot	Team monitor		Yeniden başlatmaya zorla
-Team monitor	Team monitor		Takım monitörü
+Team monitor	Team monitor		Takım Monitörü
 Kill application	Team monitor		Uygulamayı sonlandır
-Cancel	Team monitor		İptal
+Cancel	Team monitor		Vazgeç
 (This team is a system component)	Team monitor		(Bu takım bir sistem parçasıdır)

data/catalogs/add-ons/mail_daemon/inbound_protocols/imap/de.catkeys

@@ -1,12 +1,12 @@
 1	german	x-vnd.Haiku-IMAP	1343128980
 Could not connect to server \"%server%\":\n%error%	IMAPFolderConfig		Keine Verbindung zum Server \"%server%\":\n%error%
-Updating subscriptions to IMAP folders, please be patient…	IMAPFolderConfig		Abonnements der IMAP-Ordner werden aktualisiert, bitte warten…
+Updating subscriptions to IMAP folders, please be patient…	IMAPFolderConfig		Abonnements der IMAP-Ordner werden aktualisiert, bitte warten …
 Failed to fetch available storage.	IMAPFolderConfig		Keine der vorhandenen Ablagen konnte übertragen werden.
 Cancel	IMAPFolderConfig		Abbrechen
 OK	IMAPFolderConfig		OK
 Server storage: %s / %s used.	IMAPFolderConfig		Serverspeicher: %s / %s belegt.
 No encryption	imap_config		Keine Verschlüsselung
-Fetching IMAP folders, please be patient…	IMAPFolderConfig		IMAP-Ordner werden angefordert, bitte warten…
+Fetching IMAP folders, please be patient…	IMAPFolderConfig		IMAP-Ordner werden angefordert, bitte warten …
 Configure IMAP Folders	imap_config		IMAP-Ordner konfigurieren
 SSL	imap_config		SSL
 Apply	IMAPFolderConfig		Anwenden

data/catalogs/add-ons/mail_daemon/inbound_protocols/imap/tr.catkeys

@@ -2,7 +2,7 @@
 Could not connect to server \"%server%\":\n%error%	IMAPFolderConfig		\"%server%\" sunucusuna bağlanılamadı:\n%error%
 Updating subscriptions to IMAP folders, please be patient…	IMAPFolderConfig		IMAP klasörlerine olan abonelikler güncelleniyor, lütfen bekleyin…
 Failed to fetch available storage.	IMAPFolderConfig		Kullanılabilir depolama alanı getirilemedi.
-Cancel	IMAPFolderConfig		İptal
+Cancel	IMAPFolderConfig		Vazgeç
 OK	IMAPFolderConfig		Tamam
 Server storage: %s / %s used.	IMAPFolderConfig		Sunucu depolaması: %s/%s kullanılıyor.
 No encryption	imap_config		Şifreleme yok

data/catalogs/add-ons/mail_daemon/inbound_protocols/pop3/de.catkeys

@@ -1,18 +1,18 @@
 1	german	x-vnd.Haiku-POP3	3335299031
-Sending username…	pop3		Benutzername wird gesendet…
+Sending username…	pop3		Benutzername wird gesendet …
-Connect to server…	pop3		Mit Server verbinden…
+Connect to server…	pop3		Mit Server verbinden …
 APOP	ConfigView		APOP
-Connecting to POP3 server…	pop3		Mit POP3-Server verbinden…
+Connecting to POP3 server…	pop3		Mit POP3-Server verbinden …
 : The server does not support APOP.	pop3		: APOP wird vom Server nicht unterstützt.
 Error while authenticating user %user	pop3		Fehler beim Authentifizieren von Benutzer %user
 Destination:	ConfigView		Zielverzeichnis:
 . The server said:\n	pop3		. Servermeldung:\n
 Plain text	ConfigView		Klartext
-Getting mailbox size…	pop3		Postfachgröße wird ermittelt…
+Getting mailbox size…	pop3		Postfachgröße wird ermittelt …
 Error while connecting to server %serv	pop3		Fehler beim Verbinden mit Server %serv
-Getting UniqueIDs…	pop3		UniqueIDs werden empfangen…
+Getting UniqueIDs…	pop3		UniqueIDs werden empfangen …
-Sending password…	pop3		Passwort wird gesendet…
+Sending password…	pop3		Passwort wird gesendet …
 No encryption	ConfigView		Keine Verschlüsselung
 SSL	ConfigView		SSL
 : No reply.\n	pop3		: Keine Antwort.\n
-Sending APOP authentication…	pop3		APOP-Authentifizierung wird gesendet…
+Sending APOP authentication…	pop3		APOP-Authentifizierung wird gesendet …

data/catalogs/add-ons/mail_daemon/outbound_protocols/smtp/de.catkeys

@@ -2,7 +2,7 @@
 POP3 authentication failed. The server said:\n	smtp		POP3-Authentifizierung fehlgeschlagen. Servermeldung:\n
 Destination:	ConfigView		Zielverzeichnis:
 Error while logging in to %serv	smtp		Fehler beim Anmelden an %serv
-Connecting to server…	smtp		Mit Server verbinden…
+Connecting to server…	smtp		Mit Server verbinden …
 Unencrypted	ConfigView		Unverschlüsselt
 . The server says:\n	smtp		. Servermeldung:\n
 Error while opening connection to %serv	smtp		Fehler beim Verbinden mit %serv

data/catalogs/add-ons/media/media-add-ons/mixer/be.catkeys

@@ -1,27 +1,19 @@
-1	belarusian	x-vnd.Haiku-mixer.media_addon	3450667169
+1	belarusian	x-vnd.Haiku-mixer.media_addon	3463574286
-Input gain controls represent	AudioMixer		Уваходныя рэгулятары узмацнення
+Input mapping	AudioMixer		Перапрызначенне ўваходаў
-Linear interpolation	AudioMixer		Линейная iнтэрпаляцыя
-Virtual output channels	AudioMixer		Вiртуальныя выхадныя каналы
-Refuse output format changes	AudioMixer		Адмовіць змяняць выхадны фармат
-Output mapping	AudioMixer		Мапа вывадаў
-Allow input channel remapping	AudioMixer		Дазволiць перапрызначэнне ўваходнага канала
-Resampling algorithm	AudioMixer		Алгарытм рэсэмплінгу
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Аслабiць выхад мiксеру на 3дБ(як у BeOS R5)
-Display balance control for stereo connections	AudioMixer		Паказаць рэгулятар балансу для стэрэа злучэнняў
 To output	AudioMixer		Выводзіць
+Gain	AudioMixer		Узмацненне
+To master	AudioMixer		Да асноўнага
 not connected	AudioMixer		ня злучана
-Refuse input format changes	AudioMixer		Адмова змен ўваходнага фармату
+Master output	AudioMixer		Асноўны выхад
-Drop/repeat samples	AudioMixer		Прапусцiць/паўтарыць сэмплы
-Output channel sources	AudioMixer		Крыніцы выхаднога каналу
 dB	AudioMixer		дБ
 Gain controls	AudioMixer		Рэгулятары ўзмацнення
-Input mapping	AudioMixer		Перапрызначенне ўваходаў
+Output channel sources	AudioMixer		Крыніцы выхаднога каналу
-Mute	AudioMixer		Сцішыць
+Allow input channel remapping	AudioMixer		Дазволiць перапрызначэнне ўваходнага канала
-Input channel destinations	AudioMixer		Назначэнне ўваходных каналаў
+Display balance control for stereo connections	AudioMixer		Паказаць рэгулятар балансу для стэрэа злучэнняў
-To master	AudioMixer		Да асноўнага
-Master output	AudioMixer		Асноўны выхад
 Setup	AudioMixer		Наладкі
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Нелінейнае кіраванне гукам (як у BeOS R5)
-Gain	AudioMixer		Узмацненне
-Allow output channel remapping	AudioMixer		Дазволiць перапрызначэнне выхаднога каналу
 Physical input channels	AudioMixer		Фiзiчныя ўваходныя каналы
+Input channel destinations	AudioMixer		Назначэнне ўваходных каналаў
+Mute	AudioMixer		Сцішыць
+Output mapping	AudioMixer		Мапа вывадаў
+Virtual output channels	AudioMixer		Вiртуальныя выхадныя каналы
+Allow output channel remapping	AudioMixer		Дазволiць перапрызначэнне выхаднога каналу

data/catalogs/add-ons/media/media-add-ons/mixer/ca.catkeys

@@ -1,27 +1,24 @@
-1	catalan; valencian	x-vnd.Haiku-mixer.media_addon	3450667169
+1	catalan; valencian	x-vnd.Haiku-mixer.media_addon	275473112
-Input gain controls represent	AudioMixer		Els controls de guany de l'entrada representen
+Input mapping	AudioMixer		Mapeig d'entrada
-Linear interpolation	AudioMixer		Interpolació lineal
+High quality (linear interpolation)	AudioMixer		Alta qualitat (interpolació lineal)
-Virtual output channels	AudioMixer		Canals de sortida virtuals
-Refuse output format changes	AudioMixer		Rebutja els canvis de format de la sortida
-Output mapping	AudioMixer		Mapeig de sortida
-Allow input channel remapping	AudioMixer		Permet el remapat del canal d'entrada
-Resampling algorithm	AudioMixer		Algorisme de canvi del mostratge
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Atenua 3dB la sortida del mesclador (com al BeOS R5)
-Display balance control for stereo connections	AudioMixer		Mostra el control de l'equilibri de les connexions estèreo
 To output	AudioMixer		Cap a la sortida
+Gain	AudioMixer		Guany
+To master	AudioMixer		Cap al mestre
 not connected	AudioMixer		no està connectat
-Refuse input format changes	AudioMixer		Rebutja els canvis de format de l'entrada
+Master output	AudioMixer		Sortida principal
-Drop/repeat samples	AudioMixer		Abandona/repeteix les mostres
-Output channel sources	AudioMixer		Procedència del canal de sortida
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Controls de guany
-Input mapping	AudioMixer		Mapeig d'entrada
+Low quality (drop/repeat samples)	AudioMixer		Baixa qualitat (abandonament / repetició de mostres)
-Mute	AudioMixer		Silencia
+Output channel sources	AudioMixer		Procedència del canal de sortida
-Input channel destinations	AudioMixer		Destins de canal d'entrada
+Allow input channel remapping	AudioMixer		Permet el remapat del canal d'entrada
-To master	AudioMixer		Cap al mestre
+Display balance control for stereo connections	AudioMixer		Mostra el control de l'equilibri de les connexions estèreo
-Master output	AudioMixer		Sortida principal
 Setup	AudioMixer		Configuració
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Usa controls de guany lliscants no lineals (com el BeOS R5)
-Gain	AudioMixer		Guany
-Allow output channel remapping	AudioMixer		Permet el remapat del canal de sortida
 Physical input channels	AudioMixer		Canals d'entrada físics
+Input channel destinations	AudioMixer		Destins de canal d'entrada
+Resampling algorithm:	AudioMixer		Algorisme de remotreig:
+Mute	AudioMixer		Silencia
+Output mapping	AudioMixer		Mapeig de sortida
+Virtual output channels	AudioMixer		Canals de sortida virtuals
+Allow output channel remapping	AudioMixer		Permet el remapat del canal de sortida
+Input gain controls represent:	AudioMixer		Els controls de guany d'entrada representen això:
+Attenuate mixer output by 3 dB	AudioMixer		Atenua la sortida del mesclador 3 dB

data/catalogs/add-ons/media/media-add-ons/mixer/cs.catkeys

@@ -1,27 +1,24 @@
-1	czech	x-vnd.Haiku-mixer.media_addon	3450667169
+1	czech	x-vnd.Haiku-mixer.media_addon	275473112
-Input gain controls represent	AudioMixer		Ovládací prvky zesílení vstupu představují
+Input mapping	AudioMixer		Mapování vstupu
-Linear interpolation	AudioMixer		Lineární interpolace
+High quality (linear interpolation)	AudioMixer		Vysoká kvalita (lineární prokládání)
-Virtual output channels	AudioMixer		Virtuální výstupní kanály
-Refuse output format changes	AudioMixer		Odmítnout změny výstupního formátu
-Output mapping	AudioMixer		Mapování výstupu
-Allow input channel remapping	AudioMixer		Povolit přemapování vstupního kanálu
-Resampling algorithm	AudioMixer		Algoritmus převzorkování
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Utlumit výstup směšovače o 3dB (jako BeOS R5)
-Display balance control for stereo connections	AudioMixer		Zobrazit ovládání vyvážení při stereo připojeních
 To output	AudioMixer		Na výstup
+Gain	AudioMixer		Zesílení
+To master	AudioMixer		Na hlavní
 not connected	AudioMixer		není připojeno
-Refuse input format changes	AudioMixer		Odmítnout změny formátu vstupu
+Master output	AudioMixer		Hlavní výstup
-Drop/repeat samples	AudioMixer		Zahodit/opakovat vzorky
-Output channel sources	AudioMixer		Zdroje výstupního kanálu
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Ovládání zesílení
-Input mapping	AudioMixer		Mapování vstupu
+Low quality (drop/repeat samples)	AudioMixer		Nízká kvalita (zahazovat/opakovat vzorky)
-Mute	AudioMixer		Ztlumit
+Output channel sources	AudioMixer		Zdroje výstupního kanálu
-Input channel destinations	AudioMixer		Cíle vstupního kanálu
+Allow input channel remapping	AudioMixer		Povolit přemapování vstupního kanálu
-To master	AudioMixer		Na hlavní
+Display balance control for stereo connections	AudioMixer		Zobrazit ovládání vyvážení při stereo připojeních
-Master output	AudioMixer		Hlavní výstup
 Setup	AudioMixer		Nastavení
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Použít nelineární posuvníky zesílení (jako BeOS R5)
-Gain	AudioMixer		Zesílení
-Allow output channel remapping	AudioMixer		Povolit přemapování výstupních kanálů
 Physical input channels	AudioMixer		Fyzické vstupní kanály
+Input channel destinations	AudioMixer		Cíle vstupního kanálu
+Resampling algorithm:	AudioMixer		Algoritmus převzorkování:
+Mute	AudioMixer		Ztlumit
+Output mapping	AudioMixer		Mapování výstupu
+Virtual output channels	AudioMixer		Virtuální výstupní kanály
+Allow output channel remapping	AudioMixer		Povolit přemapování výstupních kanálů
+Input gain controls represent:	AudioMixer		Vstupní ovládací prvky zesílení představují:
+Attenuate mixer output by 3 dB	AudioMixer		Zmírnit výstup mixéru o 3 dB

data/catalogs/add-ons/media/media-add-ons/mixer/da.catkeys

@@ -1,27 +1,19 @@
-1	danish	x-vnd.Haiku-mixer.media_addon	3450667169
+1	danish	x-vnd.Haiku-mixer.media_addon	3463574286
-Input gain controls represent	AudioMixer		Repræsentant for input gain-styringer
+Input mapping	AudioMixer		Inputkortlægning
-Linear interpolation	AudioMixer		Lineær interpolering
-Virtual output channels	AudioMixer		Virtuelle outputkaneler
-Refuse output format changes	AudioMixer		Nægt ændringer af outputformat
-Output mapping	AudioMixer		Outportkortlægning
-Allow input channel remapping	AudioMixer		Tillad genkortlæsning af inputkanaler
-Resampling algorithm	AudioMixer		Gemsamplingsalgoritme
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Svæk mixeroutput med 3dB (ligesom BeOS R5)
-Display balance control for stereo connections	AudioMixer		Vis balancestyring til stereoforbindelser
 To output	AudioMixer		Til output
+Gain	AudioMixer		Gain
+To master	AudioMixer		Til master
 not connected	AudioMixer		ikke tilsluttet
-Refuse input format changes	AudioMixer		Nægt ændringer af inputformat
+Master output	AudioMixer		Master-output
-Drop/repeat samples	AudioMixer		Drop/gentag datapunkter
-Output channel sources	AudioMixer		Kilder for outputkanal
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Gain-styringer
-Input mapping	AudioMixer		Inputkortlægning
+Output channel sources	AudioMixer		Kilder for outputkanal
-Mute	AudioMixer		Mute
+Allow input channel remapping	AudioMixer		Tillad genkortlæsning af inputkanaler
-Input channel destinations	AudioMixer		Destinationer for inputkanal
+Display balance control for stereo connections	AudioMixer		Vis balancestyring til stereoforbindelser
-To master	AudioMixer		Til master
-Master output	AudioMixer		Master-output
 Setup	AudioMixer		Opsætning
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Brug ikke-lineær gain-skydere (ligesom BeOS R5)
-Gain	AudioMixer		Gain
-Allow output channel remapping	AudioMixer		Tillad kortlægning af outputkanal
 Physical input channels	AudioMixer		Fysiske inputkanaler
+Input channel destinations	AudioMixer		Destinationer for inputkanal
+Mute	AudioMixer		Mute
+Output mapping	AudioMixer		Outportkortlægning
+Virtual output channels	AudioMixer		Virtuelle outputkaneler
+Allow output channel remapping	AudioMixer		Tillad kortlægning af outputkanal

data/catalogs/add-ons/media/media-add-ons/mixer/de.catkeys

@@ -1,27 +1,24 @@
-1	german	x-vnd.Haiku-mixer.media_addon	3450667169
+1	german	x-vnd.Haiku-mixer.media_addon	275473112
-Input gain controls represent	AudioMixer		Regler für Eingangslautstärke sind 
+Input mapping	AudioMixer		Eingangs-Zuordnung
-Linear interpolation	AudioMixer		Lineare Interpolation
+High quality (linear interpolation)	AudioMixer		Hohe Qualität (lineare Interpolation)
-Virtual output channels	AudioMixer		Virtuelle Ausgangskanäle
-Refuse output format changes	AudioMixer		Änderungen des Ausgabeformats verhindern
-Output mapping	AudioMixer		Ausgangs-Zuordnung
-Allow input channel remapping	AudioMixer		Neuzuordnung der Eingangskanäle erlauben
-Resampling algorithm	AudioMixer		Resample-Algorithmus
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Mixerausgabe um 3dB dämpfen (wie BeOS R5)
-Display balance control for stereo connections	AudioMixer		Balance-Regler für Stereo-Anschlüsse anzeigen 
 To output	AudioMixer		Zum Ausgang
+Gain	AudioMixer		Verstärkung
+To master	AudioMixer		Zum Master
 not connected	AudioMixer		nicht verbunden
-Refuse input format changes	AudioMixer		Änderungen des Eingangsformats verhindern
+Master output	AudioMixer		Master-Ausgang
-Drop/repeat samples	AudioMixer		Samples auslassen/wiederholen
-Output channel sources	AudioMixer		Ausgangskanalquellen
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Lautstärke
-Input mapping	AudioMixer		Eingangs-Zuordnung
+Low quality (drop/repeat samples)	AudioMixer		Niedrige Qualität (Samples weglassen/wiederholen)
-Mute	AudioMixer		Stumm
+Output channel sources	AudioMixer		Ausgangskanalquellen
-Input channel destinations	AudioMixer		Eingangskanalziele
+Allow input channel remapping	AudioMixer		Neuzuordnung der Eingangskanäle erlauben
-To master	AudioMixer		Zum Master
+Display balance control for stereo connections	AudioMixer		Balance-Regler für Stereo-Verbindungen anzeigen 
-Master output	AudioMixer		Master-Ausgang
 Setup	AudioMixer		Einstellungen
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Nicht-lineare Lautstärkeregler (wie BeOS R5)
-Gain	AudioMixer		Verstärkung
-Allow output channel remapping	AudioMixer		Neuzuordnung der Ausgangskanäle erlauben
 Physical input channels	AudioMixer		Physische Eingangskanäle
+Input channel destinations	AudioMixer		Eingangskanalziele
+Resampling algorithm:	AudioMixer		Resample Algorithmus:
+Mute	AudioMixer		Stumm
+Output mapping	AudioMixer		Ausgangs-Zuordnung
+Virtual output channels	AudioMixer		Virtuelle Ausgangskanäle
+Allow output channel remapping	AudioMixer		Neuzuordnung der Ausgangskanäle erlauben
+Input gain controls represent:	AudioMixer		Eingangsverstärker-Regler zeigen:
+Attenuate mixer output by 3 dB	AudioMixer		Mixerausgang um 3 dB dämpfen

data/catalogs/add-ons/media/media-add-ons/mixer/el.catkeys

@@ -1,27 +1,24 @@
-1	greek, modern (1453-)	x-vnd.Haiku-mixer.media_addon	3450667169
+1	greek, modern (1453-)	x-vnd.Haiku-mixer.media_addon	275473112
-Input gain controls represent	AudioMixer		Αναπαράσταση απολαβής εισόδου ήχου
+Input mapping	AudioMixer		Χαρτογράφηση εισόδου
-Linear interpolation	AudioMixer		Γραμμική παρεμβολή
+High quality (linear interpolation)	AudioMixer		Υψηλή ποιότητα (γραμμική παρεμβολή)
-Virtual output channels	AudioMixer		Κανάλια εικονικής εξόδου
-Refuse output format changes	AudioMixer		Απαγόρευση αλλαγών στις μονάδες εξόδου
-Output mapping	AudioMixer		Χαρτογράφηση εξόδου
-Allow input channel remapping	AudioMixer		Έγκριση επαναχαρτογράφησης του καναλιού εισαγωγής
-Resampling algorithm	AudioMixer		Αλγόριθμος αναδειγματοληψίας
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Εξασθένηση της εξόδου του μείκτη κατά 3dB (όπως στο BeOS R5)
-Display balance control for stereo connections	AudioMixer		Προβολή ελέγχου ισορροπίας ήχου για στερεοφωνικές συνδέσεις
 To output	AudioMixer		Προς έξοδο
+Gain	AudioMixer		Απολαβή
+To master	AudioMixer		Προς κύρια έξοδο
 not connected	AudioMixer		μη συνδεδεμένο
-Refuse input format changes	AudioMixer		Απαγόρευση αλλαγών στις μονάδες εισόδου
+Master output	AudioMixer		Κύρια έξοδος
-Drop/repeat samples	AudioMixer		Ρίψιμο/επανάληψη δειγμάτων
-Output channel sources	AudioMixer		Πηγές καναλιών εξόδου
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Έλεγχος απολαβής
-Input mapping	AudioMixer		Χαρτογράφηση εισόδου
+Low quality (drop/repeat samples)	AudioMixer		Χαμηλή ποιότητα (απόρριψη/επανάληψη δειγμάτων)
-Mute	AudioMixer		Σίγαση
+Output channel sources	AudioMixer		Πηγές καναλιών εξόδου
-Input channel destinations	AudioMixer		Προορισμοί καναλιού εισαγωγής
+Allow input channel remapping	AudioMixer		Έγκριση επαναχαρτογράφησης του καναλιού εισαγωγής
-To master	AudioMixer		Προς κύρια έξοδο
+Display balance control for stereo connections	AudioMixer		Προβολή ελέγχου ισορροπίας ήχου για στερεοφωνικές συνδέσεις
-Master output	AudioMixer		Κύρια έξοδος
 Setup	AudioMixer		Ρύθμιση
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Χρήση μη-γραμμικών μπαρών απολαβής (όπως στο BeOS R5)
-Gain	AudioMixer		Απολαβή
-Allow output channel remapping	AudioMixer		Έγκριση επαναχαρτογράφησης του καναλιού εξαγωγής
 Physical input channels	AudioMixer		Υλικά κανάλια εισόδου
+Input channel destinations	AudioMixer		Προορισμοί καναλιού εισαγωγής
+Resampling algorithm:	AudioMixer		Αλγόριθμος για resampling:
+Mute	AudioMixer		Σίγαση
+Output mapping	AudioMixer		Χαρτογράφηση εξόδου
+Virtual output channels	AudioMixer		Κανάλια εικονικής εξόδου
+Allow output channel remapping	AudioMixer		Έγκριση επαναχαρτογράφησης του καναλιού εξαγωγής
+Input gain controls represent:	AudioMixer		Τα χειριστήρια αύξησης εισόδου αναπαριστούν:
+Attenuate mixer output by 3 dB	AudioMixer		Εξασθένιση εξόδου του μίκτη κατά 3 dB

data/catalogs/add-ons/media/media-add-ons/mixer/eo.catkeys

@@ -1,27 +1,19 @@
-1	esperanto	x-vnd.Haiku-mixer.media_addon	3450667169
+1	esperanto	x-vnd.Haiku-mixer.media_addon	3463574286
-Input gain controls represent	AudioMixer		Enigopliigaj stiriloj reprezentas
+Input mapping	AudioMixer		Eniga mapado
-Linear interpolation	AudioMixer		Linia interpolado
-Virtual output channels	AudioMixer		Virtualaj eligaj kanaloj
-Refuse output format changes	AudioMixer		Malpermesi eligajn formŝangojn
-Output mapping	AudioMixer		Eliga mapado
-Allow input channel remapping	AudioMixer		Permesi enigkanelan remapadon
-Resampling algorithm	AudioMixer		Resampla algoritmo
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Atenui miksilan eligon per 3dB (kiel BeOS R5)
-Display balance control for stereo connections	AudioMixer		Montri balancstirilon por stereofoniaj konektoj
 To output	AudioMixer		Al enigo
+Gain	AudioMixer		Pliigo
+To master	AudioMixer		Al majstro
 not connected	AudioMixer		nekonektanta
-Refuse input format changes	AudioMixer		Rifuzi enigformajn ŝanĝojn
+Master output	AudioMixer		Majstra eligo
-Drop/repeat samples	AudioMixer		Ellasi/ripeti specimenojn
-Output channel sources	AudioMixer		Eligkanalaj fontoj
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Pliigaj stiriloj
-Input mapping	AudioMixer		Eniga mapado
+Output channel sources	AudioMixer		Eligkanalaj fontoj
-Mute	AudioMixer		Silentigi
+Allow input channel remapping	AudioMixer		Permesi enigkanelan remapadon
-Input channel destinations	AudioMixer		Enigkanalaj celoj
+Display balance control for stereo connections	AudioMixer		Montri balancstirilon por stereofoniaj konektoj
-To master	AudioMixer		Al majstro
-Master output	AudioMixer		Majstra eligo
 Setup	AudioMixer		Agordi
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Uzu neliniajn pliigstirilojn (kiel BeOS R5)
-Gain	AudioMixer		Pliigo
-Allow output channel remapping	AudioMixer		Permesi eligkanalan remapadon
 Physical input channels	AudioMixer		Fizikaj enigaj kanaloj
+Input channel destinations	AudioMixer		Enigkanalaj celoj
+Mute	AudioMixer		Silentigi
+Output mapping	AudioMixer		Eliga mapado
+Virtual output channels	AudioMixer		Virtualaj eligaj kanaloj
+Allow output channel remapping	AudioMixer		Permesi eligkanalan remapadon

data/catalogs/add-ons/media/media-add-ons/mixer/es.catkeys

@@ -1,27 +1,19 @@
-1	spanish; castilian	x-vnd.Haiku-mixer.media_addon	3450667169
+1	spanish; castilian	x-vnd.Haiku-mixer.media_addon	3463574286
-Input gain controls represent	AudioMixer		Controles de ganancia de entrada representan
+Input mapping	AudioMixer		Asignación de entrada
-Linear interpolation	AudioMixer		Interpolación lineal
-Virtual output channels	AudioMixer		Canales virtuales de salida
-Refuse output format changes	AudioMixer		Rechazar los cambios de formato de salida
-Output mapping	AudioMixer		Asignación de salida
-Allow input channel remapping	AudioMixer		Permitir la entrada del canal de reasignación
-Resampling algorithm	AudioMixer		Algoritmo de remuestreo
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Atenuar la salida del mezclador en 3 dB (como BeOS R5)
-Display balance control for stereo connections	AudioMixer		Pantalla de control de balance para las conexiones estéreo
 To output	AudioMixer		A la salida
+Gain	AudioMixer		Ganancia
+To master	AudioMixer		A maestro
 not connected	AudioMixer		no conectado
-Refuse input format changes	AudioMixer		Rechazar los cambios de formato de entrada
+Master output	AudioMixer		Salida maestra
-Drop/repeat samples	AudioMixer		Muestras de soltar/repetir
-Output channel sources	AudioMixer		Fuentes de salida del canal
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Controles de ganancia
-Input mapping	AudioMixer		Asignación de entrada
+Output channel sources	AudioMixer		Fuentes de salida del canal
-Mute	AudioMixer		Silencio
+Allow input channel remapping	AudioMixer		Permitir la entrada del canal de reasignación
-Input channel destinations	AudioMixer		Destinos del canal de entrada
+Display balance control for stereo connections	AudioMixer		Pantalla de control de balance para las conexiones estéreo
-To master	AudioMixer		A maestro
-Master output	AudioMixer		Salida maestra
 Setup	AudioMixer		Configuración
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Utilice reguladores de ganancia no lineal (como BeOS R5)
-Gain	AudioMixer		Ganancia
-Allow output channel remapping	AudioMixer		Permitir la salida de canal de reasignación
 Physical input channels	AudioMixer		Canales de ingreso físicos
+Input channel destinations	AudioMixer		Destinos del canal de entrada
+Mute	AudioMixer		Silencio
+Output mapping	AudioMixer		Asignación de salida
+Virtual output channels	AudioMixer		Canales virtuales de salida
+Allow output channel remapping	AudioMixer		Permitir la salida de canal de reasignación

data/catalogs/add-ons/media/media-add-ons/mixer/fi.catkeys

@@ -1,27 +1,24 @@
-1	finnish	x-vnd.Haiku-mixer.media_addon	3450667169
+1	finnish	x-vnd.Haiku-mixer.media_addon	275473112
-Input gain controls represent	AudioMixer		Tulovahvistusohjaimet esittää
+Input mapping	AudioMixer		Syötekuvaus
-Linear interpolation	AudioMixer		Lineaarinen interpolointi
+High quality (linear interpolation)	AudioMixer		Korkea laatu (lineaarinen interpolointi)
-Virtual output channels	AudioMixer		Virtuaaliset lähtökanavat
-Refuse output format changes	AudioMixer		Kiellä lähtömuodon muutokset
-Output mapping	AudioMixer		Lähtökuvaus
-Allow input channel remapping	AudioMixer		Salli tulokanavien uudelleenkuvaus
-Resampling algorithm	AudioMixer		Uusintanäytealgoritmi
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		3 dB:n vaimennussekoittajalähtö (kuten BeOS R5)
-Display balance control for stereo connections	AudioMixer		Näytä balanssiohjaus stereoyhteyksille
 To output	AudioMixer		Lähtöön
+Gain	AudioMixer		Vahvistus
+To master	AudioMixer		Master-laitteelle
 not connected	AudioMixer		ei ole yhdistetty
-Refuse input format changes	AudioMixer		Kiellä tulomuodon muutokset
+Master output	AudioMixer		Master-lähtö
-Drop/repeat samples	AudioMixer		Pudota/toista näytteistys
-Output channel sources	AudioMixer		Lähtökanavalähteet
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Vahvistusohjaimet
-Input mapping	AudioMixer		Tulokuvaus
+Low quality (drop/repeat samples)	AudioMixer		Alhainen laatu (pudota/toista näytteistys)
-Mute	AudioMixer		Mykistä
+Output channel sources	AudioMixer		Lähtökanavalähteet
-Input channel destinations	AudioMixer		Tulokanavakohteet
+Allow input channel remapping	AudioMixer		Salli tulokanavien uudelleenkuvaus
-To master	AudioMixer		Master-laitteelle
+Display balance control for stereo connections	AudioMixer		Näytä balanssiohjaus stereoyhteyksille
-Master output	AudioMixer		Master-lähtö
 Setup	AudioMixer		Asetus
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Käytä ei-lineaarisia vahvistusliukukytkimiä (kuten BeOS R5)
+Physical input channels	AudioMixer		Fyysiset syötekanavat
-Gain	AudioMixer		Vahvistus
+Input channel destinations	AudioMixer		Syötekanavakohteet
+Resampling algorithm:	AudioMixer		Uudelleennäytteistysalgoritmi:
+Mute	AudioMixer		Mykistä
+Output mapping	AudioMixer		Lähtökuvaus
+Virtual output channels	AudioMixer		Virtuaaliset lähtökanavat
 Allow output channel remapping	AudioMixer		Salli lähtökanavien uudelleennäytteistys
-Physical input channels	AudioMixer		Fyysiset tulokanavat
+Input gain controls represent:	AudioMixer		Syötevahvistusohjaimet edustavat:
+Attenuate mixer output by 3 dB	AudioMixer		Vaimenna mikserilähtöä 3:lla dB:llä

data/catalogs/add-ons/media/media-add-ons/mixer/fr.catkeys

@@ -1,27 +1,24 @@
-1	french	x-vnd.Haiku-mixer.media_addon	3450667169
+1	french	x-vnd.Haiku-mixer.media_addon	275473112
-Input gain controls represent	AudioMixer		Les contrôles de gain d’entrée représentent
+Input mapping	AudioMixer		Correspondances d’entrées
-Linear interpolation	AudioMixer		Interpolation linéaire
+High quality (linear interpolation)	AudioMixer		Haute qualité (interpolation linéaire)
-Virtual output channels	AudioMixer		Canaux de la sortie virtuelle
-Refuse output format changes	AudioMixer		Refuser les changements de formats de sorties
-Output mapping	AudioMixer		Correspondances de sorties
-Allow input channel remapping	AudioMixer		Autoriser la réassignation des canaux d’entrées
-Resampling algorithm	AudioMixer		Algorithme de ré-échantillonnage
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Atténuer la sortie du mélangeur de 3 dB (comme BeOS R5)
-Display balance control for stereo connections	AudioMixer		Afficher le contrôle de balance pour les connexions stéréo
 To output	AudioMixer		Vers la sortie
+Gain	AudioMixer		Gain
+To master	AudioMixer		Vers la sortie principale
 not connected	AudioMixer		débranché
-Refuse input format changes	AudioMixer		Refuser les changements de formats d’entrées
+Master output	AudioMixer		Sortie principale
-Drop/repeat samples	AudioMixer		Sauter/répéter les échantillons
-Output channel sources	AudioMixer		Sources des canaux de sorties
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Contrôles de gain
-Input mapping	AudioMixer		Correspondances d’entrées
+Low quality (drop/repeat samples)	AudioMixer		Basse qualité (échantillons de chute/répétition)
-Mute	AudioMixer		Sourdine
+Output channel sources	AudioMixer		Sources des canaux de sorties
-Input channel destinations	AudioMixer		Destinations des canaux d’entrées
+Allow input channel remapping	AudioMixer		Autoriser la réassignation des canaux d’entrées
-To master	AudioMixer		Vers la sortie principale
+Display balance control for stereo connections	AudioMixer		Afficher le contrôle de balance pour les connexions stéréo
-Master output	AudioMixer		Sortie principale
 Setup	AudioMixer		Réglages
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Utiliser les curseurs de gain non-linéaires (comme BeOS R5)
-Gain	AudioMixer		Gain
-Allow output channel remapping	AudioMixer		Autoriser la réassignation des canaux de sorties
 Physical input channels	AudioMixer		Canaux d’entrées physiques
+Input channel destinations	AudioMixer		Destinations des canaux d’entrées
+Resampling algorithm:	AudioMixer		Algorithme de ré-échantillonnage :
+Mute	AudioMixer		Sourdine
+Output mapping	AudioMixer		Correspondances de sorties
+Virtual output channels	AudioMixer		Canaux de la sortie virtuelle
+Allow output channel remapping	AudioMixer		Autoriser la réassignation des canaux de sorties
+Input gain controls represent:	AudioMixer		Les contrôles de gain d'entrée représentent :
+Attenuate mixer output by 3 dB	AudioMixer		Atténuer la sortie du mélangeur de 3 dB

data/catalogs/add-ons/media/media-add-ons/mixer/fur.catkeys

@@ -1,27 +1,24 @@
-1	friulian	x-vnd.Haiku-mixer.media_addon	3450667169
+1	friulian	x-vnd.Haiku-mixer.media_addon	275473112
-Input gain controls represent	AudioMixer		I controi di vuadagn in jentrade a rapresentin
+Input mapping	AudioMixer		Mapadure des jentradis
-Linear interpolation	AudioMixer		Interpolazion lineâr
+High quality (linear interpolation)	AudioMixer		Alte cualitât (interpolazion lineâr)
-Virtual output channels	AudioMixer		Canâi di jessude virtuâi
-Refuse output format changes	AudioMixer		Refude modifichis al formât di jessude
-Output mapping	AudioMixer		Mapadure des jessudis
-Allow input channel remapping	AudioMixer		Permet modifiche di mapadure dal canâl di jentrade
-Resampling algorithm	AudioMixer		Algoritmi par tornâ a campionâ
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Sbasse la jessude dal mixer di 3dB (come BeOS R5)
-Display balance control for stereo connections	AudioMixer		Mostre controi di belançament pes conessions stereo
 To output	AudioMixer		In jessude
+Gain	AudioMixer		Vuadagn
+To master	AudioMixer		Al principâl
 not connected	AudioMixer		no conetût
-Refuse input format changes	AudioMixer		Refude modifichis al formât di jentrade
+Master output	AudioMixer		Jessude principâl
-Drop/repeat samples	AudioMixer		Fâs colâ/ripet campions
-Output channel sources	AudioMixer		Sorzints canâi di jessude
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Controi di vuadagn
-Input mapping	AudioMixer		Mapadure des jentradis
+Low quality (drop/repeat samples)	AudioMixer		Basse cualitât (campions di scartâ/ripeti)
-Mute	AudioMixer		Cidin
+Output channel sources	AudioMixer		Sorzints canâi di jessude
-Input channel destinations	AudioMixer		Destinazions canâi di jentrade
+Allow input channel remapping	AudioMixer		Permet modifiche di mapadure dal canâl di jentrade
-To master	AudioMixer		Al principâl
+Display balance control for stereo connections	AudioMixer		Mostre controi di belançament pes conessions stereo
-Master output	AudioMixer		Jessude principâl
 Setup	AudioMixer		Configurazion
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Dopre cursôrs regoladôrs di vuadagn no lineâr (come BeOS R5)
-Gain	AudioMixer		Vuadagn
-Allow output channel remapping	AudioMixer		Permet di tornâ a mapâ i canâi di jessude
 Physical input channels	AudioMixer		Canâi di jentrade fisics
+Input channel destinations	AudioMixer		Destinazions canâi di jentrade
+Resampling algorithm:	AudioMixer		Algoritmi di ricampionament:
+Mute	AudioMixer		Cidin
+Output mapping	AudioMixer		Mapadure des jessudis
+Virtual output channels	AudioMixer		Canâi di jessude virtuâi
+Allow output channel remapping	AudioMixer		Permet di tornâ a mapâ i canâi di jessude
+Input gain controls represent:	AudioMixer		I controi dal vuadagn di jentrade a rapresentin:
+Attenuate mixer output by 3 dB	AudioMixer		Moreste la jessude dal mixer di 3 dB

data/catalogs/add-ons/media/media-add-ons/mixer/hr.catkeys

@@ -1,12 +1,10 @@
-1	croatian	x-vnd.Haiku-mixer.media_addon	526355835
+1	croatian	x-vnd.Haiku-mixer.media_addon	1299388074
-Virtual output channels	AudioMixer		Virtualni izlazni kanali
-Refuse output format changes	AudioMixer		Odbij promjene izlaznog formata
 not connected	AudioMixer		nije spojeno
-Refuse input format changes	AudioMixer		Odbij promjene ulaznog formata
-Output channel sources	AudioMixer		Izvori izlaznog kanala
-dB	AudioMixer		dB
-Mute	AudioMixer		Utišaj
-Input channel destinations	AudioMixer		Odredišta ulaznog kanala
 Master output	AudioMixer		Glavni izlaz
+dB	AudioMixer		dB
+Output channel sources	AudioMixer		Izvori izlaznog kanala
 Setup	AudioMixer		Postavi
 Physical input channels	AudioMixer		Fizički ulazni kanali
+Input channel destinations	AudioMixer		Odredišta ulaznog kanala
+Mute	AudioMixer		Utišaj
+Virtual output channels	AudioMixer		Virtualni izlazni kanali

data/catalogs/add-ons/media/media-add-ons/mixer/hu.catkeys

@@ -1,27 +1,24 @@
-1	hungarian	x-vnd.Haiku-mixer.media_addon	3450667169
+1	hungarian	x-vnd.Haiku-mixer.media_addon	275473112
-Input gain controls represent	AudioMixer		A bemeneti előerősítés beállításai ezt jelentik:
+Input mapping	AudioMixer		Bemenet leképezése
-Linear interpolation	AudioMixer		Lineáris interpoláció
+High quality (linear interpolation)	AudioMixer		‎Kiváló minőség (lineáris interpoláció)‎
-Virtual output channels	AudioMixer		Virtuális kimeneti csatornák
-Refuse output format changes	AudioMixer		Kimeneti formátum változtatásainak visszautasítása
-Output mapping	AudioMixer		Kimenet leképezése
-Allow input channel remapping	AudioMixer		Bemeneti csatorna újraképezésének az engedélyezése
-Resampling algorithm	AudioMixer		Újramintavételezési algoritmus
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		A keverő kimenetének 3dB-lel való gyengítése (mint a BeOS R5-ben)
-Display balance control for stereo connections	AudioMixer		Sztereó kapcsolatok egyensúlycsúszkáinak megjelenítése
 To output	AudioMixer		Kimenetre
+Gain	AudioMixer		Erősítés
+To master	AudioMixer		Az elsődlegesre
 not connected	AudioMixer		nincs csatlakoztatva
-Refuse input format changes	AudioMixer		Bemeneti formátum változtatásainak visszautasítása
+Master output	AudioMixer		Elsődleges kimenet
-Drop/repeat samples	AudioMixer		Minták átugrása/ismétlése
-Output channel sources	AudioMixer		Kimeneti csatorna forrásai
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Erősítő vezérlői
-Input mapping	AudioMixer		Bemenet leképezése
+Low quality (drop/repeat samples)	AudioMixer		Alacsony minőség (eldob/ismétel mintákat)
-Mute	AudioMixer		Némítás
+Output channel sources	AudioMixer		Kimeneti csatorna forrásai
-Input channel destinations	AudioMixer		Bemeneti csatornák céljai
+Allow input channel remapping	AudioMixer		Bemeneti csatorna újraképezésének az engedélyezése
-To master	AudioMixer		Az elsődlegesre
+Display balance control for stereo connections	AudioMixer		Sztereó kapcsolatok egyensúlycsúszkáinak megjelenítése
-Master output	AudioMixer		Elsődleges kimenet
 Setup	AudioMixer		Beállítás
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Nem lineáris előerősítés csúszkák használata (mint a BeOS R5-ben)
-Gain	AudioMixer		Erősítés
-Allow output channel remapping	AudioMixer		Kimeneti csatorna újraképezésének az engedélyezése
 Physical input channels	AudioMixer		Fizikai bemeneti csatornák
+Input channel destinations	AudioMixer		Bemeneti csatornák céljai
+Resampling algorithm:	AudioMixer		Újraszámítási algoritmus:
+Mute	AudioMixer		Némítás
+Output mapping	AudioMixer		Kimenet leképezése
+Virtual output channels	AudioMixer		Virtuális kimeneti csatornák
+Allow output channel remapping	AudioMixer		Kimeneti csatorna újraképezésének az engedélyezése
+Input gain controls represent:	AudioMixer		‎A bemeneti erősítés vezérlői a következőket képviselik:‎
+Attenuate mixer output by 3 dB	AudioMixer		‎A keverő kimenetének csillapítása 3 dB-lel‎

data/catalogs/add-ons/media/media-add-ons/mixer/id.catkeys

@@ -1,27 +1,19 @@
-1	indonesian	x-vnd.Haiku-mixer.media_addon	3450667169
+1	indonesian	x-vnd.Haiku-mixer.media_addon	3463574286
-Input gain controls represent	AudioMixer		Kontrol penguatan masukan mewakili
+Input mapping	AudioMixer		Pemetaan input
-Linear interpolation	AudioMixer		Interpolasi linier
-Virtual output channels	AudioMixer		Saluran keluaran virtual
-Refuse output format changes	AudioMixer		Menolak perubahan format keluaran
-Output mapping	AudioMixer		Pemetaan keluaran
-Allow input channel remapping	AudioMixer		Ijinkan pemetaan ulang kanal masukan
-Resampling algorithm	AudioMixer		Algoritma sampel-ulang
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Lemahkan keluaran mixer sebesar 3dB (seperti BeOS R5)
-Display balance control for stereo connections	AudioMixer		Tampilkan kontrol keseimbangan untuk sambungan stereo
 To output	AudioMixer		Ke keluaran
+Gain	AudioMixer		Penguatan
+To master	AudioMixer		Ke master
 not connected	AudioMixer		tidak terhubung
-Refuse input format changes	AudioMixer		Menolak perubahan format masukan
+Master output	AudioMixer		Keluaran master
-Drop/repeat samples	AudioMixer		Jatuhkan/ulangi sampel
-Output channel sources	AudioMixer		Sumber kanal keluaran
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Pengatur penguatan
-Input mapping	AudioMixer		Pemetaan input
+Output channel sources	AudioMixer		Sumber kanal keluaran
-Mute	AudioMixer		Bisu
+Allow input channel remapping	AudioMixer		Ijinkan pemetaan ulang kanal masukan
-Input channel destinations	AudioMixer		Tujuan kanal input
+Display balance control for stereo connections	AudioMixer		Tampilkan kontrol keseimbangan untuk sambungan stereo
-To master	AudioMixer		Ke master
-Master output	AudioMixer		Keluaran master
 Setup	AudioMixer		Tata
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Pakai penguat slider non-linier (seperti BeOS R5)
-Gain	AudioMixer		Penguatan
-Allow output channel remapping	AudioMixer		Ijinkan pemetaan ulang kanal keluaran
 Physical input channels	AudioMixer		Kanal input fisik
+Input channel destinations	AudioMixer		Tujuan kanal input
+Mute	AudioMixer		Bisu
+Output mapping	AudioMixer		Pemetaan keluaran
+Virtual output channels	AudioMixer		Saluran keluaran virtual
+Allow output channel remapping	AudioMixer		Ijinkan pemetaan ulang kanal keluaran

data/catalogs/add-ons/media/media-add-ons/mixer/it.catkeys

@@ -1,27 +1,19 @@
-1	italian	x-vnd.Haiku-mixer.media_addon	3450667169
+1	italian	x-vnd.Haiku-mixer.media_addon	3463574286
-Input gain controls represent	AudioMixer		Controlli di guadagno in ingresso rappresentano
+Input mapping	AudioMixer		Mappatura degli ingressi
-Linear interpolation	AudioMixer		Interpolazione lineare
-Virtual output channels	AudioMixer		Canali di uscita virtuali
-Refuse output format changes	AudioMixer		Non consenti cambiamenti nel formato di uscita
-Output mapping	AudioMixer		Mappatura delle uscite
-Allow input channel remapping	AudioMixer		Consenti la riassegnazione di canali di ingresso
-Resampling algorithm	AudioMixer		Algoritmo di ricampionamento
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Attenua l'uscita del mixer di 3dB (come BeOS R5)
-Display balance control for stereo connections	AudioMixer		Visualizza controlli di bilanciamento per le connessioni stereo
 To output	AudioMixer		In uscita
+Gain	AudioMixer		Guadagno
+To master	AudioMixer		Al master
 not connected	AudioMixer		non connessa
-Refuse input format changes	AudioMixer		Rifiuta cambiamenti nel formato di ingresso
+Master output	AudioMixer		Uscita master
-Drop/repeat samples	AudioMixer		Rimuovi/ripeti campioni
-Output channel sources	AudioMixer		Canali sorgente in uscita
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Controlli di guadagno
-Input mapping	AudioMixer		Mappatura degli ingressi
+Output channel sources	AudioMixer		Canali sorgente in uscita
-Mute	AudioMixer		Muto
+Allow input channel remapping	AudioMixer		Consenti la riassegnazione di canali di ingresso
-Input channel destinations	AudioMixer		Destinazione dei canali di ingresso
+Display balance control for stereo connections	AudioMixer		Visualizza controlli di bilanciamento per le connessioni stereo
-To master	AudioMixer		Al master
-Master output	AudioMixer		Uscita master
 Setup	AudioMixer		Configurazione
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Utilizza selettori di guadagno non lineare (come BeOS R5)
-Gain	AudioMixer		Guadagno
-Allow output channel remapping	AudioMixer		Consenti la riassegnazione dei canali di uscita
 Physical input channels	AudioMixer		Canali di ingresso fisici
+Input channel destinations	AudioMixer		Destinazione dei canali di ingresso
+Mute	AudioMixer		Muto
+Output mapping	AudioMixer		Mappatura delle uscite
+Virtual output channels	AudioMixer		Canali di uscita virtuali
+Allow output channel remapping	AudioMixer		Consenti la riassegnazione dei canali di uscita

data/catalogs/add-ons/media/media-add-ons/mixer/ja.catkeys

@@ -1,27 +1,24 @@
-1	japanese	x-vnd.Haiku-mixer.media_addon	3450667169
+1	japanese	x-vnd.Haiku-mixer.media_addon	275473112
-Input gain controls represent	AudioMixer		入力ゲインコントロール表示
+Input mapping	AudioMixer		入力再マッピング
-Linear interpolation	AudioMixer		線形補完
+High quality (linear interpolation)	AudioMixer		高品質 (線形補間)
-Virtual output channels	AudioMixer		仮想出力チャンネル
-Refuse output format changes	AudioMixer		出力フォーマットの変更を許可しない
-Output mapping	AudioMixer		出力マッピング
-Allow input channel remapping	AudioMixer		入力チャンネルの再マッピングを許可する
-Resampling algorithm	AudioMixer		リサンプリングアルゴリズム
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		ミキサー出力を 3dB 下げる ( BeOS R5 と同様)
-Display balance control for stereo connections	AudioMixer		ステレオ接続にバランスコントロールを表示
 To output	AudioMixer		出力へ
+Gain	AudioMixer		ゲイン
+To master	AudioMixer		マスターへ
 not connected	AudioMixer		接続されていません
-Refuse input format changes	AudioMixer		入力フォーマットの変更を許可しない
+Master output	AudioMixer		マスター出力
-Drop/repeat samples	AudioMixer		サンプルを下げる/繰り返す
-Output channel sources	AudioMixer		出力チャンネルソース
 dB	AudioMixer		dB
 Gain controls	AudioMixer		ゲインコントロール
-Input mapping	AudioMixer		入力再マッピング
+Low quality (drop/repeat samples)	AudioMixer		低品質 (drop/repeat samples)
-Mute	AudioMixer		ミュート
+Output channel sources	AudioMixer		出力チャンネルソース
-Input channel destinations	AudioMixer		入力チャンネルの接続先
+Allow input channel remapping	AudioMixer		入力チャンネルの再マッピングを許可
-To master	AudioMixer		マスターへ
+Display balance control for stereo connections	AudioMixer		ステレオ接続にバランスコントロールを表示
-Master output	AudioMixer		マスター出力
 Setup	AudioMixer		設定
-Use non linear gain sliders (like BeOS R5)	AudioMixer		非線形ゲインスライダーを使用 (BeOS R5と同様)
-Gain	AudioMixer		ゲイン
-Allow output channel remapping	AudioMixer		出力チャンネルの再マッピングを許可する
 Physical input channels	AudioMixer		物理入力チャンネル
+Input channel destinations	AudioMixer		入力チャンネルの接続先
+Resampling algorithm:	AudioMixer		リサンプリングアルゴリズム:
+Mute	AudioMixer		ミュート
+Output mapping	AudioMixer		出力マッピング
+Virtual output channels	AudioMixer		仮想出力チャンネル
+Allow output channel remapping	AudioMixer		出力チャンネルの再マッピングを許可
+Input gain controls represent:	AudioMixer		入力ゲインコントロール表示:
+Attenuate mixer output by 3 dB	AudioMixer		ミキサー出力を 3 dB 減衰

data/catalogs/add-ons/media/media-add-ons/mixer/lt.catkeys

@@ -1,27 +1,19 @@
-1	lithuanian	x-vnd.Haiku-mixer.media_addon	3450667169
+1	lithuanian	x-vnd.Haiku-mixer.media_addon	3463574286
-Input gain controls represent	AudioMixer		Įvesties stiprinimo valdikliai atspindi
+Input mapping	AudioMixer		Įvesties susiejimas
-Linear interpolation	AudioMixer		linijinė interpoliacija
-Virtual output channels	AudioMixer		virtualius išvesties kanalus
-Refuse output format changes	AudioMixer		Neleisti išvesties formato keitimų
-Output mapping	AudioMixer		Išvesties susiejimas
-Allow input channel remapping	AudioMixer		Leisti įvesties kanalų persiejimą
-Resampling algorithm	AudioMixer		Garso elementų atrankos algoritmas
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Sumažinti maišiklio išvesties garsį 3 dB (kaip „BeOS R5“)
-Display balance control for stereo connections	AudioMixer		Rodyti balanso valdiklius stereofoninėms jungtims
 To output	AudioMixer		Į išvestį
+Gain	AudioMixer		Stiprinimas
+To master	AudioMixer		Į pagrindinį
 not connected	AudioMixer		neprijungta
-Refuse input format changes	AudioMixer		Neleisti įvesties formato keitimų
+Master output	AudioMixer		Pagrindinė išvestis
-Drop/repeat samples	AudioMixer		Praleisti / kartoti garso elementus
-Output channel sources	AudioMixer		Išvesties kanalo šaltiniai
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Stiprinimo valdikliai
-Input mapping	AudioMixer		Įvesties susiejimas
+Output channel sources	AudioMixer		Išvesties kanalo šaltiniai
-Mute	AudioMixer		Nutildyti
+Allow input channel remapping	AudioMixer		Leisti įvesties kanalų persiejimą
-Input channel destinations	AudioMixer		Įvesties kanalų paskirtys
+Display balance control for stereo connections	AudioMixer		Rodyti balanso valdiklius stereofoninėms jungtims
-To master	AudioMixer		Į pagrindinį
-Master output	AudioMixer		Pagrindinė išvestis
 Setup	AudioMixer		Nuostatos
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Naudoti nelinijinius stiprinimo šliaužiklius (kaip „BeOS R5“)
-Gain	AudioMixer		Stiprinimas
-Allow output channel remapping	AudioMixer		Leisti išvesties kanalų persiejimą
 Physical input channels	AudioMixer		fizinius įvesties kanalus
+Input channel destinations	AudioMixer		Įvesties kanalų paskirtys
+Mute	AudioMixer		Nutildyti
+Output mapping	AudioMixer		Išvesties susiejimas
+Virtual output channels	AudioMixer		virtualius išvesties kanalus
+Allow output channel remapping	AudioMixer		Leisti išvesties kanalų persiejimą

data/catalogs/add-ons/media/media-add-ons/mixer/nl.catkeys

@@ -1,27 +1,22 @@
-1	dutch; flemish	x-vnd.Haiku-mixer.media_addon	3450667169
+1	dutch; flemish	x-vnd.Haiku-mixer.media_addon	4284602042
-Input gain controls represent	AudioMixer		Invoer versterkingsknoppen representeren
+Input mapping	AudioMixer		Invoermapping
-Linear interpolation	AudioMixer		Lineaire interpolatie
+High quality (linear interpolation)	AudioMixer		Hoge kwaliteit (lineaire interpolatie)
-Virtual output channels	AudioMixer		Virtuele uitvoerkanalen
-Refuse output format changes	AudioMixer		Weiger wijzigingen van het uitvoerformaat
-Output mapping	AudioMixer		Uitgang mapping
-Allow input channel remapping	AudioMixer		Sta toe het invoerkanaal opnieuw te mappen
-Resampling algorithm	AudioMixer		Resampling algorithme
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Verzwakken mixeruitgang met 3dB (zoals BeOS R5)
-Display balance control for stereo connections	AudioMixer		Balansknop voor stereoverbindingen weergeven
 To output	AudioMixer		Uitvoer
+Gain	AudioMixer		Versterking
+To master	AudioMixer		Naar master
 not connected	AudioMixer		niet verbonden
-Refuse input format changes	AudioMixer		Weiger veranderingen in invoerformaat
+Master output	AudioMixer		Masteruitvoer
-Drop/repeat samples	AudioMixer		Drop/herhaal samples
-Output channel sources	AudioMixer		Uitgangskanaal bronnen
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Gain instellingen
-Input mapping	AudioMixer		Invoermapping
+Low quality (drop/repeat samples)	AudioMixer		Lage kwaliteit (samples overslaan/herhalen)
-Mute	AudioMixer		Dempen
+Output channel sources	AudioMixer		Uitgangskanaal bronnen
-Input channel destinations	AudioMixer		Ingang kanaal bestemming
+Allow input channel remapping	AudioMixer		Sta toe het invoerkanaal opnieuw te mappen
-To master	AudioMixer		Naar master
+Display balance control for stereo connections	AudioMixer		Balansknop voor stereoverbindingen weergeven
-Master output	AudioMixer		Masteruitvoer
 Setup	AudioMixer		Instellingen
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Gebruik nonlineare versterkingsschuifknoppen (zoals BeOS R5)
-Gain	AudioMixer		Versterking
-Allow output channel remapping	AudioMixer		Uitvoerkanaal hermappen toelaten
 Physical input channels	AudioMixer		Fysieke invoerkanalen
+Input channel destinations	AudioMixer		Ingang kanaal bestemming
+Resampling algorithm:	AudioMixer		Algoritme om te hersamplen:
+Mute	AudioMixer		Dempen
+Output mapping	AudioMixer		Uitgang mapping
+Virtual output channels	AudioMixer		Virtuele uitvoerkanalen
+Allow output channel remapping	AudioMixer		Uitvoerkanaal hermappen toelaten

data/catalogs/add-ons/media/media-add-ons/mixer/pl.catkeys

@@ -1,27 +1,19 @@
-1	polish	x-vnd.Haiku-mixer.media_addon	3450667169
+1	polish	x-vnd.Haiku-mixer.media_addon	3463574286
-Input gain controls represent	AudioMixer		Regulacja wzmocnienia wejścia reprezentuje
+Input mapping	AudioMixer		Mapowanie wejścia
-Linear interpolation	AudioMixer		Interpolacja liniowa
-Virtual output channels	AudioMixer		Wirtualne kanały wyjściowe
-Refuse output format changes	AudioMixer		Odmów zmiany formatu wyjściowego
-Output mapping	AudioMixer		Mapowanie wyjścia
-Allow input channel remapping	AudioMixer		Pozwól ponownie mapować kanał wejściowy
-Resampling algorithm	AudioMixer		Algorytm konwersji częstotliwości próbkowania
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Tłum wyjście miksera o 3dB (jak w BeOS R5)
-Display balance control for stereo connections	AudioMixer		Wyświetl kontrolę balansu dla połączeń stereo
 To output	AudioMixer		Do wyjścia
+Gain	AudioMixer		Wzmocnienie
+To master	AudioMixer		Do głównego
 not connected	AudioMixer		nie podłączony
-Refuse input format changes	AudioMixer		Odmów zmiany formatu wejściowego
+Master output	AudioMixer		Wyjście główne
-Drop/repeat samples	AudioMixer		Zostaw/powtórz sample
-Output channel sources	AudioMixer		Źródła kanału wyjściowego
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Regulacja wzmocnienia
-Input mapping	AudioMixer		Mapowanie wejścia
+Output channel sources	AudioMixer		Źródła kanału wyjściowego
-Mute	AudioMixer		Wycisz
+Allow input channel remapping	AudioMixer		Pozwól ponownie mapować kanał wejściowy
-Input channel destinations	AudioMixer		Miejsca kanału wejściowego
+Display balance control for stereo connections	AudioMixer		Wyświetl kontrolę balansu dla połączeń stereo
-To master	AudioMixer		Do głównego
-Master output	AudioMixer		Wyjście główne
 Setup	AudioMixer		Ustawienia
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Użyj nieliniowych suwaków wzmocnienia (jak w BeOS R5)
-Gain	AudioMixer		Wzmocnienie
-Allow output channel remapping	AudioMixer		Pozwól ponownie mapować kanał wyjściowy
 Physical input channels	AudioMixer		Fizyczne kanały wejściowe
+Input channel destinations	AudioMixer		Miejsca kanału wejściowego
+Mute	AudioMixer		Wycisz
+Output mapping	AudioMixer		Mapowanie wyjścia
+Virtual output channels	AudioMixer		Wirtualne kanały wyjściowe
+Allow output channel remapping	AudioMixer		Pozwól ponownie mapować kanał wyjściowy

data/catalogs/add-ons/media/media-add-ons/mixer/pt.catkeys

@@ -1,27 +1,24 @@
-1	portuguese	x-vnd.Haiku-mixer.media_addon	3450667169
+1	portuguese	x-vnd.Haiku-mixer.media_addon	275473112
-Input gain controls represent	AudioMixer		Controles de ganho de entrada representam
+Input mapping	AudioMixer		Mapeamento de entrada
-Linear interpolation	AudioMixer		Interpolação linear
+High quality (linear interpolation)	AudioMixer		Alta qualidade (interpolação linear)
-Virtual output channels	AudioMixer		Canais de saída virtuais
-Refuse output format changes	AudioMixer		Recusar alterações do formato de saída
-Output mapping	AudioMixer		Mapeamento de saída
-Allow input channel remapping	AudioMixer		Permitir re-mapeamento do canal de entrada
-Resampling algorithm	AudioMixer		Algoritmo de reamostragem
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Atenuar a saída do misturador em 3dB (como no BeOS R5)
-Display balance control for stereo connections	AudioMixer		Mostrar ajuste de equilíbrio para ligações estéreo
 To output	AudioMixer		Para a saída
+Gain	AudioMixer		Ganho
+To master	AudioMixer		Para master
 not connected	AudioMixer		não ligado
-Refuse input format changes	AudioMixer		Recusar alterações do formato de entrada
+Master output	AudioMixer		Saída master
-Drop/repeat samples	AudioMixer		Descartar/repetir amostras
-Output channel sources	AudioMixer		Origens de canal de saída
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Controlos de ganho
-Input mapping	AudioMixer		Mapeamento de entrada
+Low quality (drop/repeat samples)	AudioMixer		Baixa qualidade (descartar/repetir amostras)
-Mute	AudioMixer		Silenciar
+Output channel sources	AudioMixer		Origens de canal de saída
-Input channel destinations	AudioMixer		Destinos de canal de entrada
+Allow input channel remapping	AudioMixer		Permitir re-mapeamento do canal de entrada
-To master	AudioMixer		Para master
+Display balance control for stereo connections	AudioMixer		Mostrar ajuste de equilíbrio para ligações estéreo
-Master output	AudioMixer		Saída master
 Setup	AudioMixer		Configurar
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Usar controlo deslizante de ganho não linear (como no BeOS R5)
-Gain	AudioMixer		Ganho
-Allow output channel remapping	AudioMixer		Permitir re-mapeamento do canal de saída
 Physical input channels	AudioMixer		Canais de entrada físicos
+Input channel destinations	AudioMixer		Destinos de canal de entrada
+Resampling algorithm:	AudioMixer		Algoritmo de reamostragem:
+Mute	AudioMixer		Silenciar
+Output mapping	AudioMixer		Mapeamento de saída
+Virtual output channels	AudioMixer		Canais de saída virtuais
+Allow output channel remapping	AudioMixer		Permitir re-mapeamento do canal de saída
+Input gain controls represent:	AudioMixer		Controlos de ganho de entrada representam:
+Attenuate mixer output by 3 dB	AudioMixer		Atenuar saída do misturador em 3 dB

data/catalogs/add-ons/media/media-add-ons/mixer/pt_BR.catkeys

@@ -1,27 +1,19 @@
-1	portuguese (brazil)	x-vnd.Haiku-mixer.media_addon	3450667169
+1	portuguese (brazil)	x-vnd.Haiku-mixer.media_addon	3463574286
-Input gain controls represent	AudioMixer		Controles de ganho de entrada representam
+Input mapping	AudioMixer		Mapear entrada
-Linear interpolation	AudioMixer		Interpolação linear
-Virtual output channels	AudioMixer		Canais virtuais de saída
-Refuse output format changes	AudioMixer		Recusar mudanças de formato de saída
-Output mapping	AudioMixer		Mapeamento de saída
-Allow input channel remapping	AudioMixer		Permitir remapeamento do canal de entrada
-Resampling algorithm	AudioMixer		Algoritmo de reamostragem
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Atenuar saída do mixador em 3dB (como BeOS R5)
-Display balance control for stereo connections	AudioMixer		Mostrar controle de balanço para conexões estéreo
 To output	AudioMixer		Para saída
+Gain	AudioMixer		Ganho
+To master	AudioMixer		Ao mestre
 not connected	AudioMixer		desconectado
-Refuse input format changes	AudioMixer		Recusar mudanças no formato de entrada
+Master output	AudioMixer		Saída principal
-Drop/repeat samples	AudioMixer		Parar/repetir amostras
-Output channel sources	AudioMixer		Fontes do canal de saída
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Controles de ganho
-Input mapping	AudioMixer		Mapear entrada
+Output channel sources	AudioMixer		Fontes do canal de saída
-Mute	AudioMixer		Mudo
+Allow input channel remapping	AudioMixer		Permitir remapeamento do canal de entrada
-Input channel destinations	AudioMixer		Destinos do canal de entrada
+Display balance control for stereo connections	AudioMixer		Mostrar controle de balanço para conexões estéreo
-To master	AudioMixer		Ao mestre
-Master output	AudioMixer		Saída principal
 Setup	AudioMixer		Configuração
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Usar botões deslizantes de ganho não linear (como BeOS R5)
-Gain	AudioMixer		Ganho
-Allow output channel remapping	AudioMixer		Permitir remapeamento do canal de saída
 Physical input channels	AudioMixer		Canais de entrada físicos
+Input channel destinations	AudioMixer		Destinos do canal de entrada
+Mute	AudioMixer		Mudo
+Output mapping	AudioMixer		Mapeamento de saída
+Virtual output channels	AudioMixer		Canais virtuais de saída
+Allow output channel remapping	AudioMixer		Permitir remapeamento do canal de saída

data/catalogs/add-ons/media/media-add-ons/mixer/ro.catkeys

@@ -1,27 +1,22 @@
-1	romanian	x-vnd.Haiku-mixer.media_addon	3450667169
+1	romanian	x-vnd.Haiku-mixer.media_addon	4284602042
-Input gain controls represent	AudioMixer		Controalele amplificării de intrare reprezintă
+Input mapping	AudioMixer		Maparea intrării
-Linear interpolation	AudioMixer		Interpolare liniară
+High quality (linear interpolation)	AudioMixer		Calitate înaltă (interpolare liniară)
-Virtual output channels	AudioMixer		Canale de ieșire virtuale
-Refuse output format changes	AudioMixer		Refuză modificările de format de ieșire
-Output mapping	AudioMixer		Maparea ieșirilor
-Allow input channel remapping	AudioMixer		Permite remaparea canalului de intrare
-Resampling algorithm	AudioMixer		Algoritm de reeșantionare
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Atenuează ieșirea de mixaj cu 3dB (ca BeOS R5)
-Display balance control for stereo connections	AudioMixer		Afișează controlul de echilibru pentru conexiunile stereo
 To output	AudioMixer		Spre ieșire
+Gain	AudioMixer		Amplificare
+To master	AudioMixer		Spre principal
 not connected	AudioMixer		nu este conectat
-Refuse input format changes	AudioMixer		Refuză modificările de format de intrare
+Master output	AudioMixer		Ieșire principală
-Drop/repeat samples	AudioMixer		Aruncă/repetă eșantioane
-Output channel sources	AudioMixer		Surse de canal de ieșire
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Controale de amplificare
-Input mapping	AudioMixer		Maparea intrării
+Low quality (drop/repeat samples)	AudioMixer		Calitate scăzută (eșantioane de cădere/repetare)
-Mute	AudioMixer		Mut
+Output channel sources	AudioMixer		Surse de canal de ieșire
-Input channel destinations	AudioMixer		Destinații de canal de ieșire
+Allow input channel remapping	AudioMixer		Permite remaparea canalului de intrare
-To master	AudioMixer		Spre principal
+Display balance control for stereo connections	AudioMixer		Afișează controlul de echilibru pentru conexiunile stereo
-Master output	AudioMixer		Ieșire principală
 Setup	AudioMixer		Configurare
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Folosește glisoare de amplificare neliniare (ca BeOS R5)
-Gain	AudioMixer		Amplificare
-Allow output channel remapping	AudioMixer		Permite remaparea canalului de ieșire
 Physical input channels	AudioMixer		Canale de intrare fizice
+Input channel destinations	AudioMixer		Destinații de canal de ieșire
+Resampling algorithm:	AudioMixer		Algoritm de re-eșantionare:
+Mute	AudioMixer		Mut
+Output mapping	AudioMixer		Maparea ieșirilor
+Virtual output channels	AudioMixer		Canale de ieșire virtuale
+Allow output channel remapping	AudioMixer		Permite remaparea canalului de ieșire

data/catalogs/add-ons/media/media-add-ons/mixer/ru.catkeys

@@ -1,27 +1,19 @@
-1	russian	x-vnd.Haiku-mixer.media_addon	3450667169
+1	russian	x-vnd.Haiku-mixer.media_addon	3463574286
-Input gain controls represent	AudioMixer		Входные регуляторы усиления представляют
+Input mapping	AudioMixer		Переназначение входа
-Linear interpolation	AudioMixer		Линейная интерполяция
-Virtual output channels	AudioMixer		Виртуальные каналы выхода
-Refuse output format changes	AudioMixer		Отклонять изменения выходного формата
-Output mapping	AudioMixer		Переназначение выхода
-Allow input channel remapping	AudioMixer		Разрешить переназначение входного канала
-Resampling algorithm	AudioMixer		Алгоритм передискретизации
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Ослаблять вывод микшера на 3 дБ
-Display balance control for stereo connections	AudioMixer		Показывать регулятор баланса для стерео соединений
 To output	AudioMixer		Выход
+Gain	AudioMixer		Усиление
+To master	AudioMixer		К главному
 not connected	AudioMixer		не подключен
-Refuse input format changes	AudioMixer		Отклонять изменения входного формата
+Master output	AudioMixer		Основной выход
-Drop/repeat samples	AudioMixer		Пропуск/повтор сэмплов
-Output channel sources	AudioMixer		Источники выходного канала
 dB	AudioMixer		дБ
 Gain controls	AudioMixer		Регулировка усиления
-Input mapping	AudioMixer		Переназначение входа
+Output channel sources	AudioMixer		Источники выходного канала
-Mute	AudioMixer		Выключить звук
+Allow input channel remapping	AudioMixer		Разрешить переназначение входного канала
-Input channel destinations	AudioMixer		Направления входных каналов
+Display balance control for stereo connections	AudioMixer		Показывать регулятор баланса для стерео соединений
-To master	AudioMixer		К главному
-Master output	AudioMixer		Основной выход
 Setup	AudioMixer		Настройка
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Использовать нелинейные ползунки управления звуком
-Gain	AudioMixer		Усиление
-Allow output channel remapping	AudioMixer		Разрешить переназначение выходного канала
 Physical input channels	AudioMixer		Физические каналы входа
+Input channel destinations	AudioMixer		Направления входных каналов
+Mute	AudioMixer		Выключить звук
+Output mapping	AudioMixer		Переназначение выхода
+Virtual output channels	AudioMixer		Виртуальные каналы выхода
+Allow output channel remapping	AudioMixer		Разрешить переназначение выходного канала

data/catalogs/add-ons/media/media-add-ons/mixer/sk.catkeys

@@ -1,27 +1,19 @@
-1	slovak	x-vnd.Haiku-mixer.media_addon	3450667169
+1	slovak	x-vnd.Haiku-mixer.media_addon	3463574286
-Input gain controls represent	AudioMixer		Ovládacie prvky vstupného zosilnenia predstavujú
+Input mapping	AudioMixer		Mapovanie vstupu
-Linear interpolation	AudioMixer		Lineárna interpolácia
-Virtual output channels	AudioMixer		Virtuálne výstupné kanály
-Refuse output format changes	AudioMixer		Odmietnuť zmeny výstupného formátu
-Output mapping	AudioMixer		Mapovanie výstupu
-Allow input channel remapping	AudioMixer		Povoliť premapovanie vstupného kanála
-Resampling algorithm	AudioMixer		Algoritmus prevzorkovania
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Utlmiť výstup zmiešavača o 3dB (ako BeOS R5)
-Display balance control for stereo connections	AudioMixer		Zobraziť ovládanie vyváženia pri stereo spojeniach
 To output	AudioMixer		Na výstup
+Gain	AudioMixer		Zosilnenie
+To master	AudioMixer		Na hlavný
 not connected	AudioMixer		nepripojené
-Refuse input format changes	AudioMixer		Odmietnuť zmeny formátu vstupu
+Master output	AudioMixer		Hlavný výstup
-Drop/repeat samples	AudioMixer		Zahodiť/opakovať vzorky
-Output channel sources	AudioMixer		Zdroje výstupného kanála
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Ovládanie zosilnenia
-Input mapping	AudioMixer		Mapovanie vstupu
+Output channel sources	AudioMixer		Zdroje výstupného kanála
-Mute	AudioMixer		Stlmiť
+Allow input channel remapping	AudioMixer		Povoliť premapovanie vstupného kanála
-Input channel destinations	AudioMixer		Ciele vstupného kanála
+Display balance control for stereo connections	AudioMixer		Zobraziť ovládanie vyváženia pri stereo spojeniach
-To master	AudioMixer		Na hlavný
-Master output	AudioMixer		Hlavný výstup
 Setup	AudioMixer		Nastavenie
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Použiť nelineárne posuvníky zosilnenia (ako BeOS R5)
-Gain	AudioMixer		Zosilnenie
-Allow output channel remapping	AudioMixer		Povoliť premapovanie výstupných kanálov
 Physical input channels	AudioMixer		Fyzické vstupné kanály
+Input channel destinations	AudioMixer		Ciele vstupného kanála
+Mute	AudioMixer		Stlmiť
+Output mapping	AudioMixer		Mapovanie výstupu
+Virtual output channels	AudioMixer		Virtuálne výstupné kanály
+Allow output channel remapping	AudioMixer		Povoliť premapovanie výstupných kanálov

data/catalogs/add-ons/media/media-add-ons/mixer/sv.catkeys

@@ -1,27 +1,24 @@
-1	swedish	x-vnd.Haiku-mixer.media_addon	3450667169
+1	swedish	x-vnd.Haiku-mixer.media_addon	275473112
-Input gain controls represent	AudioMixer		Input volymkontroll representation
+Input mapping	AudioMixer		Ingångs mappning
-Linear interpolation	AudioMixer		Linjär interpolering
+High quality (linear interpolation)	AudioMixer		Hög kvalitet (linjär interpolation)
-Virtual output channels	AudioMixer		Virtuella utkanaler
-Refuse output format changes	AudioMixer		Tillåt inte utformatändringar
-Output mapping	AudioMixer		Utgångs mappning
-Allow input channel remapping	AudioMixer		Tillåt ingång remapping
-Resampling algorithm	AudioMixer		Omsamplings algoritm
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Dämpa mixerns utsignal med 3dB (som i BeOS R5)
-Display balance control for stereo connections	AudioMixer		Visa balanskontroll för stereoanslutningar
 To output	AudioMixer		Till utgång
+Gain	AudioMixer		Volym
+To master	AudioMixer		Till huvudkanal
 not connected	AudioMixer		ej ansluten
-Refuse input format changes	AudioMixer		Tillåt inte informatsändringar
+Master output	AudioMixer		Utgång för huvudkanal
-Drop/repeat samples	AudioMixer		Ta bort/gör om samplingen
-Output channel sources	AudioMixer		Källa till utgångs kanaler
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Volymkontroller
-Input mapping	AudioMixer		Ingångs mappning
+Low quality (drop/repeat samples)	AudioMixer		Låg kvalitet (släpp/upprepa)
-Mute	AudioMixer		Tyst
+Output channel sources	AudioMixer		Källa till utgångs kanaler
-Input channel destinations	AudioMixer		Ingångskanalens mål
+Allow input channel remapping	AudioMixer		Tillåt ingång remapping
-To master	AudioMixer		Till huvudkanal
+Display balance control for stereo connections	AudioMixer		Visa balanskontroll för stereoanslutningar
-Master output	AudioMixer		Utgång för huvudkanal
 Setup	AudioMixer		Inställningar
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Använd icke-linjärna volymkontroller (som i BeOS R5)
-Gain	AudioMixer		Volym
-Allow output channel remapping	AudioMixer		Tillåt ommappning av utgående kanal
 Physical input channels	AudioMixer		Fysiska ingångskanaler
+Input channel destinations	AudioMixer		Ingångskanalens mål
+Resampling algorithm:	AudioMixer		Omsamplingsalgoritm:
+Mute	AudioMixer		Tyst
+Output mapping	AudioMixer		Utgångs mappning
+Virtual output channels	AudioMixer		Virtuella utkanaler
+Allow output channel remapping	AudioMixer		Tillåt ommappning av utgående kanal
+Input gain controls represent:	AudioMixer		Ingångsförstärkningskontroller representerar:
+Attenuate mixer output by 3 dB	AudioMixer		Dämpa mixereffekten med 3 dB

data/catalogs/add-ons/media/media-add-ons/mixer/th.catkeys

@@ -1,27 +1,19 @@
-1	thai	x-vnd.Haiku-mixer.media_addon	3450667169
+1	thai	x-vnd.Haiku-mixer.media_addon	3463574286
-Input gain controls represent	AudioMixer		แสดงการควบคุมการรับข้อมูล
+Input mapping	AudioMixer		การทำแผนที่ข้อมูลเข้า
-Linear interpolation	AudioMixer		การแก้ไขเชิงเส้น
-Virtual output channels	AudioMixer		ช่องสัญญาณออกจำลอง
-Refuse output format changes	AudioMixer		ปฏิเสธการเปลี่ยนแปลงรูปแบบข้อมูลออก
-Output mapping	AudioMixer		แผนที่ข้อมูลออก
-Allow input channel remapping	AudioMixer		อนุญาตให้ทำแผนที่ช่องสัญญาณข้อมูลเข้าใหม่
-Resampling algorithm	AudioMixer		อัลกอริทึมการสุ่มตัวอย่างใหม่
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		ลดทอนการผสมข้อมูลออกโดย 3dB (อย่างเดียวกับ BeOS R5)
-Display balance control for stereo connections	AudioMixer		แสดงการควบคุมยอดสมดุลสำหรับการเชื่อมต่อสเตอริโอ
 To output	AudioMixer		ไปยังข้อมูลออก
+Gain	AudioMixer		ได้รับ
+To master	AudioMixer		เพื่อข้อมูลหลัก
 not connected	AudioMixer		ไม่เชื่อมต่อ
-Refuse input format changes	AudioMixer		ปฎิเสธการเปลี่ยนแปลงข้อมูลเข้า
+Master output	AudioMixer		ข้อมูลออกหลัก
-Drop/repeat samples	AudioMixer		วาง/ทำซ้ำตัวอย่าง
-Output channel sources	AudioMixer		แหล่งช่องสัญญาณออก
 dB	AudioMixer		dB
 Gain controls	AudioMixer		ได้รับการควบคุม
-Input mapping	AudioMixer		การทำแผนที่ข้อมูลเข้า
+Output channel sources	AudioMixer		แหล่งช่องสัญญาณออก
-Mute	AudioMixer		เงียบ
+Allow input channel remapping	AudioMixer		อนุญาตให้ทำแผนที่ช่องสัญญาณข้อมูลเข้าใหม่
-Input channel destinations	AudioMixer		ปลายทางช่องข้อมูลเข้า
+Display balance control for stereo connections	AudioMixer		แสดงการควบคุมยอดสมดุลสำหรับการเชื่อมต่อสเตอริโอ
-To master	AudioMixer		เพื่อข้อมูลหลัก
-Master output	AudioMixer		ข้อมูลออกหลัก
 Setup	AudioMixer		ติดตั้ง
-Use non linear gain sliders (like BeOS R5)	AudioMixer		ใช้แถบเลื่อนที่ไม่ได้รับเชิงเส้น (เช่นเดียวกับ BeOS R5)
-Gain	AudioMixer		ได้รับ
-Allow output channel remapping	AudioMixer		อนุญาตการทำแผนที่ช่องข้อมูลออกใหม่
 Physical input channels	AudioMixer		ช่องสัญญาณทางกายภาพ
+Input channel destinations	AudioMixer		ปลายทางช่องข้อมูลเข้า
+Mute	AudioMixer		เงียบ
+Output mapping	AudioMixer		แผนที่ข้อมูลออก
+Virtual output channels	AudioMixer		ช่องสัญญาณออกจำลอง
+Allow output channel remapping	AudioMixer		อนุญาตการทำแผนที่ช่องข้อมูลออกใหม่

data/catalogs/add-ons/media/media-add-ons/mixer/tr.catkeys

@@ -1,27 +1,24 @@
-1	turkish	x-vnd.Haiku-mixer.media_addon	3450667169
+1	turkish	x-vnd.Haiku-mixer.media_addon	275473112
-Input gain controls represent	AudioMixer		Girdi kazanım denetimleri şunu yansıtmakta:
+Input mapping	AudioMixer		Girdi eşleme
-Linear interpolation	AudioMixer		Doğrusal aradeğerleme
+High quality (linear interpolation)	AudioMixer		Yüksek kalite (doğrusal aradeğerleme)
-Virtual output channels	AudioMixer		Sanal çıktı kanalları
-Refuse output format changes	AudioMixer		Çıktı biçimi değişimlerini reddet
-Output mapping	AudioMixer		Çıktı eşleme
-Allow input channel remapping	AudioMixer		Girdi kanalı yeniden eşlemesine izin ver
-Resampling algorithm	AudioMixer		Yeniden örnekleme algoritması
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Karıştırıcı çıktısını 3dB azalt (BeOS R5'teki gibi)
-Display balance control for stereo connections	AudioMixer		Çift kanallı bağlantılar için denge denetimini göster
 To output	AudioMixer		Çıktıya
+Gain	AudioMixer		Kazanım
+To master	AudioMixer		Ana denetleyiciye
 not connected	AudioMixer		bağlı değil
-Refuse input format changes	AudioMixer		Girdi biçimi değişikliklerini reddet
+Master output	AudioMixer		Ana çıktı
-Drop/repeat samples	AudioMixer		Örnekleri bırak/tekrar et
-Output channel sources	AudioMixer		Çıktı kanalı kaynakları
 dB	AudioMixer		dB
 Gain controls	AudioMixer		Kazanım ayarları
-Input mapping	AudioMixer		Girdi eşleme
+Low quality (drop/repeat samples)	AudioMixer		Düşük kalite (örneklemeleri bırak/yinele)
-Mute	AudioMixer		Sessiz
+Output channel sources	AudioMixer		Çıktı kanalı kaynakları
-Input channel destinations	AudioMixer		Girdi kanalı hedefleri
+Allow input channel remapping	AudioMixer		Girdi kanalı yeniden eşlemesine izin ver
-To master	AudioMixer		Ana denetleyiciye
+Display balance control for stereo connections	AudioMixer		Çift kanallı bağlantılar için denge denetimini göster
-Master output	AudioMixer		Ana çıktı
 Setup	AudioMixer		Kurulum
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Doğrusal olmayan kazanım kaydırıcısı kullan (BeOS R5'teki gibi)
-Gain	AudioMixer		Kazanım
-Allow output channel remapping	AudioMixer		Çıktı kanalı yeniden eşlemesine izin ver
 Physical input channels	AudioMixer		Fiziksel girdi kanalları
+Input channel destinations	AudioMixer		Girdi kanalı hedefleri
+Resampling algorithm:	AudioMixer		Yeniden örnekleme algoritması:
+Mute	AudioMixer		Sessiz
+Output mapping	AudioMixer		Çıktı eşleme
+Virtual output channels	AudioMixer		Sanal çıktı kanalları
+Allow output channel remapping	AudioMixer		Çıktı kanalı yeniden eşlemesine izin ver
+Input gain controls represent:	AudioMixer		Giriş artışı denetimleri şunları belirtir:
+Attenuate mixer output by 3 dB	AudioMixer		Karıştırıcı çıkışını 3 dB azalt

data/catalogs/add-ons/media/media-add-ons/mixer/uk.catkeys

@@ -1,27 +1,24 @@
-1	ukrainian	x-vnd.Haiku-mixer.media_addon	3450667169
+1	ukrainian	x-vnd.Haiku-mixer.media_addon	275473112
-Input gain controls represent	AudioMixer		Представлення регуляторів підсилення вхідного сигналу
+Input mapping	AudioMixer		Перепризначення входу
-Linear interpolation	AudioMixer		Лінійна інтерполяція
+High quality (linear interpolation)	AudioMixer		Висока якість (лінійна інтерполяція)
-Virtual output channels	AudioMixer		Віртуальні вихідні канали
-Refuse output format changes	AudioMixer		Відхилити зміни вихідного формату
-Output mapping	AudioMixer		Перепризначення виходу
-Allow input channel remapping	AudioMixer		Дозволити перепризначення вхідного каналу
-Resampling algorithm	AudioMixer		Алгоритм передискретизації
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		Послабити вихід мікшера на 3 дБ (як у BeOS R5)
-Display balance control for stereo connections	AudioMixer		Показати регулятор балансу для стереоз'єднань
 To output	AudioMixer		До виходу
+Gain	AudioMixer		Підсилення
+To master	AudioMixer		До головного
 not connected	AudioMixer		не приєднано
-Refuse input format changes	AudioMixer		Відхилити зміни вхідного формату
+Master output	AudioMixer		Головний вихід
-Drop/repeat samples	AudioMixer		Пропуск/повтор семплів
-Output channel sources	AudioMixer		Джерела вихідного канала
 dB	AudioMixer		дБ
 Gain controls	AudioMixer		Регулювання підсилення
-Input mapping	AudioMixer		Перепризначення входу
+Low quality (drop/repeat samples)	AudioMixer		Низька якість (пропуски/повтор семплів)
-Mute	AudioMixer		Заглушити
+Output channel sources	AudioMixer		Джерела вихідного канала
-Input channel destinations	AudioMixer		Напрямки вхідних каналів
+Allow input channel remapping	AudioMixer		Дозволити перепризначення вхідного каналу
-To master	AudioMixer		До головного
+Display balance control for stereo connections	AudioMixer		Показати регулятор балансу для стереоз'єднань
-Master output	AudioMixer		Головний вихід
 Setup	AudioMixer		Настройки
-Use non linear gain sliders (like BeOS R5)	AudioMixer		Використовувати нелінійні регулятори підсилення (як у BeOS R5)
-Gain	AudioMixer		Підсилення
-Allow output channel remapping	AudioMixer		Дозволити перепризначення вихідного каналу
 Physical input channels	AudioMixer		Фізичні вхідні канали
+Input channel destinations	AudioMixer		Напрямки вхідних каналів
+Resampling algorithm:	AudioMixer		Алгоритм передискретизації:
+Mute	AudioMixer		Заглушити
+Output mapping	AudioMixer		Перепризначення виходу
+Virtual output channels	AudioMixer		Віртуальні вихідні канали
+Allow output channel remapping	AudioMixer		Дозволити перепризначення вихідного каналу
+Input gain controls represent:	AudioMixer		Регулятор вхідного підсилення діє на:
+Attenuate mixer output by 3 dB	AudioMixer		Знизити вихід мікшера на 3 дБ

data/catalogs/add-ons/media/media-add-ons/mixer/zh_Hans.catkeys

@@ -1,27 +1,24 @@
-1	english	x-vnd.Haiku-mixer.media_addon	3450667169
+1	english	x-vnd.Haiku-mixer.media_addon	275473112
-Input gain controls represent	AudioMixer		输入增益控制表示
+Input mapping	AudioMixer		输入映射
-Linear interpolation	AudioMixer		线性插补
+High quality (linear interpolation)	AudioMixer		高品质(线性插补)
-Virtual output channels	AudioMixer		虚拟输出通道
-Refuse output format changes	AudioMixer		禁止改变输出格式
-Output mapping	AudioMixer		输出映射
-Allow input channel remapping	AudioMixer		启用输入频道重映射
-Resampling algorithm	AudioMixer		重采样算法
-Attenuate mixer output by 3dB (like BeOS R5)	AudioMixer		将输出音量衰减 3dB (类似 BeOS R5)
-Display balance control for stereo connections	AudioMixer		为立体声系统显示均衡控制器
 To output	AudioMixer		输出
+Gain	AudioMixer		增益
+To master	AudioMixer		到主音量
 not connected	AudioMixer		未连接
-Refuse input format changes	AudioMixer		禁止输入格式改变
+Master output	AudioMixer		主音量输出
-Drop/repeat samples	AudioMixer		拽入/重复采样
-Output channel sources	AudioMixer		输出通道源
 dB	AudioMixer		分贝
 Gain controls	AudioMixer		增益控制
-Input mapping	AudioMixer		输入映射
+Low quality (drop/repeat samples)	AudioMixer		低品质 (丢弃/重复采样)
-Mute	AudioMixer		静音
+Output channel sources	AudioMixer		输出通道源
-Input channel destinations	AudioMixer		输入通道目标
+Allow input channel remapping	AudioMixer		启用输入频道重映射
-To master	AudioMixer		到主音量
+Display balance control for stereo connections	AudioMixer		为立体声系统显示均衡控制器
-Master output	AudioMixer		主音量输出
 Setup	AudioMixer		配置
-Use non linear gain sliders (like BeOS R5)	AudioMixer		使用非线性增益滚动条(类似 BeOS R5)
-Gain	AudioMixer		增益
-Allow output channel remapping	AudioMixer		启用输出频道重映射
 Physical input channels	AudioMixer		物理输入频道
+Input channel destinations	AudioMixer		输入通道目标
+Resampling algorithm:	AudioMixer		重新采样算法:
+Mute	AudioMixer		静音
+Output mapping	AudioMixer		输出映射
+Virtual output channels	AudioMixer		虚拟输出通道
+Allow output channel remapping	AudioMixer		启用输出频道重映射
+Input gain controls represent:	AudioMixer		输入增益控制表示：
+Attenuate mixer output by 3 dB	AudioMixer		衰减混音输出 3dB

data/catalogs/add-ons/media/media-add-ons/multi_audio/fi.catkeys

@@ -8,19 +8,19 @@ CD	MultiAudio		CD
 Tone control	MultiAudio		Äänensävyn säätö
 Phone	MultiAudio		Puhelin
 Aux	MultiAudio		Aux
-Output bass	MultiAudio		Basso-ulostulo
+Output bass	MultiAudio		Lähtöbasso
 Headphones	MultiAudio		Kuulokkeet
 Beep	MultiAudio		Piip
-Output mono mix	MultiAudio		Monomiksaus-ulostulo
+Output mono mix	MultiAudio		Lähtömonomiksaus
-Output stereo mix	MultiAudio		Stereomiksaus-ulostulo
+Output stereo mix	MultiAudio		Lähtöstereomiksaus
 Input	MultiAudio		Tulo
-Output treble	MultiAudio		Diskantti-ulostulo
+Output treble	MultiAudio		Lähtödiskantti
 Mono mix	MultiAudio		Monomiksaus
 General	MultiAudio		Yleisasetukset
-Input & Output	MultiAudio		Tulot ja lähdöt
+Input & Output	MultiAudio		Syötteet ja lähdöt
 Enhanced Setup	MultiAudio		Laajennetut asetukset
 Stereo mix	MultiAudio		Stereomiksaus
-Output 3D depth	MultiAudio		Tulosta 3D-syvyys
+Output 3D depth	MultiAudio		Lähtö-3D-syvyys
 Volume	MultiAudio		Äänenvoimakkuus
 Output	MultiAudio		Lähtö
 Video	MultiAudio		Video

data/catalogs/add-ons/media/media-add-ons/multi_audio/ja.catkeys

@@ -9,26 +9,26 @@ Tone control	MultiAudio		Tone control
 Phone	MultiAudio		Phone
 Aux	MultiAudio		Aux
 Output bass	MultiAudio		Output bass
-Headphones	MultiAudio		Headphones
+Headphones	MultiAudio		ヘッドホン
 Beep	MultiAudio		Beep
 Output mono mix	MultiAudio		Output mono mix
 Output stereo mix	MultiAudio		Output stereo mix
-Input	MultiAudio		Input
+Input	MultiAudio		入力
 Output treble	MultiAudio		Output treble
 Mono mix	MultiAudio		Mono mix
-General	MultiAudio		General
+General	MultiAudio		一般
-Input & Output	MultiAudio		Input & Output
+Input & Output	MultiAudio		入出力
 Enhanced Setup	MultiAudio		高度なセットアップ
 Stereo mix	MultiAudio		Stereo mix
 Output 3D depth	MultiAudio		Output 3D depth
 Volume	MultiAudio		音量
-Output	MultiAudio		Output
+Output	MultiAudio		出力
-Video	MultiAudio		Video
+Video	MultiAudio		ビデオ
 Line	MultiAudio		Line
 Mic	MultiAudio		Mic
  frequency:	MultiAudio		  周波数:
 Enable	MultiAudio		有効にする
-Mute	MultiAudio		Mute
+Mute	MultiAudio		ミュート
 Wave	MultiAudio		Wave
 Setup	MultiAudio		セットアップ
-Level	MultiAudio		Level
+Level	MultiAudio		レベル

data/catalogs/add-ons/network_settings/ftpd/ru.catkeys

@@ -1,3 +1,3 @@
 1	russian	x-vnd.Haiku-FTPService	4086152171
-FTP server	FTPServiceAddOn		Сервер FTP
+FTP server	FTPServiceAddOn		FTP сервер
-The FTP server allows you to remotely access the files on your machine using the FTP protocol.\n\nPlease note that it is an insecure and unencrypted connection.	FTPServiceAddOn		Сервер FTP позволяет получить доступ к файлам на вашем компьютере дистанционно, используя протокол FTP.\n\nПожалуйста, имейте ввиду, что это небезопасное и незашифрованное соединение.
+The FTP server allows you to remotely access the files on your machine using the FTP protocol.\n\nPlease note that it is an insecure and unencrypted connection.	FTPServiceAddOn		FTP сервер позволяет получить доступ к файлам на вашем компьютере дистанционно, используя протокол FTP.\n\nПожалуйста, имейте ввиду, что это небезопасное и незашифрованное соединение.

data/catalogs/add-ons/screen_savers/butterfly/uk.catkeys

@@ -1,2 +1,2 @@
 1	ukrainian	x-vnd.Haiku-ButterflyScreensaver	3604552753
-by Geoffry Song	Screensaver Butterfly		by Geoffry Song
+by Geoffry Song	Screensaver Butterfly		розробник Geoffry Song

data/catalogs/add-ons/screen_savers/debugnow/uk.catkeys

@@ -1,4 +1,4 @@
 1	ukrainian	x-vnd.Haiku-DebugNowScreensaver	3664380395
 DEBUG	Screensaver DebugNow	keep it short and all uppercase, 5 characters or less	DEBUG
-by Ryan Leavengood	Screensaver DebugNow		by Ryan Leavengood
+by Ryan Leavengood	Screensaver DebugNow		розробник Ryan Leavengood
 NOW	Screensaver DebugNow	keep it short and all uppercase, 5 characters or less	ЗАРАЗ

data/catalogs/add-ons/screen_savers/glife/be.catkeys

@@ -1,10 +1,9 @@
-1	belarusian	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	belarusian	x-vnd.Haiku-GLifeScreensaver	2189777521
 by Aaron Hill	GLife ScreenSaver		распрацавана Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Затрымка сетки: няма
 None	GLife ScreenSaver		Няма
 Grid height: %li	GLife ScreenSaver		Вышыня сеткі: %li
 Grid width: 	GLife ScreenSaver		Шырыня сетки: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Затрымка сетки: %dx
 Grid border: %li	GLife ScreenSaver		Мяжа сетки: %li
 Grid border: 	GLife ScreenSaver		Мяжа сетки:  
 OpenGL \"Game of Life\"	GLife ScreenSaver		OpenGL \"Гульня Life\"

data/catalogs/add-ons/screen_savers/glife/ca.catkeys

@@ -1,14 +1,14 @@
-1	catalan; valencian	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	catalan; valencian	x-vnd.Haiku-GLifeScreensaver	358758987
 by Aaron Hill	GLife ScreenSaver		per Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Retard de l'activació de la graella: cap
 None	GLife ScreenSaver		Cap
 Grid height: %li	GLife ScreenSaver		Alçada de la graella: %li
 Grid width: 	GLife ScreenSaver		Amplada de la graella: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Retard de l'activació de la graella: %dx
 Grid border: %li	GLife ScreenSaver		Vora de la graella: %li
 Grid border: 	GLife ScreenSaver		Vora de la graella: 
 OpenGL \"Game of Life\"	GLife ScreenSaver		OpenGL \"Joc de la Vida\"
 Grid height: 	GLife ScreenSaver		Alçada de la graella: 
 4x	GLife ScreenSaver	This is a factor: the x represents 'times'	4x
 Grid width: %li	GLife ScreenSaver		Amplada de la graella: %li
+Grid life delay: %ldx	This is a factor: the x represents 'times', don't translate '%ld'		Retard de la vida de la graella: %ldx
 Grid life delay: 	GLife ScreenSaver		Retard de l'activació de la graella: 

data/catalogs/add-ons/screen_savers/glife/cs.catkeys

@@ -1,14 +1,14 @@
-1	czech	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	czech	x-vnd.Haiku-GLifeScreensaver	358758987
 by Aaron Hill	GLife ScreenSaver		napsal Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Životnost mřížky: žádná
 None	GLife ScreenSaver		Žádná
 Grid height: %li	GLife ScreenSaver		Výška mřížky: %li
 Grid width: 	GLife ScreenSaver		Šířka mřížky: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Životnost mřížky: %dx
 Grid border: %li	GLife ScreenSaver		Okraj mřížky: %li
 Grid border: 	GLife ScreenSaver		Okraj mřížky: 
 OpenGL \"Game of Life\"	GLife ScreenSaver		OpenGL \"Hra života\"
 Grid height: 	GLife ScreenSaver		Výška mřížky: 
 4x	GLife ScreenSaver	This is a factor: the x represents 'times'	4x
 Grid width: %li	GLife ScreenSaver		Šířka mřížky: %li
+Grid life delay: %ldx	This is a factor: the x represents 'times', don't translate '%ld'		Zpoždění životnosti mřížky: %ldx
 Grid life delay: 	GLife ScreenSaver		Životnost mřížky: 

data/catalogs/add-ons/screen_savers/glife/da.catkeys

@@ -1,10 +1,9 @@
-1	danish	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	danish	x-vnd.Haiku-GLifeScreensaver	2189777521
 by Aaron Hill	GLife ScreenSaver		af Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Forsinkelse for gitterliv: none
 None	GLife ScreenSaver		Ingen
 Grid height: %li	GLife ScreenSaver		Gitterhøjde: %li
 Grid width: 	GLife ScreenSaver		Gitterbredde: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Forsinkelse for gitterliv: %dx
 Grid border: %li	GLife ScreenSaver		Gitterkant: %li
 Grid border: 	GLife ScreenSaver		Gitterkant: 
 OpenGL \"Game of Life\"	GLife ScreenSaver		OpenGL \"Game of Life\"

data/catalogs/add-ons/screen_savers/glife/de.catkeys

@@ -1,14 +1,14 @@
-1	german	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	german	x-vnd.Haiku-GLifeScreensaver	358758987
 by Aaron Hill	GLife ScreenSaver		von Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Verzögerung: keine
 None	GLife ScreenSaver		keine
 Grid height: %li	GLife ScreenSaver		Rasterhöhe: %li
 Grid width: 	GLife ScreenSaver		Rasterbreite: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Verzögerung: %dx
 Grid border: %li	GLife ScreenSaver		Rastergrenze: %li
 Grid border: 	GLife ScreenSaver		Rastergrenze: 
 OpenGL \"Game of Life\"	GLife ScreenSaver		OpenGL \"Spiel des Lebens\"
 Grid height: 	GLife ScreenSaver		Rasterhöhe: 
 4x	GLife ScreenSaver	This is a factor: the x represents 'times'	4x
 Grid width: %li	GLife ScreenSaver		Rasterbreite: %li
+Grid life delay: %ldx	This is a factor: the x represents 'times', don't translate '%ld'		Verzögerung: %ldx
 Grid life delay: 	GLife ScreenSaver		Verzögerung: 

data/catalogs/add-ons/screen_savers/glife/el.catkeys

@@ -1,14 +1,14 @@
-1	greek, modern (1453-)	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	greek, modern (1453-)	x-vnd.Haiku-GLifeScreensaver	358758987
 by Aaron Hill	GLife ScreenSaver		από τον Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Επέκταση ζωής κελιού: καμία
 None	GLife ScreenSaver		Κανένα
 Grid height: %li	GLife ScreenSaver		Ύψος κελιού: %li
 Grid width: 	GLife ScreenSaver		Πλάτος κελιού: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Επέκταση ζωής κελιού: %dx
 Grid border: %li	GLife ScreenSaver		Περίγραμμα κελιού: %li
 Grid border: 	GLife ScreenSaver		Περίγραμμα κελιού: 
 OpenGL \"Game of Life\"	GLife ScreenSaver		OpenGL \"Παιχνίδι της Ζωής\"
 Grid height: 	GLife ScreenSaver		Ύψος κελιού: 
 4x	GLife ScreenSaver	This is a factor: the x represents 'times'	4x
 Grid width: %li	GLife ScreenSaver		Πλάτος κελιού: %li
+Grid life delay: %ldx	This is a factor: the x represents 'times', don't translate '%ld'		Καθυστέρηση ζωής ανά κελί: %ldx
 Grid life delay: 	GLife ScreenSaver		Επέκταση ζωής κελιού: 

data/catalogs/add-ons/screen_savers/glife/eo.catkeys

@@ -1,10 +1,9 @@
-1	esperanto	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	esperanto	x-vnd.Haiku-GLifeScreensaver	2189777521
 by Aaron Hill	GLife ScreenSaver		de Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Kadroviva prokrasto: neniu
 None	GLife ScreenSaver		Neniu
 Grid height: %li	GLife ScreenSaver		Kadroalto: %li
 Grid width: 	GLife ScreenSaver		Kadrolarĝo: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Kadrovivo prokrasto: %d-foje
 Grid border: %li	GLife ScreenSaver		Krada bordero: %li
 Grid border: 	GLife ScreenSaver		Krada bordero: 
 OpenGL \"Game of Life\"	GLife ScreenSaver		OpenGL \"Ludo de la vivo\"

data/catalogs/add-ons/screen_savers/glife/es.catkeys

@@ -1,10 +1,9 @@
-1	spanish; castilian	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	spanish; castilian	x-vnd.Haiku-GLifeScreensaver	2189777521
 by Aaron Hill	GLife ScreenSaver		por Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Demora de la cuadrícula: ninguna
 None	GLife ScreenSaver		Ninguno
 Grid height: %li	GLife ScreenSaver		Altura de la cuadrícula: %li
 Grid width: 	GLife ScreenSaver		Anchura de la cuadrícula: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Demora de activación de la cuadrícula: %dx
 Grid border: %li	GLife ScreenSaver		Borde de la cuadrícula: %li
 Grid border: 	GLife ScreenSaver		Borde de la cuadrícula: 
 OpenGL \"Game of Life\"	GLife ScreenSaver		\"El juego de la vida\" OpenGL

data/catalogs/add-ons/screen_savers/glife/fi.catkeys

@@ -1,14 +1,14 @@
-1	finnish	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	finnish	x-vnd.Haiku-GLifeScreensaver	358758987
 by Aaron Hill	GLife ScreenSaver		tekijä: Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Rasterin käyttöikäviive: ei mitään
 None	GLife ScreenSaver		Ei mitään
 Grid height: %li	GLife ScreenSaver		Rasterikorkeus: %li
 Grid width: 	GLife ScreenSaver		Rasterileveys: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Rasterin käyttöikäviive: %dx
 Grid border: %li	GLife ScreenSaver		Rasteriraja: %li
 Grid border: 	GLife ScreenSaver		Rasteriraja: 
 OpenGL \"Game of Life\"	GLife ScreenSaver		OpenGL ”Elämänpeli”
 Grid height: 	GLife ScreenSaver		Rasterikorkeus: 
 4x	GLife ScreenSaver	This is a factor: the x represents 'times'	4x
 Grid width: %li	GLife ScreenSaver		Rasterileveys: %li
+Grid life delay: %ldx	This is a factor: the x represents 'times', don't translate '%ld'		Rasterieloviive: %ldx
 Grid life delay: 	GLife ScreenSaver		Rasterin käyttöikäviive: 

data/catalogs/add-ons/screen_savers/glife/fr.catkeys

@@ -1,14 +1,14 @@
-1	french	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	french	x-vnd.Haiku-GLifeScreensaver	358758987
 by Aaron Hill	GLife ScreenSaver		par Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Délai de vie de la grille : aucun
 None	GLife ScreenSaver		Aucun
 Grid height: %li	GLife ScreenSaver		Hauteur de la grille : %li
 Grid width: 	GLife ScreenSaver		Largeur de la grille : 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Délai de vie de la grille : %dx
 Grid border: %li	GLife ScreenSaver		Bordure de la grille : %li
 Grid border: 	GLife ScreenSaver		Bordure de la grille : 
 OpenGL \"Game of Life\"	GLife ScreenSaver		OpenGL « Jeu de la vie »
 Grid height: 	GLife ScreenSaver		Hauteur de la grille : 
 4x	GLife ScreenSaver	This is a factor: the x represents 'times'	4x
 Grid width: %li	GLife ScreenSaver		Largeur de la grille : %li
+Grid life delay: %ldx	This is a factor: the x represents 'times', don't translate '%ld'		Délai de vie de la grille : %ldx
 Grid life delay: 	GLife ScreenSaver		Délai de vie de la grille : 

data/catalogs/add-ons/screen_savers/glife/fur.catkeys

@@ -1,14 +1,14 @@
-1	friulian	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	friulian	x-vnd.Haiku-GLifeScreensaver	358758987
 by Aaron Hill	GLife ScreenSaver		di Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Ritart te gridele de vite: nissun
 None	GLife ScreenSaver		Nissun
 Grid height: %li	GLife ScreenSaver		Altece gridele: %li
 Grid width: 	GLife ScreenSaver		Largjece gridele: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Ritart te gridele de vite: %dx
 Grid border: %li	GLife ScreenSaver		Ôr gridele: %li
 Grid border: 	GLife ScreenSaver		Ôr gridele: 
 OpenGL \"Game of Life\"	GLife ScreenSaver		Il \"Zûc de Vite\" in version OpenGL
 Grid height: 	GLife ScreenSaver		Altece gridele: 
 4x	GLife ScreenSaver	This is a factor: the x represents 'times'	4x
 Grid width: %li	GLife ScreenSaver		Largjece gridele: %li
+Grid life delay: %ldx	This is a factor: the x represents 'times', don't translate '%ld'		Ritart de vite te gridele: %ldx
 Grid life delay: 	GLife ScreenSaver		Ritart te gridele de vite: 

data/catalogs/add-ons/screen_savers/glife/hu.catkeys

@@ -1,14 +1,14 @@
-1	hungarian	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	hungarian	x-vnd.Haiku-GLifeScreensaver	358758987
 by Aaron Hill	GLife ScreenSaver		Készítette: Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Késleltetés: nincs
 None	GLife ScreenSaver		Nincs
 Grid height: %li	GLife ScreenSaver		Magasság: %li
 Grid width: 	GLife ScreenSaver		Szélesség: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Késleltetés: %dx
 Grid border: %li	GLife ScreenSaver		Keret: %li
 Grid border: 	GLife ScreenSaver		Keret: 
 OpenGL \"Game of Life\"	GLife ScreenSaver		OpenGL \"Életjáték\"
 Grid height: 	GLife ScreenSaver		Magasság: 
 4x	GLife ScreenSaver	This is a factor: the x represents 'times'	4x
 Grid width: %li	GLife ScreenSaver		Szélesség: %li
+Grid life delay: %ldx	This is a factor: the x represents 'times', don't translate '%ld'		Késleltetés: %ldx
 Grid life delay: 	GLife ScreenSaver		Késleltetés: 

data/catalogs/add-ons/screen_savers/glife/id.catkeys

@@ -1,10 +1,9 @@
-1	indonesian	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	indonesian	x-vnd.Haiku-GLifeScreensaver	2189777521
 by Aaron Hill	GLife ScreenSaver		oleh Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Tundaan kisi hidup: tidak ada
 None	GLife ScreenSaver		Tak satupun
 Grid height: %li	GLife ScreenSaver		Tinggi kotak: %li
 Grid width: 	GLife ScreenSaver		Lebar kisi: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Tundaan kisi hidup: %dx
 Grid border: %li	GLife ScreenSaver		Bata kisi: %li
 Grid border: 	GLife ScreenSaver		Batas kisi: 
 OpenGL \"Game of Life\"	GLife ScreenSaver		OpenGL \"Game of Life\"

data/catalogs/add-ons/screen_savers/glife/it.catkeys

@@ -1,10 +1,9 @@
-1	italian	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	italian	x-vnd.Haiku-GLifeScreensaver	2189777521
 by Aaron Hill	GLife ScreenSaver		di Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Ritardo nella griglia della vita: nessuno
 None	GLife ScreenSaver		Nessuno
 Grid height: %li	GLife ScreenSaver		Altezza della griglia: %li
 Grid width: 	GLife ScreenSaver		Ampiezza della griglia: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Ritardo nella griglia della vita: %dx
 Grid border: %li	GLife ScreenSaver		Bordo della griglia: %li
 Grid border: 	GLife ScreenSaver		Bordo della griglia: 
 OpenGL \"Game of Life\"	GLife ScreenSaver		Il \"Gioco della Vita\" in versione OpenGL

data/catalogs/add-ons/screen_savers/glife/ja.catkeys

@@ -1,14 +1,14 @@
-1	japanese	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	japanese	x-vnd.Haiku-GLifeScreensaver	358758987
 by Aaron Hill	GLife ScreenSaver		Aaron Hill 作
 Grid life delay: none	GLife ScreenSaver		グリッドが変化するまでの時間: 無し
 None	GLife ScreenSaver		無し
 Grid height: %li	GLife ScreenSaver		グリッドの高さ: %li
 Grid width: 	GLife ScreenSaver		グリッドの幅: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		グリッドが変化するまでの時間: %dx
 Grid border: %li	GLife ScreenSaver		グリッドの境界: %li
 Grid border: 	GLife ScreenSaver		グリッドの境界: 
 OpenGL \"Game of Life\"	GLife ScreenSaver		OpenGL \"ライフゲーム\"
 Grid height: 	GLife ScreenSaver		グリッドの高さ: 
 4x	GLife ScreenSaver	This is a factor: the x represents 'times'	4x
 Grid width: %li	GLife ScreenSaver		グリッドの幅: %li
+Grid life delay: %ldx	This is a factor: the x represents 'times', don't translate '%ld'		グリッドが変化するまでの時間: %ldx
 Grid life delay: 	GLife ScreenSaver		グリッドが変化するまでの時間: 

data/catalogs/add-ons/screen_savers/glife/nl.catkeys

@@ -1,10 +1,9 @@
-1	dutch; flemish	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	dutch; flemish	x-vnd.Haiku-GLifeScreensaver	2189777521
 by Aaron Hill	GLife ScreenSaver		door Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Vertraging beweging raster: geen
 None	GLife ScreenSaver		Geen
 Grid height: %li	GLife ScreenSaver		Rasterbreedte: %li
 Grid width: 	GLife ScreenSaver		Rasterbreedte: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Vertraging beweging raster: %dx
 Grid border: %li	GLife ScreenSaver		Rasterrand: %li
 Grid border: 	GLife ScreenSaver		Rasterrand:  
 OpenGL \"Game of Life\"	GLife ScreenSaver		OpenGL \"Game of Life\"

data/catalogs/add-ons/screen_savers/glife/pl.catkeys

@@ -1,10 +1,9 @@
-1	polish	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	polish	x-vnd.Haiku-GLifeScreensaver	2189777521
 by Aaron Hill	GLife ScreenSaver		autorstwa Aarona Hilla
 Grid life delay: none	GLife ScreenSaver		Opóźnienie cyklu życia: brak
 None	GLife ScreenSaver		Brak
 Grid height: %li	GLife ScreenSaver		Wysokość siatki: %li
 Grid width: 	GLife ScreenSaver		Szerokość siatki: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Opóźnienie cyklu życia: %dx
 Grid border: %li	GLife ScreenSaver		Krawędzie siatki: %li
 Grid border: 	GLife ScreenSaver		Krawędzie siatki: 
 OpenGL \"Game of Life\"	GLife ScreenSaver		„Gra w Życie” (OpenGL)

data/catalogs/add-ons/screen_savers/glife/pt.catkeys

@@ -1,10 +1,9 @@
-1	portuguese	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	portuguese	x-vnd.Haiku-GLifeScreensaver	2189777521
 by Aaron Hill	GLife ScreenSaver		por Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Atraso da vida da grelha: nenhum
 None	GLife ScreenSaver		Nenhum
 Grid height: %li	GLife ScreenSaver		Altura da grelha: %li
 Grid width: 	GLife ScreenSaver		Largura da grelha: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Atraso da vida da grelha: %dx
 Grid border: %li	GLife ScreenSaver		Limite da grelha: %li
 Grid border: 	GLife ScreenSaver		Limite da grelha: 
 OpenGL \"Game of Life\"	GLife ScreenSaver		\"Jogo da Vida\" OpenGL

data/catalogs/add-ons/screen_savers/glife/pt_BR.catkeys

@@ -1,10 +1,9 @@
-1	portuguese (brazil)	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	portuguese (brazil)	x-vnd.Haiku-GLifeScreensaver	2189777521
 by Aaron Hill	GLife ScreenSaver		por Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Atraso de vida da grade: nenhum
 None	GLife ScreenSaver		Nenhum
 Grid height: %li	GLife ScreenSaver		Altura da grade: %li
 Grid width: 	GLife ScreenSaver		Largura da grade: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Atraso de vida da grade: %dx
 Grid border: %li	GLife ScreenSaver		Borda da grade: %li
 Grid border: 	GLife ScreenSaver		Borda da grade: 
 OpenGL \"Game of Life\"	GLife ScreenSaver		OpenGL \"Jogo da Vida\"

data/catalogs/add-ons/screen_savers/glife/ro.catkeys

@@ -1,10 +1,9 @@
-1	romanian	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	romanian	x-vnd.Haiku-GLifeScreensaver	2189777521
 by Aaron Hill	GLife ScreenSaver		de Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Întârziere de viață a grilei: nespecificat
 None	GLife ScreenSaver		Nespecificat
 Grid height: %li	GLife ScreenSaver		Înălțime grilă: %li
 Grid width: 	GLife ScreenSaver		Lățime grilă: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Întârziere de viață a grilei: %dx
 Grid border: %li	GLife ScreenSaver		Margină grilă: %li
 Grid border: 	GLife ScreenSaver		Margină grilă: 
 OpenGL \"Game of Life\"	GLife ScreenSaver		\„Jocul vieții\” OpenGL

data/catalogs/add-ons/screen_savers/glife/ru.catkeys

@@ -1,10 +1,9 @@
-1	russian	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	russian	x-vnd.Haiku-GLifeScreensaver	2189777521
 by Aaron Hill	GLife ScreenSaver		разработал Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Задержка сетки: нет
 None	GLife ScreenSaver		Отсутствует
 Grid height: %li	GLife ScreenSaver		Высота сетки: %li
 Grid width: 	GLife ScreenSaver		Ширина сетки: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Задержка сетки: %dx
 Grid border: %li	GLife ScreenSaver		Граница сетки: %li
 Grid border: 	GLife ScreenSaver		Граница сетки: 
 OpenGL \"Game of Life\"	GLife ScreenSaver		OpenGL \"Игра Жизнь\"

data/catalogs/add-ons/screen_savers/glife/sv.catkeys

@@ -1,14 +1,14 @@
-1	swedish	x-vnd.Haiku-GLifeScreensaver	2955223231
+1	swedish	x-vnd.Haiku-GLifeScreensaver	358758987
 by Aaron Hill	GLife ScreenSaver		av Aaron Hill
 Grid life delay: none	GLife ScreenSaver		Rutnätets livslängd: ingen
 None	GLife ScreenSaver		Ingen
 Grid height: %li	GLife ScreenSaver		Rutnätets höjd %li
 Grid width: 	GLife ScreenSaver		Rutnätets bredd: 
-Grid life delay: %dx	This is a factor: the x represents 'times', don't translate '%d'		Rutnätets livslängd: %dx
 Grid border: %li	GLife ScreenSaver		Rutnätets kant: %li
 Grid border: 	GLife ScreenSaver		Rutnätets kant: 
 OpenGL \"Game of Life\"	GLife ScreenSaver		OpenGL \"Game of Life\"
 Grid height: 	GLife ScreenSaver		Rutnätets höjd: 
 4x	GLife ScreenSaver	This is a factor: the x represents 'times'	4x
 Grid width: %li	GLife ScreenSaver		Rutnätets bredd: %li
+Grid life delay: %ldx	This is a factor: the x represents 'times', don't translate '%ld'		Rutnätets livslängd: %ldx
 Grid life delay: 	GLife ScreenSaver		Rutnätets livslängd: