Merge branch 'master' into sam460ex

2012-12-24 01:52:39 +01:00
parent 0e4a0c0e7f 16b8573bae
commit be95f65a23
171 changed files with 4551 additions and 1382 deletions
@@ -230,13 +230,9 @@ if $(TARGET_ARCH) = x86 {

 # Mesa
 if $(TARGET_ARCH) = x86 {
-	local glslObject ;
-	local galliumObjects ;
 	local zipFile ;
 	if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		HAIKU_MESA_FILE = mesa-9.0-x86-gcc4-2012-11-17.zip ;
-		glslObject = lib.haiku/libglsl.a ;
-		galliumObjects = lib.haiku/libgallium.a ;
+		HAIKU_MESA_FILE = mesa-9.0.1-x86-gcc4-2012-12-21.zip ;
 	} else {
 		HAIKU_MESA_FILE = mesa-7.8.2-x86-gcc2-2012-01-17.zip ;
 	}
@@ -250,19 +246,41 @@ if $(TARGET_ARCH) = x86 {
 	HAIKU_MESA_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_MESA_DIR)
 		: include/ : $(zipFile) : extracted-mesa ] ;

-	HAIKU_MESA_LIBS = [ ExtractArchive $(HAIKU_MESA_DIR)
+	HAIKU_GLAPI_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
 		:
-		$(galliumObjects)
 		lib.haiku/libglapi.a
-		$(glslObject)
+		: $(zipFile)
+		: extracted-mesa ] ;
+	HAIKU_GLSL_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
+		:
+		lib.haiku/libglsl.a
+		: $(zipFile)
+		: extracted-mesa ] ;
+	HAIKU_MESA_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
+		:
 		lib.haiku/libmesa.a
 		: $(zipFile)
 		: extracted-mesa ] ;
+	HAIKU_GALLIUM_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
+		:
+		lib.haiku/libgallium.a
+		: $(zipFile)
+		: extracted-mesa ] ;
+	HAIKU_GALLIUM_SOFTPIPE_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
+		:
+		lib.haiku/libsoftpipe.a
+		: $(zipFile)
+		: extracted-mesa ] ;
+	HAIKU_GALLIUM_LLVMPIPE_LIB = [ ExtractArchive $(HAIKU_MESA_DIR)
+		:
+		lib.haiku/libllvmpipe.a
+		: $(zipFile)
+		: extracted-mesa ] ;

 	HAIKU_MESA_HEADERS = [ FDirName $(HAIKU_MESA_DIR) include ] ;

 	Depends $(HAIKU_MESA_HEADERS_DEPENDENCY) : $(HAIKU_GLU_HEADERS_DEPENDENCY) ;
-	Depends $(HAIKU_MESA_LIBS) : $(HAIKU_GLU_LIBS) ;
+	Depends $(HAIKU_GLAPI_LIBS) : $(HAIKU_GLU_LIBS) ;

 	EnableBuildFeatures mesa ;
 } else {
@@ -527,10 +545,13 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
 	HAIKU_BUILD_FEATURE_WEBKIT = 1 ;
 }

-HAIKU_WEBKIT_FILE = haikuwebkit-1.1.3-x86-gcc4-2012-08-31a.zip ;
-
+if $(TARGET_ARCH) = x86 {
+	HAIKU_WEBKIT_FILE = haikuwebkit-1.1.3-x86-gcc4-2012-08-31a.zip ;
+} else if $(TARGET_ARCH) = x86_64 {
+	HAIKU_WEBKIT_FILE = haikuwebkit-1.1.3-x86_64-gcc4-2012-12-22.zip ;
+}
 if $(HAIKU_BUILD_FEATURE_WEBKIT) {
-	if $(TARGET_ARCH) != x86 {
+	if $(TARGET_ARCH) != x86 && $(TARGET_ARCH) != x86_64 {
 		Echo "WebKit support not available on $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) < 4 {
 		if ! $(isHybridBuild) {
@@ -23,8 +23,8 @@ SYSTEM_BIN = "[" addattr base64 basename bash beep cal cat catattr checkfs
 	zmore znew
 ;

-SYSTEM_APPS = AboutSystem ActivityMonitor DriveSetup Installer NetworkStatus
-	ProcessController StyledEdit Terminal
+SYSTEM_APPS = AboutSystem ActivityMonitor Debugger DriveSetup Installer
+	NetworkStatus ProcessController StyledEdit Terminal
 ;

 SYSTEM_PREFERENCES = Appearance Backgrounds <preference>Deskbar FileTypes
@@ -446,16 +446,22 @@ if [ IsOptionalHaikuImagePackageAdded CCache ] {

 # CDRecord
 if [ IsOptionalHaikuImagePackageAdded CDRecord ] {
-	if $(TARGET_ARCH) != x86 {
-		Echo "No optional package CDRecord available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+	if $(TARGET_ARCH) = x86 {
+		if $(HAIKU_GCC_VERSION[1]) >= 4 {
+			InstallOptionalHaikuImagePackage
+				cdrtools-3.01a07-r1a4-x86-gcc4-2012-08-30.zip
+				: $(baseURL)/cdrtools-3.01a07-r1a4-x86-gcc4-2012-08-30.zip ;
+		} else {
+			InstallOptionalHaikuImagePackage
+				cdrtools-3.01a07-r1a4-x86-gcc2-2012-08-28.zip
+				: $(baseURL)/cdrtools-3.01a07-r1a4-x86-gcc2-2012-08-28.zip ;
+		}
+	} else if $(TARGET_ARCH) = x86_64 {
 		InstallOptionalHaikuImagePackage
-			cdrtools-3.01a07-r1a4-x86-gcc4-2012-08-30.zip
-			: $(baseURL)/cdrtools-3.01a07-r1a4-x86-gcc4-2012-08-30.zip ;
+			cdrtools-3.01a07-x86_64-2012-12-17.zip
+			: $(baseURL)/cdrtools-3.01a07-x86_64-2012-12-17.zip ;
 	} else {
-		InstallOptionalHaikuImagePackage
-			cdrtools-3.01a07-r1a4-x86-gcc2-2012-08-28.zip
-			: $(baseURL)/cdrtools-3.01a07-r1a4-x86-gcc2-2012-08-28.zip ;
+		Echo "No optional package CDRecord available for $(TARGET_ARCH)" ;
 	}
 }

@@ -576,23 +582,29 @@ if [ IsOptionalHaikuImagePackageAdded Ctags ] {

 # Curl
 if [ IsOptionalHaikuImagePackageAdded Curl ] {
-	if $(TARGET_ARCH) != x86 {
-		Echo "No optional package Curl available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		InstallOptionalHaikuImagePackage curl-7.26.0-r1a4-x86-gcc4-2012-08-29.zip
-			: $(baseURL)/curl-7.26.0-r1a4-x86-gcc4-2012-08-29.zip ;
+	if $(TARGET_ARCH) = x86 {
+		if $(HAIKU_GCC_VERSION[1]) >= 4 {
+			InstallOptionalHaikuImagePackage
+				curl-7.26.0-r1a4-x86-gcc4-2012-08-29.zip
+				: $(baseURL)/curl-7.26.0-r1a4-x86-gcc4-2012-08-29.zip ;
+		} else {
+			InstallOptionalHaikuImagePackage
+				curl-7.26.0-r1a4-x86-gcc2-2012-08-28.zip
+				: $(baseURL)/curl-7.26.0-r1a4-x86-gcc2-2012-08-28.zip ;
+		}
+	} else if $(TARGET_ARCH) = x86_64 {
+		InstallOptionalHaikuImagePackage
+			curl-7.28.1-x86_64-2012-12-18.zip
+			: $(baseURL)/curl-7.28.1-x86_64-2012-12-18.zip ;
 	} else {
-		InstallOptionalHaikuImagePackage curl-7.26.0-r1a4-x86-gcc2-2012-08-28.zip
-			: $(baseURL)/curl-7.26.0-r1a4-x86-gcc2-2012-08-28.zip ;
+		Echo "No optional package Curl available for $(TARGET_ARCH)" ;
 	}
 }


 # CVS
 if [ IsOptionalHaikuImagePackageAdded CVS ] {
-	if $(TARGET_ARCH) != x86 {
-		Echo "No optional package CVS available for $(TARGET_ARCH)" ;
-	} else {
+	if $(TARGET_ARCH) = x86 {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
 			InstallOptionalHaikuImagePackage
 				cvs-1.12.13.1-r1a4-x86-gcc4-2012-08-30.zip
@@ -604,6 +616,13 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] {
 				: $(baseURL)/cvs-1.12.13.1-r1a4-x86-gcc2-2012-08-28.zip
 				: : true ;
 		}
+	} else if $(TARGET_ARCH) = x86_64 {
+		InstallOptionalHaikuImagePackage
+			cvs-1.12.13.1-x86_64-2012-12-18.zip
+			: $(baseURL)/cvs-1.12.13.1-x86_64-2012-12-18.zip
+			: : true ;
+	} else {
+		Echo "No optional package CVS available for $(TARGET_ARCH)" ;
 	}
 }

@@ -682,6 +701,8 @@ if [ IsOptionalHaikuImagePackageAdded Development ] {
 				: : true ;
 		}
 	} else if $(TARGET_ARCH) = x86_64 {
+		AddSymlinkToHaikuImage home config settings deskbar Applications
+			: /boot/system/apps/Debugger : Debugger ;
 		InstallOptionalHaikuImagePackage
 			autoconf-2.69-x86_64-2012-08-17.zip
 			: $(baseURL)/autoconf-2.69-x86_64-2012-08-17.zip
@@ -1132,9 +1153,7 @@ if [ IsOptionalHaikuImagePackageAdded Git ] {

 # GitDoc
 if [ IsOptionalHaikuImagePackageAdded GitDoc ] {
-	if $(TARGET_ARCH) != x86 {
-		Echo "No optional package GitDoc available for $(TARGET_ARCH)" ;
-	} else {
+	if $(TARGET_ARCH) = x86 {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
 			InstallOptionalHaikuImagePackage
 				gitdoc-1.7.10.2-r1a4-x86-gcc4-2012-09-03.zip
@@ -1146,6 +1165,13 @@ if [ IsOptionalHaikuImagePackageAdded GitDoc ] {
 				: $(baseURL)/gitdoc-1.7.10.2-r1a4-x86-gcc2-2012-08-28.zip
 				: : true ;
 		}
+	} else if $(TARGET_ARCH) = x86_64 {
+		InstallOptionalHaikuImagePackage
+			gitdoc-1.8.0-x86_64-2012-12-18.zip
+			: $(baseURL)/gitdoc-1.8.0-x86_64-2012-12-18.zip
+			: : true ;
+	} else {
+		Echo "No optional package GitDoc available for $(TARGET_ARCH)" ;
 	}
 }

@@ -1336,9 +1362,7 @@ if [ IsOptionalHaikuImagePackageAdded LibEvent ] {

 # LibIconv
 if [ IsOptionalHaikuImagePackageAdded LibIconv ] {
-	if $(TARGET_ARCH) != x86 {
-		Echo "No optional package LibIconv available for $(TARGET_ARCH)" ;
-	} else {
+	if $(TARGET_ARCH) = x86 {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
 			InstallOptionalHaikuImagePackage
 				libiconv-1.13.1-r1a4-x86-gcc4-2012-08-30.zip
@@ -1348,6 +1372,12 @@ if [ IsOptionalHaikuImagePackageAdded LibIconv ] {
 				libiconv-1.13.1-r1a4-x86-gcc2-2012-08-28.zip
 				: $(baseURL)/libiconv-1.13.1-r1a4-x86-gcc2-2012-08-28.zip ;
 		}
+	} else if $(TARGET_ARCH) = x86_64 {
+		InstallOptionalHaikuImagePackage
+			libiconv-1.13.1-x86_64-2012-12-18.zip
+			: $(baseURL)/libiconv-1.13.1-x86_64-2012-12-18.zip ;
+	} else {
+		Echo "No optional package LibIconv available for $(TARGET_ARCH)" ;
 	}
 }

@@ -1485,9 +1515,7 @@ if [ IsOptionalHaikuImagePackageAdded MandatoryPackages ] {

 # Mercurial
 if [ IsOptionalHaikuImagePackageAdded Mercurial ] {
-	if $(TARGET_ARCH) != x86 {
-		Echo "No optional package Mercurial available for $(TARGET_ARCH)" ;
-	} else {
+	if $(TARGET_ARCH) = x86 {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
 			InstallOptionalHaikuImagePackage
 				mercurial-2.2.2-r1a4-x86-gcc4-2012-08-30.zip
@@ -1499,6 +1527,13 @@ if [ IsOptionalHaikuImagePackageAdded Mercurial ] {
 				: $(baseURL)/mercurial-2.2.2-r1a4-x86-gcc2-2012-08-27.zip
 				: : true ;
 		}
+	} else if $(TARGET_ARCH) = x86_64 {
+		InstallOptionalHaikuImagePackage
+			mercurial-2.4-x86_64-2012-12-18.zip
+			: $(baseURL)/mercurial-2.4-x86_64-2012-12-18.zip
+			: : true ;
+	} else {
+		Echo "No optional package Mercurial available for $(TARGET_ARCH)" ;
 	}
 }

@@ -1535,9 +1570,7 @@ if [ IsOptionalHaikuImagePackageAdded Nanumfont ] {

 # Neon
 if [ IsOptionalHaikuImagePackageAdded Neon ] {
-	if $(TARGET_ARCH) != x86 {
-		Echo "No optional package Neon available for $(TARGET_ARCH)" ;
-	} else {
+	if $(TARGET_ARCH) = x86 {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
 			InstallOptionalHaikuImagePackage
 				neon-0.29.6-r1a4-x86-gcc4-2012-08-29.zip
@@ -1547,6 +1580,12 @@ if [ IsOptionalHaikuImagePackageAdded Neon ] {
 				neon-0.29.6-r1a4-x86-gcc2-2012-08-28.zip
 				: $(baseURL)/neon-0.29.6-r1a4-x86-gcc2-2012-08-28.zip ;
 		}
+	} else if $(TARGET_ARCH) = x86_64 {
+		InstallOptionalHaikuImagePackage
+			neon-0.29.6-x86_64-2012-12-18.zip
+			: $(baseURL)/neon-0.29.6-x86_64-2012-12-18.zip ;
+	} else {
+		Echo "No optional package Neon available for $(TARGET_ARCH)" ;
 	}
 }

@@ -1723,9 +1762,7 @@ if [ IsOptionalHaikuImagePackageAdded Paladin ] {

 # PCRE regex engine
 if [ IsOptionalHaikuImagePackageAdded PCRE ] {
-	if $(TARGET_ARCH) != x86 {
-		Echo "No optional package PCRE available for $(TARGET_ARCH)" ;
-	} else {
+	if $(TARGET_ARCH) = x86 {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
 			InstallOptionalHaikuImagePackage
 				libpcre-8.21-r1a4-x86-gcc4-2012-09-03.zip
@@ -1735,6 +1772,12 @@ if [ IsOptionalHaikuImagePackageAdded PCRE ] {
 				libpcre-8.21-r1a4-x86-gcc2-2012-08-28.zip
 				: $(baseURL)/libpcre-8.21-r1a4-x86-gcc2-2012-08-28.zip ;
 		}
+	} else if $(TARGET_ARCH) = x86_64 {
+		InstallOptionalHaikuImagePackage
+			libpcre-8.21-x86_64-2012-12-18.zip
+			: $(baseURL)/libpcre-8.21-x86_64-2012-12-18.zip ;
+	} else {
+		Echo "No optional package PCRE available for $(TARGET_ARCH)" ;
 	}
 }

@@ -1909,9 +1952,7 @@ if [ IsOptionalHaikuImagePackageAdded SQLite ] {

 # Subversion
 if [ IsOptionalHaikuImagePackageAdded Subversion ] {
-	if $(TARGET_ARCH) != x86 {
-		Echo "No optional package Subversion available for $(TARGET_ARCH)" ;
-	} else {
+	if $(TARGET_ARCH) = x86 {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
 			InstallOptionalHaikuImagePackage
 				subversion-1.6.18-r1a4-x86-gcc4-2012-08-30.zip
@@ -1923,6 +1964,13 @@ if [ IsOptionalHaikuImagePackageAdded Subversion ] {
 				: $(baseURL)/subversion-1.6.18-r1a4-x86-gcc2-2012-08-28.zip
 				: : true ;
 		}
+	} else if $(TARGET_ARCH) = x86_64 {
+		InstallOptionalHaikuImagePackage
+			subversion-1.6.18-x86_64-2012-12-18.zip
+			: $(baseURL)/subversion-1.6.18-x86_64-2012-12-18.zip
+			: : true ;
+	} else {
+		Echo "No optional package Subversion available for $(TARGET_ARCH)" ;
 	}
 }

@@ -2095,7 +2143,7 @@ if [ IsOptionalHaikuImagePackageAdded Vision ] {

 # WebKit
 if [ IsOptionalHaikuImagePackageAdded WebKit ] {
-	if $(TARGET_ARCH) != x86 {
+	if $(TARGET_ARCH) != x86 && $(TARGET_ARCH) != x86_64 {
 		Echo "No optional package WebKit available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) < 4 && ! $(isHybridBuild) {
 		Echo "No optional package WebKit available for gcc2" ;
@@ -2109,7 +2157,7 @@ if [ IsOptionalHaikuImagePackageAdded WebKit ] {

 # WebPositive
 if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
-	if $(TARGET_ARCH) != x86 {
+	if $(TARGET_ARCH) != x86  && $(TARGET_ARCH) != x86_64 {
 		Echo "No optional package WebPositive available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) < 4 {
 		if ! $(isHybridBuild) {
@@ -383,8 +383,8 @@ function DownloadAllBuildFiles()
 {
 	# DownloadAllBuildFiles
 	# Retreive the necessary jam files from svn.
-	local buildFiles="OptionalPackages OptionalPackageDependencies \
-		OptionalBuildFeatures OptionalLibPackages"
+	local buildFiles="BuildFeatures OptionalPackageDependencies \
+		OptionalPackages OptionalLibPackages"
 	for file in ${buildFiles} ; do
 		GetBuildFile ${file}
 	done
@@ -676,29 +676,32 @@ function ConvertJamToBash()
 	# TODO : add these following variables to the CreateInstallerScript
 	# TODO : parse HAIKU_ICU_GCC_2_PACKAGE
 	#local regExp='/^HAIKU_ICU_GCC_2_PACKAGE/p'
-	#icuGcc2PkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
+	#icuGcc2PkgLine=`sed -n -e "$regExp" ${baseDir}/BuildFeatures`
 	#ConvertVariableDeclarationLines "$regExp" 'icuGcc2PkgLine'

 	# TODO : parse HAIKU_ICU_GCC_4_PACKAGE
 	#local regExp='/^HAIKU_ICU_GCC_4_PACKAGE/p'
-	#icuGcc4PkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
+	#icuGcc4PkgLine=`sed -n -e "$regExp" ${baseDir}/BuildFeatures`
 	#ConvertVariableDeclarationLines "$regExp" 'icuGcc4PkgLine'

 	# TODO : parse HAIKU_ICU_DEVEL_PACKAGE
 	#local regExp='/^HAIKU_ICU_DEVEL_PACKAGE/p'
-	#icuDevelPkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
+	#icuDevelPkgLine=`sed -n -e "$regExp" ${baseDir}/BuildFeatures`
 	#ConvertVariableDeclarationLines "$regExp" 'icuDevelPkgLine'

+	# TODO : fix the regex
 	local regExp="/^\s*HAIKU_OPENSSL_PACKAGE = .*-gcc${HAIKU_GCC_VERSION[1]}-/p"
-	sslPkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
+	sslPkgLine=`sed -n -e "$regExp" ${baseDir}/BuildFeatures`
 	ConvertVariableDeclarationLines "$regExp" 'sslPkgLine'

+	# TODO : fix the regex
 	local regExp='/^HAIKU_OPENSSL_URL/p'
-	sslUrlLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
+	sslUrlLine=`sed -n -e "$regExp" ${baseDir}/BuildFeatures`
 	ConvertVariableDeclarationLines "$regExp" 'sslUrlLine'

+	# TODO : fix the regex
 	local regExp='/^HAIKU_WEBKIT_FILE/p'
-	webkitFileLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
+	webkitFileLine=`sed -n -e "$regExp" ${baseDir}/BuildFeatures`
 	ConvertVariableDeclarationLines "$regExp" 'webkitFileLine'

 	local regExp='/^local\ baseURL/p'
@@ -1,3 +1,4 @@
-1	japanese	x-vnd.mmu_man.BSnow	2460058908
+1	japanese	x-vnd.mmu_man.BSnow	2621406458
 Drag me on your desktop…	BSnow		デスクトップにドラッグしてください…
 Click me to remove BSnow…	BSnow		クリックして BSnow を削除してください…
+BSnow	System name		BSnow
@@ -1,21 +1,17 @@
-1	belarusian	x-vnd.Be-TSKB	3197510812
+1	belarusian	x-vnd.Be-TSKB	3155357024
 Power off	DeskbarMenu		Выключыць
-Show day of week	PreferencesWindow		Паказваць дзень тыдню
 Edit menu…	PreferencesWindow		Змяніць меню…
 Suspend	DeskbarMenu		Прыпыніць
-Applications	PreferencesWindow		Праграмы
 Time preferences…	TimeView		Наладкі Часу…
 About Haiku	DeskbarMenu		Пра Haiku
 Recent documents:	PreferencesWindow		Нядаўнія дакументы:
 Recent applications	DeskbarMenu		Нядаўнія праграмы
 Sort running applications	PreferencesWindow		Сартыравать запушчаныя праграмы
-Show time	Tray		Паказваць час
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		Праграмы
 Find…	DeskbarMenu		Знайсці…
 Window	PreferencesWindow		Акно
 Menu	PreferencesWindow		Меню
 Recent documents	DeskbarMenu		Нядаўнія дакументы
-Show seconds	PreferencesWindow		Паказваць секунды
 Auto-hide	PreferencesWindow		Схаваць аўтаматычна
 Always on top	PreferencesWindow		Заўсёды наверсе
 <Deskbar folder is empty>	DeskbarMenu		<Папка Deskbar-у пустая>
@@ -25,7 +21,6 @@ Deskbar	System name		Дэскбар
 Restart system	DeskbarMenu		Перазапусціць сістэму
 Large	PreferencesWindow		Вялікі
 Auto-raise	PreferencesWindow		Узнікаць аўтаматычна
-Hide time	TimeView		Час на схаванне
 Recent folders:	PreferencesWindow		Нядаўнія каталёгі:
 Show application expander	PreferencesWindow		Паказваць кнопку спісу праграм
 Restart Tracker	DeskbarMenu		Перазапусціць Tracker
@@ -44,7 +39,6 @@ Deskbar preferences…	DeskbarMenu		Наладкі Deskbar-у…
 Expand new applications	PreferencesWindow		Разгарнуць новыя праграмы
 Show replicants	DeskbarMenu		Паказваць дупліканты
 Hide application names	PreferencesWindow		Схаваць імёны праграм
-Clock	PreferencesWindow		Гадзіннік
 Demos	B_USER_DESKBAR_DIRECTORY/Demos		Прыклады
 Icon size	PreferencesWindow		Памер значак
 Desktop applets	B_USER_DESKBAR_DIRECTORY/Desktop applets		Праграмкі Дэсктопу
@@ -1,21 +1,17 @@
-1	german	x-vnd.Be-TSKB	3197510812
+1	german	x-vnd.Be-TSKB	3155357024
 Power off	DeskbarMenu		Ausschalten
-Show day of week	PreferencesWindow		Wochentag anzeigen
 Edit menu…	PreferencesWindow		Menü bearbeiten…
 Suspend	DeskbarMenu		Ruhezustand
-Applications	PreferencesWindow		Anwendungen
 Time preferences…	TimeView		Datum & Zeit Einstellungen…
 About Haiku	DeskbarMenu		Über Haiku
 Recent documents:	PreferencesWindow		Letzte Dokumente:
 Recent applications	DeskbarMenu		Letzte Anwendungen
 Sort running applications	PreferencesWindow		Laufende Anwendungen sortieren
-Show time	Tray		Uhrzeit anzeigen
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		Anwendungen
 Find…	DeskbarMenu		Suchen…
 Window	PreferencesWindow		Fenster
 Menu	PreferencesWindow		Menü
 Recent documents	DeskbarMenu		Letzte Dokumente
-Show seconds	PreferencesWindow		Sekunden anzeigen
 Auto-hide	PreferencesWindow		Automatisch ausblenden
 Always on top	PreferencesWindow		Immer im Vordergrund
 <Deskbar folder is empty>	DeskbarMenu		<Deskbar-Ordner ist leer>
@@ -25,7 +21,6 @@ Deskbar	System name		Deskbar
 Restart system	DeskbarMenu		Neustarten
 Large	PreferencesWindow		Groß
 Auto-raise	PreferencesWindow		Automatisch nach vorn holen
-Hide time	TimeView		Uhrzeit ausblenden
 Recent folders:	PreferencesWindow		Letzte Ordner:
 Show application expander	PreferencesWindow		Expander anzeigen
 Restart Tracker	DeskbarMenu		Tracker neu starten
@@ -44,7 +39,6 @@ Deskbar preferences…	DeskbarMenu		Deskbar-Einstellungen…
 Expand new applications	PreferencesWindow		Neue Anwendungen aufklappen
 Show replicants	DeskbarMenu		Replikanten einblenden
 Hide application names	PreferencesWindow		Anwendungsnamen ausblenden
-Clock	PreferencesWindow		Uhr
 Demos	B_USER_DESKBAR_DIRECTORY/Demos		Demos
 Icon size	PreferencesWindow		Icon-Größe
 Desktop applets	B_USER_DESKBAR_DIRECTORY/Desktop applets		Desktop-Apps
@@ -1,7 +1,6 @@
-1	greek, modern (1453-)	x-vnd.Be-TSKB	1095421712
+1	greek, modern (1453-)	x-vnd.Be-TSKB	1782938413
 Power off	DeskbarMenu		Απενεργοποίηση
 Edit menu…	PreferencesWindow		Επεξεργασία μενού...
-Applications	PreferencesWindow		Εφαρμογές
 Recent documents:	PreferencesWindow		Πρόσφατα έγγραφα:
 Recent applications	DeskbarMenu		Πρόσφατες εφαρμογές
 Sort running applications	PreferencesWindow		Ταξινόμησε τις τρέχουσες εφαρμογές
@@ -18,7 +17,6 @@ No windows	WindowMenu		Χωρίς παράθυρα
 Deskbar	System name		Deskbar
 Restart system	DeskbarMenu		Επανεκκίνηση συστήματος
 Auto-raise	PreferencesWindow		Αυτόματη-ανύψωση
-Hide time	TimeView		Απόκρυψη ώρας
 Recent folders:	PreferencesWindow		Πρόσφατοι φάκελοι:
 Show application expander	PreferencesWindow		Εμφάνιση της εφαρμογής Επεκτατής
 Restart Tracker	DeskbarMenu		Επανεκκίνηση Tracker
@@ -35,7 +33,6 @@ Show calendar…	TimeView		Εμφάνιση ημερολογίου…
 Deskbar preferences…	DeskbarMenu		Προτιμήσεις Deskbar…
 Expand new applications	PreferencesWindow		Επέκταση νέων εφαρμογών
 Show replicants	DeskbarMenu		Εμφάνιση αντιγράφων
-Clock	PreferencesWindow		Ρολόϊ
 Demos	B_USER_DESKBAR_DIRECTORY/Demos		Επιδείξεις
 Desktop applets	B_USER_DESKBAR_DIRECTORY/Desktop applets		Applets επιφάνειας εργασίας
 Hide all	WindowMenu		Απόκρυψη όλων
@@ -1,21 +1,17 @@
-1	finnish	x-vnd.Be-TSKB	3197510812
+1	finnish	x-vnd.Be-TSKB	3155357024
 Power off	DeskbarMenu		Sammuta virta
-Show day of week	PreferencesWindow		Näytä viikonpäivä
 Edit menu…	PreferencesWindow		Muokkaa valikkoa...
 Suspend	DeskbarMenu		Keskeytystila
-Applications	PreferencesWindow		Sovellukset
 Time preferences…	TimeView		Aika-asetukset...
 About Haiku	DeskbarMenu		Haikusta
 Recent documents:	PreferencesWindow		Äskettäiset asiakirjat:
 Recent applications	DeskbarMenu		Äskettäiset sovellukset
 Sort running applications	PreferencesWindow		Lajittele suoritettavat sovellukset
-Show time	Tray		Näytä aika
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		Sovellukset
 Find…	DeskbarMenu		Etsi...
 Window	PreferencesWindow		Ikkuna
 Menu	PreferencesWindow		Valikko
 Recent documents	DeskbarMenu		Äskettäiset asiakirjat
-Show seconds	PreferencesWindow		Näytä sekunnit
 Auto-hide	PreferencesWindow		Piilota automaattisesti
 Always on top	PreferencesWindow		Aina päällimmäisenä
 <Deskbar folder is empty>	DeskbarMenu		<Työpöytäpalkkikansio on tyhjä>
@@ -25,7 +21,6 @@ Deskbar	System name		Työpöytäpalkki
 Restart system	DeskbarMenu		Käynnistä järjestelmä uudelleen
 Large	PreferencesWindow		Suuri
 Auto-raise	PreferencesWindow		Nosta automaattisesti
-Hide time	TimeView		Piilota aika
 Recent folders:	PreferencesWindow		Äskettäiset kansiot:
 Show application expander	PreferencesWindow		Näytä sovelluslaajentaja
 Restart Tracker	DeskbarMenu		Käynnistä Seuraaja uudelleen
@@ -44,7 +39,6 @@ Deskbar preferences…	DeskbarMenu		Työpöytäpalkkiasetukset...
 Expand new applications	PreferencesWindow		Laajenna uudet sovellukset
 Show replicants	DeskbarMenu		Näytä kopiot
 Hide application names	PreferencesWindow		Piilota sovellusnimet
-Clock	PreferencesWindow		Kello
 Demos	B_USER_DESKBAR_DIRECTORY/Demos		Esittelyohjelmat
 Icon size	PreferencesWindow		Kuvakekoko
 Desktop applets	B_USER_DESKBAR_DIRECTORY/Desktop applets		Työpöytäsovelmat
@@ -1,21 +1,17 @@
-1	french	x-vnd.Be-TSKB	3197510812
+1	french	x-vnd.Be-TSKB	3155357024
 Power off	DeskbarMenu		Éteindre
-Show day of week	PreferencesWindow		Afficher le jour de la semaine
 Edit menu…	PreferencesWindow		Éditer le menu…
 Suspend	DeskbarMenu		Mettre en veille
-Applications	PreferencesWindow		Applications
 Time preferences…	TimeView		Préférences de l'heure…
 About Haiku	DeskbarMenu		À propos de Haiku
 Recent documents:	PreferencesWindow		Documents récents :
 Recent applications	DeskbarMenu		Applications récentes
 Sort running applications	PreferencesWindow		Trier les applications lancées
-Show time	Tray		Afficher l'heure
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		Applications
 Find…	DeskbarMenu		Rechercher…
 Window	PreferencesWindow		Fenêtre
 Menu	PreferencesWindow		Menu
 Recent documents	DeskbarMenu		Documents récents
-Show seconds	PreferencesWindow		Afficher les secondes
 Auto-hide	PreferencesWindow		Masquer automatiquement
 Always on top	PreferencesWindow		Toujours au dessus
 <Deskbar folder is empty>	DeskbarMenu		<Le dossier Deskbar est vide>
@@ -25,7 +21,6 @@ Deskbar	System name		Deskbar
 Restart system	DeskbarMenu		Redémarrer l'ordinateur
 Large	PreferencesWindow		Grande
 Auto-raise	PreferencesWindow		Rehausser automatiquement
-Hide time	TimeView		Cacher l'heure
 Recent folders:	PreferencesWindow		Dossiers récents :
 Show application expander	PreferencesWindow		Montrer le dérouleur d'application
 Restart Tracker	DeskbarMenu		Redémarrer le Tracker
@@ -44,7 +39,6 @@ Deskbar preferences…	DeskbarMenu		Réglages de la Deskbar…
 Expand new applications	PreferencesWindow		Développer les nouvelles applications
 Show replicants	DeskbarMenu		Afficher les réplicants
 Hide application names	PreferencesWindow		Cacher le nom des applications
-Clock	PreferencesWindow		Horloge
 Demos	B_USER_DESKBAR_DIRECTORY/Demos		Démos
 Icon size	PreferencesWindow		Taille des icônes
 Desktop applets	B_USER_DESKBAR_DIRECTORY/Desktop applets		Gadgets
@@ -1,6 +1,5 @@
-1	hindi	x-vnd.Be-TSKB	1193384805
+1	hindi	x-vnd.Be-TSKB	1880901506
 Edit menu…	PreferencesWindow		मेनू संपादित करें ...
-Applications	PreferencesWindow		आवेदन
 Recent documents:	PreferencesWindow		हाल ही में दस्तावेजों:
 Sort running applications	PreferencesWindow		क्रमबद्ध अनुप्रयोगों को चलाने
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		अनुप्रयोग
@@ -12,7 +11,6 @@ Show all	WindowMenu		सभी दिखाएँ
 No windows	WindowMenu		कोई भी विन्दोव्स नहीं है
 Deskbar	System name		डेस्कबार
 Auto-raise	PreferencesWindow		ऑटो-रेज
-Hide time	TimeView		समय को छिपाओ
 Recent folders:	PreferencesWindow		हाल ही में फ़ोल्डर्स:
 Show application expander	PreferencesWindow		आवेदन विस्तारक दिखाएँ
 Close all	WindowMenu		सभी बंद करें
@@ -22,7 +20,6 @@ Tracker always first	PreferencesWindow		ट्रैकर हमेशा प
 Preferences	B_USER_DESKBAR_DIRECTORY/Preferences		प्राथमिकताएं
 Show calendar…	TimeView		कैलेंडर दिखाएँ...
 Expand new applications	PreferencesWindow		विस्तार कीजिए नए अनुप्रयोगों को
-Clock	PreferencesWindow		घड़ी
 Demos	B_USER_DESKBAR_DIRECTORY/Demos		प्रदर्शनों
 Desktop applets	B_USER_DESKBAR_DIRECTORY/Desktop applets		डेस्कटॉप एप्लेट्स
 Hide all	WindowMenu		सभी छुपाएँ
@@ -1,21 +1,17 @@
-1	hungarian	x-vnd.Be-TSKB	3197510812
+1	hungarian	x-vnd.Be-TSKB	3155357024
 Power off	DeskbarMenu		Kikapcsolás
-Show day of week	PreferencesWindow		A hét napjának mutatása
 Edit menu…	PreferencesWindow		Menü szerkesztése…
 Suspend	DeskbarMenu		Felfüggesztés
-Applications	PreferencesWindow		Programok
 Time preferences…	TimeView		Idő beállítása…
 About Haiku	DeskbarMenu		Haiku névjegye
 Recent documents:	PreferencesWindow		Utolsó dokumentumok:
 Recent applications	DeskbarMenu		Legutóbbi programok
 Sort running applications	PreferencesWindow		Futó programok rendezése
-Show time	Tray		Idő megjelenítése
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		Programok
 Find…	DeskbarMenu		Keresés…
 Window	PreferencesWindow		Ablak
 Menu	PreferencesWindow		Menü
 Recent documents	DeskbarMenu		Legutóbbi dokumentumok
-Show seconds	PreferencesWindow		Másodpercek megjelenítése
 Auto-hide	PreferencesWindow		Automatikus elrejtés
 Always on top	PreferencesWindow		Mindig felül
 <Deskbar folder is empty>	DeskbarMenu		<Az Asztalsáv mappa üres>
@@ -25,7 +21,6 @@ Deskbar	System name		Asztalsáv
 Restart system	DeskbarMenu		Rendszer újraindítása
 Large	PreferencesWindow		Nagy
 Auto-raise	PreferencesWindow		Automatikus előrehozás
-Hide time	TimeView		Idő elrejtése
 Recent folders:	PreferencesWindow		Utolsó mappák:
 Show application expander	PreferencesWindow		Programkiterjesztő mutatása
 Restart Tracker	DeskbarMenu		Nyomkövető újraindítása
@@ -44,7 +39,6 @@ Deskbar preferences…	DeskbarMenu		Asztalsáv-beállítások…
 Expand new applications	PreferencesWindow		Új programok kicsomagolása
 Show replicants	DeskbarMenu		Replikánsok megjelenítése
 Hide application names	PreferencesWindow		Programnevek elrejtése
-Clock	PreferencesWindow		Óra
 Demos	B_USER_DESKBAR_DIRECTORY/Demos		Bemutatók
 Icon size	PreferencesWindow		Ikon mérete
 Desktop applets	B_USER_DESKBAR_DIRECTORY/Desktop applets		Asztali kisalkalmazások
@@ -1,21 +1,17 @@
-1	japanese	x-vnd.Be-TSKB	3197510812
+1	japanese	x-vnd.Be-TSKB	3155357024
 Power off	DeskbarMenu		電源を切る
-Show day of week	PreferencesWindow		曜日を表示する
 Edit menu…	PreferencesWindow		メニューの編集…
 Suspend	DeskbarMenu		サスペンド
-Applications	PreferencesWindow		アプリケーション
 Time preferences…	TimeView		日付と時刻の設定…
 About Haiku	DeskbarMenu		Haiku について
 Recent documents:	PreferencesWindow		最近使ったドキュメント
 Recent applications	DeskbarMenu		最近使ったアプリケーション
 Sort running applications	PreferencesWindow		実行中のアプリケーションを名前順に並び換える
-Show time	Tray		時刻を表示する
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		アプリケーション
 Find…	DeskbarMenu		検索…
 Window	PreferencesWindow		ウィンドウ
 Menu	PreferencesWindow		メニュー
 Recent documents	DeskbarMenu		最近使ったドキュメント
-Show seconds	PreferencesWindow		秒を表示する
 Auto-hide	PreferencesWindow		自動的に隠す
 Always on top	PreferencesWindow		常に手前に
 <Deskbar folder is empty>	DeskbarMenu		<Deskbar フォルダーは空です>
@@ -25,7 +21,6 @@ Deskbar	System name		Deskbar
 Restart system	DeskbarMenu		システムを再起動
 Large	PreferencesWindow		大
 Auto-raise	PreferencesWindow		マウスオーバーで手前に
-Hide time	TimeView		時刻を隠す
 Recent folders:	PreferencesWindow		最近開いたフォルダー：
 Show application expander	PreferencesWindow		エキスパンダーを表示
 Restart Tracker	DeskbarMenu		Tracker を再起動
@@ -44,7 +39,6 @@ Deskbar preferences…	DeskbarMenu		Deskbar の設定…
 Expand new applications	PreferencesWindow		新しいアプリケーションを展開表示
 Show replicants	DeskbarMenu		レプリカントを表示
 Hide application names	PreferencesWindow		アプリケーション名を隠す
-Clock	PreferencesWindow		日付と時刻
 Demos	B_USER_DESKBAR_DIRECTORY/Demos		デモ
 Icon size	PreferencesWindow		アイコンのサイズ
 Desktop applets	B_USER_DESKBAR_DIRECTORY/Desktop applets		デスクトップアプレット
@@ -1,21 +1,17 @@
-1	lithuanian	x-vnd.Be-TSKB	3197510812
+1	lithuanian	x-vnd.Be-TSKB	3155357024
 Power off	DeskbarMenu		Išjungti
-Show day of week	PreferencesWindow		Rodyti savaitės dieną
 Edit menu…	PreferencesWindow		Taisyti meniu…
 Suspend	DeskbarMenu		Pristabdyti
-Applications	PreferencesWindow		Programos
 Time preferences…	TimeView		Laiko nuostatos…
 About Haiku	DeskbarMenu		Apie „Haiku“
 Recent documents:	PreferencesWindow		Paskiausi dokumentai:
 Recent applications	DeskbarMenu		Paskiausiai leistos programos
 Sort running applications	PreferencesWindow		Rikiuoti paleistas programas
-Show time	Tray		Rodyti laiką
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		Programos
 Find…	DeskbarMenu		Ieškoti…
 Window	PreferencesWindow		Langas
 Menu	PreferencesWindow		Meniu
 Recent documents	DeskbarMenu		Paskiausiai atverti dokumentai
-Show seconds	PreferencesWindow		Rodyti sekundes
 Auto-hide	PreferencesWindow		Automatiškai slėpti
 Always on top	PreferencesWindow		Visuomet viršuje
 <Deskbar folder is empty>	DeskbarMenu		<Meniu aplankas tuščias>
@@ -25,7 +21,6 @@ Deskbar	System name		Užduočių juosta
 Restart system	DeskbarMenu		Paleisti iš naujo
 Large	PreferencesWindow		Didelės
 Auto-raise	PreferencesWindow		Automatiškai iškilti
-Hide time	TimeView		Nerodyti laikrodžio
 Recent folders:	PreferencesWindow		Paskiausi aplankai:
 Show application expander	PreferencesWindow		Rodyti programų skleistuką
 Restart Tracker	DeskbarMenu		Perleisti Pėdsekį
@@ -44,7 +39,6 @@ Deskbar preferences…	DeskbarMenu		Užduočių juostos nuostatos…
 Expand new applications	PreferencesWindow		Išskleisti paleidžiamas programas
 Show replicants	DeskbarMenu		Rodyti replikavimo rankenėles
 Hide application names	PreferencesWindow		Nerodyti programų vardų
-Clock	PreferencesWindow		Laikrodis
 Demos	B_USER_DESKBAR_DIRECTORY/Demos		Pavyzdžiai
 Icon size	PreferencesWindow		Piktogramų dydis
 Desktop applets	B_USER_DESKBAR_DIRECTORY/Desktop applets		Pagalbinės programėlės
@@ -1,21 +1,17 @@
-1	dutch; flemish	x-vnd.Be-TSKB	3197510812
+1	dutch; flemish	x-vnd.Be-TSKB	3155357024
 Power off	DeskbarMenu		Uitzetten
-Show day of week	PreferencesWindow		Dag van de week tonen
 Edit menu…	PreferencesWindow		Bewerk menu...
 Suspend	DeskbarMenu		Opschorten
-Applications	PreferencesWindow		Toepassingen
 Time preferences…	TimeView		Tijdsvoorkeuren…
 About Haiku	DeskbarMenu		Over Haiku
 Recent documents:	PreferencesWindow		Recente documenten:
 Recent applications	DeskbarMenu		Recente toepassingen
 Sort running applications	PreferencesWindow		Sorteer lopende toepassingen
-Show time	Tray		Tijd tonen
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		Toepassingen
 Find…	DeskbarMenu		Vind...
 Window	PreferencesWindow		Venster
 Menu	PreferencesWindow		Menu
 Recent documents	DeskbarMenu		Recente documenten
-Show seconds	PreferencesWindow		Seconden tonen
 Auto-hide	PreferencesWindow		Automatisch verbergen
 Always on top	PreferencesWindow		Altijd bovenop
 <Deskbar folder is empty>	DeskbarMenu		<Deskbar map is leeg>
@@ -25,7 +21,6 @@ Deskbar	System name		Deskbar
 Restart system	DeskbarMenu		Systeem herstarten
 Large	PreferencesWindow		Groot
 Auto-raise	PreferencesWindow		Automatisch naar boven
-Hide time	TimeView		Tijd verbergen
 Recent folders:	PreferencesWindow		Recente mappen:
 Show application expander	PreferencesWindow		Toon toepassing-expander
 Restart Tracker	DeskbarMenu		Tracker herstarten
@@ -44,7 +39,6 @@ Deskbar preferences…	DeskbarMenu		Deskbar-voorkeuren...
 Expand new applications	PreferencesWindow		Toon nieuwe toepassingen
 Show replicants	DeskbarMenu		Toon replicants
 Hide application names	PreferencesWindow		Programmanamen verbergen
-Clock	PreferencesWindow		Klok
 Demos	B_USER_DESKBAR_DIRECTORY/Demos		Demo's
 Icon size	PreferencesWindow		Pictogramgrootte
 Desktop applets	B_USER_DESKBAR_DIRECTORY/Desktop applets		Bureaubladapplets
@@ -1,21 +1,17 @@
-1	polish	x-vnd.Be-TSKB	3197510812
+1	polish	x-vnd.Be-TSKB	3155357024
 Power off	DeskbarMenu		Wyłącz komputer
-Show day of week	PreferencesWindow		Pokaż dzień tygodnia
 Edit menu…	PreferencesWindow		Edytuj zawartość menu…
 Suspend	DeskbarMenu		Wstrzymaj
-Applications	PreferencesWindow		Lista aplikacji
 Time preferences…	TimeView		Ustawienia czasu...
 About Haiku	DeskbarMenu		O Haiku
 Recent documents:	PreferencesWindow		Ostatnio przeglądane dokumenty:
 Recent applications	DeskbarMenu		Ostatnio uruchomione aplikacje
 Sort running applications	PreferencesWindow		Sortuj uruchomione aplikacje alfabetycznie
-Show time	Tray		Pokaż czas
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		Aplikacje
 Find…	DeskbarMenu		Wyszukaj…
 Window	PreferencesWindow		Położenie
 Menu	PreferencesWindow		Menu
 Recent documents	DeskbarMenu		Ostatnio otwarte dokumenty
-Show seconds	PreferencesWindow		Pokaż sekundy
 Auto-hide	PreferencesWindow		Autoukrywanie
 Always on top	PreferencesWindow		Zawsze na wierzchu
 <Deskbar folder is empty>	DeskbarMenu		Folder Paska Pulpitu jest pusty
@@ -25,7 +21,6 @@ Deskbar	System name		Pasek Pulpitu
 Restart system	DeskbarMenu		Uruchom ponownie
 Large	PreferencesWindow		Duże
 Auto-raise	PreferencesWindow		Automatyczne rozszerzanie
-Hide time	TimeView		Ukryj czas
 Recent folders:	PreferencesWindow		Ostatnio przeglądane foldery:
 Show application expander	PreferencesWindow		Aplikacje jako lista rozwijalna
 Restart Tracker	DeskbarMenu		Uruchom ponownie Trackera
@@ -44,7 +39,6 @@ Deskbar preferences…	DeskbarMenu		Preferencje Deskbara…
 Expand new applications	PreferencesWindow		Uruchamiaj aplikacje rozwinięte
 Show replicants	DeskbarMenu		Pokaż replikanty
 Hide application names	PreferencesWindow		Ukryj nazwy aplikacji
-Clock	PreferencesWindow		Zegar
 Demos	B_USER_DESKBAR_DIRECTORY/Demos		Dema
 Icon size	PreferencesWindow		Rozmiar ikon
 Desktop applets	B_USER_DESKBAR_DIRECTORY/Desktop applets		Aplety pulpitu
@@ -1,21 +1,17 @@
-1	portuguese (brazil)	x-vnd.Be-TSKB	3197510812
+1	portuguese (brazil)	x-vnd.Be-TSKB	3155357024
 Power off	DeskbarMenu		Desligar
-Show day of week	PreferencesWindow		Exibir o dia da semana
 Edit menu…	PreferencesWindow		Editar menu...
 Suspend	DeskbarMenu		Suspender
-Applications	PreferencesWindow		Aplicativos
 Time preferences…	TimeView		Preferências de hora…
 About Haiku	DeskbarMenu		Sobre o Haiku
 Recent documents:	PreferencesWindow		Documentos recentes:
 Recent applications	DeskbarMenu		Aplicativos recentes
 Sort running applications	PreferencesWindow		Ordenar aplicativos em execução
-Show time	Tray		Exibir hora
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		Aplicativos
 Find…	DeskbarMenu		Localizar…
 Window	PreferencesWindow		Janela
 Menu	PreferencesWindow		Menu
 Recent documents	DeskbarMenu		Documentos recentes
-Show seconds	PreferencesWindow		Exibir segundos
 Auto-hide	PreferencesWindow		Ocultar automaticamente
 Always on top	PreferencesWindow		Sempre no topo
 <Deskbar folder is empty>	DeskbarMenu		<Pasta Deskbar está vazia>
@@ -25,7 +21,6 @@ Deskbar	System name		Deskbar
 Restart system	DeskbarMenu		Reiniciar sistema
 Large	PreferencesWindow		Grande
 Auto-raise	PreferencesWindow		Auto-levantar
-Hide time	TimeView		Ocultar hora
 Recent folders:	PreferencesWindow		Pastas recentes:
 Show application expander	PreferencesWindow		Mostrar expansor de aplicativo
 Restart Tracker	DeskbarMenu		Reiniciar Rastreador
@@ -44,7 +39,6 @@ Deskbar preferences…	DeskbarMenu		Preferências da Deskbar…
 Expand new applications	PreferencesWindow		Expandir novos aplicativos
 Show replicants	DeskbarMenu		Exibir replicantes
 Hide application names	PreferencesWindow		Ocultar nomes de aplicativos
-Clock	PreferencesWindow		Relógio
 Demos	B_USER_DESKBAR_DIRECTORY/Demos		Demonstrações
 Icon size	PreferencesWindow		Tamanho do ícone
 Desktop applets	B_USER_DESKBAR_DIRECTORY/Desktop applets		Miniaplicativos da área de trabalho
@@ -1,6 +1,5 @@
-1	romanian	x-vnd.Be-TSKB	1193384805
+1	romanian	x-vnd.Be-TSKB	1880901506
 Edit menu…	PreferencesWindow		Editează meniu...
-Applications	PreferencesWindow		Aplicații
 Recent documents:	PreferencesWindow		Documente recente:
 Sort running applications	PreferencesWindow		Sortează aplicațiile pornite
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		Aplicații
@@ -12,7 +11,6 @@ Show all	WindowMenu		Afișează tot
 No windows	WindowMenu		Fără ferestre
 Deskbar	System name		Deskbar
 Auto-raise	PreferencesWindow		Auto-montează
-Hide time	TimeView		Ascunde oră
 Recent folders:	PreferencesWindow		Dosare recente:
 Show application expander	PreferencesWindow		Afișează extensorul de aplicație
 Close all	WindowMenu		Închide tot
@@ -22,7 +20,6 @@ Tracker always first	PreferencesWindow		Trackerul întotdeauna primul
 Preferences	B_USER_DESKBAR_DIRECTORY/Preferences		Preferințe
 Show calendar…	TimeView		Afișează calendar...
 Expand new applications	PreferencesWindow		Extinde aplicații noi
-Clock	PreferencesWindow		Ceas
 Demos	B_USER_DESKBAR_DIRECTORY/Demos		Demo-uri
 Desktop applets	B_USER_DESKBAR_DIRECTORY/Desktop applets		Miniaplicații desktop
 Hide all	WindowMenu		Ascunde tot
@@ -1,21 +1,17 @@
-1	russian	x-vnd.Be-TSKB	3197510812
+1	russian	x-vnd.Be-TSKB	3155357024
 Power off	DeskbarMenu		Выключить компьютер
-Show day of week	PreferencesWindow		Отображать день недели
 Edit menu…	PreferencesWindow		Изменить меню…
 Suspend	DeskbarMenu		Приостановить
-Applications	PreferencesWindow		Приложения
 Time preferences…	TimeView		Настроить часы…
 About Haiku	DeskbarMenu		О системе Haiku
 Recent documents:	PreferencesWindow		Недавние документы:
 Recent applications	DeskbarMenu		Недавние приложения
 Sort running applications	PreferencesWindow		Сортировать запущенные приложения
-Show time	Tray		Отображать время
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		Приложения
 Find…	DeskbarMenu		Найти…
 Window	PreferencesWindow		Окно
 Menu	PreferencesWindow		Меню
 Recent documents	DeskbarMenu		Недавние документы
-Show seconds	PreferencesWindow		Отображать секунды
 Auto-hide	PreferencesWindow		Скрывать автоматически
 Always on top	PreferencesWindow		Всегда сверху
 <Deskbar folder is empty>	DeskbarMenu		<Папка Deskbar пуста>
@@ -25,7 +21,6 @@ Deskbar	System name		Deskbar
 Restart system	DeskbarMenu		Перезагрузить компьютер
 Large	PreferencesWindow		Крупные
 Auto-raise	PreferencesWindow		Всплывать при наведении
-Hide time	TimeView		Скрыть часы
 Recent folders:	PreferencesWindow		Недавние папки:
 Show application expander	PreferencesWindow		Отображать список окон приложений
 Restart Tracker	DeskbarMenu		Перезапустить Tracker
@@ -44,7 +39,6 @@ Deskbar preferences…	DeskbarMenu		Настроить Deskbar…
 Expand new applications	PreferencesWindow		Раскрывать список окон при запуске
 Show replicants	DeskbarMenu		Отображать репликанты
 Hide application names	PreferencesWindow		Скрыть имена приложений
-Clock	PreferencesWindow		Часы
 Demos	B_USER_DESKBAR_DIRECTORY/Demos		Демо
 Icon size	PreferencesWindow		Размер значков
 Desktop applets	B_USER_DESKBAR_DIRECTORY/Desktop applets		Апплеты
@@ -1,21 +1,17 @@
-1	slovak	x-vnd.Be-TSKB	3197510812
+1	slovak	x-vnd.Be-TSKB	3155357024
 Power off	DeskbarMenu		Vypnúť
-Show day of week	PreferencesWindow		Zobraziť deň v týždni
 Edit menu…	PreferencesWindow		Upraviť menu…
 Suspend	DeskbarMenu		Režim spánku
-Applications	PreferencesWindow		Aplikácie
 Time preferences…	TimeView		Nastavenia času…
 About Haiku	DeskbarMenu		O Haiku
 Recent documents:	PreferencesWindow		Nedávne dokumenty:
 Recent applications	DeskbarMenu		Nedávne aplikácie
 Sort running applications	PreferencesWindow		Zoradiť bežiace aplikácie
-Show time	Tray		Zobraziť čas
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		Aplikácie
 Find…	DeskbarMenu		Nájsť…
 Window	PreferencesWindow		Okno
 Menu	PreferencesWindow		Menu
 Recent documents	DeskbarMenu		Nedávne dokumenty
-Show seconds	PreferencesWindow		Zobraziť sekundy
 Auto-hide	PreferencesWindow		Automaticky skrývať
 Always on top	PreferencesWindow		Vždy na vrchu
 <Deskbar folder is empty>	DeskbarMenu		<priečinok Panel je prázdny>
@@ -25,7 +21,6 @@ Deskbar	System name		Panel
 Restart system	DeskbarMenu		Reštartovať systém
 Large	PreferencesWindow		Veľké
 Auto-raise	PreferencesWindow		Automaticky aktivovať
-Hide time	TimeView		Skryť čas
 Recent folders:	PreferencesWindow		Nedávne priečinky:
 Show application expander	PreferencesWindow		Zobraziť výsuvný zoznam aplikácií
 Restart Tracker	DeskbarMenu		Reštartovať Tracker
@@ -44,7 +39,6 @@ Deskbar preferences…	DeskbarMenu		Nastavenia Panelu…
 Expand new applications	PreferencesWindow		Výsuvný zoznam nových aplikácií
 Show replicants	DeskbarMenu		Zobraziť replikantov
 Hide application names	PreferencesWindow		Skryť názvy aplikácií
-Clock	PreferencesWindow		Hodiny
 Demos	B_USER_DESKBAR_DIRECTORY/Demos		Demá
 Icon size	PreferencesWindow		Veľkosť ikon
 Desktop applets	B_USER_DESKBAR_DIRECTORY/Desktop applets		Aplety plochy
@@ -1,21 +1,17 @@
-1	swedish	x-vnd.Be-TSKB	3197510812
+1	swedish	x-vnd.Be-TSKB	3155357024
 Power off	DeskbarMenu		Stäng av
-Show day of week	PreferencesWindow		Visa dag i veckan
 Edit menu…	PreferencesWindow		Redigera meny...
 Suspend	DeskbarMenu		Vänteläge
-Applications	PreferencesWindow		Program
 Time preferences…	TimeView		Tidspreferenser
 About Haiku	DeskbarMenu		Om Haiku
 Recent documents:	PreferencesWindow		Senaste dokument:
 Recent applications	DeskbarMenu		Senaste program
 Sort running applications	PreferencesWindow		Sortera aktiva program
-Show time	Tray		Visa tid
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		Program
 Find…	DeskbarMenu		Sök...
 Window	PreferencesWindow		Fönster
 Menu	PreferencesWindow		Meny
 Recent documents	DeskbarMenu		Senaste dokument
-Show seconds	PreferencesWindow		Visa sekunder
 Auto-hide	PreferencesWindow		Dölj automatiskt
 Always on top	PreferencesWindow		Alltid överst
 <Deskbar folder is empty>	DeskbarMenu		<Deskbar mappen är tom>
@@ -25,7 +21,6 @@ Deskbar	System name		Deskbar
 Restart system	DeskbarMenu		Starta om systemet
 Large	PreferencesWindow		Stor
 Auto-raise	PreferencesWindow		Höj vid närkontakt
-Hide time	TimeView		Göm tiden
 Recent folders:	PreferencesWindow		Senaste mappar:
 Show application expander	PreferencesWindow		Visa program-expanderare
 Restart Tracker	DeskbarMenu		Starta om Tracker
@@ -44,7 +39,6 @@ Deskbar preferences…	DeskbarMenu		Deskbar inställningar...
 Expand new applications	PreferencesWindow		Expandera nya program
 Show replicants	DeskbarMenu		Visa replicants
 Hide application names	PreferencesWindow		Göm applikation namnen
-Clock	PreferencesWindow		Klocka
 Demos	B_USER_DESKBAR_DIRECTORY/Demos		Exempelprogram
 Icon size	PreferencesWindow		Ikonstorlek
 Desktop applets	B_USER_DESKBAR_DIRECTORY/Desktop applets		Skrivbordsprogram
@@ -1,7 +1,6 @@
-1	ukrainian	x-vnd.Be-TSKB	1095421712
+1	ukrainian	x-vnd.Be-TSKB	1782938413
 Power off	DeskbarMenu		Вимкнути
 Edit menu…	PreferencesWindow		Редагувати меню…
-Applications	PreferencesWindow		Додатки
 Recent documents:	PreferencesWindow		Недавні документи:
 Recent applications	DeskbarMenu		Останні програми
 Sort running applications	PreferencesWindow		Сортувати додатки, що запущені
@@ -18,7 +17,6 @@ No windows	WindowMenu		Немає вікон
 Deskbar	System name		Deskbar
 Restart system	DeskbarMenu		Перезавантажити систему
 Auto-raise	PreferencesWindow		Автоспливання
-Hide time	TimeView		Сховати час
 Recent folders:	PreferencesWindow		Недавні папки:
 Show application expander	PreferencesWindow		Показувати додаток expander
 Restart Tracker	DeskbarMenu		Перезавантажити Tracker
@@ -35,7 +33,6 @@ Show calendar…	TimeView		Показати календар…
 Deskbar preferences…	DeskbarMenu		Налаштування Deskbar...
 Expand new applications	PreferencesWindow		Розпакувати нові додатки
 Show replicants	DeskbarMenu		Показати репліканти
-Clock	PreferencesWindow		Годинник
 Demos	B_USER_DESKBAR_DIRECTORY/Demos		Демо
 Desktop applets	B_USER_DESKBAR_DIRECTORY/Desktop applets		Аплети екрану
 Hide all	WindowMenu		Сховати все
@@ -1,21 +1,17 @@
-1	english	x-vnd.Be-TSKB	3197510812
+1	english	x-vnd.Be-TSKB	3155357024
 Power off	DeskbarMenu		关闭电源
-Show day of week	PreferencesWindow		显示星期
 Edit menu…	PreferencesWindow		编辑菜单
 Suspend	DeskbarMenu		挂起
-Applications	PreferencesWindow		应用程序
 Time preferences…	TimeView		时间设置...
 About Haiku	DeskbarMenu		关于Haiku
 Recent documents:	PreferencesWindow		最近文档：
 Recent applications	DeskbarMenu		最近程序
 Sort running applications	PreferencesWindow		运行程序排序
-Show time	Tray		显示时间
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		应用程序
 Find…	DeskbarMenu		查找...
 Window	PreferencesWindow		窗口
 Menu	PreferencesWindow		菜单
 Recent documents	DeskbarMenu		最近文档：
-Show seconds	PreferencesWindow		显示秒
 Auto-hide	PreferencesWindow		自动隐藏
 Always on top	PreferencesWindow		置顶
 <Deskbar folder is empty>	DeskbarMenu		<桌面栏目录为空>
@@ -25,7 +21,6 @@ Deskbar	System name		桌面栏
 Restart system	DeskbarMenu		重启系统
 Large	PreferencesWindow		大
 Auto-raise	PreferencesWindow		自动
-Hide time	TimeView		隐藏时间
 Recent folders:	PreferencesWindow		最近文件夹：
 Show application expander	PreferencesWindow		显示程序扩展
 Restart Tracker	DeskbarMenu		重启Tracker
@@ -44,7 +39,6 @@ Deskbar preferences…	DeskbarMenu		桌面栏首选项...
 Expand new applications	PreferencesWindow		展开新程序
 Show replicants	DeskbarMenu		显示 replicants
 Hide application names	PreferencesWindow		隐藏应用名称
-Clock	PreferencesWindow		时钟
 Demos	B_USER_DESKBAR_DIRECTORY/Demos		演示程序
 Icon size	PreferencesWindow		图标尺寸
 Desktop applets	B_USER_DESKBAR_DIRECTORY/Desktop applets		桌面插件
@@ -1,4 +1,4 @@
-1	finnish	x-vnd.Haiku-DiskUsage	1726021626
+1	finnish	x-vnd.Haiku-DiskUsage	3848101922
 Scanning %refName%	Scanner		Tutkitaan %refName%
 Size	Info Window		Koko
 Rescan	Pie View		Tutki uudelleen
@@ -9,6 +9,7 @@ no supporting apps	Pie View		ei tukevia sovelluksia
 Path	Info Window		Polku
 Scan	Status View		Tutki
 9999.99 GB	Status View		9999.99 gibitavua
+Rescan	Status View		Tutki uudelleen
 file unavailable	Status View		tiedosto ei ole saatavilla
 Get Info	Pie View		Hae tiedot
 DiskUsage	System name		Levyasemakäyttö
@@ -16,6 +17,7 @@ DiskUsage	System name		Levyasemakäyttö
 %d files	Status View		%d tiedostoa
 Created	Info Window		Luotu
 Modified	Info Window		Muokattu
+Abort	Status View		Keskeytä
 Open	Pie View		Avaa
 Open With	Pie View		Avaa sovelluksella
 %a, %d %b %Y, %r	Info Window		%a, %d. %Bta %Y, %r
@@ -1,4 +1,4 @@
-1	finnish	x-vnd.Haiku-Expander	282517174
+1	finnish	x-vnd.Haiku-Expander	2603318510
 Expand	ExpanderMenu		Laajenna
 Close window when done expanding	ExpanderPreferences		Sulje ikkuna kun laajentaminen on tehty
 Set destination…	ExpanderMenu		Aseta kohde…
@@ -22,6 +22,7 @@ Cancel	ExpanderPreferences		Peru
 Expansion	ExpanderPreferences		Laajentaminen
 Are you sure you want to stop expanding this\narchive? The expanded items may not be complete.	ExpanderWindow		Oletko varma, että haluat pysäyttää tämän arkiston\nlaajentamisen? Laajennetut alkiot eivät ehkä ole valmiita.
 Select	DirectoryFilePanel		Valitse
+Destination folder doesn't exist. Would you like to create it?	ExpanderWindow		Kohdekansiota ”%s” ei ole olemassa. Haluatko luoda sen?
 Same directory as source (archive) file	ExpanderPreferences		Sama hakemisto lähde(arkisto)tiedostona
 Expanding '%s'	ExpanderWindow		Laajennetaan ’%s’
 Settings	ExpanderMenu		Asetukset
@@ -32,6 +33,8 @@ Show contents	ExpanderWindow		Näytä sisällöt
 Automatically show contents listing	ExpanderPreferences		Näytä sisältöluettelo automaattisesti
 OK	ExpanderPreferences		Valmis
 Leave destination folder path empty	ExpanderPreferences		Jätä kohdekansiopolku tyhjäksi
+Failed to create the destination folder.	ExpanderWindow		Kohdekansion luominen epäonnistui.
+Create	ExpanderWindow		Luo
 The folder was either moved, renamed or not\nsupported.	ExpanderWindow		Kansio on joko siirretty, nimetty uudelleen tai sitä\nei tueta.
 The file doesn't exist	ExpanderWindow		Tiedostoa ei ole olemassa
 Stop	ExpanderMenu		Pysäytä
@@ -1,4 +1,4 @@
-1	belarusian	x-vnd.Haiku-StyledEdit	1508367857
+1	belarusian	x-vnd.Haiku-StyledEdit	3417936913
 StyledEdit	System name		Стыльны Рэдактар
 Paste	Menus		Уставіць
 OK	LoadAlert		Так
@@ -7,7 +7,6 @@ File	Menus		Файл
 Lines:	Statistics		Радкоў:
 Italic	Menus		Нахілены
 Left	Menus		Левы
-Revert to the last version of \"%s\"? 	RevertToSavedAlert		Вярнуцца да апошняй версіі \"%s\"? 
 Search backwards	FindandReplaceWindow		Шукаць ў адваротным накірунку
 Size	Menus		Памер
 Save	QuitAlert		Захаваць
@@ -20,7 +19,6 @@ Cancel	SaveAlert		Адмена
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		Немагчыма вярнуцца, файл \"%s\" ня знойдзены.
 Case-sensitive	FindandReplaceWindow		З улікам рэгістру
 Green	Menus		Зялёны
-Revert to saved…	Menus		Вярнуцца да захаванага…
 Yellow	Menus		Жоўты
 Replace in all windows	FindandReplaceWindow		Замяняць ва ўсіх вокнах
 Wrap lines	Menus		Пераносіць радкі
@@ -1,4 +1,4 @@
-1	german	x-vnd.Haiku-StyledEdit	1508367857
+1	german	x-vnd.Haiku-StyledEdit	3417936913
 StyledEdit	System name		Texteditor
 Paste	Menus		Einfügen
 OK	LoadAlert		OK
@@ -7,7 +7,6 @@ File	Menus		Datei
 Lines:	Statistics		Zeilen:
 Italic	Menus		Kursiv
 Left	Menus		Links
-Revert to the last version of \"%s\"? 	RevertToSavedAlert		Letzte Version von \"%s\" wiederherstellen? 
 Search backwards	FindandReplaceWindow		Rückwärts suchen
 Size	Menus		Größe
 Save	QuitAlert		Speichern
@@ -20,7 +19,6 @@ Cancel	SaveAlert		Abbrechen
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		Rückgängig machen unmöglich, die Datei wurde nicht gefunden: \"%s\".
 Case-sensitive	FindandReplaceWindow		Groß-/Kleinschreibung beachten
 Green	Menus		Grün
-Revert to saved…	Menus		Gespeicherte Version herstellen…
 Yellow	Menus		Gelb
 Replace in all windows	FindandReplaceWindow		In allen Fenstern ersetzen
 Wrap lines	Menus		Zeilenumbruch
@@ -1,4 +1,4 @@
-1	greek, modern (1453-)	x-vnd.Haiku-StyledEdit	1508367857
+1	greek, modern (1453-)	x-vnd.Haiku-StyledEdit	3417936913
 StyledEdit	System name		StyledEdit
 Paste	Menus		Επικόλληση
 OK	LoadAlert		Εντάξει
@@ -7,7 +7,6 @@ File	Menus		Αρχείο
 Lines:	Statistics		Γραμμές:
 Italic	Menus		Πλάγια
 Left	Menus		Αριστερά
-Revert to the last version of \"%s\"? 	RevertToSavedAlert		Επαναφορά στην τελευταία έκδοση του \"%s\";
 Search backwards	FindandReplaceWindow		Αναζήτηση προς τα πίσω
 Size	Menus		Μέγεθος
 Save	QuitAlert		Αποθήκευση
@@ -20,7 +19,6 @@ Cancel	SaveAlert		Άκυρο
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		Δεν μπορεί να γίνει επαναφορά, το αρχείο δεν βρέθηκε: \"%s\".
 Case-sensitive	FindandReplaceWindow		Ταίριασμα πεζών/κεφαλαίων
 Green	Menus		Πράσινο
-Revert to saved…	Menus		Επαναφορά στο αποθηκευμένο...
 Yellow	Menus		Κίτρινο
 Replace in all windows	FindandReplaceWindow		Αντικατάσταση σε όλα τα παράθυρα
 Wrap lines	Menus		Αναδίπλωση γραμμών
@@ -1,4 +1,4 @@
-1	finnish	x-vnd.Haiku-StyledEdit	1508367857
+1	finnish	x-vnd.Haiku-StyledEdit	3417936913
 StyledEdit	System name		Tyylitetty editori
 Paste	Menus		Liitä
 OK	LoadAlert		Valmis
@@ -7,7 +7,6 @@ File	Menus		Tiedosto
 Lines:	Statistics		Rivejä:
 Italic	Menus		Kursivointi
 Left	Menus		Vasen
-Revert to the last version of \"%s\"? 	RevertToSavedAlert		Palauta viimeinen ”%s”-versio? 
 Search backwards	FindandReplaceWindow		Etsi taaksepäin
 Size	Menus		Koko
 Save	QuitAlert		Tallenna
@@ -20,7 +19,6 @@ Cancel	SaveAlert		Peru
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		Ei voi palauttaa, tiedostoa ei löytynyt: ”%s”.
 Case-sensitive	FindandReplaceWindow		Kirjainkoosta riippuva
 Green	Menus		Vihreä
-Revert to saved…	Menus		Palauta tallennettuun…
 Yellow	Menus		Keltainen
 Replace in all windows	FindandReplaceWindow		Korvaa kaikissa ikkunoissa
 Wrap lines	Menus		Rivitä
@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-StyledEdit	1508367857
+1	french	x-vnd.Haiku-StyledEdit	3417936913
 StyledEdit	System name		Éditeur stylé
 Paste	Menus		Coller
 OK	LoadAlert		OK
@@ -7,7 +7,6 @@ File	Menus		Fichier
 Lines:	Statistics		Lignes :
 Italic	Menus		Italique
 Left	Menus		À gauche
-Revert to the last version of \"%s\"? 	RevertToSavedAlert		Retourner à la dernière version de « %s » ? 
 Search backwards	FindandReplaceWindow		Chercher en arrière
 Size	Menus		Taille
 Save	QuitAlert		Sauvegarder
@@ -20,7 +19,6 @@ Cancel	SaveAlert		Annuler
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		Rétablissement impossible, fichier non trouvé : « %s ».
 Case-sensitive	FindandReplaceWindow		Sensible à la casse
 Green	Menus		Vert
-Revert to saved…	Menus		Revenir à la dernière version enregistrée…
 Yellow	Menus		Jaune
 Replace in all windows	FindandReplaceWindow		Remplacer dans toutes les fenêtres
 Wrap lines	Menus		Retour à la ligne
@@ -1,4 +1,4 @@
-1	hindi	x-vnd.Haiku-StyledEdit	1508367857
+1	hindi	x-vnd.Haiku-StyledEdit	3417936913
 StyledEdit	System name		StyledEdit
 Paste	Menus		पेस्ट
 OK	LoadAlert		ठीक है
@@ -7,7 +7,6 @@ File	Menus		फ़ाइल
 Lines:	Statistics		लाइनें:
 Italic	Menus		तिरछे अक्षर
 Left	Menus		बाएं
-Revert to the last version of \"%s\"? 	RevertToSavedAlert		पिछले संस्करण \"%s\" पर जाए? 
 Search backwards	FindandReplaceWindow		पीछे ढूँढें
 Size	Menus		आकार
 Save	QuitAlert		सहेजें
@@ -20,7 +19,6 @@ Cancel	SaveAlert		रद्द
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		वापस नहीं कर सकते, फ़ाइल नहीं मिली : \"%s\".
 Case-sensitive	FindandReplaceWindow		केस संवेदी
 Green	Menus		हरा
-Revert to saved…	Menus		सहेजी स्थिति पर लौटे
 Yellow	Menus		पीला
 Replace in all windows	FindandReplaceWindow		सभी विंडो में बदलें
 Wrap lines	Menus		रेखाएं लपेटें
@@ -1,4 +1,4 @@
-1	hungarian	x-vnd.Haiku-StyledEdit	1508367857
+1	hungarian	x-vnd.Haiku-StyledEdit	3417936913
 StyledEdit	System name		StyledEdit
 Paste	Menus		Beillesztés
 OK	LoadAlert		Rendben
@@ -7,7 +7,6 @@ File	Menus		Fájl
 Lines:	Statistics		Sor:
 Italic	Menus		Dőlt
 Left	Menus		Balra
-Revert to the last version of \"%s\"? 	RevertToSavedAlert		Visszaállítja legutolsó verzióját: %s?
 Search backwards	FindandReplaceWindow		Keresés visszafelé
 Size	Menus		Méret
 Save	QuitAlert		Mentés
@@ -20,7 +19,6 @@ Cancel	SaveAlert		Mégse
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		Nem vonható vissza, a fájl (%s) nem található.
 Case-sensitive	FindandReplaceWindow		Betűérzékeny
 Green	Menus		Zöld
-Revert to saved…	Menus		Vissza a mentett állapotra…
 Yellow	Menus		Sárga
 Replace in all windows	FindandReplaceWindow		Cserélje minden ablakban
 Wrap lines	Menus		Sortörés
@@ -1,4 +1,4 @@
-1	japanese	x-vnd.Haiku-StyledEdit	1508367857
+1	japanese	x-vnd.Haiku-StyledEdit	3417936913
 StyledEdit	System name		StyledEdit
 Paste	Menus		貼り付け
 OK	LoadAlert		OK
@@ -7,7 +7,6 @@ File	Menus		ファイル
 Lines:	Statistics		行数:
 Italic	Menus		イタリック
 Left	Menus		左揃え
-Revert to the last version of \"%s\"? 	RevertToSavedAlert		\"%s\" を最後に保存した内容へ戻しますか？
 Search backwards	FindandReplaceWindow		逆方向検索
 Size	Menus		サイズ
 Save	QuitAlert		保存
@@ -20,7 +19,6 @@ Cancel	SaveAlert		中止
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		\"%s\" ファイルが存在しないため、読み込めませんでした。
 Case-sensitive	FindandReplaceWindow		大文字と小文字を区別する
 Green	Menus		緑
-Revert to saved…	Menus		最新保存版に戻す…
 Yellow	Menus		黄
 Replace in all windows	FindandReplaceWindow		すべてのウィンドウで置換
 Wrap lines	Menus		ワードラップ
@@ -1,4 +1,4 @@
-1	lithuanian	x-vnd.Haiku-StyledEdit	1508367857
+1	lithuanian	x-vnd.Haiku-StyledEdit	3417936913
 StyledEdit	System name		Rašyklė
 Paste	Menus		Įdėti
 OK	LoadAlert		Gerai
@@ -7,7 +7,6 @@ File	Menus		Failas
 Lines:	Statistics		Eilučių:
 Italic	Menus		Kursyvas
 Left	Menus		Kairinė
-Revert to the last version of \"%s\"? 	RevertToSavedAlert		Grįžti prie paskutinės „%s“ versijos? 
 Search backwards	FindandReplaceWindow		Ieškoti viršun
 Size	Menus		Dydis
 Save	QuitAlert		Įrašyti
@@ -20,7 +19,6 @@ Cancel	SaveAlert		Atsisakyti
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		Negrįžtama, failas nerastas: „%s“.
 Case-sensitive	FindandReplaceWindow		Paisyti raidžių registro
 Green	Menus		Žalia
-Revert to saved…	Menus		Grįžti prie įrašyto…
 Yellow	Menus		Geltona
 Replace in all windows	FindandReplaceWindow		Keisti visuose languose
 Wrap lines	Menus		Laužyti eilutes
@@ -1,4 +1,4 @@
-1	dutch; flemish	x-vnd.Haiku-StyledEdit	1508367857
+1	dutch; flemish	x-vnd.Haiku-StyledEdit	3417936913
 StyledEdit	System name		StyledEdit
 Paste	Menus		Plakken
 OK	LoadAlert		Oké
@@ -7,7 +7,6 @@ File	Menus		Bestand
 Lines:	Statistics		Regels:
 Italic	Menus		Cursief
 Left	Menus		Links
-Revert to the last version of \"%s\"? 	RevertToSavedAlert		Herstellen naar laatste versie van \"%s\"? 
 Search backwards	FindandReplaceWindow		Achteruit zoeken
 Size	Menus		Grootte
 Save	QuitAlert		Opslaan
@@ -20,7 +19,6 @@ Cancel	SaveAlert		Annuleren
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		Kan niet herstellen, het bestand \"%s\" werd niet gevonden.
 Case-sensitive	FindandReplaceWindow		Hoofdlettergevoelig
 Green	Menus		Groen
-Revert to saved…	Menus		Herstel naar opgeslagen...
 Yellow	Menus		Geel
 Replace in all windows	FindandReplaceWindow		Vervang in alle vensters
 Wrap lines	Menus		Regels afbreken
@@ -1,4 +1,4 @@
-1	polish	x-vnd.Haiku-StyledEdit	1508367857
+1	polish	x-vnd.Haiku-StyledEdit	3417936913
 StyledEdit	System name		StyledEdit
 Paste	Menus		Wklej
 OK	LoadAlert		OK
@@ -7,7 +7,6 @@ File	Menus		Plik
 Lines:	Statistics		Linie:
 Italic	Menus		Kursywa
 Left	Menus		Lewo
-Revert to the last version of \"%s\"? 	RevertToSavedAlert		Przywrócić ostatnią wersję \"%s\"? 
 Search backwards	FindandReplaceWindow		Szukaj wstecz
 Size	Menus		Rozmiar
 Save	QuitAlert		Zapisz
@@ -20,7 +19,6 @@ Cancel	SaveAlert		Anuluj
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		Nie można przywrócić, nie znaleziono pliku: \"%s\".
 Case-sensitive	FindandReplaceWindow		Wielkość liter brana pod uwagę
 Green	Menus		Zielony
-Revert to saved…	Menus		Przywróć zapisane…
 Yellow	Menus		Żółty
 Replace in all windows	FindandReplaceWindow		Zamień we wszystkich oknach
 Wrap lines	Menus		Zawijaj wiersze
@@ -1,4 +1,4 @@
-1	portuguese (brazil)	x-vnd.Haiku-StyledEdit	1508367857
+1	portuguese (brazil)	x-vnd.Haiku-StyledEdit	3417936913
 StyledEdit	System name		Estilo de Edição
 Paste	Menus		Colar
 OK	LoadAlert		OK
@@ -7,7 +7,6 @@ File	Menus		Arquivo
 Lines:	Statistics		Linhas:
 Italic	Menus		Itálico
 Left	Menus		Esquerda
-Revert to the last version of \"%s\"? 	RevertToSavedAlert		Reverter para a última versão de \"%s\"?
 Search backwards	FindandReplaceWindow		Pesquisar para trás
 Size	Menus		Tamanho
 Save	QuitAlert		Salvar
@@ -20,7 +19,6 @@ Cancel	SaveAlert		Cancelar
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		Impossível reverter, arquivo não encontrado: \"%s\".
 Case-sensitive	FindandReplaceWindow		Diferenciar maiúsculas/minúsculas
 Green	Menus		Verde
-Revert to saved…	Menus		Reverter para arquivo salvo...
 Yellow	Menus		Amarelo
 Replace in all windows	FindandReplaceWindow		Substituir em todas as janelas
 Wrap lines	Menus		Quebrar linhas
@@ -1,4 +1,4 @@
-1	romanian	x-vnd.Haiku-StyledEdit	1799001682
+1	romanian	x-vnd.Haiku-StyledEdit	3417936913
 StyledEdit	System name		EditorText
 Paste	Menus		Lipește
 OK	LoadAlert		OK
@@ -19,7 +19,6 @@ Cancel	SaveAlert		Anulează
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		Nu se poate reveni, nu s-a găsit fișierul: „%s”.
 Case-sensitive	FindandReplaceWindow		Sensibil la majuscule
 Green	Menus		Verde
-Revert to saved…	Menus		Revenire la salvat...
 Yellow	Menus		Galben
 Replace in all windows	FindandReplaceWindow		Înlocuiește în toate ferestrele
 Wrap lines	Menus		Încadrează linii
@@ -1,4 +1,4 @@
-1	russian	x-vnd.Haiku-StyledEdit	1508367857
+1	russian	x-vnd.Haiku-StyledEdit	3417936913
 StyledEdit	System name		Стильный редактор
 Paste	Menus		Вставить
 OK	LoadAlert		ОК
@@ -7,7 +7,6 @@ File	Menus		Файл
 Lines:	Statistics		Строк:
 Italic	Menus		Наклонный
 Left	Menus		По левому краю
-Revert to the last version of \"%s\"? 	RevertToSavedAlert		Вернуться к последней сохраненной версии \"%s\"? 
 Search backwards	FindandReplaceWindow		Искать снизу вверх
 Size	Menus		Размер
 Save	QuitAlert		Сохранить
@@ -20,7 +19,6 @@ Cancel	SaveAlert		Отмена
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		Невозможно вернуть, файл не найден: \"%s\".
 Case-sensitive	FindandReplaceWindow		Учитывать регистр
 Green	Menus		Зеленый
-Revert to saved…	Menus		Вернуться к сохраненному…
 Yellow	Menus		Желтый
 Replace in all windows	FindandReplaceWindow		Заменить во всех окнах
 Wrap lines	Menus		Перенос строк
@@ -1,4 +1,4 @@
-1	slovak	x-vnd.Haiku-StyledEdit	1508367857
+1	slovak	x-vnd.Haiku-StyledEdit	3417936913
 StyledEdit	System name		StyledEdit
 Paste	Menus		Vložiť
 OK	LoadAlert		OK
@@ -7,7 +7,6 @@ File	Menus		Súbor
 Lines:	Statistics		Riadkov:
 Italic	Menus		Kurzíva
 Left	Menus		Vľavo
-Revert to the last version of \"%s\"? 	RevertToSavedAlert		Vrátiť späť poslednú verziu „%s“? 
 Search backwards	FindandReplaceWindow		Hľadať dozadu
 Size	Menus		Veľkosť
 Save	QuitAlert		Uložiť
@@ -20,7 +19,6 @@ Cancel	SaveAlert		Zrušiť
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		Nie je možné vrátiť späť, súbor nebol nájdený: „%s“.
 Case-sensitive	FindandReplaceWindow		Rozlišovať veľkosť písmen
 Green	Menus		Zelená
-Revert to saved…	Menus		Vrátiť späť uložené…
 Yellow	Menus		Žltá
 Replace in all windows	FindandReplaceWindow		Nahradiť vo všetkých oknách
 Wrap lines	Menus		Zalamovať riadky
@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Haiku-StyledEdit	1508367857
+1	swedish	x-vnd.Haiku-StyledEdit	3417936913
 StyledEdit	System name		SkrivStiligt
 Paste	Menus		Klistra in
 OK	LoadAlert		OK
@@ -7,7 +7,6 @@ File	Menus		Arkiv
 Lines:	Statistics		Rader:
 Italic	Menus		Kursiv
 Left	Menus		Vänster
-Revert to the last version of \"%s\"? 	RevertToSavedAlert		Återgå till den senast använda versionen av "%s"? 
 Search backwards	FindandReplaceWindow		Sök bakåt
 Size	Menus		Storlek
 Save	QuitAlert		Spara
@@ -20,7 +19,6 @@ Cancel	SaveAlert		Avbryt
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		Kan inte återgå, filen hittades inte: "%s".
 Case-sensitive	FindandReplaceWindow		Skiftlägeskänslig
 Green	Menus		Grön
-Revert to saved…	Menus		Återgå till sparad…
 Yellow	Menus		Gul
 Replace in all windows	FindandReplaceWindow		Ersätt i alla fönster
 Wrap lines	Menus		Bryt rader
@@ -1,4 +1,4 @@
-1	ukrainian	x-vnd.Haiku-StyledEdit	1508367857
+1	ukrainian	x-vnd.Haiku-StyledEdit	3417936913
 StyledEdit	System name		Редактор тексту StyledEdit
 Paste	Menus		Вставити
 OK	LoadAlert		Гаразд
@@ -7,7 +7,6 @@ File	Menus		Файл
 Lines:	Statistics		Стрічка:
 Italic	Menus		Italic
 Left	Menus		Вліво
-Revert to the last version of \"%s\"? 	RevertToSavedAlert		Повернутись до останньої версії \"%s\" ?
 Search backwards	FindandReplaceWindow		Повторний пошук
 Size	Menus		Розмір
 Save	QuitAlert		Зберегти
@@ -20,7 +19,6 @@ Cancel	SaveAlert		Відмінити
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		Неможливо повернути, файл не знайдено: \"%s\".
 Case-sensitive	FindandReplaceWindow		Чутливий до регістра
 Green	Menus		Зелений
-Revert to saved…	Menus		Повернутись до збереження…
 Yellow	Menus		Жовтий
 Replace in all windows	FindandReplaceWindow		Замінити  у всіх вікнах
 Wrap lines	Menus		Перенос по словах
@@ -1,4 +1,4 @@
-1	english	x-vnd.Haiku-StyledEdit	1508367857
+1	english	x-vnd.Haiku-StyledEdit	3417936913
 StyledEdit	System name		StyledEdit
 Paste	Menus		粘贴
 OK	LoadAlert		确定
@@ -7,7 +7,6 @@ File	Menus		文件
 Lines:	Statistics		行数：
 Italic	Menus		斜体
 Left	Menus		居左
-Revert to the last version of \"%s\"? 	RevertToSavedAlert		恢复到最后一个\"%s\"版本？
 Search backwards	FindandReplaceWindow		后台搜索
 Size	Menus		大小
 Save	QuitAlert		保存
@@ -20,7 +19,6 @@ Cancel	SaveAlert		取消
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		无法恢复，文件未找到：\"%s\"。
 Case-sensitive	FindandReplaceWindow		区分大小写
 Green	Menus		绿
-Revert to saved…	Menus		恢复保存为...
 Yellow	Menus		黄
 Replace in all windows	FindandReplaceWindow		在所有窗口进行替换
 Wrap lines	Menus		收起
@@ -1,10 +1,9 @@
-1	german	x-vnd.Haiku-Terminal	1252738083
+1	german	x-vnd.Haiku-Terminal	1724034391
 Not found.	Terminal TermWindow		Nicht gefunden.
 Switch Terminals	Terminal TermWindow		Terminals wechseln
 Change directory	Terminal TermView		Zum Ordner wechseln
 OK	Terminal TermWindow		OK
 New Terminal	Terminal TermWindow		Neues Terminal
-Cursor text	Terminal AppearancePrefView		Text unter Cursor
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Das Terminal konnte die Konsole leider nicht starten.
 Match case	Terminal FindWindow		Groß-/Kleinschreibung beachten
 Quit	Terminal TermWindow		Beenden
@@ -20,8 +19,11 @@ Font:	Terminal AppearancePrefView		Schriftart:
 Copy here	Terminal TermView		Hierher kopieren
 Really close?	Terminal TermWindow		Wirklich schließen?
 Copy	Terminal TermWindow		Kopieren
+Color scheme:	Terminal AppearancePrefView		Farbschema:
 Window title:	Terminal TermWindow		Fenstertitel:
 Unrecognized option \"%s\"\n	Terminal arguments parsing		Unbekannte Option \"%s\"\n
+Blue	Terminal colors scheme		Blau
+Custom	Terminal colors scheme		Benutzerdefiniert
 %app% settings	Terminal PrefWindow	window title	%app%-Einstellungen
 Cancel	Terminal SetTitleWindow		Abbrechen
 Increase	Terminal TermWindow		Vergrößern
@@ -45,6 +47,7 @@ The following processes are still running:\n\n\t%1\n\nIf you close the Terminal,
 Insert path	Terminal TermView		Pfad einfügen
 Haiku Terminal\nCopyright 2001-2009 Haiku, Inc.\nCopyright(C) 1999 Kazuho Okui and Takashi Murai.\n\nUsage: %s [OPTION] [SHELL]\n	Terminal TermApp		Haiku Terminal\nCopyright 2001-2009 Haiku, Inc.\nCopyright(C) 1999 Kazuho Okui und Takashi Murai.\n\nGebrauch: %s [OPTION] [SHELL]\n
 No search string was entered.	Terminal TermWindow		Es wurde kein Suchbegriff eingegeben.
+Font size	Terminal TermWindow		Schriftgröße
 Blinking cursor	Terminal AppearancePrefView		Blinkender Cursor
 Don't save	Terminal PrefWindow		Verwerfen
 Set window title	Terminal TermWindow		Setze Fenstertitel
@@ -57,11 +60,15 @@ Find…	Terminal TermWindow		Suchen...
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Der Prozess \"%1\" läuft noch.\nWird das Terminal geschlossen, wird auch dieser Prozess abgebrochen.
 Move here	Terminal TermView		Hierher verschieben
 \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-\tDas aktuelle Arbeitsverzeichnis des aktiven Prozesses\n\t\t\t in diesem Reiter. Optional kann die maximale Anzahl von Pfad-Komponenten\n\t\t\t angegeben werden, z.B. '%2d' für maximal zwei Komponenten.\n\t%i\t-\tDer Index des Fensters.\n\t%p\t-\tDer Titel dieses Reiters.\n\t%%\t-\tDas %-Zeichen.
+Retro	Terminal colors scheme		Retro
 Error!	Terminal getString		Fehler!
 New tab	Terminal TermWindow		Neuer Reiter
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Die Formel für Reitertitel. Folgende Variablen\nstehen zur Verfügung:\n
 Selected background	Terminal AppearancePrefView		Auswahl-Hintergrund
+Slate	Terminal colors scheme		Schiefer
+Midnight	Terminal colors scheme		Mitternacht
 Decrease	Terminal TermWindow		Verkleinern
+Default	Terminal colors scheme		Standard
 Create link here	Terminal TermView		Verknüpfung hier erstellen
 Close	Terminal TermWindow		Schließen
 Text	Terminal AppearancePrefView		Text
@@ -74,7 +81,6 @@ Set tab title	Terminal TermWindow		Reiter umbenennen
 Settings…	Terminal TermWindow		Einstellungen...
 Abort	Terminal Shell		Abbrechen
 Edit	Terminal TermWindow		Bearbeiten
-Cursor background	Terminal AppearancePrefView		Cursor
 Color:	Terminal AppearancePrefView		Farbe:
 The pattern specifying the window title. The following placeholders\ncan be used:\n	Terminal TermWindow		Die Formel für den Fenstertitel. Folgende Variablen\nstehen zur Verfügung:\n
 Print	Terminal TermWindow		Drucken
@@ -1,7 +1,8 @@
-1	finnish	x-vnd.Haiku-Terminal	2912171349
+1	finnish	x-vnd.Haiku-Terminal	4226482962
 Not found.	Terminal TermWindow		Ei löytynyt.
 Switch Terminals	Terminal TermWindow		Vaihda pääteikkunoita
 Change directory	Terminal TermView		Vaihda hakemistoa
+Professional	Terminal colors scheme		Ammattilaistaso
 OK	Terminal TermWindow		Valmis
 New Terminal	Terminal TermWindow		Uusi Pääteikkuna
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Komentotulkin käynnistäminen Pääteikkunassa epäonnistui.
@@ -19,8 +20,11 @@ Font:	Terminal AppearancePrefView		Kirjasintyyppi:
 Copy here	Terminal TermView		Kopioi tänne
 Really close?	Terminal TermWindow		Suljetaanko todella?
 Copy	Terminal TermWindow		Kopioi
+Color scheme:	Terminal AppearancePrefView		Väriteema:
 Window title:	Terminal TermWindow		Ikkunaotsikko:
 Unrecognized option \"%s\"\n	Terminal arguments parsing		Tunnistamaton valitsin ”%s”\n
+Blue	Terminal colors scheme		Sininen
+Custom	Terminal colors scheme		Räätälöity
 %app% settings	Terminal PrefWindow	window title	%app%-asetukset
 Cancel	Terminal SetTitleWindow		Peru
 Increase	Terminal TermWindow		Kasvata
@@ -44,6 +48,8 @@ The following processes are still running:\n\n\t%1\n\nIf you close the Terminal,
 Insert path	Terminal TermView		Lisää polku
 Haiku Terminal\nCopyright 2001-2009 Haiku, Inc.\nCopyright(C) 1999 Kazuho Okui and Takashi Murai.\n\nUsage: %s [OPTION] [SHELL]\n	Terminal TermApp		Haiku Pääteikkuna\nCopyright 2001-2009 Haiku, Inc.\nCopyright(C) 1999 Kazuho Okui ja Takashi Murai.\n\nKäyttö: %s [VALITSIN] [KOMENTOTULKKI]\n
 No search string was entered.	Terminal TermWindow		Hakumerkkijono ei kirjoitettu.
+Font size	Terminal TermWindow		Kirjasinkoko
+Blinking cursor	Terminal AppearancePrefView		Vilkkuva kohdistin
 Don't save	Terminal PrefWindow		Älä tallenna
 Set window title	Terminal TermWindow		Aseta ikkunaotsikko
 Terminal	System name		Pääteikkuna
@@ -55,11 +61,15 @@ Find…	Terminal TermWindow		Etsi...
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Prosessia ”%1” suoritetaan yhä.\nJos suljet Pääteikkunan, prosessi tapetaan.
 Move here	Terminal TermView		Siirrä tänne
 \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-\tKäynnissä olevan prosessin nykyinen työhakemisto\n\t\t\tnykyisessä välilehdessä. Valinnaisesti määriteltävien polkukomponenttien\n\t\t\tenimmäismäärä. Esim.: ’%2d’ kahdelle yleisimmälle komponentille.\n\t%i\t-\tIkkunan indeksi.\n\t%p\t-\tKäynnissä olevan prosessin nimi nykyisessä välilehdessä.\n\t%t\t-\tNykyisen välilehden otsikko.\n\t%%\t-\tMerkki ’%’.
+Retro	Terminal colors scheme		Retro
 Error!	Terminal getString		Virhe!
 New tab	Terminal TermWindow		Uusi välilehti
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Välilehtiotsikot määrittävä malli. Seuraavia paikanpitäjiä\nvoidaan käyttää:\n
 Selected background	Terminal AppearancePrefView		Valitse tausta
+Slate	Terminal colors scheme		Laatta
+Midnight	Terminal colors scheme		Keskiyö
 Decrease	Terminal TermWindow		Vähennä
+Default	Terminal colors scheme		Oletus
 Create link here	Terminal TermView		Luo linkki tänne
 Close	Terminal TermWindow		Sulje
 Text	Terminal AppearancePrefView		Teksti
@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-Terminal	680179617
+1	french	x-vnd.Haiku-Terminal	1829613568
 Not found.	Terminal TermWindow		Non trouvé.
 Switch Terminals	Terminal TermWindow		Inverser les Terminaux
 Change directory	Terminal TermView		Changer de répertoire
@@ -73,7 +73,6 @@ Set tab title	Terminal TermWindow		Changer le titre de l'onglet
 Settings…	Terminal TermWindow		Réglages…
 Abort	Terminal Shell		Abandonner
 Edit	Terminal TermWindow		Éditer
-Cursor background	Terminal AppearancePrefView		Arrière-plan du curseur
 Color:	Terminal AppearancePrefView		Couleur :
 The pattern specifying the window title. The following placeholders\ncan be used:\n	Terminal TermWindow		Le modèle utilisé pour composer le titre des fenêtres peut\ncontenir les éléments suivants :\n
 Print	Terminal TermWindow		Imprimer
@@ -1,10 +1,10 @@
-1	hungarian	x-vnd.Haiku-Terminal	1252738083
+1	hungarian	x-vnd.Haiku-Terminal	4226482962
 Not found.	Terminal TermWindow		Nem található.
 Switch Terminals	Terminal TermWindow		Terminálok közti váltás
 Change directory	Terminal TermView		Mappa váltása
+Professional	Terminal colors scheme		Professzionális
 OK	Terminal TermWindow		Rendben
 New Terminal	Terminal TermWindow		Új terminál
-Cursor text	Terminal AppearancePrefView		Kurzor szöveg
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Sajnos, a terminálnak nem sikerült elindítani a shellt.
 Match case	Terminal FindWindow		Betűérzékeny
 Quit	Terminal TermWindow		Kilépés
@@ -20,8 +20,11 @@ Font:	Terminal AppearancePrefView		Betűtípus:
 Copy here	Terminal TermView		Másolás
 Really close?	Terminal TermWindow		Biztos bezárja?
 Copy	Terminal TermWindow		Másolás
+Color scheme:	Terminal AppearancePrefView		Színösszeállítás:
 Window title:	Terminal TermWindow		Ablak címe:
 Unrecognized option \"%s\"\n	Terminal arguments parsing		Ismeretlen beállítás: %s\n
+Blue	Terminal colors scheme		Kék
+Custom	Terminal colors scheme		Egyéni
 %app% settings	Terminal PrefWindow	window title	%app% beállítások
 Cancel	Terminal SetTitleWindow		Mégse
 Increase	Terminal TermWindow		Növelés
@@ -45,6 +48,7 @@ The following processes are still running:\n\n\t%1\n\nIf you close the Terminal,
 Insert path	Terminal TermView		Útvonal beszúrása
 Haiku Terminal\nCopyright 2001-2009 Haiku, Inc.\nCopyright(C) 1999 Kazuho Okui and Takashi Murai.\n\nUsage: %s [OPTION] [SHELL]\n	Terminal TermApp		Haiku Terminál\nMinden jog fenntartva 2001-2009 Haiku, Inc.\nMinden jog fenntartva(C) 1999 Kazuho Okui és Takashi Murai.\n\nHasználata: %s [OPCIÓ] [SHELL]\n
 No search string was entered.	Terminal TermWindow		Nincs beírva keresendő szöveg
+Font size	Terminal TermWindow		Betűméret
 Blinking cursor	Terminal AppearancePrefView		Villogó kurzor
 Don't save	Terminal PrefWindow		Nincs mentés
 Set window title	Terminal TermWindow		Ablak címének beállítása
@@ -57,11 +61,15 @@ Find…	Terminal TermWindow		Keresés…
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		A folyamat (%1) még fut.\nHa bezárja a Terminált, a folyamat megszakad.
 Move here	Terminal TermView		Mozgatás
 \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-\tAz a mappa amiben a jelenlegi fül az aktív folyamata\n\t\t\tfut épp.Meg lehet adni az elérési út\n\t\t\tkomponenseinek számát. Pl. '%2d' maximum két komponenshez.\n\t%i\t-\tAz ablak indexe.\n\t%p\t-\tA jelenlegi fülben futó folyamat neve.\n\t%t\t-\tA jelenlegi fül címe.\n\t%%\t-\tEgy '%' karakter.
+Retro	Terminal colors scheme		Retro
 Error!	Terminal getString		Hiba!
 New tab	Terminal TermWindow		Új lap
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		A fülek címét meghatározó minta. A következő kódok használhatóak:
 Selected background	Terminal AppearancePrefView		Kijelölés háttere
+Slate	Terminal colors scheme		Pala
+Midnight	Terminal colors scheme		Éjfél
 Decrease	Terminal TermWindow		Csökkentés
+Default	Terminal colors scheme		Eredeti
 Create link here	Terminal TermView		Hivatkozás létrehozása
 Close	Terminal TermWindow		Bezárás
 Text	Terminal AppearancePrefView		Szöveg
@@ -74,7 +82,6 @@ Set tab title	Terminal TermWindow		Lap címének beállítása
 Settings…	Terminal TermWindow		Beállítások…
 Abort	Terminal Shell		Megszakítás
 Edit	Terminal TermWindow		Szerkesztés
-Cursor background	Terminal AppearancePrefView		Kurzor háttere
 Color:	Terminal AppearancePrefView		Szín:
 The pattern specifying the window title. The following placeholders\ncan be used:\n	Terminal TermWindow		Az ablak címét meghatározó minta. A következő kódok használhatóak:
 Print	Terminal TermWindow		Nyomtatás
@@ -1,10 +1,10 @@
-1	japanese	x-vnd.Haiku-Terminal	1252738083
+1	japanese	x-vnd.Haiku-Terminal	4226482962
 Not found.	Terminal TermWindow		これ以上見つかりません。
 Switch Terminals	Terminal TermWindow		ターミナルを切替える
 Change directory	Terminal TermView		ディレクトリを変更
+Professional	Terminal colors scheme		プロフェッショナル
 OK	Terminal TermWindow		OK
 New Terminal	Terminal TermWindow		新しいターミナルを開く
-Cursor text	Terminal AppearancePrefView		カーソル
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		すみません、シェルを起動できませんでした。
 Match case	Terminal FindWindow		大文字と小文字を区別する
 Quit	Terminal TermWindow		終了
@@ -20,8 +20,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		Unrecognized option \"%s\"\n
+Blue	Terminal colors scheme		ブルー
+Custom	Terminal colors scheme		カスタム
 %app% settings	Terminal PrefWindow	window title	%app% 設定
 Cancel	Terminal SetTitleWindow		中止
 Increase	Terminal TermWindow		大きく
@@ -45,6 +48,7 @@ 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 Terminal\nCopyright 2001-2009 Haiku, Inc.\nCopyright(C) 1999 Kazuho Okui and Takashi Murai.\n\nUsage: %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		ウィンドウタイトルを設定
@@ -57,11 +61,15 @@ Find…	Terminal TermWindow		検索…
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		プロセス \"%1\" がまだ実行中です。\nTerminalを閉じると強制終了されます。
 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-\tThe index of the window.\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		スレート
+Midnight	Terminal colors scheme		ミッドナイト
 Decrease	Terminal TermWindow		小さく
+Default	Terminal colors scheme		デフォルト
 Create link here	Terminal TermView		カレントディレクトリにリンク作成
 Close	Terminal TermWindow		閉じる
 Text	Terminal AppearancePrefView		テキスト
@@ -74,7 +82,6 @@ Set tab title	Terminal TermWindow		タブのタイトルを設定
 Settings…	Terminal TermWindow		設定…
 Abort	Terminal Shell		中断
 Edit	Terminal TermWindow		編集
-Cursor background	Terminal AppearancePrefView		カーソルの背景
 Color:	Terminal AppearancePrefView		色:
 The pattern specifying the window title. The following placeholders\ncan be used:\n	Terminal TermWindow		パターンはウィンドウタイトルを指定します。次のプレースホルダーが\n使用できます:\n
 Print	Terminal TermWindow		印刷
@@ -1,10 +1,9 @@
-1	portuguese (brazil)	x-vnd.Haiku-Terminal	1252738083
+1	portuguese (brazil)	x-vnd.Haiku-Terminal	1829613568
 Not found.	Terminal TermWindow		Não localizado.
 Switch Terminals	Terminal TermWindow		Alternar Terminais
 Change directory	Terminal TermView		Mudar de pasta
 OK	Terminal TermWindow		OK
 New Terminal	Terminal TermWindow		Novo Terminal
-Cursor text	Terminal AppearancePrefView		Texto do cursor
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Terminal não pôde iniciar o shell. Desculpe.
 Match case	Terminal FindWindow		Diferenciar maiúsculas de minúsculas
 Quit	Terminal TermWindow		Sair
@@ -74,7 +73,6 @@ Set tab title	Terminal TermWindow		Definir o título da guia
 Settings…	Terminal TermWindow		Configurações...
 Abort	Terminal Shell		Cancelar
 Edit	Terminal TermWindow		Editar
-Cursor background	Terminal AppearancePrefView		Plano de fundo do cursor
 Color:	Terminal AppearancePrefView		Cor:
 The pattern specifying the window title. The following placeholders\ncan be used:\n	Terminal TermWindow		O padrão especificando o título da janela. Os seguintes espaços reservados\npodem ser usados:\n
 Print	Terminal TermWindow		Imprimir
@@ -1,10 +1,9 @@
-1	swedish	x-vnd.Haiku-Terminal	1252738083
+1	swedish	x-vnd.Haiku-Terminal	1829613568
 Not found.	Terminal TermWindow		Hittades ej.
 Switch Terminals	Terminal TermWindow		Växla terminal
 Change directory	Terminal TermView		Byt katalog
 OK	Terminal TermWindow		OK
 New Terminal	Terminal TermWindow		Ny terminal
-Cursor text	Terminal AppearancePrefView		Markörtext
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Terminalen kunde inte starta skalet.
 Match case	Terminal FindWindow		Matcha gemener/versaler
 Quit	Terminal TermWindow		Avsluta
@@ -74,7 +73,6 @@ Set tab title	Terminal TermWindow		Ange fliktitel
 Settings…	Terminal TermWindow		Inställningar...
 Abort	Terminal Shell		Avbryt
 Edit	Terminal TermWindow		Redigera
-Cursor background	Terminal AppearancePrefView		Markörbakgrund
 Color:	Terminal AppearancePrefView		Färg:
 The pattern specifying the window title. The following placeholders\ncan be used:\n	Terminal TermWindow		Mönstret bestämmer fönstrets namn. Följande alternativ finns:\n
 Print	Terminal TermWindow		Skriv ut
@@ -1,21 +1,29 @@
-1	finnish	x-vnd.Haiku-libbe	864109244
+1	finnish	x-vnd.Haiku-libbe	672385853
+gamma	AboutWindow		gamma
+beta	AboutWindow		beeta
 %3.2f GiB	StringForSize		%3.2f gibitavua
 Written by:	AboutWindow		Tekijä:
 About %app%	AboutMenuItem		Ohjelmasta %app%
 Cut	TextView		Leikkaa
+Version	AboutWindow		Versio
 Cannot create the replicant for \"%description\".\n%error	ZombieReplicantView		Ei voida luoda replikanttia kohteelle ”%description”.\n%error
+About	AboutWindow		Ohjelmasta
 Copy	TextView		Kopioi
 %3.2f KiB	StringForSize		%3.2f kibitavua
 %d bytes	StringForSize		%d tavua
+alpha	AboutWindow		alfa
 Error	PrintJob		Virhe
 No Pages to print!	PrintJob		Ei ole tulostettavia sivuja!
+All Rights Reserved.	AboutWindow		All Rights Reserved.
 OK	Dragger		Valmis
 OK	PrintJob		Valmis
 Green:	ColorControl		Vihreä:
+Version history:	AboutWindow		Versiohistoria:
 Remove replicant	Dragger		Poista replikantti
 OK	ZombieReplicantView		Valmis
 Print Server is not responding.	PrintJob		Tulostuspalvelin ei vastaa.
 Paste	TextView		Liitä
+Special Thanks:	AboutWindow		Erityiskiitokset:
 %.2f TiB	StringForSize		%.2f tebitavua
 Cannot locate the application for the replicant. No application signature supplied.\n%error	ZombieReplicantView		Ei voi paikallistaa sovellusta replikantille. Sovellusallekirjoitusta ei ole tarjottu.\n%error
 Redo	TextView		Tee uudelleen
@@ -26,6 +34,8 @@ Undo	TextView		Peru
 Red:	ColorControl		Punainen:
 %3.2f MiB	StringForSize		%3.2f mebitavua
 About %app…	Dragger		Ohjelmasta %app...
+development	AboutWindow		ohjelmakehitys
 Error	ZombieReplicantView		Virhe
 Blue:	ColorControl		Sininen:
+gold master	AboutWindow		gold master
 Can't delete this replicant from its original application. Life goes on.	Dragger		Ei voida poistaa tätä replikanttia sen alkuperäisestä sovelluksesta. Elämä jatkuu.
@@ -1,4 +1,6 @@
-1	japanese	x-vnd.Haiku-libbe	1560959841
+1	japanese	x-vnd.Haiku-libbe	672385853
+gamma	AboutWindow		 γ
+beta	AboutWindow		β
 %3.2f GiB	StringForSize		%3.2f GiB
 Written by:	AboutWindow		作者:
 About %app%	AboutMenuItem		%app% について
@@ -9,8 +11,10 @@ About	AboutWindow		このソフトウェアについて…
 Copy	TextView		コピー
 %3.2f KiB	StringForSize		%3.2f KiB
 %d bytes	StringForSize		%d バイト
+alpha	AboutWindow		α
 Error	PrintJob		エラー
 No Pages to print!	PrintJob		印刷するページがありません。
+All Rights Reserved.	AboutWindow		All Rights Reserved.
 OK	Dragger		OK
 OK	PrintJob		OK
 Green:	ColorControl		緑：
@@ -19,6 +23,7 @@ Remove replicant	Dragger		レプリカントを削除
 OK	ZombieReplicantView		OK
 Print Server is not responding.	PrintJob		プリントサーバーが応答しません。
 Paste	TextView		貼り付け
+Special Thanks:	AboutWindow		Special Thanks:
 %.2f TiB	StringForSize		%.2f TiB
 Cannot locate the application for the replicant. No application signature supplied.\n%error	ZombieReplicantView		このレプリカント用のアプリケーションを見つけることができません。アプリケーション識別子が提供されていません。\n%error
 Redo	TextView		やり直し
@@ -29,6 +34,7 @@ Undo	TextView		元に戻す
 Red:	ColorControl		赤：
 %3.2f MiB	StringForSize		%3.2f MiB
 About %app…	Dragger		%appについて…
+development	AboutWindow		開発版
 Error	ZombieReplicantView		エラー
 Blue:	ColorControl		青：
 gold master	AboutWindow		ゴールデンマスター
@@ -1,4 +1,4 @@
-1	finnish	x-vnd.Haiku-libtracker	1301055003
+1	finnish	x-vnd.Haiku-libtracker	3955647850
 common	B_COMMON_DIRECTORY		yhteinen
 OK	WidgetAttributeText		Valmis
 Icon view	VolumeWindow		Kuvakenäkymä
@@ -452,6 +452,7 @@ Mount	DeskWindow		Liitä
 Mount	ContainerWindow		Liitä
 %capacity (%used used -- %free free)	InfoWindow		%capacity (%used käytetty -- %free vapaana)
 Cancel	FSClipBoard		Peru
+Restart Deskbar	DeskWindow		Käynnistä Työpöytäpalkki uudelleen
 Cut more	ContainerWindow		Leikkaa lisää
 Deleting: 	StatusWindow		Poistetaan:
 Empty Trash	InfoWindow		Tyhjennä roskakori
@@ -1,4 +1,4 @@
-1	finnish	x-vnd.Haiku-Appearance	1428480647
+1	finnish	x-vnd.Haiku-Appearance	2950529393
 Plain font:	Font view		Pelkkä kirjasin:
 Control highlight	Colors tab		Kontrollin korostus
 Control border	Colors tab		Kontrollin reuna
@@ -23,27 +23,33 @@ Tooltip background	Colors tab		Työkaluvinkin tausta
 Selected menu item background	Colors tab		Valitun valikkovalinnan tausta
 Antialiasing	APRWindow		Reunanpehmennys
 Navigation base	Colors tab		Navigoinnin pohja
+Selected list item text	Colors tab		Valitun luettelorivin teksti
 Window border	Colors tab		Ikkunaraja
+Double:	DecorSettingsView		Kaksikko:
 Window tab text	Colors tab		Ikkunakahvan teksti
 Document text	Colors tab		Dokumentin teksti
 Navigation pulse	Colors tab		Navigoinnin välke
 Window decorator:	DecorSettingsView		Ikkunan kehystäjä:
 Selected menu item text	Colors tab		Valitun valikkovalinnan teksti
 Menu background	Colors tab		Valikon tausta
+List background	Colors tab		Luettelotausta
 OK	DecorSettingsView		Valmis
 Control mark	Colors tab		Ohjausmerkki
 Size:	Font Selection view		Koko:
+Selected list item background	Colors tab		Valitun luettelorivin tausta
 Panel background	Colors tab		Paneelin tausta
 Menu font:	Font view		Valikkokirjasin:
 Colors	APRWindow		Värit
 Control background	Colors tab		Kontrollin tausta
 Inactive window tab	Colors tab		Epäaktiivisen ikkunakahvan väri
+List item text	Colors tab		Luettelorivin teksti
 Appearance	System name		Ulkoasuasetukset
 Fixed font:	Font view		Tasalevyinen kirjasin:
 The quick brown fox jumps over the lazy dog.	Font Selection view	Don't translate this literally ! Use a phrase showing all chars from A to Z.	Albert osti fagotin ja töräytti puhkuvan melodian.
 Reduce colored edges filter strength:	AntialiasingSettingsView		Vähennä värillisten reunojen suodatuksen vahvuutta:
 Subpixel based anti-aliasing in combination with glyph hinting is not available in this build of Haiku to avoid possible patent issues. To enable this feature, you have to build Haiku yourself and enable certain options in the libfreetype configuration header.	AntialiasingSettingsView		Alipikselipohjainen reunanpehmennys yhdistettynä kirjoitusmerkkiviimeistelyyn ei ole saatavilla tässä Haiku-versiossa patenttisyiden takia. Ominaisuuden saaminen käyttöön vaatii Haikun uudelleenkääntämistä ja eräiden optioiden aktivoimista libfreetype:n määrittelytiedostoissa.
 Control text	Colors tab		Kontrollin teksti
+Single:	DecorSettingsView		Yksikkö:
 Tooltip text	Colors tab		Työkaluvinkin teksti
 Bold font:	Font view		Lihavoitu kirjasin:
 Inactive window border	Colors tab		Ei-aktiivinen ikkunaraja
@@ -52,6 +58,7 @@ LCD subpixel	AntialiasingSettingsView		LCD alipikseli
 Selected menu item border	Colors tab		Valitun valikkovalinnan reuna
 Strong	AntialiasingSettingsView		Vahva
 Panel text	Colors tab		Paneelin teksti
+Arrow style	DecorSettingsView		Nuolityyli
 Monospaced fonts only	AntialiasingSettingsView		Vain monospace-kirjasimet
 Look and feel	APRWindow		Ulkoasu ja käyttötuntuma
 Antialiasing menu	AntialiasingSettingsView		Reunanpehmennysvalikko
@@ -1,4 +1,4 @@
-1	japanese	x-vnd.Haiku-Appearance	580285868
+1	japanese	x-vnd.Haiku-Appearance	2950529393
 Plain font:	Font view		標準フォント：
 Control highlight	Colors tab		コントロールのハイライト
 Control border	Colors tab		コントロールの境界
@@ -25,6 +25,7 @@ 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		ナビゲーションの点滅
@@ -48,6 +49,7 @@ The quick brown fox jumps over the lazy dog.	Font Selection view	Don't translate
 Reduce colored edges filter strength:	AntialiasingSettingsView		カラーエッジフィルターの強度を下げる
 Subpixel based anti-aliasing in combination with glyph hinting is not available in this build of Haiku to avoid possible patent issues. To enable this feature, you have to build Haiku yourself and enable certain options in the libfreetype configuration header.	AntialiasingSettingsView		このHaikuのビルドでは、グリフのヒンティングと組合せたサブピクセルベースのアンチエイリアスは特許問題の可能性を回避するため使用できません。有効にするには、Haikuをソースからビルドして、libfreetypeの設定ヘッダーファイル中の特定のオプションを有効にしなければなりません。
 Control text	Colors tab		コントロールの文字
+Single:	DecorSettingsView		一方向:
 Tooltip text	Colors tab		ツールチップの文字
 Bold font:	Font view		太字フォント：
 Inactive window border	Colors tab		非アクティブなウィンドウ枠
@@ -1,8 +1,7 @@
-1	belarusian	x-vnd.Haiku-Sounds	3924145958
+1	belarusian	x-vnd.Haiku-Sounds	150798324
 Sounds	System name		Гукі
 No such file or directory	HEventList		Няма такога файла ці каталога
 OK	SoundsHApp		ОК
-Sound File:	HWindow		Аўдыё файл:
 OK	HEventList		ОК
 OK	HWindow		ОК
 This is not an audio file.	HWindow		Гэта не аўдыё файл.
@@ -1,8 +1,7 @@
-1	german	x-vnd.Haiku-Sounds	3924145958
+1	german	x-vnd.Haiku-Sounds	150798324
 Sounds	System name		Klänge
 No such file or directory	HEventList		Datei oder Ordner nicht gefunden
 OK	SoundsHApp		OK
-Sound File:	HWindow		Klangdatei:
 OK	HEventList		OK
 OK	HWindow		OK
 This is not an audio file.	HWindow		Dies ist keine Audiodatei.
@@ -1,8 +1,7 @@
-1	greek, modern (1453-)	x-vnd.Haiku-Sounds	3924145958
+1	greek, modern (1453-)	x-vnd.Haiku-Sounds	150798324
 Sounds	System name		Sounds
 No such file or directory	HEventList		Δεν υπάρχει τέτοιο αρχείο ή κατάλογος
 OK	SoundsHApp		Εντάξει
-Sound File:	HWindow		Αρχείο Ήχου:
 OK	HEventList		Εντάξει
 OK	HWindow		Εντάξει
 This is not an audio file.	HWindow		Αυτό δεν είναι ένα αρχείο ήχου.
@@ -1,8 +1,7 @@
-1	finnish	x-vnd.Haiku-Sounds	3924145958
+1	finnish	x-vnd.Haiku-Sounds	150798324
 Sounds	System name		Ääniasetukset
 No such file or directory	HEventList		Tiedostoa tai hakemistoa ei löydy
 OK	SoundsHApp		Valmis
-Sound File:	HWindow		Äänitiedosto:
 OK	HEventList		Valmis
 OK	HWindow		Valmis
 This is not an audio file.	HWindow		Tämä ei ole äänitiedosto.
@@ -1,8 +1,7 @@
-1	french	x-vnd.Haiku-Sounds	3924145958
+1	french	x-vnd.Haiku-Sounds	150798324
 Sounds	System name		Sons
 No such file or directory	HEventList		Pas de tel fichier ou répertoire
 OK	SoundsHApp		OK
-Sound File:	HWindow		Fichier son :
 OK	HEventList		OK
 OK	HWindow		OK
 This is not an audio file.	HWindow		Ceci n'est pas un fichier audio.
@@ -1,8 +1,7 @@
-1	hindi	x-vnd.Haiku-Sounds	3924145958
+1	hindi	x-vnd.Haiku-Sounds	150798324
 Sounds	System name		आवाजें
 No such file or directory	HEventList		ऐसी कोई फ़ाइल या निर्देशिका नही हैं
 OK	SoundsHApp		ठीक है
-Sound File:	HWindow		ध्वनि फ़ाइल:
 OK	HEventList		ठीक है
 OK	HWindow		ठीक है
 This is not an audio file.	HWindow		यह एक ऑडियो फ़ाइल नहीं है
@@ -1,8 +1,7 @@
-1	hungarian	x-vnd.Haiku-Sounds	3924145958
+1	hungarian	x-vnd.Haiku-Sounds	150798324
 Sounds	System name		Hangok
 No such file or directory	HEventList		Nem található ilyen fájl vagy mappa
 OK	SoundsHApp		Rendben
-Sound File:	HWindow		Hangfájl:
 OK	HEventList		Rendben
 OK	HWindow		Rendben
 This is not an audio file.	HWindow		Ez nem egy hangfájl.
@@ -1,8 +1,7 @@
-1	japanese	x-vnd.Haiku-Sounds	3924145958
+1	japanese	x-vnd.Haiku-Sounds	150798324
 Sounds	System name		サウンド
 No such file or directory	HEventList		ファイルまたはフォルダーがありません
 OK	SoundsHApp		OK
-Sound File:	HWindow		サウンドファイル：
 OK	HEventList		OK
 OK	HWindow		OK
 This is not an audio file.	HWindow		オーディオファイルではありません。
@@ -1,8 +1,7 @@
-1	lithuanian	x-vnd.Haiku-Sounds	3924145958
+1	lithuanian	x-vnd.Haiku-Sounds	150798324
 Sounds	System name		Garsai
 No such file or directory	HEventList		Tokio failo ar aplanko nėra
 OK	SoundsHApp		Gerai
-Sound File:	HWindow		Garso failas:
 OK	HEventList		Gerai
 OK	HWindow		Gerai
 This is not an audio file.	HWindow		Tai nėra garso failas.
@@ -1,8 +1,7 @@
-1	dutch; flemish	x-vnd.Haiku-Sounds	3924145958
+1	dutch; flemish	x-vnd.Haiku-Sounds	150798324
 Sounds	System name		Geluiden
 No such file or directory	HEventList		Geen dergelijk bestand of map
 OK	SoundsHApp		Oké
-Sound File:	HWindow		Geluidsbestand:
 OK	HEventList		Oké
 OK	HWindow		Oké
 This is not an audio file.	HWindow		Dit is geen geluidsbestand.
@@ -1,8 +1,7 @@
-1	polish	x-vnd.Haiku-Sounds	3924145958
+1	polish	x-vnd.Haiku-Sounds	150798324
 Sounds	System name		Dźwięki
 No such file or directory	HEventList		Nie znaleziono pliku/folderu
 OK	SoundsHApp		OK
-Sound File:	HWindow		Plik audio:
 OK	HEventList		OK
 OK	HWindow		OK
 This is not an audio file.	HWindow		To nie jest plik audio.
@@ -1,8 +1,7 @@
-1	portuguese (brazil)	x-vnd.Haiku-Sounds	3924145958
+1	portuguese (brazil)	x-vnd.Haiku-Sounds	150798324
 Sounds	System name		Sons
 No such file or directory	HEventList		Arquivo ou pasta inexistente
 OK	SoundsHApp		OK
-Sound File:	HWindow		Arquivo de som:
 OK	HEventList		OK
 OK	HWindow		OK
 This is not an audio file.	HWindow		Isto não é um arquivo de áudio.
@@ -1,8 +1,7 @@
-1	romanian	x-vnd.Haiku-Sounds	3924145958
+1	romanian	x-vnd.Haiku-Sounds	150798324
 Sounds	System name		Sunete
 No such file or directory	HEventList		Niciun astfel de fișier sau dosar
 OK	SoundsHApp		OK
-Sound File:	HWindow		Fișier de sunet:
 OK	HEventList		OK
 OK	HWindow		OK
 This is not an audio file.	HWindow		Acesta nu este un fișier audio.
@@ -1,8 +1,7 @@
-1	russian	x-vnd.Haiku-Sounds	3924145958
+1	russian	x-vnd.Haiku-Sounds	150798324
 Sounds	System name		Звуки
 No such file or directory	HEventList		Такого файла или папки не существует
 OK	SoundsHApp		ОК
-Sound File:	HWindow		Аудиофайл:
 OK	HEventList		ОК
 OK	HWindow		ОК
 This is not an audio file.	HWindow		Это не аудиофайл.
@@ -1,8 +1,7 @@
-1	slovak	x-vnd.Haiku-Sounds	3924145958
+1	slovak	x-vnd.Haiku-Sounds	150798324
 Sounds	System name		Zvuky
 No such file or directory	HEventList		Taký súbor alebo adresár neexistuje
 OK	SoundsHApp		OK
-Sound File:	HWindow		Zvukový súbor:
 OK	HEventList		OK
 OK	HWindow		OK
 This is not an audio file.	HWindow		Toto nie je zvukový súbor.
@@ -1,8 +1,7 @@
-1	swedish	x-vnd.Haiku-Sounds	3924145958
+1	swedish	x-vnd.Haiku-Sounds	150798324
 Sounds	System name		Ljud
 No such file or directory	HEventList		Ingen sådan fil eller katalog
 OK	SoundsHApp		OK
-Sound File:	HWindow		Ljudfil:
 OK	HEventList		OK
 OK	HWindow		OK
 This is not an audio file.	HWindow		Detta är ingen ljudfil.
@@ -1,8 +1,7 @@
-1	ukrainian	x-vnd.Haiku-Sounds	3924145958
+1	ukrainian	x-vnd.Haiku-Sounds	150798324
 Sounds	System name		Звуки
 No such file or directory	HEventList		Немає такого файлу або папки
 OK	SoundsHApp		Гаразд
-Sound File:	HWindow		Звуковий файл:
 OK	HEventList		Гаразд
 OK	HWindow		Гаразд
 This is not an audio file.	HWindow		Це не аудіо файл.
@@ -1,8 +1,7 @@
-1	english	x-vnd.Haiku-Sounds	3924145958
+1	english	x-vnd.Haiku-Sounds	150798324
 Sounds	System name		声音
 No such file or directory	HEventList		该文件或者目录不存在。
 OK	SoundsHApp		确定
-Sound File:	HWindow		声音文件：
 OK	HEventList		确定
 OK	HWindow		确定
 This is not an audio file.	HWindow		该文件不是音频文件。  
@@ -1,4 +1,3 @@
-1	german	x-vnd.Haiku-debug_server	945172012
+1	german	x-vnd.Haiku-debug_server	3203333611
 Debug	DebugServer		Debug
-Kill	DebugServer		Beenden erzwingen
 The application:\n\n      %app\n\nhas encountered an error which prevents it from continuing. Haiku will terminate the application and clean up.	DebugServer		Die Anwendung:\n\n %app\n\nist auf einen Fehler gestoßen und kann nicht weiter ausgeführt werden. Haiku wird die Anwendung beenden und das System säubern.
@@ -1,4 +1,3 @@
-1	french	x-vnd.Haiku-debug_server	945172012
+1	french	x-vnd.Haiku-debug_server	3203333611
 Debug	DebugServer		Déboguer
-Kill	DebugServer		Tuer
 The application:\n\n      %app\n\nhas encountered an error which prevents it from continuing. Haiku will terminate the application and clean up.	DebugServer		L'application :\n\n      %app\n\na rencontré une erreur l'empêchant de continuer. Haiku va fermer l'application et libérer ses ressources.
@@ -1,4 +1,3 @@
-1	hungarian	x-vnd.Haiku-debug_server	945172012
+1	hungarian	x-vnd.Haiku-debug_server	3203333611
 Debug	DebugServer		Hibakeresés
-Kill	DebugServer		Megszakítás
 The application:\n\n      %app\n\nhas encountered an error which prevents it from continuing. Haiku will terminate the application and clean up.	DebugServer		A következő program:\n\n %app\n\nhibába ütközött, és nem tud tovább futni. A Haiku leállítja a programot.
@@ -1,4 +1,3 @@
-1	japanese	x-vnd.Haiku-debug_server	945172012
+1	japanese	x-vnd.Haiku-debug_server	3203333611
 Debug	DebugServer		デバッグ
-Kill	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 はアプリケーションを終了し、後始末をします。
@@ -1,4 +1,3 @@
-1	portuguese (brazil)	x-vnd.Haiku-debug_server	945172012
+1	portuguese (brazil)	x-vnd.Haiku-debug_server	3203333611
 Debug	DebugServer		Depurar
-Kill	DebugServer		Matar
 The application:\n\n      %app\n\nhas encountered an error which prevents it from continuing. Haiku will terminate the application and clean up.	DebugServer		A aplicação:\n\n      %app\n\nencontrou um erro que a impede de continuar. Haiku irá fechar a aplicação.
@@ -1,4 +1,3 @@
-1	swedish	x-vnd.Haiku-debug_server	945172012
+1	swedish	x-vnd.Haiku-debug_server	3203333611
 Debug	DebugServer		Felsök
-Kill	DebugServer		Döda
 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.
@@ -601,7 +601,7 @@ WARN_LOGFILE           =
 INPUT                  = . \
                         app \
                         drivers \
-						 game \
+                         game \
                         interface \
                         keyboard \
                         locale \
@@ -614,6 +614,7 @@ INPUT                  = . \
                         ../../headers/os/drivers/fs_interface.h \
                         ../../headers/os/drivers/USB3.h \
                         ../../headers/os/drivers/USB_spec.h \
+                         ../../headers/os/game \
                         ../../headers/os/interface \
                         ../../headers/os/locale \
                         ../../headers/os/media \
@@ -0,0 +1,292 @@
+/*
+ * Copyright 2012 Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		John Scipione, [email protected]
+ * 
+ * Corresponds to:
+ *		/trunk/headers/os/app/Cursor.h	 hrev45039
+ *		/trunk/src/kits/app/Cursor.cpp	 hrev45039
+ */
+
+
+/*!
+	\file Cursor.h
+	\brief Provides the BCursor class.
+*/
+
+
+/*!
+	\enum BCursorID
+	List of predefined cursor IDs
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_SYSTEM_DEFAULT
+	System default cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_CONTEXT_MENU
+	Context menu cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_COPY
+	Copy cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_CREATE_LINK
+	Symlink cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_CROSS_HAIR
+	Cross hairs cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_FOLLOW_LINK
+	Follow html link cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_GRAB
+	Grab cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_GRABBING
+	Grabbing cursor (mouse down)
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_HELP
+	Help cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_I_BEAM
+	I beam cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_I_BEAM_HORIZONTAL
+	Horizontal I beam cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_MOVE
+	Move cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_NO_CURSOR
+	No cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_NOT_ALLOWED
+	Not allowed cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_PROGRESS
+	Progress cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_RESIZE_NORTH
+	Resize north cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_RESIZE_EAST
+	Resize east cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_RESIZE_SOUTH
+	Resize south cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_RESIZE_WEST
+	Resize west cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_RESIZE_NORTH_EAST
+	Resize north east cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_RESIZE_NORTH_WEST
+	Resize north west cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_RESIZE_SOUTH_EAST
+	Resize south east cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_RESIZE_SOUTH_WEST
+	Resize south west cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_RESIZE_NORTH_SOUTH
+	Resize north south cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_RESIZE_EAST_WEST
+	Resize east west cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_RESIZE_NORTH_EAST_SOUTH_WEST
+	Resize north east south west cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_RESIZE_NORTH_WEST_SOUTH_EAST
+	Resize north west south east cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_ZOOM_IN
+	Zoom in cursor
+*/
+
+
+/*!
+	\var BCursorID B_CURSOR_ID_ZOOM_OUT
+	Zoom out cursor
+*/
+
+
+/*!
+	\class BCursor
+	\ingroup app
+	\brief BCursor describes a view-wide or application-wide cursor.
+
+	\note As BeOS only supports 16x16 monochrome cursors, to see a nice
+		  shadowed one we will need to extend this.
+*/
+
+
+/*!
+	\fn BCursor::BCursor(const void* cursorData)
+	\brief Initializes a new cursor object.
+
+	If the \a cursorData parameter is not \c NULL then the cursor is initialized
+	with the cursor data.
+
+	\param cursorData The cursor data.
+*/
+
+
+/*!
+	\fn BCursor::BCursor(BCursorID id)
+	\brief Initializes a new cursor object from a predefined cursor \a id.
+
+	\param id The predefined \a id to initialize to.
+*/
+
+
+/*!
+	\fn BCursor::BCursor(const BCursor& other)
+	\brief Initializes a new cursor object from another cursor object.
+
+	\param other The cursor object to initialize from.
+*/
+
+
+/*!
+	\fn BCursor::BCursor(BMessage* data)
+	\brief Initializes a new cursor object from a message archive.
+
+	\param data The message data to initialize from.
+*/
+
+
+/*!
+	\fn BCursor::~BCursor()
+	\brief Destroy the cursor and free it's memory.
+*/
+
+
+/*!
+	status_t BCursor::Archive(BMessage *into, bool deep) const
+	\brief Archive the cursor. Not implemented.
+*/
+
+
+/*!
+	BArchivable* BCursor::Instantiate(BMessage *data)
+	\brief Instantiate the cursor from a message. Not implemented.
+*/
+
+
+/*!
+	BCursor& BCursor::operator=(const BCursor& other)
+	\brief Set the cursor to another cursor object.
+
+	\param other The cursor object to copy from.
+
+	\returns the new cursor object.
+*/
+
+
+/*!
+	bool BCursor::operator==(const BCursor& other) const
+	\brief Compare a cursor object to another and return if they are equal.
+
+	\param other The cursor object to compare to.
+
+	\returns \c true if the cursor objects are equal, \c false if the cursor
+		objects are not equal.
+*/
+
+
+/*!
+	bool BCursor::operator!=(const BCursor& other) const
+	\brief Compare a cursor object to another and return if they are not equal.
+
+	\param other The cursor object to compare to.
+
+	\returns \c true if the cursor objects are not equal, \c false if the cursor
+		objects are equal.
+*/
@@ -480,7 +480,7 @@ div.fragment pre.fragment {
 	font-family: "Deja Vu Mono", Courier, "Courier New", monospace, fixed;
 	font-weight: normal;
 	font-style: normal;
-	font-size: 0.9em;
+	font-size: 13px;
 	line-height: 1.3;
 }
 div.fragment pre.fragment a.code {
@@ -0,0 +1,281 @@
+/*
+ * Copyright 2012 Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		John Scipione, [email protected]
+ *
+ * Corresponds to:
+ *		src/kits/game/DirectWindow.cpp  hrev45044
+ *		src/kits/game/DirectWindow.h    hrev45044
+ */
+
+
+/*!
+	\file DirectWindow.h
+	\brief Provides the DirectWindow class.
+*/
+
+
+/*!
+	\enum direct_buffer_state
+	Direct buffer state constants
+*/
+
+
+/*!
+	\enum direct_driver_state
+	Direct driver state constants
+*/
+
+
+/*!
+	\struct direct_buffer_info
+	Direct butter info struct
+*/
+
+
+/*!
+	\var direct_buffer_info::buffer_state
+	State of the direct buffer access privileges.
+	It can have one of the following values:
+	- \c B_DIRECT_MODE_MASK
+	- \c B_DIRECT_START
+	- \c B_DIRECT_MODIFY
+	- \c B_DIRECT_STOP
+	- \c B_BUFFER_MOVED
+	- \c B_BUFFER_RESET
+	- \c B_BUFFER_RESIZED
+	- \c B_CLIPPING_MODIFIED
+*/
+
+
+/*!
+	\var direct_buffer_info::driver_state
+	State of the graphics card on which your direct window is displayed.
+	There are two possible values:
+	- \c B_MODE_CHANGED The resolution or color depth has changed.
+	- \c B_DRIVER_CHANGED The window was moved onto another monitor.
+*/
+
+
+/*!
+	\var direct_buffer_info::bits
+	Pointer to the frame buffer in your team's memory space.
+*/
+
+
+/*!
+	\var direct_buffer_info::pci_bits
+	Pointer to the frame buffer in the PCI memory space. This value is
+	typically needed to control DMA.
+*/
+
+/*!
+	\var direct_buffer_info::bytes_per_row
+	Number of bytes used to represent a single row of pixels in the frame buffer.
+*/
+
+
+/*!
+	\var direct_buffer_info::bits_per_pixel
+	number of bits actually used to store a single pixel, including reserved,
+	unused, or alpha channel bits. This value is usually a multiple of eight.
+*/
+
+
+/*!
+	\var direct_buffer_info::pixel_format
+	The format used to encode a pixel as defined by the \c color_space type.
+*/
+
+/*!
+	\var direct_buffer_info::layout
+	Reserved for future use.
+*/
+
+/*!
+	\var direct_buffer_info::orientation
+	Reserved for future use.
+*/
+
+/*!
+	\var direct_buffer_info::_reserved[9]
+	Reserved for future use.
+*/
+
+/*!
+	\var direct_buffer_info::_dd_type_
+	Reserved for future use.
+*/
+
+/*!
+	\var direct_buffer_info::_dd_token_
+	Reserved for future use.
+*/
+
+/*!
+	\var direct_buffer_info::clip_list_count
+	Number of rectangles in \c clip_list.
+*/
+
+/*!
+	\var direct_buffer_info::window_bounds
+	Rectangle that defines the full content area of the window in screen
+	coordinates.
+*/
+
+/*!
+	\var direct_buffer_info::clip_bounds
+	Bounding rectangle of the visible part of the content area of the window
+	in screen coordinates.
+*/
+
+
+/*!
+	\var direct_buffer_info::clip_list
+	List of rectangles that together define the visible region of the content
+	area of the window in screen coordinates.
+*/
+
+
+/*!
+	\class BDirectWindow
+	\ingroup game
+	\ingroup libbe
+	\brief Provides direct access to the video card graphics frame buffer.
+*/
+
+
+/*!
+	\fn BDirectWindow::BDirectWindow(BRect frame, const char *title,
+		window_type type, uint32 flags, uint32 workspace)
+	\brief Creates and initializes a BDirectWindow object.
+
+	\param frame The initial frame rectangle of the window.
+	\param title The title of the Window.
+	\param type Window type (see BWindow).
+	\param flags Window flags (see BWindow).
+	\param workspace Workspace of the direct window (see BWindow).
+*/
+
+
+/*!
+	\fn BDirectWindow::BDirectWindow(BRect frame, const char *title,
+		window_look look, window_feel feel, uint32 flags, uint32 workspace)
+	\brief Creates and initializes a BDirectWindow object.
+
+	\param frame The initial frame rectangle of the window.
+	\param title The title of the Window.
+	\param look Window look (see BWindow).
+	\param feel Window feel (see BWindow).
+	\param flags Window flags (see BWindow).
+	\param workspace Workspace of the direct window (see BWindow).
+*/
+
+
+/*!
+	\fn BDirectWindow::~BDirectWindow()
+	\brief Destroys the BDirectWindow and frees all memory used by it.
+
+	Do not delete a BDirectWindow object directly, call Quit() instead.
+
+	Destroying a BDirectWindow involves a few steps to make sure that it
+	is disconnected and cleaned up.
+
+	Set the fConnectionDisabled flag to \c true to prevent DirectConnected()
+	from attempting to reconnect while it's being destroyed.
+
+	next call Hide() and finally Sync() to force the direct window to
+	disconnect from direct access.
+
+	Once these steps are complete you may do your usual destructor work.
+*/
+
+
+/*!
+	\fn BArchivable* BDirectWindow::Instantiate(BMessage *data)
+	\brief Instantiate window from message \a data. Not implemented.
+*/
+
+
+/*!
+	\fn status_t BDirectWindow::Archive(BMessage *data, bool deep) const
+	\brief Archive window into message \a data. Not implemented.
+*/
+
+
+/*!
+	\fn void BDirectWindow::DirectConnected(direct_buffer_info *info)
+	\brief hook function called when your application learns about the state
+		of the graphics display and changes occur.
+
+	This is the heart of BDirectWindow.
+
+	\param info The \c direct_buffer_info struct
+*/
+
+
+/*!
+	\fn status_t BDirectWindow::GetClippingRegion(BRegion *region,
+		BPoint *origin) const
+	\brief Sets \a region to the current clipping region of the direct window.
+
+	If \a origin is not \c NULL, the \a region is offset by \a origin.
+
+	\warning GetClippingRegion() should only be called from within the
+		DirectConnected() method. If called outside GetClippingRegion() will
+		return \c B_ERROR.
+
+	\param region The clipping region to fill out.
+	\param origin An origin to offset the region by.
+
+	\returns A status code.
+	\retval B_OK Everything went as expected.
+	\retval B_BAD_VALUE \a region was NULL.
+	\retval B_ERROR Window not locked or not in DirectConnected() method.
+	\retval B_NO_MEMORY Not enough memory to fill \a region
+*/
+
+
+/*!
+	\fn status_t BDirectWindow::SetFullScreen(bool enable)
+	\brief Enables or disables full-screen mode.
+
+	The SupportsWindowMode() method determines whether or not the video card
+	is capable of supporting windowed mode.
+
+	When the window is in full screen mode it will always have the focus and
+	no other window can be in front of it.
+
+	\param enable \c true to enable fullscreen mode, \c false for windowed mode.
+
+	\returns A status code.
+	\retval B_OK Everything went as expected.
+	\retval B_ERROR An error occurred while trying to switch between full screen
+		and windowed mode.
+
+	\see BDirectWindow::SupportsWindowMode()
+*/
+
+
+/*!
+	\fn bool BDirectWindow::IsFullScreen() const
+	\brief Returns whether the window is in full-screen or windowed mode.
+
+	\returns \c true if in full-screen mode, \c false if in windowed mode.
+*/
+
+
+/*!
+	\fn static bool BDirectWindow::SupportsWindowMode(screen_id id)
+	\brief Returns whether or not the specified screen supports windowed mode.
+
+	Because this is a static function you don't have to construct a
+	BDirectWindow object to call it.
+
+	\param id The id of the screen you want to check, \c B_MAIN_SCREEN_ID by
+		default.
+
+	\returns \c true if the screen support windowed mode, \c false otherwise.
+*/
@@ -169,36 +169,6 @@
 */


-/*!
-	\fn void BButton::MouseDown(BPoint point)
-	\brief Hook method that is called when a mouse button is pressed.
-
-	\param point The point on the screen where to mouse pointer is when
-		the mouse button is pressed.
-
-	\sa BView::MouseDown()
-*/
-
-
-/*!
-	\fn void BButton::AttachedToWindow()
-	\brief Hook method that is called when the object is attached to a
-		window.
-
-	\sa BControl::AttachedToWindow()
-*/
-
-
-/*!
-	\fn void BButton::KeyDown(const char *bytes, int32 numBytes)
-	\brief Hook method that is called when a keyboard key is pushed down.
-		to the window.
-	
-	\param bytes The key pressed.
-	\param numBytes The number of keys pressed.
-*/
-
-
 /*!
 	\fn void BButton::MakeDefault(bool flag)
 	\brief Make the BButton the default button i.e. it will be activated
@@ -258,14 +228,6 @@
 */


-/*!
-	\fn void BButton::ResizeToPreferred()
-	\brief Resizes the BButton to its preferred size.
-
-	\see BView::ResizeToPreferred()
-*/
-
-
 /*!
 	\fn status_t BButton::Invoke(BMessage *message)
 	\brief The BButton is invoked from a message.
@@ -282,88 +244,3 @@

 	\see BControl::Invoke()
 */
-
-
-/*!
-	\fn void BButton::FrameMoved(BPoint newLocation)
-	\brief Hook method that is called when the BButton has moved.
-
-	\param newLocation The location on the screen that the BButton
-		is moved to.
-
-	\see BView::FrameMoved();
-*/
-
-
-/*!
-	\fn void BButton::FrameResized(float width, float height)
-	\brief Hook method that is called when the BButton changes size.
-
-	\param width the new \a width of the BButton
-	\param height the new \a height of the BButton
-
-	\see BView::FrameResized();
-*/
-
-
-/*!
-	\fn void BButton::MakeFocus(bool focused)
-	\brief Focus or unfocus the BButton.
-
-	\param focused If \c true focus the button, otherwise remove focus from
-		the button.
-
-	\see BControl::MakeFocus()
-*/
-
-
-/*!
-	\fn status_t BButton::Perform(perform_code code, void* _data)
-	\brief Perform an action on the BButton.
-
-	\param code The \a perform_code. One of the following:
-		\li \c PERFORM_CODE_MIN_SIZE
-		\li \c PERFORM_CODE_MAX_SIZE
-		\li \c PERFORM_CODE_PREFERRED_SIZE
-		\li \c PERFORM_CODE_LAYOUT_ALIGNMENT
-		\li \c PERFORM_CODE_HAS_HEIGHT_FOR_WIDTH
-		\li \c PERFORM_CODE_GET_HEIGHT_FOR_WIDTH
-		\li \c PERFORM_CODE_SET_LAYOUT
-		\li \c PERFORM_CODE_INVALIDATE_LAYOUT
-		\li \c PERFORM_CODE_DO_LAYOUT
-	\param _data Data to use to act on.
-
-	\returns \c B_OK if the action was successful or an error code if not.
-*/
-
-
-/*!
-	\fn void BButton::InvalidateLayout(bool descendants)
-	\brief Redraws the BButton.
-
-	\param descendants Redraw subviews as well.
-*/
-
-
-/*!
-	\fn BSize BButton::MinSize()
-	\brief Returns the minimum size of the BButton.
-
-	\returns The minimum BButton size as a BSize
-*/
-
-
-/*!
-	\fn BSize BButton::MaxSize()
-	\brief Returns the maximum size of the BButton.
-
-	\returns The maximum BButton size as a BSize
-*/
-
-
-/*!
-	\fn BSize BButton::PreferredSize()
-	\brief Returns the preferred size of the BButton.
-
-	\returns The preferred BButton size as a BSize
-*/
@@ -126,28 +126,6 @@
 */


-/*!
-	\fn void BCheckBox::FrameMoved(BPoint newLocation)
-	\brief Hook method that gets called when the checkbox is moved.
-
-	\param newLocation The point that the top left corner of the frame
-		is moved to.
-
-	\sa BView::FrameMoved()
-*/
-
-
-/*!
-	\fn void BCheckBox::FrameResized(float width, float height)
-	\brief Hook method that gets called when the checkbox is resized.
-
-	\param width The new \a width of the checkbox.
-	\param height The new \a height of the checkbox.
-
-	\sa BView::FrameResized()
-*/
-
-
 /*!
 	\fn void BCheckBox::GetPreferredSize(float* _width, float* _height)
 	\brief Fill out the preferred width and height of the checkbox
@@ -160,64 +138,6 @@
 */


-/*!
-	\fn void BCheckBox::ResizeToPreferred()
-	\brief Resize the checkbox to its preferred size.
-
-	\sa BView::ResizeToPreferred()
-*/
-
-
-/*!
-	\fn void BCheckBox::InvalidateLayout(bool descendants)
-	\brief \brief Redraws the checkbox.
-
-	\param descendants Redraw child views as well.
-
-	\sa BLayout::InvalidateLayout()
-*/
-
-
-/*!
-	\fn BSize BCheckBox::MinSize()
-	\brief Get the minimum size of the checkbox.
-
-	\return The minimum size of the checkbox as a BSize.
-
-	\sa BAbstractLayout::MinSize()
-*/
-
-
-/*!
-	\fn BSize BCheckBox::MaxSize()
-	\brief Get the maximum size of the checkbox.
-
-	\return The maximum size of the checkbox as a BSize.
-
-	\sa BAbstractLayout::MaxSize()
-*/
-
-
-/*!
-	\fn BSize BCheckBox::PreferredSize()
-	\brief Get the preferred size of the checkbox.
-
-	\return The preferred size of the checkbox as a BSize.
-
-	\sa BAbstractLayout::PreferredSize()
-*/
-
-
-/*!
-	\fn void BCheckBox::MakeFocus(bool focused)
-	\brief Gives or removes focus from the checkbox.
-
-	\param focused \a true to set focus, \a false to remove it.
-
-	\sa BControl::MakeFocus()
-*/
-
-
 /*!
 	\fn void BCheckBox::SetValue(int32 value)
 	\brief Turn the checkbox on or off.
@@ -227,13 +147,3 @@

 	\sa BControl::SetValue()
 */
-
-
-/*!
-	\fn status_t BCheckBox::Invoke(BMessage *message)
-	\brief Tells the messenger to send a message.
-
-	\param message The \a message to send.
-
-	\sa BInvoker::Invoke()
-*/
@@ -0,0 +1,191 @@
+/*
+ * Copyright 2012 Haiku inc.
+ * Distributed under the terms of the MIT License.
+ *
+ * Documentation by:
+ *		John Scipione, [email protected]
+ *
+ * Corresponds to:
+ *		/trunk/headers/os/interface/Dragger.h	 hrev45050
+ *		/trunk/src/kits/interface/Dragger.cpp	 hrev45050
+
+
+/*!
+	\file Dragger.h
+	\brief Provides the BDragger class.
+*/
+
+
+/*!
+	\class BDragger
+	\ingroup interface
+	\ingroup libbe
+	\brief A view that allows the user drag and drop a target view.
+
+	The target view must be its immediate relative--a sibling, a parent, or
+	single child. The target BView must be able to be archived.
+
+	The dragger draws a handle on top of the target view, usually in the
+	bottom left the corner that the user can grab. When the user drags the
+	handle the target view appears to move with the handle.
+
+	However the target view doesn't actually move, instead, the view is archived
+	into a BMessage object and the BMessage object is dragged. When the BMessage
+	is dropped, the target BView is reconstructed from the archive (along with
+	the BDragger). The new object is a a replicant of the target view.
+
+	An example of a dragger handle on the Clock app can be seen below.
+
+	\image html BDragger_example.png
+
+	This class is tied closely to BShelf. A BShelf object accepts dragged BViews,
+	reconstructs them from their archives and adds them to the view hierarchy
+	of another view.
+
+	The Show Replicants/Hide Replicants menu item in Deskbar shows and hides the
+	BDragger handles.
+*/
+
+
+/*!
+	\fn BDragger::BDragger(BRect frame, BView* target, uint32 resizingMode,
+		uint32 flags)
+	\brief Creates a new BDragger and sets its target view.
+
+	The target view must be its immediate relative--a sibling, a parent, or
+	single child, however, the constructor does not establish this
+	relationship for you.
+	
+	Once you construct the BDragger you must do one of of these:
+	- Add the target as a child of the dragger.
+	- Add the dragger as a child of the target.
+	- Add the dragger as a sibling of the target.
+
+	If you add the target as a child of the dragger it should be its only
+	child.
+
+	A BDragger draws in the right bottom corner of its frame rectangle. If the
+	\a target view is a parent or a sibling of the dragger then the frame
+	rectangle needs to be no larger than the handle. However, if the \a target
+	is a child of the dragger then the dragger's frame rectangle must enclose
+	the target's frame so that the dragger doesn't clip the \a target.
+
+	\param frame The frame rectangle that the dragger is draw into.
+	\param target The view to set the dragger to.
+	\param resizingMode Sets the parameters by which the dragger can be
+		resized. See BView for more information on resizing options.
+	\param flags The flags mask sets what notifications the BDragger can
+		receive. See BView for more information on \a flags.
+*/
+
+
+/*!
+	\fn BDragger::BDragger(BMessage* data)
+	\brief Constructs a BDragger object from message \a data.
+
+	\param data The message \a data to restore from.
+*/
+
+
+/*!
+	\fn BDragger::~BDragger()
+	\brief Destroys the BDragger object and frees the memory it uses,
+		primarily from the bitmap handle.
+*/
+
+
+/*!
+	\fn static BArchivable* BDragger::Instantiate(BMessage* data)
+	\brief Creates a new BDragger object from the BMessage constructor.
+
+	\returns A newly created BDragger or \c NULL if the message doesn't
+		contain an archived BDragger object.
+*/
+
+
+/*!
+	\fn status_t BDragger::Archive(BMessage* data, bool deep) const
+	\brief Archives the draggers's relationship to the target view.
+
+	The \a deep parameter has no effect on the BDragger object but
+	is passed on to BView::Archive().
+
+	\returns A status code, typically \c B_OK or \c B_ERROR on error.
+
+	\see BView::Archive()
+*/
+
+
+/*!
+	\fn void BDragger::AttachedToWindow()
+	\brief Puts the BDragger under the control of HideAllDraggers() and
+		ShowAllDraggers().
+*/
+
+
+/*!
+	\fn void BDragger::DetachedFromWindow()
+	\brief Removes the BDragger from the control of HideAllDraggers()
+		and ShowAllDraggers().
+*/
+
+
+/*!
+	\fn void BDragger::Draw(BRect updateRect)
+	\brief Draws the dragger handle.
+
+	\param updateRect The rectangular area to draw the handle in.
+*/
+
+
+/*!
+	\fn void BDragger::MouseDown(BPoint point)
+	\brief Hook method that is called when a mouse button is pressed over the
+		dragger.
+
+	This results in the archiving of the target view and the dragger and
+	initiates a drag-and-drop operation.
+
+	\param point The point on the screen where to mouse pointer is when
+		the mouse is clicked.
+*/
+
+
+/*!
+	\fn void BDragger::MessageReceived(BMessage* msg)
+	\brief Receives messages that control the visibility of the dragger handle.
+
+	\param msg The message received
+
+	\see BView::MessageReceived()
+*/
+
+
+/*!
+	\fn static status_t BDragger::ShowAllDraggers()
+	\brief Causes all BDragger objects to draw their handles.
+
+	The Show Replicants menu item in Deskbar does its work through this
+	method.
+
+	\returns A status code, \c B_OK on success or an error code on failure.
+*/
+
+
+/*!
+	\fn static status_t BDragger::HideAllDraggers()
+	\brief Hides all BDragger objects so that they're not visible on screen.
+
+	The Hide Replicants menu item in Deskbar does its work through this
+	method.
+
+	\returns A status code, \c B_OK on success or an error code on failure.
+*/
+
+
+/*!
+	\fn static bool BDragger::AreDraggersDrawn()
+	\brief Returns whether or not draggers are currently drawn.
+
+	\returns \c true if draggers are drawn, \c false otherwise.
+*/
@@ -0,0 +1,395 @@
+/*
+ * Copyright 2009-2012 Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Tyler Dauwalder
+ *		John Scipione, [email protected]
+ *		Ingo Weinhold, [email protected]
+ *
+ * Corresponds to:
+ *		headers/os/storage/File.h  hrev45060
+ *		src/kits/storage/File.cpp  hrev45060
+ */
+
+
+/*!
+	\file File.h
+	Provides the BFile class.
+*/
+
+
+/*!
+	\class BFile
+	\ingroup storage
+	\ingroup libbe
+	\brief Provides the ability to read and write the data of a file.
+
+	The file is automatically opened when you initialize a BFile and is 
+	automatically closed when you re-initialize or destroy the object.
+
+	Symbolic links are automatically transversed by opening a BFile.
+	The node that the BFile ends up opening will be the file or directory
+	that the link points to, not the symbolic link file itself.
+*/
+
+
+/*!
+	\fn BFile::BFile()
+	\brief Creates an uninitialized BFile object.
+
+	Should be followed by a call to one of the SetTo() methods, or an
+	assignment:
+	- SetTo(const entry_ref* ref, uint32 openMode)
+	- SetTo(const BEntry* entry, uint32 openMode)
+	- SetTo(const char* path, uint32 openMode)
+	- SetTo(const BDirectory* dir, const char* path, uint32 openMode)
+	- operator=(const BFile &file)
+*/
+
+
+/*!
+	\fn BFile::BFile(const BFile& file)
+	\brief Creates a copy of the supplied BFile.
+
+	If \a file is uninitialized, the newly constructed BFile will be too.
+
+	\param file The BFile object to be copied.
+*/
+
+
+/*!
+	\fn BFile::BFile(const entry_ref* ref, uint32 openMode)
+	\brief Creates a BFile and initializes it to the file referred to by
+		   the supplied entry_ref and according to the specified open mode.
+
+	\param ref The entry_ref referring to the file.
+	\param openMode The mode in which the file should be opened.
+
+	\see SetTo(const entry_ref* ref, uint32 openMode)
+*/
+
+
+/*!
+	\fn BFile::BFile(const BEntry* entry, uint32 openMode)
+	\brief Creates a BFile and initializes it to the file referred to by
+		   the supplied BEntry and according to the specified open mode.
+
+	\param entry The BEntry referring to the file.
+	\param openMode The mode in which the file should be opened.
+
+	\see SetTo(const BEntry* entry, uint32 openMode)
+*/
+
+
+/*!
+	\fn BFile::BFile(const char* path, uint32 openMode)
+	\brief Creates a BFile and initializes it to the file referred to by
+		   the supplied path name and according to the specified open mode.
+
+	\param path The file's path name.
+	\param openMode The mode in which the file should be opened.
+
+	\see SetTo(const char* path, uint32 openMode)
+*/
+
+
+/*!
+	\fn BFile::BFile(const BDirectory *dir, const char* path, uint32 openMode)
+	\brief Creates a BFile and initializes it to the file referred to by
+		   the supplied path name relative to the specified BDirectory and
+		   according to the specified open mode.
+
+	\param dir The BDirectory, relative to which the file's path name is
+		   given.
+	\param path The file's path name relative to \a dir.
+	\param openMode The mode in which the file should be opened.
+
+	\see SetTo(const BDirectory* dir, const char* path, uint32 openMode)
+*/
+
+
+/*!
+	\fn BFile::~BFile()
+	\brief Destroys the BFile object and frees all allocated resources.
+
+	If the file is properly initialized, the file descriptor is closed.
+*/
+
+
+/*!
+	\fn status_t BFile::SetTo(const entry_ref* ref, uint32 openMode)
+	\brief Re-initializes the BFile to the file referred to by the
+		   supplied entry_ref and according to the specified open mode.
+
+	\param ref The entry_ref referring to the file.
+	\param openMode The mode in which the file should be opened
+		\a openMode must be a bitwise or of exactly one of the flags.
+		- \c B_READ_ONLY: The file is opened read only.
+		- \c B_WRITE_ONLY: The file is opened write only.
+		- \c B_READ_WRITE: The file is opened for random read/write access.
+		and any number of the flags
+		- \c B_CREATE_FILE: A new file will be created, if it does not already
+			exist.
+		- \c B_FAIL_IF_EXISTS: If the file does already exist and
+			\c B_CREATE_FILE is set, SetTo() fails.
+		- \c B_ERASE_FILE: An already existing file is truncated to zero size.
+		- \c B_OPEN_AT_END: Seek() to the end of the file after opening.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_BAD_VALUE \c NULL \a ref or bad \a openMode.
+	\retval B_ENTRY_NOT_FOUND File not found or failed to create file.
+	\retval B_FILE_EXISTS File exists and \c B_FAIL_IF_EXISTS was passed.
+	\retval B_PERMISSION_DENIED File permissions didn't allow operation.
+	\retval B_NO_MEMORY Insufficient memory for operation.
+	\retval B_LINK_LIMIT Indicates a cyclic loop within the file system.
+	\retval B_BUSY A node was busy.
+	\retval B_FILE_ERROR A general file error.
+	\retval B_NO_MORE_FDS The application has run out of file descriptors.
+*/
+
+
+/*!
+	\fn status_t BFile::SetTo(const BEntry* entry, uint32 openMode)
+	\brief Re-initializes the BFile to the file referred to by the
+		   supplied BEntry and according to the specified open mode.
+
+	\param entry the BEntry referring to the file
+	\param openMode the mode in which the file should be opened
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_BAD_VALUE \c NULL \a entry or bad \a openMode.
+	\retval B_ENTRY_NOT_FOUND File not found or failed to create file.
+	\retval B_FILE_EXISTS File exists and \c B_FAIL_IF_EXISTS was passed.
+	\retval B_PERMISSION_DENIED File permissions didn't allow operation.
+	\retval B_NO_MEMORY Insufficient memory for operation.
+	\retval B_LINK_LIMIT Indicates a cyclic loop within the file system.
+	\retval B_BUSY A node was busy.
+	\retval B_FILE_ERROR A general file error.
+	\retval B_NO_MORE_FDS The application has run out of file descriptors.
+
+	\todo Implemented using SetTo(entry_ref*, uint32). Check, if necessary
+		  to re-implement!
+*/
+
+
+/*!
+	\fn status_t BFile::SetTo(const char* path, uint32 openMode)
+	\brief Re-initializes the BFile to the file referred to by the
+		   supplied path name and according to the specified open mode.
+
+	\param path The file's path name.
+	\param openMode The mode in which the file should be opened.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_BAD_VALUE \c NULL \a path or bad \a openMode.
+	\retval B_ENTRY_NOT_FOUND File not found or failed to create file.
+	\retval B_FILE_EXISTS File exists and \c B_FAIL_IF_EXISTS was passed.
+	\retval B_PERMISSION_DENIED File permissions didn't allow operation.
+	\retval B_NO_MEMORY Insufficient memory for operation.
+	\retval B_LINK_LIMIT Indicates a cyclic loop within the file system.
+	\retval B_BUSY A node was busy.
+	\retval B_FILE_ERROR A general file error.
+	\retval B_NO_MORE_FDS The application has run out of file descriptors.
+*/
+*/
+
+
+/*!
+	\fn status_t BFile::SetTo(const BDirectory* dir, const char* path,
+		uint32 openMode)
+	\brief Re-initializes the BFile to the file referred to by the
+		   supplied path name relative to the specified BDirectory and
+		   according to the specified open mode.
+
+	\param dir The BDirectory, relative to which the file's path name is
+		   given.
+	\param path The file's path name relative to \a dir.
+	\param openMode The mode in which the file should be opened.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_BAD_VALUE \c NULL \a dir or \a path or bad \a openMode.
+	\retval B_ENTRY_NOT_FOUND File not found or failed to create file.
+	\retval B_FILE_EXISTS File exists and \c B_FAIL_IF_EXISTS was passed.
+	\retval B_PERMISSION_DENIED File permissions didn't allow operation.
+	\retval B_NO_MEMORY Insufficient memory for operation.
+	\retval B_LINK_LIMIT Indicates a cyclic loop within the file system.
+	\retval B_BUSY A node was busy.
+	\retval B_FILE_ERROR A general file error.
+	\retval B_NO_MORE_FDS The application has run out of file descriptors.
+
+	\todo Implemented using SetTo(BEntry*, uint32). Check, if necessary
+		  to re-implement!
+*/
+
+
+/*!
+	\fn bool BFile::IsReadable() const
+	\brief Reports whether or not the file is readable.
+
+	\return
+	- \c true, if the BFile has been initialized properly and the file has
+	  been been opened for reading,
+	- \c false, otherwise.
+*/
+
+
+/*!
+	\fn bool BFile::IsWritable() const
+	\brief Reports whether or not the file is writable.
+
+	\return
+	- \c true, if the BFile has been initialized properly and the file has
+	  been opened for writing,
+	- \c false, otherwise.
+*/
+
+
+/*!
+	ssize_t BFile::Read(void* buffer, size_t size)
+	\brief Reads a number of bytes from the file into a buffer.
+
+	\param buffer The buffer the data from the file shall be written to.
+	\param size The number of bytes that shall be read.
+
+	\returns The number of bytes read or an error code.
+*/
+
+
+/*!
+	\fn ssize_t BFile::ReadAt(off_t location, void* buffer, size_t size)
+	\brief Reads a number of bytes from a certain position within the file
+		   into a buffer.
+
+	\param location The position (in bytes) within the file from which the
+		   data shall be read.
+	\param buffer The buffer the data from the file shall be written to.
+	\param size The number of bytes that shall be read.
+
+	\returns The number of bytes read or an error code.
+*/
+
+
+/*!
+	\fn ssize_t BFile::Write(const void* buffer, size_t size)
+	\brief Writes a number of bytes from a buffer into the file.
+
+	\param buffer The buffer containing the data to be written to the file.
+	\param size The number of bytes that shall be written.
+
+	\returns The number of bytes actually written or an error code.
+*/
+
+
+/*!
+	\fn ssize_t BFile::WriteAt(off_t location, const void* buffer, size_t size)
+	\brief \brief Writes a number of bytes from a buffer at a certain position
+		   into the file.
+
+	\param location The position (in bytes) within the file at which the data
+		   shall be written.
+	\param buffer The buffer containing the data to be written to the file.
+	\param size The number of bytes that shall be written.
+
+	\returns The number of bytes actually written or an error code.
+*/
+
+
+/*!
+	\fn off_t BFile::Seek(off_t offset, uint32 seekMode)
+	\brief Seeks to another read/write position within the file.
+
+	It is allowed to seek past the end of the file. A subsequent call to
+	Write() will pad the file with undefined data. Seeking before the
+	beginning of the file will fail and the behavior of subsequent Read()
+	or Write() invocations will be undefined.
+
+	\param offset New read/write position, depending on \a seekMode relative
+		   to the beginning or the end of the file or the current position.
+	\param seekMode
+		- \c SEEK_SET: move relative to the beginning of the file
+		- \c SEEK_CUR: move relative to the current position
+		- \c SEEK_END: move relative to the end of the file
+
+	\returns The new read/write position relative to the beginning of the
+		file or an error code.
+	\retval B_ERROR Trying to seek before the beginning of the file.
+	\retval B_FILE_ERROR The file is not properly initialized.
+*/
+
+
+/*!
+	\fn off_t BFile::Position() const
+	\brief Gets the current read/write position within the file.
+
+	\returns The current read/write position relative to the beginning of the
+		file or an error code.
+	\retval B_ERROR After a Seek() before the beginning of the file.
+	\retval B_FILE_ERROR The file has not been initialized.
+*/
+
+
+/*!
+	\fn status_t BFile::SetSize(off_t size)
+	\brief Sets the size of the file.
+
+	If the file is shorter than \a size bytes it will be padded with
+	unspecified data to the requested size. If it is larger, it will be
+	truncated.
+
+	\note There's no problem with setting the size of a BFile opened in
+		  \c B_READ_ONLY mode, unless the file resides on a read only volume.
+
+	\param size The new file size.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_NOT_ALLOWED Trying to set the size of a file on a read only
+			volume.
+	\retval B_DEVICE_FULL There's not enough space left on the volume.
+*/
+
+
+/*!
+	\fn status_t BFile::GetSize(off_t* size) const
+	\brief Gets the size of the file.
+
+	\param size The file size to fill out.
+
+	\returns A status code.
+
+	\see BStatable::GetSize()
+*/
+
+
+/*!
+	\fn BFile& BFile::operator=(const BFile &file)
+	\brief Assigns another BFile to this BFile.
+
+	If the other BFile is uninitialized, this one will be too. Otherwise it
+	will refer to the same file using the same mode, unless an error occurs.
+
+	\param file The original BFile to assign from.
+
+	\returns A reference to the assigned BFile.
+*/
+
+
+/*!
+	\fn int BFile::get_fd() const
+	\brief Gets the file descriptor of the BFile.
+
+	To be used instead of accessing the BNode's private \c fFd member directly.
+
+	\returns The file descriptor, or -1 if not properly initialized.
+*/
+
+
+/*!
+	\fn void BFile::close_fd()
+	\brief Overrides BNode::close_fd() for binary compatibility with BeOS R5.
+*/
@@ -361,7 +361,7 @@


 /*!
-	\fn status_tBMimeType::GetFileExtensions(BMessage *extensions) const
+	\fn status_t BMimeType::GetFileExtensions(BMessage *extensions) const
 	\brief Fetches the MIME type's associated filename extensions from the
 		MIME database.

@@ -525,9 +525,8 @@
 */


-// 
 /*!
-	\fn status_t BMimeType::SetP0referredApp(const char *signature,
+	\fn status_t BMimeType::SetPreferredApp(const char *signature,
 		app_verb verb)
 	\brief Sets the preferred application for the MIME type.

@@ -832,12 +831,12 @@
 	mini icon. Additionally, the bitmap must be in the \c B_CMAP8 color space
 	(8-bit color).

-	\param type Pointer to a pre-allocated string containing the MIME type whose
-	            custom icon you wish to fetch.
+	\param type Pointer to a pre-allocated string containing the MIME type
+		whose custom icon you wish to fetch.
 	\param icon Pointer to a pre-allocated \c BBitmap of proper size and
-				colorspace into which the icon is copied.
-	\param icon_size Value that specifies which icon to return. Currently
-					 \c B_LARGE_ICON and \c B_MINI_ICON are supported.
+		colorspace into which the icon is copied.
+	\param which Value that specifies which icon to return. Currently
+		\c B_LARGE_ICON and \c B_MINI_ICON are supported.

 	\returns A status code.
 	\retval B_OK Success
@@ -8,6 +8,7 @@
 #ifndef	_DIRECT_WINDOW_H
 #define	_DIRECT_WINDOW_H

+
 #include <Region.h>
 #include <Window.h>

@@ -54,98 +55,106 @@ typedef struct {

 class BDirectWindow : public BWindow {
 	public:
-		BDirectWindow(BRect frame, const char *title, window_type type, 
-			uint32 flags, uint32 workspace = B_CURRENT_WORKSPACE);
-		BDirectWindow(BRect frame, const char *title, window_look look,
-			window_feel feel, uint32 flags,
-			uint32 workspace = B_CURRENT_WORKSPACE);
-		virtual ~BDirectWindow();
+								BDirectWindow(BRect frame, const char *title,
+									window_type type, uint32 flags,
+									uint32 workspace = B_CURRENT_WORKSPACE);
+								BDirectWindow(BRect frame, const char *title,
+									window_look look, window_feel feel,
+									uint32 flags,
+									uint32 workspace = B_CURRENT_WORKSPACE);
+		virtual					~BDirectWindow();

-		static	BArchivable* Instantiate(BMessage *data);
-		virtual	status_t	Archive(BMessage *data, bool deep = true) const;
+		static	BArchivable*	Instantiate(BMessage *data);
+		virtual	status_t		Archive(BMessage *data,
+									bool deep = true) const;

-		virtual void		Quit();
-		virtual	void		DispatchMessage(BMessage *message, BHandler *handler);
-		virtual	void		MessageReceived(BMessage *message);
-		virtual	void		FrameMoved(BPoint newPosition);
-		virtual void		WorkspacesChanged(uint32 oldWorkspaces,
-								uint32 newWorkspaces);
-		virtual void		WorkspaceActivated(int32 workspaceIndex, bool state);
-		virtual	void		FrameResized(float newWidth, float newHeight);
-		virtual void		Minimize(bool minimize);
-		virtual void		Zoom(BPoint recPosition, float recWidth,
-								float recHeight);
-		virtual void		ScreenChanged(BRect screenFrame, color_space depth);
-		virtual	void		MenusBeginning();
-		virtual	void		MenusEnded();
-		virtual	void		WindowActivated(bool state);
-		virtual	void		Show();
-		virtual	void		Hide();
-		virtual BHandler*	ResolveSpecifier(BMessage *message, int32 index,
-								BMessage *specifier, int32 form,
-								const char *property);
-		virtual status_t	GetSupportedSuites(BMessage *data);
-		virtual status_t	Perform(perform_code code, void *arg);
+		virtual	void			Quit();
+		virtual	void			DispatchMessage(BMessage *message,
+									BHandler *handler);
+		virtual	void			MessageReceived(BMessage *message);
+		virtual	void			FrameMoved(BPoint newPosition);
+		virtual	void			WorkspacesChanged(uint32 oldWorkspaces,
+									uint32 newWorkspaces);
+		virtual	void			WorkspaceActivated(int32 workspaceIndex,
+									bool state);
+		virtual	void			FrameResized(float newWidth, float newHeight);
+		virtual	void			Minimize(bool minimize);
+		virtual	void			Zoom(BPoint recPosition, float recWidth,
+									float recHeight);
+		virtual	void			ScreenChanged(BRect screenFrame,
+									color_space depth);
+		virtual	void			MenusBeginning();
+		virtual	void			MenusEnded();
+		virtual	void			WindowActivated(bool state);
+		virtual	void			Show();
+		virtual	void			Hide();
+		virtual	BHandler*		ResolveSpecifier(BMessage *message,
+									int32 index, BMessage *specifier,
+									int32 form, const char *property);
+		virtual	status_t		GetSupportedSuites(BMessage *data);
+		virtual	status_t		Perform(perform_code code, void *arg);

 	private:
-		virtual	void		task_looper();
-		virtual BMessage*	ConvertToMessage(void *raw, int32 code);
+		virtual	void			task_looper();
+		virtual	BMessage*		ConvertToMessage(void *raw, int32 code);

 	public:	
-		virtual void		DirectConnected(direct_buffer_info *info);
-		status_t			GetClippingRegion(BRegion *region,
-								BPoint *origin = NULL) const;
-		status_t			SetFullScreen(bool enable);
-		bool				IsFullScreen() const;
+		virtual	void			DirectConnected(direct_buffer_info *info);
+		status_t				GetClippingRegion(BRegion *region,
+									BPoint *origin = NULL) const;
+		status_t				SetFullScreen(bool enable);
+		bool					IsFullScreen() const;

-		static	bool		SupportsWindowMode(screen_id id = B_MAIN_SCREEN_ID);
+		static	bool			SupportsWindowMode(
+									screen_id id = B_MAIN_SCREEN_ID);

 	private:
-		typedef BWindow	inherited;
+		typedef	BWindow			inherited;

-		virtual void		_ReservedDirectWindow1();
-		virtual void		_ReservedDirectWindow2();
-		virtual void		_ReservedDirectWindow3();
-		virtual void		_ReservedDirectWindow4();
+		virtual	void			_ReservedDirectWindow1();
+		virtual	void			_ReservedDirectWindow2();
+		virtual	void			_ReservedDirectWindow3();
+		virtual	void			_ReservedDirectWindow4();

-		BDirectWindow();
-		BDirectWindow(BDirectWindow& other);
-		BDirectWindow& operator=(BDirectWindow& other);
+								BDirectWindow();
+								BDirectWindow(BDirectWindow& other);
+				BDirectWindow&	operator=(BDirectWindow& other);

-		static	int32	_daemon_thread(void* arg);
-		int32			_DirectDaemon();
-		bool			_LockDirect() const;
-		void			_UnlockDirect() const;
+		static	int32			_daemon_thread(void* arg);
+				int32			_DirectDaemon();
+				bool			_LockDirect() const;
+				void			_UnlockDirect() const;

-		void			_InitData();
-		void			_DisposeData();
+				void			_InitData();
+				void			_DisposeData();

-		bool			fDaemonKiller;
-		bool			fConnectionEnable;
-		bool			fIsFullScreen;
-		bool			_unused;
-		bool			fInDirectConnect;
+				bool			fDaemonKiller;
+				bool			fConnectionEnable;
+				bool			fIsFullScreen;
+				bool			_unused;
+				bool			fInDirectConnect;

-		int32			fDirectLock;				
-		sem_id			fDirectSem;
-		uint32			fDirectLockCount;
-		thread_id		fDirectLockOwner;
-		char*			fDirectLockStack;
+				int32			fDirectLock;
+				sem_id			fDirectSem;
+				uint32			fDirectLockCount;
+				thread_id		fDirectLockOwner;
+				char*			fDirectLockStack;

-		sem_id			fDisableSem;
-		sem_id			fDisableSemAck;
+				sem_id			fDisableSem;
+				sem_id			fDisableSemAck;

-		uint32			fInitStatus;
-		uint32			fInfoAreaSize;
+				uint32			fInitStatus;
+				uint32			fInfoAreaSize;

-		uint32			_reserved[2];
+				uint32			_reserved[2];

-		area_id			fClonedClippingArea;
-		area_id			fSourceClippingArea;
-		thread_id		fDirectDaemonId;
-		direct_buffer_info* fBufferDesc;
+				area_id			fClonedClippingArea;
+				area_id			fSourceClippingArea;
+				thread_id		fDirectDaemonId;
+				direct_buffer_info*	fBufferDesc;

-		uint32			_more_reserved_[17];
+				uint32			_more_reserved_[17];
 };

+
 #endif	// _DIRECT_WINDOW_H
@@ -23,8 +23,8 @@ namespace BPrivate {

 class BDragger : public BView {
 public:
-								BDragger(BRect bounds, BView* target,
-									uint32 resizingMask = B_FOLLOW_NONE,
+								BDragger(BRect frame, BView* target,
+									uint32 resizingMode = B_FOLLOW_NONE,
 									uint32 flags = B_WILL_DRAW);
 								BDragger(BMessage* data);
 	virtual						~BDragger();
@@ -60,7 +60,7 @@ class BFile : public BNode, public BPositionIO {
 		virtual void close_fd();

 	private:
-		//! The file's open mode.
+		// The file's open mode.
 		uint32 fMode;
 };

@@ -47,11 +47,13 @@ extern "C" {
 										PRINT(("%s\t", #OBJ));	\
 										(OBJ).PrintToStream(); 	\
 									} ((void)0)
-	#define TRACE()					_debugPrintf("File: %s, Line: %d, Thread: %ld\n", \
-										__FILE__, __LINE__, find_thread(NULL))
+	#define TRACE()					_debugPrintf("File: %s, Line: %d, Thread: %" \
+										B_PRId32 "\n", __FILE__, __LINE__, \
+										find_thread(NULL))

-	#define SERIAL_TRACE()			_sPrintf("File: %s, Line: %d, Thread: %ld\n", \
-										__FILE__, __LINE__, find_thread(NULL))
+	#define SERIAL_TRACE()			_sPrintf("File: %s, Line: %d, Thread: %" \
+										B_PRId32 "\n", __FILE__, __LINE__, \
+										find_thread(NULL))

 	#define DEBUGGER(MSG)			if (_rtDebugFlag) debugger(MSG)
 	#if !defined(ASSERT)
@@ -739,6 +739,12 @@ PCI::_EnumerateBus(int domain, uint8 bus, uint8 *subordinateBus)
 			if (baseClass != PCI_bridge || subClass != PCI_pci)
 				continue;

+			// skip incorrectly configured devices
+			uint8 headerType = ReadConfig(domain, bus, dev, function,
+				PCI_header_type, 1) & PCI_header_type_mask;
+			if (headerType != PCI_header_type_PCI_to_PCI_bridge)
+				continue;
+
 			TRACE(("PCI: found PCI-PCI bridge: domain %u, bus %u, dev %u, func %u\n",
 				domain, bus, dev, function));
 			TRACE(("PCI: original settings: pcicmd %04" B_PRIx32 ", primary-bus "
@@ -793,6 +799,12 @@ PCI::_EnumerateBus(int domain, uint8 bus, uint8 *subordinateBus)
 			if (baseClass != PCI_bridge || subClass != PCI_pci)
 				continue;

+			// skip incorrectly configured devices
+			uint8 headerType = ReadConfig(domain, bus, dev, function,
+				PCI_header_type, 1) & PCI_header_type_mask;
+			if (headerType != PCI_header_type_PCI_to_PCI_bridge)
+				continue;
+
 			TRACE(("PCI: configuring PCI-PCI bridge: domain %u, bus %u, dev %u, func %u\n",
 				domain, bus, dev, function));

@@ -877,6 +889,18 @@ PCI::_FixupDevices(int domain, uint8 bus)
 			if (subClass != PCI_pci)
 				continue;

+			// some FIC motherboards have a buggy BIOS...
+			// make sure the header type is correct for a bridge,
+			uint8 headerType = ReadConfig(domain, bus, dev, function,
+				PCI_header_type, 1) & PCI_header_type_mask;
+			if (headerType != PCI_header_type_PCI_to_PCI_bridge) {
+				dprintf("PCI: dom %u, bus %u, dev %2u, func %u, PCI bridge"
+					" class but wrong header type 0x%02x, ignoring.\n",
+					domain, bus, dev, function, headerType);
+				continue;
+			}
+
+
 			int busBehindBridge = ReadConfig(domain, bus, dev, function,
 				PCI_secondary_bus, 1);

@@ -894,7 +918,9 @@ PCI::_ConfigureBridges(PCIBus *bus)
 {
 	for (PCIDev *dev = bus->child; dev; dev = dev->next) {
 		if (dev->info.class_base == PCI_bridge
-			&& dev->info.class_sub == PCI_pci) {
+			&& dev->info.class_sub == PCI_pci
+			&& (dev->info.header_type & PCI_header_type_mask)
+			== PCI_header_type_PCI_to_PCI_bridge) {
 			uint16 bridgeControlOld = ReadConfig(dev->domain, dev->bus,
 				dev->device, dev->function, PCI_bridge_control, 2);
 			uint16 bridgeControlNew = bridgeControlOld;
@@ -1058,7 +1084,10 @@ PCI::_DiscoverDevice(PCIBus *bus, uint8 dev, uint8 function)
 		PCI_class_base, 1);
 	uint8 subClass = ReadConfig(bus->domain, bus->bus, dev, function,
 		PCI_class_sub, 1);
-	if (baseClass == PCI_bridge && subClass == PCI_pci) {
+	uint8 headerType = ReadConfig(bus->domain, bus->bus, dev, function,
+		PCI_header_type, 1) & PCI_header_type_mask;
+	if (baseClass == PCI_bridge && subClass == PCI_pci
+		&& headerType == PCI_header_type_PCI_to_PCI_bridge) {
 		uint8 secondaryBus = ReadConfig(bus->domain, bus->bus, dev, function,
 			PCI_secondary_bus, 1);
 		PCIBus *newBus = _CreateBus(newDev, bus->domain, secondaryBus);
@@ -182,6 +182,7 @@ allocate_device_interface(net_device* device, net_device_module_info* module)
 	interface->device = device;
 	interface->up_count = 0;
 	interface->ref_count = 1;
+	interface->monitor_count = 0;
 	interface->deframe_func = NULL;
 	interface->deframe_ref_count = 0;

@@ -26,9 +26,10 @@ extern "C" {
 #include "state_tracker/st_gl_api.h"
 #include "state_tracker/st_manager.h"
 #include "state_tracker/sw_winsys.h"
-#include "softpipe/sp_public.h"
 #ifdef HAVE_LLVM
 #include "llvmpipe/lp_public.h"
+#else
+#include "softpipe/sp_public.h"
 #endif
 }

@@ -52,6 +53,11 @@ hgl_viewport(struct gl_context* glContext, GLint x, GLint y,
 		glContext, x, y, width, height);
 	struct hgl_context *context = (struct hgl_context*)glContext->DriverCtx;

+	if (!context) {
+		ERROR("%s: No context yet. bailing.\n", __func__);
+		return;
+	}
+
 	int32 bitmapWidth;
 	int32 bitmapHeight;

@@ -207,11 +213,10 @@ GalliumContext::CreateScreen()

 	#ifdef HAVE_LLVM
 	fScreen = llvmpipe_create_screen(winsys);
+	#else
+	fScreen = softpipe_create_screen(winsys);
 	#endif

-	if (fScreen == NULL)
-		fScreen = softpipe_create_screen(winsys);
-
 	if (fScreen == NULL) {
 		ERROR("%s: Couldn't create screen!\n", __FUNCTION__);
 		FREE(winsys);
@@ -13,14 +13,103 @@ local sources =
 	GalliumFramebuffer.cpp
 	bitmap_wrapper.cpp ;

-if $(HAIKU_LLVM_PRESENT) {
+local HAIKU_SWPIPE_DRIVER = $(HAIKU_GALLIUM_SOFTPIPE_LIB) ;
+
+local llvmLibraries = ;
+if $(HAIKU_LLVM_DIR) {
 	# TODO: Add LLVM OptionalBuildPackage
 	SubDirC++Flags [ FDefines HAVE_LLVM=0x0302 ] ;

 	# TODO: This is a hack for now
 	SubDirSysHdrs /boot/common/include ;
-}
+	HAIKU_LLVM_DIR = /boot/common/lib ;

+	HAIKU_SWPIPE_DRIVER = $(HAIKU_GALLIUM_LLVMPIPE_LIB) ;
+
+	llvmLibraries =
+		$(HAIKU_LLVM_DIR)/libLLVMAsmParser.a
+		$(HAIKU_LLVM_DIR)/libLLVMInstrumentation.a
+		$(HAIKU_LLVM_DIR)/libLLVMLinker.a
+		$(HAIKU_LLVM_DIR)/libLLVMArchive.a
+		$(HAIKU_LLVM_DIR)/libLLVMBitReader.a
+		$(HAIKU_LLVM_DIR)/libLLVMDebugInfo.a
+		$(HAIKU_LLVM_DIR)/libLLVMJIT.a
+		$(HAIKU_LLVM_DIR)/libLLVMipo.a
+		$(HAIKU_LLVM_DIR)/libLLVMVectorize.a
+		$(HAIKU_LLVM_DIR)/libLLVMBitWriter.a
+		$(HAIKU_LLVM_DIR)/libLLVMTableGen.a
+		$(HAIKU_LLVM_DIR)/libLLVMHexagonCodeGen.a
+		$(HAIKU_LLVM_DIR)/libLLVMHexagonAsmPrinter.a
+		$(HAIKU_LLVM_DIR)/libLLVMHexagonDesc.a
+		$(HAIKU_LLVM_DIR)/libLLVMHexagonInfo.a
+		$(HAIKU_LLVM_DIR)/libLLVMNVPTXCodeGen.a
+		$(HAIKU_LLVM_DIR)/libLLVMNVPTXDesc.a
+		$(HAIKU_LLVM_DIR)/libLLVMNVPTXInfo.a
+		$(HAIKU_LLVM_DIR)/libLLVMNVPTXAsmPrinter.a
+		$(HAIKU_LLVM_DIR)/libLLVMMBlazeCodeGen.a
+		$(HAIKU_LLVM_DIR)/libLLVMMBlazeAsmParser.a
+		$(HAIKU_LLVM_DIR)/libLLVMMBlazeDisassembler.a
+		$(HAIKU_LLVM_DIR)/libLLVMMBlazeDesc.a
+		$(HAIKU_LLVM_DIR)/libLLVMMBlazeInfo.a
+		$(HAIKU_LLVM_DIR)/libLLVMMBlazeAsmPrinter.a
+		$(HAIKU_LLVM_DIR)/libLLVMCppBackendCodeGen.a
+		$(HAIKU_LLVM_DIR)/libLLVMCppBackendInfo.a
+		$(HAIKU_LLVM_DIR)/libLLVMMSP430CodeGen.a
+		$(HAIKU_LLVM_DIR)/libLLVMMSP430Desc.a
+		$(HAIKU_LLVM_DIR)/libLLVMMSP430AsmPrinter.a
+		$(HAIKU_LLVM_DIR)/libLLVMMSP430Info.a
+		$(HAIKU_LLVM_DIR)/libLLVMXCoreCodeGen.a
+		$(HAIKU_LLVM_DIR)/libLLVMXCoreDesc.a
+		$(HAIKU_LLVM_DIR)/libLLVMXCoreInfo.a
+		$(HAIKU_LLVM_DIR)/libLLVMCellSPUCodeGen.a
+		$(HAIKU_LLVM_DIR)/libLLVMCellSPUDesc.a
+		$(HAIKU_LLVM_DIR)/libLLVMCellSPUInfo.a
+		$(HAIKU_LLVM_DIR)/libLLVMMipsAsmParser.a
+		$(HAIKU_LLVM_DIR)/libLLVMMipsCodeGen.a
+		$(HAIKU_LLVM_DIR)/libLLVMMipsDesc.a
+		$(HAIKU_LLVM_DIR)/libLLVMMipsAsmPrinter.a
+		$(HAIKU_LLVM_DIR)/libLLVMMipsDisassembler.a
+		$(HAIKU_LLVM_DIR)/libLLVMMipsInfo.a
+		$(HAIKU_LLVM_DIR)/libLLVMARMAsmParser.a
+		$(HAIKU_LLVM_DIR)/libLLVMARMCodeGen.a
+		$(HAIKU_LLVM_DIR)/libLLVMARMDisassembler.a
+		$(HAIKU_LLVM_DIR)/libLLVMARMDesc.a
+		$(HAIKU_LLVM_DIR)/libLLVMARMInfo.a
+		$(HAIKU_LLVM_DIR)/libLLVMARMAsmPrinter.a
+		$(HAIKU_LLVM_DIR)/libLLVMPowerPCCodeGen.a
+		$(HAIKU_LLVM_DIR)/libLLVMPowerPCDesc.a
+		$(HAIKU_LLVM_DIR)/libLLVMPowerPCInfo.a
+		$(HAIKU_LLVM_DIR)/libLLVMPowerPCAsmPrinter.a
+		$(HAIKU_LLVM_DIR)/libLLVMSparcCodeGen.a
+		$(HAIKU_LLVM_DIR)/libLLVMSparcDesc.a
+		$(HAIKU_LLVM_DIR)/libLLVMSparcInfo.a
+		$(HAIKU_LLVM_DIR)/libLLVMX86AsmParser.a
+		$(HAIKU_LLVM_DIR)/libLLVMX86CodeGen.a
+		$(HAIKU_LLVM_DIR)/libLLVMSelectionDAG.a
+		$(HAIKU_LLVM_DIR)/libLLVMAsmPrinter.a
+		$(HAIKU_LLVM_DIR)/libLLVMX86Disassembler.a
+		$(HAIKU_LLVM_DIR)/libLLVMX86Desc.a
+		$(HAIKU_LLVM_DIR)/libLLVMX86Info.a
+		$(HAIKU_LLVM_DIR)/libLLVMX86AsmPrinter.a
+		$(HAIKU_LLVM_DIR)/libLLVMX86Utils.a
+		$(HAIKU_LLVM_DIR)/libLLVMMCDisassembler.a
+		$(HAIKU_LLVM_DIR)/libLLVMMCParser.a
+		$(HAIKU_LLVM_DIR)/libLLVMInterpreter.a
+		$(HAIKU_LLVM_DIR)/libLLVMCodeGen.a
+		$(HAIKU_LLVM_DIR)/libLLVMScalarOpts.a
+		$(HAIKU_LLVM_DIR)/libLLVMInstCombine.a
+		$(HAIKU_LLVM_DIR)/libLLVMTransformUtils.a
+		$(HAIKU_LLVM_DIR)/libLLVMipa.a
+		$(HAIKU_LLVM_DIR)/libLLVMAnalysis.a
+		$(HAIKU_LLVM_DIR)/libLLVMMCJIT.a
+		$(HAIKU_LLVM_DIR)/libLLVMRuntimeDyld.a
+		$(HAIKU_LLVM_DIR)/libLLVMExecutionEngine.a
+		$(HAIKU_LLVM_DIR)/libLLVMTarget.a
+		$(HAIKU_LLVM_DIR)/libLLVMMC.a
+		$(HAIKU_LLVM_DIR)/libLLVMObject.a
+		$(HAIKU_LLVM_DIR)/libLLVMCore.a
+		$(HAIKU_LLVM_DIR)/libLLVMSupport.a ;
+}

 UsePrivateHeaders interface ;
 SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
@@ -31,7 +120,10 @@ AddResources Software\ Renderer : SoftwareRenderer.rdef ;
 Addon Software\ Renderer :
 	$(sources)
 	: libGL.so
-	$(HAIKU_MESA_DIR)/lib.haiku/libgallium.a
-	$(HAIKU_MESA_DIR)/lib.haiku/libsoftpipe.a
-	be translation $(TARGET_LIBSUPC++)
+	$(HAIKU_SWPIPE_DRIVER)
+	$(HAIKU_MESA_LIB)
+	$(HAIKU_GLSL_LIB)
+	$(HAIKU_GALLIUM_LIB)
+	$(llvmLibraries)
+	be translation stdc++ $(TARGET_LIBSUPC++)
 ;
@@ -8,20 +8,8 @@ if $(TARGET_PLATFORM) != haiku {
 }


-{
-	local defines ;
-	defines = BEOS_THREADS GNU_ASSEMBLER ;
-
-	if $(TARGET_ARCH) = x86 {
-		defines += USE_X86_ASM USE_MMX_ASM USE_3DNOW_ASM USE_SSE_ASM ;
-	} else if $(TARGET_ARCH) = ppc {
-		# Not yet supported, as current Mesa3D PPC assembly is Linux-dependent!
-		# defines += USE_PPC_ASM ;
-	} else if $(TARGET_ARCH) = sparc {
-		defines += USE_SPARC_ASM ;
-	}
-}
-
+local defines = BEOS_THREADS GNU_ASSEMBLER ;
+SubDirC++Flags [ FDefines $(defines) ] ;

 local sources = MesaSoftwareRenderer.cpp ;

@@ -35,15 +23,12 @@ UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa main ] ;
 UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mapi ] ;
 UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mapi glapi ] ;

-# For older versions of Mesa
-UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa glapi ] ;
-UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa tnl ] ;
-UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa x86 ] ;
-
-
 AddResources Software\ Rasterizer : MesaSoftwareRenderer.rdef ;

 Addon Software\ Rasterizer :
 	MesaSoftwareRenderer.cpp
-	: libGL.so be $(TARGET_LIBSUPC++)
+	:
+	$(HAIKU_MESA_LIB)
+	$(HAIKU_GLSL_LIB)
+	libGL.so be $(TARGET_LIBSUPC++)
 ;
@@ -469,22 +469,11 @@ MesaSoftwareRenderer::_Error(gl_context* ctx)
 const GLubyte*
 MesaSoftwareRenderer::_GetString(gl_context* ctx, GLenum name)
 {
-
 	switch (name) {
 		case GL_VENDOR:
 			return (const GLubyte*) "Mesa Project";
-		case GL_RENDERER: {
-			_mesa_get_cpu_features();
-			static char buffer[256] = { '\0' };
-
-			if (!buffer[0]) {
-				char* cpuInfo = _mesa_get_cpu_string();
-				// Let's build an renderer string
-				sprintf(buffer, "Software Rasterizer for %s", cpuInfo);
-				free(cpuInfo);
-			}
-			return (const GLubyte*) buffer;
-		}
+		case GL_RENDERER:
+			return (const GLubyte*) "Software Rasterizer";
 		default:
 			// Let core library handle all other cases
 			return NULL;
@@ -47,6 +47,8 @@ UseHeaders [ FDirName $(HAIKU_MESA_DIR) src mesa x86 ] ;
 AddResources Legacy\ Software\ Rasterizer : MesaSoftwareRenderer.rdef ;

 Addon Legacy\ Software\ Rasterizer :
-	MesaSoftwareRenderer.cpp
-	: libGL.so be $(TARGET_LIBSUPC++)
+	$(sources)
+	:
+	$(HAIKU_MESA_LIB)
+	libGL.so be $(TARGET_LIBSUPC++)
 ;
--- a/Show More
+++ b/Show More