Merge branch 'master' into dev/netservices

3rdparty/docker/bootstrap/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 ENV DEBIAN_FRONTEND="noninteractive"
 
@@ -7,8 +7,8 @@ RUN apt-get update
 # Base Haiku requirements
 RUN apt-get install -y git nasm autoconf automake autopoint texinfo \
 	flex bison gawk build-essential unzip wget zip less zlib1g-dev \
-	libcurl4-openssl-dev genisoimage libtool mtools gcc-multilib \
+	libzstd-dev libcurl4-openssl-dev genisoimage libtool \
-	u-boot-tools util-linux device-tree-compiler bc
+	mtools gcc-multilib u-boot-tools util-linux device-tree-compiler bc
 
 # GCC requirements
 RUN apt-get install -y python3

3rdparty/docker/bootstrap/crosstools.sh

@@ -21,7 +21,7 @@ mkdir -p $GENERATED
 echo "Beginning a bootstrap build for $TARGET_ARCH at $GENERATED..."
 
 cd $GENERATED
-$WORKPATH/src/haiku/configure -j4 --build-cross-tools $TARGET_ARCH $WORKPATH/src/buildtools \
+$WORKPATH/src/haiku/configure -j4 --build-cross-tools $TARGET_ARCH --cross-tools-source $WORKPATH/src/buildtools \
 	--bootstrap $WORKPATH/src/haikuporter/haikuporter $WORKPATH/src/haikuports.cross $WORKPATH/src/haikuports
 
 echo "If everything was successful, your next step is 'TARGET_ARCH=$TARGET_ARCH make bootstrap'"

3rdparty/os_probe/83haiku

@@ -0,0 +1,56 @@
+#!/bin/sh
+# Detects bootable Haiku OS on BeFS partitions and FUSE mounted BeFS too.
+# If it doesn't find anything, try mounting the BeFS volumes in Linux.
+# Discussion of improvements and development history at
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=732696
+# Adapted from version 42 (dated 20150811) updated by Jeroen Oortwijn at
+# https://bazaar.launchpad.net/~idefix/ubuntu/trusty/os-prober/HaikuPM/files/head:/os-probes/mounted/x86
+# Latest version now at https://git.haiku-os.org/haiku/tree/3rdparty/os_probe
+
+. /usr/share/os-prober/common.sh
+
+partition="$1"
+mpoint="$2"
+type="$3"
+
+# Weed out stuff that doesn't apply to us, needs to be a Be file system.
+case "$type" in
+	bfs|befs) debug "$partition is a BeFS partition." ;;
+	fuse|fuseblk) debug "$partition is a FUSE partition, maybe with BeFS on it." ; mpoint="$mpoint/myfs" ;;
+	*) exit 1 ;; # Be quiet and just quit for irrelevant partitions.
+esac
+
+if head -c 512 "$partition" | grep -qs "haiku_loader"; then
+	debug "Haiku stage 1 bootloader found."
+else
+	debug "Haiku stage 1 bootloader not found: exiting"
+	exit 1
+fi
+
+if system="$(item_in_dir "system" "$mpoint")" &&
+	packages="$(item_in_dir "packages" "$mpoint/$system")" &&
+		item_in_dir -q "haiku_loader-r[0-9].*\.hpkg" "$mpoint/$system/$packages" &&
+		rev="$(item_in_dir "haiku-r[0-9].*\.hpkg" "$mpoint/$system/$packages")"
+then
+	debug "Haiku Package Manager stage 2 bootloader and kernel ($rev) found."
+	label="$(count_next_label Haiku)"
+	# Convert kernel file name like haiku-r1~beta3_hrev55181_56-1-x86_64.hpkg
+	# or haiku-r1~alpha4_pm_hrev49856-1-x86_gcc2.hpkg into a readable version,
+	# like "Haiku R1 beta3 (hrev55181_56) 64".  Seems to use a travelling space
+	# technique in the sed stream editor.
+	rev="$(echo "$rev" | sed 's/haiku-//;s/^\(r[0-9]\+\)./\U\1\E /;s/ \([a-z]\+[0-9]\+\)[_-]/ \1 /;s/ [a-z]*_\?\(hrev[0-9_]\+\)\+-/ (\1) /;s/) [^_]\+_\([a-z0-9]\+\)\.hpkg/) \1 /;s/[^ ]\+.hpkg//;s/ $//')"
+	long="Haiku $rev"
+	result "$partition:$long:$label:chain"
+	exit 0
+elif system="$(item_in_dir "system" "$mpoint")" &&
+	item_in_dir -q "haiku_loader" "$mpoint/$system" &&
+	item_in_dir -q "kernel_.*" "$mpoint/$system"
+then
+	debug "Older non-package manager Haiku stage 2 bootloader and kernel found."
+	label="$(count_next_label Haiku)"
+	result "$partition:Haiku:$label:chain"
+	exit 0
+else
+	debug "Haiku stage 2 bootloader and kernel not found: exiting"
+	exit 1
+fi

3rdparty/os_probe/README.md

@@ -0,0 +1,30 @@
+# os-probe for the Haiku Computer Operating System
+
+This is the Linux "os-probes" file to detect Haiku OS and to automatically add
+it to the GRUB boot menu.  Mostly relevant for x86 BIOS based computers.
+
+Copy the 83haiku file to your Linux system in the os-probes subdirectory,
+usually (in Fedora at least) it will be /usr/libexec/os-probes/mounted/83haiku
+You can find older 83haiku versions in the repository history, though the
+latest should be able to detect older (pre-package manager) Haiku too.
+
+Then regenerate the GRUB boot configuration file.  This will happen
+automatically the next time your kernel is updated.  To do it manually,
+for old school MBR BIOS boot computers, the command is
+`grub2-mkconfig --output /boot/grub2/grub.cfg`
+If it doesn't find the Haiku partitions, try manually mounting them in Linux
+and rerun the grub command.
+
+Computers using the newer UEFI boot system have a EFI/HAIKU/BOOTX64.EFI file
+that you manually install to your EFI partition, and booting is done
+differently, so you don't need this 83Haiku file for them.  See
+[UEFI Booting Haiku](https://www.haiku-os.org/guides/uefi_booting/) instead.
+
+The original seems to have come from Debian and was written by François Revol.
+It's in the
+[Debian os-prober package](https://packages.debian.org/search?keywords=os-prober).
+There's also a big discussion about updating it in
+[Debian Bug Report #732696](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=732696).
+Latest version is now at https://git.haiku-os.org/haiku/tree/3rdparty/os_probe
+
+_AGMS20210927_

Jamfile

@@ -20,10 +20,10 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 # Include required packages:
 # primary architecture
 AddHaikuImageSystemPackages [ FFilterByBuildFeatures
-	bash bc coreutils freetype libsolv zlib
+	bash bc freetype libsolv zlib
 
-	!gcc2 @{ icu66 }@
+	!gcc2 @{ coreutils icu66 }@
-	gcc2 @{ icu icu66_x86@secondary_x86 }@
+	gcc2 @{ coreutils_x86 icu icu66_x86@secondary_x86 }@
 	regular_image @{
 		bzip2 diffutils expat ffmpeg findutils glu gutenprint8 gzip
 		lame less libedit libicns
@@ -37,7 +37,10 @@ AddHaikuImageSystemPackages [ FFilterByBuildFeatures
 	}@
 ] ;
 AddHaikuImageSourcePackages [ FFilterByBuildFeatures
-	bash bc coreutils
+	bash bc
+
+	!gcc2 @{ coreutils }@
+	gcc2 @{ coreutils_x86 }@
 
 	regular_image @{
 		expat ffmpeg findutils grep gutenprint8 gzip

ReadMe.Compiling.md

@@ -136,7 +136,7 @@ cd haiku/generated.x86_64
 cd haiku/generated.x86gcc2
 ../configure \
 	--cross-tools-source ../../buildtools/ \
-	--build-cross-tools x86_gcc2 
+	--build-cross-tools x86_gcc2 \
 	--build-cross-tools x86
 ```
 
@@ -244,7 +244,7 @@ Configure Haiku's build system for a bootstrap build specifying the location
 of all of the repositories above.
 ```
 ../configure -j4 \
-  --build-cross-tools myarch ../../buildtools \
+  --build-cross-tools myarch --cross-tools-source ../../buildtools \
   --bootstrap ../../haikuporter/haikuporter ../../haikuports.cross ../../haikuports
 ```
 

build/jam/ArchitectureRules

@@ -40,6 +40,7 @@ rule ArchitectureSetup architecture
 	switch $(cpu) {
 		case ppc : archFlags += -mcpu=440fp ;
 		case arm : archFlags += -march=armv7-a -mfloat-abi=hard ;
+		case arm64 : archFlags += -march=armv8.2-a+fp16 ;
 		case x86 : archFlags += -march=pentium ;
 		case riscv64 : archFlags += -march=rv64gc ;
 	}
@@ -108,11 +109,11 @@ rule ArchitectureSetup architecture
 
 	# disable some Clang warnings that are not very useful
 	if $(HAIKU_CC_IS_CLANG_$(architecture)) = 1 {
-		HAIKU_WARNING_CCFLAGS_$(architecture) += -Wno-address-of-packed-member
+		HAIKU_WARNING_CCFLAGS_$(architecture) +=
-			-Wno-unused-private-field -Wno-cast-align -Wno-gnu-designator
+			-Wno-unused-private-field -Wno-gnu-designator
 			-Wno-builtin-requires-header ;
-		HAIKU_WARNING_C++FLAGS_$(architecture) += -Wno-address-of-packed-member
+		HAIKU_WARNING_C++FLAGS_$(architecture) +=
-			-Wno-unused-private-field -Wno-cast-align -Wno-gnu-designator
+			-Wno-unused-private-field -Wno-gnu-designator
 			-Wno-builtin-requires-header ;
 	}
 
@@ -122,7 +123,10 @@ rule ArchitectureSetup architecture
 		# TODO: Remove all these.
 		HAIKU_WERROR_FLAGS_$(architecture) += -Wno-error=unused-but-set-variable
 			-Wno-error=deprecated -Wno-error=deprecated-declarations
-			-Wno-error=cpp -Wno-error=trigraphs ;
+			-Wno-error=cpp -Wno-error=trigraphs -Wno-error=register ;
+		# These currently generate too many "false positives."
+		HAIKU_WERROR_FLAGS_$(architecture) += -Wno-error=address-of-packed-member
+			-Wno-error=stringop-overread -Wno-error=array-bounds ;
 		# But these can stay.
 		HAIKU_WERROR_FLAGS_$(architecture) += -Wno-error=cast-align
 			-Wno-error=format-truncation ;
@@ -217,6 +221,7 @@ rule KernelArchitectureSetup architecture
 	# packaging architecture (supplied for convenience).
 
 	HAIKU_KERNEL_ARCH = $(HAIKU_ARCH) ;
+	HAIKU_KERNEL_ARCH_DIR = $(HAIKU_KERNEL_ARCH) ;
 
 	local cpu = $(HAIKU_CPU_$(architecture)) ;
 
@@ -267,7 +272,7 @@ rule KernelArchitectureSetup architecture
 
 			HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
 			# offset in floppy image (>= sizeof(haiku_loader))
-			HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 320 ; # in kB
+			HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 384 ; # in kB
 
 			# nasm is required for target arch x86
 			if ! $(HAIKU_NASM) {
@@ -292,10 +297,10 @@ rule KernelArchitectureSetup architecture
 
 			HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
 			# offset in floppy image (>= sizeof(haiku_loader))
-			HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 320 ; # in kB
+			HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 384 ; # in kB
 
 			# x86_64 kernel source is under arch/x86.
-			HAIKU_KERNEL_ARCH = x86 ;
+			HAIKU_KERNEL_ARCH_DIR = x86 ;
 
 			# nasm is required for target arch x86_64
 			if ! $(HAIKU_NASM) {
@@ -333,14 +338,14 @@ rule KernelArchitectureSetup architecture
 	HAIKU_PRIVATE_KERNEL_HEADERS =
 		[ PrivateHeaders $(DOT) kernel libroot shared
 			kernel/boot/platform/$(HAIKU_KERNEL_PLATFORM) ]
-		[ ArchHeaders $(HAIKU_KERNEL_ARCH) ]
+		[ ArchHeaders $(HAIKU_KERNEL_ARCH_DIR) ]
 		[ FDirName $(HAIKU_COMMON_DEBUG_OBJECT_DIR_$(architecture)) system
 			kernel ]
 		$(HAIKU_PRIVATE_SYSTEM_HEADERS_$(architecture))
 		;
 
 	# C/C++ flags
-	local ccBaseFlags = -finline -fno-builtin ;
+	local ccBaseFlags = -finline -fno-builtin -Wno-main ;
 
 	if $(HAIKU_CC_IS_LEGACY_GCC_$(architecture)) != 1 {
 		if $(HAIKU_CC_IS_CLANG_$(architecture)) != 1 {
@@ -467,6 +472,11 @@ rule KernelArchitectureSetup architecture
 	}
 
 	# bootloader-centric flags
+	HAIKU_BOOT_CCFLAGS
+		+= -DBOOT_ARCHIVE_IMAGE_OFFSET=$(HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET) ;
+	HAIKU_BOOT_C++FLAGS
+		+= -DBOOT_ARCHIVE_IMAGE_OFFSET=$(HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET) ;
+
 	local bootTarget ;
 	for bootTarget in $(HAIKU_BOOT_TARGETS) {
 		switch $(bootTarget) {
@@ -489,6 +499,27 @@ rule KernelArchitectureSetup architecture
 							HAIKU_BOOT_$(bootTarget:U)_CCFLAGS += -maccumulate-outgoing-args ;
 							HAIKU_BOOT_$(bootTarget:U)_C++FLAGS += -maccumulate-outgoing-args ;
 						}
+					case arm :
+						HAIKU_BOOT_$(bootTarget:U)_CCFLAGS += -mfloat-abi=soft ;
+						HAIKU_BOOT_$(bootTarget:U)_C++FLAGS += -mfloat-abi=soft ;
+
+						# Remove any previous -mfloat-abi=hard setting from compiler flags
+						local fixedBootCCFlags ;
+						local fixedBootC++Flags ;
+						for flag in $(HAIKU_BOOT_CCFLAGS) {
+							if $(flag) = "-mfloat-abi=hard" {
+								continue ;
+							}
+							fixedBootCCFlags += $(flag) ;
+						}
+						for flag in $(HAIKU_BOOT_C++FLAGS) {
+							if $(flag) = "-mfloat-abi=hard" {
+								continue ;
+							}
+							fixedBootC++Flags += $(flag) ;
+						}
+						HAIKU_BOOT_CCFLAGS = $(fixedBootCCFlags) ;
+						HAIKU_BOOT_C++FLAGS = $(fixedBootC++Flags) ;
 				}
 				HAIKU_BOOT_$(bootTarget:U)_LDFLAGS = -Bstatic -Bsymbolic
 					-nostdlib -znocombreloc -no-undefined ;
@@ -532,6 +563,9 @@ rule KernelArchitectureSetup architecture
 			case riscv :
 				HAIKU_BOOT_$(bootTarget:U)_CCFLAGS += -mcmodel=medany -fno-omit-frame-pointer -fno-plt -fno-pic -fno-semantic-interposition ;
 				HAIKU_BOOT_$(bootTarget:U)_C++FLAGS += -mcmodel=medany -fno-omit-frame-pointer -fno-plt -fno-pic -fno-semantic-interposition ;
+			case openfirmware :
+				HAIKU_BOOT_$(bootTarget:U)_CCFLAGS += -fno-pic -fno-semantic-interposition -Wno-error=main -Wstack-usage=1023 ;
+				HAIKU_BOOT_$(bootTarget:U)_C++FLAGS += -fno-pic -fno-semantic-interposition -Wno-error=main -Wstack-usage=1023 ;
 			case * :
 				# all other bootloaders are non-PIC
 				HAIKU_BOOT_$(bootTarget:U)_CCFLAGS += -fno-pic -Wno-error=main ;
@@ -556,11 +590,6 @@ rule KernelArchitectureSetup architecture
 	# defines
 	HAIKU_KERNEL_DEFINES += _KERNEL_MODE ;
 
-	HAIKU_DEFINES_$(architecture)
-		+= BOOT_ARCHIVE_IMAGE_OFFSET=$(HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET) ;
-		# TODO: That doesn't need to be a general define. It's just needed for
-		# compiling (part of) the boot loader.
-
 	# kernel add-on glue code
 	HAIKU_KERNEL_ADDON_BEGIN_GLUE_CODE = <$(architecture)>crtbeginS.o
 		<src!system!glue!$(architecture)>haiku_version_glue.o ;
@@ -630,14 +659,14 @@ rule ArchitectureSetupWarnings architecture
 	EnableWerror src add-ons disk_systems ;
 	EnableWerror src add-ons input_server devices ;
 	EnableWerror src add-ons input_server filters ;
-#	EnableWerror src add-ons input_server methods pen ;
+	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 agp_gart ;
 	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 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 ;
@@ -649,35 +678,39 @@ rule ArchitectureSetupWarnings architecture
 	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 ; # gcc2
+	EnableWerror src add-ons kernel debugger ;
 #	EnableWerror src add-ons kernel drivers audio ;
 	EnableWerror src add-ons kernel drivers bluetooth ;
-#	EnableWerror src add-ons kernel drivers bus ;
+	EnableWerror src add-ons kernel drivers bus ;
 	EnableWerror src add-ons kernel drivers common ;
 #	EnableWerror src add-ons kernel drivers disk ;
 	EnableWerror src add-ons kernel drivers dvb ;
 #	EnableWerror src add-ons kernel drivers graphics ;
 	EnableWerror src add-ons kernel drivers graphics intel_extreme ;
-#	EnableWerror src add-ons kernel drivers input ;
+	EnableWerror src add-ons kernel drivers input ;
 	EnableWerror src add-ons kernel drivers joystick ;
 	EnableWerror src add-ons kernel drivers midi ;
 	EnableWerror src add-ons kernel drivers misc ;
 #	EnableWerror src add-ons kernel drivers network ;
 	EnableWerror src add-ons kernel drivers ports ;
-#	EnableWerror src add-ons kernel drivers power ;
+	EnableWerror src add-ons kernel drivers power ;
 	EnableWerror src add-ons kernel drivers printer ;
 	EnableWerror src add-ons kernel drivers random ;
 	EnableWerror src add-ons kernel drivers tty ;
 	EnableWerror src add-ons kernel drivers video ;
 	EnableWerror src add-ons kernel file_systems bfs ;
 	EnableWerror src add-ons kernel file_systems cdda ;
-#	EnableWerror src add-ons kernel file_systems ext2 ;
+	EnableWerror src add-ons kernel file_systems ext2 ;
 #	EnableWerror src add-ons kernel file_systems fat ;
-#	EnableWerror src add-ons kernel file_systems googlefs ;
+	EnableWerror src add-ons kernel file_systems googlefs ;
 	EnableWerror src add-ons kernel file_systems iso9660 ;
 	EnableWerror src add-ons kernel file_systems layers ;
 #	EnableWerror src add-ons kernel file_systems netfs ;
@@ -690,13 +723,7 @@ rule ArchitectureSetupWarnings architecture
 	EnableWerror src add-ons kernel file_systems udf ;
 	EnableWerror src add-ons kernel file_systems userlandfs ;
 	EnableWerror src add-ons kernel generic ;
-#	EnableWerror src add-ons kernel network datalink_protocols ;
+	EnableWerror src add-ons kernel network ;
-	EnableWerror src add-ons kernel network devices ;
-	EnableWerror src add-ons kernel network dns_resolver ;
-	EnableWerror src add-ons kernel network notifications ;
-	EnableWerror src add-ons kernel network ppp ;
-	EnableWerror src add-ons kernel network protocols ;
-#	EnableWerror src add-ons kernel network stack ;
 	EnableWerror src add-ons kernel partitioning_systems ;
 	EnableWerror src add-ons kernel power ;
 	EnableWerror src add-ons locale ;
@@ -714,15 +741,15 @@ rule ArchitectureSetupWarnings architecture
 	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 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 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 ;
-#	EnableWerror src add-ons media plugins raw_decoder ;
+	EnableWerror src add-ons media plugins raw_decoder ;
 	EnableWerror src add-ons print ;
 	EnableWerror src add-ons screen_savers ;
 	EnableWerror src add-ons tracker ;

build/jam/BootRules

@@ -76,9 +76,9 @@ rule SetupBoot
 		SourceSysHdrs $(sources) : $(TARGET_PRIVATE_KERNEL_HEADERS) ;
 	}
 
-	if $(HAIKU_BOOT_C++_HEADERS_DIR_$(TARGET_PACKAGING_ARCH)) {
+	if $(HAIKU_BOOT_C++_HEADERS_DIR_$(TARGET_KERNEL_ARCH)) {
 		SourceSysHdrs $(sources) :
-			$(HAIKU_BOOT_C++_HEADERS_DIR_$(TARGET_PACKAGING_ARCH)) ;
+			$(HAIKU_BOOT_C++_HEADERS_DIR_$(TARGET_KERNEL_ARCH)) ;
 	}
 
 	# MultiBootSubDirSetup sets the target boot platform on the target object,
@@ -90,6 +90,8 @@ rule SetupBoot
 	local platform = $(TARGET_BOOT_PLATFORM:U) ;
 	local object ;
 	for object in $(objects) {
+		TARGET_PACKAGING_ARCH on $(object) = $(TARGET_KERNEL_ARCH) ;
+
 		# add boot flags for the object
 		ObjectCcFlags $(object) : $(HAIKU_BOOT_CCFLAGS) $(HAIKU_BOOT_$(platform)_CCFLAGS) $(2) ;
 		ObjectC++Flags $(object) : $(HAIKU_BOOT_C++FLAGS) $(HAIKU_BOOT_$(platform)_C++FLAGS) $(2) ;
@@ -97,13 +99,14 @@ rule SetupBoot
 		ASFLAGS on $(object) = $(HAIKU_BOOT_CCFLAGS) $(HAIKU_BOOT_$(platform)_CCFLAGS) ;
 
 		# override regular CCFLAGS/C++FLAGS, as we don't want them
-		TARGET_CCFLAGS_$(TARGET_PACKAGING_ARCH) on $(object) = ;
+		TARGET_CCFLAGS_$(TARGET_KERNEL_ARCH) on $(object) = ;
-		TARGET_C++FLAGS_$(TARGET_PACKAGING_ARCH) on $(object) = ;
+		TARGET_C++FLAGS_$(TARGET_KERNEL_ARCH) on $(object) = ;
+		TARGET_ASFLAGS_$(TARGET_KERNEL_ARCH) on $(object) = ;
 
 		# override warning flags
-		TARGET_WARNING_CCFLAGS_$(TARGET_PACKAGING_ARCH) on $(object)
+		TARGET_WARNING_CCFLAGS_$(TARGET_KERNEL_ARCH) on $(object)
 			= $(TARGET_KERNEL_WARNING_CCFLAGS) ;
-		TARGET_WARNING_C++FLAGS_$(TARGET_PACKAGING_ARCH) on $(object)
+		TARGET_WARNING_C++FLAGS_$(TARGET_KERNEL_ARCH) on $(object)
 			= $(TARGET_KERNEL_WARNING_C++FLAGS) ;
 	 }
 }
@@ -118,7 +121,7 @@ rule BootLd
 {
 	# BootLd <name> : <objs> : <linkerscript> : <args> ;
 
-	LINK on $(1) = $(TARGET_LD_$(TARGET_PACKAGING_ARCH)) ;
+	LINK on $(1) = $(TARGET_LD_$(TARGET_KERNEL_ARCH)) ;
 
 	LINKFLAGS on $(1) = $(HAIKU_BOOT_$(TARGET_BOOT_PLATFORM:U)_LDFLAGS) $(4) ;
 	if $(3) { LINKFLAGS on $(1) += --script=$(3) ; }
@@ -130,8 +133,8 @@ rule BootLd
 		libs += [ TargetBootLibsupc++ true ] ;
 		Depends $(1) : [ TargetBootLibsupc++ ] ;
 	}
-	LINKLIBS on $(1) = $(libs) [ TargetBootLibgcc true ] ;
+	LINKLIBS on $(1) = $(libs) [ TargetBootLibgcc $(TARGET_KERNEL_ARCH) : true ] ;
-	Depends $(1) : [ TargetBootLibgcc ] ;
+	Depends $(1) : [ TargetBootLibgcc $(TARGET_KERNEL_ARCH) ] ;
 
 	# TODO: Do we really want to invoke SetupBoot here? The objects should
 	# have been compiled with BootObjects anyway, so we're doing that twice.
@@ -169,6 +172,8 @@ rule BootMergeObject
 	#				   will be added.
 	#
 
+	TARGET_PACKAGING_ARCH on $(1) = $(TARGET_KERNEL_ARCH) ;
+
 	SetupBoot $(2) : $(3) ;
 	Objects $(2) ;
 	MergeObjectFromObjects $(1) : $(2:S=$(SUFOBJ)) : $(4) ;
@@ -181,6 +186,8 @@ rule BootStaticLibrary
 	# This is designed to take a set of sources and libraries and create
 	# a file called lib<name>.a
 
+	TARGET_PACKAGING_ARCH on $(1) = $(TARGET_KERNEL_ARCH) ;
+
 	SetupBoot $(2) : $(3) : false ;
 	Library $(1) : $(2) ;
 }
@@ -191,6 +198,8 @@ rule BootStaticLibraryObjects
 	# This is designed to take a set of sources and libraries and create
 	# a file called <name>
 
+	TARGET_PACKAGING_ARCH on $(1) = $(TARGET_KERNEL_ARCH) ;
+
 	# Show that we depend on the libraries we need
 	SetupBoot $(2) ;
 	LocalClean clean : $(1) ;
@@ -205,7 +214,7 @@ actions BootStaticLibraryObjects
 	# Force recreation of the archive to avoid build errors caused by
 	# stale dependencies after renaming or deleting object files.
 	$(RM) "$(1)"
-	$(HAIKU_AR_$(TARGET_PACKAGING_ARCH)) -r "$(1)" "$(2)" ;
+	$(HAIKU_AR_$(TARGET_KERNEL_ARCH)) -r "$(1)" "$(2)" ;
 }
 
 rule BuildMBR binary : source

build/jam/BuildFeatureRules

@@ -5,6 +5,11 @@ rule FQualifiedBuildFeatureName features
 	# Prepends the name of the current target packaging architecture to the
 	# given feature names.
 
+	if $(features[1]) = "QUALIFIED" {
+		# We have been pre-supplied a qualified name.
+		return $(features[2]) ;
+	}
+
 	return $(TARGET_PACKAGING_ARCH):$(features) ;
 }
 

build/jam/BuildFeatures

@@ -78,9 +78,12 @@ if [ IsPackageAvailable gcc_syslibs_devel ] {
 				libgcc_eh.a: $(developLibDir)/libgcc_eh.a
 				libgcc-kernel.a: $(developLibDir)/libgcc-kernel.a
 				libgcc_eh-kernel.a: $(developLibDir)/libgcc_eh.a
+				libgcc-boot.a: $(developLibDir)/libgcc-boot.a
+				libgcc_eh-boot.a: $(developLibDir)/libgcc_eh-boot.a
 				libstdc++.a: $(developLibDir)/libstdc++.a
 				libsupc++.a: $(developLibDir)/libsupc++.a
 				libsupc++-kernel.a: $(developLibDir)/libsupc++-kernel.a
+				libsupc++-boot.a: $(developLibDir)/libsupc++-boot.a
 				c++-headers: $(developHeadersDir)/c++
 				gcc-headers: $(developHeadersDir)/gcc
 			;
@@ -104,7 +107,6 @@ if [ IsPackageAvailable icu_devel ] {
 				$(developLibDir)/libicudata.so
 				$(developLibDir)/libicui18n.so
 				$(developLibDir)/libicuio.so
-				$(developLibDir)/libicutu.so
 				$(developLibDir)/libicuuc.so
 			headers: $(developHeadersDir)
 		;
@@ -120,7 +122,6 @@ if [ IsPackageAvailable icu_devel ] {
 				$(developLibDir)/libicudata.so
 				$(developLibDir)/libicui18n.so
 				$(developLibDir)/libicuio.so
-				$(developLibDir)/libicutu.so
 				$(developLibDir)/libicuuc.so
 			headers: $(developHeadersDir)
 		;
@@ -622,6 +623,23 @@ if [ IsPackageAvailable libdvdnav_devel ] {
 }
 
 
+# libraw
+if [ IsPackageAvailable libraw_devel ] {
+	ExtractBuildFeatureArchives libraw :
+		file: base libraw
+			runtime: lib
+		file: devel libraw_devel
+			depends: base
+			libraries: $(developLibDir)/libraw.so.19
+			headers: $(developHeadersDir)
+		;
+
+	EnableBuildFeatures libraw ;
+} else {
+	unavailableBuildFeatures += libraw ;
+}
+
+
 # libwebp
 if [ IsPackageAvailable libwebp_devel ] {
 	if $(HAIKU_PACKAGING_ARCH) = x86 && $(TARGET_PACKAGING_ARCH) = x86_gcc2 {
@@ -652,19 +670,15 @@ if [ IsPackageAvailable libwebp_devel ] {
 
 # libavif
 if [ IsPackageAvailable libavif_devel ] {
-	if $(HAIKU_PACKAGING_ARCH) = x86_64 {
+	ExtractBuildFeatureArchives libavif :
-		ExtractBuildFeatureArchives libavif :
+		file: base libavif
-			file: base libavif
+			runtime: lib
-				runtime: lib
+		file: devel libavif_devel
-			file: devel libavif_devel
+			depends: base
-				depends: base
+			library: $(developLibDir)/libavif.so.9
-				library: $(developLibDir)/libavif.so.12
+			headers: $(developHeadersDir) $(developHeadersDir)/avif
-				headers: $(developHeadersDir) $(developHeadersDir)/avif
+		;
-			;
+	EnableBuildFeatures libavif ;
-		EnableBuildFeatures libavif ;
-	} else {
-		unavailableBuildFeatures += libavif ;
-	}
 } else {
 	unavailableBuildFeatures += libavif ;
 }

build/jam/BuildSetup

@@ -114,7 +114,12 @@ for architecture in $(HAIKU_PACKAGING_ARCHS) {
 }
 
 if $(HAIKU_PACKAGING_ARCH) {
-	KernelArchitectureSetup $(HAIKU_PACKAGING_ARCH) ;
+	local kernelArch = $(HAIKU_PACKAGING_ARCH) ;
+	# Always use the non-legacy GCC for the kernel.
+	if $(kernelArch) = x86_gcc2 {
+		kernelArch = x86 ;
+	}
+	KernelArchitectureSetup $(kernelArch) ;
 }
 
 # define primary packaging architecture macro
@@ -217,7 +222,7 @@ HOST_UNARFLAGS		?= x ;
 
 # check the host platform compatibility
 SetPlatformCompatibilityFlagVariables HOST_PLATFORM : HOST : host
-	: linux openbsd freebsd darwin msys ;
+	: linux openbsd freebsd darwin ;
 HOST_PLATFORM_(host)_COMPATIBLE = 1 ;
 
 if $(HOST_PLATFORM) = linux || $(HOST_PLATFORM) = freebsd
@@ -407,10 +412,7 @@ if $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
 } else {
 	HOST_LINKFLAGS += -lm -ldl ;
 	HOST_LIBSTDC++ = stdc++ ;
-	if $(HOST_PLATFORM) = msys {
+	if $(HOST_PLATFORM) = darwin {
-		HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR
-			= "PATH=$PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)" ;
-	} else if $(HOST_PLATFORM) = darwin {
 		HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR
 			= "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)\"" ;
 	} else {
@@ -565,7 +567,7 @@ if $(HAIKU_HOST_BUILD_ONLY) = 1 {
 # for all architectures (e.g. TARGET_DEFINES).
 
 local buildVars =
-	ARCH ARCHS KERNEL_ARCH PACKAGING_ARCH PACKAGING_ARCHS
+	ARCH ARCHS KERNEL_ARCH KERNEL_ARCH_DIR PACKAGING_ARCH PACKAGING_ARCHS
 
 	DEFINES
 	KERNEL_DEFINES
@@ -644,7 +646,6 @@ switch $(HOST_PLATFORM) {
 	case linux		: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_LINUX ;
 	case freebsd	: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_FREEBSD ;
 	case darwin		: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_DARWIN ;
-	case msys		: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_MSYS ;
 }
 
 # define host platform 64 bit macro

build/jam/HaikuPackages

@@ -2,6 +2,7 @@
 # subdirectory.
 local packages = [ FFilterByBuildFeatures
 	HaikuDevel
+	HaikuDataTranslators
 	HaikuExtras
 	HaikuLoader
 	HaikuSource

build/jam/ImageRules

@@ -1649,6 +1649,7 @@ rule BuildCDBootPPCImage image : hfsmaps : elfloader : coffloader : chrpscript
 actions BuildCDBootPPCImage1 bind MAPS
 {
 	$(RM) $(<)
+
 	mkdir -p $(HAIKU_OUTPUT_DIR)/cd/ppc
 	mkdir -p $(HAIKU_OUTPUT_DIR)/cd/boot
 	# CHRP Boot script
@@ -1662,9 +1663,10 @@ actions BuildCDBootPPCImage1 bind MAPS
 
 	# Xorriso doesn't have map and some other required tools
 	# to make bootable PowerPC images
-	genisoimage -v -hfsplus -map $(MAPS) \
+	genisoimage -v -hfs -map $(MAPS) \
 		-hfs-bless $(HAIKU_OUTPUT_DIR)/cd/boot -part -no-desktop \
 		-hfs-parms MAX_XTCSIZE=2656248 -hfs-volid Haiku \
+		--prep-boot boot/haikuloader.elf \
 		--chrp-boot -r -J -o $(<) $(HAIKU_OUTPUT_DIR)/cd
 
 	$(RM) -r $(HAIKU_OUTPUT_DIR)/cd
@@ -1683,6 +1685,8 @@ rule BuildEfiSystemPartition image : efiLoader
 	Depends $(image) : $(fatshell) ;
 
 	switch $(TARGET_ARCH) {
+		case x86 :
+			EFINAME on $(image) = "BOOTIA32.EFI" ;
 		case x86_64 :
 			EFINAME on $(image) = "BOOTX64.EFI" ;
 		case arm :

build/jam/KernelRules

@@ -16,14 +16,16 @@ rule SetupKernel
 
 	local object ;
 	for object in $(objects) {
+		TARGET_PACKAGING_ARCH on $(object) = $(TARGET_KERNEL_ARCH) ;
+
 		# add kernel flags for the object
 		ObjectCcFlags $(object) : $(TARGET_KERNEL_CCFLAGS) $(2) ;
 		ObjectC++Flags $(object) : $(TARGET_KERNEL_C++FLAGS) $(2) ;
 		ObjectDefines $(object) : $(TARGET_KERNEL_DEFINES) ;
 
 		# override regular CCFLAGS/C++FLAGS, as we don't want them
-		TARGET_CCFLAGS_$(TARGET_PACKAGING_ARCH) on $(object) = ;
+		TARGET_CCFLAGS_$(TARGET_KERNEL_ARCH) on $(object) = ;
-		TARGET_C++FLAGS_$(TARGET_PACKAGING_ARCH) on $(object) = ;
+		TARGET_C++FLAGS_$(TARGET_KERNEL_ARCH) on $(object) = ;
 
 		# override warning flags
 		TARGET_WARNING_CCFLAGS_$(TARGET_PACKAGING_ARCH) on $(object)
@@ -43,7 +45,7 @@ rule KernelLd
 {
 	# KernelLd <name> : <objs> : <linkerscript> : <args> ;
 
-	LINK on $(1) = $(TARGET_LD_$(TARGET_PACKAGING_ARCH)) ;
+	LINK on $(1) = $(TARGET_LD_$(HAIKU_KERNEL_ARCH)) ;
 
 	LINKFLAGS on $(1) = $(4) ;
 	if $(3) {
@@ -103,7 +105,7 @@ actions KernelSo1
 	export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
 
 	$(2[1]) --data $(2[2]) $(1) &&
-	$(HAIKU_ELFEDIT_$(TARGET_PACKAGING_ARCH)) --output-type dyn $(1)
+	$(HAIKU_ELFEDIT_$(HAIKU_KERNEL_ARCH)) --output-type dyn $(1)
 }
 
 rule KernelAddon
@@ -115,6 +117,8 @@ rule KernelAddon
 	local libs = $(3) ;
 	AddResources $(1) : $(4) ;
 
+	TARGET_PACKAGING_ARCH on $(target) = $(TARGET_KERNEL_ARCH) ;
+
 	local kernel ;
 	local beginGlue ;
 	local endGlue ;
@@ -164,6 +168,8 @@ rule KernelMergeObject
 	#                  will be added.
 	#
 
+	TARGET_PACKAGING_ARCH on $(1) = $(TARGET_KERNEL_ARCH) ;
+
 	SetupKernel $(2) : $(3) ;
 	Objects $(2) ;
 	MergeObjectFromObjects $(1) : $(2:S=$(SUFOBJ)) : $(4) ;
@@ -175,6 +181,8 @@ rule KernelStaticLibrary
 	# This is designed to take a set of sources and libraries and create
 	# a static library.
 
+	TARGET_PACKAGING_ARCH on $(1) = $(TARGET_KERNEL_ARCH) ;
+
 	SetupKernel $(2) : $(3) : false ;
 	Library $(1) : $(2) ;
 }
@@ -185,6 +193,8 @@ rule KernelStaticLibraryObjects
 	# This is designed to take a set of sources and libraries and create
 	# a file called <name>
 
+	TARGET_PACKAGING_ARCH on $(1) = $(TARGET_KERNEL_ARCH) ;
+
 	# Show that we depend on the libraries we need
 	SetupKernel $(2) ;
 	LocalClean clean : $(1) ;
@@ -199,5 +209,5 @@ actions KernelStaticLibraryObjects
 	# Force recreation of the archive to avoid build errors caused by
 	# stale dependencies after renaming or deleting object files.
 	$(RM) "$(1)"
-	$(HAIKU_AR_$(TARGET_PACKAGING_ARCH)) -r "$(1)" "$(2)" ;
+	$(HAIKU_AR_$(HAIKU_KERNEL_ARCH)) -r "$(1)" "$(2)" ;
 }

build/jam/MainBuildRules

@@ -258,15 +258,17 @@ actions Ld
 	$(LINK) $(LINKFLAGS) -o "$(1)" "$(2)" "$(NEEDLIBS)" $(LINKLIBS)
 }
 
-rule CreateAsmStructOffsetsHeader header : source
+rule CreateAsmStructOffsetsHeader header : source : architecture
 {
-	# CreateAsmStructOffsetsHeader header : source
+	# CreateAsmStructOffsetsHeader header : source : architecture
 	#
 	# Grist will be added to both header and source.
 
 	header = [ FGristFiles $(header) ] ;
 	source = [ FGristFiles $(source) ] ;
 
+	TARGET_PACKAGING_ARCH on $(header) = $(architecture) ;
+
 	# find out which headers, defines, etc. to use
 	local headers ;
 	local sysHeaders ;
@@ -367,7 +369,8 @@ rule CreateAsmStructOffsetsHeader header : source
 
 	Depends $(header) : $(source) $(PLATFORM) ;
 	SEARCH on $(source) += $(SEARCH_SOURCE) ;
-	MakeLocateArch $(header) ;
+	MakeLocate $(header) : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(architecture))
+		system kernel ] ;
 	LocalClean clean : $(header) ;
 
 	HDRRULE on $(source) = HdrRule ;

build/jam/OverriddenJamRules

@@ -6,12 +6,13 @@ rule Link
 {
 	# Note: RESFILES must be set before invocation.
 
+	local architecture = [ on $(1) return $(TARGET_PACKAGING_ARCH) ] ;
 	if [ on $(1) return $(PLATFORM) ] = host {
 		LINK on $(1) = $(HOST_LINK) ;
 	 	LINKFLAGS on $(1) = $(HOST_LINKFLAGS) [ on $(1) return $(LINKFLAGS) ] ;
 	} else {
-		LINK on $(1) = $(TARGET_LINK_$(TARGET_PACKAGING_ARCH)) ;
+		LINK on $(1) = $(TARGET_LINK_$(architecture)) ;
-	 	LINKFLAGS on $(1) = $(TARGET_LINKFLAGS_$(TARGET_PACKAGING_ARCH))
+		LINKFLAGS on $(1) = $(TARGET_LINKFLAGS_$(architecture))
 			[ on $(1) return $(LINKFLAGS) ] ;
 	}
 
@@ -172,38 +173,41 @@ rule Object
 
 rule As
 {
-	local flags ;
-	local includesSeparator ;
-	local localIncludesOption ;
-	local systemIncludesOption ;
-	if [ on $(1) return $(PLATFORM) ] = host {
-		flags = [ on $(1) return $(HOST_ASFLAGS) $(ASFLAGS) ] ;
-
-		CC on $(1) = $(HOST_CC) ;
-
-		includesSeparator = $(HOST_INCLUDES_SEPARATOR) ;
-		localIncludesOption = $(HOST_LOCAL_INCLUDES_OPTION) ;
-		systemIncludesOption = $(HOST_SYSTEM_INCLUDES_OPTION) ;
-	} else {
-		flags = [ on $(1) return $(TARGET_ASFLAGS_$(TARGET_PACKAGING_ARCH))
-			$(ASFLAGS) ] ;
-
-		CC on $(1) = $(TARGET_CC_$(TARGET_PACKAGING_ARCH)) ;
-
-		includesSeparator
-			= $(TARGET_INCLUDES_SEPARATOR_$(TARGET_PACKAGING_ARCH)) ;
-		localIncludesOption
-			= $(TARGET_LOCAL_INCLUDES_OPTION_$(TARGET_PACKAGING_ARCH)) ;
-		systemIncludesOption
-			= $(TARGET_SYSTEM_INCLUDES_OPTION_$(TARGET_PACKAGING_ARCH)) ;
-	}
-
 	Depends $(<) : $(>) [ on $(1) return $(PLATFORM) ] ;
-	ASFLAGS on $(<) += $(flags) $(SUBDIRASFLAGS) ;
+
-	ASHDRS on $(<) = [ on $(<) FIncludes $(HDRS) : $(localIncludesOption) ]
+	on $(1) {
-		$(includesSeparator)
+		local flags ;
-		[ on $(<) FSysIncludes $(SYSHDRS) : $(systemIncludesOption) ] ;
+		local includesSeparator ;
-	ASDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ;
+		local localIncludesOption ;
+		local systemIncludesOption ;
+
+		if $(PLATFORM) = host {
+			flags = $(HOST_ASFLAGS) $(ASFLAGS) ;
+
+			CC on $(1) = $(HOST_CC) ;
+
+			includesSeparator = $(HOST_INCLUDES_SEPARATOR) ;
+			localIncludesOption = $(HOST_LOCAL_INCLUDES_OPTION) ;
+			systemIncludesOption = $(HOST_SYSTEM_INCLUDES_OPTION) ;
+		} else {
+			flags = $(TARGET_ASFLAGS_$(TARGET_PACKAGING_ARCH)) $(ASFLAGS) ;
+
+			CC on $(1) = $(TARGET_CC_$(TARGET_PACKAGING_ARCH)) ;
+
+			includesSeparator
+				= $(TARGET_INCLUDES_SEPARATOR_$(TARGET_PACKAGING_ARCH)) ;
+			localIncludesOption
+				= $(TARGET_LOCAL_INCLUDES_OPTION_$(TARGET_PACKAGING_ARCH)) ;
+			systemIncludesOption
+				= $(TARGET_SYSTEM_INCLUDES_OPTION_$(TARGET_PACKAGING_ARCH)) ;
+		}
+
+		ASFLAGS on $(<) += $(flags) $(SUBDIRASFLAGS) ;
+		ASHDRS on $(<) = [ on $(<) FIncludes $(HDRS) : $(localIncludesOption) ]
+			$(includesSeparator)
+			[ on $(<) FSysIncludes $(SYSHDRS) : $(systemIncludesOption) ] ;
+		ASDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ;
+	}
 }
 
 actions As

build/jam/PackageRules

@@ -99,6 +99,7 @@ rule PreprocessPackageOrRepositoryInfo target : source : architecture
 	#		placeholder substitutions have been performed.
 
 	local defines = HAIKU_PACKAGING_ARCH=$(architecture)
+		HAIKU_PACKAGING_ARCH_$(architecture)
 		HAIKU_$(HAIKU_BUILD_TYPE:U)_BUILD ;
 	local sedReplacements = %HAIKU_PACKAGING_ARCH%,$(architecture) ;
 	if $(secondaryArchitecture) {

build/jam/SystemLibraryRules

@@ -103,7 +103,7 @@ rule TargetKernelLibsupc++ asPath
 			flags += path ;
 		}
 		return [
-			BuildFeatureAttribute gcc_syslibs_devel
+			BuildFeatureAttribute QUALIFIED $(TARGET_KERNEL_ARCH):gcc_syslibs_devel
 				: libsupc++-kernel.a : $(flags)
 		] ;
 	} else {
@@ -134,6 +134,12 @@ rule TargetBootLibsupc++ asPath
 		if $(asPath) = true {
 			flags += path ;
 		}
+		if $(TARGET_PACKAGING_ARCH) = arm {
+			return [
+				BuildFeatureAttribute gcc_syslibs_devel
+					: libsupc++-boot.a : $(flags)
+			] ;
+		}
 		return [
 			BuildFeatureAttribute gcc_syslibs_devel
 				: libsupc++-kernel.a : $(flags)
@@ -215,7 +221,7 @@ rule TargetKernelLibgcc asPath
 			flags += path ;
 		}
 		return [
-			BuildFeatureAttribute gcc_syslibs_devel
+			BuildFeatureAttribute QUALIFIED $(TARGET_KERNEL_ARCH):gcc_syslibs_devel
 				: libgcc-kernel.a : $(flags)
 		] ;
 	} else {
@@ -224,15 +230,15 @@ rule TargetKernelLibgcc asPath
 }
 
 
-rule TargetBootLibgcc asPath
+rule TargetBootLibgcc architecture : asPath
 {
-	# TargetBootLibgcc [ <asPath> ]
+	# TargetBootLibgcc [ architecture ] : [ <asPath> ]
 	#
 	# Returns the static bootloader libgcc for the target.
 	# Invoking with <asPath> = true will return the full library path.
 
 	if $(TARGET_PLATFORM) = haiku {
-		if $(TARGET_PACKAGING_ARCH) = x86_64 {
+		if $(architecture) = x86_64 {
 			# we need to use the 32-bit libgcc.a built by the cross-compiler
 			return $(TARGET_BOOT_LIBGCC) ;
 
@@ -246,8 +252,14 @@ rule TargetBootLibgcc asPath
 		if $(asPath) = true {
 			flags += path ;
 		}
+		if $(architecture) = arm {
+			return [
+				BuildFeatureAttribute QUALIFIED $(architecture):gcc_syslibs_devel
+					: libgcc-boot.a : $(flags)
+			] ;
+		}
 		return [
-			BuildFeatureAttribute gcc_syslibs_devel
+			BuildFeatureAttribute QUALIFIED $(architecture):gcc_syslibs_devel
 				: libgcc-kernel.a : $(flags)
 		] ;
 	} else {
@@ -292,7 +304,7 @@ rule TargetKernelLibgcceh asPath
 			flags += path ;
 		}
 		return [
-			BuildFeatureAttribute gcc_syslibs_devel
+			BuildFeatureAttribute QUALIFIED $(TARGET_KERNEL_ARCH):gcc_syslibs_devel
 				: libgcc_eh-kernel.a : $(flags)
 		] ;
 	} else {

build/jam/images/CDBootImage

@@ -13,7 +13,7 @@ NotFile $(HAIKU_CD_BOOT_IMAGE_CONTAINER_NAME) ;
 
 # common extra files to put on the boot iso
 local extras = README.html ;
-SEARCH on $(extras) = [ FDirName $(HAIKU_TOP) data boot_cd ] ;
+SEARCH on $(extras) = [ FDirName $(HAIKU_TOP) data boot extras ] ;
 
 if $(TARGET_ARCH) = ppc {
 	local elfloader = boot_loader_openfirmware ;
@@ -25,9 +25,6 @@ if $(TARGET_ARCH) = ppc {
 	# HFS creator and application type mapping for mkisofs
 	local hfsmaps = hfs.map ;
 
-	SEARCH on $(chrpscript) $(hfsmaps) $(extras)
-		= [ FDirName $(HAIKU_TOP) data boot_cd ] ;
-
 	BuildCDBootPPCImage $(HAIKU_CD_BOOT_IMAGE) : $(hfsmaps)
 		: $(elfloader) : $(coffloader) : $(chrpscript) : $(extras) ;
 } else {

build/jam/images/HaikuImage

@@ -17,6 +17,7 @@ include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuPackages ] ;
 AddPackageFilesToHaikuImage system packages :
 	haiku_loader.hpkg
 	haiku.hpkg
+	haiku_datatranslators.hpkg
 	haiku_$(TARGET_PACKAGING_ARCHS[2-]).hpkg
 	:
 	nameFromMetaInfo

build/jam/images/MMCImage

@@ -22,6 +22,8 @@ rule BuildSDImage image : files
 
 	if $(TARGET_BOOT_PLATFORM) = efi {
 		switch $(TARGET_ARCH) {
+			case x86 :
+				EFINAME on $(image) = "BOOTIA32.EFI" ;
 			case x86_64 :
 				EFINAME on $(image) = "BOOTX64.EFI" ;
 			case arm :

build/jam/images/NetBootArchive

@@ -8,12 +8,12 @@ SYSTEM_NETWORK_PROTOCOLS = ipv4 tcp udp icmp unix ;
 
 SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures
 	x86 @{
-		3com atheros813x
+		3com atheros813x atheros81xx
 		broadcom440x broadcom570x ipro1000
 		rtl8139 rtl81xx
 		via_rhine ipro100 nforce
 		marvell_yukon sis900 syskonnect
-		attansic_l2 ar81xx
+		attansic_l2
 	}@ # x86
 
 	etherpci pegasus usb_ecm wb840

build/jam/images/definitions/common-tail

@@ -13,7 +13,9 @@ AddDirectoryToHaikuImage home config var ;
 AddDirectoryToHaikuImage home config non-packaged bin ;
 AddDirectoryToHaikuImage home config non-packaged data fonts ;
 AddDirectoryToHaikuImage home config non-packaged lib ;
+AddDirectoryToHaikuImage home config non-packaged add-ons control_look ;
 AddDirectoryToHaikuImage home config non-packaged add-ons decorators ;
+AddDirectoryToHaikuImage home config non-packaged add-ons opengl ;
 AddDirectoryToHaikuImage home config non-packaged add-ons kernel drivers bin ;
 AddDirectoryToHaikuImage home config non-packaged add-ons kernel drivers dev ;
 AddDirectoryToHaikuImage home config non-packaged add-ons input_server devices ;
@@ -29,7 +31,9 @@ AddDirectoryToHaikuImage system cache tmp ;
 AddDirectoryToHaikuImage system non-packaged bin ;
 AddDirectoryToHaikuImage system non-packaged data fonts ;
 AddDirectoryToHaikuImage system non-packaged lib ;
+AddDirectoryToHaikuImage system non-packaged add-ons control_look ;
 AddDirectoryToHaikuImage system non-packaged add-ons decorators ;
+AddDirectoryToHaikuImage system non-packaged add-ons opengl ;
 AddDirectoryToHaikuImage system non-packaged add-ons kernel drivers bin ;
 AddDirectoryToHaikuImage system non-packaged add-ons kernel drivers dev ;
 AddDirectoryToHaikuImage system non-packaged add-ons input_server devices ;

build/jam/images/definitions/minimum

@@ -143,9 +143,15 @@ SYSTEM_NETWORK_PROTOCOLS =
 ;
 
 SYSTEM_ADD_ONS_ACCELERANTS = [ FFilterByBuildFeatures
-	x86,x86_64,riscv64 @{
+	framebuffer.accelerant
+	x86,x86_64 @{
 		vesa.accelerant
-	}@ # x86,x86_64,riscv64
+	}@ # x86,x86_64
+	riscv64 @{
+		# ati for qemu, radeon_hd for unmatched
+		ati.accelerant
+		radeon_hd.accelerant
+	}@ # riscv64
 ] ;
 
 SYSTEM_ADD_ONS_TRANSLATORS =
@@ -171,9 +177,15 @@ SYSTEM_ADD_ONS_DRIVERS_AUDIO = ;
 SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ;
 
 SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = [ FFilterByBuildFeatures
-	x86,x86_64,riscv64 @{
+	framebuffer
+	x86,x86_64 @{
 		vesa
-	}@ # x86,x86_64,riscv64
+	}@ # x86,x86_64
+	riscv64 @{
+		# ati for qemu, radeon_hd for unmatched
+		ati
+		radeon_hd
+	}@ # riscv64
 ] ;
 
 SYSTEM_ADD_ONS_DRIVERS_MIDI = ;
@@ -181,7 +193,7 @@ SYSTEM_ADD_ONS_DRIVERS_MIDI = ;
 SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures
 	x86,x86_64 @{
 		3com
-		atheros813x ar81xx attansic_l1 attansic_l2
+		atheros813x atheros81xx attansic_l1 attansic_l2
 		broadcom440x broadcom570x
 		dec21xxx
 		emulex_oce
@@ -256,7 +268,6 @@ local etcDir = [ FDirName $(HAIKU_TOP) data etc ] ;
 local etcFiles = inputrc profile ;
 etcFiles = $(etcFiles:G=etc) ;
 SEARCH on $(etcFiles) = $(etcDir) ;
-etcFiles += <etc>termcap ;
 AddFilesToHaikuImage system settings etc : $(etcFiles) ;
 
 local profileFiles = [ Glob $(etcDir)/profile.d : *.sh ] ;

build/jam/packages/Haiku

@@ -67,7 +67,7 @@ if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
 
 # drivers
 AddNewDriversToPackage 				: wmi@x86,x86_64 ;
-AddNewDriversToPackage disk			: nvme_disk@x86,x86_64 ;
+AddNewDriversToPackage disk			: nvme_disk ;
 AddNewDriversToPackage disk mmc		: mmc_disk ;
 AddNewDriversToPackage disk scsi	: scsi_cd scsi_disk ;
 AddNewDriversToPackage disk virtual : virtio_block ram_disk ;
@@ -202,7 +202,7 @@ AddBootModuleSymlinksToPackage
 	ide_isa@x86 isa@x86,x86_64 intel it8211
 	legacy_sata locked_pool
 	mmc mmc_disk
-	nvme_disk@x86,x86_64
+	nvme_disk
 	openpic@ppc
 	packagefs pci
 	fdt@riscv64,arm
@@ -214,7 +214,6 @@ AddBootModuleSymlinksToPackage
 
 # add-ons
 AddFilesToPackage add-ons accelerants	: $(SYSTEM_ADD_ONS_ACCELERANTS) ;
-AddFilesToPackage add-ons Translators	: $(SYSTEM_ADD_ONS_TRANSLATORS) ;
 AddFilesToPackage add-ons locale catalogs : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
 
 AddFilesToPackage add-ons mail_daemon inbound_protocols		: POP3
@@ -225,7 +224,6 @@ AddFilesToPackage add-ons mail_daemon inbound_filters
 AddFilesToPackage add-ons mail_daemon outbound_filters		: Fortune ;
 
 AddFilesToPackage add-ons media : $(SYSTEM_ADD_ONS_MEDIA) ;
-AddFilesToPackage add-ons media plugins : $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
 
 AddFilesToPackage add-ons Network\ Settings
 	: IPv4Interface IPv6Interface DNSClientService Hostname FTPService SSHService
@@ -268,10 +266,6 @@ AddFilesToPackage add-ons disk_systems
 # Kernel bluetooth stack
 AddFilesToPackage add-ons kernel bluetooth : $(SYSTEM_BT_STACK) ;
 
-# decorators
-AddFilesToPackage add-ons decorators : BeDecorator ;
-	# MacDecorator WinDecorator
-
 # the MIME DB
 CopyDirectoryToPackage data : <mimedb>mime_db : : : isTarget ;
 

build/jam/packages/HaikuDataTranslators

@@ -0,0 +1,9 @@
+local architecture = $(HAIKU_PACKAGING_ARCHS[1]) ;
+
+local dataTranslatorsPackage = haiku_datatranslators.hpkg ;
+HaikuPackage $(dataTranslatorsPackage) ;
+
+AddFilesToPackage add-ons Translators	: $(SYSTEM_ADD_ONS_TRANSLATORS) ;
+AddFilesToPackage add-ons media plugins : $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
+
+BuildHaikuPackage $(dataTranslatorsPackage) : haiku_datatranslators ;

build/jam/packages/HaikuDevel

@@ -28,12 +28,12 @@ AddFilesToPackage lib : $(developmentLibs) ;
 # library symlinks
 local lib ;
 for lib in [ HaikuImageGetSystemLibs ] $(developmentLibs) {
-	AddSymlinkToPackage develop lib : /system/lib $(lib:BS) ;
+	AddSymlinkToPackage develop lib : ../../lib $(lib:BS) ;
 	local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ;
 	if $(abiVersion) {
 		local abiVersionedLib = $(lib:BS).$(abiVersion) ;
 		AddSymlinkToPackage develop lib
-			: /system/lib $(abiVersionedLib) ;
+			: ../../lib $(abiVersionedLib) ;
 	}
 }
 

build/jam/packages/HaikuDevelSecondary

@@ -23,12 +23,12 @@ AddFilesToPackage lib $(architecture) : $(developmentLibs) ;
 local lib ;
 for lib in [ HaikuImageGetSystemLibs ] $(developmentLibs) {
 	AddSymlinkToPackage develop lib $(architecture)
-		: /system/lib/$(architecture) $(lib:BS) ;
+		: ../../../lib/$(architecture) $(lib:BS) ;
 	local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ;
 	if $(abiVersion) {
 		local abiVersionedLib = $(lib:BS).$(abiVersion) ;
 		AddSymlinkToPackage develop lib $(architecture)
-			: /system/lib/$(architecture) $(abiVersionedLib) ;
+			: ../../../lib/$(architecture) $(abiVersionedLib) ;
 	}
 }
 

build/jam/packages/HaikuExtras

@@ -3,11 +3,22 @@ local architecture = $(HAIKU_PACKAGING_ARCHS[1]) ;
 local extrasPackage = haiku_extras.hpkg ;
 HaikuPackage $(extrasPackage) ;
 
+## Driver Oddities
+
 # kernel modules
 AddFilesToPackage add-ons kernel partitioning_systems
 	: amiga_rdb@!m68k apple@!ppc sun@!sparc ;
 
-AddFilesToPackage add-ons control_look	: BeControlLook ;
+
+## Visual Oddities
+
+# MacDecorator WinDecorator need improved stack and tile support
+
+# Control Looks
+AddFilesToPackage add-ons control_look : BeControlLook FlatControlLook ;
+
+# Decorators
+AddFilesToPackage add-ons decorators : BeDecorator FlatDecorator ;
+
 
 BuildHaikuPackage $(extrasPackage) : haiku_extras ;
-

build/jam/repositories/Haiku

@@ -10,6 +10,7 @@ SEARCH on $(repoInfo) = $(HAIKU_TOP)/src/data/repository_infos ;
 local secondaryArchs = $(TARGET_PACKAGING_ARCHS[2-]) ;
 local packages = [ FFilterByBuildFeatures
 	haiku
+	haiku_datatranslators
 	haiku_devel
 	haiku_loader
 

build/jam/repositories/HaikuPorts/arm64

@@ -4,40 +4,40 @@ RemotePackageRepository HaikuPorts
 	:
 	# architecture "any" packages
 #	be_book-2008_10_26-3
-	ca_root_certificates-2020_01_01-1
+	ca_root_certificates-2021_07_05-1
-	haikuporter-1.2.3-2
+	haikuporter-1.2.5-1
-	noto-20170920-4
+	noto-20200106-1
 	timgmsoundfont-fixed-5
 	wqy_microhei-0.2.0~beta-4
 	:
 	# repository architecture packages
 	# primary architecture (arm64)
-	bash-5.1-1
+	bash-4.4.023-1
-	binutils-2.28.1_2017_08_05-1
+	binutils-2.36.1_2021_09_21-1
 	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-8.3.0_2021_09_21-1
-	gcc_syslibs_devel-8.3.0_2019_05_24-4
+	gcc_syslibs_devel-8.3.0_2021_09_21-1
-	gcc_syslibs-8.3.0_2019_05_24-4
+	gcc_syslibs-8.3.0_2021_09_21-1
-	icu-57.2-2
+	icu-67.1-1
-	icu_devel-57.2-2
+	icu_devel-67.1-1
 	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_devel-6.0-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

build/jam/repositories/HaikuPorts/riscv64

@@ -4,10 +4,10 @@ RemotePackageRepository HaikuPorts
 	:
 	# architecture "any" packages
 	be_book-2008_10_26-3
-	ca_root_certificates-2020_01_01-1
+	ca_root_certificates-2021_07_05-1
 	gnu_efi_kernel-3.0.10-1
-	haikuporter-1.2.3-2
+	haikuporter-1.2.5-1
-	noto-20170920-4
+	noto-20200106-1
 	timgmsoundfont-fixed-5
 	wqy_microhei-0.2.0~beta-4
 	:
@@ -41,6 +41,8 @@ RemotePackageRepository HaikuPorts
 	python-2.7.6-1
 	sed-4.2.1-1
 	texinfo-4.13a-1
+	zstd-1.5.0-2
+	zstd_devel-1.5.0-2
 	zlib-1.2.11-1
 	zlib_devel-1.2.11-1
 	:
@@ -121,6 +123,7 @@ RemotePackageRepository HaikuPorts
 	yasm
 	xz_utils
 	zlib
+	zstd
 	:
 	# debuginfo packages
 	;

build/jam/repositories/HaikuPorts/x86_64

@@ -4,33 +4,35 @@ RemotePackageRepository HaikuPorts
 	:
 	# architecture "any" packages
 	be_book-2008_10_26-3
-	ca_root_certificates-2021_01_19-1
+	ca_root_certificates-2021_07_05-1
-	gnu_efi_kernel-3.0.10-1
+	haikuporter-1.2.5-1
-	haikuporter-1.2.4-1
 	noto-20200106-1
 	noto_sans_cjk_jp-1.004-2
 	timgmsoundfont-fixed-5
 	wqy_microhei-0.2.0~beta-4
+	intel_wifi_firmwares-2019_11_02-1
+	realtek_wifi_firmwares-2019_01_02-1
+	ralink_wifi_firmwares-2015_02_11-1
 	:
 	# repository architecture packages
 	# primary architecture (x86_64)
 	autoconf-2.69-8
-	automake-1.16.3-1
+	automake-1.16.5-1
-	bash-5.1-1
+	bash-5.1.008-1
 	bc-1.07.1-2
-	bepdf-2.1.2-1
+	bepdf-2.1.4-2
 	binutils-2.31.1-2
-	bison-3.7.6-1
+	bison-3.8.2-1
 	bzip2-1.0.8-1
 	bzip2_devel-1.0.8-1
-	cdrtools-3.02~a09-1
+	cdrtools-3.02~a09-2
-	cdrtools_devel-3.02~a09-1
+	cdrtools_devel-3.02~a09-2
-	coreutils-8.29-2
+	coreutils-9.0-6
 	ctags-5.8-5
-	curl-7.76.1-1
+	curl-7.79.1-1
-	curl_devel-7.76.1-1
+	curl_devel-7.79.1-1
-	dav1d-0.8.2-1
+	dav1d-0.9.2-1
-	dav1d_devel-0.8.2-1
+	dav1d_devel-0.9.2-1
 	diffutils-3.7-1
 	enca-1.19-2
 	enca_devel-1.19-2
@@ -39,36 +41,36 @@ RemotePackageRepository HaikuPorts
 	fdk_aac-2.0.2-1
 	ffmpeg-4.2.2-9
 	ffmpeg_devel-4.2.2-9
-	file-5.40-1
+	file-5.41-1
-	file_data-5.40-1
+	file_data-5.41-1
 	findutils-4.8.0-1
 	flex-2.6.4-2
 	fluidlite-1.0.0-3
 	fluidlite_devel-1.0.0-3
 	fontconfig-2.13.92-1
 	fontconfig_devel-2.13.92-1
-	freetype-2.10.4-3
+	freetype-2.11.0-2
-	freetype_devel-2.10.4-3
+	freetype_devel-2.11.0-2
-	fribidi-1.0.10-1
+	fribidi-1.0.11-1
-	fribidi_devel-1.0.10-1
+	fribidi_devel-1.0.11-1
 	game_music_emu-0.6.3-1
 	game_music_emu_devel-0.6.3-1
 	gettext-0.19.8.1-7
 	gettext_libintl-0.19.8.1-7
-	gcc-8.3.0_2019_05_24-10
+	gcc-11.2.0_2021_07_28-5
-	gcc_syslibs-8.3.0_2019_05_24-10
+	gcc_syslibs-11.2.0_2021_07_28-5
-	gcc_syslibs_devel-8.3.0_2019_05_24-10
+	gcc_syslibs_devel-11.2.0_2021_07_28-5
 	giflib-5.2.1-1
 	giflib_devel-5.2.1-1
-	git-2.30.2-2
+	git-2.30.2-3
-	git_arch-2.30.2-2
+	git_arch-2.30.2-3
-	git_cvs-2.30.2-2
+	git_cvs-2.30.2-3
-	git_daemon-2.30.2-2
+	git_daemon-2.30.2-3
-	git_email-2.30.2-2
+	git_email-2.30.2-3
-	git_svn-2.30.2-2
+	git_svn-2.30.2-3
 	glu-9.0.0-7
 	glu_devel-9.0.0-7
-	gmp-6.2.1-1
+	gmp-6.2.1-2
 	graphite2-1.3.14-1
 	graphite2_devel-1.3.14-1
 	grep-3.6-2
@@ -76,8 +78,8 @@ RemotePackageRepository HaikuPorts
 	gutenprint8-5.3.1-2
 	gutenprint8_devel-5.3.1-2
 	gzip-1.10-1
-	haikuwebkit-1.8.2-2
+	haikuwebkit-1.8.4-1
-	haikuwebkit_devel-1.8.2-2
+	haikuwebkit_devel-1.8.4-1
 	harfbuzz-2.8.1-1
 	harfbuzz_devel-2.8.1-1
 	icu66-66.1-2
@@ -85,7 +87,7 @@ RemotePackageRepository HaikuPorts
 	jam-2.5_2018_11_21-8
 	jasper-2.0.16-4
 	jasper_devel-2.0.16-4
-	keymapswitcher-1.2.7.15-1
+	keymapswitcher-1.2.7.16-1
 	lame-3.100-3
 	lame_devel-3.100-3
 	lcms-2.12-1
@@ -93,6 +95,8 @@ RemotePackageRepository HaikuPorts
 	less-581.2-1
 	libass-0.15.1-1
 	libass_devel-0.15.1-1
+	libavif-0.8.4-2
+	libavif_devel-0.8.4-2
 	libbluray-1.3.0-1
 	libbluray_devel-1.3.0-1
 	libdvdnav-6.1.1-1
@@ -102,32 +106,36 @@ RemotePackageRepository HaikuPorts
 	libedit-20210419_3.1-1
 	libedit_devel-20210419_3.1-1
 	libexecinfo-1.1-5
-	libffi-3.2.1-6
+	libffi-3.4.2-1
 	libgcrypt-1.8.5-1
-	libgpg_error-1.36-1
+	libgpg_error-1.36-2
 	libiconv-1.16-1
 	libicns-0.8.1-8
 	libicns_devel-0.8.1-8
 	libidn2-2.0.5-2
-	libjpeg_turbo-2.1.0-1
+	libjpeg_turbo-2.1.1-1
-	libjpeg_turbo_devel-2.1.0-1
+	libjpeg_turbo_devel-2.1.1-1
 	libmodplug-0.8.9.0-1
 	libogg-1.3.5-1
 	libogg_devel-1.3.5-1
-	libopenmpt-0.5.9-1
+	libopenmpt-0.5.13-1
-	libopenmpt_devel-0.5.9-1
+	libopenmpt_devel-0.5.13-1
 	libpcap-1.8.1-4
 	libpcap_devel-1.8.1-4
 	libpcre2-10.37-1
-	libpcre-8.44-1
+	libpcre-8.45-1
-	libpcre_devel-8.44-1
+	libpcre_devel-8.45-1
 	libpng16-1.6.37-1
 	libpng16_devel-1.6.37-1
 	libpsl-0.21.0-1
 	libpsl_devel-0.21.0-1
+	libraw-0.19.5-3
+	libraw_devel-0.19.5-3
 	libsolv-0.3.0_haiku_2014_12_22-3
 	libsolv_devel-0.3.0_haiku_2014_12_22-3
-	libtasn1-4.16.0-1
+	libssh2-1.9.0-2
+	libssh2_devel-1.9.0-2
+	libtasn1-4.17.0-1
 	libtheora-1.1.1-7
 	libtheora_devel-1.1.1-7
 	libtool-2.4.6-2
@@ -137,27 +145,27 @@ RemotePackageRepository HaikuPorts
 	libvpx-1.10.0-1
 	libvpx_devel-1.10.0-1
 	libuuid-1.3.1-4
-	libwebp-1.1.0-2
+	libwebp-1.2.1-1
-	libwebp_devel-1.1.0-2
+	libwebp_devel-1.2.1-1
 	libxml2-2.9.12-1
 	libxml2_devel-2.9.12-1
 	libxslt-1.1.34-3
 	live555-2016.06.22-5
 	live555_devel-2016.06.22-5
-	llvm7-7.0.1-2
+	llvm9-9.0.1-2
-	llvm7_libs-7.0.1-2
+	llvm9_libs-9.0.1-2
 	m4-1.4.18-3
 	make-4.1-4
 	mandoc-1.14.3-2
 	mawk-1.3.4_20171017-1
-	mercurial-4.8.1-2
+	mercurial-4.9.1-1
-	mesa-17.1.10-6
+	mesa-21.2.3-2
-	mesa_devel-17.1.10-6
+	mesa_devel-21.2.3-2
-	mesa_swpipe-17.1.10-6
+	mesa_swpipe-21.2.3-2
 	mkdepend-1.7-5
 	mpc-1.2.1-1
 	mpfr-4.1.0-1
-	nano-5.7-1
+	nano-5.9-1
 	nasm-2.14.02-2
 	ncurses6-6.2-1
 	ncurses6_devel-6.2-1
@@ -169,9 +177,9 @@ RemotePackageRepository HaikuPorts
 	openexr_devel-2.4.1-1
 	openjpeg-2.4.0-1
 	openjpeg_devel-2.4.0-1
-	openssh-8.6p1-1
+	openssh-8.8p1-1
-	openssl-1.1.1k-1
+	openssl-1.1.1l-1
-	openssl_devel-1.1.1k-1
+	openssl_devel-1.1.1l-1
 	opus-1.3.1-1
 	opus_devel-1.3.1-1
 	p7zip-17.04-2
@@ -181,7 +189,7 @@ RemotePackageRepository HaikuPorts
 	pe-2.4.5-8
 	perl-5.32.1-1
 	pkgconfig-0.29.2-4
-	python3-3.7.10-4
+	python3-3.7.12-1
 	qrencode_kdl_devel-3.4.4-2
 	readline-8.1-1
 	sed-4.8-1
@@ -192,32 +200,32 @@ RemotePackageRepository HaikuPorts
 	soxr_devel-0.1.3-1
 	speex-1.2.0-4
 	speex_devel-1.2.0-4
-	sqlite-3.34.1.0-1
+	sqlite-3.36.0.0-1
 	subversion-1.14.1-1
 	subversion_devel-1.14.1-1
 	taglib-1.12-1
 	taglib_devel-1.12-1
 	tar-1.34-1
-	tcpdump-4.9.2-1
+	tcpdump-4.99.1-1
-	texinfo-6.7-2
+	texinfo-6.7-3
 	tiff4-4.2.0-1
 	tiff4_devel-4.2.0-1
 	tnftp-20151004-6
 	unzip-6.10c23-4
-	vision-0.10.6-1
+	vision-0.10.6-2
 	wavpack-5.4.0-1
 	wavpack_devel-5.4.0-1
 	wget-1.21.1-1
 	which-2.21-6
-	wpa_supplicant-2.9.haiku.1-2
+	wpa_supplicant-2.9.haiku.1-3
 	xz_utils-5.2.5-1
 	xz_utils_devel-5.2.5-1
 	zip-3.0-4
 	zlib-1.2.11-4
 	zlib_devel-1.2.11-4
-	zstd-1.4.5-1
+	zstd-1.5.0-2
-	zstd_bin-1.4.5-1
+	zstd_bin-1.5.0-2
-	zstd_devel-1.4.5-1
+	zstd_devel-1.5.0-2
 	:
 	# source packages
 	autoconf
@@ -265,6 +273,7 @@ RemotePackageRepository HaikuPorts
 	lcms
 	less
 	libass
+	libavif
 	libbluray
 	libdvdnav
 	libdvdread
@@ -284,7 +293,9 @@ RemotePackageRepository HaikuPorts
 	libpcre2
 	libpng16
 	libpsl
+	libraw
 	libsolv
+	libssh2
 	libtasn1
 	libtheora
 	libtool
@@ -296,7 +307,7 @@ RemotePackageRepository HaikuPorts
 	libxml2
 	libxslt
 	live555
-	llvm7
+	llvm9
 	m4
 	make
 	mandoc

build/jam/repositories/HaikuPorts/x86_gcc2

@@ -4,45 +4,46 @@ RemotePackageRepository HaikuPorts
 	:
 	# architecture "any" packages
 	be_book-2008_10_26-3
-	ca_root_certificates-2021_01_19-1
+	ca_root_certificates-2021_07_05-1
-	gnu_efi_kernel-3.0.10-1
+	haikuporter-1.2.5-1
-	haikuporter-1.2.4-1
 	noto-20200106-1
 	noto_sans_cjk_jp-1.004-2
 	timgmsoundfont-fixed-5
 	wqy_microhei-0.2.0~beta-4
+	intel_wifi_firmwares-2019_11_02-1
+	realtek_wifi_firmwares-2019_01_02-1
+	ralink_wifi_firmwares-2015_02_11-1
 	:
 	# repository architecture packages
 	# primary architecture (x86_gcc2)
 	autoconf-2.69-8
-	automake-1.16.3-1
+	automake-1.16.5-1
-	bash-5.1-1
+	bash-5.1.008-1
 	bc-1.07.1-2
-	bepdf-2.1.2-1
+	bepdf-2.1.4-2
 	binutils-2.17_2016_07_24-4
 	bison-3.0.5-1
 	bzip2-1.0.8-1
 	bzip2_devel-1.0.8-1
-	cdrtools-3.02~a09-1
+	cdrtools-3.02~a09-2
-	cdrtools_devel-3.02~a09-1
+	cdrtools_devel-3.02~a09-2
 	ctags-5.8-5
-	coreutils-8.24-2
+	curl-7.79.1-1
-	curl-7.76.1-1
+	curl_devel-7.79.1-1
-	curl_devel-7.76.1-1
 	diffutils-3.7-1
 	expat-2.4.1-1
 	expat_devel-2.4.1-1
 	ffmpeg-4.2.2-9
 	ffmpeg_devel-4.2.2-9
-	file-5.40-1
+	file-5.41-1
-	file_data-5.40-1
+	file_data-5.41-1
 	findutils-4.6.0-1
 	flex-2.6.4-2
 	fluidlite_devel-1.0.0-3
 	fontconfig-2.13.92-1
 	fontconfig_devel-2.13.92-1
-	freetype-2.10.4-3
+	freetype-2.11.0-2
-	freetype_devel-2.10.4-3
+	freetype_devel-2.11.0-2
 	gettext_libintl-0.19.8.1-7
 	gcc-2.95.3_2017_07_20-2
 	gcc_syslibs_devel-2.95.3_2017_07_20-2
@@ -63,7 +64,7 @@ RemotePackageRepository HaikuPorts
 	jam-2.5_2018_11_21-8
 	jasper-2.0.16-4
 	jasper_devel-2.0.16-4
-	keymapswitcher-1.2.7.15-1
+	keymapswitcher-1.2.7.16-1
 	lame-3.100-3
 	lame_devel-3.100-3
 	less-581.2-1
@@ -73,15 +74,15 @@ RemotePackageRepository HaikuPorts
 	libiconv-1.16-1
 	libicns-0.8.1-8
 	libicns_devel-0.8.1-8
-	libjpeg_turbo-2.1.0-1
+	libjpeg_turbo-2.1.1-1
-	libjpeg_turbo_devel-2.1.0-1
+	libjpeg_turbo_devel-2.1.1-1
 	liblayout-1.4.1-8
 	libmodplug-0.8.9.0-1
 	libogg-1.3.5-1
 	libogg_devel-1.3.5-1
 	libpcap-1.8.1-4
 	libpcap_devel-1.8.1-4
-	libpcre-8.44-1
+	libpcre-8.45-1
 	libpcre2-10.37-1
 	libpng16-1.6.37-1
 	libpng16_devel-1.6.37-1
@@ -89,6 +90,8 @@ RemotePackageRepository HaikuPorts
 	libpsl_devel-0.21.0-1
 	libsolv-0.3.0_haiku_2014_12_22-3
 	libsolv_devel-0.3.0_haiku_2014_12_22-3
+	libssh2-1.9.0-2
+	libssh2_devel-1.9.0-2
 	libtheora-1.1.1-7
 	libtheora_devel-1.1.1-7
 	libtool-2.4.6-2
@@ -96,8 +99,8 @@ RemotePackageRepository HaikuPorts
 	libvorbis-1.3.7-1
 	libvorbis_devel-1.3.7-1
 	libvpx-1.0.0-2
-	libwebp-1.1.0-2
+	libwebp-1.2.1-1
-	libwebp_devel-1.1.0-2
+	libwebp_devel-1.2.1-1
 	libxml2-2.9.12-1
 	libxml2_devel-2.9.12-1
 	live555-2016.06.22-5
@@ -117,9 +120,9 @@ RemotePackageRepository HaikuPorts
 	openexr_devel-2.2.1-3
 	openjpeg-2.1.2-3
 	openjpeg_devel-2.1.2-3
-	openssh-8.6p1-1
+	openssh-8.8p1-1
-	openssl-1.1.1k-1
+	openssl-1.1.1l-1
-	openssl_devel-1.1.1k-1
+	openssl_devel-1.1.1l-1
 	opus-1.3.1-1
 	opus_devel-1.3.1-1
 	patch-2.7.5-3
@@ -134,34 +137,37 @@ RemotePackageRepository HaikuPorts
 	sharutils-4.15.2-3
 	speex-1.2.0-4
 	speex_devel-1.2.0-4
-	sqlite-3.34.1.0-1
+	sqlite-3.36.0.0-1
 	taglib-1.7.2-3
 	taglib_devel-1.7.2-3
-	tcpdump-4.9.2-1
+	tcpdump-4.99.1-1
-	texinfo-6.1-6
+	texinfo-6.1-7
 	tiff4-4.2.0-1
 	tiff4_devel-4.2.0-1
 	tnftp-20151004-6
 	unzip-6.10c23-4
-	vision-0.10.6-1
+	vision-0.10.6-2
 	wget-1.21.1-1
 	which-2.21-6
 	wonderbrush-2.1.2-11
-	wpa_supplicant-2.9.haiku.1-2
+	wpa_supplicant-2.9.haiku.1-3
 	zip-3.0-4
 	zlib-1.2.11-4
 	zlib_devel-1.2.11-4
+	zstd-1.5.0-2
+	zstd_devel-1.5.0-2
 	# secondary architecture (x86)
 	binutils_x86-2.26.1_2016_07_22-6
-	bison_x86-3.7.6-1
+	bison_x86-3.8.2-1
 	bzip2_x86-1.0.8-1
 	bzip2_x86_devel-1.0.8-1
-	cdrtools_x86-3.02~a09-1
+	cdrtools_x86-3.02~a09-2
-	cdrtools_x86_devel-3.02~a09-1
+	cdrtools_x86_devel-3.02~a09-2
-	curl_x86-7.76.1-1
+	coreutils_x86-9.0-6
-	curl_x86_devel-7.76.1-1
+	curl_x86-7.79.1-1
-	dav1d_x86-0.8.2-1
+	curl_x86_devel-7.79.1-1
-	dav1d_x86_devel-0.8.2-1
+	dav1d_x86-0.9.2-1
+	dav1d_x86_devel-0.9.2-1
 	enca_x86-1.19-2
 	enca_x86_devel-1.19-2
 	expat_x86-2.4.1-1
@@ -172,27 +178,27 @@ RemotePackageRepository HaikuPorts
 	fluidlite_x86_devel-1.0.0-3
 	fontconfig_x86-2.13.92-1
 	fontconfig_x86_devel-2.13.92-1
-	freetype_x86-2.10.4-3
+	freetype_x86-2.11.0-2
-	freetype_x86_devel-2.10.4-3
+	freetype_x86_devel-2.11.0-2
-	fribidi_x86-1.0.10-1
+	fribidi_x86-1.0.11-1
-	fribidi_x86_devel-1.0.10-1
+	fribidi_x86_devel-1.0.11-1
 	game_music_emu_x86-0.6.3-1
 	game_music_emu_x86_devel-0.6.3-1
-	gcc_x86-8.3.0_2019_05_24-10
+	gcc_x86-11.2.0_2021_07_28-5
-	gcc_x86_syslibs-8.3.0_2019_05_24-10
+	gcc_x86_syslibs-11.2.0_2021_07_28-5
-	gcc_x86_syslibs_devel-8.3.0_2019_05_24-10
+	gcc_x86_syslibs_devel-11.2.0_2021_07_28-5
 	gettext_x86-0.19.8.1-7
 	gettext_x86_libintl-0.19.8.1-7
 	giflib_x86-5.2.1-1
 	giflib_x86_devel-5.2.1-1
 	glu_x86-9.0.0-7
 	glu_x86_devel-9.0.0-7
-	gmp_x86-6.2.1-1
+	gmp_x86-6.2.1-2
 	graphite2_x86-1.3.14-1
 	graphite2_x86_devel-1.3.14-1
 	grep_x86-3.6-2
-	haikuwebkit_x86-1.8.2-2
+	haikuwebkit_x86-1.8.4-1
-	haikuwebkit_x86_devel-1.8.2-2
+	haikuwebkit_x86_devel-1.8.4-1
 	harfbuzz_x86-2.8.1-1
 	harfbuzz_x86_devel-2.8.1-1
 	icu66_x86-66.1-2
@@ -205,32 +211,36 @@ RemotePackageRepository HaikuPorts
 	lcms_x86_devel-2.12-1
 	libass_x86-0.15.1-1
 	libass_x86_devel-0.15.1-1
+	libavif_x86-0.8.4-2
+	libavif_x86_devel-0.8.4-2
 	libedit_x86-20210419_3.1-1
 	libedit_x86_devel-20210419_3.1-1
 	libexecinfo_x86-1.1-5
-	libffi_x86-3.2.1-6
+	libffi_x86-3.4.2-1
-	libffi_x86_devel-3.2.1-6
+	libffi_x86_devel-3.4.2-1
 	libgcrypt_x86-1.8.5-1
-	libgpg_error_x86-1.36-1
+	libgpg_error_x86-1.36-2
 	libiconv_x86-1.16-1
 	libiconv_x86_devel-1.16-1
 	libicns_x86-0.8.1-8
 	libicns_x86_devel-0.8.1-8
 	libidn2_x86-2.0.5-2
-	libjpeg_turbo_x86-2.1.0-1
+	libjpeg_turbo_x86-2.1.1-1
-	libjpeg_turbo_x86_devel-2.1.0-1
+	libjpeg_turbo_x86_devel-2.1.1-1
 	libmodplug_x86-0.8.9.0-1
 	libogg_x86-1.3.5-1
 	libogg_x86_devel-1.3.5-1
-	libopenmpt_x86-0.5.9-1
+	libopenmpt_x86-0.5.13-1
-	libopenmpt_x86_devel-0.5.9-1
+	libopenmpt_x86_devel-0.5.13-1
-	libpcre_x86-8.44-1
+	libpcre_x86-8.45-1
-	libpcre_x86_devel-8.44-1
+	libpcre_x86_devel-8.45-1
 	libpng16_x86-1.6.37-1
 	libpng16_x86_devel-1.6.37-1
 	libsolv_x86-0.3.0_haiku_2014_12_22-3
 	libsolv_x86_devel-0.3.0_haiku_2014_12_22-3
-	libtasn1_x86-4.16.0-1
+	libssh2_x86-1.9.0-2
+	libssh2_x86_devel-1.9.0-2
+	libtasn1_x86-4.17.0-1
 	libtheora_x86-1.1.1-7
 	libtheora_x86_devel-1.1.1-7
 	libtool_x86-2.4.6-2
@@ -240,18 +250,18 @@ RemotePackageRepository HaikuPorts
 	libvorbis_x86_devel-1.3.7-1
 	libvpx_x86-1.10.0-1
 	libvpx_x86_devel-1.10.0-1
-	libwebp_x86-1.1.0-2
+	libwebp_x86-1.2.1-1
-	libwebp_x86_devel-1.1.0-2
+	libwebp_x86_devel-1.2.1-1
 	libxml2_x86-2.9.12-1
 	libxml2_x86_devel-2.9.12-1
 	libxslt_x86-1.1.34-3
 	live555_x86-2016.06.22-5
 	live555_x86_devel-2016.06.22-5
-	llvm7_x86_libs-7.0.1-2
+	llvm9_x86_libs-9.0.1-2
-	mesa_x86-17.1.10-6
+	mesa_x86-21.2.3-2
-	mesa_x86_devel-17.1.10-6
+	mesa_x86_devel-21.2.3-2
-	mesa_x86_swpipe-17.1.10-6
+	mesa_x86_swpipe-21.2.3-2
-	nano_x86-5.7-1
+	nano_x86-5.9-1
 	nasm_x86-2.14.02-2
 	ncurses6_x86-6.2-1
 	ncurses6_x86_devel-6.2-1
@@ -263,13 +273,13 @@ RemotePackageRepository HaikuPorts
 	openexr_x86_devel-2.4.1-1
 	openjpeg_x86-2.4.0-1
 	openjpeg_x86_devel-2.4.0-1
-	openssl_x86-1.1.1k-1
+	openssl_x86-1.1.1l-1
-	openssl_x86_devel-1.1.1k-1
+	openssl_x86_devel-1.1.1l-1
 	opus_x86-1.3.1-1
 	opus_x86_devel-1.3.1-1
 	p7zip_x86-17.04-2
 	pkgconfig_x86-0.29.2-4
-	python3_x86-3.7.10-4
+	python3_x86-3.7.12-1
 	readline_x86-8.1-1
 	sharutils_x86-4.15.2-3
 	snappy_x86-1.1.8-1
@@ -278,7 +288,7 @@ RemotePackageRepository HaikuPorts
 	soxr_x86_devel-0.1.3-1
 	speex_x86-1.2.0-4
 	speex_x86_devel-1.2.0-4
-	sqlite_x86-3.34.1.0-1
+	sqlite_x86-3.36.0.0-1
 	taglib_x86-1.12-1
 	taglib_x86_devel-1.12-1
 	tar_x86-1.34-1
@@ -290,6 +300,8 @@ RemotePackageRepository HaikuPorts
 	xz_utils_x86_devel-5.2.5-1
 	zlib_x86-1.2.11-4
 	zlib_x86_devel-1.2.11-4
+	zstd_x86-1.5.0-2
+	zstd_x86_devel-1.5.0-2
 	:
 	# source packages
 	autoconf
@@ -304,7 +316,7 @@ RemotePackageRepository HaikuPorts
 	bzip2
 	cdrtools
 	cdrtools_x86
-	coreutils
+	coreutils_x86
 	ctags
 	curl
 	dav1d_x86
@@ -343,6 +355,7 @@ RemotePackageRepository HaikuPorts
 	lcms_x86
 	less
 	libass_x86
+	libavif_x86
 	libedit
 	libedit_x86
 	libexecinfo
@@ -364,6 +377,7 @@ RemotePackageRepository HaikuPorts
 	libpng16
 	libpsl
 	libsolv
+	libssh2
 	libtasn1
 	libtheora
 	libtool
@@ -376,7 +390,7 @@ RemotePackageRepository HaikuPorts
 	libxml2
 	libxslt
 	live555
-	llvm7_x86
+	llvm9_x86
 	m4
 	make
 	mandoc
@@ -427,6 +441,7 @@ RemotePackageRepository HaikuPorts
 	xz_utils_x86
 	zip
 	zlib
+	zstd
 	:
 	# debuginfo packages
 	bison

build/jam/repositories/HaikuPortsCross/arm

@@ -6,38 +6,40 @@ BootstrapPackageRepository HaikuPortsCross
 	noto-20170202-7
 	:
 	# repository architecture packages (stage 0)
-	gcc_bootstrap-8.3.0_2019_05_24-1
+	gcc_bootstrap-8.3.0_2019_05_24-6
-	gcc_bootstrap_syslibs-8.3.0_2019_05_24-1
+	gcc_bootstrap_syslibs-8.3.0_2019_05_24-6
-	gcc_bootstrap_syslibs_devel-8.3.0_2019_05_24-1
+	gcc_bootstrap_syslibs_devel-8.3.0_2019_05_24-6
 	:
 	# 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-1
 	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.1-2
+	icu_bootstrap-67.1-2
-	icu_bootstrap_devel-57.1-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
-	mawk_bootstrap-1.3.4-1
 	ncurses6_bootstrap-6.0-1
 	ncurses6_bootstrap_devel-6.0-1
-	python_bootstrap-2.7.6-1
+	libffi_bootstrap-3.3-1
+	python_bootstrap-3.9.1-1
 	sed_bootstrap-4.2.1-1
 	texinfo_bootstrap-4.13a-1
 	zlib_bootstrap-1.2.11-1
 	zlib_bootstrap_devel-1.2.11-1
+	zstd_bootstrap-1.5.0-2
+	zstd_bootstrap_devel-1.5.0-2
 	:
 	# repository architecture packages (stage 2)
 	libsolv_bootstrap-0.3.0_haiku_2014_12_22-1
@@ -53,7 +55,6 @@ BootstrapPackageRepository HaikuPortsCross
 	findutils_bootstrap
 	flex_bootstrap
 	freetype_bootstrap
-	mawk_bootstrap
 	gawk_bootstrap
 	gcc_bootstrap
 	grep_bootstrap
@@ -66,6 +67,7 @@ BootstrapPackageRepository HaikuPortsCross
 	sed_bootstrap
 	texinfo_bootstrap
 	zlib_bootstrap
+	zstd_bootstrap
 	:
 	# debuginfo packages
 	;

build/jam/repositories/HaikuPortsCross/arm64

@@ -6,19 +6,19 @@ BootstrapPackageRepository HaikuPortsCross
 	noto-20170202-7
 	:
 	# repository architecture packages (stage 0)
-	gcc_bootstrap-8.3.0_2021_02_27-1
+	gcc_bootstrap-8.3.0_2021_09_21-1
-	gcc_bootstrap_syslibs-8.3.0_2021_02_27-1
+	gcc_bootstrap_syslibs-8.3.0_2021_09_21-1
-	gcc_bootstrap_syslibs_devel-8.3.0_2021_02_27-1
+	gcc_bootstrap_syslibs_devel-8.3.0_2021_09_21-1
 	:
 	# 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-1
 	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
@@ -29,7 +29,7 @@ BootstrapPackageRepository HaikuPortsCross
 	icu_bootstrap_devel-67.1-1
 	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_devel-6.0-1
 	libffi_bootstrap-3.3-1
@@ -38,6 +38,8 @@ BootstrapPackageRepository HaikuPortsCross
 	texinfo_bootstrap-4.13a-1
 	zlib_bootstrap-1.2.11-1
 	zlib_bootstrap_devel-1.2.11-1
+	zstd_bootstrap-1.5.0-2
+	zstd_bootstrap_devel-1.5.0-2
 	:
 	# repository architecture packages (stage 2)
 	libsolv_bootstrap-0.3.0_haiku_2014_12_22-1
@@ -65,6 +67,7 @@ BootstrapPackageRepository HaikuPortsCross
 	sed_bootstrap
 	texinfo_bootstrap
 	zlib_bootstrap
+	zstd_bootstrap
 	:
 	# debuginfo packages
 	;

build/jam/repositories/HaikuPortsCross/sparc

@@ -6,31 +6,31 @@ BootstrapPackageRepository HaikuPortsCross
 	noto-20170202-7
 	:
 	# repository architecture packages (stage 0)
-	gcc_bootstrap-8.3.0_2019_05_24-1
+	gcc_bootstrap-8.3.0_2021_09_21-1
-	gcc_bootstrap_syslibs-8.3.0_2019_05_24-1
+	gcc_bootstrap_syslibs-8.3.0_2021_09_21-1
-	gcc_bootstrap_syslibs_devel-8.3.0_2019_05_24-1
+	gcc_bootstrap_syslibs_devel-8.3.0_2021_09_21-1
 
 	:
 	# 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-1
 	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.1-2
+	icu_bootstrap-67.1-1
-	icu_bootstrap_devel-57.1-2
+	icu_bootstrap_devel-67.1-1
 	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_devel-6.0-1
 	python_bootstrap-2.7.6-1
@@ -38,6 +38,8 @@ BootstrapPackageRepository HaikuPortsCross
 	texinfo_bootstrap-4.13a-1
 	zlib_bootstrap-1.2.11-1
 	zlib_bootstrap_devel-1.2.11-1
+	zstd_bootstrap-1.5.0-2
+	zstd_bootstrap_devel-1.5.0-2
 
 	:
 	# repository architecture packages (stage 2)
@@ -67,6 +69,7 @@ BootstrapPackageRepository HaikuPortsCross
 	sed_bootstrap
 	texinfo_bootstrap
 	zlib_bootstrap
+	zstd_bootstrap
 	:
 	# debuginfo packages
 	;

configure

@@ -450,7 +450,7 @@ check_native_xattrs()
 			xattr_set="setextattr"; xattr_set_args="user \$NAME \"\$VALUE\""
 			xattr_get="getextattr"; xattr_get_args="user \$NAME"
 			;;
-		linux|msys)
+		linux)
 			xattr_set="setfattr"; xattr_set_args="-n user.\$NAME -v \"\$VALUE\""
 			xattr_get="getfattr"; xattr_get_args="-n user.\$NAME"
 			;;
@@ -601,7 +601,6 @@ case "${platform}" in
 	Haiku)   HOST_PLATFORM=haiku_host ;;
 	Linux)   HOST_PLATFORM=linux ;;
 	OpenBSD) HOST_PLATFORM=openbsd ;;
-	MSYS*)   HOST_PLATFORM=msys ;;
 	*)       echo Unsupported platform: ${platform}
 	         exit 1 ;;
 esac
@@ -1040,12 +1039,9 @@ else
 			get_build_tool_path ELFEDIT_$targetArch elfedit
 		elif [ -n "$crossToolsPrefix" ]; then
 			get_build_tool_path LD_$targetArch ${crossToolsPrefix}ld
-			case `get_variable HAIKU_GCC_RAW_VERSION_$targetArch` in
+			if [ `get_variable HAIKU_CC_IS_LEGACY_GCC_$targetArch` -eq 0 ]; then
-				4.*|5.*|6.*|7.*|8.*)
+				get_build_tool_path ELFEDIT_$targetArch ${crossToolsPrefix}elfedit
-					get_build_tool_path ELFEDIT_$targetArch \
+			fi
-						${crossToolsPrefix}elfedit
-				;;
-			esac
 		fi
 		if [ -n "$crossToolsPrefix" ]; then
 			get_build_tool_path AR_$targetArch ${crossToolsPrefix}ar

data/boot/openfirmware/ofboot.chrp

@@ -6,6 +6,18 @@ MacRISC MacRISC3 MacRISC4
 Haiku for PowerPC
 </description>
 <boot-script>
+" screen" output
+load-base release-load-area
+" /cpus/@0" find-package if
+  " 64-bit" rot get-package-property 0= if
+    2drop
+    ." Booting Haiku for PowerPC (64-bit)..."
+    " boot cd:,\\haikuloader.elf" eval
+  else
+    ." Booting Haiku for PowerPC (32-bit)..."
+    " boot cd:,\\haikuloader.elf" eval
+  then
+then
 boot cd:,\\haikuloader.elf
 </boot-script>
 <icon size=64,64 color-space=3,3,2>

data/catalogs/add-ons/disk_systems/fat/id.catkeys

@@ -1,4 +1,4 @@
 1	indonesian	x-vnd.Haiku-FATAddOn	2766737426
-Auto (default)	FAT_Initialize_Parameter		Auto (bawaan standar)
+Auto (default)	FAT_Initialize_Parameter		Otomatis (baku)
 FAT bits:	FAT_Initialize_Parameter		Bit FAT:
 Name:	FAT_Initialize_Parameter		Nama:

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

@@ -1,7 +1,7 @@
 1	czech	x-vnd.Haiku-KeyboardInputServerDevice	131044710
 If the application will not quit you may have to kill it.	Team monitor		Pokud se aplikace neukončí, možná ji budete muset zabít.
 Quit application	Team monitor		Ukončit aplikaci
-Open Terminal	Team monitor		Otevřít okno Terminálu
+Open Terminal	Team monitor		Otevřít okno terminálu
 {0, plural,one{Hold CONTROL+ALT+DELETE for # second to reboot.}other{Hold CONTROL+ALT+DELETE for # seconds to reboot.}}	Team monitor		{0, plural,one{Pro restart podržte klávesy CONTROL+ALT+DELETE po dobu # sekundy.}other{Pro restart podržte klávesy CONTROL+ALT+DELETE po dobu # sekund.}}
 Restart the desktop	Team monitor		Restartovat plochu
 Force reboot	Team monitor		Vynutit restart

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

@@ -1,7 +1,8 @@
-1	greek, modern (1453-)	x-vnd.Haiku-KeyboardInputServerDevice	1085266673
+1	greek, modern (1453-)	x-vnd.Haiku-KeyboardInputServerDevice	131044710
 If the application will not quit you may have to kill it.	Team monitor		Αν η εφαρμογή δεν κλείσει, θα πρέπει ενδεχομένως να την τερματίσετε εξαναγκαστικά.
 Quit application	Team monitor		Κλείσιμο εφαρμογής
 Open Terminal	Team monitor		Άνοιγμα Τερματικού
+{0, plural,one{Hold CONTROL+ALT+DELETE for # second to reboot.}other{Hold CONTROL+ALT+DELETE for # seconds to reboot.}}	Team monitor		{0, plural,one{Πατήστε CONTROL+ALT+DELETE για # δευτερόλεπτο για επανεκκίνηση.}other{Πατήστε CONTROL+ALT+DELETE για # δευτερόλεπτα για επανεκκίνηση.}}
 Restart the desktop	Team monitor		Επαννεκίνηση
 Force reboot	Team monitor		Εξαναγκαστική επανεκκίνηση
 Team monitor	Team monitor		Οθόνη ομάδας

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

@@ -1,9 +1,11 @@
-1	indonesian	x-vnd.Haiku-KeyboardInputServerDevice	2228550365
+1	indonesian	x-vnd.Haiku-KeyboardInputServerDevice	131044710
 If the application will not quit you may have to kill it.	Team monitor		Jika aplikasi tidak mau keluar anda mungkin harus mematikannya.
-Quit application	Team monitor		Keluar dari aplikasi
+Quit application	Team monitor		Keluar aplikasi
-Restart the desktop	Team monitor		Start ulang desktop
+Open Terminal	Team monitor		Buka Terminal
+{0, plural,one{Hold CONTROL+ALT+DELETE for # second to reboot.}other{Hold CONTROL+ALT+DELETE for # seconds to reboot.}}	Team monitor		{0, plural,one{Tahan CONTROL+ALT+DELETE selama # detik untuk mulai ulang.}other{Tahan CONTROL+ALT+DELETE selama # detik untuk mulai ulang.}}
+Restart the desktop	Team monitor		Mulai ulang desktop
 Force reboot	Team monitor		Paksa restart
-Team monitor	Team monitor		Monitor tim
+Team monitor	Team monitor		Pemantau tim
 Kill application	Team monitor		Matikan aplikasi
 Cancel	Team monitor		Batal
 (This team is a system component)	Team monitor		(Tim ini adalah komponen sistem)

data/catalogs/add-ons/mail_daemon/inbound_filters/match_header/id.catkeys

@@ -2,13 +2,13 @@
 Delete message	ConfigView		Hapus pesan
 Match \"%attribute\" against \"%regex\"	RuleFilter		Cocokkan \"%attribute\" terhadap \"%regex\"
 Match header	RuleFilter		Cocokan tajuk
-Set flags to	ConfigView		Setel bendera ke
+Set flags to	ConfigView		Atur bendera ke
 Header field (e.g. Subject, From, …)	ConfigView		Bidang tajuk (misal. Subyek, Dari, …)
 <Choose account>	ConfigView		<Pilih akun>
 Wildcard value like \"*spam*\".\nPrefix with \"REGEX:\" in order to use regular expressions.	ConfigView		Nilai wildcard seperti \"*spam*\".\nDiawali dengan \"REGEX:\" untuk menggunakan expresi-ekspresi reguler.
 Then	ConfigView		Kemudian
 If	ConfigView		Jika
-Set as read	ConfigView		Setel telah dibaca
+Set as read	ConfigView		Atur sebagai dibaca
 Reply with	ConfigView		Balas dengan
 <Choose action>	ConfigView		<Pilih tindakan>
 Move to	ConfigView		Pindahkan ke

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

@@ -10,6 +10,6 @@ Fetching IMAP folders, please be patient…	IMAPFolderConfig		A obter pastas IMA
 Configure IMAP Folders	imap_config		Configurar Pastas IMAP
 SSL	imap_config		SSL
 Apply	IMAPFolderConfig		Aplicar
-status	IMAPFolderConfig		status
+status	IMAPFolderConfig		estado
 IMAP Folders	IMAPFolderConfig		Pastas IMAP
 Destination:	imap_config		Destino:

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

@@ -1,5 +1,5 @@
 1	indonesian	x-vnd.Haiku-IFSScreensaver	2018309174
 %screenSaverName%\n\n© 1997 Massimino Pascal\n\nxscreensaver port by Stephan Aßmus\n<[email protected]>	Screensaver IFS		%screenSaverName%\n\n© 1997 Massimino Pascal\n\nport xscreensaver oleh Stephan Aßmus\n<[email protected]>
 Morphing speed:	Screensaver IFS		Kecepatan perubahan:
-Render dots additive	Screensaver IFS		Buat tambahan titik 
+Render dots additive	Screensaver IFS		Buat tambahan titik
 Iterated Function System	Screensaver IFS		Sistem Fungsi Berulang

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

@@ -1,5 +1,5 @@
 1	belarusian	x-vnd.Haiku-NebulaScreensaver	2460229525
+yellow	Nebula Screen Saver		жоўты
 © 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
 green	Nebula Screen Saver		зялёны
-yellow	Nebula Screen Saver		жоўты
 cyan	Nebula Screen Saver		блакітны

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

@@ -1,20 +1,22 @@
-1	catalan; valencian	x-vnd.Haiku-NebulaScreensaver	3897597581
+1	catalan; valencian	x-vnd.Haiku-NebulaScreensaver	2177689501
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004, Axel Dörfler.
+cold	Nebula Screen Saver		fred
-Enable motion blur	Nebula Screen Saver		Habilita l'arrossegament de la imatge
-fullscreen, no borders	Nebula Screen Saver		pantalla completa, sense vores
-green	Nebula Screen Saver		verd
-yellow	Nebula Screen Saver		groc
-cyan	Nebula Screen Saver		cian
-Maximum Frames Per Second	Nebula Screen Saver		Màxim de fotogrames per segon
-Speed	Nebula Screen Saver		Velocitat
-Nebula	Nebula Screen Saver		Nebulosa
-orange (original)	Nebula Screen Saver		taronja (original)
 Internal width:	Nebula Screen Saver		Amplada interna:
+16:9, wide-screen	Nebula Screen Saver		16:9, pantalla ampla
+Maximum Frames Per Second	Nebula Screen Saver		Màxim de fotogrames per segon
+Format:	Nebula Screen Saver		Format:
+yellow	Nebula Screen Saver		groc
+screen resolution	Nebula Screen Saver		resolució de la pantalla
 2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascop
+Color:	Nebula Screen Saver		Color:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004, Axel Dörfler.
+green	Nebula Screen Saver		verd
+Enable motion blur	Nebula Screen Saver		Habilita l'arrossegament de la imatge
+only a slit	Nebula Screen Saver		només una escletxa
+fullscreen, no borders	Nebula Screen Saver		pantalla completa, sense vores
+orange (original)	Nebula Screen Saver		taronja (original)
+cyan	Nebula Screen Saver		cian
+Speed	Nebula Screen Saver		Velocitat
+%d pixels	Nebula Screen Saver		%d píxels
+Nebula	Nebula Screen Saver		Nebulosa
 red	Nebula Screen Saver		vermell
 grey	Nebula Screen Saver		gris
-cold	Nebula Screen Saver		fred
-Format:	Nebula Screen Saver		Format:
-only a slit	Nebula Screen Saver		només una escletxa
-Color:	Nebula Screen Saver		Color:
-16:9, wide-screen	Nebula Screen Saver		16:9, pantalla ampla

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

@@ -1,20 +1,22 @@
-1	czech	x-vnd.Haiku-NebulaScreensaver	3897597581
+1	czech	x-vnd.Haiku-NebulaScreensaver	2177689501
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		studená
-Enable motion blur	Nebula Screen Saver		Zapnout rozostření pohybem
-fullscreen, no borders	Nebula Screen Saver		celoobrazovkový režim bez okrajů
-green	Nebula Screen Saver		zelená
-yellow	Nebula Screen Saver		žlutá
-cyan	Nebula Screen Saver		azurová
-Maximum Frames Per Second	Nebula Screen Saver		Max. snímků za sekundu
-Speed	Nebula Screen Saver		Rychlost
-Nebula	Nebula Screen Saver		Mlhovina
-orange (original)	Nebula Screen Saver		oranžová (výchozí)
 Internal width:	Nebula Screen Saver		Vnitřní šířka:
+16:9, wide-screen	Nebula Screen Saver		16:9, širokoúhlá
+Maximum Frames Per Second	Nebula Screen Saver		Max. snímků za sekundu
+Format:	Nebula Screen Saver		Formát:
+yellow	Nebula Screen Saver		žlutá
+screen resolution	Nebula Screen Saver		rozlišení obrazovky
 2:3.5, cinemascope	Nebula Screen Saver		2:3.5, širočina
+Color:	Nebula Screen Saver		Barva:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		zelená
+Enable motion blur	Nebula Screen Saver		Zapnout rozostření pohybem
+only a slit	Nebula Screen Saver		pouze štěrbina
+fullscreen, no borders	Nebula Screen Saver		celoobrazovkový režim bez okrajů
+orange (original)	Nebula Screen Saver		oranžová (výchozí)
+cyan	Nebula Screen Saver		azurová
+Speed	Nebula Screen Saver		Rychlost
+%d pixels	Nebula Screen Saver		%d pixelů
+Nebula	Nebula Screen Saver		Mlhovina
 red	Nebula Screen Saver		červená
 grey	Nebula Screen Saver		šedá
-cold	Nebula Screen Saver		studená
-Format:	Nebula Screen Saver		Formát:
-only a slit	Nebula Screen Saver		pouze štěrbina
-Color:	Nebula Screen Saver		Barva:
-16:9, wide-screen	Nebula Screen Saver		16:9, širokoúhlá

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

@@ -1,20 +1,22 @@
-1	danish	x-vnd.Haiku-NebulaScreensaver	3897597581
+1	danish	x-vnd.Haiku-NebulaScreensaver	2177689501
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		kold
-Enable motion blur	Nebula Screen Saver		Aktivér bevægelsessløring
-fullscreen, no borders	Nebula Screen Saver		fuldskærm, ingen kanter
-green	Nebula Screen Saver		grøn
-yellow	Nebula Screen Saver		gul
-cyan	Nebula Screen Saver		cyan
-Maximum Frames Per Second	Nebula Screen Saver		Maksimale billeder pr. sekund
-Speed	Nebula Screen Saver		Hastighed
-Nebula	Nebula Screen Saver		Nebula
-orange (original)	Nebula Screen Saver		orange (original)
 Internal width:	Nebula Screen Saver		Intern bredde:
+16:9, wide-screen	Nebula Screen Saver		16:9, widescreen
+Maximum Frames Per Second	Nebula Screen Saver		Maksimale billeder pr. sekund
+Format:	Nebula Screen Saver		Format:
+yellow	Nebula Screen Saver		gul
+screen resolution	Nebula Screen Saver		skærmopløsning
 2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascope
+Color:	Nebula Screen Saver		Farve:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		grøn
+Enable motion blur	Nebula Screen Saver		Aktivér bevægelsessløring
+only a slit	Nebula Screen Saver		kun en slidse
+fullscreen, no borders	Nebula Screen Saver		fuldskærm, ingen kanter
+orange (original)	Nebula Screen Saver		orange (original)
+cyan	Nebula Screen Saver		cyan
+Speed	Nebula Screen Saver		Hastighed
+%d pixels	Nebula Screen Saver		%d pixels
+Nebula	Nebula Screen Saver		Nebula
 red	Nebula Screen Saver		rød
 grey	Nebula Screen Saver		grå
-cold	Nebula Screen Saver		kold
-Format:	Nebula Screen Saver		Format:
-only a slit	Nebula Screen Saver		kun en slidse
-Color:	Nebula Screen Saver		Farve:
-16:9, wide-screen	Nebula Screen Saver		16:9, widescreen

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

@@ -1,20 +1,22 @@
-1	german	x-vnd.Haiku-NebulaScreensaver	3897597581
+1	german	x-vnd.Haiku-NebulaScreensaver	2177689501
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		kalt
-Enable motion blur	Nebula Screen Saver		Bewegungsunschärfe
-fullscreen, no borders	Nebula Screen Saver		Vollbild, ohne Rahmen
-green	Nebula Screen Saver		Grün
-yellow	Nebula Screen Saver		Gelb
-cyan	Nebula Screen Saver		Cyan
-Maximum Frames Per Second	Nebula Screen Saver		Max. Bilder pro Sekunde
-Speed	Nebula Screen Saver		Geschwindigkeit
-Nebula	Nebula Screen Saver		Nebula
-orange (original)	Nebula Screen Saver		Orange (Original)
 Internal width:	Nebula Screen Saver		Interne Breite:
+16:9, wide-screen	Nebula Screen Saver		16:9, Breitbild
+Maximum Frames Per Second	Nebula Screen Saver		Max. Bilder pro Sekunde
+Format:	Nebula Screen Saver		Format:
+yellow	Nebula Screen Saver		Gelb
+screen resolution	Nebula Screen Saver		Bildschirmauflösung
 2:3.5, cinemascope	Nebula Screen Saver		2:3.5, Cinemascope
+Color:	Nebula Screen Saver		Farbe:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		Grün
+Enable motion blur	Nebula Screen Saver		Bewegungsunschärfe
+only a slit	Nebula Screen Saver		nur ein Schlitz
+fullscreen, no borders	Nebula Screen Saver		Vollbild, ohne Rahmen
+orange (original)	Nebula Screen Saver		Orange (Original)
+cyan	Nebula Screen Saver		Cyan
+Speed	Nebula Screen Saver		Geschwindigkeit
+%d pixels	Nebula Screen Saver		%d Pixel
+Nebula	Nebula Screen Saver		Nebula
 red	Nebula Screen Saver		Rot
 grey	Nebula Screen Saver		Grau
-cold	Nebula Screen Saver		kalt
-Format:	Nebula Screen Saver		Format:
-only a slit	Nebula Screen Saver		nur ein Schlitz
-Color:	Nebula Screen Saver		Farbe:
-16:9, wide-screen	Nebula Screen Saver		16:9, Breitbild

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

@@ -1,20 +1,22 @@
-1	greek, modern (1453-)	x-vnd.Haiku-NebulaScreensaver	3897597581
+1	greek, modern (1453-)	x-vnd.Haiku-NebulaScreensaver	2177689501
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		κρύο
-Enable motion blur	Nebula Screen Saver		Ενεργοποίηση θόλωσης κίνησης
-fullscreen, no borders	Nebula Screen Saver		πλήρης οθόνη, χωρίς περιγράμματα
-green	Nebula Screen Saver		πράσινο
-yellow	Nebula Screen Saver		κίτρινο
-cyan	Nebula Screen Saver		κυανό
-Maximum Frames Per Second	Nebula Screen Saver		Μέγιστα Καρέ Ανά Δευτερόλεπτο
-Speed	Nebula Screen Saver		Ταχύτητα
-Nebula	Nebula Screen Saver		Νεφέλωμα
-orange (original)	Nebula Screen Saver		πορτοκαλί (προεπιλογή)
 Internal width:	Nebula Screen Saver		Εσωτερικό πλάτος:
+16:9, wide-screen	Nebula Screen Saver		16:9, ευρεία οθόνη
+Maximum Frames Per Second	Nebula Screen Saver		Μέγιστα Καρέ Ανά Δευτερόλεπτο
+Format:	Nebula Screen Saver		Μορφή:
+yellow	Nebula Screen Saver		κίτρινο
+screen resolution	Nebula Screen Saver		ανάλυση οθόνης
 2:3.5, cinemascope	Nebula Screen Saver		2:3.5, σινεμασκόπ
+Color:	Nebula Screen Saver		Χρώμα:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		πράσινο
+Enable motion blur	Nebula Screen Saver		Ενεργοποίηση θόλωσης κίνησης
+only a slit	Nebula Screen Saver		μια πινελιά
+fullscreen, no borders	Nebula Screen Saver		πλήρης οθόνη, χωρίς περιγράμματα
+orange (original)	Nebula Screen Saver		πορτοκαλί (προεπιλογή)
+cyan	Nebula Screen Saver		κυανό
+Speed	Nebula Screen Saver		Ταχύτητα
+%d pixels	Nebula Screen Saver		%d εικονοστοιχεία
+Nebula	Nebula Screen Saver		Νεφέλωμα
 red	Nebula Screen Saver		κόκκινο
 grey	Nebula Screen Saver		γκρι
-cold	Nebula Screen Saver		κρύο
-Format:	Nebula Screen Saver		Μορφή:
-only a slit	Nebula Screen Saver		μια πινελιά
-Color:	Nebula Screen Saver		Χρώμα:
-16:9, wide-screen	Nebula Screen Saver		16:9, ευρεία οθόνη

data/catalogs/add-ons/screen_savers/nebula/en_GB.catkeys

@@ -1,3 +1,3 @@
 1	english (united kingdom)	x-vnd.Haiku-NebulaScreensaver	3452114930
-grey	Nebula Screen Saver		grey
 Color:	Nebula Screen Saver		Colour:
+grey	Nebula Screen Saver		grey

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

@@ -1,20 +1,20 @@
 1	esperanto	x-vnd.Haiku-NebulaScreensaver	3897597581
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		malvarma
-Enable motion blur	Nebula Screen Saver		Ŝalti movan malklarigon
+Internal width:	Nebula Screen Saver		Interna grando:
-fullscreen, no borders	Nebula Screen Saver		plenekrane, sen bordero
+16:9, wide-screen	Nebula Screen Saver		16:9, larĝekrane
-green	Nebula Screen Saver		verda
-yellow	Nebula Screen Saver		flava
-cyan	Nebula Screen Saver		bluverda
 Maximum Frames Per Second	Nebula Screen Saver		Maksimuma Kadrokvanto po Sekundo
+Format:	Nebula Screen Saver		Formo:
+yellow	Nebula Screen Saver		flava
+2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemaskopo
+Color:	Nebula Screen Saver		Koloro:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		verda
+Enable motion blur	Nebula Screen Saver		Ŝalti movan malklarigon
+only a slit	Nebula Screen Saver		nur fendo
+fullscreen, no borders	Nebula Screen Saver		plenekrane, sen bordero
+orange (original)	Nebula Screen Saver		oranĝkolora (originala)
+cyan	Nebula Screen Saver		bluverda
 Speed	Nebula Screen Saver		Rapideco
 Nebula	Nebula Screen Saver		Nebula
-orange (original)	Nebula Screen Saver		oranĝkolora (originala)
-Internal width:	Nebula Screen Saver		Interna grando:
-2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemaskopo
 red	Nebula Screen Saver		ruĝa
 grey	Nebula Screen Saver		griza
-cold	Nebula Screen Saver		malvarma
-Format:	Nebula Screen Saver		Formo:
-only a slit	Nebula Screen Saver		nur fendo
-Color:	Nebula Screen Saver		Koloro:
-16:9, wide-screen	Nebula Screen Saver		16:9, larĝekrane

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

@@ -1,20 +1,22 @@
-1	spanish; castilian	x-vnd.Haiku-NebulaScreensaver	3897597581
+1	spanish; castilian	x-vnd.Haiku-NebulaScreensaver	2177689501
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		frío
-Enable motion blur	Nebula Screen Saver		Activar desenfoque de movimiento
-fullscreen, no borders	Nebula Screen Saver		pantalla completa, sin bordes
-green	Nebula Screen Saver		verde
-yellow	Nebula Screen Saver		amarillo
-cyan	Nebula Screen Saver		cian
-Maximum Frames Per Second	Nebula Screen Saver		Cantidad máxima de cuadros por segundo
-Speed	Nebula Screen Saver		Velocidad
-Nebula	Nebula Screen Saver		Nebula
-orange (original)	Nebula Screen Saver		naranja (original)
 Internal width:	Nebula Screen Saver		Anchura interna:
+16:9, wide-screen	Nebula Screen Saver		16:9, panorámico
+Maximum Frames Per Second	Nebula Screen Saver		Cantidad máxima de cuadros por segundo
+Format:	Nebula Screen Saver		Formato:
+yellow	Nebula Screen Saver		amarillo
+screen resolution	Nebula Screen Saver		resolución de pantalla
 2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascopio
+Color:	Nebula Screen Saver		Color:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		verde
+Enable motion blur	Nebula Screen Saver		Activar desenfoque de movimiento
+only a slit	Nebula Screen Saver		sólo una hendidura
+fullscreen, no borders	Nebula Screen Saver		pantalla completa, sin bordes
+orange (original)	Nebula Screen Saver		naranja (original)
+cyan	Nebula Screen Saver		cian
+Speed	Nebula Screen Saver		Velocidad
+%d pixels	Nebula Screen Saver		%d píxeles
+Nebula	Nebula Screen Saver		Nebula
 red	Nebula Screen Saver		rojo
 grey	Nebula Screen Saver		gris
-cold	Nebula Screen Saver		frío
-Format:	Nebula Screen Saver		Formato:
-only a slit	Nebula Screen Saver		sólo una hendidura
-Color:	Nebula Screen Saver		Color:
-16:9, wide-screen	Nebula Screen Saver		16:9, panorámico

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

@@ -1,20 +1,22 @@
-1	finnish	x-vnd.Haiku-NebulaScreensaver	3897597581
+1	finnish	x-vnd.Haiku-NebulaScreensaver	2177689501
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		kylmä
-Enable motion blur	Nebula Screen Saver		Ota käyttöön liikesumentaminen
-fullscreen, no borders	Nebula Screen Saver		kokonäyttö, ei rajoja
-green	Nebula Screen Saver		vihreä
-yellow	Nebula Screen Saver		keltainen
-cyan	Nebula Screen Saver		sinivihreä
-Maximum Frames Per Second	Nebula Screen Saver		Enimmillään kehyksiä per sekunti
-Speed	Nebula Screen Saver		Nopeus
-Nebula	Nebula Screen Saver		Tähtisumu
-orange (original)	Nebula Screen Saver		oranssi (alkuperäinen)
 Internal width:	Nebula Screen Saver		Sisäinen leveys:
+16:9, wide-screen	Nebula Screen Saver		16:9, leveä näyttö
+Maximum Frames Per Second	Nebula Screen Saver		Enimmillään kehyksiä per sekunti
+Format:	Nebula Screen Saver		Muoto:
+yellow	Nebula Screen Saver		keltainen
+screen resolution	Nebula Screen Saver		näytön erotuskyky
 2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascope
+Color:	Nebula Screen Saver		Väri:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		vihreä
+Enable motion blur	Nebula Screen Saver		Ota käyttöön liikesumentaminen
+only a slit	Nebula Screen Saver		vain halkaisu
+fullscreen, no borders	Nebula Screen Saver		kokonäyttö, ei rajoja
+orange (original)	Nebula Screen Saver		oranssi (alkuperäinen)
+cyan	Nebula Screen Saver		sinivihreä
+Speed	Nebula Screen Saver		Nopeus
+%d pixels	Nebula Screen Saver		%d pikseliä
+Nebula	Nebula Screen Saver		Tähtisumu
 red	Nebula Screen Saver		punainen
 grey	Nebula Screen Saver		harmaa
-cold	Nebula Screen Saver		kylmä
-Format:	Nebula Screen Saver		Muoto:
-only a slit	Nebula Screen Saver		vain halkaisu
-Color:	Nebula Screen Saver		Väri:
-16:9, wide-screen	Nebula Screen Saver		16:9, leveä näyttö

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

@@ -1,20 +1,22 @@
-1	french	x-vnd.Haiku-NebulaScreensaver	3897597581
+1	french	x-vnd.Haiku-NebulaScreensaver	2177689501
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		froid
-Enable motion blur	Nebula Screen Saver		Activer le flou de mouvement
-fullscreen, no borders	Nebula Screen Saver		plein écran, sans bordures
-green	Nebula Screen Saver		vert
-yellow	Nebula Screen Saver		jaune
-cyan	Nebula Screen Saver		cyan
-Maximum Frames Per Second	Nebula Screen Saver		Nombre maximum de trames par seconde
-Speed	Nebula Screen Saver		Vitesse
-Nebula	Nebula Screen Saver		Nébuleuse
-orange (original)	Nebula Screen Saver		orange (original)
 Internal width:	Nebula Screen Saver		Largeur interne :
+16:9, wide-screen	Nebula Screen Saver		16:9, écran-large
+Maximum Frames Per Second	Nebula Screen Saver		Nombre maximum de trames par seconde
+Format:	Nebula Screen Saver		Format :
+yellow	Nebula Screen Saver		jaune
+screen resolution	Nebula Screen Saver		résolution de l’écran
 2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinémascope
+Color:	Nebula Screen Saver		Couleur :
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		vert
+Enable motion blur	Nebula Screen Saver		Activer le flou de mouvement
+only a slit	Nebula Screen Saver		seulement une fente
+fullscreen, no borders	Nebula Screen Saver		plein écran, sans bordures
+orange (original)	Nebula Screen Saver		orange (original)
+cyan	Nebula Screen Saver		cyan
+Speed	Nebula Screen Saver		Vitesse
+%d pixels	Nebula Screen Saver		%d pixels
+Nebula	Nebula Screen Saver		Nébuleuse
 red	Nebula Screen Saver		rouge
 grey	Nebula Screen Saver		gris
-cold	Nebula Screen Saver		froid
-Format:	Nebula Screen Saver		Format :
-only a slit	Nebula Screen Saver		seulement une fente
-Color:	Nebula Screen Saver		Couleur :
-16:9, wide-screen	Nebula Screen Saver		16:9, écran-large

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

@@ -1,20 +1,20 @@
 1	friulian	x-vnd.Haiku-NebulaScreensaver	3897597581
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		frêt
-Enable motion blur	Nebula Screen Saver		Abilite fûr di fûc di moviment
+Internal width:	Nebula Screen Saver		Largjece interne:
-fullscreen, no borders	Nebula Screen Saver		a plen visôr, nissun ôr
+16:9, wide-screen	Nebula Screen Saver		16:9, panoramic
-green	Nebula Screen Saver		vert
-yellow	Nebula Screen Saver		zâl
-cyan	Nebula Screen Saver		turchin
 Maximum Frames Per Second	Nebula Screen Saver		Massims Fotograms Par Secont
+Format:	Nebula Screen Saver		Formât:
+yellow	Nebula Screen Saver		zâl
+2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascope
+Color:	Nebula Screen Saver		Colôr:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		vert
+Enable motion blur	Nebula Screen Saver		Abilite fûr di fûc di moviment
+only a slit	Nebula Screen Saver		dome une fressure
+fullscreen, no borders	Nebula Screen Saver		a plen visôr, nissun ôr
+orange (original)	Nebula Screen Saver		naranç (origjinâl)
+cyan	Nebula Screen Saver		turchin
 Speed	Nebula Screen Saver		Velocitât
 Nebula	Nebula Screen Saver		Nebulose
-orange (original)	Nebula Screen Saver		naranç (origjinâl)
-Internal width:	Nebula Screen Saver		Largjece interne:
-2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascope
 red	Nebula Screen Saver		ros
 grey	Nebula Screen Saver		grîs
-cold	Nebula Screen Saver		frêt
-Format:	Nebula Screen Saver		Formât:
-only a slit	Nebula Screen Saver		dome une fressure
-Color:	Nebula Screen Saver		Colôr:
-16:9, wide-screen	Nebula Screen Saver		16:9, panoramic

data/catalogs/add-ons/screen_savers/nebula/hr.catkeys

@@ -1,10 +1,10 @@
 1	croatian	x-vnd.Haiku-NebulaScreensaver	154113433
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
-green	Nebula Screen Saver		zelena
-yellow	Nebula Screen Saver		žuta
-Speed	Nebula Screen Saver		Brzina
-orange (original)	Nebula Screen Saver		narančasto (izvorno)
-grey	Nebula Screen Saver		sivo
 cold	Nebula Screen Saver		hladno
 Format:	Nebula Screen Saver		Format:
+yellow	Nebula Screen Saver		žuta
 Color:	Nebula Screen Saver		Boja:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		zelena
+orange (original)	Nebula Screen Saver		narančasto (izvorno)
+Speed	Nebula Screen Saver		Brzina
+grey	Nebula Screen Saver		sivo

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

@@ -1,20 +1,22 @@
-1	hungarian	x-vnd.Haiku-NebulaScreensaver	3897597581
+1	hungarian	x-vnd.Haiku-NebulaScreensaver	2177689501
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		hideg
-Enable motion blur	Nebula Screen Saver		Mozgási elmosás engedélyezése
-fullscreen, no borders	Nebula Screen Saver		teljesképernyő keret nélkül
-green	Nebula Screen Saver		zöld
-yellow	Nebula Screen Saver		sárga
-cyan	Nebula Screen Saver		cián
-Maximum Frames Per Second	Nebula Screen Saver		Maximális képkocka másodpercenként
-Speed	Nebula Screen Saver		Sebesség
-Nebula	Nebula Screen Saver		Csillagköd
-orange (original)	Nebula Screen Saver		narancs (alapértelmezett)
 Internal width:	Nebula Screen Saver		Belső szélesség:
+16:9, wide-screen	Nebula Screen Saver		16:9, szélesvászon
+Maximum Frames Per Second	Nebula Screen Saver		Maximális képkocka másodpercenként
+Format:	Nebula Screen Saver		Formátum:
+yellow	Nebula Screen Saver		sárga
+screen resolution	Nebula Screen Saver		képernyőfelbontás
 2:3.5, cinemascope	Nebula Screen Saver		2:3.5, mozivászon
+Color:	Nebula Screen Saver		Szín:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		zöld
+Enable motion blur	Nebula Screen Saver		Mozgási elmosás engedélyezése
+only a slit	Nebula Screen Saver		csak egy rés
+fullscreen, no borders	Nebula Screen Saver		teljesképernyő keret nélkül
+orange (original)	Nebula Screen Saver		narancs (alapértelmezett)
+cyan	Nebula Screen Saver		cián
+Speed	Nebula Screen Saver		Sebesség
+%d pixels	Nebula Screen Saver		%d képpont
+Nebula	Nebula Screen Saver		Csillagköd
 red	Nebula Screen Saver		piros
 grey	Nebula Screen Saver		szürke
-cold	Nebula Screen Saver		hideg
-Format:	Nebula Screen Saver		Formátum:
-only a slit	Nebula Screen Saver		csak egy rés
-Color:	Nebula Screen Saver		Szín:
-16:9, wide-screen	Nebula Screen Saver		16:9, szélesvászon

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

@@ -1,20 +1,22 @@
-1	indonesian	x-vnd.Haiku-NebulaScreensaver	3897597581
+1	indonesian	x-vnd.Haiku-NebulaScreensaver	2177689501
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		dingin
-Enable motion blur	Nebula Screen Saver		Aktifkan gerakan buram
-fullscreen, no borders	Nebula Screen Saver		layar penuh, tanpa batas
-green	Nebula Screen Saver		hijau
-yellow	Nebula Screen Saver		kuning
-cyan	Nebula Screen Saver		cyan
-Maximum Frames Per Second	Nebula Screen Saver		Frame Maksimal Per Detik
-Speed	Nebula Screen Saver		Kecepatan
-Nebula	Nebula Screen Saver		Nebula
-orange (original)	Nebula Screen Saver		oranye (asli)
 Internal width:	Nebula Screen Saver		Lebar internal:
+16:9, wide-screen	Nebula Screen Saver		16:9, layar lebar
+Maximum Frames Per Second	Nebula Screen Saver		Frame Maksimal Per Detik
+Format:	Nebula Screen Saver		Format:
+yellow	Nebula Screen Saver		kuning
+screen resolution	Nebula Screen Saver		resolusi layar
 2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascope
+Color:	Nebula Screen Saver		Warna:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		hijau
+Enable motion blur	Nebula Screen Saver		Aktifkan gerakan buram
+only a slit	Nebula Screen Saver		hanya 1 celah
+fullscreen, no borders	Nebula Screen Saver		layar penuh, tanpa batas
+orange (original)	Nebula Screen Saver		oranye (asli)
+cyan	Nebula Screen Saver		cyan
+Speed	Nebula Screen Saver		Kecepatan
+%d pixels	Nebula Screen Saver		%d piksel
+Nebula	Nebula Screen Saver		Nebula
 red	Nebula Screen Saver		merah
 grey	Nebula Screen Saver		abu-abu
-cold	Nebula Screen Saver		dingin
-Format:	Nebula Screen Saver		Format:
-only a slit	Nebula Screen Saver		hanya 1 celah
-Color:	Nebula Screen Saver		Warna:
-16:9, wide-screen	Nebula Screen Saver		16:9 (Layar Lebar)

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

@@ -1,20 +1,20 @@
 1	italian	x-vnd.Haiku-NebulaScreensaver	3897597581
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		freddo
-Enable motion blur	Nebula Screen Saver		Abilita sfocatura movimento
+Internal width:	Nebula Screen Saver		Larghezza interna:
-fullscreen, no borders	Nebula Screen Saver		schermo intero, nessun bordo
+16:9, wide-screen	Nebula Screen Saver		16:9, panoramico
-green	Nebula Screen Saver		verde
-yellow	Nebula Screen Saver		giallo
-cyan	Nebula Screen Saver		ciano
 Maximum Frames Per Second	Nebula Screen Saver		Massimi Fotogrammi Per Secondo
+Format:	Nebula Screen Saver		Formato:
+yellow	Nebula Screen Saver		giallo
+2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascope
+Color:	Nebula Screen Saver		Colore:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		verde
+Enable motion blur	Nebula Screen Saver		Abilita sfocatura movimento
+only a slit	Nebula Screen Saver		solo una fessura
+fullscreen, no borders	Nebula Screen Saver		schermo intero, nessun bordo
+orange (original)	Nebula Screen Saver		arancione (originale)
+cyan	Nebula Screen Saver		ciano
 Speed	Nebula Screen Saver		Velocità
 Nebula	Nebula Screen Saver		Nebulosa
-orange (original)	Nebula Screen Saver		arancione (originale)
-Internal width:	Nebula Screen Saver		Larghezza interna:
-2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascope
 red	Nebula Screen Saver		rosso
 grey	Nebula Screen Saver		grigio
-cold	Nebula Screen Saver		freddo
-Format:	Nebula Screen Saver		Formato:
-only a slit	Nebula Screen Saver		solo una fessura
-Color:	Nebula Screen Saver		Colore:
-16:9, wide-screen	Nebula Screen Saver		16:9, panoramico

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

@@ -1,20 +1,22 @@
-1	japanese	x-vnd.Haiku-NebulaScreensaver	3897597581
+1	japanese	x-vnd.Haiku-NebulaScreensaver	2177689501
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		コールド
-Enable motion blur	Nebula Screen Saver		モーションブラーを有効
-fullscreen, no borders	Nebula Screen Saver		全画面、枠なし
-green	Nebula Screen Saver		緑
-yellow	Nebula Screen Saver		黄
-cyan	Nebula Screen Saver		シアン
-Maximum Frames Per Second	Nebula Screen Saver		1秒あたりの最大フレーム数
-Speed	Nebula Screen Saver		速度
-Nebula	Nebula Screen Saver		ネビュラ
-orange (original)	Nebula Screen Saver		オレンジ (オリジナル)
 Internal width:	Nebula Screen Saver		内部幅:
+16:9, wide-screen	Nebula Screen Saver		16:9, ワイドスクリーン
+Maximum Frames Per Second	Nebula Screen Saver		1秒あたりの最大フレーム数
+Format:	Nebula Screen Saver		フォーマット:
+yellow	Nebula Screen Saver		黄
+screen resolution	Nebula Screen Saver		画面解像度
 2:3.5, cinemascope	Nebula Screen Saver		2:3.5, シネマスコープ
+Color:	Nebula Screen Saver		色:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		緑
+Enable motion blur	Nebula Screen Saver		モーションブラーを有効
+only a slit	Nebula Screen Saver		スリットのみ
+fullscreen, no borders	Nebula Screen Saver		全画面、枠なし
+orange (original)	Nebula Screen Saver		オレンジ (オリジナル)
+cyan	Nebula Screen Saver		シアン
+Speed	Nebula Screen Saver		速度
+%d pixels	Nebula Screen Saver		%d ピクセル
+Nebula	Nebula Screen Saver		ネビュラ
 red	Nebula Screen Saver		赤
 grey	Nebula Screen Saver		灰
-cold	Nebula Screen Saver		コールド
-Format:	Nebula Screen Saver		フォーマット:
-only a slit	Nebula Screen Saver		スリットのみ
-Color:	Nebula Screen Saver		色:
-16:9, wide-screen	Nebula Screen Saver		16:9, ワイドスクリーン

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

@@ -1,20 +1,20 @@
 1	dutch; flemish	x-vnd.Haiku-NebulaScreensaver	3897597581
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		koud
-Enable motion blur	Nebula Screen Saver		Motion blur inschakelen
+Internal width:	Nebula Screen Saver		Interne breedte:
-fullscreen, no borders	Nebula Screen Saver		volledig scherm, zonder vensterranden
+16:9, wide-screen	Nebula Screen Saver		16:9, breedbeeld
-green	Nebula Screen Saver		groen
-yellow	Nebula Screen Saver		geel
-cyan	Nebula Screen Saver		cyaan
 Maximum Frames Per Second	Nebula Screen Saver		Maximum aantal frames per seconde
+Format:	Nebula Screen Saver		Formaat:
+yellow	Nebula Screen Saver		geel
+2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascope
+Color:	Nebula Screen Saver		Kleur:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		groen
+Enable motion blur	Nebula Screen Saver		Motion blur inschakelen
+only a slit	Nebula Screen Saver		alleen een gleuf
+fullscreen, no borders	Nebula Screen Saver		volledig scherm, zonder vensterranden
+orange (original)	Nebula Screen Saver		oranje (origineel)
+cyan	Nebula Screen Saver		cyaan
 Speed	Nebula Screen Saver		Snelheid
 Nebula	Nebula Screen Saver		Nebula
-orange (original)	Nebula Screen Saver		oranje (origineel)
-Internal width:	Nebula Screen Saver		Interne breedte:
-2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascope
 red	Nebula Screen Saver		rood
 grey	Nebula Screen Saver		grijs
-cold	Nebula Screen Saver		koud
-Format:	Nebula Screen Saver		Formaat:
-only a slit	Nebula Screen Saver		alleen een gleuf
-Color:	Nebula Screen Saver		Kleur:
-16:9, wide-screen	Nebula Screen Saver		16:9, breedbeeld

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

@@ -1,20 +1,20 @@
 1	polish	x-vnd.Haiku-NebulaScreensaver	3897597581
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		chłodny
-Enable motion blur	Nebula Screen Saver		Włącz rozmycie w ruchu
+Internal width:	Nebula Screen Saver		Wewnętrzna szerokość:
-fullscreen, no borders	Nebula Screen Saver		pełny ekran, bez krawędzi
+16:9, wide-screen	Nebula Screen Saver		16:9, szerokoekranowy
-green	Nebula Screen Saver		zielony
-yellow	Nebula Screen Saver		żółty
-cyan	Nebula Screen Saver		cyjan
 Maximum Frames Per Second	Nebula Screen Saver		Maksymalna liczba klatek na sekundę
+Format:	Nebula Screen Saver		Format:
+yellow	Nebula Screen Saver		żółty
+2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascope
+Color:	Nebula Screen Saver		Kolor:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		zielony
+Enable motion blur	Nebula Screen Saver		Włącz rozmycie w ruchu
+only a slit	Nebula Screen Saver		szczelina
+fullscreen, no borders	Nebula Screen Saver		pełny ekran, bez krawędzi
+orange (original)	Nebula Screen Saver		pomarańczowy (oryginalny)
+cyan	Nebula Screen Saver		cyjan
 Speed	Nebula Screen Saver		Szybkość
 Nebula	Nebula Screen Saver		Mgławica
-orange (original)	Nebula Screen Saver		pomarańczowy (oryginalny)
-Internal width:	Nebula Screen Saver		Wewnętrzna szerokość:
-2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascope
 red	Nebula Screen Saver		czerwony
 grey	Nebula Screen Saver		szary
-cold	Nebula Screen Saver		chłodny
-Format:	Nebula Screen Saver		Format:
-only a slit	Nebula Screen Saver		szczelina
-Color:	Nebula Screen Saver		Kolor:
-16:9, wide-screen	Nebula Screen Saver		16:9, szerokoekranowy

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

@@ -1,20 +1,20 @@
 1	portuguese	x-vnd.Haiku-NebulaScreensaver	3897597581
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		frio
-Enable motion blur	Nebula Screen Saver		Ativar desfoque de movimento
+Internal width:	Nebula Screen Saver		Largura interna:
-fullscreen, no borders	Nebula Screen Saver		ecrã completo, sem margens
+16:9, wide-screen	Nebula Screen Saver		16:9, ecrã panorâmico
-green	Nebula Screen Saver		verde
-yellow	Nebula Screen Saver		amarelo
-cyan	Nebula Screen Saver		ciano
 Maximum Frames Per Second	Nebula Screen Saver		Máximo de Quadros por Segundo
+Format:	Nebula Screen Saver		Formato:
+yellow	Nebula Screen Saver		amarelo
+2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascópio
+Color:	Nebula Screen Saver		Cor:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		verde
+Enable motion blur	Nebula Screen Saver		Ativar desfoque de movimento
+only a slit	Nebula Screen Saver		apenas uma frincha
+fullscreen, no borders	Nebula Screen Saver		ecrã completo, sem margens
+orange (original)	Nebula Screen Saver		laranja (original)
+cyan	Nebula Screen Saver		ciano
 Speed	Nebula Screen Saver		Velocidade
 Nebula	Nebula Screen Saver		Nebulosa
-orange (original)	Nebula Screen Saver		laranja (original)
-Internal width:	Nebula Screen Saver		Largura interna:
-2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascópio
 red	Nebula Screen Saver		vermelho
 grey	Nebula Screen Saver		cinzento
-cold	Nebula Screen Saver		frio
-Format:	Nebula Screen Saver		Formato:
-only a slit	Nebula Screen Saver		apenas uma frincha
-Color:	Nebula Screen Saver		Cor:
-16:9, wide-screen	Nebula Screen Saver		16:9, ecrã panorâmico

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

@@ -1,20 +1,21 @@
-1	portuguese (brazil)	x-vnd.Haiku-NebulaScreensaver	3897597581
+1	portuguese (brazil)	x-vnd.Haiku-NebulaScreensaver	1375348234
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		frio
-Enable motion blur	Nebula Screen Saver		Ativar desfoque de movimento
-fullscreen, no borders	Nebula Screen Saver		tela cheia, sem bordas
-green	Nebula Screen Saver		verde
-yellow	Nebula Screen Saver		amarelo
-cyan	Nebula Screen Saver		ciano
-Maximum Frames Per Second	Nebula Screen Saver		Máximo de quadros por segundo
-Speed	Nebula Screen Saver		Velocidade
-Nebula	Nebula Screen Saver		Nébula
-orange (original)	Nebula Screen Saver		laranja (original)
 Internal width:	Nebula Screen Saver		Largura interna:
+16:9, wide-screen	Nebula Screen Saver		16:9, tela panorâmica
+Maximum Frames Per Second	Nebula Screen Saver		Máximo de quadros por segundo
+Format:	Nebula Screen Saver		Formato:
+yellow	Nebula Screen Saver		amarelo
 2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascópio
+Color:	Nebula Screen Saver		Cor:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		verde
+Enable motion blur	Nebula Screen Saver		Ativar desfoque de movimento
+only a slit	Nebula Screen Saver		apenas uma fenda
+fullscreen, no borders	Nebula Screen Saver		tela cheia, sem bordas
+orange (original)	Nebula Screen Saver		laranja (original)
+cyan	Nebula Screen Saver		ciano
+Speed	Nebula Screen Saver		Velocidade
+%d pixels	Nebula Screen Saver		%d pixels
+Nebula	Nebula Screen Saver		Nébula
 red	Nebula Screen Saver		vermelho
 grey	Nebula Screen Saver		cinza
-cold	Nebula Screen Saver		frio
-Format:	Nebula Screen Saver		Formato:
-only a slit	Nebula Screen Saver		apenas uma fenda
-Color:	Nebula Screen Saver		Cor:
-16:9, wide-screen	Nebula Screen Saver		16:9, tela panorâmica

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

@@ -1,20 +1,20 @@
 1	romanian	x-vnd.Haiku-NebulaScreensaver	3897597581
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		rece
-Enable motion blur	Nebula Screen Saver		Activează estomparea mișcării
+Internal width:	Nebula Screen Saver		Lățime internă:
-fullscreen, no borders	Nebula Screen Saver		ecran complet, fără margini
+16:9, wide-screen	Nebula Screen Saver		16:9, ecran lat
-green	Nebula Screen Saver		verde
-yellow	Nebula Screen Saver		galben
-cyan	Nebula Screen Saver		cyan
 Maximum Frames Per Second	Nebula Screen Saver		Număr maxim de cadre pe secundă
+Format:	Nebula Screen Saver		Format:
+yellow	Nebula Screen Saver		galben
+2:3.5, cinemascope	Nebula Screen Saver		2:3:5, cinemascop
+Color:	Nebula Screen Saver		Culoare:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		verde
+Enable motion blur	Nebula Screen Saver		Activează estomparea mișcării
+only a slit	Nebula Screen Saver		doar o fantă
+fullscreen, no borders	Nebula Screen Saver		ecran complet, fără margini
+orange (original)	Nebula Screen Saver		portocaliu (original)
+cyan	Nebula Screen Saver		cyan
 Speed	Nebula Screen Saver		Viteză
 Nebula	Nebula Screen Saver		Nebuloasă
-orange (original)	Nebula Screen Saver		portocaliu (original)
-Internal width:	Nebula Screen Saver		Lățime internă:
-2:3.5, cinemascope	Nebula Screen Saver		2:3:5, cinemascop
 red	Nebula Screen Saver		roșu
 grey	Nebula Screen Saver		gri
-cold	Nebula Screen Saver		rece
-Format:	Nebula Screen Saver		Format:
-only a slit	Nebula Screen Saver		doar o fantă
-Color:	Nebula Screen Saver		Culoare:
-16:9, wide-screen	Nebula Screen Saver		16:9, ecran lat

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

@@ -1,20 +1,20 @@
 1	russian	x-vnd.Haiku-NebulaScreensaver	3897597581
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		Все права защищены © 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		холодный
-Enable motion blur	Nebula Screen Saver		Включить размывание движения
+Internal width:	Nebula Screen Saver		Внутренняя ширина:
-fullscreen, no borders	Nebula Screen Saver		во весь экран, без рамок
+16:9, wide-screen	Nebula Screen Saver		16:9, широкоэкранный
-green	Nebula Screen Saver		зеленый
-yellow	Nebula Screen Saver		желтый
-cyan	Nebula Screen Saver		бирюзовый
 Maximum Frames Per Second	Nebula Screen Saver		Максимальное количество кадров в секунду
+Format:	Nebula Screen Saver		Формат:
+yellow	Nebula Screen Saver		желтый
+2:3.5, cinemascope	Nebula Screen Saver		2:3.5, широкоэкранный
+Color:	Nebula Screen Saver		Цвет:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		Все права защищены © 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		зеленый
+Enable motion blur	Nebula Screen Saver		Включить размывание движения
+only a slit	Nebula Screen Saver		только разрез
+fullscreen, no borders	Nebula Screen Saver		во весь экран, без рамок
+orange (original)	Nebula Screen Saver		оранжевый (оригинальный)
+cyan	Nebula Screen Saver		бирюзовый
 Speed	Nebula Screen Saver		Скорость
 Nebula	Nebula Screen Saver		Туманность
-orange (original)	Nebula Screen Saver		оранжевый (оригинальный)
-Internal width:	Nebula Screen Saver		Внутренняя ширина:
-2:3.5, cinemascope	Nebula Screen Saver		2:3.5, широкоэкранный
 red	Nebula Screen Saver		красный
 grey	Nebula Screen Saver		серый
-cold	Nebula Screen Saver		холодный
-Format:	Nebula Screen Saver		Формат:
-only a slit	Nebula Screen Saver		только разрез
-Color:	Nebula Screen Saver		Цвет:
-16:9, wide-screen	Nebula Screen Saver		16:9, широкоэкранный

data/catalogs/add-ons/screen_savers/nebula/sk.catkeys

@@ -1,20 +1,20 @@
 1	slovak	x-vnd.Haiku-NebulaScreensaver	3897597581
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		studená
-Enable motion blur	Nebula Screen Saver		Zapnúť rozostrenie pohybom
+Internal width:	Nebula Screen Saver		Vnútorná šírka:
-fullscreen, no borders	Nebula Screen Saver		celoobrazovkový režim bez okrajov
+16:9, wide-screen	Nebula Screen Saver		16:9, širokouhlá
-green	Nebula Screen Saver		zelená
-yellow	Nebula Screen Saver		žltá
-cyan	Nebula Screen Saver		tyrkysová
 Maximum Frames Per Second	Nebula Screen Saver		Max. snímok za sekundu
+Format:	Nebula Screen Saver		Formát:
+yellow	Nebula Screen Saver		žltá
+2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascope
+Color:	Nebula Screen Saver		Farba:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		zelená
+Enable motion blur	Nebula Screen Saver		Zapnúť rozostrenie pohybom
+only a slit	Nebula Screen Saver		iba štrbina
+fullscreen, no borders	Nebula Screen Saver		celoobrazovkový režim bez okrajov
+orange (original)	Nebula Screen Saver		oranžová (pôvodná)
+cyan	Nebula Screen Saver		tyrkysová
 Speed	Nebula Screen Saver		Rýchlosť
 Nebula	Nebula Screen Saver		Hmlovina
-orange (original)	Nebula Screen Saver		oranžová (pôvodná)
-Internal width:	Nebula Screen Saver		Vnútorná šírka:
-2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascope
 red	Nebula Screen Saver		červená
 grey	Nebula Screen Saver		šedá
-cold	Nebula Screen Saver		studená
-Format:	Nebula Screen Saver		Formát:
-only a slit	Nebula Screen Saver		iba štrbina
-Color:	Nebula Screen Saver		Farba:
-16:9, wide-screen	Nebula Screen Saver		16:9, širokouhlá

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

@@ -1,20 +1,22 @@
-1	swedish	x-vnd.Haiku-NebulaScreensaver	3897597581
+1	swedish	x-vnd.Haiku-NebulaScreensaver	2177689501
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		kall
-Enable motion blur	Nebula Screen Saver		Aktivera rörelseoskärpa
-fullscreen, no borders	Nebula Screen Saver		fullskärmsläge, inga kanter
-green	Nebula Screen Saver		grön
-yellow	Nebula Screen Saver		gul
-cyan	Nebula Screen Saver		cyan
-Maximum Frames Per Second	Nebula Screen Saver		Maximalt antal bildrutor per sekund
-Speed	Nebula Screen Saver		Hastighet
-Nebula	Nebula Screen Saver		Nebulosa
-orange (original)	Nebula Screen Saver		orange (ursprunglig)
 Internal width:	Nebula Screen Saver		Intern bredd:
+16:9, wide-screen	Nebula Screen Saver		16:9, wide-screen
+Maximum Frames Per Second	Nebula Screen Saver		Maximalt antal bildrutor per sekund
+Format:	Nebula Screen Saver		Format:
+yellow	Nebula Screen Saver		gul
+screen resolution	Nebula Screen Saver		skärmupplösning
 2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascope
+Color:	Nebula Screen Saver		Färg:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		grön
+Enable motion blur	Nebula Screen Saver		Aktivera rörelseoskärpa
+only a slit	Nebula Screen Saver		endast en reva
+fullscreen, no borders	Nebula Screen Saver		fullskärmsläge, inga kanter
+orange (original)	Nebula Screen Saver		orange (ursprunglig)
+cyan	Nebula Screen Saver		cyan
+Speed	Nebula Screen Saver		Hastighet
+%d pixels	Nebula Screen Saver		%d pixlar
+Nebula	Nebula Screen Saver		Nebulosa
 red	Nebula Screen Saver		röd
 grey	Nebula Screen Saver		grå
-cold	Nebula Screen Saver		kall
-Format:	Nebula Screen Saver		Format:
-only a slit	Nebula Screen Saver		endast en reva
-Color:	Nebula Screen Saver		Färg:
-16:9, wide-screen	Nebula Screen Saver		16:9, wide-screen

data/catalogs/add-ons/screen_savers/nebula/th.catkeys

@@ -1,20 +1,20 @@
 1	thai	x-vnd.Haiku-NebulaScreensaver	3897597581
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		เย็น
-Enable motion blur	Nebula Screen Saver		เปิดใช้งานการเคลื่อนไหวเบลอ
+Internal width:	Nebula Screen Saver		ความกว้างภายใน
-fullscreen, no borders	Nebula Screen Saver		เต็มหน้าจอไม่มีขอบ
+16:9, wide-screen	Nebula Screen Saver		16: 9 แบบจอกว้าง
-green	Nebula Screen Saver		เขียว
-yellow	Nebula Screen Saver		เหลือง
-cyan	Nebula Screen Saver		ฟ้า
 Maximum Frames Per Second	Nebula Screen Saver		เฟรมสูงสุดต่อวินาที
+Format:	Nebula Screen Saver		ฟอร์แมท:
+yellow	Nebula Screen Saver		เหลือง
+2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascope
+Color:	Nebula Screen Saver		สี:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		เขียว
+Enable motion blur	Nebula Screen Saver		เปิดใช้งานการเคลื่อนไหวเบลอ
+only a slit	Nebula Screen Saver		แยกเท่านั้น
+fullscreen, no borders	Nebula Screen Saver		เต็มหน้าจอไม่มีขอบ
+orange (original)	Nebula Screen Saver		ส้ม (สีเดิม)
+cyan	Nebula Screen Saver		ฟ้า
 Speed	Nebula Screen Saver		ความเร็ว
 Nebula	Nebula Screen Saver		Nebula
-orange (original)	Nebula Screen Saver		ส้ม (สีเดิม)
-Internal width:	Nebula Screen Saver		ความกว้างภายใน
-2:3.5, cinemascope	Nebula Screen Saver		2:3.5, cinemascope
 red	Nebula Screen Saver		แดง
 grey	Nebula Screen Saver		เทา
-cold	Nebula Screen Saver		เย็น
-Format:	Nebula Screen Saver		ฟอร์แมท:
-only a slit	Nebula Screen Saver		แยกเท่านั้น
-Color:	Nebula Screen Saver		สี:
-16:9, wide-screen	Nebula Screen Saver		16: 9 แบบจอกว้าง

data/catalogs/add-ons/screen_savers/nebula/tr.catkeys

@@ -1,20 +1,22 @@
-1	turkish	x-vnd.Haiku-NebulaScreensaver	3897597581
+1	turkish	x-vnd.Haiku-NebulaScreensaver	2177689501
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		donuk
-Enable motion blur	Nebula Screen Saver		Hareket bulanıklığını etkinleştir
-fullscreen, no borders	Nebula Screen Saver		tam ekran, kenarlıklar olmadan
-green	Nebula Screen Saver		yeşil
-yellow	Nebula Screen Saver		sarı
-cyan	Nebula Screen Saver		camgöbeği
-Maximum Frames Per Second	Nebula Screen Saver		Saniyedeki en çok kare sayısı
-Speed	Nebula Screen Saver		Hız
-Nebula	Nebula Screen Saver		Bulutsu
-orange (original)	Nebula Screen Saver		turuncu (orijinal)
 Internal width:	Nebula Screen Saver		İç genişlik:
+16:9, wide-screen	Nebula Screen Saver		16:9, geniş ekran
+Maximum Frames Per Second	Nebula Screen Saver		Saniyedeki en çok kare sayısı
+Format:	Nebula Screen Saver		Biçim:
+yellow	Nebula Screen Saver		sarı
+screen resolution	Nebula Screen Saver		ekran çözünürlüğü
 2:3.5, cinemascope	Nebula Screen Saver		2:35.5, sinemaskop
+Color:	Nebula Screen Saver		Renk:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		yeşil
+Enable motion blur	Nebula Screen Saver		Hareket bulanıklığını etkinleştir
+only a slit	Nebula Screen Saver		sadece bir yarık
+fullscreen, no borders	Nebula Screen Saver		tam ekran, kenarlıklar olmadan
+orange (original)	Nebula Screen Saver		turuncu (orijinal)
+cyan	Nebula Screen Saver		camgöbeği
+Speed	Nebula Screen Saver		Hız
+%d pixels	Nebula Screen Saver		%d piksel
+Nebula	Nebula Screen Saver		Bulutsu
 red	Nebula Screen Saver		kırmızı
 grey	Nebula Screen Saver		gri
-cold	Nebula Screen Saver		donuk
-Format:	Nebula Screen Saver		Biçim:
-only a slit	Nebula Screen Saver		sadece bir yarık
-Color:	Nebula Screen Saver		Renk:
-16:9, wide-screen	Nebula Screen Saver		16:9, geniş ekran

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

@@ -1,20 +1,21 @@
-1	ukrainian	x-vnd.Haiku-NebulaScreensaver	3897597581
+1	ukrainian	x-vnd.Haiku-NebulaScreensaver	1375348234
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		холодний
-Enable motion blur	Nebula Screen Saver		Увімкнути розмиття руху
-fullscreen, no borders	Nebula Screen Saver		повний екран, без меж
-green	Nebula Screen Saver		зелений
-yellow	Nebula Screen Saver		жовтий
-cyan	Nebula Screen Saver		бірюзовий
-Maximum Frames Per Second	Nebula Screen Saver		Максимум кадрів за секунду
-Speed	Nebula Screen Saver		Швидкість
-Nebula	Nebula Screen Saver		Nebula
-orange (original)	Nebula Screen Saver		оранжевий (original)
 Internal width:	Nebula Screen Saver		Внутрішня ширина:
+16:9, wide-screen	Nebula Screen Saver		16:9 широкий екран
+Maximum Frames Per Second	Nebula Screen Saver		Максимум кадрів за секунду
+Format:	Nebula Screen Saver		Формат:
+yellow	Nebula Screen Saver		жовтий
 2:3.5, cinemascope	Nebula Screen Saver		2:3.5, CinemaScope
+Color:	Nebula Screen Saver		Колір:
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		зелений
+Enable motion blur	Nebula Screen Saver		Увімкнути розмиття руху
+only a slit	Nebula Screen Saver		тільки щілину
+fullscreen, no borders	Nebula Screen Saver		повний екран, без меж
+orange (original)	Nebula Screen Saver		оранжевий (original)
+cyan	Nebula Screen Saver		бірюзовий
+Speed	Nebula Screen Saver		Швидкість
+%d pixels	Nebula Screen Saver		%d пікселів
+Nebula	Nebula Screen Saver		Nebula
 red	Nebula Screen Saver		червоний
 grey	Nebula Screen Saver		сірий
-cold	Nebula Screen Saver		холодний
-Format:	Nebula Screen Saver		Формат:
-only a slit	Nebula Screen Saver		тільки щілину
-Color:	Nebula Screen Saver		Колір:
-16:9, wide-screen	Nebula Screen Saver		16:9 широкий екран

data/catalogs/add-ons/screen_savers/nebula/zh_Hans.catkeys

@@ -1,20 +1,20 @@
 1	english	x-vnd.Haiku-NebulaScreensaver	3897597581
-© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+cold	Nebula Screen Saver		冷色
-Enable motion blur	Nebula Screen Saver		启用动态模糊
+Internal width:	Nebula Screen Saver		内部宽度：
-fullscreen, no borders	Nebula Screen Saver		全屏，无边框
+16:9, wide-screen	Nebula Screen Saver		16:9，宽屏
-green	Nebula Screen Saver		绿色
-yellow	Nebula Screen Saver		黄色
-cyan	Nebula Screen Saver		青色
 Maximum Frames Per Second	Nebula Screen Saver		最大帧率
+Format:	Nebula Screen Saver		格式：
+yellow	Nebula Screen Saver		黄色
+2:3.5, cinemascope	Nebula Screen Saver		2:3.5，宽屏
+Color:	Nebula Screen Saver		颜色：
+© 2001-2004 Axel Dörfler.	Nebula Screen Saver		© 2001-2004 Axel Dörfler.
+green	Nebula Screen Saver		绿色
+Enable motion blur	Nebula Screen Saver		启用动态模糊
+only a slit	Nebula Screen Saver		仅单个裂缝
+fullscreen, no borders	Nebula Screen Saver		全屏，无边框
+orange (original)	Nebula Screen Saver		橙色（原始）
+cyan	Nebula Screen Saver		青色
 Speed	Nebula Screen Saver		速度
 Nebula	Nebula Screen Saver		星云
-orange (original)	Nebula Screen Saver		橙色（原始）
-Internal width:	Nebula Screen Saver		内部宽度：
-2:3.5, cinemascope	Nebula Screen Saver		2:3.5，宽屏
 red	Nebula Screen Saver		红色
 grey	Nebula Screen Saver		灰色
-cold	Nebula Screen Saver		冷色
-Format:	Nebula Screen Saver		格式：
-only a slit	Nebula Screen Saver		仅单个裂缝
-Color:	Nebula Screen Saver		颜色：
-16:9, wide-screen	Nebula Screen Saver		16:9，宽屏

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

@@ -1,4 +1,4 @@
 1	indonesian	x-vnd.Haiku-ShelfScreensaver	547737841
 Drop replicants on the full-screen window behind the preferences panel.	Shelf Screen Saver		Jatuhkan replican pada jendela layar penuh di belakang panel preferensi.
 © 2012 François Revol.	Shelf Screen Saver		© 2012 François Revol.
-Shelf	Shelf Screen Saver		Shelf (Rak)
+Shelf	Shelf Screen Saver		Rak

data/catalogs/add-ons/translators/pcx/id.catkeys

@@ -3,6 +3,6 @@ PCX Settings	main		Pengaturan PCX
 Version %d.%d.%d, %s	ConfigView		Versi %d.%d.%d, %s
 PCXTranslator Settings	ConfigView		Pengaturan PCXTranslator
 PCX image translator	PCXTranslator		Penerjemah gambar PCX
-PCX %lu bit image	PCXTranslator		Citra PCX %lu bit 
+PCX %lu bit image	PCXTranslator		Citra PCX %lu bit
 PCX images	PCXTranslator		Citra PCX
 PCX image translator	ConfigView		Penerjemah gambar PCX

data/catalogs/add-ons/translators/tga/id.catkeys

@@ -10,7 +10,7 @@ Written by the Haiku Translation Kit Team	TGAView		Ditulis oleh Tim Translation
 Targa image (%d bits RLE truecolor)	TGATranslator		Gambar targa (%d bita RLE warna-asli)
 TGA images	TGATranslator		Gambar TGA
 Version %d.%d.%d, %s	TGAView		Versi %d.%d.%d, %s
-TGATranslator Settings	TGATranslator		Pengaturan TGATranslator 
+TGATranslator Settings	TGATranslator		Pengaturan TGATranslator
 TGA image translator	TGATranslator		Penerjemah gambar TGA
 Targa image (%d bits RLE gray)	TGATranslator		Gambar targa (%d bita RLE abu-abu)
 TGA Settings	TGAMain		Pengaturan TGA

data/catalogs/apps/aboutsystem/ca.catkeys

@@ -1,4 +1,4 @@
-1	catalan; valencian	x-vnd.Haiku-About	2374494647
+1	catalan; valencian	x-vnd.Haiku-About	408681589
 Revision	AboutView		Revisió
 The Haikuware team and their bounty program\n	AboutView		L'equip de Haikuware i el seu programa de recompenses\n
 Copyright © 1999-2007 Michael C. Ring. All rights reserved.	AboutView		Copyright © 1999-2007 Michael C. Ring. Tots els drets reservats.
@@ -42,6 +42,7 @@ About this system	AboutWindow		Quant a aquest sistema
 Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved.	AboutView		Copyright © 1999-2010 dels autors del Gutenprint. Tots els drets reservats.
 Copyright © 1994-1997 Mark Kilgard. All rights reserved.	AboutView		Copyright © 1994-1997 Mark Kilgard. Tots els drets reservats.
 AboutSystem	System name		Quant al sistema
+Copyright © 2019 Joe Drago. All rights reserved.	AboutView		Copyright © 2019 Joe Drago. Tots els drets reservats.
 Copyright © 1995-2001 Lars Düning. All rights reserved.	AboutView		Copyright © 1995-2001 Lars Düning. Tots els drets reservats.
 Copyright © 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper.	AboutView		Copyright © 1998-2000 Thai Open Source Software Center Ltd i Clark Cooper.
 Source Code: 	AboutView		Codi font: 

data/catalogs/apps/aboutsystem/cs.catkeys

@@ -1,4 +1,4 @@
-1	czech	x-vnd.Haiku-About	2374494647
+1	czech	x-vnd.Haiku-About	408681589
 Revision	AboutView		Revize
 The Haikuware team and their bounty program\n	AboutView		Tým Haikuware a jejich systém prémií\n
 Copyright © 1999-2007 Michael C. Ring. All rights reserved.	AboutView		Copyright © 1999-2007 Michael C. Ring. Všechna práva vyhrazena.
@@ -42,6 +42,7 @@ About this system	AboutWindow		O tomto systému
 Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved.	AboutView		Copyright © 1999-2010 autoři Gutenprint. Všechna práva vyhrazena.
 Copyright © 1994-1997 Mark Kilgard. All rights reserved.	AboutView		Copyright © 1994-1997 Mark Kilgard. Všechna práva vyhrazena.
 AboutSystem	System name		O Systému
+Copyright © 2019 Joe Drago. All rights reserved.	AboutView		Copyright © 2019 Joe Drago. Všechna práva vyhrazena.
 Copyright © 1995-2001 Lars Düning. All rights reserved.	AboutView		Copyright © 1995-2001 Lars Düning. Všechna práva vyhrazena.
 Copyright © 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper.	AboutView		Copyright © 1998-2000 Thai Open Source Software Center Ltd a Clark Cooper.
 Source Code: 	AboutView		Zdrojový kód:

data/catalogs/apps/aboutsystem/da.catkeys

@@ -1,4 +1,4 @@
-1	danish	x-vnd.Haiku-About	2374494647
+1	danish	x-vnd.Haiku-About	408681589
 Revision	AboutView		Revision
 The Haikuware team and their bounty program\n	AboutView		Haikuware-holdet og deres dusørprogram\n
 Copyright © 1999-2007 Michael C. Ring. All rights reserved.	AboutView		Ophavsret © 1999-2007 Michael C. Ring. Alle rettigheder forbeholdes.
@@ -11,7 +11,7 @@ Google and their Google Summer of Code and Google Code In programs\n	AboutView
 Contributors:\n	AboutView		Bidragsydere:\n
 Kernel:	AboutView		Kerne:
 Copyright © 2006-2012 Kentaro Fukuchi	AboutView		Ophavsret © 2006-2012 Kentaro Fukuchi
-Copyright © 1991-2000 Silicon Graphics, Inc. All rights reserved.	AboutView		Ophavsret © 1991-2000 Silicon Graphics, Inc. All rights reserved.
+Copyright © 1991-2000 Silicon Graphics, Inc. All rights reserved.	AboutView		Ophavsret © 1991-2000 Silicon Graphics, Inc. Alle rettigheder forbeholdes.
 Copyright © 1990-2002 Info-ZIP. All rights reserved.	AboutView		Ophavsret © 1990-2002 Info-ZIP. Alle rettigheder forbeholdes.
 Past website & marketing:\n	AboutView		Forhenværende websted og markedsføring:\n
 Copyright © 2003 Peter Hanappe and others.	AboutView		Ophavsret © 2003 Peter Hanappe og andre.
@@ -20,7 +20,7 @@ Testing and bug triaging:\n	AboutView		Testning og fejltriagering:\n
 %d MiB total	AboutView		%d MiB i alt
 The code that is unique to Haiku, especially the kernel and all code that applications may link against, is distributed under the terms of the <MIT license>. Some system libraries contain third party code distributed under the <LGPL license>. You can find the copyrights to third party code below.\n\n	AboutView	<MIT license> and <LGPL license> aren't variables and can be translated. However, please, don't remove < and > as they're needed as placeholders for proper hypertext functionality.	Kode som er unikt til Haiku, specielt kernen og al kode som programmer kan linke mod, distribueres under vilkårene i <MIT-licensen>. Nogle systembiblioteker indeholder tredjepartskode som distribueres under <LGPL-licensen>. Du kan finde ophavsrettene til tredjepartskode nedenfor.\n\n
 Copyright © 1996-1997 Jeff Prosise. All rights reserved.	AboutView		Ophavsret © 1996-1997 Jeff Prosise. Alle rettigheder forbeholdes.
-Copyright © 1999-2006 Brian Paul. Mesa3D Project. All rights reserved.	AboutView		Ophavsret © 1999-2006 Brian Paul. Mesa3D Project. Alle rettigheder forbeholdes.
+Copyright © 1999-2006 Brian Paul. Mesa3D Project. All rights reserved.	AboutView		Ophavsret © 1999-2006 Brian Paul. Mesa3D-projektet. Alle rettigheder forbeholdes.
 Copyright © 2010-2011 Google Inc. All rights reserved.	AboutView		Ophavsret © 2010-2011 Google Inc. Alle rettigheder forbeholdes.
 Copyright © 1987-1988 Digital Equipment Corporation, Maynard, Massachusetts.\nAll rights reserved.	AboutView		Ophavsret © 1987-1988 Digital Equipment Corporation, Maynard, Massachusetts.\nAlle rettigheder forbeholdes.
 Past maintainers:\n	AboutView		Forhenværende vedligeholdere:\n
@@ -28,7 +28,7 @@ Unknown	AboutView		Ukendt
 Be Inc. and its developer team, for having created BeOS!\n\n	AboutView		Be Inc. og deres udviklingshold, for at have skabt BeOS!\n\n
 Copyright © 2002-2014 Industrial Light & Magic, a division of Lucas Digital Ltd. LLC.	AboutView		Ophavsret © 2002-2014 Industrial Light & Magic, et datterselskab af Lucas Digital Ltd. LLC.
 Licenses: 	AboutView		Licenser: 
-The copyright to the Haiku code is property of Haiku, Inc. or of the respective authors where expressly noted in the source. Haiku® and the HAIKU logo® are registered trademarks of Haiku, Inc.\n\n	AboutView		Ophavsretten til Haikus kode tilhører Haiku, Inc. eller af de respektive ophavsmænd som er udtrykkeligt angivet i kildekoden. Haiku® og HAIKU-logoet® er registrerede varemærker af Haiku, Inc.\n\n
+The copyright to the Haiku code is property of Haiku, Inc. or of the respective authors where expressly noted in the source. Haiku® and the HAIKU logo® are registered trademarks of Haiku, Inc.\n\n	AboutView		Ophavsretten til Haikus kode tilhører Haiku, Inc. eller de respektive ophavsmænd som udtrykkeligt er angivet i kildekoden. Haiku® og HAIKU-logoet® er registrerede varemærker tilhørende Haiku, Inc.\n\n
 Copyright © 2009 Colin Percival	AboutView		Ophavsret © 2009 Colin Percival
 Time running:	AboutView		Oppetid:
 %ld MHz	AboutView		%ld MHz
@@ -42,6 +42,7 @@ About this system	AboutWindow		Om systemet
 Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved.	AboutView		Ophavsret © 1999-2010 af forfatterne af Gutenprint. Alle rettigheder forbeholdes.
 Copyright © 1994-1997 Mark Kilgard. All rights reserved.	AboutView		Ophavsret © 1994-1997 Mark Kilgard. Alle rettigheder forbeholdes.
 AboutSystem	System name		Om systemet
+Copyright © 2019 Joe Drago. All rights reserved.	AboutView		Ophavsret © 2019 Joe Drago. Alle rettigheder forbeholdes.
 Copyright © 1995-2001 Lars Düning. All rights reserved.	AboutView		Ophavsret © 1995-2001 Lars Düning. Alle rettigheder forbeholdes.
 Copyright © 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper.	AboutView		Ophavsret © 1998-2000 Thai Open Source Software Center Ltd og Clark Cooper.
 Source Code: 	AboutView		Kildekode: 
@@ -50,7 +51,7 @@ GNU GPL v3	AboutWindow		GNU GPL v3
 The HaikuPorts team\n	AboutView		HaikuPorts-teamet\n
 Contains software from the GNU Project, released under the GPL and LGPL licenses:\nGNU C Library, GNU coretools, diffutils, findutils, sharutils, gawk, bison, m4, make, wget, ncurses, termcap, Bourne Again Shell.\nCopyright © The Free Software Foundation.	AboutView		Indeholder software fra GNU-projektet, udgivet under GPL- og LGPL-licenserne:\nGNU C-bibliotek, GNU-kerneværktøjer, diffutils, findutils, sharutils, gawk, bison, m4, make, wget, ncurses, termcap, Bourne Again Shell.\nOphavsret © The Free Software Foundation.
 Copyright © 1996-2002, 2006 David Turner, Robert Wilhelm and Werner Lemberg.	AboutView		Ophavsret © 1996-2002, 2006 David Turner, Robert Wilhelm og Werner Lemberg.
-Contains software from the FreeBSD Project, released under the BSD license:\nftpd, ping, telnet, telnetd, traceroute\nCopyright © 1994-2008 The FreeBSD Project. All rights reserved.	AboutView		Indeholder software fra FreeBSD-projektet, udgivet under BSD-licenserne:\nftpd, ping, telnet, telnetd, traceroute\nOphavsret © 1994-2008 FreeBSD-projektet. Alle rettigheder forbeholdt.
+Contains software from the FreeBSD Project, released under the BSD license:\nftpd, ping, telnet, telnetd, traceroute\nCopyright © 1994-2008 The FreeBSD Project. All rights reserved.	AboutView		Indeholder software fra FreeBSD-projektet, udgivet under BSD-licenserne:\nftpd, ping, telnet, telnetd, traceroute\nOphavsret © 1994-2008 FreeBSD-projektet. Alle rettigheder forbeholdes.
 Copyright © 2002-2003 Steve Lhomme. All rights reserved.	AboutView		Ophavsret © 2002-2003 Steve Lhomme. Alle rettigheder forbeholdes.
 Copyright © 2000-2019 Fabrice Bellard, et al.	AboutView		Ophavsret © 2000-2019 Fabrice Bellard, med flere
 Current maintainers:\n	AboutView		Nuværende vedligeholdere:\n

data/catalogs/apps/aboutsystem/de.catkeys

@@ -1,4 +1,4 @@
-1	german	x-vnd.Haiku-About	2374494647
+1	german	x-vnd.Haiku-About	408681589
 Revision	AboutView		Stand:
 The Haikuware team and their bounty program\n	AboutView		Das Haikuware-Team und deren Bounty-Programm\n
 Copyright © 1999-2007 Michael C. Ring. All rights reserved.	AboutView		Copyright © 1999-2007 Michael C. Ring. Alle Rechte vorbehalten.
@@ -42,6 +42,7 @@ About this system	AboutWindow		Über dieses System
 Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved.	AboutView		Copyright © 1999-2010 durch die Autoren von Gutenprint. Alle Rechte vorbehalten.
 Copyright © 1994-1997 Mark Kilgard. All rights reserved.	AboutView		Copyright © 1994-1997 Mark Kilgard. Alle Rechte vorbehalten.
 AboutSystem	System name		Über Haiku
+Copyright © 2019 Joe Drago. All rights reserved.	AboutView		Copyright © 2019 Joe Drago. Alle Rechte vorbehalten.
 Copyright © 1995-2001 Lars Düning. All rights reserved.	AboutView		Copyright © 1995-2001 Lars Düning. Alle Rechte vorbehalten.
 Copyright © 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper.	AboutView		Copyright © 1998-2000 Thai Open Source Software Center Ltd und Clark Cooper.
 Source Code: 	AboutView		Quellcode: 

data/catalogs/apps/aboutsystem/el.catkeys

@@ -1,4 +1,4 @@
-1	greek, modern (1453-)	x-vnd.Haiku-About	511528774
+1	greek, modern (1453-)	x-vnd.Haiku-About	408681589
 Revision	AboutView		Αναθεώρηση
 The Haikuware team and their bounty program\n	AboutView		Η ομάδα της Haikuware και το πρόγραμμα επιδοτήσεων της\n
 Copyright © 1999-2007 Michael C. Ring. All rights reserved.	AboutView		Πνευματική ιδιοκτησία © 1999-2007 Michael C. Ring. Με επιφύλαξη παντός δικαιώματος.
@@ -42,6 +42,7 @@ About this system	AboutWindow		Πληροφορίες συστήματος
 Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved.	AboutView		Πνευματική ιδιοκτησία © 1999-2010 απο τους συγγραφείς του Gutenprint. Με επιφύλαξη παντός δικαιώματος.
 Copyright © 1994-1997 Mark Kilgard. All rights reserved.	AboutView		Πνευματική ιδιοκτησία © 1994-1997 Mark Kilgard. Με επιφύλαξη παντός δικαιώματος.
 AboutSystem	System name		Σχετικά
+Copyright © 2019 Joe Drago. All rights reserved.	AboutView		Copyright © 2019 Joe Drago. Με επιφύλαξη παντός δικαιώματος.
 Copyright © 1995-2001 Lars Düning. All rights reserved.	AboutView		Πνευματική ιδιοκτησία © 1995-2001 Lars Düning. Με επιφύλαξη παντός δικαιώματος.
 Copyright © 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper.	AboutView		Πνευματική ιδιοκτησία © 1998-2000 Thai Open Source Software Center Ltd και Clark Cooper.
 Source Code: 	AboutView		Πηγαίος Κώδικας: 
@@ -72,6 +73,7 @@ Memory:	AboutView		Μνήμη:
 \n…and probably some more we forgot to mention (sorry!)\n\n	AboutView		\n…και μάλλον αρκετά άλλα άτομα που ξεχάσαμε να αναφέρουμε (συγγνώμη!)\n\n
 BSD (2-clause)	AboutWindow		BSD (2-όρων)
 Website & marketing:\n	AboutView		Ιστοσελίδα & μάρκετινγκ:\n
+Copyright © 2018-2021, Frederic Cambus	AboutView		Copyright © 2018-2021, Frederic Cambus
 2001 by Andy Ritger based on the Generalized Timing Formula	AboutView		2001 απο τον Andy Ritger βασισμένο στο Generalized Timing Formula
 …and the many people making donations!\n\n	AboutView		...και τους πολλούς δωρητές μας!\n\n
 BSD (4-clause)	AboutWindow		BSD (4-όρων)

data/catalogs/apps/aboutsystem/es.catkeys

@@ -1,4 +1,4 @@
-1	spanish; castilian	x-vnd.Haiku-About	2374494647
+1	spanish; castilian	x-vnd.Haiku-About	408681589
 Revision	AboutView		Revisión
 The Haikuware team and their bounty program\n	AboutView		El equipo de Haikuware y su programa de recompensas\n
 Copyright © 1999-2007 Michael C. Ring. All rights reserved.	AboutView		Copyright © 1999-2007 Michael C. Ring. Todos los derechos reservados.
@@ -42,6 +42,7 @@ About this system	AboutWindow		Acerca de este sistema
 Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved.	AboutView		Copyright © 1999-2010 por los autores de Gutenprint. Todos los derechos reservados.
 Copyright © 1994-1997 Mark Kilgard. All rights reserved.	AboutView		Copyright © 1994-1997 Mark Kilgard. Todos los derechos reservados.
 AboutSystem	System name		Acerca del sistema
+Copyright © 2019 Joe Drago. All rights reserved.	AboutView		Copyright © 2019 Joe Drago. Todos los derechos reservados.
 Copyright © 1995-2001 Lars Düning. All rights reserved.	AboutView		Copyright © 1995-2001 Lars Düning. Todos los derechos reservados.
 Copyright © 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper.	AboutView		Copyright © 1998-2000 Thai Open Source Software Center Ltd y Clark Cooper.
 Source Code: 	AboutView		Código fuente:

data/catalogs/apps/aboutsystem/fi.catkeys

@@ -1,4 +1,4 @@
-1	finnish	x-vnd.Haiku-About	2374494647
+1	finnish	x-vnd.Haiku-About	408681589
 Revision	AboutView		Korjausversio
 The Haikuware team and their bounty program\n	AboutView		Haikuware-ryhmä ja heidän bounty-ohjelmansa\n
 Copyright © 1999-2007 Michael C. Ring. All rights reserved.	AboutView		Copyright © 1999-2007 Michael C. Ring. Kaikki oikeudet pidätetty.
@@ -42,6 +42,7 @@ About this system	AboutWindow		Tietoa tästä järjestelmästä
 Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved.	AboutView		Copyright © 1999-2010 Gutenprint-tekijät. Kaikki oikeudet pidätetty.
 Copyright © 1994-1997 Mark Kilgard. All rights reserved.	AboutView		Copyright © 1994-1997 Mark Kilgard. Kaikki oikeudet pidätetty.
 AboutSystem	System name		Järjestelmästä
+Copyright © 2019 Joe Drago. All rights reserved.	AboutView		Copyright © 2019 Joe Drago. Kaikki oikeudet varattu.
 Copyright © 1995-2001 Lars Düning. All rights reserved.	AboutView		Copyright © 1995-2001 Lars Düning. Kaikki oikeudet pidätetty.
 Copyright © 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper.	AboutView		Copyright © 1998-2000 Thai Open Source Software Center Ltd ja Clark Cooper.
 Source Code: 	AboutView		Lähdekoodi: 

data/catalogs/apps/aboutsystem/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-About	2374494647
+1	french	x-vnd.Haiku-About	408681589
 Revision	AboutView		Révision
 The Haikuware team and their bounty program\n	AboutView		L’équipe Haikuware et son programme de récompenses\n
 Copyright © 1999-2007 Michael C. Ring. All rights reserved.	AboutView		Copyright © 1999-2007 Michael C. Ring. Tous droits réservés.
@@ -42,6 +42,7 @@ About this system	AboutWindow		À propos de ce système
 Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved.	AboutView		Copyright © 1999-2010 par les auteurs de Gutenprint. Tous droits réservés.
 Copyright © 1994-1997 Mark Kilgard. All rights reserved.	AboutView		Copyright © 1994-1997 Mark Kilgard. Tous droits réservés.
 AboutSystem	System name		À propos du système
+Copyright © 2019 Joe Drago. All rights reserved.	AboutView		Copyright © 2019 Joe Drago. Tous droits réservés.
 Copyright © 1995-2001 Lars Düning. All rights reserved.	AboutView		Copyright © 1995-2001 Lars Düning. Tous droits réservés.
 Copyright © 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper.	AboutView		Copyright © 1998-2000 Thai Open Source Software Center Ltd et Clark Cooper.
 Source Code: 	AboutView		Code Source : 

data/catalogs/apps/aboutsystem/hu.catkeys

@@ -1,4 +1,4 @@
-1	hungarian	x-vnd.Haiku-About	2374494647
+1	hungarian	x-vnd.Haiku-About	408681589
 Revision	AboutView		kiadás:
 The Haikuware team and their bounty program\n	AboutView		A Haikuware csapatának és az adományprogramjuknak\n
 Copyright © 1999-2007 Michael C. Ring. All rights reserved.	AboutView		Copyright © 1999-2007 Michael C. Ring. Minden jog fenntartva.
@@ -42,6 +42,7 @@ About this system	AboutWindow		Haiku névjegye
 Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved.	AboutView		Copyright © 1999-2010 a Gutenprint szerzőitől. Minden jog fenntartva.
 Copyright © 1994-1997 Mark Kilgard. All rights reserved.	AboutView		Copyright © 1994-1997 Mark Kilgard. Minden jog fenntartva.
 AboutSystem	System name		Névjegy
+Copyright © 2019 Joe Drago. All rights reserved.	AboutView		Copyright © 2019 Joe Drago. Minden jog fenntartva.
 Copyright © 1995-2001 Lars Düning. All rights reserved.	AboutView		Copyright © 1995-2001 Lars Düning. Minden jog fenntartva.
 Copyright © 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper.	AboutView		Copyright © 1998-2000 Thai Open Source Software Center Ltd és Clark Cooper.
 Source Code: 	AboutView		Forráskód: 

data/catalogs/apps/aboutsystem/id.catkeys

@@ -1,4 +1,4 @@
-1	indonesian	x-vnd.Haiku-About	511528774
+1	indonesian	x-vnd.Haiku-About	408681589
 Revision	AboutView		Revisi
 The Haikuware team and their bounty program\n	AboutView		Tim Haikuware dan Program hadiah mereka\n
 Copyright © 1999-2007 Michael C. Ring. All rights reserved.	AboutView		Hak Cipta © 1999-2007 Michael C. Ring. Hak cipta dilindungi undang-undang.
@@ -42,6 +42,7 @@ About this system	AboutWindow		Tentang sistem ini
 Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved.	AboutView		Hak Cipta © 1999-2010 oleh penulis Gutenprint. Hak cipta dilindungi Undang-Undang.
 Copyright © 1994-1997 Mark Kilgard. All rights reserved.	AboutView		Hak Cipta © 1994-1997 Mark Kilgard. Hak cipta dilindungi undang-undang.
 AboutSystem	System name		AboutSystem
+Copyright © 2019 Joe Drago. All rights reserved.	AboutView		Hak Cipta © 2019 Joe Drago.Semua hak dilindungi.
 Copyright © 1995-2001 Lars Düning. All rights reserved.	AboutView		Hak Cipta © 1995-2001 Lars Düning. Hak cipta dilindungi undang-undang.
 Copyright © 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper.	AboutView		Hak Cipta © 1998-2000 Thai Open Source Software Center Ltd dan Clark Cooper.
 Source Code: 	AboutView		Kode sumber: 
@@ -72,6 +73,7 @@ Memory:	AboutView		Memori:
 \n…and probably some more we forgot to mention (sorry!)\n\n	AboutView		\n…dan mungkin ada lagi yang kami lupa menyebutkan (maaf!)\n\n
 BSD (2-clause)	AboutWindow		BSD (2-klausa)
 Website & marketing:\n	AboutView		Situs web & marketing:\n
+Copyright © 2018-2021, Frederic Cambus	AboutView		Hak cipta © 2018-2021, Frederic Cambus
 2001 by Andy Ritger based on the Generalized Timing Formula	AboutView		2001 oleh Andy Ritger berdasarkan formula Generalized Timing
 …and the many people making donations!\n\n	AboutView		…dan orang-orang yang ikut menyumbang!\n\n
 BSD (4-clause)	AboutWindow		BSD (4-pasal)

data/catalogs/apps/aboutsystem/ja.catkeys

@@ -1,4 +1,4 @@
-1	japanese	x-vnd.Haiku-About	2374494647
+1	japanese	x-vnd.Haiku-About	408681589
 Revision	AboutView		リビジョン
 The Haikuware team and their bounty program\n	AboutView		Haikuware チーム＆報奨金プログラム\n
 Copyright © 1999-2007 Michael C. Ring. All rights reserved.	AboutView		Copyright © 1999-2007 Michael C. Ring. All rights reserved.
@@ -42,6 +42,7 @@ About this system	AboutWindow		このシステムについて
 Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved.	AboutView		Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved.
 Copyright © 1994-1997 Mark Kilgard. All rights reserved.	AboutView		Copyright © 1994-1997 Mark Kilgard. All rights reserved.
 AboutSystem	System name		このシステムについて
+Copyright © 2019 Joe Drago. All rights reserved.	AboutView		Copyright © 2019 Joe Drago. All rights reserved.
 Copyright © 1995-2001 Lars Düning. All rights reserved.	AboutView		Copyright © 1995-2001 Lars Düning. All rights reserved.
 Copyright © 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper.	AboutView		Copyright © 1998-2000 Thai Open Source Software Center LtdおよびClark Cooper.
 Source Code: 	AboutView		ソースコード:

data/catalogs/apps/aboutsystem/pt_BR.catkeys

@@ -37,7 +37,7 @@ GNU LGPL v2	AboutWindow		GNU LGPL v2
 Copyright © 1994-2009, Thomas G. Lane, Guido Vollbeding. This software is based in part on the work of the Independent JPEG Group.	AboutView		Direitos autorais © 1994-2009, Thomas G. Lane, Guido Vollbeding. Este software é baseado em parte do trabalho do Grupo Independente JPEG.
 Michael Phipps (project founder)\n\n	AboutView		Michael Phipps (fundador do projeto)\n\n
 BSD (3-clause)	AboutWindow		BSD (3-cláusulas)
-About this system	AboutWindow		Sobre o Haiku
+About this system	AboutWindow		Sobre este sistema
 %d MiB used (%d%%)	AboutView		%d MiB usados (%d%%)
 Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved.	AboutView		Direitos autorais © 1999-2010 pelos autores do Gutenprint. Todos os direitos reservados.
 Copyright © 1994-1997 Mark Kilgard. All rights reserved.	AboutView		Direitos autorais © 1994-1997 Mark Kilgard. Todos os direitos reservados.

data/catalogs/apps/aboutsystem/sv.catkeys

@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Haiku-About	2374494647
+1	swedish	x-vnd.Haiku-About	408681589
 Revision	AboutView		Utgåva
 The Haikuware team and their bounty program\n	AboutView		Haikuware-teamet och deras belöningsprogram\n
 Copyright © 1999-2007 Michael C. Ring. All rights reserved.	AboutView		Upphovsrätt © 1999-2007 Michael C. Ring. Med ensamrätt.
@@ -42,6 +42,7 @@ About this system	AboutWindow		Om Haiku
 Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved.	AboutView		Upphovsrätt © 1999-2010 skaparna av Gutenprint. Med ensamrätt.
 Copyright © 1994-1997 Mark Kilgard. All rights reserved.	AboutView		Upphovsrätt © 1994-1997 Mark Kilard. Med ensamrätt.
 AboutSystem	System name		OmHaiku
+Copyright © 2019 Joe Drago. All rights reserved.	AboutView		Upphovsrätt © 2019 Joe Drago. Alla rättigheter förbehållna.
 Copyright © 1995-2001 Lars Düning. All rights reserved.	AboutView		Upphovsrätt © 1995-2001 Lars Düning. Med ensamrätt.
 Copyright © 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper.	AboutView		Upphovsrätt © 1998-2000 Thai Open Source Software Center Ltd och Clark Cooper.
 Source Code: 	AboutView		Källkod: 

data/catalogs/apps/aboutsystem/th.catkeys

@@ -1,4 +1,4 @@
-1	thai	x-vnd.Haiku-About	511528774
+1	thai	x-vnd.Haiku-About	2374494647
 Revision	AboutView		ปรับปรุง
 The Haikuware team and their bounty program\n	AboutView		ทีมไฮกุแวร์และโปรแกรมสนับสนุนของพวกเขา\n
 Copyright © 1999-2007 Michael C. Ring. All rights reserved.	AboutView		ลิขสิทธิ์© 1999-2007 Michael C. Ring สงวนลิขสิทธิ์.
@@ -72,6 +72,7 @@ Memory:	AboutView		หน่วยความจำ:
 \n…and probably some more we forgot to mention (sorry!)\n\n	AboutView		\n…และอาจมีบางอย่างที่เราลืมพูดถึง (ขออภัย!) \n\n
 BSD (2-clause)	AboutWindow		BSD (2-ข้อ)
 Website & marketing:\n	AboutView		เว็บไซต์และการตลาด: \n
+Copyright © 2018-2021, Frederic Cambus	AboutView		ลิขสิทธิ์  © 2018-2021, Frederic Cambus
 2001 by Andy Ritger based on the Generalized Timing Formula	AboutView		2001 โดย Andy Ritger ตาม Generalized Timing Formula
 …and the many people making donations!\n\n	AboutView		…และผู้คนมากมายบริจาคเงิน! \n\n
 BSD (4-clause)	AboutWindow		BSD (4-ข้อ)

data/catalogs/apps/aboutsystem/tr.catkeys

@@ -1,4 +1,4 @@
-1	turkish	x-vnd.Haiku-About	2374494647
+1	turkish	x-vnd.Haiku-About	408681589
 Revision	AboutView		Revizyon
 The Haikuware team and their bounty program\n	AboutView		Haikuware takımı ve onların ödül programı\n
 Copyright © 1999-2007 Michael C. Ring. All rights reserved.	AboutView		Telif hakkı © 1999-2007 Michael C. Ring. Tüm hakları saklıdır.
@@ -42,6 +42,7 @@ About this system	AboutWindow		Sistem Hakkında
 Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved.	AboutView		Telif hakkı © 1999 - 2010 Gutenprint yazarları. Tüm hakları saklıdır.
 Copyright © 1994-1997 Mark Kilgard. All rights reserved.	AboutView		Telif hakkı © 1994 - 1997 Mark Kilgard. Tüm hakları saklıdır.
 AboutSystem	System name		Sistem Hakkında
+Copyright © 2019 Joe Drago. All rights reserved.	AboutView		Telif hakkı © 2019 Joe Drago. Tüm hakları saklıdır.
 Copyright © 1995-2001 Lars Düning. All rights reserved.	AboutView		Telif hakkı © 1995-2001 Lars Düning. Tüm hakları saklıdır.
 Copyright © 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper.	AboutView		Telif hakkı © 1998-2000 Thai Open Source Software Center Ltd ve Clark Cooper.
 Source Code: 	AboutView		Kaynak Kodu: 

data/catalogs/apps/aboutsystem/uk.catkeys

@@ -1,4 +1,4 @@
-1	ukrainian	x-vnd.Haiku-About	2374494647
+1	ukrainian	x-vnd.Haiku-About	408681589
 Revision	AboutView		Ревізія
 The Haikuware team and their bounty program\n	AboutView		Команді Haikuware з їхньою програмою заохочень\n
 Copyright © 1999-2007 Michael C. Ring. All rights reserved.	AboutView		Copyright © 1999-2007 Michael C. Ring. All rights reserved.
@@ -42,6 +42,7 @@ About this system	AboutWindow		Про цю систему
 Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved.	AboutView		Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved.
 Copyright © 1994-1997 Mark Kilgard. All rights reserved.	AboutView		Copyright © 1994-1997 Mark Kilgard. All rights reserved.
 AboutSystem	System name		AboutSystem
+Copyright © 2019 Joe Drago. All rights reserved.	AboutView		Copyright © 2019 Joe Drago. Всі права захищені.
 Copyright © 1995-2001 Lars Düning. All rights reserved.	AboutView		Copyright © 1995-2001 Lars Düning. All rights reserved.
 Copyright © 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper.	AboutView		Copyright © 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper.
 Source Code: 	AboutView		Початковий код: 

data/catalogs/apps/activitymonitor/da.catkeys

@@ -5,7 +5,7 @@ TX	DataSource	Shorter version for Sending	TX
 Block cache memory	DataSource		Blok mellemlager hukommelse
 %lld ms	SettingsWindow		%lld ms
 MiB	DataSource		MiB
-Media nodes	DataSource		Medie noder
+Media nodes	DataSource		Medienoder
 Text clipboard	DataSource		Tekst udklipsholder
 Network send	DataSource		Netværk afsende
 Running applications	DataSource		Kørende programmer

data/catalogs/apps/activitymonitor/el.catkeys

@@ -1,4 +1,4 @@
-1	greek, modern (1453-)	x-vnd.Haiku-ActivityMonitor	3672498538
+1	greek, modern (1453-)	x-vnd.Haiku-ActivityMonitor	2601047281
 Teams	DataSource		Ομάδες
 Semaphores	DataSource		Σηματοφόροι
 TX	DataSource	Shorter version for Sending	ΑΠ
@@ -17,6 +17,7 @@ Remove graph	ActivityView		Αφαίρεση γραφήματος
 Swap space	DataSource		Χώρος Swap
 CPU	DataSource		ΚΜΕ
 ActivityMonitor	System name		Διαχείριση Εργασιών
+CPU %d	DataSource		ΚΜΕ %d
 Update time interval:	SettingsWindow		Ενημέρωση χρονικού διαστήματος:
 RX	DataSource	Shorter version for Receiving.	ΛΗ
 Settings…	ActivityWindow		Ρυθμίσεις…
@@ -30,6 +31,7 @@ Used memory	DataSource		Χρησιμοποιημένη μνήμη
 %.1f faults/s	DataSource		%.1f σφάλματα/s
 Show legend	ActivityView		Εμφάνιση υπομνήματος
 Cached memory	DataSource		Μνήμη προσωρινής αποθήκευσης
+CPU %d usage	DataSource		Χρήση ΚΜΕ %d
 File	ActivityWindow		Αρχείο
 Ports	DataSource		Θύρες
 Page faults	DataSource		Σφάλματα σελίδας

data/catalogs/apps/autoraise/el.catkeys

@@ -1,25 +1,25 @@
 1	greek, modern (1453-)	x-vnd.mmu.AutoRaise	3527604525
 AutoRaise, (c) 2002, mmu_man\nEnjoy :-)	AutoRaiseIcon		AutoRaise, (c) 2002, mmu_man\nΚαλή διασκέδαση :-)
-2 s	AutoRaiseIcon		2 δ
+2 s	AutoRaiseIcon		2 δευτ.
 OK	AutoRaiseIcon		Εντάξει
 AutoRaise	System name		AutoRaise
-0.2 s	AutoRaiseIcon		0.2 δ
+0.2 s	AutoRaiseIcon		0.2 δευτ.
-1 s	AutoRaiseIcon		1 δ
+1 s	AutoRaiseIcon		1 δευτ.
 Delay	AutoRaiseIcon		Καθυστέρηση
-5 s	AutoRaiseIcon		5 δ
+5 s	AutoRaiseIcon		5 δευτ.
 Active	AutoRaiseIcon		Ενεργό
-0.1 s	AutoRaiseIcon		0.1 δ
+0.1 s	AutoRaiseIcon		0.1 δευτ.
 Default (all windows)	AutoRaiseIcon		Προεπιλογή (όλα τα παράθυρα)
 Instant warping (ffm)	AutoRaiseIcon		Άμεση παραμόρφωση (ffm)
 About AutoRaise…	AutoRaiseIcon		Σχετικά με το AutoRaise…
 Normal	AutoRaiseIcon		Κανονικό
-0.5 s	AutoRaiseIcon		0.5 δ
+0.5 s	AutoRaiseIcon		0.5 δευτ.
 Deskbar only (touch)	AutoRaiseIcon		Μόνο γραμμή εργασιών (αφή)
-4 s	AutoRaiseIcon		4 δ
+4 s	AutoRaiseIcon		4 δευτ.
 Focus follows mouse	AutoRaiseIcon		Να εστιάζεται όποιο παράθυρο δείχνει ο κέρσορας
 Deskbar only (over its area)	AutoRaiseIcon		Μόνο στην Γραμμή Εργασιών (από πάνω)
 Inactive behaviour	AutoRaiseIcon		Ανενεργή συμπεριφορά
 Mode	AutoRaiseIcon		Λειτουργία
 Warping (ffm)	AutoRaiseIcon		Παραμόρφωση (ffm)
 Remove from tray	AutoRaiseIcon		Αφαίρεση από την γραμμή εργασιών
-3 s	AutoRaiseIcon		3 δ
+3 s	AutoRaiseIcon		3 δευτ.

data/catalogs/apps/autoraise/pt_BR.catkeys

@@ -2,7 +2,7 @@
 AutoRaise, (c) 2002, mmu_man\nEnjoy :-)	AutoRaiseIcon		AutoRaise, (c) 2002, mmu_man\nAproveite :-)
 2 s	AutoRaiseIcon		2 s
 OK	AutoRaiseIcon		OK
-AutoRaise	System name		AutoRaise
+AutoRaise	System name		Auto-Elevar
 0.2 s	AutoRaiseIcon		0.2 s
 1 s	AutoRaiseIcon		1 s
 Delay	AutoRaiseIcon		Atraso