Merge branch 'master' into sam460ex

build/jam/Haiku64Image

@@ -6,20 +6,34 @@
 # easily add things to the image as I port them.
 
 
-SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep cal cat catattr
+SYSTEM_BIN = "["
-	checkfs	chgrp chmod chown chroot cksum clear clockconfig cmp
+	addattr alert arp
-	collectcatkeys comm compress copyattr CortexAddOnHost cp csplit cut date
+	base64 basename bash bc beep
-	dd diff diff3 dircolors dirname df du dumpcatalog echo eject env error
+	cal cat catattr checkfs chgrp chmod chown chroot cksum clear clockconfig
-	expand expr factor false find finddir fmt fold fortune ftp gawk gdb gzip
+	cmp collectcatkeys comm compress copyattr CortexAddOnHost cp csplit cut
-	gzexe getlimits groups head hostname id ifconfig <bin>install isvolume
+	date dd diff diff3 dircolors dirname df du dumpcatalog
-	join kernel_debugger kill less lessecho	lesskey link linkcatkeys listdev
+	echo eject env error expand expr
-	ln locale locate logger logname ls makebootable md5sum mimeset mkdir
+	factor false find finddir FirstBootPrompt fmt fold fortune ftp
-	mkfifo mkfs mktemp mount mountvolume mv nl nohup notify nproc od open
+	gawk gdb gzip gzexe getlimits groups
-	paste patch pathchk ping pr printenv printf ps ptx pwd query rc readlink
+	head hostname
-	ReadOnlyBootPrompt rm rmattr rmdir safemode sdiff seq sha1sum shred shuf
+	id ifconfig <bin>install isvolume
-	shutdown sleep sort split stat strace stty su sum sync sysinfo tac tail
+	join
-	tee test timeout touch tr true truncate tsort tty unexpand uname uniq
+	kernel_debugger kill
-	unlink unmount unzip <bin>updatedb waitfor wc wget whoami xargs xres yes
+	less lessecho lesskey link linkcatkeys listdev ln locale locate logger
+	logname ls
+	makebootable md5sum mimeset mkdir mkfifo mkfs mktemp mount mountvolume mv
+	nl nohup notify nproc
+	od open
+	paste patch pathchk ping pr printenv printf ps ptx pwd
+	query
+	rc readlink rm rmattr rmdir
+	safemode sdiff seq sha1sum shred shuf shutdown sleep sort split stat
+	strace stty su sum sync sysinfo
+	tac tail tee test timeout touch tr true truncate tsort tty
+	unexpand uname uniq unlink unmount unzip <bin>updatedb
+	waitfor wc wget whoami
+	xargs xres
+	yes
 	zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit zmore znew
 ;
 

build/jam/HaikuImage

@@ -4,14 +4,16 @@
 
 
 SYSTEM_BIN = [ FFilterByBuildFeatures
-	"[" addattr alert arp base64 basename bash bc beep bfsinfo
+	"["
+	addattr alert arp
+	base64 basename bash bc beep bfsinfo
 	cal cat catattr checkfs checkitout chgrp chmod chop chown chroot cksum clear
 	clockconfig cmp collectcatkeys comm compress copyattr CortexAddOnHost cp
 	csplit cut date dc dd desklink df diff diff3 dircolors dirname
 	diskimage draggers driveinfo dstcheck du dumpcatalog
 	echo eject env error expand expr
-	factor false fdinfo ffm filepanel find finddir fmt fold fortune frcode
+	factor false fdinfo ffm filepanel find finddir FirstBootPrompt fmt fold
-	ftp ftpd funzip fwcontrol
+	fortune frcode ftp ftpd funzip fwcontrol
 	gawk gdb@x86 getlimits groups gzip gzexe
 	hd head hey hostname
 	id ident ifconfig <bin>install installsound iroster isvolume
@@ -27,18 +29,18 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
 	passwd paste patch pathchk pc ping ping6 play playfile playsound playwav
 	pr prio printenv printf profile ps ptx pwd
 	query quit
-	rc readlink ReadOnlyBootPrompt reindex release renice rlog rm rmattr
+	rc readlink reindex release renice rlog rm rmattr rmindex rmdir roster
-	rmindex rmdir roster route
+	route
 	safemode screen_blanker screenmode screenshot sdiff setdecor setmime settype
 	setversion setvolume seq sha1sum shar shred shuf shutdown sleep sort
-	spamdbm
+	spamdbm split stat strace stty su sum sync sysinfo
-	split stat strace stty su sum sync sysinfo
 	tac tail tcpdump tcptester tee telnet telnetd test timeout top touch
 	tput tr traceroute translate trash true truncate tsort tty
-	uname unchop unexpand unmount uniq unlink unrar unshar unzip unzipsfx
+	uname unchop unexpand unmount uniq unlink unshar unzip unzipsfx
 	<bin>updatedb uptime urlwrapper useradd uudecode uuencode
 	vdir version vmstat
-	waitfor watch wc wget whoami writembr@x86 xargs xres yes
+	waitfor watch wc wget whoami writembr@x86 xargs xres
+	yes
 	zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit zmore znew
 ] ;
 
@@ -676,7 +678,7 @@ AddFilesToHaikuImage system add-ons Screen\ Savers
 	: $(SYSTEM_ADD_ONS_SCREENSAVERS) ;
 
 AddFilesToHaikuImage system add-ons disk_systems
-	: <disk_system>intel <disk_system>bfs <disk_system>ntfs ;
+	: <disk_system>intel <disk_system>gpt <disk_system>bfs <disk_system>ntfs ;
 
 # decorators
 AddDirectoryToHaikuImage home config add-ons decorators ;

build/jam/OptionalPackages

@@ -95,6 +95,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
 #	TimGMSoundFont			- a good quality General MIDI Sound Font
 #	TrackerNewTemplates		- template files for Tracker's New menu
 #	Transmission			- a fast, easy, and free BitTorrent Client
+#	UnRAR					- utility to list, test and extract RAR archives
 #	UserlandFS				- aids native file system development (like FUSE)
 #	Vim						- Vi IMproved. Highly configurable text editor
 #	Vision					- powerful native IRC client
@@ -1330,22 +1331,29 @@ if [ IsOptionalHaikuImagePackageAdded ICU-devel ] {
 
 # KeymapSwitcher
 if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
-	if $(TARGET_ARCH) != x86 {
+	if $(TARGET_ARCH) = x86 {
-		Echo "No optional package KeymapSwitcher available for $(TARGET_ARCH)" ;
-	} else {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
 			InstallOptionalHaikuImagePackage
-				KeymapSwitcher-1.2.7-r1a4-x86-gcc4-2012-11-01.zip
+				KeymapSwitcher-1.2.7-x86-gcc4-2013-01-08.zip
-				: $(baseURL)/KeymapSwitcher-1.2.7-r1a4-x86-gcc4-2012-11-01.zip
+				: $(baseURL)/KeymapSwitcher-1.2.7-x86-gcc4-2013-01-08.zip
 				: : : false ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				KeymapSwitcher-1.2.7-r1a4-x86-gcc2-2012-11-01.zip
+				KeymapSwitcher-1.2.7-x86-gcc2-2013-01-08.zip
-				: $(baseURL)/KeymapSwitcher-1.2.7-r1a4-x86-gcc2-2012-11-01.zip
+				: $(baseURL)/KeymapSwitcher-1.2.7-x86-gcc2-2013-01-08.zip
 				: : : false ;
 		}
 		AddSymlinkToHaikuImage home config settings deskbar Preferences
 			: /boot/common/bin/KeymapSwitcher ;
+	} else if $(TARGET_ARCH) = x86_64 {
+		InstallOptionalHaikuImagePackage
+			KeymapSwitcher-1.2.7-x86_64-2013-01-08.zip
+			: $(baseURL)/KeymapSwitcher-1.2.7-x86_64-2013-01-08.zip
+			: : true ;
+		AddSymlinkToHaikuImage home config settings deskbar Preferences
+			: /boot/common/bin/KeymapSwitcher ;
+	} else {
+		Echo "No optional package KeymapSwitcher available for $(TARGET_ARCH)" ;
 	}
 }
 
@@ -2080,6 +2088,31 @@ if [ IsOptionalHaikuImagePackageAdded Transmission ] {
 }
 
 
+# UnRAR
+if [ IsOptionalHaikuImagePackageAdded UnRAR ] {
+	if $(TARGET_ARCH) = x86 {
+		if $(HAIKU_GCC_VERSION[1]) >= 4 {
+			InstallOptionalHaikuImagePackage
+				UnRAR-4.2.4-x86-gcc4-2013-01-21.zip
+				: $(baseURL)/UnRAR-4.2.4-x86-gcc4-2013-01-21.zip
+				: : true ;
+		} else {
+			InstallOptionalHaikuImagePackage
+				UnRAR-4.2.4-x86-gcc2-2013-01-21.zip
+				: $(baseURL)/UnRAR-4.2.4-x86-gcc2-2013-01-21.zip
+				: : true ;
+		}
+	} else if $(TARGET_ARCH) = x86_64 {
+		InstallOptionalHaikuImagePackage
+			UnRAR-4.2.4-x86_64-2013-01-21.zip
+			: $(baseURL)/UnRAR-4.2.4-x86_64-2013-01-21.zip
+			: : true ;
+	} else {
+		Echo "No optional package UnRAR available for $(TARGET_ARCH)" ;
+	}
+}
+
+
 # UserlandFS
 if [ IsOptionalHaikuImagePackageAdded UserlandFS ] {
 	local arch = $(TARGET_ARCH) ;
@@ -2135,9 +2168,7 @@ if [ IsOptionalHaikuImagePackageAdded UserlandFS ] {
 
 # Vim
 if [ IsOptionalHaikuImagePackageAdded Vim ] {
-	if $(TARGET_ARCH) != x86 {
+	if $(TARGET_ARCH) = x86 {
-		Echo "No optional package Vim available for $(TARGET_ARCH)" ;
-	} else {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
 			InstallOptionalHaikuImagePackage vim-7.3-r1a4-x86-gcc4-2012-09-26.zip
 				:  $(baseURL)/vim-7.3-r1a4-x86-gcc4-2012-09-26.zip
@@ -2149,6 +2180,14 @@ if [ IsOptionalHaikuImagePackageAdded Vim ] {
 		}
 		AddSymlinkToHaikuImage home config settings deskbar Applications
 			: /boot/common/bin/gvim ;
+	} else if $(TARGET_ARCH) = x86_64 {
+		InstallOptionalHaikuImagePackage vim-7.3-x86_64-2013-01-19.zip
+			:  $(baseURL)/vim-7.3-x86_64-2013-01-19.zip
+			: : true ;
+		AddSymlinkToHaikuImage home config settings deskbar Applications
+			: /boot/common/bin/gvim ;
+	} else {
+		Echo "No optional package Vim available for $(TARGET_ARCH)" ;
 	}
 }
 

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

@@ -22,6 +22,6 @@ To master	AudioMixer		Az elsődlegesre
 Master output	AudioMixer		Elsődleges kimenet
 Setup	AudioMixer		Beállítás
 Use non linear gain sliders (like BeOS R5)	AudioMixer		Nem lineáris előerősítés csúszkák használata (mint a BeOS R5-ben)
-Gain	AudioMixer		Előerősítés
+Gain	AudioMixer		Erősítés
 Allow output channel remapping	AudioMixer		Kimeneti csatorna újraképezésének az engedélyezése
 Physical input channels	AudioMixer		Fizikai bemeneti csatornák

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

@@ -0,0 +1,34 @@
+1	belarusian	x-vnd.Haiku-hmulti_audio.media_addon	451057402
+Master	MultiAudio		Галоўны
+SPDIF	MultiAudio		SPDIF
+Gain	MultiAudio		Гучнасць
+Output 3D center	MultiAudio		Цэнтр Выхад 3D
+Extended Setup	MultiAudio		Пашыраныя Наладкі
+CD	MultiAudio		CD
+Tone control	MultiAudio		Кіраванне тонам
+Phone	MultiAudio		Тэлефон
+Aux	MultiAudio		Дадатковы
+Output bass	MultiAudio		Выхад басу
+Headphones	MultiAudio		Навушнікі
+Beep	MultiAudio		Званок
+Output mono mix	MultiAudio		Выхад моно мікс
+Output stereo mix	MultiAudio		Выхад стэрэа мікс
+Input	MultiAudio		Уваход
+Output treble	MultiAudio		Выхад высокіх
+Mono mix	MultiAudio		Моно мікс
+General	MultiAudio		Агульны
+Input & Output	MultiAudio		Выхад і Ўваход
+Enhanced Setup	MultiAudio		Спец. Наладкі
+Stereo mix	MultiAudio		Стэрэа мікс
+Output 3D depth	MultiAudio		Выхад глыбіня 3D
+Volume	MultiAudio		Гучнасьць
+Output	MultiAudio		Выхад
+Video	MultiAudio		Відэа
+Line	MultiAudio		Лінія
+Mic	MultiAudio		Мікрафон
+ frequency:	MultiAudio		 частата:
+Enable	MultiAudio		Уключыць
+Mute	MultiAudio		Сцішыць
+Wave	MultiAudio		Хваля
+Setup	MultiAudio		Наладкі
+Level	MultiAudio		Узровень

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

@@ -0,0 +1,34 @@
+1	hungarian	x-vnd.Haiku-hmulti_audio.media_addon	451057402
+Master	MultiAudio		Elsődleges
+SPDIF	MultiAudio		SPDIF
+Gain	MultiAudio		Erősítés
+Output 3D center	MultiAudio		Kimeneti 3D közép
+Extended Setup	MultiAudio		További beállítások
+CD	MultiAudio		CD
+Tone control	MultiAudio		Hangszín vezérlés
+Phone	MultiAudio		Telefon
+Aux	MultiAudio		Aux
+Output bass	MultiAudio		Kimeneti basszus
+Headphones	MultiAudio		Fejhallgató
+Beep	MultiAudio		Csipogó
+Output mono mix	MultiAudio		Kimeneti monó keverő
+Output stereo mix	MultiAudio		Kimeneti sztereó keverő
+Input	MultiAudio		Bemenet
+Output treble	MultiAudio		Kimeneti szólam
+Mono mix	MultiAudio		Monó keverő
+General	MultiAudio		Általános
+Input & Output	MultiAudio		Ki- és bemenet
+Enhanced Setup	MultiAudio		További beállítások
+Stereo mix	MultiAudio		Sztereó keverő
+Output 3D depth	MultiAudio		Kimeneti 3D mélység
+Volume	MultiAudio		Hangerő
+Output	MultiAudio		Kimenet
+Video	MultiAudio		Videó
+Line	MultiAudio		Vonalbemenet
+Mic	MultiAudio		Mikrofon
+ frequency:	MultiAudio		 frekvencia:
+Enable	MultiAudio		Engedélyezés
+Mute	MultiAudio		Némítás
+Wave	MultiAudio		Hanghullám
+Setup	MultiAudio		Beállítás
+Level	MultiAudio		Szint

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

@@ -0,0 +1,28 @@
+1	japanese	x-vnd.Haiku-hmulti_audio.media_addon	342589902
+Master	MultiAudio		マスター
+SPDIF	MultiAudio		SPDIF
+Gain	MultiAudio		ゲイン
+Extended Setup	MultiAudio		高度な設定
+CD	MultiAudio		CD
+Tone control	MultiAudio		音質調整
+Phone	MultiAudio		電話
+Aux	MultiAudio		Aux
+Headphones	MultiAudio		ヘッドフォン
+Beep	MultiAudio		ビープ音
+Input	MultiAudio		入力
+Mono mix	MultiAudio		モノラルミックス
+General	MultiAudio		一般
+Input & Output	MultiAudio		入出力
+Enhanced Setup	MultiAudio		高度なセットアップ
+Stereo mix	MultiAudio		ステレオミックス
+Volume	MultiAudio		音量
+Output	MultiAudio		出力
+Video	MultiAudio		ビデオ
+Line	MultiAudio		ライン
+Mic	MultiAudio		マイク
+ frequency:	MultiAudio		周波数:
+Enable	MultiAudio		有効にする
+Mute	MultiAudio		ミュート
+Wave	MultiAudio		Wave
+Setup	MultiAudio		セットアップ
+Level	MultiAudio		レベル

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

@@ -0,0 +1,34 @@
+1	portuguese (brazil)	x-vnd.Haiku-hmulti_audio.media_addon	451057402
+Master	MultiAudio		Mestre
+SPDIF	MultiAudio		SPDIF
+Gain	MultiAudio		Ganho
+Output 3D center	MultiAudio		Centro da saída 3D
+Extended Setup	MultiAudio		Configuração adicional
+CD	MultiAudio		CD
+Tone control	MultiAudio		Controle de tonalidade
+Phone	MultiAudio		Fone
+Aux	MultiAudio		Aux
+Output bass	MultiAudio		Saída do baixo
+Headphones	MultiAudio		Fones de ouvido
+Beep	MultiAudio		Bip
+Output mono mix	MultiAudio		Misturador da saída mono
+Output stereo mix	MultiAudio		Misturador da saída estéreo
+Input	MultiAudio		Entrada
+Output treble	MultiAudio		Saída de agudos
+Mono mix	MultiAudio		Misturador mono
+General	MultiAudio		Geral
+Input & Output	MultiAudio		Entrada e Saída
+Enhanced Setup	MultiAudio		Configuração Avançada
+Stereo mix	MultiAudio		Misturador estéreo
+Output 3D depth	MultiAudio		Profundidade de saída 3D
+Volume	MultiAudio		Volume
+Output	MultiAudio		Saída
+Video	MultiAudio		Vídeo
+Line	MultiAudio		Linha
+Mic	MultiAudio		Microfone
+ frequency:	MultiAudio		frequência:
+Enable	MultiAudio		Habilitar
+Mute	MultiAudio		Mudo
+Wave	MultiAudio		Onda
+Setup	MultiAudio		Configurar
+Level	MultiAudio		Nível

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

@@ -0,0 +1,34 @@
+1	swedish	x-vnd.Haiku-hmulti_audio.media_addon	451057402
+Master	MultiAudio		Master
+SPDIF	MultiAudio		SPDIF
+Gain	MultiAudio		Förstärk
+Output 3D center	MultiAudio		Utgång 3D center
+Extended Setup	MultiAudio		Utökad inställning
+CD	MultiAudio		CD
+Tone control	MultiAudio		Ton kontroll
+Phone	MultiAudio		Telefon
+Aux	MultiAudio		Aux
+Output bass	MultiAudio		Utgångsbas
+Headphones	MultiAudio		Hörlurar
+Beep	MultiAudio		Ljudsignal
+Output mono mix	MultiAudio		Utgång mono mix
+Output stereo mix	MultiAudio		Utgång stereo mix
+Input	MultiAudio		Ingång
+Output treble	MultiAudio		Utgång tredubbel
+Mono mix	MultiAudio		Monomix
+General	MultiAudio		Allmän
+Input & Output	MultiAudio		Ingång & Utgång
+Enhanced Setup	MultiAudio		Avancerad Inställning
+Stereo mix	MultiAudio		Stereomix
+Output 3D depth	MultiAudio		Utgång 3D djup
+Volume	MultiAudio		Volym
+Output	MultiAudio		Utgång
+Video	MultiAudio		Video
+Line	MultiAudio		Linje
+Mic	MultiAudio		Mic
+ frequency:	MultiAudio		 frekvens:
+Enable	MultiAudio		Aktivera
+Mute	MultiAudio		Tyst
+Wave	MultiAudio		Våg
+Setup	MultiAudio		Inställningar
+Level	MultiAudio		Nivå

data/catalogs/add-ons/translators/icns/sv.catkeys

@@ -0,0 +1,5 @@
+1	swedish	x-vnd.Haiku-ICNSTranslator	2416672857
+Version %d.%d.%d, %s	ICNSConfig		Version %d.%d.%d, %s
+Apple icons	ICNSTranslator		Appleikoner
+Apple icon translator	ICNSTranslator		Översättning av Appleikoner
+Apple icon translator	ICNSConfig		Översättning av Appleikoner

data/catalogs/apps/diskusage/sv.catkeys

@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Haiku-DiskUsage	274830116
+1	swedish	x-vnd.Haiku-DiskUsage	3631077986
 Scanning %refName%	Scanner		Skannar %refName%
 Size	Info Window		Storlek
 Rescan	Pie View		Skanna om
@@ -11,12 +11,14 @@ Scan	Status View		Skanna
 9999.99 GB	Status View		9999.99 GB
 Rescan	Status View		Skanna om
 file unavailable	Status View		fil ej tillgänglig
+Get info	Pie View		Hämta information
 DiskUsage	System name		DiskAnvändning
  in %d files	Info Window		 i %d filer
 %d files	Status View		%d filer
 Created	Info Window		Skapad
 Modified	Info Window		Modifierad
 Abort	Status View		Avbryt
+Open with	Pie View		Öppna med
 Open	Pie View		Öppna
 %a, %d %b %Y, %r	Info Window		%a, %d %b %Y, %r
 Free on %refName%	Scanner		Ledigt på %refName%

data/catalogs/apps/drivesetup/hu.catkeys

@@ -1,4 +1,4 @@
-1	hungarian	x-vnd.Haiku-DriveSetup	1372142450
+1	hungarian	x-vnd.Haiku-DriveSetup	1387045579
 DriveSetup	System name		Lemezkezelő
 Delete	MainWindow		Törlés
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so!	MainWindow		Biztosan jóváhagyja az adatok felírását a lemezre?\n\nEz esetben a partíció teljes tartalma visszavonhatatlanul meg fog semmisülni.
@@ -46,6 +46,7 @@ The disk has been successfully initialized.\n	MainWindow		A partíció (%s) hiba
 Could not unmount partition %s.	MainWindow		Nem lehet leválasztani a partíciót (%s).
 Failed to format the partition %s!\n	MainWindow		Nem sikerült előkészíteni a partíciót: „%s”.\n
 Mount	MainWindow		Csatol
+Partition type	PartitionList		Partíció típusa:
 Create	CreateParamsPanel		Létrehoz
 Are you sure you want to format a raw disk? (most people initialize the disk with a partitioning system first) You will be asked again before changes are written to the disk.	MainWindow		Biztosan formázni szeretné a nyers lemezt? (A legtöbb esetben elő szokták készíteni a lemezt formázás előtt.) Ezt még egyszer meg kell majd erősítenie.
 Device	PartitionList		Eszköz

data/catalogs/apps/expander/ru.catkeys

@@ -1,4 +1,4 @@
-1	russian	x-vnd.Haiku-Expander	1269216169
+1	russian	x-vnd.Haiku-Expander	2603318510
 Expand	ExpanderMenu		Распаковать
 Close window when done expanding	ExpanderPreferences		Закрывать окно после распаковки
 Set destination…	ExpanderMenu		Путь назначения для извлечения…
@@ -33,6 +33,8 @@ Show contents	ExpanderWindow		Показать содержимое
 Automatically show contents listing	ExpanderPreferences		Автоматически отображать содержимое архива
 OK	ExpanderPreferences		ОК
 Leave destination folder path empty	ExpanderPreferences		Оставить путь назначения пустым
+Failed to create the destination folder.	ExpanderWindow		Не удалось создать папку назначения.
+Create	ExpanderWindow		Создать
 The folder was either moved, renamed or not\nsupported.	ExpanderWindow		Папка была перемещена, переименована либо не\nподдерживается.
 The file doesn't exist	ExpanderWindow		Файл не существует
 Stop	ExpanderMenu		Остановить

data/catalogs/apps/firstbootprompt/be.catkeys

@@ -0,0 +1,8 @@
+1	belarusian	x-vnd.Haiku-FirstBootPrompt	2544294242
+Custom	BootPromptWindow		Карыстальніка
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	Мы дзякуем вас за спробу усталяваць Haiku. Спадзяемся, што вам спадабаецца!\n\nВы можаце абраць пажаданую мову інтэрфейса і раскладку клавіятуры ў левым спісе. Гэтыя параметры таксма могуць быць змененыя пазней.\n\nЖадаеце запусціць Усталёўшчык ці загрузіць Дэсктоп?\n
+Desktop (Live-CD)	BootPromptWindow		Дэсктоп (Live-CD)
+Language	BootPromptWindow		Мова
+Welcome to Haiku!	BootPromptWindow		Вітаем!
+Run Installer	BootPromptWindow		Запусціць Усталёўшчык
+Keymap	BootPromptWindow		Расклад клавіятуры

data/catalogs/apps/firstbootprompt/cs.catkeys

@@ -1,4 +1,4 @@
-1	czech	x-vnd.Haiku-ReadOnlyBootPrompt	1972532432
+1	czech	x-vnd.Haiku-FirstBootPrompt	1972532432
 Desktop (Live-CD)	BootPromptWindow		Plocha (Live-CD)
 Keymap	BootPromptWindow		Rozložení klávesnice
 Language	BootPromptWindow		Jazyk

data/catalogs/apps/firstbootprompt/da.catkeys

@@ -1,4 +1,4 @@
-1	danish	x-vnd.Haiku-ReadOnlyBootPrompt	1972532432
+1	danish	x-vnd.Haiku-FirstBootPrompt	1972532432
 Desktop (Live-CD)	BootPromptWindow		Skrivebord (Live-CD)
 Keymap	BootPromptWindow		Tastatur layout
 Language	BootPromptWindow		Sprog

data/catalogs/apps/firstbootprompt/de.catkeys

@@ -0,0 +1,8 @@
+1	german	x-vnd.Haiku-FirstBootPrompt	2544294242
+Custom	BootPromptWindow		Benutzerdefiniert
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	Danke für das Interesse an Haiku!\n\nAus der nebenstehenden Liste können Sprache und Tastaturlayout gewählt werden. Die Einstellungen werden sofort verwendet, lassen sich aber jederzeit im laufenden System ändern.\n\nSoll die Installation gestartet werden oder soll weiter zum Desktop gebootet werden?\n\nDie Übersetzung der Haiku-Anwendungen und anderer Komponenten ist noch nicht abgeschlossen. Wer auf nicht übersetzte Texte stößt und bei der Arbeit helfen möchte, findet dazu weitere Informationen auf der Webseite <www.haiku-os.org>.
+Desktop (Live-CD)	BootPromptWindow		Desktop (Live-CD)
+Language	BootPromptWindow		Sprache
+Welcome to Haiku!	BootPromptWindow		Willkommen bei Haiku!
+Run Installer	BootPromptWindow		Installer starten
+Keymap	BootPromptWindow		Tastaturschema

data/catalogs/apps/firstbootprompt/el.catkeys

@@ -0,0 +1,8 @@
+1	greek, modern (1453-)	x-vnd.Haiku-FirstBootPrompt	2544294242
+Custom	BootPromptWindow		Προσαρμοσμένο
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	Ευχαριστούμε που δοκιμάζετε το Haiku! Ευχόμαστε να σας αρέσει!\n\nΜπορείτε να επιλέξετε τον επιθυμιτή γλώσσα σας και τη διάταξη πληκτρολογίου από τη λίστα στα αριστερά που θα χρησιμοποιείται έπειτα στιγμιαία. Μπορείτε εύκολα να αλλάξετε και τις ρυθμίσεις για την επιφάνεια εργασίας.\n\nΘέλετε να εκτελέσετε τον Εγκαταστάση ή να συνεχίσετε την εκκίνηση στην επιφάνεια εργασίας;\nΣημείωση: Για τις υπόλοιπες γλώσσες, πρoστίθεται μια ενημέρωση:\"Σημείωση: Η μετάφραση των εφαρμογών του Haiku και άλλων περιεχομένων χρειάζεται ακόμη προσπάθεια.. Θα βρείτε συχνά τμήματα χωρίς μετάφραση, αλλά εαν θέλετε μπορείτε να συνεισφέρετε σε αυτή τη δουλεία στο <www.haiku-os.org>.\"
+Desktop (Live-CD)	BootPromptWindow		Επιφάνεια εργασίας (Live-CD)
+Language	BootPromptWindow		Γλώσσα
+Welcome to Haiku!	BootPromptWindow		Καλώς ήλθατε στο Haiku!
+Run Installer	BootPromptWindow		Έναρξη Εγκατάστασης
+Keymap	BootPromptWindow		Διάταξη πληκτρολογίου

data/catalogs/apps/firstbootprompt/eo.catkeys

@@ -1,4 +1,4 @@
-1	esperanto	x-vnd.Haiku-ReadOnlyBootPrompt	1972532432
+1	esperanto	x-vnd.Haiku-FirstBootPrompt	1972532432
 Desktop (Live-CD)	BootPromptWindow		Labortablo (Viva Lumdisko)
 Keymap	BootPromptWindow		Klavara aranĝo
 Language	BootPromptWindow		Lingvo

data/catalogs/apps/firstbootprompt/es.catkeys

@@ -1,4 +1,4 @@
-1	spanish	x-vnd.Haiku-ReadOnlyBootPrompt	1972532432
+1	spanish	x-vnd.Haiku-FirstBootPrompt	1972532432
 Desktop (Live-CD)	BootPromptWindow		Escritorio (Live-CD)
 Keymap	BootPromptWindow		Distribución de teclado
 Language	BootPromptWindow		Idioma

data/catalogs/apps/firstbootprompt/fi.catkeys

@@ -0,0 +1,8 @@
+1	finnish	x-vnd.Haiku-FirstBootPrompt	2544294242
+Custom	BootPromptWindow		Oma
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	Kiitoksia siitä, että kokeilet Haikua! Toivomme, että pidät siitä!\n\nVoit valita ensisijaisen kielen ja näppäimistöasetuksen vasemmalla näkyvästä luettelosta. Asetukset otetaan käyttöön välittömästi. Voit helposti vaihtaa molempia asetuksia myöhemmin työpöydältäsi.\n\nHaluatko suorittaa asennusohjelman tai jatkaa alkulautausta työpöydälle?\n Huomaa: Ponnistelemme edelleen Haiku-sovellusten ja muiden komponenttien kotoistamiseksi. Kohtaat usein suomentamattomia merkkijonoja, mutta jos haluat, voit liittyä työhön osoitteessa <www.haiku-os.org>.
+Desktop (Live-CD)	BootPromptWindow		Työpöytä (Live-CD)
+Language	BootPromptWindow		Kieli
+Welcome to Haiku!	BootPromptWindow		Tervetuloa Haikuun!
+Run Installer	BootPromptWindow		Suorita asennusohjelma
+Keymap	BootPromptWindow		Näppäinkartta

data/catalogs/apps/firstbootprompt/fr.catkeys

@@ -0,0 +1,8 @@
+1	french	x-vnd.Haiku-FirstBootPrompt	2544294242
+Custom	BootPromptWindow		Personnalisé
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	Merci d'essayer Haiku ! Nous espérons que vous l'aimerez !\n\nVeuillez choisir votre clavier et votre langue préférés dans la liste à gauche. Ils seront pris en compte instantanément. Plus tard, vous pourrez facilement modifier à la volée ces deux réglages à partir du bureau.\n\nVoulez-vous exécuter le programme d'installation ou continuer le démarrage du bureau ?\n\nNote : La traduction des applications et des autres parties d'Haiku n'est pas terminée. Vous trouverez souvent des phrases non traduites, mais si vous le souhaitez, vous pouvez apporter votre contribution sur <www.haiku-os.org>.\n
+Desktop (Live-CD)	BootPromptWindow		Bureau (CD Live)
+Language	BootPromptWindow		Langue
+Welcome to Haiku!	BootPromptWindow		Bienvenue dans Haiku !
+Run Installer	BootPromptWindow		Lancer l'installeur
+Keymap	BootPromptWindow		Disposition du clavier

data/catalogs/apps/firstbootprompt/hi.catkeys

@@ -0,0 +1,8 @@
+1	hindi	x-vnd.Haiku-FirstBootPrompt	2544294242
+Custom	BootPromptWindow		कस्टम
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	धन्यवाद हाइकु को इस्तमाल करने के लिए! हम आशा करते हैं की आप को यह पसंद आया होगा!\n\nआप अपने मनपसंद भाषा और कीबोर्ड लेयाओउट चुन सकते है लिस्ट में से. आप बाद में दोंनो चीज़ बदल सकते है डेस्कटॉप पर से.\n\nक्या आप इंस्टॉलर रन करना चाहेंगे या फिर डेस्कटॉप को बूट करना जारी रखना चाहेंगे?\n
+Desktop (Live-CD)	BootPromptWindow		डेस्कटॉप (लाइव सीडी)
+Language	BootPromptWindow		भाषा
+Welcome to Haiku!	BootPromptWindow		हाइकू में आपका स्वागत है!
+Run Installer	BootPromptWindow		इंस्टॉलर चलाएँ
+Keymap	BootPromptWindow		कीमैप

data/catalogs/apps/firstbootprompt/hr.catkeys

@@ -1,4 +1,4 @@
-1	croatian	x-vnd.Haiku-ReadOnlyBootPrompt	2686989872
+1	croatian	x-vnd.Haiku-FirstBootPrompt	2686989872
 Custom	BootPromptWindow		Prilagođeno
 Desktop (Live-CD)	BootPromptWindow		Desktop (Live-CD)
 Keymap	BootPromptWindow		Tipkovnica

data/catalogs/apps/firstbootprompt/hu.catkeys

@@ -0,0 +1,8 @@
+1	hungarian	x-vnd.Haiku-FirstBootPrompt	2649051796
+Custom	BootPromptWindow		Egyéni
+Boot to Desktop	BootPromptWindow		Az Asztalt
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	Köszönjük, hogy kipróbálja a Haiku-t, reméljük, meg lesz vele elégedve!\n\nA bal oldali listából kiválasztva a nyelvet a felület nyelve és a billentyűzetkiosztás automatikusan beállításra kerül. A későbbiekben ez bármikor módosítható a beállításoknál.\n\nMegjegyzés: a Haiku-t önkéntesek fordítják, így megeshet, hogy valami angolul jelenik meg. Ha Ön is részt szeretne venni a fordításban, akkor csatlakozhat a fordítókhoz a <www.haiku-os.org> oldalon.\n\nA Telepítőt, vagy inkább az Asztalt indítsuk most el?\n
+Language	BootPromptWindow		Nyelv
+Welcome to Haiku!	BootPromptWindow		A Haiku üdvözli Önt!
+Run Installer	BootPromptWindow		A Telepítót
+Keymap	BootPromptWindow		Billentyűzetkiosztás

data/catalogs/apps/firstbootprompt/it.catkeys

@@ -1,4 +1,4 @@
-1	italian	x-vnd.Haiku-ReadOnlyBootPrompt	1972532432
+1	italian	x-vnd.Haiku-FirstBootPrompt	1972532432
 Desktop (Live-CD)	BootPromptWindow		Desktop (Live-CD)
 Keymap	BootPromptWindow		Keymap
 Language	BootPromptWindow		Lingua

data/catalogs/apps/firstbootprompt/ja.catkeys

@@ -0,0 +1,8 @@
+1	japanese	x-vnd.Haiku-FirstBootPrompt	2649051796
+Custom	BootPromptWindow		カスタム
+Boot to Desktop	BootPromptWindow		デスクトップを起動
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	Haikuを試用していただきありがとうございます。Haikuのことを気に入っていただければ幸いです。\n\n左のリストからご希望の言語とキーマップの選択がすぐできます。あとで、デスクトップからこれらの設定をすぐに簡単に変更できます。\n\nインストーラーを実行しますか、それともデスクトップの起動を続行しますか?\n
+Language	BootPromptWindow		言語
+Welcome to Haiku!	BootPromptWindow		Haikuへようこそ!
+Run Installer	BootPromptWindow		インストーラーを実行
+Keymap	BootPromptWindow		キーマップ

data/catalogs/apps/firstbootprompt/ko.catkeys

@@ -1,4 +1,4 @@
-1	korean	x-vnd.Haiku-ReadOnlyBootPrompt	1972532432
+1	korean	x-vnd.Haiku-FirstBootPrompt	1972532432
 Desktop (Live-CD)	BootPromptWindow		데스크탑 (라이브 시디)
 Keymap	BootPromptWindow		키보드배열
 Language	BootPromptWindow		언어

data/catalogs/apps/firstbootprompt/lt.catkeys

@@ -0,0 +1,8 @@
+1	lithuanian	x-vnd.Haiku-FirstBootPrompt	2544294242
+Custom	BootPromptWindow		Pasirinktinė
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	Dėkojame, kad nusprendėte išbandyti „Haiku“! Mes tikimės, kad ši operacinė sistema Jums patiks!\n\nIš sąrašo kairėje galite išsirinkti norimą kalbą ir klaviatūros išdėstymą – šių nuostatų pakeitimai bus iškart pritaikyti. Taip pat lengvai jas galėsite pasikeisti ir vėliau, jau naudodamiesi sistema.\n\nAr norite paleisti įdiegimo programą, ar išbandyti „Haiku“ aplinką, ją paleidžiant tiesiai iš šios laikmenos?
+Desktop (Live-CD)	BootPromptWindow		Išbandyti „Haiku“
+Language	BootPromptWindow		Kalba
+Welcome to Haiku!	BootPromptWindow		Sveiki, čia – „Haiku“!
+Run Installer	BootPromptWindow		Paleisti įdiegimo programą
+Keymap	BootPromptWindow		Klaviatūros išdėstymas

data/catalogs/apps/firstbootprompt/nb.catkeys

@@ -0,0 +1,8 @@
+1	bokmål, norwegian; norwegian bokmål	x-vnd.Haiku-FirstBootPrompt	2544294242
+Custom	BootPromptWindow		Tilpasset
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	Takk for at du prøver ut Haiku! Vi håper du vil like det!\n\nDu kan velge hvilket språk du foretrekker og tastaturoppsett fra sliten til venstre, som så vil bli tatt i bruk umiddelbart. Du kan enkelt endre begge innstillingne fra skrivebordet senere.\n\nØnsker du å kjøre installasjonsprogrammet, eller fortsette oppstartsprosessen fra CD-en?\n
+Desktop (Live-CD)	BootPromptWindow		Skrivebord (Live-CD)
+Language	BootPromptWindow		Språk
+Welcome to Haiku!	BootPromptWindow		Velkommen til Haiku!
+Run Installer	BootPromptWindow		Kjør installeringsprogram
+Keymap	BootPromptWindow		Tastaturspråk

data/catalogs/apps/firstbootprompt/nl.catkeys

@@ -0,0 +1,8 @@
+1	dutch; flemish	x-vnd.Haiku-FirstBootPrompt	2544294242
+Custom	BootPromptWindow		Aangepast
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	Bedankt om Haiku uit te proberen! We hopen dat Haiku u bevalt!\n\nU kunt uw voorkeurstaal en -toetsenbordindeling kiezen uit de lijst, waarna deze onmiddellijk gebruikt zullen worden. U kunt beide instellingen later eenvoudig wijzigen vanaf het bureaublad.\n\nWenst u het installatieprogramma uit te voeren of verder op te starten naar het bureaublad?
+Desktop (Live-CD)	BootPromptWindow		Bureaublad (Live-CD)
+Language	BootPromptWindow		Taal
+Welcome to Haiku!	BootPromptWindow		Welkom bij Haiku!
+Run Installer	BootPromptWindow		Activeer Installer
+Keymap	BootPromptWindow		Toetsenbordindeling

data/catalogs/apps/firstbootprompt/pl.catkeys

@@ -0,0 +1,8 @@
+1	polish	x-vnd.Haiku-FirstBootPrompt	2544294242
+Custom	BootPromptWindow		Własne
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	Dziękujemy za wypróbowanie Haiku! Mamy nadzieję, że Ci się spodoba!\n\nMożesz wybrać swój język i układ klawiatury z listy po lewej stronie, które to zostaną następnie użyte. Możesz później łatwo zmienić oba ustawienia w ustawieniach Pulpitu.\n\nChcesz od razu przejść do instalatora, czy może kontynuować rozruch do Pulpitu?\n
+Desktop (Live-CD)	BootPromptWindow		Pulpit (Live-CD)
+Language	BootPromptWindow		Język
+Welcome to Haiku!	BootPromptWindow		Witaj w Haiku!
+Run Installer	BootPromptWindow		Uruchom instalator
+Keymap	BootPromptWindow		Układ klawiatury

data/catalogs/apps/firstbootprompt/pt.catkeys

@@ -1,4 +1,4 @@
-1	portuguese	x-vnd.Haiku-ReadOnlyBootPrompt	1972532432
+1	portuguese	x-vnd.Haiku-FirstBootPrompt	1972532432
 Desktop (Live-CD)	BootPromptWindow		Desktop (Live-CD)
 Keymap	BootPromptWindow		Esquema de teclado
 Language	BootPromptWindow		Idioma

data/catalogs/apps/firstbootprompt/pt_BR.catkeys

@@ -0,0 +1,8 @@
+1	portuguese (brazil)	x-vnd.Haiku-FirstBootPrompt	2649051796
+Custom	BootPromptWindow		Personalizado
+Boot to Desktop	BootPromptWindow		Inicializar a Área de Trabalho
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	Obrigado por experimentar o Haiku! Esperamos que goste dele!\n\nVocê pode selecionar seu idioma preferido e disposição de teclado a partir da lista à esquerda, os quais serão utilizados imediatamente. Você pode facilmente alterar ambas as definições a partir da Área de Trabalho mais tarde rapidamente.\n\nDeseja executar o Instalador ou continuar inicializando a Área de Trabalho?\n 
+Language	BootPromptWindow		Idioma
+Welcome to Haiku!	BootPromptWindow		Bem-vindo ao Haiku!
+Run Installer	BootPromptWindow		Executar o Instalador
+Keymap	BootPromptWindow		Mapa do teclado

data/catalogs/apps/firstbootprompt/pt_br.catkeys

@@ -1,4 +1,4 @@
-1	brazilian_portuguese	x-vnd.Haiku-ReadOnlyBootPrompt	988630706
+1	brazilian_portuguese	x-vnd.Haiku-FirstBootPrompt	988630706
 Custom	BootPromptWindow		Personalizado
 Keymap	BootPromptWindow		Mapa de Teclas
 Language	BootPromptWindow		Linguagem

data/catalogs/apps/firstbootprompt/ro.catkeys

@@ -0,0 +1,8 @@
+1	romanian	x-vnd.Haiku-FirstBootPrompt	2544294242
+Custom	BootPromptWindow		Personalizat
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	Vă mulțumim că ați încercat Haiku! Sperăm că o să vă placă!\n\nPuteți să selectați limba preferată și aranjamentul de tastatură din lista din stânga care vor fi apoi utilizate automat. Puteți să schimbați ușor mai târziu cele două configurări de pe Desktop.\n\nDoriți să rulați Programul de instalare sau continuați să porniți sistemul?\nNotă: Localizarea aplicațiilor Haiku și a altor componente este un efort susținut. Veți întâlni frecvent șiruri netraduse, dar dacă doriți, puteți să vă implicați în muncă la <www.haiku-os.org>
+Desktop (Live-CD)	BootPromptWindow		Birou (Live-CD)
+Language	BootPromptWindow		Limbaj
+Welcome to Haiku!	BootPromptWindow		Bun venit în Haiku!
+Run Installer	BootPromptWindow		Rulează Instalator
+Keymap	BootPromptWindow		Hartă de taste

data/catalogs/apps/firstbootprompt/ru.catkeys

@@ -0,0 +1,8 @@
+1	russian	x-vnd.Haiku-FirstBootPrompt	2544294242
+Custom	BootPromptWindow		Пользовательская
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	Большое спасибо за то, что решили попробовать Haiku.\nМы очень надеемся, что она вам понравится!\n\nИз списка слева вы можете выбрать предпочитаемый язык и клавиатурную раскладку, которые активируются немедленно. Вы легко сможете изменить эти настройки после запуска рабочего стола без перезагрузки.\n\nВы хотите запустить Установщик или продолжить загрузку рабочего стола?\n
+Desktop (Live-CD)	BootPromptWindow		Рабочий стол (Live-CD)
+Language	BootPromptWindow		Язык
+Welcome to Haiku!	BootPromptWindow		Добро пожаловать в Haiku!
+Run Installer	BootPromptWindow		Запустить Установщик
+Keymap	BootPromptWindow		Раскладка клавиатуры

data/catalogs/apps/firstbootprompt/sk.catkeys

@@ -0,0 +1,8 @@
+1	slovak	x-vnd.Haiku-FirstBootPrompt	2544294242
+Custom	BootPromptWindow		Vlastná
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	Ďakujeme, že skúšate Haiku! Dúfame, že sa vám bude páčiť!\n\nZo zoznamu vľavo môžete vybrať váš preferovaný jazyk a rozloženie klávesnice, ktoré sa ihneď použije. Obe nastavenia môžete neskôr jednoducho za behu zmeniť z pracovného prostredia.\n\nChcete spustiť inštalátor alebo pokračovať v zavedení pracovného prostredia?\n
+Desktop (Live-CD)	BootPromptWindow		Pracovné prostredie (živé CD)
+Language	BootPromptWindow		Jazyk
+Welcome to Haiku!	BootPromptWindow		Vitajte v Haiku!
+Run Installer	BootPromptWindow		Spustiť inštalátor
+Keymap	BootPromptWindow		Mapa klávesov

data/catalogs/apps/firstbootprompt/sv.catkeys

@@ -0,0 +1,8 @@
+1	swedish	x-vnd.Haiku-FirstBootPrompt	2649051796
+Custom	BootPromptWindow		Anpassad
+Boot to Desktop	BootPromptWindow		Boota till Skrivbordet
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	Tack för att du testar Haiku! Vi hoppas att du kommer att gilla det!\n \nDu kan ändra till det språk och tangentbordslayout du vill ha från listan till vänster. Valet kommer att gälla direkt. Du kan senare ändra båda inställningarna från skrivbordet\n\nVill du köra installationen eller fortsätta till skrivbordet?\nNotering: Översättning av Haiku till Svenska är något vi arbetar med regelbundet. Du kommer att träffa på delar som inte är översatta. Vill du hjälpa till kan du kontakta oss på <www.haiku-os.org>.\
+Language	BootPromptWindow		Språk
+Welcome to Haiku!	BootPromptWindow		Välkommen till Haiku!
+Run Installer	BootPromptWindow		Kör Installationen
+Keymap	BootPromptWindow		Tangentkarta

data/catalogs/apps/firstbootprompt/uk.catkeys

@@ -0,0 +1,8 @@
+1	ukrainian	x-vnd.Haiku-FirstBootPrompt	2544294242
+Custom	BootPromptWindow		Задане
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	Дякуємо за ваше зацікавлення Haiku. Ми надіємося що вона Вам сподобається!\n\nВи  можете вибрати бажану мову і розкладку клавіатури зі списку зліва при використанні. Ви можете просто змінити обидві настройки Робочого столу на льоту .\n\nDo you wish to run the Installer or continue booting to the Desktop?\n
+Desktop (Live-CD)	BootPromptWindow		Робочий стіл (Live-CD)
+Language	BootPromptWindow		Мова
+Welcome to Haiku!	BootPromptWindow		Ласкаво просимо в Haiku!
+Run Installer	BootPromptWindow		Виконати встановлення
+Keymap	BootPromptWindow		Розкладка

data/catalogs/apps/firstbootprompt/zh-Hans.catkeys

@@ -1,4 +1,4 @@
-1	english	x-vnd.Haiku-ReadOnlyBootPrompt	2544294242
+1	english	x-vnd.Haiku-FirstBootPrompt	2544294242
 Custom	BootPromptWindow		自定义
 Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	欢迎使用 Haiku！希望喜欢它！\n\n您可以从左边的列表中选择首选语言和键盘类型，它们将马上启用。您可以在进入桌面之后进行修改。\n\n您希望运行系统安装器，还是继续引导进入桌面？
 Desktop (Live-CD)	BootPromptWindow		桌面系统 (Live-CD)

data/catalogs/apps/firstbootprompt/zh_Hans.catkeys

@@ -0,0 +1,8 @@
+1	english	x-vnd.Haiku-FirstBootPrompt	2544294242
+Custom	BootPromptWindow		自定义
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	欢迎使用 Haiku！希望喜欢它！\n\n您可以从左边的列表中选择首选语言和键盘类型，它们将马上启用。您可以在进入桌面之后进行修改。\n\n您希望运行系统安装器，还是继续引导进入桌面？
+Desktop (Live-CD)	BootPromptWindow		桌面系统 (Live-CD)
+Language	BootPromptWindow		语言
+Welcome to Haiku!	BootPromptWindow		欢迎使用 Haiku!
+Run Installer	BootPromptWindow		运行系统安装器
+Keymap	BootPromptWindow		键盘映射

data/catalogs/apps/icon-o-matic/ru.catkeys

@@ -1,4 +1,4 @@
-1	russian	x-vnd.haiku-icon_o_matic	3069426771
+1	russian	x-vnd.haiku-icon_o_matic	3933520036
 Select All	Icon-O-Matic-PathManipulator		Выделить всё
 Add Style	Icon-O-Matic-AddStylesCmd		Добавить стиль
 Color (#%02x%02x%02x)	Style name after dropping a color		Цвет (#%02x%02x%02x)
@@ -43,6 +43,7 @@ Untitled	Icon-O-Matic-Main		Новый значок
 Multi Set 	Multi Set (property name)		Множество 
 any of the other lists to	Empty property list - 2nd line		любом другом списке для того,
 Save as…	Icon-O-Matic-Menu-File		Сохранить как…
+Don't save	Icon-O-Matic-Menu-Settings		Не сохранять
 Change Color	Icon-O-Matic-SetColorCmd		Изменить цвет
 Style	Icon-O-Matic-Menus		Стиль
 <modify path>	Icon-O-Matic-PathCmd		<изменить путь>
@@ -72,6 +73,7 @@ Undo	Icon-O-Matic-Main		Отменить
 Click on a shape above	Empty transformers list - 1st line		Нажмите на форму выше
 Add Shape	Icon-O-Matic-AddShapesCmd		Добавить форму
 Contour	Transformation		Обводка
+Save changes to current icon before closing?	Icon-O-Matic-Menu-Settings		Сохранить изменения теущего значка перед закрытием?
 <nothing to redo>	Icon-O-Matic-Menu-Edit		<нечего возвращать>
 Perspective	Transformation		Перспектива
 Move Transformer	Icon-O-Matic-MoveTransformersCmd		Переместить трансформатор

data/catalogs/apps/icon-o-matic/sv.catkeys

@@ -1,4 +1,4 @@
-1	swedish	x-vnd.haiku-icon_o_matic	3069426771
+1	swedish	x-vnd.haiku-icon_o_matic	3933520036
 Select All	Icon-O-Matic-PathManipulator		Markera allt
 Add Style	Icon-O-Matic-AddStylesCmd		Lägg till stil
 Color (#%02x%02x%02x)	Style name after dropping a color		Färg (#%02x%02x%02x)
@@ -43,6 +43,7 @@ Untitled	Icon-O-Matic-Main		Namnlös
 Multi Set 	Multi Set (property name)		Mängduppsättning
 any of the other lists to	Empty property list - 2nd line		någon av dom andra listorna till
 Save as…	Icon-O-Matic-Menu-File		Spara som...
+Don't save	Icon-O-Matic-Menu-Settings		Spara inte
 Change Color	Icon-O-Matic-SetColorCmd		Byt färg
 Style	Icon-O-Matic-Menus		Stil
 <modify path>	Icon-O-Matic-PathCmd		<modifiera bana>
@@ -72,6 +73,7 @@ Undo	Icon-O-Matic-Main		Ångra
 Click on a shape above	Empty transformers list - 1st line		Klicka på en figur ovan
 Add Shape	Icon-O-Matic-AddShapesCmd		Lägg till figur
 Contour	Transformation		Kontur
+Save changes to current icon before closing?	Icon-O-Matic-Menu-Settings		Spara ändringarna till ikonen "%s" innan det stängs?
 <nothing to redo>	Icon-O-Matic-Menu-Edit		<inget att göra om>
 Perspective	Transformation		Perspektiv
 Move Transformer	Icon-O-Matic-MoveTransformersCmd		Förflyttningsomvandlare

data/catalogs/apps/installer/sv.catkeys

@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Haiku-Installer	3015727137
+1	swedish	x-vnd.Haiku-Installer	3488795908
 So behind the other menu entries towards the bottom of the file, add something similar to these lines:\n\n	InstallerApp		Efter de andra menyposterna mot slutet av filen, lägg till något som liknar dessa rader:\n\n
 Are you sure you want to abort the installation and restart the system?	InstallerWindow		Är du säker på att du vill avbryta installationen och starta om systemet
 \t}\n\n	InstallerApp		\t}\n\n
@@ -109,12 +109,14 @@ NOTE: While the naming strategy for hard disks is still as described under 2.1)
 Cancel	InstallProgress		Avbryt
 Running Boot Manager and DriveSetup…\n\nClose both applications to continue with the installation.	InstallerWindow		Kör Boot Manager och DriveSetup…\n\nStäng båda programmen för att fortsätta med installationen.
 Try installing anyway	InstallProgress		Försök installera iallafall
+So below the heading that must not be edited, add something similar to these lines:\n\n	InstallerApp		Under rubriken ska inte ändras. Lägg till något liknande till dessa rader:\n\n
 Are you sure you want to to stop the installation?	InstallerWindow		Är du säker på att du vill stoppa installationen?
 Onto:	InstallerWindow		På:
 Please close the Boot Manager window before closing the Installer window.	InstallerWindow		Stäng Boot Manager fönstret före du stänger installatione fönstret.
 3)   When you successfully boot into Haiku for the first time, make sure to read our \"Welcome\" and \"Userguide\" documentation. There are links on the Desktop and in WebPositive's bookmarks.\n\n	InstallerApp		3)   När du har startat Haiku första gången. Läs gärna våra dokument \"Välkommen\" och \"Användarguid\". Det finns länkar på skrivbordet och i WebPositive's bokmärken.\n\n
 Tools	InstallerWindow		Verktyg
 The mount point could not be retrieved.	InstallProgress		Monteringspunkt kunde inte läsas av.
+The target volume is not empty. Are you sure you want to install anyway?\n\nNote: The 'system' folder will be a clean copy from the source volume, all other folders will be merged, whereas files and links that exist on both the source and target volume will be overwritten with the source volume version.	InstallProgress		volymen du vill installera till är inte tom. Vill du installera ändå?\n\nNotera: System foldern kommer att tömmas och vara en 'ren' kopia från käll katalogen. Övriga mappar kommer att mergas och de filer och länkar som finns både i källmappen och destinations mappen kommer att skrivas över med källmappen.
 You can see the correct partition in GParted for example.\n\n\n	InstallerApp		Du kan se de rätta partionerna i tex GParted.\n\n\n
 \ttitle\t\t\t\tHaiku\n	InstallerApp		\t titel\t \t \t \t Haiku\n
 \tsudo <your favorite text editor> /etc/grub.d/40_custom\n\n	InstallerApp		\t sudo <valfri textredigerare> /etc/grub.d/40_custom\n\n

data/catalogs/apps/mail/hu.catkeys

@@ -21,7 +21,7 @@ Enclosure: %name% (Type: %type%)	Mail	Don't translate the variables %name% and %
 Show icons & labels	Mail		Ikonok és feliratok
 Remove attachment	Mail		Eltávolítás
 Button bar:	Mail		Gombsor:
-spam	B_USER_DIRECTORY/mail/spam		spam
+spam	B_USER_DIRECTORY/mail/spam		Levélszemét
 Beginner	Mail		Kezdő
 Don't save	Mail		Ne mentse
 Expert	Mail		Haladó
@@ -109,7 +109,7 @@ The mail_daemon is not running. The message is queued and will be sent when the
 Really delete this signature? This cannot be undone.	Mail		Biztosan törli az aláírást? Ez nem vonható vissza.
 Save this message as a draft before closing?	Mail		Menti ezt az üzenetet piszkozatként bezárás előtt?
 Open	Mail		Megnyitás
-draft	B_USER_DIRECTORY/mail/draft		piszkozat
+draft	B_USER_DIRECTORY/mail/draft		Piszkozat
 Quote	Mail		Idézet
 Add	Mail		Hozzáadás
 Next message	Mail		Következő levél

data/catalogs/apps/mail/ru.catkeys

@@ -1,4 +1,4 @@
-1	russian	x-vnd.Be-MAIL	2646020355
+1	russian	x-vnd.Be-MAIL	233997769
 View	Mail		Вид
 %d - Date	Mail		%d - Дата
 Attach attributes:	Mail		Прикрепление атрибутов:
@@ -10,6 +10,7 @@ Edit	Mail		Изменить
 Print	Mail		Печать
 <none>	Mail		<пусто>
 New mail message	Mail		Новое сообщение
+Untitled	Mail		Безымянный
 Automatic	Mail		Автоматическая
 Automatically mark mail as read:	Mail		Автоматически помечать письмо как прочитанное:
 helpful message	Mail		полезное сообщение
@@ -106,6 +107,7 @@ Close	Mail		Закрыть
 No matches	Mail		Нет совпадений
 The mail_daemon is not running. The message is queued and will be sent when the mail_daemon is started.	Mail		Не запущен mail_daemon. Сообщение поставлено в очередь и будет отправлено как только mail_daemon будет запущен.
 Really delete this signature? This cannot be undone.	Mail		Действительно удалить эту подпись? Эту операцию будет невозможно отменить.
+Save this message as a draft before closing?	Mail		Сохранитьэто сообщение в черновики перед закрытием?
 Open	Mail		Открыть
 draft	B_USER_DIRECTORY/mail/draft		Черновики
 Quote	Mail		Цитата
@@ -119,6 +121,7 @@ Account:	Mail		Аккаунт:
 Decoding:	Mail		Кодировка:
 Sorry, could not find an application that supports the 'Person' data type.	Mail		Извините, не удалось найти приложение поддерживающее тип файлов 'Персона'.
 Delete	Mail		Удалить
+Don't send	Mail		Не отправлять
 Leave as '%s'	Mail		Оставить как '%s'
 Copy	Mail		Копия
 Mail couldn't find its dictionary.	Mail		Невозможно найти файл словаря.
@@ -133,6 +136,7 @@ Font:	Mail		Шрифт:
 (Address unavailable)	Mail		(Адрес недоступен)
 Save address	Mail		Сохранить адрес
 Queries	Mail		Запросы
+Send this message before closing?	Mail		Отправить это сообщение перед закрытием?
 Save	Mail		Сохранить
 Random	Mail		Случайная
 Close and 	Mail		Закрыть и 

data/catalogs/apps/mediaconverter/ru.catkeys

@@ -1,9 +1,11 @@
-1	russian	x-vnd.Haiku-MediaConverter	2955071341
+1	russian	x-vnd.Haiku-MediaConverter	2722282283
 Video using parameters form settings	MediaConverter		Видео использует параметры из настроек
 Video encoding:	MediaConverter		Кодирование видео:
+Error read audio frame %lld	MediaConverter		Ошибка чтения аудио кадра %lld
 No audio	Audio codecs list		Без аудио
 Error	MediaConverter		Ошибка
 Error loading a file	MediaConverter		Ошибка при загрузке файла
+Error read video frame %lld	MediaConverter		Ошибка чтения видеокадра %lld
 File Error	MediaConverter-FileInfo		Ошибка файла
 Open…	Menu		Открыть…
 Start [ms]: 	MediaConverter		Начало [мс]: 
@@ -22,6 +24,8 @@ Audio:	MediaConverter-FileInfo		Аудио:
 OK	MediaConverter-FileInfo		ОК
  seconds	MediaFileInfo		 секунд
 Source files	MediaConverter		Исходные файлы
+Error writing video frame %lld	MediaConverter		Ошибка записи видеокадра %lld
+Error writing audio frame %lld	MediaConverter		Ошибка записи аудио кадра %lld
 Cancelling	MediaConverter		Отменяется
 %d byte 	MediaFileInfo		%d байт 
 Error loading files	MediaConverter		Ошибка при загрузке файлов

data/catalogs/apps/mediaconverter/sv.catkeys

@@ -1,9 +1,11 @@
-1	swedish	x-vnd.Haiku-MediaConverter	2955071341
+1	swedish	x-vnd.Haiku-MediaConverter	2722282283
 Video using parameters form settings	MediaConverter		Video med parametrar från inställningar
 Video encoding:	MediaConverter		Videokodning:
+Error read audio frame %lld	MediaConverter		Fel vid inläsning av ljudstycke %lld
 No audio	Audio codecs list		Inget ljud
 Error	MediaConverter		Fel
 Error loading a file	MediaConverter		Fel vid inläsning av en fil
+Error read video frame %lld	MediaConverter		Fel vid inläsning av bildruta %lld
 File Error	MediaConverter-FileInfo		Filfel
 Open…	Menu		Öppna...
 Start [ms]: 	MediaConverter		Start [ms]:
@@ -22,6 +24,8 @@ Audio:	MediaConverter-FileInfo		Ljud:
 OK	MediaConverter-FileInfo		OK
  seconds	MediaFileInfo		 sekunder
 Source files	MediaConverter		Källfiler
+Error writing video frame %lld	MediaConverter		Fel vid skrivande av bildruta %lld
+Error writing audio frame %lld	MediaConverter		Fel vid skrivning av ljudstycke %lld
 Cancelling	MediaConverter		Avbryter
 %d byte 	MediaFileInfo		%d bytes
 Error loading files	MediaConverter		Fel vid inläsning av filer

data/catalogs/apps/people/ru.catkeys

@@ -1,4 +1,4 @@
-1	russian	x-vnd.Be-PEPL	3273435274
+1	russian	x-vnd.Be-PEPL	2332202134
 Edit	People		Изменить
 Error	People		Ошибка
 City	People		Город
@@ -21,6 +21,7 @@ Nickname	People		Прозвище
 Quit	People		Выход
 Name	People		Имя
 Revert	People		Вернуть
+Don't save	People		Не сохранять
 Undo	People		Отменить
 E-mail	People		E-mail
 Load image…	People		Выбрать рисунок…
@@ -30,6 +31,7 @@ Launching the FileTypes preflet to configure Person attributes has failed.\n\nEr
 Home phone	People		Домашний телефон
 Save as…	People		Сохранить как…
 Redo	People		Отменить
+Save changes before closing?	People		Сохранить изменения перед выходом?
 Paste	People		Вставить
 Drop an image here,\nor use the contextual menu.	People		Перенесите сюда фотографию\nили используйте контекстное меню.
 Save	People		Сохранить

data/catalogs/apps/people/sv.catkeys

@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Be-PEPL	3273435274
+1	swedish	x-vnd.Be-PEPL	2332202134
 Edit	People		Redigera
 Error	People		Fel
 City	People		Stad
@@ -21,6 +21,7 @@ Nickname	People		Smeknamn
 Quit	People		Avsluta
 Name	People		Namn
 Revert	People		Återställ
+Don't save	People		Spara inte
 Undo	People		Ångra
 E-mail	People		E-post
 Load image…	People		Välj bild...
@@ -30,6 +31,7 @@ Launching the FileTypes preflet to configure Person attributes has failed.\n\nEr
 Home phone	People		Hemtelefon
 Save as…	People		Spara som...
 Redo	People		Gör om
+Save changes before closing?	People		Spara ändringar innan avslut?
 Paste	People		Klistra in
 Drop an image here,\nor use the contextual menu.	People		Släpp en bild här,\neller använd högerklicksmenyn.
 Save	People		Spara

data/catalogs/apps/readonlybootprompt/hu.catkeys

@@ -1,8 +1,8 @@
 1	hungarian	x-vnd.Haiku-ReadOnlyBootPrompt	2544294242
 Custom	BootPromptWindow		Egyéni
-Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	Köszönjük, hogy kipróbálja a Haiku-t! Reméljük tetszeni fog!\n\nA baloldali listából választhat nyelvet és billentyűzetkiosztást. Mindkét beállítást könnyen átállíthatja majd később az Asztalról.\n\nA Telepítőt vagy az Asztalt indítsuk el most?\n\nMegjegyzés: A Haiku programjait önkéntesek fordítják, folyamatosan. Könnyen megeshet hogy hiányosan, vagy hibásan fordított programokkal fog találkozni. Ha szeretné, csatlakozhat a munkához és kijavíthatja ezeket a <www.haiku-os.org> oldalon. Köszönjük!
+Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n	BootPromptWindow	For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at <www.haiku-os.org>.\"	Köszönjük, hogy kipróbálja a Haiku-t!\n\nA baloldali listából választhat nyelvet és billentyűzetkiosztást. Mindkét beállítást könnyen átállíthatja majd később az Asztalról.\n\nA Telepítőt vagy az Asztalt indítsuk most el?\n\nMegjegyzés: A Haiku programjait önkéntesek fordítják, folyamatosan. Könnyen megeshet hogy hiányosan, vagy hibásan fordított programokkal fog találkozni. Ha szeretné, csatlakozhat a munkához és kijavíthatja ezeket a <www.haiku-os.org> oldalon. Köszönjük!
 Desktop (Live-CD)	BootPromptWindow		Asztal
 Language	BootPromptWindow		Nyelv
 Welcome to Haiku!	BootPromptWindow		A Haiku üdvözli Önt!
-Run Installer	BootPromptWindow		Telepítés
+Run Installer	BootPromptWindow		Telepítő
 Keymap	BootPromptWindow		Billentyűzetkiosztás

data/catalogs/apps/stylededit/ja.catkeys

@@ -1,10 +1,11 @@
-1	japanese	x-vnd.Haiku-StyledEdit	2434449144
+1	japanese	x-vnd.Haiku-StyledEdit	3208803155
 StyledEdit	System name		StyledEdit
 This file is marked read-only. Save changes to the document \"%s\"? 	SaveAlert		このファイルは読み取り専用です。変更を\"%s\"ドキュメントに保存しますか?
 Paste	Menus		貼り付け
 OK	LoadAlert		OK
 File	Menus		ファイル
 ???	LoadAlert		???
+Modified	StatusView		変更あり
 Lines:	Statistics		行数:
 Italic	Menus		イタリック
 Left	Menus		左揃え

data/catalogs/apps/stylededit/ru.catkeys

@@ -1,13 +1,16 @@
-1	russian	x-vnd.Haiku-StyledEdit	3117187160
+1	russian	x-vnd.Haiku-StyledEdit	3208803155
 StyledEdit	System name		Стильный редактор
+This file is marked read-only. Save changes to the document \"%s\"? 	SaveAlert		Этот файл отмечен только для чтения. Сохранить изменения в документе \"%s\"? 
 Paste	Menus		Вставить
 OK	LoadAlert		ОК
 File	Menus		Файл
 ???	LoadAlert		???
+Modified	StatusView		Изменён
 Lines:	Statistics		Строк:
 Italic	Menus		Наклонный
 Left	Menus		По левому краю
 Search backwards	FindandReplaceWindow		Искать снизу вверх
+Unlock file	StatusView		Разблокировать
 Size	Menus		Размер
 Save	QuitAlert		Сохранить
 Page setup…	Menus		Настройка печати…
@@ -19,21 +22,27 @@ Cancel	SaveAlert		Отмена
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		Невозможно вернуть, файл не найден: \"%s\".
 Case-sensitive	FindandReplaceWindow		Учитывать регистр
 Green	Menus		Зеленый
+Reload	NodeMonitorAlerts		Перезагрузить
 Yellow	Menus		Желтый
 Replace in all windows	FindandReplaceWindow		Заменить во всех окнах
 Wrap lines	Menus		Перенос строк
 Quit	Menus		Выход
+File \"%file%\" was removed by another application, recover it?	NodeMonitorAlerts		Файл \"%file%\" был удален другой программой, восстановить его?
 Document statistics	Statistics		Статистика документа
 Cancel	RevertToSavedAlert		Отмена
+Autodetect	Menus		Автоопределение
 Document	Menus		Документ
 Save changes to the document \"%s\"? 	QuitAlert		Сохранить изменения в файле \"%s\"? 
 Edit	Menus		Изменить
+Revert	RevertToSavedAlert		Вернуть
 Font	Menus		Шрифт
 Replace all	FindandReplaceWindow		Заменить все
 Statistics…	Menus		Статистика…
 Default	Open_and_SaveAsPanel		По умолчанию
 Replace next	Menus		Заменить далее
+\"%s\" has unsaved changes.\nRevert it to the last saved version? 	RevertToSavedAlert		\"%s\" имеет несохраненные изменения.\nВернуться его до последней сохраненной версии?
 Cancel	FindandReplaceWindow		Отмена
+Text encoding	Menus		Кодировка
 Close	Menus		Закрыть
 Save	SaveAlert		Сохранить
 Words:	Statistics		Слов:
@@ -43,10 +52,13 @@ Don't save	QuitAlert		Не сохранять
 Align	Menus		Выровнять
 Color	Menus		Цвет
 Red	Menus		Красный
+OK	QuitAlert		ОК
 Open…	Menus		Открыть…
 Center	Menus		По центру
 Blue	Menus		Синий
+Unable to unlock file\n\t%s	QuitAlert		Невозможно разблокировать файл\n\t%s
 Cyan	Menus		Бирюзовый
+line %d, column %d	StatusView		линия %d, позиция %d
 OK	Statistics		ОК
 Magenta	Menus		Пурпурный
 New	Menus		Новый
@@ -57,13 +69,17 @@ Find:	FindandReplaceWindow		Найти:
 Error saving \"%s\":\n%s	SaveAlert		Ошибка сохранения \"%s\":\n%s
 Copy	Menus		Копировать
 Cut	Menus		Вырезать
+File \"%file%\" was modified by another application, reload it?	NodeMonitorAlerts		Файл \"%file%\" был изменен другой программой, перезагрузить его?
 Replace	FindandReplaceWindow		Заменить
 Find again	Menus		Найти далее
 Cancel	QuitAlert		Отмена
 Find…	Menus		Найти…
 Select all	Menus		Выделить всё
 Don't save	SaveAlert		Не сохранять
+Recover	NodeMonitorAlerts		Восстановить
 Error loading \"%s\":\n\t%s	LoadAlert		Ошибка загрузки \"%s\":\n\t%s
+Ignore	NodeMonitorAlerts		Игнорировать
+Read-only	StatusView		Только чтение
 Undo typing	QuitAlert		Отменить ввод
 Black	Menus		Черный
 Untitled 	StyledEditWindow		Новый документ 
@@ -73,5 +89,6 @@ Encoding	Open_and_SaveAsPanel		Кодировка
 Characters:	Statistics		Символов:
 Save as…	Menus		Сохранить как…
 Redo typing	QuitAlert		Повторить ввод
+Reload…	Menus		Перезагрузить…
 Replace…	Menus		Заменить…
 Right	Menus		По правому краю

data/catalogs/apps/stylededit/sv.catkeys

@@ -1,13 +1,16 @@
-1	swedish	x-vnd.Haiku-StyledEdit	894766086
+1	swedish	x-vnd.Haiku-StyledEdit	3208803155
 StyledEdit	System name		SkrivStiligt
+This file is marked read-only. Save changes to the document \"%s\"? 	SaveAlert		Denna fil är markerad som endast läsbar. Vill du spara ändringarna till dokumentet \"%s\"?  
 Paste	Menus		Klistra in
 OK	LoadAlert		OK
 File	Menus		Arkiv
 ???	LoadAlert		???
+Modified	StatusView		Ändrad
 Lines:	Statistics		Rader:
 Italic	Menus		Kursiv
 Left	Menus		Vänster
 Search backwards	FindandReplaceWindow		Sök bakåt
+Unlock file	StatusView		Låsupp fil
 Size	Menus		Storlek
 Save	QuitAlert		Spara
 Page setup…	Menus		Sidinställningar...
@@ -31,6 +34,7 @@ Autodetect	Menus		Identifiera automatiskt
 Document	Menus		Dokument
 Save changes to the document \"%s\"? 	QuitAlert		Spara ändringar till dokumentet "%s"? 
 Edit	Menus		Redigera
+Revert	RevertToSavedAlert		Återställ
 Font	Menus		Font
 Replace all	FindandReplaceWindow		Ersätt alla
 Statistics…	Menus		Statistik...
@@ -48,10 +52,13 @@ Don't save	QuitAlert		Spara inte
 Align	Menus		Justera
 Color	Menus		Färg
 Red	Menus		Röd
+OK	QuitAlert		OK
 Open…	Menus		Öppna…
 Center	Menus		Mitten
 Blue	Menus		Blå
+Unable to unlock file\n\t%s	QuitAlert		Kan inte låsaupp fil\n\t %s
 Cyan	Menus		Cyan
+line %d, column %d	StatusView		rad %d, kolumn %d
 OK	Statistics		OK
 Magenta	Menus		Magenta
 New	Menus		Ny
@@ -72,6 +79,7 @@ Don't save	SaveAlert		Spara inte
 Recover	NodeMonitorAlerts		Återskapa
 Error loading \"%s\":\n\t%s	LoadAlert		Fel vid inläsning "%s":\n\t%s
 Ignore	NodeMonitorAlerts		Ignorera
+Read-only	StatusView		Skrivskyddad
 Undo typing	QuitAlert		Ångra inmatning
 Black	Menus		Svart
 Untitled 	StyledEditWindow		Namnlös 

data/catalogs/apps/terminal/ru.catkeys

@@ -1,7 +1,9 @@
-1	russian	x-vnd.Haiku-Terminal	2912171349
+1	russian	x-vnd.Haiku-Terminal	3561344903
 Not found.	Terminal TermWindow		Текст не найден
 Switch Terminals	Terminal TermWindow		Переключить терминалы
 Change directory	Terminal TermView		Сменить каталог
+Cursor	Terminal AppearancePrefView		Курсор
+Professional	Terminal colors scheme		Профессионал
 OK	Terminal TermWindow		ОК
 New Terminal	Terminal TermWindow		Новый терминал
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Терминал не смог запустить оболочку. Простите.
@@ -19,8 +21,11 @@ Font:	Terminal AppearancePrefView		Шрифт:
 Copy here	Terminal TermView		Копировать сюда
 Really close?	Terminal TermWindow		Действительно закрыть?
 Copy	Terminal TermWindow		Копировать
+Color scheme:	Terminal AppearancePrefView		Цветовая схема:
 Window title:	Terminal TermWindow		Заголовок окна:
 Unrecognized option \"%s\"\n	Terminal arguments parsing		Нераспознанная опция \"%s\"\n
+Blue	Terminal colors scheme		Синий
+Custom	Terminal colors scheme		Настроена вручную
 %app% settings	Terminal PrefWindow	window title	Настройки терминала
 Cancel	Terminal SetTitleWindow		Отмена
 Increase	Terminal TermWindow		Увеличить
@@ -44,6 +49,8 @@ The following processes are still running:\n\n\t%1\n\nIf you close the Terminal,
 Insert path	Terminal TermView		Вставить путь
 Haiku Terminal\nCopyright 2001-2009 Haiku, Inc.\nCopyright(C) 1999 Kazuho Okui and Takashi Murai.\n\nUsage: %s [OPTION] [SHELL]\n	Terminal TermApp		Haiku Терминал\nCopyright 2001-2009 Haiku, Inc.\nCopyright(C) 1999 Kazuho Okui and Takashi Murai.\n\nИспользование: %s [OPTION] [SHELL]\n
 No search string was entered.	Terminal TermWindow		Не введена строка поиска
+Font size	Terminal TermWindow		Размер шрифта
+Blinking cursor	Terminal AppearancePrefView		Мигающий курсор
 Don't save	Terminal PrefWindow		Не сохранять
 Set window title	Terminal TermWindow		Установить заголовок окна
 Terminal	System name		Терминал
@@ -55,11 +62,16 @@ Find…	Terminal TermWindow		Найти…
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Процесс \"%1\" все еще работает.\nЕсли вы закроете Терминал, то этот процесс будет уничтожен.
 Move here	Terminal TermView		Переместить сюда
 \t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\tТекущая директория активного процесса текущей вкладки.\n\t\t\tОпционально можно указать максимальное число отображаемых компонентов пути.\n\t\t\tНапример '%2d' отобразит последние 2 компонента.\n\t%i\t-\tНомер окна.\n\t%p\t-\tНазвание активного процесса в текущей вкладке.\n\t%t\t-\tЗаголовок текущей вкладки.\n\t%%\t-\tСимвол процента - '%'.
+Retro	Terminal colors scheme		Ретро
 Error!	Terminal getString		Ошибка!
 New tab	Terminal TermWindow		Новая вкладка
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Этот шаблон описывает заголовки вкладок.\nВозможно использовать следующие переменные:\n
 Selected background	Terminal AppearancePrefView		Выделенного фона
+Slate	Terminal colors scheme		Шифер
+Text under cursor	Terminal AppearancePrefView		Текст под под курсором
+Midnight	Terminal colors scheme		Полночь
 Decrease	Terminal TermWindow		Уменьшить
+Default	Terminal colors scheme		По умолчанию
 Create link here	Terminal TermView		Создать ссылку здесь
 Close	Terminal TermWindow		Закрыть
 Text	Terminal AppearancePrefView		Текста

data/catalogs/apps/terminal/sv.catkeys

@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Haiku-Terminal	2178478404
+1	swedish	x-vnd.Haiku-Terminal	3561344903
 Not found.	Terminal TermWindow		Hittades ej.
 Switch Terminals	Terminal TermWindow		Växla terminal
 Change directory	Terminal TermView		Byt katalog
@@ -67,6 +67,7 @@ Error!	Terminal getString		Fel!
 New tab	Terminal TermWindow		Ny flik
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Mönstret bestämmer namn på flikar. Följande alternativ finns:\n
 Selected background	Terminal AppearancePrefView		Vald bakgrund
+Slate	Terminal colors scheme		Slate
 Text under cursor	Terminal AppearancePrefView		Text under markören
 Midnight	Terminal colors scheme		Midnatt
 Decrease	Terminal TermWindow		Minska

data/catalogs/kits/tracker/be.catkeys

@@ -1,4 +1,4 @@
-1	belarusian	x-vnd.Haiku-libtracker	3779634732
+1	belarusian	x-vnd.Haiku-libtracker	2580969822
 common	B_COMMON_DIRECTORY		агульны
 OK	WidgetAttributeText		ОК
 Icon view	VolumeWindow		Від іконак
@@ -81,6 +81,7 @@ Decrease size	DeskWindow		Паменшыць памер
 Size	ContainerWindow		Памер
 All disks	AutoMounterSettings		Усе дыскі
 Would you like to find some other suitable application?	FSUtils		Жадаеце пашукаць іншую падыходзячую праграму?
+Ask before deleting for good	SettingsView		Спытаць перад выдаленнем
 Finish: %time - %finishtime left	StatusWindow		Завяршэнне: %time - засталося %finishtime
 Could not open \"%document\" with application \"%app\" (Missing libraries: %library). \n	FSUtils		Немагчыма адкрыць \"%document\" праграмай \"%app\" (Не хапае: %library). \n
 no items	CountView		няма элементаў
@@ -101,6 +102,7 @@ New folder	FilePanelPriv		Новы каталог
 %name info	InfoWindow	InfoWindow Title	%name інфа
 Favorites	FavoritesMenu		Выбранае
 Add-ons	VolumeWindow		Дапаўненні
+Move deleted files to Trash first	SettingsView		Перасунуць выдаленыя файлы спярша ў Сметніцу
 Sorry, you can't copy items to the Trash.	PoseView		Прабачце, вы не можаце капіяваць элементы ў Сметніцу.
 List view	VolumeWindow		Від спісу
 matches wildcard expression	SelectionWindow		супадае з падстановачнымі выразамі

data/catalogs/kits/tracker/sv.catkeys

@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Haiku-libtracker	3779634732
+1	swedish	x-vnd.Haiku-libtracker	2580969822
 common	B_COMMON_DIRECTORY		gemensam
 OK	WidgetAttributeText		OK
 Icon view	VolumeWindow		Ikonvy
@@ -81,6 +81,7 @@ Decrease size	DeskWindow		Minska storleken
 Size	ContainerWindow		Storlek
 All disks	AutoMounterSettings		Alla diskar
 Would you like to find some other suitable application?	FSUtils		Vill du söka efter ett annat program?
+Ask before deleting for good	SettingsView		Fråga innan det tasbort permanent
 Finish: %time - %finishtime left	StatusWindow		Klar: %time - %finishtime kvar
 Could not open \"%document\" with application \"%app\" (Missing libraries: %library). \n	FSUtils		Kunde inte öppna "%document" med programmet "%app" (Saknar bibliotek: %library). \n
 no items	CountView		inga objekt
@@ -101,6 +102,7 @@ New folder	FilePanelPriv		Ny mapp
 %name info	InfoWindow	InfoWindow Title	%name information
 Favorites	FavoritesMenu		Favoriter
 Add-ons	VolumeWindow		Tillägg
+Move deleted files to Trash first	SettingsView		Flytta borttagna filer till papperskorgen först
 Sorry, you can't copy items to the Trash.	PoseView		Du kan inte kopiera filer till Papperskorgen.
 List view	VolumeWindow		Listvy
 matches wildcard expression	SelectionWindow		matchar jokeruttryck

data/catalogs/preferences/appearance/ru.catkeys

@@ -1,4 +1,4 @@
-1	russian	x-vnd.Haiku-Appearance	1428480647
+1	russian	x-vnd.Haiku-Appearance	3266657197
 Plain font:	Font view		Простой шрифт:
 Control highlight	Colors tab		Подсветка элемента
 Control border	Colors tab		Граница элемента
@@ -23,7 +23,9 @@ Tooltip background	Colors tab		Фон подсказки
 Selected menu item background	Colors tab		Фон выбранного пункта меню
 Antialiasing	APRWindow		Сглаживание
 Navigation base	Colors tab		Основа навигации
+Selected list item text	Colors tab		Текст выделенного пункта меню
 Window border	Colors tab		Рамка окна
+Double:	DecorSettingsView		Двойной:
 Window tab text	Colors tab		Текст заголовка окна
 Document text	Colors tab		Текст документа
 Navigation pulse	Colors tab		Навигационная пульсация

data/catalogs/preferences/filetypes/sv.catkeys

@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Haiku-FileTypes	1059171929
+1	swedish	x-vnd.Haiku-FileTypes	133192727
 Application types…	FileTypes Window		Programtyper...
 Description:	Application Types Window		Beskrivning:
 Args only	Application Type Window		Endast argument
@@ -49,6 +49,8 @@ Group name:	New File Type Window		Gruppnamn:
 Preferred application	FileType Window		Förvalt program
 Progress	Application Types Window		Fortskridning:
 Set preferred application	Preferred App Menu		Välj förinställt program
+Don't save	Application Type Window		Spara inte
+Save changes before closing?	Application Type Window		Spara ändringar innan programmet avslutas?
 File	Application Type Window		Arkiv
 Version:	Application Type Window		Version:
 Select…	FileTypes Window		Välj...

data/catalogs/preferences/shortcuts/be.catkeys

@@ -1,4 +1,4 @@
-1	belarusian	x-vnd.Haiku-Shortcuts	3661393357
+1	belarusian	x-vnd.Haiku-Shortcuts	341885426
 Error, NULL state description?\n	ShortcutsSpec		Памылка, апісанне стану NULL?\n
 MoveMouse	ShortcutsSpec		РухацьМыш
 OK	ShortcutsWindow		ОК
@@ -15,12 +15,12 @@ Alt	ShortcutsSpec	Name for modifier on keyboard	Alt
 *InsertString \"Your Text Here\"	ShortcutsWindow		*УставіцьСтраку \"Ваш Тэкст\"
 *MouseUp	ShortcutsWindow		*МышУверх
 (Choose application with file requester)	ShortcutsWindow		(Выберыце праграму, якая патрабуе выбара файлу)
-Window	ShortcutsSpec	Name for modifier on keyboard	Window
 *LaunchHandler text/html	ShortcutsWindow		*АпрацоўшчыкЗапуску text/html
 Shortcuts was couldn't open your KeySet file!	ShortcutsWindow		Рэдактар Гарачых Клавішаў не змог адкрыць ваш файл KeySet!
 *Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"	ShortcutsWindow		*Множнае \"*РухацьМышДа 100% 0\" \"*КнопкаМышы 1\"
 SendMessage	ShortcutsSpec		АдаслацьПаведамленне
 MoveMouseTo	ShortcutsSpec		РухацьМышДа
+Option	ShortcutsSpec	Name for modifier on keyboard	Параметр
 Save	ShortcutsWindow		Захаваць
 *MouseButton 1	ShortcutsWindow		*КнопкаМышы 1
 *MoveMouse +20 +0	ShortcutsWindow		*РухацьМыш +20 +0

data/catalogs/preferences/shortcuts/de.catkeys

@@ -1,4 +1,4 @@
-1	german	x-vnd.Haiku-Shortcuts	3661393357
+1	german	x-vnd.Haiku-Shortcuts	341885426
 Error, NULL state description?\n	ShortcutsSpec		Fehler, NULL Status Beschreibung?\n
 MoveMouse	ShortcutsSpec		Bewege Maus
 OK	ShortcutsWindow		OK
@@ -15,12 +15,12 @@ Alt	ShortcutsSpec	Name for modifier on keyboard	Alt
 *InsertString \"Your Text Here\"	ShortcutsWindow		*Zeichen einfügen \"Hier der Text\"
 *MouseUp	ShortcutsWindow		*Maustaste losgelassen
 (Choose application with file requester)	ShortcutsWindow		(Eine Anwendung per Datei-Dialog wählen)
-Window	ShortcutsSpec	Name for modifier on keyboard	Windows
 *LaunchHandler text/html	ShortcutsWindow		*LaunchHandler text/html
 Shortcuts was couldn't open your KeySet file!	ShortcutsWindow		Die Tastenbelegungsdatei konnte nicht geladen werden.
 *Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"	ShortcutsWindow		Maus nach oben ins linke Eck und Maustaste 1 drücken
 SendMessage	ShortcutsSpec		Nachricht senden
 MoveMouseTo	ShortcutsSpec		Bewege Maus nach
+Option	ShortcutsSpec	Name for modifier on keyboard	Option
 Save	ShortcutsWindow		Speichern
 *MouseButton 1	ShortcutsWindow		*Maustaste 1 drücken
 *MoveMouse +20 +0	ShortcutsWindow		*Maus 20 Pixel nach rechts bewegen

data/catalogs/preferences/shortcuts/el.catkeys

@@ -1,4 +1,4 @@
-1	greek, modern (1453-)	x-vnd.Haiku-Shortcuts	1741147146
+1	greek, modern (1453-)	x-vnd.Haiku-Shortcuts	1477375596
 Error, NULL state description?\n	ShortcutsSpec		Σφάλμα, ΚΕΝΗ αναφορά περιγραφής;\n
 MoveMouse	ShortcutsSpec		Μετακίνηση Ποντικιού
 OK	ShortcutsWindow		Εντάξει
@@ -15,7 +15,6 @@ Alt	ShortcutsSpec	Name for modifier on keyboard	Alt
 *InsertString \"Your Text Here\"	ShortcutsWindow		*Εισάγετε συμβολοσεια \"Το Κείμενο σας Εδώ\"
 *MouseUp	ShortcutsWindow		*Ποντίκι Επάνω
 (Choose application with file requester)	ShortcutsWindow		(Επιλέξτε εφαρμογή με τον file requester)
-Window	ShortcutsSpec	Name for modifier on keyboard	Παράθυρο
 *LaunchHandler text/html	ShortcutsWindow		*LaunchHandler text/html
 Shortcuts was couldn't open your KeySet file!	ShortcutsWindow		Το Shortcuts δε μπόρεσε να ανοίξει το αρχείο του σετ πλήκτρων!
 *Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"	ShortcutsWindow		*Πολλαπλό \"*Μετακίνηση ποντικιού σε 100% 0\" \"*Πλήκτρο ποντικιού 1\"

data/catalogs/preferences/shortcuts/fi.catkeys

@@ -1,4 +1,4 @@
-1	finnish	x-vnd.Haiku-Shortcuts	3661393357
+1	finnish	x-vnd.Haiku-Shortcuts	3397621807
 Error, NULL state description?\n	ShortcutsSpec		Virhe, NULL-tilakuvaus?\n
 MoveMouse	ShortcutsSpec		SiirräHiirtä
 OK	ShortcutsWindow		Valmis
@@ -15,7 +15,6 @@ Alt	ShortcutsSpec	Name for modifier on keyboard	Alt-painike
 *InsertString \"Your Text Here\"	ShortcutsWindow		*Lisää merkkijono ”Tekstisi tänne”
 *MouseUp	ShortcutsWindow		*HiiriYlös
 (Choose application with file requester)	ShortcutsWindow		(Valitse sovellus tiedostohakijalla)
-Window	ShortcutsSpec	Name for modifier on keyboard	Ikkuna
 *LaunchHandler text/html	ShortcutsWindow		*Käynnistyskäsittelijä text/html
 Shortcuts was couldn't open your KeySet file!	ShortcutsWindow		Pikanäppäinasetukset ei kyennyt avaamaan KeySet-tiedostoa!
 *Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"	ShortcutsWindow		*Moni ”*SiirräHiiriKohteeseen 100% 0” ”*Hiiripainike 1”

data/catalogs/preferences/shortcuts/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-Shortcuts	3661393357
+1	french	x-vnd.Haiku-Shortcuts	3397621807
 Error, NULL state description?\n	ShortcutsSpec		Erreur : description d'état NULL ?\n
 MoveMouse	ShortcutsSpec		BougerSouris
 OK	ShortcutsWindow		OK
@@ -15,7 +15,6 @@ Alt	ShortcutsSpec	Name for modifier on keyboard	Alt
 *InsertString \"Your Text Here\"	ShortcutsWindow		*InsérerTexte « votre texte ici »
 *MouseUp	ShortcutsWindow		*SourisEnHaut
 (Choose application with file requester)	ShortcutsWindow		(Choisissez une application avec une requête de fichier)
-Window	ShortcutsSpec	Name for modifier on keyboard	Fenêtre
 *LaunchHandler text/html	ShortcutsWindow		*GestionnaireDeLancement text/html
 Shortcuts was couldn't open your KeySet file!	ShortcutsWindow		Raccourcis n'a pas pu ouvrir le fichier de jeu de touches !
 *Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"	ShortcutsWindow		*Multi « *BougerSourisEn 100% 0 » « *BoutonSouris 1 »

data/catalogs/preferences/shortcuts/hi.catkeys

@@ -1,4 +1,4 @@
-1	hindi	x-vnd.Haiku-Shortcuts	1741147146
+1	hindi	x-vnd.Haiku-Shortcuts	1477375596
 Error, NULL state description?\n	ShortcutsSpec		त्रुटि, नल स्थिति का विवरण?\n
 MoveMouse	ShortcutsSpec		माउस को हिलाएँ
 OK	ShortcutsWindow		ठीक है
@@ -15,7 +15,6 @@ Alt	ShortcutsSpec	Name for modifier on keyboard	ऑल्ट
 *InsertString \"Your Text Here\"	ShortcutsWindow		*स्ट्रिंग डालें \"Your Text Here\"
 *MouseUp	ShortcutsWindow		*माउसअप
 (Choose application with file requester)	ShortcutsWindow		(फ़ाइल रिक्वेस्टर साथ आवेदन चुनें)
-Window	ShortcutsSpec	Name for modifier on keyboard	विंडों
 *LaunchHandler text/html	ShortcutsWindow		*लांचहैंडलर टेक्स्ट/एचटीएमएल
 Shortcuts was couldn't open your KeySet file!	ShortcutsWindow		शॉर्टकट्स आपके कीसेट फ़ाइल नहीं खोल सकता था!
 *Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"	ShortcutsWindow		*बहु\"*MoveMouseTo 100% 0\" \"*MouseButton 1\"

data/catalogs/preferences/shortcuts/hu.catkeys

@@ -1,4 +1,4 @@
-1	hungarian	x-vnd.Haiku-Shortcuts	3661393357
+1	hungarian	x-vnd.Haiku-Shortcuts	341885426
 Error, NULL state description?\n	ShortcutsSpec		Hiba, NULL állapotleírás?\n
 MoveMouse	ShortcutsSpec		EgérMozgatás
 OK	ShortcutsWindow		Rendben
@@ -15,12 +15,12 @@ Alt	ShortcutsSpec	Name for modifier on keyboard	Alt
 *InsertString \"Your Text Here\"	ShortcutsWindow		*KarakterekBeszúrása \"Ide írja a szöveget\"
 *MouseUp	ShortcutsWindow		*EgérFel
 (Choose application with file requester)	ShortcutsWindow		(A fájlkérővel válasszon programot)
-Window	ShortcutsSpec	Name for modifier on keyboard	Win
 *LaunchHandler text/html	ShortcutsWindow		*Indítás text/html
 Shortcuts was couldn't open your KeySet file!	ShortcutsWindow		A Parancsgombok nem tudta megnyitni a beállításfájlját!
 *Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"	ShortcutsWindow		*Multi \"*EgérMozgatásIde 100% 0\" \"*EgérGomb 1\"
 SendMessage	ShortcutsSpec		ÜzenetKüldés
 MoveMouseTo	ShortcutsSpec		EgérMozgatásIde
+Option	ShortcutsSpec	Name for modifier on keyboard	Opció
 Save	ShortcutsWindow		Mentés
 *MouseButton 1	ShortcutsWindow		*EgérGomb 1
 *MoveMouse +20 +0	ShortcutsWindow		*EgérMozgatás +20 +0

data/catalogs/preferences/shortcuts/ja.catkeys

@@ -1,4 +1,4 @@
-1	japanese	x-vnd.Haiku-Shortcuts	3661393357
+1	japanese	x-vnd.Haiku-Shortcuts	341885426
 Error, NULL state description?\n	ShortcutsSpec		エラー、記述がありません?\n
 MoveMouse	ShortcutsSpec		MoveMouse
 OK	ShortcutsWindow		OK
@@ -15,12 +15,12 @@ Alt	ShortcutsSpec	Name for modifier on keyboard	Alt
 *InsertString \"Your Text Here\"	ShortcutsWindow		*InsertString \"テキストをここに\"
 *MouseUp	ShortcutsWindow		*MouseUp
 (Choose application with file requester)	ShortcutsWindow		(ファイルリクエスタと共にアプリケーションを選択)
-Window	ShortcutsSpec	Name for modifier on keyboard	Window
 *LaunchHandler text/html	ShortcutsWindow		*LaunchHandler text/html
 Shortcuts was couldn't open your KeySet file!	ShortcutsWindow		キーセットファイルを開けませんでした！
 *Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"	ShortcutsWindow		*Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"
 SendMessage	ShortcutsSpec		SendMessage
 MoveMouseTo	ShortcutsSpec		MoveMouseTo
+Option	ShortcutsSpec	Name for modifier on keyboard	オプション
 Save	ShortcutsWindow		保存
 *MouseButton 1	ShortcutsWindow		*MouseButton 1
 *MoveMouse +20 +0	ShortcutsWindow		*MoveMouse +20 +0

data/catalogs/preferences/shortcuts/lt.catkeys

@@ -1,4 +1,4 @@
-1	lithuanian	x-vnd.Haiku-Shortcuts	1963206485
+1	lithuanian	x-vnd.Haiku-Shortcuts	1699434935
 Error, NULL state description?\n	ShortcutsSpec		Klaida. Neapibrėžta būsena?\n
 OK	ShortcutsWindow		Gerai
 Shortcuts wasn't able to save your keyset.	ShortcutsWindow		Sparčiųjų klavišų rinkinio įrašyti nepavyko.
@@ -10,7 +10,6 @@ Open KeySet…	ShortcutsWindow		Atverti sparčiųjų klavišų rinkinį…
 Revert to saved	ShortcutsWindow		Grįžti prie įrašyto
 Alt	ShortcutsSpec	Name for modifier on keyboard	Alt
 (Choose application with file requester)	ShortcutsWindow		(Atverti programos parinkimo langą)
-Window	ShortcutsSpec	Name for modifier on keyboard	Win
 Shortcuts was couldn't open your KeySet file!	ShortcutsWindow		Sparčiųjų klavišų rinkinio atverti nepavyko!
 Save	ShortcutsWindow		Įrašyti
 Remove selected shortcut	ShortcutsWindow		Pašalinti pažymėtąjį klavišų derinį

data/catalogs/preferences/shortcuts/nl.catkeys

@@ -1,4 +1,4 @@
-1	dutch; flemish	x-vnd.Haiku-Shortcuts	1741147146
+1	dutch; flemish	x-vnd.Haiku-Shortcuts	1477375596
 Error, NULL state description?\n	ShortcutsSpec		Fout, NULL-statusbeschrijving?\n
 MoveMouse	ShortcutsSpec		VerplaatsMuis
 OK	ShortcutsWindow		Oké
@@ -15,7 +15,6 @@ Alt	ShortcutsSpec	Name for modifier on keyboard	Alt
 *InsertString \"Your Text Here\"	ShortcutsWindow		*VoegTekstIn \"Uw Tekst Hier\"
 *MouseUp	ShortcutsWindow		*MuisOmhoog
 (Choose application with file requester)	ShortcutsWindow		(Kies een toepassing met een bestandskiezer)
-Window	ShortcutsSpec	Name for modifier on keyboard	Windows-toets
 *LaunchHandler text/html	ShortcutsWindow		*StartAfhandelaar text/html
 Shortcuts was couldn't open your KeySet file!	ShortcutsWindow		Sneltoetsen kon uw toetsencombinatiebestand niet openen!
 *Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"	ShortcutsWindow		*Meerdere \"*VerplaatsMuisNaar 100% 0\" \"*MuisKnop 1\"

data/catalogs/preferences/shortcuts/pl.catkeys

@@ -1,4 +1,4 @@
-1	polish	x-vnd.Haiku-Shortcuts	1741147146
+1	polish	x-vnd.Haiku-Shortcuts	1477375596
 Error, NULL state description?\n	ShortcutsSpec		Błąd, brak opisu stanu?\n
 MoveMouse	ShortcutsSpec		MoveMouse
 OK	ShortcutsWindow		OK
@@ -15,7 +15,6 @@ Alt	ShortcutsSpec	Name for modifier on keyboard	Alt
 *InsertString \"Your Text Here\"	ShortcutsWindow		*InsertString \"Tutaj umieść swój tekst\"
 *MouseUp	ShortcutsWindow		*MouseUp
 (Choose application with file requester)	ShortcutsWindow		(Wybierz aplikację żądającą pliku)
-Window	ShortcutsSpec	Name for modifier on keyboard	Window
 *LaunchHandler text/html	ShortcutsWindow		*LaunchHandler text/html
 Shortcuts was couldn't open your KeySet file!	ShortcutsWindow		Skróty nie zdołały otworzyć pliku KeySet!
 *Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"	ShortcutsWindow		Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"

data/catalogs/preferences/shortcuts/pt_BR.catkeys

@@ -1,4 +1,4 @@
-1	portuguese (brazil)	x-vnd.Haiku-Shortcuts	3661393357
+1	portuguese (brazil)	x-vnd.Haiku-Shortcuts	341885426
 Error, NULL state description?\n	ShortcutsSpec		Erro, descrição de estado em branco?\n
 MoveMouse	ShortcutsSpec		Mover o Mouse
 OK	ShortcutsWindow		OK
@@ -15,12 +15,12 @@ Alt	ShortcutsSpec	Name for modifier on keyboard	Alt
 *InsertString \"Your Text Here\"	ShortcutsWindow		*InsertString \"Seu Texto Aqui\"
 *MouseUp	ShortcutsWindow		*MouseUp
 (Choose application with file requester)	ShortcutsWindow		(Escolha um aplicativo que contenha um requerente de arquivo)
-Window	ShortcutsSpec	Name for modifier on keyboard	Windows
 *LaunchHandler text/html	ShortcutsWindow		*LaunchHandler text/html
 Shortcuts was couldn't open your KeySet file!	ShortcutsWindow		O Atalhos não pode abrir seu arquivo de combinação de teclas!
 *Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"	ShortcutsWindow		*Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"
 SendMessage	ShortcutsSpec		Enviar Mensagem
 MoveMouseTo	ShortcutsSpec		Mover Mouse Para
+Option	ShortcutsSpec	Name for modifier on keyboard	Opção
 Save	ShortcutsWindow		Salvar
 *MouseButton 1	ShortcutsWindow		*Botão do Mouse 1
 *MoveMouse +20 +0	ShortcutsWindow		*Mover Mouse +20 +0

data/catalogs/preferences/shortcuts/ro.catkeys

@@ -1,4 +1,4 @@
-1	romanian	x-vnd.Haiku-Shortcuts	1741147146
+1	romanian	x-vnd.Haiku-Shortcuts	1477375596
 Error, NULL state description?\n	ShortcutsSpec		Eroare, descriere stare NULL?\n
 MoveMouse	ShortcutsSpec		MutăMaus
 OK	ShortcutsWindow		OK
@@ -15,7 +15,6 @@ Alt	ShortcutsSpec	Name for modifier on keyboard	Alt
 *InsertString \"Your Text Here\"	ShortcutsWindow		*InsereazăȘir "Textul dumneavoastră aici"
 *MouseUp	ShortcutsWindow		*MauSus
 (Choose application with file requester)	ShortcutsWindow		(Selectează aplicație cu solicitantul de fișier)
-Window	ShortcutsSpec	Name for modifier on keyboard	Fereastră
 *LaunchHandler text/html	ShortcutsWindow		*OperatorLansare text/html
 Shortcuts was couldn't open your KeySet file!	ShortcutsWindow		Scurtături nu a putut deschide fișierul dumneavoastră set de taste!
 *Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"	ShortcutsWindow		*Multi "*MutăMausLa 100% 0" "*ButonMaus 1"

data/catalogs/preferences/shortcuts/ru.catkeys

@@ -1,4 +1,4 @@
-1	russian	x-vnd.Haiku-Shortcuts	1741147146
+1	russian	x-vnd.Haiku-Shortcuts	1477375596
 Error, NULL state description?\n	ShortcutsSpec		Ошибка, состояние описания NULL?\n
 MoveMouse	ShortcutsSpec		MoveMouse
 OK	ShortcutsWindow		ОК
@@ -15,7 +15,6 @@ Alt	ShortcutsSpec	Name for modifier on keyboard	Alt
 *InsertString \"Your Text Here\"	ShortcutsWindow		*InsertString \"Ваш текст\"
 *MouseUp	ShortcutsWindow		*MouseUp
 (Choose application with file requester)	ShortcutsWindow		(Выбрать программу)
-Window	ShortcutsSpec	Name for modifier on keyboard	Window
 *LaunchHandler text/html	ShortcutsWindow		*LaunchHandler text/html
 Shortcuts was couldn't open your KeySet file!	ShortcutsWindow		Не удалось открыть список горячих клавиш!
 *Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"	ShortcutsWindow		*Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"

data/catalogs/preferences/shortcuts/sk.catkeys

@@ -1,4 +1,4 @@
-1	slovak	x-vnd.Haiku-Shortcuts	1741147146
+1	slovak	x-vnd.Haiku-Shortcuts	1477375596
 Error, NULL state description?\n	ShortcutsSpec		Chyba, NULL popis stavu?\n
 MoveMouse	ShortcutsSpec		PosunúťMyš
 OK	ShortcutsWindow		OK
@@ -15,7 +15,6 @@ Alt	ShortcutsSpec	Name for modifier on keyboard	Alt
 *InsertString \"Your Text Here\"	ShortcutsWindow		*VložiťReťazec \"Váš text sem\"
 *MouseUp	ShortcutsWindow		*MyšHore
 (Choose application with file requester)	ShortcutsWindow		(Vyberte aplikáciu pomocou žiadača súboru)
-Window	ShortcutsSpec	Name for modifier on keyboard	Okno
 *LaunchHandler text/html	ShortcutsWindow		*SpustiťObsluhu text/html
 Shortcuts was couldn't open your KeySet file!	ShortcutsWindow		Aplikácia Skratky nedokázala otvoriť váš súbor SadaKláves!
 *Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"	ShortcutsWindow		*Multi \"*PresunúťMyšNa 100% 0\" \"*TlačidloMyši 1\"

data/catalogs/preferences/shortcuts/sv.catkeys

@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Haiku-Shortcuts	1741147146
+1	swedish	x-vnd.Haiku-Shortcuts	341885426
 Error, NULL state description?\n	ShortcutsSpec		Fel: NULL i tillståndsbeskrivning?\n
 MoveMouse	ShortcutsSpec		FlyttaMus
 OK	ShortcutsWindow		OK
@@ -15,16 +15,17 @@ Alt	ShortcutsSpec	Name for modifier on keyboard	Alt
 *InsertString \"Your Text Here\"	ShortcutsWindow		*InfogaSträng \"Din text\"
 *MouseUp	ShortcutsWindow		*MusnappUpp
 (Choose application with file requester)	ShortcutsWindow		(Välj applikation i filväljarfönstret)
-Window	ShortcutsSpec	Name for modifier on keyboard	Start
 *LaunchHandler text/html	ShortcutsWindow		*StartHanterare text/html
 Shortcuts was couldn't open your KeySet file!	ShortcutsWindow		Genvägar kunde inte öppna din tagentuppsättning!
 *Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"	ShortcutsWindow		*Flera \"*FlyttaMusTill 100% 0\" \"*Musknapp 1\"
 SendMessage	ShortcutsSpec		SkickaMeddelande
 MoveMouseTo	ShortcutsSpec		FlyttaMusenTill
+Option	ShortcutsSpec	Name for modifier on keyboard	Alternativ
 Save	ShortcutsWindow		Spara
 *MouseButton 1	ShortcutsWindow		*Musknapp 1
 *MoveMouse +20 +0	ShortcutsWindow		*FlyttaMusenTill +20 +0
 MouseDown	ShortcutsSpec		MusknappNer
+Save changes before closing?	ShortcutsWindow		Spara ändringar innan programmet avslutas?
 Remove selected shortcut	ShortcutsWindow		Ta bort
 MouseButton	ShortcutsSpec		Musknapp
 Add new shortcut	ShortcutsWindow		Lägg till

data/catalogs/preferences/shortcuts/uk.catkeys

@@ -1,4 +1,4 @@
-1	ukrainian	x-vnd.Haiku-Shortcuts	1741147146
+1	ukrainian	x-vnd.Haiku-Shortcuts	1477375596
 Error, NULL state description?\n	ShortcutsSpec		Помилка, NULL опису стану?\n
 MoveMouse	ShortcutsSpec		Переміщення мишки
 OK	ShortcutsWindow		Гаразд
@@ -15,7 +15,6 @@ Alt	ShortcutsSpec	Name for modifier on keyboard	Alt
 *InsertString \"Your Text Here\"	ShortcutsWindow		*Вставити Рядок \"Ваш текст тут\"
 *MouseUp	ShortcutsWindow		*Мишку вгору
 (Choose application with file requester)	ShortcutsWindow		(Виберіть програму з файлами запису)
-Window	ShortcutsSpec	Name for modifier on keyboard	Win Key
 *LaunchHandler text/html	ShortcutsWindow		*Запустити обробник текст/html
 Shortcuts was couldn't open your KeySet file!	ShortcutsWindow		Не вдалося відкрити список гарячих клавіш!
 *Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"	ShortcutsWindow		*Багато \"*Перемістити мишку до 100% 0\" \"*Кнопка мишки1\"

data/catalogs/preferences/shortcuts/zh_Hans.catkeys

@@ -1,4 +1,4 @@
-1	english	x-vnd.Haiku-Shortcuts	3661393357
+1	english	x-vnd.Haiku-Shortcuts	3397621807
 Error, NULL state description?\n	ShortcutsSpec		错误，无效状态描述？\n
 MoveMouse	ShortcutsSpec		鼠标移动
 OK	ShortcutsWindow		确定
@@ -15,7 +15,6 @@ Alt	ShortcutsSpec	Name for modifier on keyboard	Alt
 *InsertString \"Your Text Here\"	ShortcutsWindow		*插入字符串 \"在此处写入文本\"
 *MouseUp	ShortcutsWindow		*MouseUp
 (Choose application with file requester)	ShortcutsWindow		（使用文件查询选取应用程序）
-Window	ShortcutsSpec	Name for modifier on keyboard	Window
 *LaunchHandler text/html	ShortcutsWindow		*LaunchHandler text/html
 Shortcuts was couldn't open your KeySet file!	ShortcutsWindow		无法打开您的按键设置文件！
 *Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"	ShortcutsWindow		*Multi \'*MoveMouseTo 100% 0\" \"*MouseButton 1\"

data/catalogs/preferences/virtualmemory/be.catkeys

@@ -1,5 +1,6 @@
-1	belarusian	x-vnd.Haiku-VirtualMemory	4238590117
+1	belarusian	x-vnd.Haiku-VirtualMemory	2090796060
 Quit	SettingsWindow		Выйсці
+Automatic swap management	SettingsWindow		Вызначаць аўтаматычна
 Turn off	SettingsWindow		Адключыць
 Disabling virtual memory will have unwanted effects on system stability once the memory is used up.\nVirtual memory does not affect system performance until this point is reached.\n\nAre you really sure you want to turn it off?	SettingsWindow		Адмова ад ужывання уяўнай памяці можа спарадзіць нечаканыя праблемы ў функцыянаванні праграмаў падчас працы сістэмы ў рэжыме скарыстання усёй фізічнай памяці. Але майце на ўвазе, што да таго моманту як сістэма вычарпае ўсю фізічную памяць, наладкі ўяўнай памяці ніяк ня будуць ўплываць на агульную прадукцыйнасьць сістэмы.\n\nВы упэўнены у тым, што сістэма не павінна карыстацца уяўнаю памяццю?
 Requested swap file size:	SettingsWindow		Запатрабаваны памер уяўнай памяці:

data/catalogs/preferences/virtualmemory/sv.catkeys

@@ -1,5 +1,6 @@
-1	swedish	x-vnd.Haiku-VirtualMemory	4238590117
+1	swedish	x-vnd.Haiku-VirtualMemory	2090796060
 Quit	SettingsWindow		Avsluta
+Automatic swap management	SettingsWindow		Automatisk swap hantering
 Turn off	SettingsWindow		Stäng av
 Disabling virtual memory will have unwanted effects on system stability once the memory is used up.\nVirtual memory does not affect system performance until this point is reached.\n\nAre you really sure you want to turn it off?	SettingsWindow		Om du stänger av det virtuella minnet så kommer det att orsaka instabilitet i systemet när minnet är fullt.\nVirtuellt minne påverkar inte systemets prestanda när det inte används.\n\nÄr du säker på att du vill inaktivera virtuellt minne?
 Requested swap file size:	SettingsWindow		Begärd växlingsfils storlek:

data/catalogs/servers/debug/ru.catkeys

@@ -1,3 +1,5 @@
-1	russian	x-vnd.Haiku-debug_server	3203333611
+1	russian	x-vnd.Haiku-debug_server	1440673937
+Terminate	DebugServer		Завершить
 Debug	DebugServer		Отладить
+Save report	DebugServer		Сохранить отчёт
 The application:\n\n      %app\n\nhas encountered an error which prevents it from continuing. Haiku will terminate the application and clean up.	DebugServer		Программа:\n\n      %app\n\nобнаружила ошибку, которая мешает продолжению её работы. Haiku завершит эту программу и немного приберется за ней.

data/catalogs/servers/debug/sv.catkeys

@@ -1,4 +1,5 @@
-1	swedish	x-vnd.Haiku-debug_server	857491333
+1	swedish	x-vnd.Haiku-debug_server	1440673937
 Terminate	DebugServer		Avsluta
 Debug	DebugServer		Felsök
+Save report	DebugServer		Spara rapport
 The application:\n\n      %app\n\nhas encountered an error which prevents it from continuing. Haiku will terminate the application and clean up.	DebugServer		Programmet:\n\n %app\n\nhar stött på ett fel som förhindrar den från att fortsätta. Haiku kommer att avsluta programmet och stöda upp.

data/catalogs/tests/servers/app/playground/de.catkeys

@@ -1,4 +1,4 @@
-1	german	application/x-vnd.Haiku-Playground	3841053224
+1	german	x-vnd.Haiku-Playground	3841053224
 Line	Playground		Linie
 Fill	Playground		Füllen
 Quit	Playground		Beenden

data/catalogs/tests/servers/app/playground/fi.catkeys

@@ -1,4 +1,4 @@
-1	finnish	application/x-vnd.Haiku-Playground	1375574837
+1	finnish	x-vnd.Haiku-Playground	1375574837
 Line	Playground		Rivi
 Fill	Playground		Täytä
 Over	Playground		Ylitä

data/catalogs/tests/servers/app/playground/hu.catkeys

@@ -1,4 +1,4 @@
-1	hungarian	application/x-vnd.Haiku-Playground	1375574837
+1	hungarian	x-vnd.Haiku-Playground	1375574837
 Line	Playground		Vonal
 Fill	Playground		Kitöltés
 Over	Playground		Felül

data/catalogs/tests/servers/app/playground/ja.catkeys

@@ -1,26 +1,28 @@
-1	japanese	application/x-vnd.Haiku-Playground	2051069653
+1	japanese	x-vnd.Haiku-Playground	3859386218
 Line	Playground		直線
-Fill	Playground		塗りつぶし
+Fill	Playground		塗りつぶす
+Over	Playground		上書き
 Quit	Playground		終了
-Rect	Playground		矩形
+Rect	Playground		四角形
 Select	Playground		選択
 Click and drag to draw an object	Playground		クリック＆ドラッグでオブジェクトを描いてください
 Controls	Playground		コントロール
 Round rect	Playground		角丸四角形
-Alpha:	Playground		透明度:
+Alpha:	Playground		不透明度:
-Mode:	Playground		モード:
+Mode:	Playground		描画モード:
 Submenu	Playground		サブメニュー
 Copy	Playground		コピー
 Cancel	Playground		キャンセル
 Clear	Playground		消去
 Blend	Playground		ブレンド
 Invert	Playground		反転
-Clear all drawing objects?	Playground		すべてのオブジェクトを削除しても良いですか?
+Clear all drawing objects?	Playground		オブジェクトをすべて削除しても良いですか?
 Width:	Playground		幅:
-Alpha	Playground		透明度
+Alpha	Playground		アルファ
 New object	Playground		新規オブジェクト
 Test	Playground		テスト
+Add	Playground		加算
 Playground	System name		プレイグラウンド
-Erase	Playground		削除
 File	Playground		ファイル
+Subtract	Playground		減算
 Ellipse	Playground		楕円

data/catalogs/tests/servers/app/playground/pt_BR.catkeys

@@ -1,4 +1,4 @@
-1	portuguese (brazil)	application/x-vnd.Haiku-Playground	1375574837
+1	portuguese (brazil)	x-vnd.Haiku-Playground	1375574837
 Line	Playground		Linha
 Fill	Playground		Preencher
 Over	Playground		Sobre

data/catalogs/tests/servers/app/playground/sv.catkeys

@@ -0,0 +1,32 @@
+1	swedish	x-vnd.Haiku-Playground	1375574837
+Line	Playground		Rad
+Fill	Playground		Fyll
+Over	Playground		Över
+Quit	Playground		Avsluta
+Rect	Playground		Rektangel
+Select	Playground		Välj
+Click and drag to draw an object	Playground		Klicka och dra för att rita ett object
+Controls	Playground		Kontroller
+Round rect	Playground		Rund form
+Alpha:	Playground		Alfa:
+Mode:	Playground		Läge:
+Submenu	Playground		Undermeny
+Copy	Playground		Kopiera
+Cancel	Playground		Avbryt
+Clear	Playground		Töm
+Min	Playground		Min
+Blend	Playground		Tona
+Invert	Playground		Invertera
+Clear all drawing objects?	Playground		Tabort alla ritade objekt?
+Width:	Playground		Bredd:
+Alpha	Playground		Alfa
+New object	Playground		Nytt objekt
+Test	Playground		Test
+Max	Playground		Max
+Add	Playground		Lägg till
+Playground	System name		Lekplats
+Erase	Playground		Ta bort
+File	Playground		Fil
+Subtract	Playground		Subtrahera
+<pick>	Playground		<pick>
+Ellipse	Playground		Ellips

data/system/boot/Bootscript

@@ -109,7 +109,7 @@ if [ "$SAFEMODE" != "yes" ]; then
 	launch $SERVERS/net_server				# launch net_server
 fi
 
-launch $SERVERS/app_server picasso		# launch app_server
+launch $SERVERS/app_server picasso			# launch app_server
 
 if [ "$SAFEMODE" != "yes" ]; then
 	launch $SERVERS/syslog_daemon
@@ -117,14 +117,15 @@ if [ "$SAFEMODE" != "yes" ]; then
 fi
 
 # Now ask the user if he wants to run the Installer or continue to the Desktop.
-if [ "$isReadOnly" = "yes" ]; then
+freshInstallIndicator=/boot/common/settings/fresh_install
-	# Create Installer link (using the write overlay)
+if [ "$isReadOnly" = "yes" -o -e $freshInstallIndicator ]; then
-	ln -sf /boot/system/apps/Installer /boot/home/Desktop/Installer
+	/bin/FirstBootPrompt
-
-	/bin/ReadOnlyBootPrompt
 	if [ $? -eq 0 ]; then
 		launchscript $SCRIPTS/Bootscript.cd
 		exit 0 # and return
+	elif [ "$isReadOnly" = "yes" ] ; then
+		# Create Installer link (using the write overlay)
+		ln -sf /boot/system/apps/Installer /boot/home/Desktop/Installer
 	fi
 fi
 
@@ -190,7 +191,6 @@ fi
 
 # Check for fresh install and run post install scripts.
 postInstallDir=/boot/common/boot/post_install
-freshInstallIndicator=/boot/common/settings/fresh_install
 if [ -e $freshInstallIndicator ]; then
 	# wait a moment for things to calm down a bit
 	sleep 3

docs/develop/opengl/readme

@@ -0,0 +1,120 @@
+Haiku OpenGL kit developers introduction
+
+The Haiku OpenGL kit is made up of the folwing pieces:
+
+* The "OpenGL Kit" aka libGL.so and supporting libraries.
+  This is what the user applications interact with.
+
+* The "OpenGL Add-ons" (which do the real work)
+  These are chosen by the OpenGL kit and utilized
+
+In the traditional BeOS sense, the OpenGL Add-ons are the
+vendor provided OpenGL drivers. This actually doesn't
+mesh well with the current open source OpenGL stack.
+
+Our "OpenGL Add-ons" are really wrappers around Mesa
+and Gallium code.  We gain greater OS control of OpenGL
+rendering with the drawback of increased work overall.
+The OpenGL Add-ons call private Mesa functions, thus
+we get no compatibility saftey net between Mesa versions.
+
+Our Gallium connecting Add-ons could actually fit into
+the upstream Mesa / Gallium project, however this would
+cause complications in the build process (linking in
+OpenGL and all of it's libraries into a small number of
+shared libraries is not really what the Mesa project
+designs it's stack for. Several symbol collisions exist
+when trying to link libmesa and libgallium together for
+example)
+
+Mesa drivers are the classical Mesa software rasterizers
+Gallium drivers are the new-school software drivers.
+
+
+**********
+Mesa versions
+
+The Haiku project uses two different versions of Mesa.
+
+ * Mesa 7.8.2 for gcc2 OpenGL Add-ons
+ * Mesa 9.0.1+ for gcc4 OpenGL Add-ons.
+
+The reasoning behind this is that any version of Mesa
+above 7.8.2 will require a *massive* porting effort to
+make it compile under gcc2.  Given this fact, it makes
+sense to bump the gcc2 version of Mesa as far as it will
+go and set it there statically.  Think of Mesa 7.8.2
+as the "stable" version Haiku R1 will use :)
+
+Hardware 3D rendering and llvm-based software rendering
+will never work for legacy gcc2 applications. Period.
+
+However!  If you're running a gcc2 hybrid version of
+Haiku, llvm or hardware based rendering should be possible
+on gcc4 applications.
+
+It is *essential* to upgrade our build Mesa packages
+with the latest release Mesa versions.  If we fall too
+far behind the update gets extremely tricky as functions
+inside Mesa and Gallium change at a fast pace.
+
+
+**********
+gcc2 OpenGL kit
+
+The following process occurs in order to generate the
+gcc2  (Mesa 7.8.2) OpenGL kit:
+
+* Some kind soul compiles a Mesa optional package on a
+  gcc2 Haiku system with the bep on haikuports.  This
+  gets uploaded to Haiku-files and the package name
+  / version gets updated as in the BuildFeatures jam
+  build script.
+
+  - The bep generally applies a few minimal patches to
+    Mesa 7.8.2 and compiles it. Then it rounds up all of
+    the headers and static libraries and throws them into
+    a .zip for the build
+
+* Someone starts a gcc2 Haiku build.  The build process pulls
+  down the Mesa optional package above and links the needed
+  parts into libGL and the swrast_legacy OpenGL add-on
+
+
+**********
+gcc4 OpenGL kit
+
+The following process occurs in order to generate the
+gcc4  (Mesa 9.0.1+) OpenGL kit:
+
+* Some kind soul compiles a Mesa optional package on a
+  gcc4 Haiku system with the bep on haikuports.  This
+  gets uploaded to Haiku-files and the package name
+  / version gets updated as in the BuildFeatures jam
+  build script.
+
+  - The kind soul also needs to install the LLVM Optional
+    build package on his build machine *before* compiling
+    the Mesa bep. (unless he or she doesn't want llvmpipe
+    rendering)
+
+  - The bep for Mesa 9.0.1+ doesn't apply too many patches as
+    Haiku build fixes are accepted upstream.
+
+  - The bep rounds up all of the headers and static
+    libraries and throws them into a .zip for the build
+
+* Someone starts a gcc4 Haiku build.  The build process pulls
+  down the Mesa optional package above and links the needed
+  parts into libGL and OpenGL add-ons.
+
+  - If the user didn't link in LLVM, he can disable the LLVM
+    dependencies in the OpenGL kit Jamfile. swpipe will
+    automagically fall back to softpipe rendering
+
+  - The build system will download the LLVM optional package
+    and link it into any OpenGL add-ons that need it.
+
+    !! The LLVM optional package needs to match the LLVM
+       binaries on the machine which compiled Mesa
+    !!

docs/user/app/Application.dox

@@ -387,10 +387,10 @@ main()
 
 /*!
 	\fn BWindow* BApplication::WindowAt(int32 index) const
-	\brief Returns the BWindow object at the specified index in the
+	\brief Returns the BWindow object at the specified \a index in the
 		application's window list.
-		
+
-	If index is out of range, this function returns \c NULL.
+	If \a index is out of range, this function returns \c NULL.
 
 	\warning Locking the BApplication object doesn't lock the window list.
 
@@ -520,7 +520,8 @@ main()
 	If the \a rate is set to 0 then the \c B_PULSE messages are not sent.
 	The pulse rate can be no faster than once per 100,000 microseconds or so.
 
-	\param rate The rate \a B_PULSE messages are sent to the application.
+	\param rate The rate at which \c B_PULSE messages are sent to the
+		application.
 */
 
 

docs/user/app/Handler.dox

@@ -26,7 +26,7 @@
 /*!
 	\def B_OBSERVE_ORIGINAL_WHAT
 	\brief Constant for a message data field in observer messages.
-	
+
 	If you have called one of the flavors of BHandler::StartWachting(), and
 	you receive a notification, sometimes there can be send a BMessage to go
 	with that notification. The message you receive is a copy of that message,
@@ -52,17 +52,17 @@
 	\class BHandler
 	\ingroup app
 	\brief Handles messages that are passed on by a BLooper.
-	
+
 	The BHandler class implements two important pieces of functionality. It
 	provides the foundations for <b>handling messages</b>, and it serves as a
 	<b>state machine</b> that sends out notifications of the state changes.
-	
+
 	The most common use of this class is to <b>handle messages</b>. Handlers
 	can be tied to loopers, which are the objects that send and receive
 	messages. As soon as a message is received, the looper passes through its
 	list of associated handlers and tries them in a certain order until the
 	message is handled, or the options are exhausted.
-	
+
 	You should know that a looper is a subclass of a handler, and as such,
 	loopers can be self-contained and do not need additional handlers. In many
 	cases, this construction will suffice. You will simply subclass the looper,
@@ -74,18 +74,18 @@
 	messages such as clicks are received, the window loops the handlers until
 	there is a handler that is at the screen position the click was in. It is
 	not unlikely that you will some day want to use this functionality of the
-	API. 
+	API.
-	
+
 	If your handler is limited to a certain type of messages, you can set a
 	filter that the looper will apply to your message before passing it on to
 	your overridden MessageReceived() method. The BMessageFilter class provides
 	the framework for the flexible filtering options, and using AddFilter() you
 	can apply filters to this handler. Note that a filter object should only be
 	applied to one handler. They cannot be shared.
-	
+
 	For more information on the handling chain, have a look at the
 	documentation of the BLooper class.
-	
+
 	Using BHandler as a <b>state machine</b> is a second area of functionality.
 	Since handlers process messages, and perform actions associated with those,
 	they are the center of keeping track on the current state of things within
@@ -93,7 +93,7 @@
 	parts of your application, you could perform this manually by sending
 	messages to the interested components, or you can use the more flexible
 	approach with observers.
-	
+
 	Observers watch a certain state. A handler can track one or more different
 	states. Each state is represented by a four byte constant - just like the
 	\c what property of a message. Using the StartWatching() methods, you can
@@ -105,7 +105,7 @@
 	that you want to be send to the observers. This data is in the form of the
 	very flexible BMessage, as such you are almost free to pass anything you
 	want.
-	
+
 	Whenever SendNotices() is called, all interested observers will receive a
 	message of the \a B_OBSERVER_NOTICE_CHANGE type. Please note that the
 	constant that is associated with the state itself is not transmitted. If
@@ -119,9 +119,9 @@
 
 
 /*!
-	\fn BHandler::BHandler(const char* name = NULL)
+	\fn BHandler::BHandler(const char *name)
 	\brief Construct a new handler with a \a name.
-	
+
 	The newly constructed handler is not associated with a looper until you
 	explicitly request this to happen. To associate this handler with a looper,
 	use BLooper::AddHandler().
@@ -131,11 +131,11 @@
 /*!
 	\fn BHandler::~BHandler()
 	\brief Free the filters of this handler, as well as the list of observers.
-	
+
 	This method does not remove the handler from the looper to which this
 	handler is associated. You should do this yourself, using
 	BLooper::RemoveHandler().
-	
+
 	\warning This constructor does no type check whatsoever. Since you can pass
 		any BMessage, you should - if you are not sure about the exact type -
 		use the Instantiate() method, which does check the type.
@@ -145,7 +145,7 @@
 /*!
 	\fn BArchivable *BHandler::Instantiate(BMessage *data)
 	\brief Static method to instantiate a handler from an archived message.
-	
+
 	\return A pointer to the instantiated handler, or \c NULL if the \a data
 		is not a valid archived BHandler object.
 	\see BHandler(BMessage* data)
@@ -156,18 +156,19 @@
 
 /*!
 	\name Archiving
+
 	BHandler inherits the BArchivable class, and as such implements support for
 	archiving and unarchiving handlers.
 */
 
 
 //! @{
-	
+
-	
+
 /*!
 	\fn BHandler::BHandler(BMessage* data)
 	\brief Construct a handler from an archived message.
-	
+
 	This \a data has to be created using the BHandler::Archive() method.
 	Note that only the name is stored. The filters, the associated looper and
 	the observers are not stored, and should be manually added when you are
@@ -178,10 +179,10 @@
 /*!
 	\fn status_t BHandler::Archive(BMessage *data, bool deep) const
 	\brief Archive a handler to a message
-	
+
 	Currently, only the name is archived. The filters, the associated looper
 	and the observers are not stored. 
-	
+
 	\param data The message to archive the object in.
 	\param deep This parameter is ignored, as BHandler does not have children.
 	\retval B_OK Archiving succeeded.
@@ -206,13 +207,13 @@
 
 /*!
 	\fn void BHandler::MessageReceived(BMessage *message)
-	\brief Handle a message that has been received by the associated looper.
+	\brief Handle \a message that has been received by the associated looper.
 
 	This method is reimplemented by subclasses. If the messages that have
 	been received by a looper pass through the filters, then they end up in
 	the MessageReceived() methods.
 
-	The example below shows a very common way to handle message. Usually,
+	The example below shows a very common way to handle \a message. Usually,
 	this involves parsing the BMessage::what constant and then perform an
 	action based on that. 
 
@@ -239,13 +240,13 @@ ShowImageApp::MessageReceived(BMessage *message)
 }
 \endcode
 
-	If your handler cannot process this message, you should pass it on
+	If your handler cannot process this \a message, you should pass it on
 	to the base class. Eventually, it will reach the base implementation,
 	which will reply with \c B_MESSAGE_NOT_UNDERSTOOD.
 
 	\attention If you want to keep or manipulate the \a message, have a
 		look at BLooper::DetachCurrentMessage() to receive ownership of
-		the message.
+		the \a message.
 
 	\param message The message that needs to be handled.
 */
@@ -279,19 +280,19 @@ ShowImageApp::MessageReceived(BMessage *message)
 /*!
 	\fn void BHandler::SetNextHandler(BHandler *handler)
 	\brief Set the next handler in the chain that the message is passed on to
-		if this handler cannot process it.
+		if this \a handler cannot process it.
-	
+
 	This method has three requirements:
-	-# This handler should belong to a looper.
+	-# This \a handler should belong to a looper.
 	-# The looper needs to be locked. See LockLooper().
 	-# The \a handler that you pass must be associated with the same looper.
-	
+
 	Failure to meet any of these requirements will result in your application
 	crashing.
-	
+
 	By default, the handlers are chained in order that they were associated to
 	a looper with BLooper::AddHander().
-	
+
 	\see NextHandler()
 */
 
@@ -316,36 +317,36 @@ ShowImageApp::MessageReceived(BMessage *message)
 
 
 //! @{
-	
+
-	
+
 /*!
 	\fn void BHandler::AddFilter(BMessageFilter *filter)
-	\brief Add a filter as a prerequisite to this handler.
+	\brief Add \a filter as a prerequisite to this handler.
-	
+
 	If the handler is associated with a looper, this looper needs to be locked
 	in order for this operation to succeed.
-	
+
-	Note that the filter is not copied, rather a pointer to the filter is
+	Note that the filter is not copied, rather a pointer to the \a filter is
-	stored. As such, you need to make sure that the filter object exists as
+	stored. As such, you need to make sure that the \a filter object exists as
 	long as it is added to this handler.
-	
+
 	\see RemoveFilter(), SetFilterList()
 */
 
 
 /*!
 	\fn bool BHandler::RemoveFilter(BMessageFilter *filter)
-	\brief Remove a filter from the filter list.
+	\brief Remove \a filter from the filter list.
-	
+
 	If the handler is associated with a looper, this looper needs to be locked
 	in order for this operation to succeed.
-	
+
-	Note that the filter is not deleted, merely removed from the list. You need
+	Note that the \a filter is not deleted, merely removed from the list. You
-	to take care of the memory yourself.
+	need to take care of the memory yourself.
-	
+
-	\retval true The filter was in the filter list and is removed.
+	\retval true The \a filter was in the filter list and is removed.
-	\retval false The filter was not found in the filter list.
+	\retval false The \a filter was not found in the filter list.
-	
+
 	\see AddFilter(), FilterList()
 */
 
@@ -356,7 +357,7 @@ ShowImageApp::MessageReceived(BMessage *message)
 
 	If the handler is associated with a looper, this looper needs to be locked
 	in order for this operation to succeed.
-	
+
 	The internal list will be replaced with the new list of \a filters. All the
 	existing filters will be \b deleted.
 
@@ -367,11 +368,11 @@ ShowImageApp::MessageReceived(BMessage *message)
 /*!
 	\fn BList *BHandler::FilterList()
 	\brief Return a pointer to the list of filters.
-	
+
 	\return A pointer to the list of filters. Do not manipulate the list of
 		filters directly, but use the methods provided by this class, in order
 		to maintain internal consistency.
-		
+
 	\see AddFilter(), RemoveFilter(), SetFilterList().
 */
 
@@ -384,22 +385,22 @@ ShowImageApp::MessageReceived(BMessage *message)
 
 /*!
 	\name Locking
-	
+
 	This class provides some utility functions to look the looper associated
 	with this handler.
 */
 
 
 //! @{
-	
+
-	
+
 /*!
 	\fn bool BHandler::LockLooper()
 	\brief Lock the looper associated with this handler.
-	
+
 	\retval true The looper is locked.
 	\retval false There was an error acquiring the lock.
-	
+
 	\see LockLooperWithTimeout(), UnlockLooper()
 */
 
@@ -407,16 +408,16 @@ ShowImageApp::MessageReceived(BMessage *message)
 /*!
 	\fn status_t BHandler::LockLooperWithTimeout(bigtime_t timeout)
 	\brief Lock the looper associated with this handler, with a time out value.
-	
+
 	\param timeout The time to wait for acquiring the lock in microseconds. You
 		may also use B_INFINITE_TIMEOUT, in which this method will wait as long
 		as it takes to acquire the lock.
-	
+
 	\retval B_OK Locking succeeded.
 	\retval B_BAD_VALUE This handler is not associated with a looper (anymore).
 	\retval B_TIMED_OUT The time specified in \a timeout has passed without
 		locking the looper.
-	
+
 	\see LockLooper(), UnlockLooper()
 */
 
@@ -463,16 +464,16 @@ ShowImageApp::MessageReceived(BMessage *message)
 
 /*!
 	\name Observing
-	
+
 	Handlers can function as state machines, which emit messages to observers
 	when the state changes. Use the following methods to subscribe to these
 	notifications.
-	
+
 	Note that there is a semantic difference between the two StartWatching()
 	methods. The overloaded method that accepts a BHandler, expects as
-	argument an \a observer that watches <em>this handler</em>. The method that
+	argument an \a observer that watches this handler. The method that
 	accepts a BMessenger, expects a \a target that emits the state changes
-	<em>to this handler</em>.
+	to this handler.
 */
 
 
@@ -483,25 +484,26 @@ ShowImageApp::MessageReceived(BMessage *message)
 	\fn status_t BHandler::StartWatching(BMessenger target, uint32 what)
 	\brief Subscribe this handler to watch a specific state change of a
 		\a target.
-	
+
-	Use this method to subscribe messengers to watch state changes in <em>this
+	Use this method to subscribe messengers to watch state changes in this
-	handler</em>. This means that also observers  from other teams can be
+	handler, this also means that observers from other teams can be
 	subscribed.
-	
+
 \code
-	// Handler B watches Handler A
+// Handler B watches Handler A
-	BHandler A, B;
+BHandler A, B;
-	BMessenger messengerA(&A)
+BMessenger messengerA(&A)
-	
+
-	B.StartWatching(messengerA, kNetworkConnection);
+B.StartWatching(messengerA, kNetworkConnection);
 \endcode
-	
+
 	\param target The messenger from which the notifications would be
 		received.
 	\param what The state that needs to be watched.
 	\return During the call of this method, a notification will be transmitted
 		using the \a target. If this works, then this method will return
 		\c B_OK.
+
 	\see StartWatchingAll(BMessenger), StopWatching(BMessenger, uint32)
 */
 
@@ -509,10 +511,10 @@ ShowImageApp::MessageReceived(BMessage *message)
 /*!
 	\fn status_t BHandler::StartWatchingAll(BMessenger target)
 	\brief Subscribe this handler to watch a \a target for all events.
-	
+
 	This method performs the same task as StartWatching(BMessenger, uint32),
 	but it will subscribe to all the state changes the \a target knows. 
-	
+
 	\see StartWatching(BMessenger, uint32), StopWatchingAll(BMessenger)
 */
 
@@ -520,10 +522,10 @@ ShowImageApp::MessageReceived(BMessage *message)
 /*!
 	\fn status_t BHandler::StopWatching(BMessenger target, uint32 what)
 	\brief Unsubscribe this handler from watching a specific state.
-	
+
 	This method will unsubscribe this handler from watching a specific event
 	in a \a target.
-	
+
 	\see StartWatching(BMessenger, uint32)
 */
 
@@ -531,9 +533,9 @@ ShowImageApp::MessageReceived(BMessage *message)
 /*!
 	\fn status_t BHandler::StopWatchingAll(BMessenger target)
 	\brief Unsubscribe this handler from watching all states.
-	
+
 	This method will unsubscribe the \a target from watching all state changes.
-	
+
 	\see StartWatchingAll(BMessenger)
 */
 
@@ -541,39 +543,39 @@ ShowImageApp::MessageReceived(BMessage *message)
 /*!
 	\fn status_t BHandler::StartWatching(BHandler* observer, uint32 what)
 	\brief Subscribe an \a observer for a specific state change of this handler.
-	
+
 	Use this method to subscribe observers to watch this handler. State changes
-	of this handler that match the \a what argment, will be sent.
+	of this handler that match the \a what argument, will be sent.
 
 \code
-	// Handler B wants to observe Handler A
+// Handler B wants to observe Handler A
-	BHandler A, B;
+BHandler A, B;
-	
+
-	A.StartWatching(&B, kNetworkConnection);
+A.StartWatching(&B, kNetworkConnection);
 \endcode
 
 	Since pointers to handlers can only
 	exist in the local namespace, have a look at
 	StartWatching(BMessenger, uint32) for inter-team watching. 
-	
+
 	\param observer The observer for this handler.
 	\param what The state that needs to be watched.
 	\return During the call of this method, a notification will be transmitted
 		using the \a observer. If this works, then this method will return
 		\c B_OK.
-	
+
 	\see StartWatchingAll(BHandler*), StopWatching(BHandler*, uint32)	
 */
 
 
 /*!
 	\fn status_t BHandler::StartWatchingAll(BHandler* observer)
-	\brief  Subscribe an \a observer for a all state changes.
+	\brief Subscribe an \a observer for a all state changes.
-	
+
 	This method performs the same task as StartWatching(BHandler, uint32),
 	but it will subscribe the \a observer to all the state changes this handler
 	tracks.
-	
+
 	\see StartWatching(BHandler*, uint32), StopWatchingAll(BHandler*)	
 */
 
@@ -591,9 +593,9 @@ ShowImageApp::MessageReceived(BMessage *message)
 /*!
 	\fn status_t BHandler::StopWatchingAll(BHandler* handler)
 	\brief Unsubscribe an observer from watching all states.
-	
+
 	This method will unsubscribe the \a handler from watching all state changes.
-	
+
 	\see StartWatchingAll(BHandler*)
 */
 
@@ -606,6 +608,7 @@ ShowImageApp::MessageReceived(BMessage *message)
 
 /*!
 	\name Emitting State Changes
+
 	If your handler functions as a state machine, and it has observers (which
 	subscribed using the StartWatching() method), you can emit these state
 	changes.
@@ -613,12 +616,12 @@ ShowImageApp::MessageReceived(BMessage *message)
 
 
 //! @{
-	
+
-	
+
 /*!
 	\fn void BHandler::SendNotices(uint32 what, const BMessage *msg)
 	\brief Emit a state change to the observers.
-	
+
 	The actual state (specified by \a what) will not be transmitted. This is
 	merely for internal bookkeeping. It is not entirely unimaginable that you
 	still want to inform the observers of what actually took place. You can
@@ -626,13 +629,13 @@ ShowImageApp::MessageReceived(BMessage *message)
 	message will be copied and slightly altered: the \c what member of the
 	message will be \c B_OBSERVER_NOTICE_CHANGE, and the \c what constant you
 	specified will be stored in the #B_OBSERVE_ORIGINAL_WHAT label.
-	
+
 	\param what The identifier of the state.
 	\param msg Any data associated with the state change. You retain ownership
 		of this data, so make sure you dispose it when you are done.
 */
-	
+
-	
+
 /*!
 	\fn bool BHandler::IsWatched() const
 	\brief Check if there are any observers watching this handler.
@@ -640,4 +643,3 @@ ShowImageApp::MessageReceived(BMessage *message)
 
 
 //! @}
-

docs/user/book.css

@@ -259,6 +259,10 @@ div.contents em, div.contents code {
 	font-style: normal;
 }
 
+div.contents em {
+	color: #dc3c01; /* grenadier */
+}
+
 div.contents code {
 	color: blue;
 }
@@ -309,10 +313,6 @@ div.contents li {
 	margin-left: 20px;
 }
 
-div.contents dd {
-	font-size: 12px;
-}
-
 div.contents dt {
 	margin-top: 16px;
 	margin-bottom: 8px;
@@ -328,6 +328,10 @@ dl.note, dl.remark, dl.warning, dl.attention {
 	min-height: 48px;
 }
 
+dl.note dd, dl.remark dd, dl.warning dd, dl.attention dd {
+	font-size: 12px;
+}
+
 dl.note {
 	/* rice flower */
 	background:#e4ffde url('http://haiku-os.org/sites/haiku-os.org/themes/shijin/haiku-icons/alert_info_32.png') 15px 15px no-repeat;
@@ -764,6 +768,7 @@ div.memdoc dl dd table.params td.paramname {
 	vertical-align: top;
 	font-weight: normal;
 	font-style: normal;
+	color: #dc3c01; /* grenadier */
 	width: 157px;
 }
 

docs/user/locale/DurationFormat.dox

@@ -50,8 +50,7 @@
 
 
 /*!
-	\fn BDurationFormat&
+	\fn BDurationFormat& BDurationFormat::operator=(const BDurationFormat& other)
-		BDurationFormat::operator=(const BDurationFormat& other)
 	\brief Assignment overload.
 
 	\param other The BDurationFormat object to copy from.

docs/user/storage/FilePanel.dox

@@ -62,7 +62,7 @@
 
 
 /*!
-	\fn virtual bool Filter(const entry_ref* ref, BNode* node,
+	\fn virtual bool BRefFilter::Filter(const entry_ref* ref, BNode* node,
 		struct stat_beos* stat, const char* mimeType)
 	\brief Hook method that's called on each file in the target directory
 		displayed by a file panel.

docs/user/storage/Mime.dox

@@ -0,0 +1,187 @@
+/*
+ * Copyright 2013 Haiku Inc.
+ * Distributed under the terms of the MIT License.
+ *
+ * Documentation by:
+ *		Ingo Weinhold, [email protected]
+ *		John Scipione, [email protected]
+ *
+ * Corresponds to:
+ *		/trunk/headers/os/storage/Mime.h	 hrev45224
+ *		/trunk/src/kits/storage/Mime.cpp	 hrev45224
+ */
+
+
+/*!
+	\file Mime.h
+	\ingroup storage
+	\brief Provides C and Haiku-only C++ MIME-type handling functions.
+*/
+
+
+/*!
+	\enum icon_size
+	\brief Legacy BeOS icon size constants.
+*/
+
+
+/*!
+	\var icon_size B_LARGE_ICON
+
+	32x32 "Large" icon.
+*/
+
+
+/*!
+	\var icon_size B_MINI_ICON
+
+	16x16 "Mini" icon.
+*/
+
+
+/*!
+	\var B_UPDATE_MIME_INFO_NO_FORCE
+
+	Files that already have a \c BEOS:TYPE attribute won't be updated.
+*/
+
+
+/*!
+	\var B_UPDATE_MIME_INFO_FORCE_KEEP_TYPE
+
+	Files that already have a \c BEOS:TYPE attribute will be updated too, but
+	\c BEOS:TYPE itself will remain untouched.
+*/
+
+
+/*!
+	\var B_UPDATE_MIME_INFO_FORCE_UPDATE_ALL
+
+	Similar to \c B_UPDATE_MIME_INFO_FORCE_KEEP_TYPE, but the \c BEOS:TYPE
+	attribute will be updated too.
+*/
+
+
+/*!
+	\fn status_t do_mime_update(int32 what, const char *path, int recursive,
+		int synchronous, int force)
+	\brief Helper function that contacts the registrar for mime update calls.
+
+	\param what The message identifier.
+	\param path The path to a file or directory, or \c NULL.
+	\param recursive Triggers recursive behavior if not \c NULL.
+	\param synchronous If not \c NULL update_mime_info() waits until the
+		   operation is finished, otherwise it returns immediately and the
+		   update is done asynchronously.
+	\param force Specifies how to handle files that already have MIME
+		   information.
+
+	\returns A status code.
+
+	\see update_mime_info
+*/
+
+
+/*!
+	\fn int update_mime_info(const char *path, int recursive, int synchronous,
+		int force)
+	\brief Updates the MIME information (i.e MIME type) for one or more files.
+
+	If \a path points to a file, the MIME information for this file are
+	updated only. If it points to a directory and \a recursive is non-null,
+	the information for all the files in the given directory tree are updated.
+	If path is \c NULL all files are considered; \a recursive is ignored in
+	this case.
+
+	\param path The path to a file or directory, or \c NULL.
+	\param recursive Triggers recursive behavior if not \c NULL.
+	\param synchronous If not \c NULL update_mime_info() waits until the
+		operation is finished, otherwise it returns immediately and the
+		update is done asynchronously.
+	\param force Specifies how to handle files that already have MIME
+		   information. See enum definitions for more information.
+		- \c B_UPDATE_MIME_INFO_NO_FORCE
+		- \c B_UPDATE_MIME_INFO_FORCE_KEEP_TYPE
+		- \c B_UPDATE_MIME_INFO_FORCE_UPDATE_ALL
+
+	\returns A status code. \c B_OK if everything went fine, an error code
+		otherwise.
+*/
+
+
+/*!
+	\fn status_t create_app_meta_mime(const char *path, int recursive,
+		int synchronous, int force)
+	\brief Creates a MIME database entry for one or more applications.
+
+	If \a path points to an application file, a MIME DB entry is create for
+	the application. If it points to a directory and \a recursive is not
+	\c NULL then entries are created for all application files in the given
+	directory tree. If path is \c NULL then all files are considered and
+	\a recursive is ignored.
+
+	\param path The path to an application file, a directory, or \c NULL.
+	\param recursive Trigger recursive behavior if not \c NULL.
+	\param synchronous Waits until the operation is finished if not \c NULL,
+		otherwise it returns immediately and the operation is done
+		asynchronously.
+	\param force Entries are created even if they do already exist if not
+		\c NULL.
+
+	\returns A status code. \c B_OK if everything went fine, an error code
+		otherwise.
+*/
+
+
+/*!
+	\fn status_t get_device_icon(const char *device, void *icon, int32 size)
+	\brief Retrieves an icon associated with a given device.
+
+	\param device The path to the device.
+	\param icon A pointer to a buffer the icon data shall be written to.
+	\param size The size of the icon to retrieve. Currently 16
+		(\c B_MINI_ICON) and 32 (\c B_LARGE_ICON) are supported.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_BAD_VALUE \a device or \a icon was \c NULL.
+	\retval B_NO_MEMORY Ran out of memory allocating bitmap.
+*/
+
+
+/*!
+	\fn status_t get_device_icon(const char *device, BBitmap *icon,
+		icon_size which)
+	\brief Retrieves an icon associated with a given device into a BBitmap.
+
+	\param device The path to the device.
+	\param icon A pointer to a pre-allocated BBitmap of the correct dimension
+		   to store the requested icon (16x16 for the mini and 32x32 for the
+		   large icon).
+	\param which The size of the icon to retrieve. Currently 16
+		(\c B_MINI_ICON) and 32 (\c B_LARGE_ICON) are supported.
+
+	\returns A status code. \c B_OK if everything went fine, an error code
+		otherwise.
+*/
+
+
+/*!
+	\fn status_t get_device_icon(const char* device, uint8** _data,
+		size_t* _size, type_code* _type);
+	\brief Undocumented.
+*/
+
+
+/*!
+	\fn status_t get_named_icon(const char* name, BBitmap* icon,
+		icon_size which);
+	\brief Undocumented.
+*/
+
+
+/*!
+	\fn status_t get_named_icon(const char* name, uint8** _data, 
+		size_t* _size, type_code* _type);
+	\brief Undocumented.
+*/

headers/private/graphics/common/edid_raw.h

@@ -1,6 +1,13 @@
 /*
  * Copyright 2003, Thomas Kurschel. All Rights Reserved.
  * Distributed under the terms of the MIT License.
+ *
+ * Copyright 2006-2013 Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *	Thomas Kurschel
+ *	Bill Randle, billr@neocat.org
  */
 #ifndef _EDID_RAW_H
 #define _EDID_RAW_H
@@ -224,12 +231,13 @@ typedef struct _PACKED {
 	);
 	uint8 h_border;
 	uint8 v_border;
-	BBITFIELD8_4 (
+	BBITFIELD8_5 (
 		interlaced : 1,
 		stereo : 2,		// upper bit set - left on sync
 						// lower bit set - right on sync
 		sync : 2,
-		misc : 2
+		misc : 2,
+		stereo_il : 1
 	);
 } edid1_detailed_timing_raw;