Merge branch 'master' into sam460ex

2012-12-29 11:55:24 +01:00
parent 0ccce7886f 48ec1c9d22
commit 28d1701896
328 changed files with 1351 additions and 72068 deletions
@@ -10,7 +10,7 @@ SYSTEM_BIN = "[" addattr base64 basename bash beep cal cat catattr checkfs
 	chgrp chmod chown chroot cksum clear clockconfig cmp collectcatkeys comm
 	compress copyattr cp csplit cut date dd diff diff3 dircolors dirname df du
 	dumpcatalog echo eject env error expand expr factor false find finddir
-	fmt fold fortune ftp gawk gdb gzip gzexe getlimits grep groups head hostname
+	fmt fold fortune ftp gawk gdb gzip gzexe getlimits groups head hostname
 	id ifconfig <bin>install isvolume join kernel_debugger kill less lessecho
 	lesskey link linkcatkeys listdev ln locale locate logger logname ls
 	makebootable md5sum mimeset mkdir mkfifo mkfs mktemp mount mountvolume
@@ -228,8 +228,6 @@ AddSymlinkToHaikuImage system bin : gzip : zcat ;
 AddSymlinkToHaikuImage system bin : zdiff : zcmp ;
 AddSymlinkToHaikuImage system bin : unzip : zipinfo ;
 AddSymlinkToHaikuImage system bin : gawk : awk ;
-AddSymlinkToHaikuImage system bin : grep : egrep ;
-AddSymlinkToHaikuImage system bin : grep : fgrep ;


 # scripts and data files
@@ -12,7 +12,7 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
 	echo eject env error expand expr
 	factor false fdinfo ffm filepanel find finddir fmt fold fortune frcode
 	ftp ftpd funzip fwcontrol
-	gawk gdb@x86 getlimits grep groups gzip gzexe
+	gawk gdb@x86 getlimits groups gzip gzexe
 	hd head hey hostname
 	id ident ifconfig <bin>install installsound iroster isvolume
 	ideinfo@ide idestatus@ide
@@ -440,8 +440,6 @@ AddSymlinkToHaikuImage system bin : gzip : zcat ;
 AddSymlinkToHaikuImage system bin : zdiff : zcmp ;
 AddSymlinkToHaikuImage system bin : unzip : zipinfo ;
 AddSymlinkToHaikuImage system bin : gawk : awk ;
-AddSymlinkToHaikuImage system bin : grep : egrep ;
-AddSymlinkToHaikuImage system bin : grep : fgrep ;


 # scripts and data files
@@ -41,4 +41,4 @@ OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite WebKit WebPositive
 OptionalPackageDependencies wpa_supplicant : OpenSSL ;
 OptionalPackageDependencies XZ-Utils : Tar ;

-OptionalPackageDependencies MandatoryPackages : Bzip Ctags ICU Sed Tar ;
+OptionalPackageDependencies MandatoryPackages : Bzip Ctags Grep ICU Sed Tar ;
@@ -53,6 +53,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
 #	Git						- the distributed version control system
 #	GitDoc					- documentation for the distributed version control system
 #	GPerf					- the perfect hash function generator.
+#	Grep					- program to search for strings inside a file
 #	Groff					- text formatter used for man pages
 #	HGrep					- header grep tool
 #	ICU-devel				- the headers and lib-links for ICU (for development)
@@ -1225,6 +1226,27 @@ if [ IsOptionalHaikuImagePackageAdded Groff ] {
 	}
 }

+# Grep
+if [ IsOptionalHaikuImagePackageAdded Grep ] {
+	if $(TARGET_ARCH) = x86 {
+		if $(HAIKU_GCC_VERSION[1]) >= 4 {
+			InstallOptionalHaikuImagePackage
+				grep-2.14-x86-gcc4-2012-12-28.zip
+				: $(baseURL)/grep-2.14-x86-gcc4-2012-12-28.zip ;
+		} else {
+			InstallOptionalHaikuImagePackage
+				grep-2.14-x86-gcc2-2012-12-28.zip
+				: $(baseURL)/grep-2.14-x86-gcc2-2012-12-28.zip ;
+		}
+	} else if $(TARGET_ARCH) = x86_64 {
+		InstallOptionalHaikuImagePackage
+			grep-2.14-x86_64-2012-12-28.zip
+			: $(baseURL)/grep-2.14-x86_64-2012-12-28.zip
+			: : true ;
+	} else {
+		Echo "No optional package Grep available for $(TARGET_ARCH)" ;
+	}
+}

 # HGgrep
 if [ IsOptionalHaikuImagePackageAdded HGrep ] {
@@ -1,3 +1,4 @@
-1	polish	x-vnd.mmu_man.BSnow	2460058908
+1	polish	x-vnd.mmu_man.BSnow	2621406458
 Drag me on your desktop…	BSnow		Przeciągnij mnie na swój pulpit…
 Click me to remove BSnow…	BSnow		Kliknij mnie by usunąć BSnow…
+BSnow	System name		BSnow
@@ -1,7 +1,8 @@
-1	german	x-vnd.Be-TSKB	3155357024
+1	german	x-vnd.Be-TSKB	1566009467
 Power off	DeskbarMenu		Ausschalten
 Edit menu…	PreferencesWindow		Menü bearbeiten…
 Suspend	DeskbarMenu		Ruhezustand
+Hide clock	TimeView		Uhr ausblenden
 Time preferences…	TimeView		Datum & Zeit Einstellungen…
 About Haiku	DeskbarMenu		Über Haiku
 Recent documents:	PreferencesWindow		Letzte Dokumente:
@@ -9,6 +10,7 @@ Recent applications	DeskbarMenu		Letzte Anwendungen
 Sort running applications	PreferencesWindow		Laufende Anwendungen sortieren
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		Anwendungen
 Find…	DeskbarMenu		Suchen…
+Show clock	Tray		Uhr anzeigen
 Window	PreferencesWindow		Fenster
 Menu	PreferencesWindow		Menü
 Recent documents	DeskbarMenu		Letzte Dokumente
@@ -1,7 +1,8 @@
-1	hungarian	x-vnd.Be-TSKB	3155357024
+1	hungarian	x-vnd.Be-TSKB	1566009467
 Power off	DeskbarMenu		Kikapcsolás
 Edit menu…	PreferencesWindow		Menü szerkesztése…
 Suspend	DeskbarMenu		Felfüggesztés
+Hide clock	TimeView		Óra elrejtése
 Time preferences…	TimeView		Idő beállítása…
 About Haiku	DeskbarMenu		Haiku névjegye
 Recent documents:	PreferencesWindow		Utolsó dokumentumok:
@@ -9,6 +10,7 @@ Recent applications	DeskbarMenu		Legutóbbi programok
 Sort running applications	PreferencesWindow		Futó programok rendezése
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		Programok
 Find…	DeskbarMenu		Keresés…
+Show clock	Tray		Óra megjelenítése
 Window	PreferencesWindow		Ablak
 Menu	PreferencesWindow		Menü
 Recent documents	DeskbarMenu		Legutóbbi dokumentumok
@@ -1,7 +1,8 @@
-1	japanese	x-vnd.Be-TSKB	3155357024
+1	japanese	x-vnd.Be-TSKB	1566009467
 Power off	DeskbarMenu		電源を切る
 Edit menu…	PreferencesWindow		メニューの編集…
 Suspend	DeskbarMenu		サスペンド
+Hide clock	TimeView		時計を隠す
 Time preferences…	TimeView		日付と時刻の設定…
 About Haiku	DeskbarMenu		Haiku について
 Recent documents:	PreferencesWindow		最近使ったドキュメント
@@ -9,6 +10,7 @@ Recent applications	DeskbarMenu		最近使ったアプリケーション
 Sort running applications	PreferencesWindow		実行中のアプリケーションを名前順に並び換える
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		アプリケーション
 Find…	DeskbarMenu		検索…
+Show clock	Tray		時計を表示
 Window	PreferencesWindow		ウィンドウ
 Menu	PreferencesWindow		メニュー
 Recent documents	DeskbarMenu		最近使ったドキュメント
@@ -1,7 +1,8 @@
-1	polish	x-vnd.Be-TSKB	3155357024
+1	polish	x-vnd.Be-TSKB	1566009467
 Power off	DeskbarMenu		Wyłącz komputer
 Edit menu…	PreferencesWindow		Edytuj zawartość menu…
 Suspend	DeskbarMenu		Wstrzymaj
+Hide clock	TimeView		Ukryj zegar
 Time preferences…	TimeView		Ustawienia czasu...
 About Haiku	DeskbarMenu		O Haiku
 Recent documents:	PreferencesWindow		Ostatnio przeglądane dokumenty:
@@ -9,6 +10,7 @@ Recent applications	DeskbarMenu		Ostatnio uruchomione aplikacje
 Sort running applications	PreferencesWindow		Sortuj uruchomione aplikacje alfabetycznie
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		Aplikacje
 Find…	DeskbarMenu		Wyszukaj…
+Show clock	Tray		Pokaż zegar
 Window	PreferencesWindow		Położenie
 Menu	PreferencesWindow		Menu
 Recent documents	DeskbarMenu		Ostatnio otwarte dokumenty
@@ -1,7 +1,8 @@
-1	swedish	x-vnd.Be-TSKB	3155357024
+1	swedish	x-vnd.Be-TSKB	1566009467
 Power off	DeskbarMenu		Stäng av
 Edit menu…	PreferencesWindow		Redigera meny...
 Suspend	DeskbarMenu		Vänteläge
+Hide clock	TimeView		Dölj klockan
 Time preferences…	TimeView		Tidspreferenser
 About Haiku	DeskbarMenu		Om Haiku
 Recent documents:	PreferencesWindow		Senaste dokument:
@@ -9,6 +10,7 @@ Recent applications	DeskbarMenu		Senaste program
 Sort running applications	PreferencesWindow		Sortera aktiva program
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		Program
 Find…	DeskbarMenu		Sök...
+Show clock	Tray		Visa klockan
 Window	PreferencesWindow		Fönster
 Menu	PreferencesWindow		Meny
 Recent documents	DeskbarMenu		Senaste dokument
@@ -1,4 +1,4 @@
-1	belarusian	x-vnd.Haiku-DiskUsage	1726021626
+1	belarusian	x-vnd.Haiku-DiskUsage	2447717116
 Scanning %refName%	Scanner		Сканаванне %refName%
 Size	Info Window		Памер
 Rescan	Pie View		Перасканаваць
@@ -10,13 +10,11 @@ Path	Info Window		Пуць
 Scan	Status View		Скан
 9999.99 GB	Status View		9999.99 ГБ
 file unavailable	Status View		файл недаступны
-Get Info	Pie View		Узяць інфу
 DiskUsage	System name		Статыстыка дыскаў
 in %d files	Info Window		 ў %d файлах
 %d files	Status View		%d файлаў
 Created	Info Window		Створаны
 Modified	Info Window		Мадыфікаваны
 Open	Pie View		Адкрыць
-Open With	Pie View		Адкрыць з дапамогай
 %a, %d %b %Y, %r	Info Window		%a, %d %b %Y, %r
 Free on %refName%	Scanner		Вольна на %refName%
@@ -1,4 +1,4 @@
-1	german	x-vnd.Haiku-DiskUsage	3848101922
+1	german	x-vnd.Haiku-DiskUsage	274830116
 Scanning %refName%	Scanner		Analysiere %refName%
 Size	Info Window		Größe
 Rescan	Pie View		Erneut analysieren
@@ -11,7 +11,6 @@ Scan	Status View		Analyse
 9999.99 GB	Status View		9999,99 GiB
 Rescan	Status View		Erneut analysieren
 file unavailable	Status View		Datei nicht verfügbar
-Get Info	Pie View		Datei-Info
 DiskUsage	System name		Datenträgerbelegung
 in %d files	Info Window		in %d Dateien
 %d files	Status View		%d Dateien
@@ -19,6 +18,5 @@ Created	Info Window		Erstellt
 Modified	Info Window		Geändert
 Abort	Status View		Abbrechen
 Open	Pie View		Öffnen
-Open With	Pie View		Öffnen mit
 %a, %d %b %Y, %r	Info Window		%a, %d %b %Y, %r
 Free on %refName%	Scanner		Frei auf %refName%
@@ -1,4 +1,4 @@
-1	greek, modern (1453-)	x-vnd.Haiku-DiskUsage	1960660144
+1	greek, modern (1453-)	x-vnd.Haiku-DiskUsage	2682355634
 Scanning %refName%	Scanner		Σάρωση %refName%
 Size	Info Window		Μέγεθος
 Rescan	Pie View		Σάρωσε Ξανά
@@ -10,12 +10,10 @@ Path	Info Window		Διαδρομή
 Scan	Status View		Σάρωση
 9999.99 GB	Status View		9999.99 GB
 file unavailable	Status View		μη διαθέσιμο αρχείο
-Get Info	Pie View		Πάρε Πληροφορίες
 DiskUsage	System name		Χρήση Δίσκου
 %d files	Status View		%d αρχεία
 Created	Info Window		Δημιουργήθηκε
 Modified	Info Window		Τροποποιήθηκε
 Open	Pie View		Άνοιγμα
-Open With	Pie View		Άνοιγμα Με
 %a, %d %b %Y, %r	Info Window		%a, %d %b %Y, %r
 Free on %refName%	Scanner		Ελεύθερα στο %refName%
@@ -1,4 +1,4 @@
-1	finnish	x-vnd.Haiku-DiskUsage	3848101922
+1	finnish	x-vnd.Haiku-DiskUsage	274830116
 Scanning %refName%	Scanner		Tutkitaan %refName%
 Size	Info Window		Koko
 Rescan	Pie View		Tutki uudelleen
@@ -11,7 +11,6 @@ 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ö
 in %d files	Info Window		 %d tiedostossa
 %d files	Status View		%d tiedostoa
@@ -19,6 +18,5 @@ 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
 Free on %refName%	Scanner		Vapaata levyasemalla %refName%
@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-DiskUsage	3848101922
+1	french	x-vnd.Haiku-DiskUsage	274830116
 Scanning %refName%	Scanner		Examen de %refName%
 Size	Info Window		Taille
 Rescan	Pie View		Réexaminer
@@ -11,7 +11,6 @@ Scan	Status View		Examiner
 9999.99 GB	Status View		9999.99 Go
 Rescan	Status View		Réexaminer
 file unavailable	Status View		fichier indisponible
-Get Info	Pie View		Obtenir des informations
 DiskUsage	System name		Utilisation Disque
 in %d files	Info Window		 dans %d fichiers
 %d files	Status View		%d fichiers
@@ -19,6 +18,5 @@ Created	Info Window		Créé
 Modified	Info Window		Modifié
 Abort	Status View		Abandonner
 Open	Pie View		Ouvrir
-Open With	Pie View		Ouvrir avec
 %a, %d %b %Y, %r	Info Window		%a, %d %b %Y, %R
 Free on %refName%	Scanner		Libre sur %refName%
@@ -1,4 +1,4 @@
-1	hindi	x-vnd.Haiku-DiskUsage	1726021626
+1	hindi	x-vnd.Haiku-DiskUsage	2447717116
 Scanning %refName%	Scanner		अवलोकन कर रहा  है %refName%
 Size	Info Window		आकार
 Rescan	Pie View		पुनः अवलोकन करे
@@ -10,13 +10,11 @@ Path	Info Window		पथ
 Scan	Status View		अवलोकन करे
 9999.99 GB	Status View		9999.99 जीबी
 file unavailable	Status View		फ़ाइल अनुपलब्ध है
-Get Info	Pie View		जानकारी प्राप्त करें
 DiskUsage	System name		डिस्क का उपयोग
 in %d files	Info Window		 %d फ़ाइलो में
 %d files	Status View		%d फ़ाइल
 Created	Info Window		बनाया गया
 Modified	Info Window		संशोधित
 Open	Pie View		खोले
-Open With	Pie View		के साथ खोले
 %a, %d %b %Y, %r	Info Window		%a, %d %b %Y, %r
 Free on %refName%	Scanner		%refName% पर मुक्त
@@ -1,4 +1,4 @@
-1	hungarian	x-vnd.Haiku-DiskUsage	3848101922
+1	hungarian	x-vnd.Haiku-DiskUsage	274830116
 Scanning %refName%	Scanner		%refName% elemzése
 Size	Info Window		Méret
 Rescan	Pie View		Újraelemzés
@@ -11,7 +11,6 @@ Scan	Status View		Elemzés
 9999.99 GB	Status View		9999,99 GB
 Rescan	Status View		Újraelemzés
 file unavailable	Status View		fájl nem elérhető
-Get Info	Pie View		Információ
 DiskUsage	System name		Lemezhasználat
 in %d files	Info Window		%d fájlban.
 %d files	Status View		%d fájl
@@ -19,6 +18,5 @@ Created	Info Window		Létrehozva
 Modified	Info Window		Módosítva
 Abort	Status View		Megszakítás
 Open	Pie View		Megnyitás
-Open With	Pie View		Megnyitás ezzel
 %a, %d %b %Y, %r	Info Window		%a, %d %b %Y, %r
 Free on %refName%	Scanner		%refName% szabad területe
@@ -1,4 +1,4 @@
-1	japanese	x-vnd.Haiku-DiskUsage	3848101922
+1	japanese	x-vnd.Haiku-DiskUsage	274830116
 Scanning %refName%	Scanner		%refName%をスキャン中
 Size	Info Window		サイズ
 Rescan	Pie View		再スキャン
@@ -11,7 +11,6 @@ Scan	Status View		スキャン
 9999.99 GB	Status View		9999.99 GB
 Rescan	Status View		再スキャン
 file unavailable	Status View		利用できないファイル
-Get Info	Pie View		情報を表示
 DiskUsage	System name		DiskUsage
 in %d files	Info Window		%d 個のファイル中
 %d files	Status View		%d 個のファイル
@@ -19,6 +18,5 @@ Created	Info Window		作成日時
 Modified	Info Window		更新日時
 Abort	Status View		中断
 Open	Pie View		開く
-Open With	Pie View		アプリケーションで開く
 %a, %d %b %Y, %r	Info Window		%a, %d %b %Y, %r
 Free on %refName%	Scanner		%refName%の空き領域
@@ -1,4 +1,4 @@
-1	lithuanian	x-vnd.Haiku-DiskUsage	1726021626
+1	lithuanian	x-vnd.Haiku-DiskUsage	2447717116
 Scanning %refName%	Scanner		Žvalgomas skirsnis „%refName%“
 Size	Info Window		Dydis
 Rescan	Pie View		Peržvalgyti
@@ -10,13 +10,11 @@ Path	Info Window		Kelias
 Scan	Status View		Žvalgyti
 9999.99 GB	Status View		9999,99 GB
 file unavailable	Status View		failas nepasiekiamas
-Get Info	Pie View		Savybės
 DiskUsage	System name		Disko naudojimas
 in %d files	Info Window		%d failuose (-ų)
 %d files	Status View		%d failai (-ų)
 Created	Info Window		Sukurtas
 Modified	Info Window		Modifikuotas
 Open	Pie View		Atverti
-Open With	Pie View		Atverti naudojant
 %a, %d %b %Y, %r	Info Window		%a, %Y %b %d, %T
 Free on %refName%	Scanner		Laisva vieta skirsnyje „%refName%“
@@ -1,4 +1,4 @@
-1	dutch; flemish	x-vnd.Haiku-DiskUsage	1726021626
+1	dutch; flemish	x-vnd.Haiku-DiskUsage	2447717116
 Scanning %refName%	Scanner		%refName% scannen
 Size	Info Window		Grootte
 Rescan	Pie View		Opnieuw scannen
@@ -10,13 +10,11 @@ Path	Info Window		Pad
 Scan	Status View		Scannen
 9999.99 GB	Status View		9999.99 GB
 file unavailable	Status View		bestand niet beschikbaar
-Get Info	Pie View		Informatie krijgen
 DiskUsage	System name		DiskUsage
 in %d files	Info Window		in %d bestanden
 %d files	Status View		%d bestanden
 Created	Info Window		Gemaakt
 Modified	Info Window		Aangepast
 Open	Pie View		Openen
-Open With	Pie View		Openen Met
 %a, %d %b %Y, %r	Info Window		%a, %d %b %Y, %r
 Free on %refName%	Scanner		Vrij op %refName%
@@ -1,4 +1,4 @@
-1	polish	x-vnd.Haiku-DiskUsage	1726021626
+1	polish	x-vnd.Haiku-DiskUsage	274830116
 Scanning %refName%	Scanner		Skanowanie %refName%
 Size	Info Window		Rozmiar
 Rescan	Pie View		Przeskanuj
@@ -9,14 +9,14 @@ no supporting apps	Pie View		brak wspierających aplikacji
 Path	Info Window		Ścieżka
 Scan	Status View		Skanowanie
 9999.99 GB	Status View		9999.99 GB
+Rescan	Status View		Przeskanuj
 file unavailable	Status View		plik niedostępny
-Get Info	Pie View		Pobierz Informacje
 DiskUsage	System name		Wykorzystanie Dysku
 in %d files	Info Window		 w %d plikach
 %d files	Status View		%d plików
 Created	Info Window		Stworzony
 Modified	Info Window		Zmodyfikowany
+Abort	Status View		Przerwij
 Open	Pie View		Otwórz
-Open With	Pie View		Otwórz z
 %a, %d %b %Y, %r	Info Window		%a, %d %b %Y, %r
 Free on %refName%	Scanner		Wolne na %refName%
@@ -1,4 +1,4 @@
-1	portuguese (brazil)	x-vnd.Haiku-DiskUsage	3848101922
+1	portuguese (brazil)	x-vnd.Haiku-DiskUsage	274830116
 Scanning %refName%	Scanner		Analisando %refName%
 Size	Info Window		Tamanho
 Rescan	Pie View		ReAnalisar
@@ -11,7 +11,6 @@ Scan	Status View		Analisar
 9999.99 GB	Status View		9999.99 Gb
 Rescan	Status View		ReAnalisar
 file unavailable	Status View		arquivo não disponível
-Get Info	Pie View		Obter Informação
 DiskUsage	System name		Uso de Disco
 in %d files	Info Window		 em %d arquivos
 %d files	Status View		%d arquivos
@@ -19,6 +18,5 @@ Created	Info Window		Criado
 Modified	Info Window		Modificado
 Abort	Status View		Cancelar
 Open	Pie View		Abrir
-Open With	Pie View		Abrir Com
 %a, %d %b %Y, %r	Info Window		%a, %d %b %Y, %r
 Free on %refName%	Scanner		Livre em %refName%
@@ -1,4 +1,4 @@
-1	romanian	x-vnd.Haiku-DiskUsage	1960660144
+1	romanian	x-vnd.Haiku-DiskUsage	2682355634
 Scanning %refName%	Scanner		Se scanează %refName%
 Size	Info Window		Dimensiune
 Rescan	Pie View		Rescanează
@@ -10,12 +10,10 @@ Path	Info Window		Cale
 Scan	Status View		Scanează
 9999.99 GB	Status View		9999.99 GB
 file unavailable	Status View		fișier indisponibil
-Get Info	Pie View		Obține informații
 DiskUsage	System name		UtilizareDisc
 %d files	Status View		%d fișiere
 Created	Info Window		Creat
 Modified	Info Window		Modificat
 Open	Pie View		Deschide
-Open With	Pie View		Deschide cu
 %a, %d %b %Y, %r	Info Window		%a, %d %b %Y, %r
 Free on %refName%	Scanner		Liber pe %refName%
@@ -1,4 +1,4 @@
-1	russian	x-vnd.Haiku-DiskUsage	1726021626
+1	russian	x-vnd.Haiku-DiskUsage	2447717116
 Scanning %refName%	Scanner		Сканируется раздел %refName%
 Size	Info Window		Размер
 Rescan	Pie View		Пересканировать
@@ -10,13 +10,11 @@ Path	Info Window		Путь
 Scan	Status View		Сканировать
 9999.99 GB	Status View		9999.99 ГБ
 file unavailable	Status View		файл недоступен
-Get Info	Pie View		Информация
 DiskUsage	System name		Использование диска
 in %d files	Info Window		 в %d файлах
 %d files	Status View		%d файлов
 Created	Info Window		Создан
 Modified	Info Window		Изменен
 Open	Pie View		Открыть
-Open With	Pie View		Открыть в
 %a, %d %b %Y, %r	Info Window		%a, %d %b %Y, %r
 Free on %refName%	Scanner		Свободно на разделе %refName%
@@ -1,4 +1,4 @@
-1	slovak	x-vnd.Haiku-DiskUsage	1726021626
+1	slovak	x-vnd.Haiku-DiskUsage	2447717116
 Scanning %refName%	Scanner		Prehľadáva sa %refName%
 Size	Info Window		Veľkosť
 Rescan	Pie View		Znovu preskúmať
@@ -10,13 +10,11 @@ Path	Info Window		Cesta
 Scan	Status View		Preskúmať
 9999.99 GB	Status View		9999.99 GB
 file unavailable	Status View		súbor nedostupný
-Get Info	Pie View		Získať informácie
 DiskUsage	System name		Využitie disku
 in %d files	Info Window		 v %d súboroch
 %d files	Status View		%d súborov
 Created	Info Window		Vytvorené
 Modified	Info Window		Zmenené
 Open	Pie View		Otvoriť
-Open With	Pie View		Otvoriť pomocou
 %a, %d %b %Y, %r	Info Window		%a, %d %b %Y, %r
 Free on %refName%	Scanner		Voľné na %refName%
@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Haiku-DiskUsage	3848101922
+1	swedish	x-vnd.Haiku-DiskUsage	274830116
 Scanning %refName%	Scanner		Skannar %refName%
 Size	Info Window		Storlek
 Rescan	Pie View		Skanna om
@@ -11,7 +11,6 @@ Scan	Status View		Skanna
 9999.99 GB	Status View		9999.99 GB
 Rescan	Status View		Skanna om
 file unavailable	Status View		fil ej tillgänglig
-Get Info	Pie View		Visa information
 DiskUsage	System name		DiskAnvändning
 in %d files	Info Window		 i %d filer
 %d files	Status View		%d filer
@@ -19,6 +18,5 @@ Created	Info Window		Skapad
 Modified	Info Window		Modifierad
 Abort	Status View		Avbryt
 Open	Pie View		Öppna
-Open With	Pie View		Öppna med
 %a, %d %b %Y, %r	Info Window		%a, %d %b %Y, %r
 Free on %refName%	Scanner		Ledigt på %refName%
@@ -1,4 +1,4 @@
-1	ukrainian	x-vnd.Haiku-DiskUsage	1960660144
+1	ukrainian	x-vnd.Haiku-DiskUsage	2682355634
 Scanning %refName%	Scanner		Сканування %refName%
 Size	Info Window		Розмір
 Rescan	Pie View		Пересканувати
@@ -10,12 +10,10 @@ Path	Info Window		Шлях
 Scan	Status View		Сканувати
 9999.99 GB	Status View		9999.99 
 file unavailable	Status View		файл недоступний
-Get Info	Pie View		Інформація
 DiskUsage	System name		Використання дисків
 %d files	Status View		%d файлів
 Created	Info Window		Створено
 Modified	Info Window		Змінено
 Open	Pie View		Відкрити
-Open With	Pie View		Відкрити в
 %a, %d %b %Y, %r	Info Window		%a, %d %b %Y, %r
 Free on %refName%	Scanner		Вільно на %refName%
@@ -1,4 +1,4 @@
-1	english	x-vnd.Haiku-DiskUsage	1726021626
+1	english	x-vnd.Haiku-DiskUsage	2447717116
 Scanning %refName%	Scanner		扫描 %refName% 
 Size	Info Window		大小
 Rescan	Pie View		重新扫描
@@ -10,13 +10,11 @@ Path	Info Window		路径
 Scan	Status View		扫描
 9999.99 GB	Status View		9999.99 GB
 file unavailable	Status View		文件不可用
-Get Info	Pie View		获取信息
 DiskUsage	System name		磁盘查看器
 in %d files	Info Window		位于 %d 个文件
 %d files	Status View		%d 文件
 Created	Info Window		已创建
 Modified	Info Window		已修改
 Open	Pie View		打开
-Open With	Pie View		打开方式
 %a, %d %b %Y, %r	Info Window		%a, %d %b %Y, %r
 Free on %refName%	Scanner		空闲存在 %refName%
@@ -1,4 +1,4 @@
-1	polish	x-vnd.Haiku-DriveSetup	3746427159
+1	polish	x-vnd.Haiku-DriveSetup	1372142450
 DriveSetup	System name		DriveSetup
 Delete	MainWindow		Usuń
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so!	MainWindow		Na pewno chcesz zapisać zmiany na dysk?\n\nWszystkie dane na wybranej partycji bedą bezpowrotnie utracone!
@@ -65,6 +65,7 @@ Partition	MainWindow		Partycja
 File system	PartitionList		System plików
 Validation of the given creation parameters failed.	MainWindow		Sprawdzenie poprawności parametrów tworzenia partycji nie powiodło się.
 Size	PartitionList		Rozmiar
+Wipe (not implemented)	MainWindow		Wyczyść (nie zaimplementowane)
 Validation of the given initialization parameters failed.	MainWindow		Sprawdzenie poprawności parametrów inicjalizacji nie powiodło się.
 The selected partition does not contain a partitioning system.	MainWindow		Wybrana partycja nie posiada systemu partycjonowania.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so!	MainWindow		Czy na pewno chcesz zapisać zmiany na dysk?\n\nWszystkie dane na partycji %s zostaną utracone!
@@ -1,4 +1,4 @@
-1	polish	x-vnd.Haiku-Expander	282517174
+1	polish	x-vnd.Haiku-Expander	2603318510
 Expand	ExpanderMenu		Rozpakuj
 Close window when done expanding	ExpanderPreferences		Zamknij okno po zakończeniu rozpakowywania
 Set destination…	ExpanderMenu		Wybierz miejsce docelowe…
@@ -22,6 +22,7 @@ Cancel	ExpanderPreferences		Anuluj
 Expansion	ExpanderPreferences		Rozpakowywanie
 Are you sure you want to stop expanding this\narchive? The expanded items may not be complete.	ExpanderWindow		Czy na pewno chcesz przerwać rozpakowywanie?\nRozpakowane dane będą najprawdopodobniej niekompletne.
 Select	DirectoryFilePanel		Wybierz
+Destination folder doesn't exist. Would you like to create it?	ExpanderWindow		Katalog docelowy  nie istnieje. Czy chcesz go utworzyć?
 Same directory as source (archive) file	ExpanderPreferences		Ten sam katalog co w plik w archiwum źródłowym
 Expanding '%s'	ExpanderWindow		Rozpakowywanie '%s'
 Settings	ExpanderMenu		Ustawienia
@@ -32,6 +33,8 @@ Show contents	ExpanderWindow		Pokaż zawartość
 Automatically show contents listing	ExpanderPreferences		Automatycznie pokazuje listę zawartości
 OK	ExpanderPreferences		OK
 Leave destination folder path empty	ExpanderPreferences		Pozostaw katalog docelowy pusty
+Failed to create the destination folder.	ExpanderWindow		Nie udało się utworzyć katalogu docelowego.
+Create	ExpanderWindow		Utwórz
 The folder was either moved, renamed or not\nsupported.	ExpanderWindow		Katalog został albo przeniesiony albo przemianowany,\nlub nie jest wspierane.
 The file doesn't exist	ExpanderWindow		Plik nie istnieje
 Stop	ExpanderMenu		Zatrzymaj
@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Haiku-Expander	282517174
+1	swedish	x-vnd.Haiku-Expander	2603318510
 Expand	ExpanderMenu		Expandera
 Close window when done expanding	ExpanderPreferences		Stäng fönstret när expandering är klar
 Set destination…	ExpanderMenu		Ange mål…
@@ -22,6 +22,7 @@ Cancel	ExpanderPreferences		Avbryt
 Expansion	ExpanderPreferences		Expansion
 Are you sure you want to stop expanding this\narchive? The expanded items may not be complete.	ExpanderWindow		Är du säker på att du vill sluta expandera det här\narkivet? De expanderade objekten kan vara inkompletta.
 Select	DirectoryFilePanel		Välj
+Destination folder doesn't exist. Would you like to create it?	ExpanderWindow		Målmappen finns inte. Vill du skapa den?
 Same directory as source (archive) file	ExpanderPreferences		Samma mapp som arkivfilen
 Expanding '%s'	ExpanderWindow		Expanderar '%s'
 Settings	ExpanderMenu		Inställningar
@@ -32,6 +33,8 @@ Show contents	ExpanderWindow		Visa innehåll
 Automatically show contents listing	ExpanderPreferences		Automatiskt visa list innehåll
 OK	ExpanderPreferences		OK
 Leave destination folder path empty	ExpanderPreferences		Lämna destinations folder tom
+Failed to create the destination folder.	ExpanderWindow		Kunde inte skapa målmappen.
+Create	ExpanderWindow		Skapa
 The folder was either moved, renamed or not\nsupported.	ExpanderWindow		Foldern har antingen flyttats, omdöpt eller\nsupporteras inte.
 The file doesn't exist	ExpanderWindow		Filen finns inte
 Stop	ExpanderMenu		Stopp
@@ -1,4 +1,4 @@
-1	german	x-vnd.Be-MAIL	1599879742
+1	german	x-vnd.Be-MAIL	2319898213
 View	Mail		Ansicht
 %d - Date	Mail		%d - Datum
 Attach attributes:	Mail		Attribute von Anhängen:
@@ -10,6 +10,7 @@ Edit	Mail		Bearbeiten
 Print	Mail		Drucken
 <none>	Mail		<kein>
 New mail message	Mail		Nachricht verfassen
+Untitled	Mail		Unbenannt
 Automatic	Mail		Automatisch
 Automatically mark mail as read:	Mail		Nachrichten automatisch als gelesen markieren:
 helpful message	Mail		Tipp
@@ -1,4 +1,4 @@
-1	hungarian	x-vnd.Be-MAIL	1599879742
+1	hungarian	x-vnd.Be-MAIL	2319898213
 View	Mail		Nézet
 %d - Date	Mail		%d - dátum
 Attach attributes:	Mail		Jellemzők csatolása:
@@ -10,6 +10,7 @@ Edit	Mail		Szerkesztés
 Print	Mail		Nyomtatás
 <none>	Mail		<nincs>
 New mail message	Mail		Új levél írása
+Untitled	Mail		Névtelen
 Automatic	Mail		Automatikus
 Automatically mark mail as read:	Mail		Automatikusan olvasottként jelölés:
 helpful message	Mail		segítőkész üzenet
@@ -1,4 +1,4 @@
-1	japanese	x-vnd.Be-MAIL	1599879742
+1	japanese	x-vnd.Be-MAIL	2319898213
 View	Mail		表示
 %d - Date	Mail		%d - 日付
 Attach attributes:	Mail		属性の添付：
@@ -10,6 +10,7 @@ Edit	Mail		編集
 Print	Mail		印刷
 <none>	Mail		<無し>
 New mail message	Mail		新規メッセージ
+Untitled	Mail		無題
 Automatic	Mail		自動
 Automatically mark mail as read:	Mail		メールを自動的に既読に設定：
 helpful message	Mail		有益なメッセージ
@@ -1,4 +1,4 @@
-1	polish	x-vnd.Be-MAIL	3337401776
+1	polish	x-vnd.Be-MAIL	4057420247
 View	Mail		Widok
 %d - Date	Mail		%d - Data
 Attach attributes:	Mail		Dołączaj atrybuty:
@@ -10,6 +10,7 @@ Edit	Mail		Edycja
 Print	Mail		Drukuj
 <none>	Mail		<brak>
 New mail message	Mail		Nowa wiadomość
+Untitled	Mail		Bez tytułu
 Automatic	Mail		Automatyczne
 Automatically mark mail as read:	Mail		Automatycznie oznacz wiadomość jako przeczytaną:
 helpful message	Mail		pomocna wiadomość
@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Be-MAIL	3771627078
+1	swedish	x-vnd.Be-MAIL	196678253
 View	Mail		Visa
 %d - Date	Mail		%d - Datum
 Attach attributes:	Mail		Bifoga attribut:
@@ -10,6 +10,7 @@ Edit	Mail		Redigera
 Print	Mail		Skriv ut
 <none>	Mail		<ingen>
 New mail message	Mail		Nytt e-post-meddelande
+Untitled	Mail		Namnlös
 Automatic	Mail		Automatiskt
 Automatically mark mail as read:	Mail		Markera brev som lästa:
 helpful message	Mail		hjälpsamt meddelande
@@ -1,4 +1,4 @@
-1	polish	x-vnd.Haiku-MediaPlayer	4127722853
+1	polish	x-vnd.Haiku-MediaPlayer	2969013755
 raw audio	MediaPlayer-InfoWin		czysty dźwięk
 Location	MediaPlayer-InfoWin		Położenie
 1.85 : 1 (American)	MediaPlayer-Main		1.85 : 1 (amerykańskie)
@@ -72,6 +72,7 @@ Stop playing.	MediaPlayer-Main		Zatrzymaj odtwarzanie.
 The file '%filename' could not be opened.\n\n	MediaPlayer-Main		Plik '%filename' nie może być otwarty.\n\n
 Error: 	MediaPlayer-RemovePLItemsCmd		Błąd: 
 Audio	MediaPlayer-InfoWin		Dźwięk
+Move into trash error	MediaPlayer-RemovePLItemsCmd		Błąd przenoszenia do kosza
 Internal error (malformed message). Saving the playlist failed.	MediaPlayer-PlaylistWindow		Błąd wewnętrzny (nieprawidłowa wiadomość). Zapisywanie listy odtwarzania nie powiodło się.
 Skip to the previous track.	MediaPlayer-Main		Przeskocz do poprzedniego utworu.
 %app% encountered an internal error. The file could not be opened.	MediaPlayer-Main		Wystąpił błąd wewnętrzny w %app%. Plik nie mógł zostać otwarty.
@@ -1,4 +1,4 @@
-1	german	x-vnd.Haiku-StyledEdit	3417936913
+1	german	x-vnd.Haiku-StyledEdit	1195515839
 StyledEdit	System name		Texteditor
 Paste	Menus		Einfügen
 OK	LoadAlert		OK
@@ -19,12 +19,15 @@ 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
+Reload	NodeMonitorAlerts		Neu laden
 Yellow	Menus		Gelb
 Replace in all windows	FindandReplaceWindow		In allen Fenstern ersetzen
 Wrap lines	Menus		Zeilenumbruch
 Quit	Menus		Beenden
+File \"%file%\" was removed by another application, recover it?	NodeMonitorAlerts		Die Datei \"%file%\" wurde von einer anderen Anwendung entfernt. Soll sie wiederhergestellt werden?
 Document statistics	Statistics		Dokument-Statistik
 Cancel	RevertToSavedAlert		Abbrechen
+Autodetect	Menus		Automatisch
 Document	Menus		Dokument
 Save changes to the document \"%s\"? 	QuitAlert		Änderungen an Dokument \"%s\" speichern? 
 Edit	Menus		Bearbeiten
@@ -33,7 +36,9 @@ Replace all	FindandReplaceWindow		Alle ersetzen
 Statistics…	Menus		Statistik…
 Default	Open_and_SaveAsPanel		Standard
 Replace next	Menus		Weiter ersetzen
+\"%s\" has unsaved changes.\nRevert it to the last saved version? 	RevertToSavedAlert		\"%s\" enthält ungespeicherte Änderungen.\nZuletzt gespeicherte Version wiederherstellen?
 Cancel	FindandReplaceWindow		Abbrechen
+Text encoding	Menus		Zeichenkodierung
 Close	Menus		Schließen
 Save	SaveAlert		Speichern
 Words:	Statistics		Wörter:
@@ -57,13 +62,16 @@ Find:	FindandReplaceWindow		Suche:
 Error saving \"%s\":\n%s	SaveAlert		Fehler beim Speichern von "%s":\n%s
 Copy	Menus		Kopieren
 Cut	Menus		Ausschneiden
+File \"%file%\" was modified by another application, reload it?	NodeMonitorAlerts		Die Datei \"%file%\" wurde von einer anderen Anwendung verändert.\nSoll sie neu geladen werden?
 Replace	FindandReplaceWindow		Ersetzen
 Find again	Menus		Weitersuchen
 Cancel	QuitAlert		Abbrechen
 Find…	Menus		Suchen…
 Select all	Menus		Alles auswählen
 Don't save	SaveAlert		Verwerfen
+Recover	NodeMonitorAlerts		Wiederherstellen
 Error loading \"%s\":\n\t%s	LoadAlert		Fehler beim Laden von "%s":\n\t%s
+Ignore	NodeMonitorAlerts		Ignorieren
 Undo typing	QuitAlert		Rückgängig: Eingabe
 This file is marked Read-Only. Save changes to the document \"%s\"? 	SaveAlert		Diese Datei ist als schreibgeschützt gekennzeichnet. Änderungen am Dokument \"%s\" speichern?
 Black	Menus		Schwarz
@@ -74,5 +82,6 @@ Encoding	Open_and_SaveAsPanel		Kodierung
 Characters:	Statistics		Zeichen:
 Save as…	Menus		Speichern unter…
 Redo typing	QuitAlert		Wiederholen: Eingabe
+Reload…	Menus		Neu laden…
 Replace…	Menus		Ersetzen…
 Right	Menus		Rechts
@@ -1,4 +1,4 @@
-1	hungarian	x-vnd.Haiku-StyledEdit	3417936913
+1	hungarian	x-vnd.Haiku-StyledEdit	1195515839
 StyledEdit	System name		StyledEdit
 Paste	Menus		Beillesztés
 OK	LoadAlert		Rendben
@@ -19,12 +19,15 @@ 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
+Reload	NodeMonitorAlerts		Újratöltés
 Yellow	Menus		Sárga
 Replace in all windows	FindandReplaceWindow		Cserélje minden ablakban
 Wrap lines	Menus		Sortörés
 Quit	Menus		Kilépés
+File \"%file%\" was removed by another application, recover it?	NodeMonitorAlerts		A fájlt (%file%) egy másik program törölte. Helyre szeretné állítani?
 Document statistics	Statistics		Dokumentum statisztika
 Cancel	RevertToSavedAlert		Mégse
+Autodetect	Menus		Automatikus felismerés
 Document	Menus		Dokumentum
 Save changes to the document \"%s\"? 	QuitAlert		Menti a dokumentum (%s) változtatásait? 
 Edit	Menus		Szerkesztés
@@ -33,7 +36,9 @@ Replace all	FindandReplaceWindow		Mindet cseréli
 Statistics…	Menus		Statisztika…
 Default	Open_and_SaveAsPanel		Alapértelmett
 Replace next	Menus		Következő cseréje
+\"%s\" has unsaved changes.\nRevert it to the last saved version? 	RevertToSavedAlert		A fájlban (%s) történt módosítások még nincsenek mentve.\nVissza szeretné állítani a legutóbbi mentett verziót?
 Cancel	FindandReplaceWindow		Mégse
+Text encoding	Menus		Szöveg kódolása
 Close	Menus		Bezárás
 Save	SaveAlert		Mentés
 Words:	Statistics		Szó:
@@ -57,13 +62,16 @@ Find:	FindandReplaceWindow		Keresés:
 Error saving \"%s\":\n%s	SaveAlert		Hiba történt a mentés (%s) közben:\n\t%s
 Copy	Menus		Másolás
 Cut	Menus		Kivágás
+File \"%file%\" was modified by another application, reload it?	NodeMonitorAlerts		A fájlt (%file") egy másik program módosította. Újratöltsem?
 Replace	FindandReplaceWindow		Cserél
 Find again	Menus		Keresés újra
 Cancel	QuitAlert		Mégse
 Find…	Menus		Keresés…
 Select all	Menus		Összes kijelölése
 Don't save	SaveAlert		Ne mentsen
+Recover	NodeMonitorAlerts		Helyreállítás
 Error loading \"%s\":\n\t%s	LoadAlert		Hiba történt a betöltés (%s) közben:\n\t%s
+Ignore	NodeMonitorAlerts		Mellőzés
 Undo typing	QuitAlert		Gépelés visszavonása
 This file is marked Read-Only. Save changes to the document \"%s\"? 	SaveAlert		Ez a fájl írásvédett. Menti dokumentum (%s) változtatásait? 
 Black	Menus		Fekete
@@ -74,5 +82,6 @@ Encoding	Open_and_SaveAsPanel		Kódolás
 Characters:	Statistics		Karakter:
 Save as…	Menus		Mentés másként…
 Redo typing	QuitAlert		Újragépelés
+Reload…	Menus		Újratöltés…
 Replace…	Menus		Csere…
 Right	Menus		Jobbra
@@ -1,4 +1,4 @@
-1	japanese	x-vnd.Haiku-StyledEdit	3417936913
+1	japanese	x-vnd.Haiku-StyledEdit	1195515839
 StyledEdit	System name		StyledEdit
 Paste	Menus		貼り付け
 OK	LoadAlert		OK
@@ -19,12 +19,15 @@ Cancel	SaveAlert		中止
 Cannot revert, file not found: \"%s\".	RevertToSavedAlert		\"%s\" ファイルが存在しないため、読み込めませんでした。
 Case-sensitive	FindandReplaceWindow		大文字と小文字を区別する
 Green	Menus		緑
+Reload	NodeMonitorAlerts		再読み込み
 Yellow	Menus		黄
 Replace in all windows	FindandReplaceWindow		すべてのウィンドウで置換
 Wrap lines	Menus		ワードラップ
 Quit	Menus		終了
+File \"%file%\" was removed by another application, recover it?	NodeMonitorAlerts		ファイル \"%file%\" はほかのアプリケーションにより削除されました。回復しますか?
 Document statistics	Statistics		ドキュメント統計
 Cancel	RevertToSavedAlert		中止
+Autodetect	Menus		自動判別
 Document	Menus		ドキュメント
 Save changes to the document \"%s\"? 	QuitAlert		\"%s\" が変更されましたが、保存されていません。終了前に保存しますか?
 Edit	Menus		編集
@@ -33,7 +36,9 @@ Replace all	FindandReplaceWindow		すべて置換
 Statistics…	Menus		統計…
 Default	Open_and_SaveAsPanel		デフォルト
 Replace next	Menus		次を置換
+\"%s\" has unsaved changes.\nRevert it to the last saved version? 	RevertToSavedAlert		\"%s\" に保存されていない変更があります。\n保存された版まで戻しますか? 
 Cancel	FindandReplaceWindow		中止
+Text encoding	Menus		テキストのエンコーディング
 Close	Menus		閉じる
 Save	SaveAlert		保存
 Words:	Statistics		単語数:
@@ -57,13 +62,16 @@ Find:	FindandReplaceWindow		検索：
 Error saving \"%s\":\n%s	SaveAlert		\"%s\" を保存中エラーが発生しました：\n%s
 Copy	Menus		コピー
 Cut	Menus		切り取り
+File \"%file%\" was modified by another application, reload it?	NodeMonitorAlerts		ファイル \"%file%\" はほかのアプリケーションにより変更されています。再読み込みしますか?
 Replace	FindandReplaceWindow		置換
 Find again	Menus		次を検索
 Cancel	QuitAlert		中止
 Find…	Menus		検索…
 Select all	Menus		すべて選択
 Don't save	SaveAlert		保存しない
+Recover	NodeMonitorAlerts		回復
 Error loading \"%s\":\n\t%s	LoadAlert		\"%s\" を読み込み中にエラー発生：\n\t%s
+Ignore	NodeMonitorAlerts		無視
 Undo typing	QuitAlert		元に戻す
 This file is marked Read-Only. Save changes to the document \"%s\"? 	SaveAlert		このファイルは読み取り専用です。変更を\"%s\"ドキュメントに保存しますか？
 Black	Menus		黒
@@ -74,5 +82,6 @@ Encoding	Open_and_SaveAsPanel		文字コード
 Characters:	Statistics		文字数:
 Save as…	Menus		名前を付けて保存…
 Redo typing	QuitAlert		やり直し
+Reload…	Menus		再読み込み…
 Replace…	Menus		置換…
 Right	Menus		右揃え
@@ -1,4 +1,4 @@
-1	polish	x-vnd.Haiku-StyledEdit	3417936913
+1	polish	x-vnd.Haiku-StyledEdit	1195515839
 StyledEdit	System name		StyledEdit
 Paste	Menus		Wklej
 OK	LoadAlert		OK
@@ -19,12 +19,15 @@ 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
+Reload	NodeMonitorAlerts		Wczytaj ponownie
 Yellow	Menus		Żółty
 Replace in all windows	FindandReplaceWindow		Zamień we wszystkich oknach
 Wrap lines	Menus		Zawijaj wiersze
 Quit	Menus		Wyjdź
+File \"%file%\" was removed by another application, recover it?	NodeMonitorAlerts		Plik \"%file%\" został usunięty przez inny program. Czy chcesz go przywrócić?
 Document statistics	Statistics		Statystyki dokumentu
 Cancel	RevertToSavedAlert		Anuluj
+Autodetect	Menus		Autodetekcja
 Document	Menus		Dokument
 Save changes to the document \"%s\"? 	QuitAlert		Zapisać zmiany w dokumencie \"%s\"? 
 Edit	Menus		Edytuj
@@ -33,7 +36,9 @@ Replace all	FindandReplaceWindow		Zamień wszystkie
 Statistics…	Menus		Statystyki…
 Default	Open_and_SaveAsPanel		Domyślne
 Replace next	Menus		Zamień następne
+\"%s\" has unsaved changes.\nRevert it to the last saved version? 	RevertToSavedAlert		\"%s\" ma niezapisane zmiany.\nCzy przywrócić ostatnią zapisaną wersję? 
 Cancel	FindandReplaceWindow		Anuluj
+Text encoding	Menus		Kodowanie tekstu
 Close	Menus		Zamknij
 Save	SaveAlert		Zapisz
 Words:	Statistics		Słów:
@@ -57,13 +62,16 @@ Find:	FindandReplaceWindow		Znajdź:
 Error saving \"%s\":\n%s	SaveAlert		Błąd podczas zapisywania \"%s\":\n%s
 Copy	Menus		Kopiuj
 Cut	Menus		Wytnij
+File \"%file%\" was modified by another application, reload it?	NodeMonitorAlerts		Plik \"%file%\" został zmieniony przez inny program. Czy wczytać go ponownie?
 Replace	FindandReplaceWindow		Zamień
 Find again	Menus		Znajdź następne
 Cancel	QuitAlert		Anuluj
 Find…	Menus		Znajdź…
 Select all	Menus		Zaznacz wszystko
 Don't save	SaveAlert		Nie zapisuj
+Recover	NodeMonitorAlerts		Odzyskaj
 Error loading \"%s\":\n\t%s	LoadAlert		Błąd podczas ładowania \"%s\":\n\t%s
+Ignore	NodeMonitorAlerts		Ignoruj
 Undo typing	QuitAlert		Cofnij pisanie
 This file is marked Read-Only. Save changes to the document \"%s\"? 	SaveAlert		Ten plik jest oznaczony jako tylko do odczytu. Zapisać zmiany w dokumencie \"%s\"? 
 Black	Menus		Czarny
@@ -74,5 +82,6 @@ Encoding	Open_and_SaveAsPanel		Kodowanie
 Characters:	Statistics		Znaków:
 Save as…	Menus		Zapisz jako…
 Redo typing	QuitAlert		Powtórz pisanie
+Reload…	Menus		Wczytaj ponownie…
 Replace…	Menus		Zastąp…
 Right	Menus		Prawo
@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Haiku-StyledEdit	3417936913
+1	swedish	x-vnd.Haiku-StyledEdit	1195515839
 StyledEdit	System name		SkrivStiligt
 Paste	Menus		Klistra in
 OK	LoadAlert		OK
@@ -19,12 +19,15 @@ 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
+Reload	NodeMonitorAlerts		Uppdatera
 Yellow	Menus		Gul
 Replace in all windows	FindandReplaceWindow		Ersätt i alla fönster
 Wrap lines	Menus		Bryt rader
 Quit	Menus		Avsluta
+File \"%file%\" was removed by another application, recover it?	NodeMonitorAlerts		Filen \"%file%\" blev bortplockad av ett annat program. Vill du plocka tillbaka den?
 Document statistics	Statistics		Dokumentstatistik
 Cancel	RevertToSavedAlert		Avbryt
+Autodetect	Menus		Identifiera automatiskt
 Document	Menus		Dokument
 Save changes to the document \"%s\"? 	QuitAlert		Spara ändringar till dokumentet "%s"? 
 Edit	Menus		Redigera
@@ -33,7 +36,9 @@ Replace all	FindandReplaceWindow		Ersätt alla
 Statistics…	Menus		Statistik...
 Default	Open_and_SaveAsPanel		Standard
 Replace next	Menus		Ersätt nästa
+\"%s\" has unsaved changes.\nRevert it to the last saved version? 	RevertToSavedAlert		\"%s\" har osparade ändringar.\nVill du ångra och återgå till senast sparade versionen?
 Cancel	FindandReplaceWindow		Avbryt
+Text encoding	Menus		Textkodning
 Close	Menus		Stäng
 Save	SaveAlert		Spara
 Words:	Statistics		Ord:
@@ -57,13 +62,16 @@ Find:	FindandReplaceWindow		Sök:
 Error saving \"%s\":\n%s	SaveAlert		Kunde inte spara "%s":\n%s
 Copy	Menus		Kopiera
 Cut	Menus		Klipp ut
+File \"%file%\" was modified by another application, reload it?	NodeMonitorAlerts		Filen \"%file%\" blev modifierad av ett annat program. Vill du laddaom programmet?
 Replace	FindandReplaceWindow		Ersätt
 Find again	Menus		Sök igen
 Cancel	QuitAlert		Avbryt
 Find…	Menus		Sök…
 Select all	Menus		Markera allt
 Don't save	SaveAlert		Spara inte
+Recover	NodeMonitorAlerts		Återskapa
 Error loading \"%s\":\n\t%s	LoadAlert		Fel vid inläsning "%s":\n\t%s
+Ignore	NodeMonitorAlerts		Ignorera
 Undo typing	QuitAlert		Ångra inmatning
 This file is marked Read-Only. Save changes to the document \"%s\"? 	SaveAlert		Denna fil är markerad som endast läsbar. Vill du spara ändringarna till dokumentet "%s"?
 Black	Menus		Svart
@@ -74,5 +82,6 @@ Encoding	Open_and_SaveAsPanel		Kodning
 Characters:	Statistics		Tecken:
 Save as…	Menus		Spara som...
 Redo typing	QuitAlert		Gör om inmatning
+Reload…	Menus		Uppdatera
 Replace…	Menus		Ersätt…
 Right	Menus		Höger
@@ -1,7 +1,9 @@
-1	german	x-vnd.Haiku-Terminal	1724034391
+1	german	x-vnd.Haiku-Terminal	3561344903
 Not found.	Terminal TermWindow		Nicht gefunden.
 Switch Terminals	Terminal TermWindow		Terminals wechseln
 Change directory	Terminal TermView		Zum Ordner wechseln
+Cursor	Terminal AppearancePrefView		Cursor
+Professional	Terminal colors scheme		Professional
 OK	Terminal TermWindow		OK
 New Terminal	Terminal TermWindow		Neues Terminal
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Das Terminal konnte die Konsole leider nicht starten.
@@ -66,6 +68,7 @@ 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
+Text under cursor	Terminal AppearancePrefView		Text unter Cursor
 Midnight	Terminal colors scheme		Mitternacht
 Decrease	Terminal TermWindow		Verkleinern
 Default	Terminal colors scheme		Standard
@@ -1,7 +1,8 @@
-1	hungarian	x-vnd.Haiku-Terminal	4226482962
+1	hungarian	x-vnd.Haiku-Terminal	3561344903
 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
+Cursor	Terminal AppearancePrefView		Kurzor
 Professional	Terminal colors scheme		Professzionális
 OK	Terminal TermWindow		Rendben
 New Terminal	Terminal TermWindow		Új terminál
@@ -67,6 +68,7 @@ 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
+Text under cursor	Terminal AppearancePrefView		Kurzor alatti szöveg
 Midnight	Terminal colors scheme		Éjfél
 Decrease	Terminal TermWindow		Csökkentés
 Default	Terminal colors scheme		Eredeti
@@ -1,7 +1,8 @@
-1	japanese	x-vnd.Haiku-Terminal	4226482962
+1	japanese	x-vnd.Haiku-Terminal	3561344903
 Not found.	Terminal TermWindow		これ以上見つかりません。
 Switch Terminals	Terminal TermWindow		ターミナルを切替える
 Change directory	Terminal TermView		ディレクトリを変更
+Cursor	Terminal AppearancePrefView		カーソル
 Professional	Terminal colors scheme		プロフェッショナル
 OK	Terminal TermWindow		OK
 New Terminal	Terminal TermWindow		新しいターミナルを開く
@@ -67,6 +68,7 @@ New tab	Terminal TermWindow		新しいタブ
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		パターンはタブタイトルを指定します。次のプレースホルダーが\n使用できます:\n
 Selected background	Terminal AppearancePrefView		選択されたテキストの背景
 Slate	Terminal colors scheme		スレート
+Text under cursor	Terminal AppearancePrefView		カーソル位置の文字
 Midnight	Terminal colors scheme		ミッドナイト
 Decrease	Terminal TermWindow		小さく
 Default	Terminal colors scheme		デフォルト
@@ -1,7 +1,9 @@
-1	polish	x-vnd.Haiku-Terminal	2912171349
+1	polish	x-vnd.Haiku-Terminal	1935314925
 Not found.	Terminal TermWindow		Nie znaleziono.
 Switch Terminals	Terminal TermWindow		Przełącz Terminal
 Change directory	Terminal TermView		Zmień folder
+Cursor	Terminal AppearancePrefView		Kursor
+Professional	Terminal colors scheme		Profesjonalny
 OK	Terminal TermWindow		OK
 New Terminal	Terminal TermWindow		Nowy Terminal
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Terminal nie może uruchomić shella. Przepraszamy.
@@ -19,8 +21,11 @@ Font:	Terminal AppearancePrefView		Czcionka:
 Copy here	Terminal TermView		Kopiuj tutaj
 Really close?	Terminal TermWindow		Na pewno zamknąć?
 Copy	Terminal TermWindow		Kopiuj
+Color scheme:	Terminal AppearancePrefView		Schemat kolorów:
 Window title:	Terminal TermWindow		Tytuł okna:
 Unrecognized option \"%s\"\n	Terminal arguments parsing		Nieznana opcja \"%s\"\n
+Blue	Terminal colors scheme		Niebieski
+Custom	Terminal colors scheme		Niestandardowe
 %app% settings	Terminal PrefWindow	window title	Ustawienia %app%
 Cancel	Terminal SetTitleWindow		Anuluj
 Increase	Terminal TermWindow		Powiększ
@@ -44,6 +49,8 @@ The following processes are still running:\n\n\t%1\n\nIf you close the Terminal,
 Insert path	Terminal TermView		Wstaw ścieżkę
 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 i Takashi Murai.\n\nUżycie: %s [OPTION] [SHELL]\n
 No search string was entered.	Terminal TermWindow		Nie podano ciągu znaków do wyszukania.
+Font size	Terminal TermWindow		Rozmiar czcionki
+Blinking cursor	Terminal AppearancePrefView		Migający kursor
 Don't save	Terminal PrefWindow		Nie zapisuj
 Set window title	Terminal TermWindow		Ustaw tytuł okna
 Terminal	System name		Terminal
@@ -55,11 +62,15 @@ Find…	Terminal TermWindow		Znajdź…
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Proces \"%1\" jest wciąż w użyciu.\nJeśli zamkniesz terminal, proces zostanie zatrzymany.
 Move here	Terminal TermView		Przenieś tutaj
 \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Ścieżka dostępu do aktywnych procesów w\n\t\t\taktywnej karcie. Opcjonalnie maksymalna liczba komponentów ścieżek która\n\t\t\tmoże zostać ustalona. Np. '%2d' dla maksymalnie dwóch komponentów.\n\t%i\t-\tIndeks okna.\n\t%p\t-\tNazwa aktywnego procesu w aktywnej karcie.\n\t%t\t-\tNazwa aktywnej karty.\n\t%%\t-\tZnak '%'.
+Retro	Terminal colors scheme		Retro
 Error!	Terminal getString		Błąd!
 New tab	Terminal TermWindow		Nowa karta
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Wzór ustalający tytuły kart. Następujące wyznaczniki\nmogą zostać użyte:\n
 Selected background	Terminal AppearancePrefView		Wybrane tło
+Slate	Terminal colors scheme		Ciemnopopielaty
+Text under cursor	Terminal AppearancePrefView		Tekst pod kursorem
 Decrease	Terminal TermWindow		Zmniejsz
+Default	Terminal colors scheme		Domyślny
 Create link here	Terminal TermView		Utwórz link tutaj
 Close	Terminal TermWindow		Zamknij
 Text	Terminal AppearancePrefView		Tekst
@@ -1,7 +1,9 @@
-1	swedish	x-vnd.Haiku-Terminal	1829613568
+1	swedish	x-vnd.Haiku-Terminal	2178478404
 Not found.	Terminal TermWindow		Hittades ej.
 Switch Terminals	Terminal TermWindow		Växla terminal
 Change directory	Terminal TermView		Byt katalog
+Cursor	Terminal AppearancePrefView		Markör
+Professional	Terminal colors scheme		Professionell
 OK	Terminal TermWindow		OK
 New Terminal	Terminal TermWindow		Ny terminal
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Terminalen kunde inte starta skalet.
@@ -19,8 +21,11 @@ Font:	Terminal AppearancePrefView		Typsnitt:
 Copy here	Terminal TermView		Kopiera hit
 Really close?	Terminal TermWindow		Vill du stänga?
 Copy	Terminal TermWindow		Kopiera
+Color scheme:	Terminal AppearancePrefView		Färgschema:
 Window title:	Terminal TermWindow		Fönstertitel:
 Unrecognized option \"%s\"\n	Terminal arguments parsing		Okänt alternativ \"%s\"\n
+Blue	Terminal colors scheme		Blå
+Custom	Terminal colors scheme		Anpassad
 %app% settings	Terminal PrefWindow	window title	%app% inställningar
 Cancel	Terminal SetTitleWindow		Avbryt
 Increase	Terminal TermWindow		Öka
@@ -44,6 +49,7 @@ The following processes are still running:\n\n\t%1\n\nIf you close the Terminal,
 Insert path	Terminal TermView		Lägg till sökväg
 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\nUpphovsrätt 2001-2009 Haiku, Inc.\nUpphovsrätt (C) 1999 Kazuho Okui and Takashi Murai.\n\nHantering: %s [OPTION] [SHELL]\n
 No search string was entered.	Terminal TermWindow		Ingen söksträng angiven.
+Font size	Terminal TermWindow		Typsnittsstorlek
 Blinking cursor	Terminal AppearancePrefView		Blinkande markör
 Don't save	Terminal PrefWindow		Spara inte
 Set window title	Terminal TermWindow		Ange fönstertitel
@@ -56,11 +62,15 @@ Find…	Terminal TermWindow		Sök...
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Processen \"%1\" körs fortfarande.\nOm du stänger Terminalen kommer processen att termineras.
 Move here	Terminal TermView		Flytta hit
 \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-\tDen valda flikens aktiva process arbetskatalog.\n\t\t\tEtt maximalt antal sökvägsdelar kan anges\n\t\t\tT.ex. '%2d' för som mest två delar.\n\t%i\t-\tFönstrets indexnummer.\n\t%p\t-\tDen valda flikens aktiva process namn.\n\t%t\t-\tDen valda flikens namn.\n\t%%\t-\tTecknet '%'.
+Retro	Terminal colors scheme		Retro
 Error!	Terminal getString		Fel!
 New tab	Terminal TermWindow		Ny flik
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Mönstret bestämmer namn på flikar. Följande alternativ finns:\n
 Selected background	Terminal AppearancePrefView		Vald bakgrund
+Text under cursor	Terminal AppearancePrefView		Text under markören
+Midnight	Terminal colors scheme		Midnatt
 Decrease	Terminal TermWindow		Minska
+Default	Terminal colors scheme		Standard
 Create link here	Terminal TermView		Skapa länk här
 Close	Terminal TermWindow		Stäng
 Text	Terminal AppearancePrefView		Text
@@ -1,4 +1,4 @@
-1	polish	x-vnd.Haiku-WebPositive	3016944326
+1	polish	x-vnd.Haiku-WebPositive	3680831920
 Show home button	Settings Window		Pokaż przycisk domowy
 Username:	Authentication Panel		Nazwa użytkownika:
 Copy URL to clipboard	Download Window		Kopiuj adres URL do schowka
@@ -11,6 +11,7 @@ Open location	WebPositive Window		Otwarcie położenia
 Clear history	WebPositive Window		Wyczyść historię
 WebPositive	System name		WebPositive
 Yesterday	WebPositive Window		Wczoraj
+Default standard font size:	Settings Window		Domyślny standardowy rozmiar czcionki:
 Start page:	Settings Window		Strona startowa:
 History	WebPositive Window		Historia
 Error opening downloads folder	Download Window		Błąd podczas otwierania folderu pobierania
@@ -20,6 +21,7 @@ Settings	Settings Window		Ustawienia
 Confirmation	WebPositive Window		Potwierdzenie
 Window	WebPositive Window		Okno
 Decrease size	WebPositive Window		Zmniejsz wielkość
+Serif font:	Settings Window		Czcionka szeryfowa:
 Loading %url	WebPositive Window		Ładowanie %url
 Page source	WebPositive Window		Źródło strony
 Next	WebPositive Window		Następna
@@ -39,6 +41,7 @@ Full screen	WebPositive Window		Pełny ekran
 Open download error	Download Window		Otwórz błąd pobierania
 Standard font:	Settings Window		Czcionka standardowa:
 Restart	Download Window		Uruchom ponownie
+Proxy server	Settings Window		Serwer proxy
 Open containing folder	Download Window		Otwórz folder zawierający
 New window	WebPositive Window		Nowe okno
 Open	Download Window		Otwórz
@@ -84,6 +87,8 @@ Remove	Download Window		Usuń
 Find	WebPositive Window		Znajdź
 Find previous	WebPositive Window		Znajdź poprzednie
 Settings	WebPositive Window		Ustawienia
+Proxy server address:	Settings Window		Adres serwera proxy:
+Proxy server port:	Settings Window		Port serwera proxy:
 Bookmarks	WebPositive Window		Zakładki
 %minutes minutes	Download Window		%minutes minut
 Paste	URL Bar		Wklej
@@ -103,6 +108,7 @@ Today	WebPositive Window		Dzisiaj
 Remember username and password for this site	Authentication Panel		Pamiętaj nazwę użytkownika i hasło dla tej strony
 Earlier	WebPositive Window		Wcześniej
 Authentication required	Authentication Panel		Wymagane uwierzytelnienie
+Use proxy server to connect to the internet	Settings Window		Użyj serwera proxy, żeby połączyć się z internetem
 There are still downloads in progress, do you really want to quit WebPositive now?	WebPositive		W toku jest pobieranie, czy na pewno chcesz teraz zamknąć WebPositive?
 Auto-hide interface in full screen mode	Settings Window		Automatyczne ukrywanie interfejsu w trybie pełnoekranowym 
 %url failed	WebPositive Window	Loading URL failed. Don't translate variable %url.	%url nie załadował się
@@ -1,9 +1,10 @@
-1	polish	x-vnd.Haiku-desklink	3053930521
+1	polish	x-vnd.Haiku-desklink	2797960853
 Control physical output	MediaReplicant		Zarządzaj wyjściem fizycznym
 Couldn't launch 	MediaReplicant		Nie można uruchomić 
 OK	MediaReplicant		OK
 Sound preferences…	MediaReplicant		Ustawienia dźwięku…
 %g dB	MediaReplicant		%g dB
+Open %name	DeskButton	Don't translate variable %name	Otwórz %name
 No media server running	VolumeControl		Brak uruchomionego serwera mediów
 Media preferences…	MediaReplicant		Ustawienia mediów…
 Open MediaPlayer	MediaReplicant		Otwórz MediaPlayer
@@ -1,21 +1,28 @@
-1	polish	x-vnd.Haiku-libbe	864109244
+1	polish	x-vnd.Haiku-libbe	1921499696
+gamma	AboutWindow		gamma
+beta	AboutWindow		beta
 %3.2f GiB	StringForSize		%3.2f GiB
 Written by:	AboutWindow		Napisany przez:
 About %app%	AboutMenuItem		O %app%
 Cut	TextView		Wytnij
+Version	AboutWindow		Wersja
 Cannot create the replicant for \"%description\".\n%error	ZombieReplicantView		Nie można stworzyć replikanta dla \"%description\".\n%error
 Copy	TextView		Skopiuj
 %3.2f KiB	StringForSize		%3.2f KiB
 %d bytes	StringForSize		%d bajtów
+alpha	AboutWindow		alfa
 Error	PrintJob		Błąd
 No Pages to print!	PrintJob		Brak Stron do wydrukowania!
+All Rights Reserved.	AboutWindow		Wszelkie Prawa Zastrzeżone.
 OK	Dragger		OK
 OK	PrintJob		OK
 Green:	ColorControl		Zielony:
+Version history:	AboutWindow		Historia zmian:
 Remove replicant	Dragger		Usuń replikant
 OK	ZombieReplicantView		OK
 Print Server is not responding.	PrintJob		Serwer Wydruku nie odpowiada.
 Paste	TextView		Wklej
+Special Thanks:	AboutWindow		Specjalne Podziękowania dla:
 %.2f TiB	StringForSize		%.2f TiB
 Cannot locate the application for the replicant. No application signature supplied.\n%error	ZombieReplicantView		Nie można zlokalizować aplikacji dla replikanta. Nie dostarczono podpisu aplikacji.\n%error
 Redo	TextView		Ponów
@@ -26,6 +33,7 @@ Undo	TextView		Cofnij
 Red:	ColorControl		Czerwony:
 %3.2f MiB	StringForSize		%3.2f MiB
 About %app…	Dragger		O %app…
+development	AboutWindow		rozwój
 Error	ZombieReplicantView		Błąd
 Blue:	ColorControl		Niebieski:
 Can't delete this replicant from its original application. Life goes on.	Dragger		Nie można usunąć tego replikanta z jego oryginalnej aplikacji. Życie toczy się dalej.
@@ -1,4 +1,4 @@
-1	polish	x-vnd.Haiku-libtracker	1934301215
+1	polish	x-vnd.Haiku-libtracker	75125649
 common	B_COMMON_DIRECTORY		common
 OK	WidgetAttributeText		OK
 Icon view	VolumeWindow		Widok ikon
@@ -120,6 +120,7 @@ Move to Trash	ContainerWindow		Przenieś do Kosza
 Move to	ContainerWindow		Przenieś do
 Create %s clipping	PoseView		Stwórz %s wycinek
 Set new link target	InfoWindow		Ustaw nowy cel dla skrótu
+If you %ifYouDoAction the system folder or its contents, you won't be able to boot %osName!\n\nAre you sure you want to do this?\n\nTo %toDoAction the system folder or its contents anyway, hold down the Shift key and click \"%toConfirmAction\".	FSUtils		Jeśli dokonasz %ifYouDoAction katalog systemowy lub jego zawartość, to nie uda się uruchomić %osName!\n\nCzy jesteś pewien/pewna, że chcesz to zrobić?\n\nŻeby rzeczywiście %toDoAction katalog systemowy lub jego zawartość, przytrzymaj przycisk Shift i kliknij \"%toConfirmAction\".
 Save as Query template:	FindPanel		Zapisz jako szablon Zapytania:
 preferences	B_PREFERENCES_DIRECTORY		ustawienia
 Cancel	FSUtils		Anuluj
@@ -443,6 +444,7 @@ Mount	DeskWindow		Zamontuj
 Mount	ContainerWindow		Zamontuj
 %capacity (%used used -- %free free)	InfoWindow		%capacity (%used zajęte -- %free wolne)
 Cancel	FSClipBoard		Anuluj
+Restart Deskbar	DeskWindow		Uruchom ponownie Deskbar
 Cut more	ContainerWindow		Wytnij więcej
 Deleting: 	StatusWindow		Usuwanie: 
 Empty Trash	InfoWindow		Opróżnij kosz
@@ -1,4 +1,4 @@
-1	polish	x-vnd.Haiku-Appearance	1933110481
+1	polish	x-vnd.Haiku-Appearance	3956654572
 Plain font:	Font view		Zwykła czcionka:
 Control highlight	Colors tab		Podkreślenie kontrolki
 Control border	Colors tab		Obramowanie kontrolki
@@ -23,6 +23,7 @@ Tooltip background	Colors tab		Tło podpowiedzi
 Selected menu item background	Colors tab		Tło zaznaczonego elementu menu
 Antialiasing	APRWindow		Antyaliasing
 Navigation base	Colors tab		Nawigacja
+Selected list item text	Colors tab		Tekst zaznaczonego elementu listy
 Window border	Colors tab		Obramowanie okna
 Window tab text	Colors tab		Tekst zakładki okna
 Document text	Colors tab		Tekst dokumentu
@@ -32,6 +33,7 @@ Selected menu item text	Colors tab		Tekst zaznaczonego elementu menu
 Menu background	Colors tab		Tło menu
 OK	DecorSettingsView		OK
 Size:	Font Selection view		Rozmiar:
+Selected list item background	Colors tab		Tło zaznaczonego elementu listy
 Panel background	Colors tab		Tło panelu
 Menu font:	Font view		Czcionka menu:
 Colors	APRWindow		Kolory
@@ -51,7 +53,9 @@ LCD subpixel	AntialiasingSettingsView		Podpikselowe LCD
 Selected menu item border	Colors tab		Obramowanie zaznaczonego elementu menu
 Strong	AntialiasingSettingsView		Silny
 Panel text	Colors tab		Tekst panelu
+Arrow style	DecorSettingsView		Wygląd strzałek
 Monospaced fonts only	AntialiasingSettingsView		Tylko czcionki o stałej szerokości
+Look and feel	APRWindow		Look and feel
 Antialiasing menu	AntialiasingSettingsView		Menu antyaliasingu
 Fonts	APRWindow		Czcionki
 Glyph hinting:	AntialiasingSettingsView		Hintowanie czcionek:
@@ -1,4 +1,4 @@
-1	polish	x-vnd.Haiku-Network	2324385456
+1	polish	x-vnd.Haiku-Network	365183238
 Choose automatically	EthernetSettingsView		Wybierz automatycznie
 Gateway:	EthernetSettingsView		Brama domyślna:
 Netmask:	EthernetSettingsView		Maska sieci:
@@ -19,3 +19,4 @@ The net_server needs to run for the auto configuration!	EthernetSettingsView		Se
 Disabled	EthernetSettingsView		Wyłączone
 Auto-configuring failed: 	EthernetSettingsView		Automatyczna konfiguracja nie powiodła się: 
 Static	EthernetSettingsView		Statyczny
+<no adapter>	EthernetSettingsView		<brak urządzenia>
@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Haiku-Network	2324385456
+1	swedish	x-vnd.Haiku-Network	365183238
 Choose automatically	EthernetSettingsView		Välj automatiskt
 Gateway:	EthernetSettingsView		Gateway:
 Netmask:	EthernetSettingsView		Nätmask:
@@ -19,3 +19,4 @@ The net_server needs to run for the auto configuration!	EthernetSettingsView		Au
 Disabled	EthernetSettingsView		Inaktiverad
 Auto-configuring failed: 	EthernetSettingsView		Automatisk konfiguration misslyckades:
 Static	EthernetSettingsView		Statisk
+<no adapter>	EthernetSettingsView		<Ingen enhet>
@@ -1,4 +1,5 @@
-1	german	x-vnd.Haiku-Sounds	150798324
+1	german	x-vnd.Haiku-Sounds	1668150342
+Sound file:	HWindow		Klangdatei:
 Sounds	System name		Klänge
 No such file or directory	HEventList		Datei oder Ordner nicht gefunden
 OK	SoundsHApp		OK
@@ -1,4 +1,5 @@
-1	hungarian	x-vnd.Haiku-Sounds	150798324
+1	hungarian	x-vnd.Haiku-Sounds	1668150342
+Sound file:	HWindow		Hangfájl:
 Sounds	System name		Hangok
 No such file or directory	HEventList		Nem található ilyen fájl vagy mappa
 OK	SoundsHApp		Rendben
@@ -1,4 +1,5 @@
-1	japanese	x-vnd.Haiku-Sounds	150798324
+1	japanese	x-vnd.Haiku-Sounds	1668150342
+Sound file:	HWindow		サウンドファイル:
 Sounds	System name		サウンド
 No such file or directory	HEventList		ファイルまたはフォルダーがありません
 OK	SoundsHApp		OK
@@ -1,4 +1,5 @@
-1	polish	x-vnd.Haiku-Sounds	150798324
+1	polish	x-vnd.Haiku-Sounds	1668150342
+Sound file:	HWindow		Plik dźwiękowy:
 Sounds	System name		Dźwięki
 No such file or directory	HEventList		Nie znaleziono pliku/folderu
 OK	SoundsHApp		OK
@@ -1,4 +1,5 @@
-1	swedish	x-vnd.Haiku-Sounds	150798324
+1	swedish	x-vnd.Haiku-Sounds	1668150342
+Sound file:	HWindow		Ljudfil:
 Sounds	System name		Ljud
 No such file or directory	HEventList		Ingen sådan fil eller katalog
 OK	SoundsHApp		OK
@@ -1,4 +1,4 @@
-1	german	x-vnd.Haiku-Time	3249243267
+1	german	x-vnd.Haiku-Time	3544635877
 GMT (UNIX compatible)	Time		GMT (Unix-kompatibel)
 OK	Time		OK
 Asia	Time		Asien
@@ -40,5 +40,6 @@ Try all servers	Time		Alle Server abfragen
 Time zone	Time		Zeitzone
 Could not create socket	Time		Socket konnte nicht erzeugt werden
 Synchronize again	Time		Nochmal synchronisieren
+Clock	Time		Uhr
 Network time	Time		Netzwerkzeit
 Atlantic	Time		Atlantik
@@ -1,4 +1,4 @@
-1	hungarian	x-vnd.Haiku-Time	3249243267
+1	hungarian	x-vnd.Haiku-Time	3544635877
 GMT (UNIX compatible)	Time		GMT (UNIX kompatibilis)
 OK	Time		Rendben
 Asia	Time		Ázsia
@@ -40,5 +40,6 @@ Try all servers	Time		Összes kiszolgáló kipróbálása
 Time zone	Time		Időzóna
 Could not create socket	Time		Socket készítése sikertelen
 Synchronize again	Time		Szinkronizálás újra
+Clock	Time		Óra
 Network time	Time		Hálózati idő
 Atlantic	Time		Atlanti-óceán
@@ -1,4 +1,4 @@
-1	japanese	x-vnd.Haiku-Time	3249243267
+1	japanese	x-vnd.Haiku-Time	3544635877
 GMT (UNIX compatible)	Time		GMT (UNIX 互換)
 OK	Time		OK
 Asia	Time		アジア
@@ -40,5 +40,6 @@ Try all servers	Time		すべてのサーバーを試す
 Time zone	Time		タイムゾーン
 Could not create socket	Time		ソケットを作成できませんでした。
 Synchronize again	Time		再同期
+Clock	Time		時計
 Network time	Time		ネットワークタイム
 Atlantic	Time		大西洋
@@ -1,4 +1,4 @@
-1	polish	x-vnd.Haiku-Time	3249243267
+1	polish	x-vnd.Haiku-Time	3544635877
 GMT (UNIX compatible)	Time		GMT (kompatybilne z UNIX'em)
 OK	Time		OK
 Asia	Time		Azja
@@ -40,5 +40,6 @@ Try all servers	Time		Wypróbuj wszystkie serwery
 Time zone	Time		Strefa czasowa
 Could not create socket	Time		Nie można utworzyć gniazda
 Synchronize again	Time		Synchronizuj ponownie
+Clock	Time		Zegar
 Network time	Time		Czas z sieci
 Atlantic	Time		Atlantyk
@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Haiku-Time	3249243267
+1	swedish	x-vnd.Haiku-Time	3544635877
 GMT (UNIX compatible)	Time		GMT (UNIX kompatibel)
 OK	Time		OK
 Asia	Time		Asien
@@ -40,5 +40,6 @@ Try all servers	Time		Prova alla servrarna
 Time zone	Time		Tidzon
 Could not create socket	Time		Kunde inte skapa en socket
 Synchronize again	Time		Synkronisera igen
+Clock	Time		Klockan
 Network time	Time		Internettid
 Atlantic	Time		Atlanten
@@ -1,3 +1,4 @@
-1	german	x-vnd.Haiku-debug_server	3203333611
+1	german	x-vnd.Haiku-debug_server	857491333
+Terminate	DebugServer		Beenden
 Debug	DebugServer		Debug
 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,3 +1,4 @@
-1	hungarian	x-vnd.Haiku-debug_server	3203333611
+1	hungarian	x-vnd.Haiku-debug_server	857491333
+Terminate	DebugServer		Megszakítás
 Debug	DebugServer		Hibakeresé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,3 +1,4 @@
-1	japanese	x-vnd.Haiku-debug_server	3203333611
+1	japanese	x-vnd.Haiku-debug_server	857491333
+Terminate	DebugServer		終了
 Debug	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,3 +1,4 @@
-1	polish	x-vnd.Haiku-debug_server	3203333611
+1	polish	x-vnd.Haiku-debug_server	857491333
+Terminate	DebugServer		Przerwij
 Debug	DebugServer		Debug
 The application:\n\n      %app\n\nhas encountered an error which prevents it from continuing. Haiku will terminate the application and clean up.	DebugServer		W aplikacji:\n\n      %app\n\nwystąpił błąd który uniemożliwia kontynuację. Haiku przerwie działanie aplikacji i posprząta po niej.
@@ -1,3 +1,4 @@
-1	swedish	x-vnd.Haiku-debug_server	3203333611
+1	swedish	x-vnd.Haiku-debug_server	857491333
+Terminate	DebugServer		Avsluta
 Debug	DebugServer		Felsök
 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.
@@ -185,6 +185,10 @@ extern int pthread_attr_getschedparam(const pthread_attr_t *attr,
 extern int pthread_attr_setschedparam(pthread_attr_t *attr,
 	const struct sched_param *param);

+extern int pthread_attr_getguardsize(const pthread_attr_t *attr,
+	size_t *guardsize);
+extern int pthread_attr_setguardsize(pthread_attr_t *attr, size_t guardsize);
+
 #if 0   /* Unimplemented attribute functions: */

 /* [TPS] */
@@ -196,11 +200,6 @@ extern int pthread_attr_getschedpolicy(const pthread_attr_t *attr,
 	int *policy);
 extern int pthread_attr_setschedpolicy(pthread_attr_t *attr, int policy);

-/* [XSI] */
-extern int pthread_attr_getguardsize(const pthread_attr_t *attr,
-	size_t *guardsize);
-extern int pthread_attr_setguardsize(pthread_attr_t *attr, size_t guardsize);
-
 /* [TSA] */
 extern int pthread_attr_getstackaddr(const pthread_attr_t *attr,
 	void **stackaddr);
@@ -43,6 +43,9 @@ typedef struct fd_set {
 #define _FD_BITSINDEX(fd) ((fd) / NFDBITS)
 #define _FD_BIT(fd) (1L << ((fd) % NFDBITS))

+// FD_ZERO uses memset
+#include <string.h>
+
 #define FD_ZERO(set) memset((set), 0, sizeof(fd_set))
 #define FD_SET(fd, set) ((set)->bits[_FD_BITSINDEX(fd)] |= _FD_BIT(fd))
 #define FD_CLR(fd, set) ((set)->bits[_FD_BITSINDEX(fd)] &= ~_FD_BIT(fd))
@@ -13,6 +13,7 @@


 typedef uint32_t socklen_t;
+typedef uint8_t sa_family_t;

 /* Address families */
 #define AF_UNSPEC		0
@@ -86,13 +87,13 @@ struct linger {

 struct sockaddr {
 	uint8_t		sa_len;
-	uint8_t		sa_family;
+	sa_family_t	sa_family;
 	uint8_t		sa_data[30];
 };

 struct sockaddr_storage {
 	uint8_t		ss_len;			/* total length */
-	uint8_t		ss_family;		/* address family */
+	sa_family_t	ss_family;		/* address family */
 	uint8_t		__ss_pad1[6];	/* align to quad */
 	uint64_t	__ss_pad2;		/* force alignment to 64 bit */
 	uint8_t		__ss_pad3[112];	/* pad to a total of 128 bytes */
@@ -128,7 +128,8 @@ struct DeviceType {

 	bool HasPlatformControlHub() const
 	{
-		return InGroup(INTEL_TYPE_ILK) || InGroup(INTEL_TYPE_SNB);
+		return InGroup(INTEL_TYPE_ILK) || InGroup(INTEL_TYPE_SNB)
+			|| InGroup(INTEL_TYPE_IVB);
 	}
 };

@@ -117,6 +117,8 @@ public:
 	inline	void				IncrementWiredPagesCount();
 	inline	void				DecrementWiredPagesCount();

+	virtual	int32				GuardSize()	{ return 0; }
+
 			void				AddConsumer(VMCache* consumer);

 			status_t			InsertAreaLocked(VMArea* area);
@@ -77,7 +77,7 @@ void forbid_page_faults(void);

 // private kernel only extension (should be moved somewhere else):
 area_id create_area_etc(team_id team, const char *name, uint32 size,
-			uint32 lock, uint32 protection, uint32 flags,
+			uint32 lock, uint32 protection, uint32 flags, uint32 guardSize,
 			const virtual_address_restrictions* virtualAddressRestrictions,
 			const physical_address_restrictions* physicalAddressRestrictions,
 			void **_address);
@@ -95,7 +95,7 @@ status_t vm_unreserve_address_range(team_id team, void *address, addr_t size);
 status_t vm_reserve_address_range(team_id team, void **_address,
 			uint32 addressSpec, addr_t size, uint32 flags);
 area_id vm_create_anonymous_area(team_id team, const char* name, addr_t size,
-			uint32 wiring, uint32 protection, uint32 flags,
+			uint32 wiring, uint32 protection, uint32 flags, addr_t guardSize,
 			const virtual_address_restrictions* virtualAddressRestrictions,
 			const physical_address_restrictions* physicalAddressRestrictions,
 			bool kernel, void** _address);
@@ -40,6 +40,7 @@ typedef struct _pthread_attr {
 	int32		detach_state;
 	int32		sched_priority;
 	size_t		stack_size;
+	size_t		guard_size;
 } pthread_attr;

 typedef struct _pthread_rwlockattr {
@@ -12,14 +12,11 @@


 /** Size of the stack given to teams in user space */
-#define USER_STACK_GUARD_PAGES		4								// 16 kB
-#define USER_MAIN_THREAD_STACK_SIZE	(16 * 1024 * 1024 \
-						- USER_STACK_GUARD_PAGES * B_PAGE_SIZE)		// 16 MB
-#define USER_STACK_SIZE				(256 * 1024	\
-						- USER_STACK_GUARD_PAGES * B_PAGE_SIZE)		// 256 kB
-#define MIN_USER_STACK_SIZE			(4 * 1024)						// 4 KB
-#define MAX_USER_STACK_SIZE			(16 * 1024 * 1024 \
-						- USER_STACK_GUARD_PAGES * B_PAGE_SIZE)		// 16 MB
+#define USER_STACK_GUARD_SIZE		(4 * B_PAGE_SIZE)		// 16 kB
+#define USER_MAIN_THREAD_STACK_SIZE	(16 * 1024 * 1024)		// 16 MB
+#define USER_STACK_SIZE				(256 * 1024)			// 256 kB
+#define MIN_USER_STACK_SIZE			(4 * 1024)				// 4 KB
+#define MAX_USER_STACK_SIZE			(16 * 1024 * 1024)		// 16 MB


 // The type of object a thread blocks on (thread::wait::type, set by
@@ -50,6 +47,7 @@ struct thread_creation_attributes {
 	void*		args2;
 	void*		stack_address;
 	size_t		stack_size;
+	size_t		guard_size;
 	pthread_t	pthread;
 	uint32		flags;
 };
@@ -12,6 +12,7 @@

 #include "utility.h"

+#include <Debug.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
@@ -21,14 +22,17 @@
 #include <AGP.h>


+#undef TRACE
 #define TRACE_ACCELERANT
 #ifdef TRACE_ACCELERANT
-extern "C" void _sPrintf(const char* format, ...);
-#	define TRACE(x) _sPrintf x
+#	define TRACE(x...) _sPrintf("intel_extreme accelerant:" x)
 #else
-#	define TRACE(x) ;
+#	define TRACE(x...)
 #endif

+#define ERROR(x...) _sPrintf("intel_extreme accelerant: " x)
+#define CALLED(x...) TRACE("CALLED %s\n", __PRETTY_FUNCTION__)
+

 struct accelerant_info* gInfo;

@@ -180,7 +184,7 @@ uninit_common(void)
 status_t
 intel_init_accelerant(int device)
 {
-	TRACE(("intel_init_accelerant()\n"));
+	CALLED();

 	status_t status = init_common(device, false);
 	if (status != B_OK)
@@ -216,11 +220,12 @@ intel_init_accelerant(int device)
 		gInfo->head_mode |= HEAD_MODE_LVDS_PANEL;
 	}

-	TRACE(("head detected: %#x\n", gInfo->head_mode));
-	TRACE(("adpa: %08lx, dova: %08lx, dovb: %08lx, lvds: %08lx\n",
+	TRACE("head detected: %#x\n", gInfo->head_mode);
+	TRACE("adpa: %08lx, dova: %08lx, dovb: %08lx, lvds: %08lx\n",
 		read32(INTEL_DISPLAY_A_ANALOG_PORT),
 		read32(INTEL_DISPLAY_A_DIGITAL_PORT),
-		read32(INTEL_DISPLAY_B_DIGITAL_PORT), read32(INTEL_DISPLAY_LVDS_PORT)));
+		read32(INTEL_DISPLAY_B_DIGITAL_PORT),
+		read32(INTEL_DISPLAY_LVDS_PORT));

 	status = create_mode_list();
 	if (status != B_OK) {
@@ -235,7 +240,7 @@ intel_init_accelerant(int device)
 ssize_t
 intel_accelerant_clone_info_size(void)
 {
-	TRACE(("intel_accelerant_clone_info_size()\n"));
+	CALLED();
 	// clone info is device name, so return its maximum size
 	return B_PATH_NAME_LENGTH;
 }
@@ -244,7 +249,7 @@ intel_accelerant_clone_info_size(void)
 void
 intel_get_accelerant_clone_info(void* info)
 {
-	TRACE(("intel_get_accelerant_clone_info()\n"));
+	CALLED();
 	ioctl(gInfo->device, INTEL_GET_DEVICE_NAME, info, B_PATH_NAME_LENGTH);
 }

@@ -252,7 +257,7 @@ intel_get_accelerant_clone_info(void* info)
 status_t
 intel_clone_accelerant(void* info)
 {
-	TRACE(("intel_clone_accelerant()\n"));
+	CALLED();

 	// create full device name
 	char path[B_PATH_NAME_LENGTH];
@@ -294,7 +299,7 @@ err1:
 void
 intel_uninit_accelerant(void)
 {
-	TRACE(("intel_uninit_accelerant()\n"));
+	CALLED();

 	// delete accelerant instance data
 	delete_area(gInfo->mode_list_area);
@@ -314,7 +319,7 @@ intel_uninit_accelerant(void)
 status_t
 intel_get_accelerant_device_info(accelerant_device_info* info)
 {
-	TRACE(("intel_get_accelerant_device_info()\n"));
+	CALLED();

 	info->version = B_ACCELERANT_VERSION;
 	strcpy(info->name, gInfo->shared_info->device_type.InFamily(INTEL_TYPE_7xx)
@@ -332,7 +337,7 @@ intel_get_accelerant_device_info(accelerant_device_info* info)
 sem_id
 intel_accelerant_retrace_semaphore()
 {
-	TRACE(("intel_accelerant_retrace_semaphore()\n"));
+	CALLED();
 	return gInfo->shared_info->vblank_sem;
 }

@@ -11,14 +11,17 @@
 #include "accelerant.h"


+#undef TRACE
 //#define TRACE_DPMS
 #ifdef TRACE_DPMS
-extern "C" void _sPrintf(const char* format, ...);
-#	define TRACE(x) _sPrintf x
+#	define TRACE(x...) _sPrintf("intel_extreme accelerant:" x)
 #else
-#	define TRACE(x) ;
+#	define TRACE(x...)
 #endif

+#define ERROR(x...) _sPrintf("intel_extreme accelerant: " x)
+#define CALLED(x...) TRACE("CALLED %s\n", __PRETTY_FUNCTION__)
+

 void
 enable_display_plane(bool enable)
@@ -231,7 +234,7 @@ set_display_power_mode(uint32 mode)
 uint32
 intel_dpms_capabilities(void)
 {
-	TRACE(("intel_dpms_capabilities()\n"));
+	CALLED();
 	return B_DPMS_ON | B_DPMS_SUSPEND | B_DPMS_STAND_BY | B_DPMS_OFF;
 }

@@ -239,7 +242,7 @@ intel_dpms_capabilities(void)
 uint32
 intel_dpms_mode(void)
 {
-	TRACE(("intel_dpms_mode()\n"));
+	CALLED();
 	return gInfo->shared_info->dpms_mode;
 }

@@ -247,7 +250,7 @@ intel_dpms_mode(void)
 status_t
 intel_set_dpms_mode(uint32 mode)
 {
-	TRACE(("intel_set_dpms_mode()\n"));
+	CALLED();
 	gInfo->shared_info->dpms_mode = mode;
 	set_display_power_mode(mode);

@@ -15,14 +15,16 @@


 #undef TRACE
-
 //#define TRACE_ENGINE
 #ifdef TRACE_ENGINE
-#	define TRACE(x) _sPrintf x
+#	define TRACE(x...) _sPrintf("intel_extreme accelerant:" x)
 #else
-#	define TRACE(x) ;
+#	define TRACE(x...)
 #endif

+#define ERROR(x...) _sPrintf("intel_extreme accelerant: " x)
+#define CALLED(x...) TRACE("CALLED %s\n", __PRETTY_FUNCTION__)
+

 static engine_token sEngineToken = {1, 0 /*B_2D_ACCELERATION*/, NULL};

@@ -127,7 +129,7 @@ QueueCommands::MakeSpace(uint32 size)

 		if (fRingBuffer.space_left < size) {
 			if (system_time() > start + 1000000LL) {
-				TRACE(("intel_extreme: engine stalled, head %lx\n", head));
+				ERROR("engine stalled, head %lx\n", head);
 				break;
 			}
 			spin(10);
@@ -163,8 +165,8 @@ uninit_ring_buffer(ring_buffer &ringBuffer)
 void
 setup_ring_buffer(ring_buffer &ringBuffer, const char* name)
 {
-	TRACE(("Setup ring buffer %s, offset %lx, size %lx\n", name,
-		ringBuffer.offset, ringBuffer.size));
+	TRACE("Setup ring buffer %s, offset %lx, size %lx\n", name,
+		ringBuffer.offset, ringBuffer.size);

 	if (init_lock(&ringBuffer.lock, name) < B_OK) {
 		// disable ring buffer
@@ -191,7 +193,7 @@ setup_ring_buffer(ring_buffer &ringBuffer, const char* name)
 uint32
 intel_accelerant_engine_count(void) 
 {
-	TRACE(("intel_accelerant_engine_count()\n"));
+	CALLED();
 	return 1;
 }

@@ -200,7 +202,7 @@ status_t
 intel_acquire_engine(uint32 capabilities, uint32 maxWait, sync_token* syncToken,
 	engine_token** _engineToken)
 {
-	TRACE(("intel_acquire_engine()\n"));
+	CALLED();
 	*_engineToken = &sEngineToken;

 	if (acquire_lock(&gInfo->shared_info->engine_lock) != B_OK)
@@ -216,7 +218,7 @@ intel_acquire_engine(uint32 capabilities, uint32 maxWait, sync_token* syncToken,
 status_t
 intel_release_engine(engine_token* engineToken, sync_token* syncToken)
 {
-	TRACE(("intel_release_engine()\n"));
+	CALLED();
 	if (syncToken != NULL)
 		syncToken->engine_id = engineToken->engine_id;

@@ -228,7 +230,7 @@ intel_release_engine(engine_token* engineToken, sync_token* syncToken)
 void
 intel_wait_engine_idle(void)
 {
-	TRACE(("intel_wait_engine_idle()\n"));
+	CALLED();

 	{
 		QueueCommands queue(gInfo->shared_info->primary_ring_buffer);
@@ -254,7 +256,7 @@ intel_wait_engine_idle(void)

 		if (system_time() > start + 1000000LL) {
 			// the engine seems to be locked up!
-			TRACE(("intel_extreme: engine locked up, head %lx!\n", head));
+			ERROR("engine locked up, head %lx!\n", head);
 			break;
 		}

@@ -266,7 +268,7 @@ intel_wait_engine_idle(void)
 status_t
 intel_get_sync_token(engine_token* engineToken, sync_token* syncToken)
 {
-	TRACE(("intel_get_sync_token()\n"));
+	CALLED();
 	return B_OK;
 }

@@ -274,7 +276,7 @@ intel_get_sync_token(engine_token* engineToken, sync_token* syncToken)
 status_t
 intel_sync_to_token(sync_token* syncToken)
 {
-	TRACE(("intel_sync_to_token()\n"));
+	CALLED();
 	intel_wait_engine_idle();
 	return B_OK;
 }
@@ -117,7 +117,8 @@ get_accelerant_hook(uint32 feature, void* data)
 				|| gInfo->shared_info->device_type.InGroup(INTEL_TYPE_G4x)
 				|| gInfo->shared_info->device_type.InGroup(INTEL_TYPE_IGD)
 				|| gInfo->shared_info->device_type.InGroup(INTEL_TYPE_ILK)
-				|| gInfo->shared_info->device_type.InGroup(INTEL_TYPE_SNB))
+				|| gInfo->shared_info->device_type.InGroup(INTEL_TYPE_SNB)
+				|| gInfo->shared_info->device_type.InGroup(INTEL_TYPE_IVB))
 				return NULL;

 			return (void*)intel_allocate_overlay_buffer;
@@ -14,14 +14,17 @@
 #include <unistd.h>


+#undef TRACE
 //#define TRACE_MEMORY
 #ifdef TRACE_MEMORY
-extern "C" void _sPrintf(const char* format, ...);
-#	define TRACE(x) _sPrintf x
+#	define TRACE(x...) _sPrintf("intel_extreme accelerant:" x)
 #else
-#	define TRACE(x) ;
+#	define TRACE(x...)
 #endif

+#define ERROR(x...) _sPrintf("intel_extreme accelerant: " x)
+#define CALLED(x...) TRACE("CALLED %s\n", __PRETTY_FUNCTION__)
+

 void
 intel_free_memory(uint32 base)
@@ -14,6 +14,7 @@
 #include "accelerant.h"
 #include "utility.h"

+#include <Debug.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
@@ -24,14 +25,17 @@
 #include <validate_display_mode.h>


+#undef TRACE
 #define TRACE_MODE
 #ifdef TRACE_MODE
-extern "C" void _sPrintf(const char* format, ...);
-#	define TRACE(x) _sPrintf x
+#	define TRACE(x...) _sPrintf("intel_extreme accelerant:" x)
 #else
-#	define TRACE(x) ;
+#	define TRACE(x...)
 #endif

+#define ERROR(x...) _sPrintf("intel_extreme accelerant: " x)
+#define CALLED(x...) TRACE("CALLED %s\n", __PRETTY_FUNCTION__)
+

 struct display_registers {
 	uint32	pll;
@@ -138,7 +142,8 @@ set_frame_buffer_base()
 	if (sharedInfo.device_type.InGroup(INTEL_TYPE_96x)
 		|| sharedInfo.device_type.InGroup(INTEL_TYPE_G4x)
 		|| sharedInfo.device_type.InGroup(INTEL_TYPE_ILK)
-		|| sharedInfo.device_type.InGroup(INTEL_TYPE_SNB)) {
+		|| sharedInfo.device_type.InGroup(INTEL_TYPE_SNB)
+		|| sharedInfo.device_type.InGroup(INTEL_TYPE_IVB)) {
 		write32(baseRegister, mode.v_display_start * sharedInfo.bytes_per_row
 			+ mode.h_display_start * (sharedInfo.bits_per_pixel + 7) / 8);
 		read32(baseRegister);
@@ -170,16 +175,16 @@ create_mode_list(void)
 		edid_dump(&gInfo->edid_info);
 		gInfo->has_edid = true;
 	} else {
-		TRACE(("intel_extreme: getting EDID on port A (analog) failed : %s. "
-			"Trying on port C (lvds)\n", strerror(error)));
+		TRACE("getting EDID on port A (analog) failed : %s. "
+			"Trying on port C (lvds)\n", strerror(error));
 		bus.cookie = (void*)INTEL_I2C_IO_C;
 		error = ddc2_read_edid1(&bus, &gInfo->edid_info, NULL, NULL);
 		if (error == B_OK) {
 			edid_dump(&gInfo->edid_info);
 			gInfo->has_edid = true;
 		} else {
-			TRACE(("intel_extreme: getting EDID on port C failed : %s\n",
-				strerror(error)));
+			TRACE("getting EDID on port C failed : %s\n",
+				strerror(error));

 			// We could not read any EDID info. Fallback to creating a list with
 			// only the mode set up by the BIOS.
@@ -241,7 +246,8 @@ get_pll_limits(pll_limits &limits)
 	// tested

 	if (gInfo->shared_info->device_type.InGroup(INTEL_TYPE_ILK)
-		|| gInfo->shared_info->device_type.InGroup(INTEL_TYPE_SNB)) {
+		|| gInfo->shared_info->device_type.InGroup(INTEL_TYPE_SNB)
+		|| gInfo->shared_info->device_type.InGroup(INTEL_TYPE_IVB)) {
 		// TODO: support LVDS output limits as well
 		static const pll_limits kLimits = {
 			// p, p1, p2, high,   n,   m, m1, m2
@@ -291,14 +297,14 @@ get_pll_limits(pll_limits &limits)
 		limits = kLimits;
 	}

-	TRACE(("PLL limits, min: p %lu (p1 %lu, p2 %lu), n %lu, m %lu "
+	TRACE("PLL limits, min: p %lu (p1 %lu, p2 %lu), n %lu, m %lu "
 		"(m1 %lu, m2 %lu)\n", limits.min.post, limits.min.post1,
 		limits.min.post2, limits.min.n, limits.min.m, limits.min.m1,
-		limits.min.m2));
-	TRACE(("PLL limits, max: p %lu (p1 %lu, p2 %lu), n %lu, m %lu "
+		limits.min.m2);
+	TRACE("PLL limits, max: p %lu (p1 %lu, p2 %lu), n %lu, m %lu "
 		"(m1 %lu, m2 %lu)\n", limits.max.post, limits.max.post1,
 		limits.max.post2, limits.max.n, limits.max.m, limits.max.m1,
-		limits.max.m2));
+		limits.max.m2);
 }


@@ -329,7 +335,7 @@ compute_pll_divisors(const display_mode &current, pll_divisors& divisors,
 	pll_limits limits;
 	get_pll_limits(limits);

-	TRACE(("required MHz: %g\n", requestedPixelClock));
+	TRACE("%s: required MHz: %g\n", __func__, requestedPixelClock);

 	if (isLVDS) {
 		if ((read32(INTEL_DISPLAY_LVDS_PORT) & LVDS_CLKB_POWER_MASK)
@@ -384,11 +390,11 @@ compute_pll_divisors(const display_mode &current, pll_divisors& divisors,

 	divisors = bestDivisors;

-	TRACE(("found: %g MHz, p = %lu (p1 = %lu, p2 = %lu), n = %lu, m = %lu "
-		"(m1 = %lu, m2 = %lu)\n",
+	TRACE("%s: found: %g MHz, p = %lu (p1 = %lu, p2 = %lu), n = %lu, m = %lu "
+		"(m1 = %lu, m2 = %lu)\n", __func__,
 		((referenceClock * divisors.m) / divisors.n) / divisors.post,
 		divisors.post, divisors.post1, divisors.post2, divisors.n,
-		divisors.m, divisors.m1, divisors.m2));
+		divisors.m, divisors.m1, divisors.m2);
 }


@@ -633,7 +639,7 @@ sanitize_display_mode(display_mode& mode)
 uint32
 intel_accelerant_mode_count(void)
 {
-	TRACE(("intel_accelerant_mode_count()\n"));
+	CALLED();
 	return gInfo->shared_info->mode_count;
 }

@@ -641,7 +647,7 @@ intel_accelerant_mode_count(void)
 status_t
 intel_get_mode_list(display_mode* modeList)
 {
-	TRACE(("intel_get_mode_info()\n"));
+	CALLED();
 	memcpy(modeList, gInfo->mode_list,
 		gInfo->shared_info->mode_count * sizeof(display_mode));
 	return B_OK;
@@ -652,7 +658,7 @@ status_t
 intel_propose_display_mode(display_mode* target, const display_mode* low,
 	const display_mode* high)
 {
-	TRACE(("intel_propose_display_mode()\n"));
+	CALLED();

 	// first search for the specified mode in the list, if no mode is found
 	// try to fix the target mode in sanitize_display_mode
@@ -683,8 +689,8 @@ intel_propose_display_mode(display_mode* target, const display_mode* low,
 status_t
 intel_set_display_mode(display_mode* mode)
 {
-	TRACE(("intel_set_display_mode(%ldx%ld)\n", mode->virtual_width,
-		mode->virtual_height));
+	TRACE("%s(%" B_PRIu16 "x%" B_PRIu16 ")\n", __func__,
+		mode->virtual_width, mode->virtual_height);

 	if (mode == NULL)
 		return B_BAD_VALUE;
@@ -695,7 +701,7 @@ intel_set_display_mode(display_mode* mode)
 	// centering, since the data from propose_display_mode will not actually be
 	// used as is in this case.
 	if (sanitize_display_mode(target)) {
-		TRACE(("intel_extreme: invalid mode set!\n"));
+		TRACE("%s: invalid mode set!\n", __func__);
 		return B_BAD_VALUE;
 	}

@@ -747,7 +753,7 @@ if (first) {
 			set_frame_buffer_base();
 		}

-		TRACE(("intel_extreme : Failed to allocate framebuffer !\n"));
+		TRACE("%s: Failed to allocate framebuffer !\n", __func__);
 		return B_NO_MEMORY;
 	}

@@ -783,8 +789,8 @@ if (first) {
 					break;
 				}
 			}
-			TRACE(("intel_extreme : hardware mode will actually be %dx%d\n",
-				hardwareTarget.virtual_width, hardwareTarget.virtual_height));
+			TRACE("%s: hardware mode will actually be %dx%d\n", __func__,
+				hardwareTarget.virtual_width, hardwareTarget.virtual_height);
 			if ((hardwareTarget.virtual_width <= target.virtual_width
 					&& hardwareTarget.virtual_height <= target.virtual_height
 					&& hardwareTarget.space <= target.space)
@@ -1147,7 +1153,7 @@ if (first) {
 status_t
 intel_get_display_mode(display_mode* _currentMode)
 {
-	TRACE(("intel_get_display_mode()\n"));
+	CALLED();

 	retrieve_current_mode(*_currentMode, INTEL_DISPLAY_A_PLL);
 	return B_OK;
@@ -1157,7 +1163,7 @@ intel_get_display_mode(display_mode* _currentMode)
 status_t
 intel_get_edid_info(void* info, size_t size, uint32* _version)
 {
-	TRACE(("intel_get_edid_info()\n"));
+	CALLED();

 	if (!gInfo->has_edid)
 		return B_ERROR;
@@ -1173,7 +1179,7 @@ intel_get_edid_info(void* info, size_t size, uint32* _version)
 status_t
 intel_get_frame_buffer_config(frame_buffer_config* config)
 {
-	TRACE(("intel_get_frame_buffer_config()\n"));
+	CALLED();

 	uint32 offset = gInfo->shared_info->frame_buffer_offset;

@@ -1189,7 +1195,7 @@ intel_get_frame_buffer_config(frame_buffer_config* config)
 status_t
 intel_get_pixel_clock_limits(display_mode* mode, uint32* _low, uint32* _high)
 {
-	TRACE(("intel_get_pixel_clock_limits()\n"));
+	CALLED();

 	if (_low != NULL) {
 		// lower limit of about 48Hz vertical refresh
@@ -1214,7 +1220,7 @@ intel_get_pixel_clock_limits(display_mode* mode, uint32* _low, uint32* _high)
 status_t
 intel_move_display(uint16 horizontalStart, uint16 verticalStart)
 {
-	TRACE(("intel_move_display()\n"));
+	CALLED();

 	intel_shared_info &sharedInfo = *gInfo->shared_info;
 	Autolock locker(sharedInfo.accelerant_lock);
@@ -1237,7 +1243,7 @@ intel_move_display(uint16 horizontalStart, uint16 verticalStart)
 status_t
 intel_get_timing_constraints(display_timing_constraints* constraints)
 {
-	TRACE(("intel_get_timing_contraints()\n"));
+	CALLED();
 	return B_ERROR;
 }

@@ -1245,8 +1251,7 @@ intel_get_timing_constraints(display_timing_constraints* constraints)
 void
 intel_set_indexed_colors(uint count, uint8 first, uint8* colors, uint32 flags)
 {
-	TRACE(("intel_set_indexed_colors(colors = %p, first = %u)\n", colors,
-		first));
+	TRACE("%s(colors = %p, first = %u)\n", __func__, colors, first);

 	if (colors == NULL)
 		return;
@@ -14,6 +14,7 @@
 #include "accelerant_protos.h"
 #include "commands.h"

+#include <Debug.h>
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
@@ -21,14 +22,17 @@
 #include <AGP.h>


+#undef TRACE
 //#define TRACE_OVERLAY
 #ifdef TRACE_OVERLAY
-extern "C" void _sPrintf(const char* format, ...);
-#	define TRACE(x) _sPrintf x
+#	define TRACE(x...) _sPrintf("intel_extreme accelerant:" x)
 #else
-#	define TRACE(x) ;
+#	define TRACE(x...)
 #endif

+#define ERROR(x...) _sPrintf("intel_extreme accelerant: " x)
+#define CALLED(x...) TRACE("CALLED %s\n", __PRETTY_FUNCTION__)
+

 #define NUM_HORIZONTAL_TAPS		5
 #define NUM_VERTICAL_TAPS		3
@@ -243,11 +247,11 @@ update_overlay(bool updateCoefficients)
 	queue.PutWaitFor(COMMAND_WAIT_FOR_OVERLAY_FLIP);
 	queue.PutFlush();

-	TRACE(("update overlay: UP: %lx, TST: %lx, ST: %lx, CMD: %lx (%lx), "
-		"ERR: %lx\n", read32(INTEL_OVERLAY_UPDATE), read32(INtEL_OVERLAY_TEST),
-		read32(INTEL_OVERLAY_STATUS),
+	TRACE("%s: UP: %lx, TST: %lx, ST: %lx, CMD: %lx (%lx), ERR: %lx\n",
+		__func__, read32(INTEL_OVERLAY_UPDATE),
+		read32(INTEL_OVERLAY_TEST), read32(INTEL_OVERLAY_STATUS),
 		*(((uint32*)gInfo->overlay_registers) + 0x68/4), read32(0x30168),
-		read32(0x2024)));
+		read32(0x2024));
 }


@@ -265,11 +269,11 @@ show_overlay(void)
 	queue.PutOverlayFlip(COMMAND_OVERLAY_ON, true);
 	queue.PutFlush();

-	TRACE(("show overlay: UP: %lx, TST: %lx, ST: %lx, CMD: %lx (%lx), "
-		"ERR: %lx\n", read32(INTEL_OVERLAY_UPDATE), read32(INTEL_OVERLAY_TEST),
-		read32(INTEL_OVERLAY_STATUS),
-		*(((uint32*)gInfo->overlay_registers) + 0x68/4), read32(0x30168),
-		read32(0x2024)));
+	TRACE("%s: UP: %lx, TST: %lx, ST: %lx, CMD: %lx (%lx), ERR: %lx\n",
+		__func__, read32(INTEL_OVERLAY_UPDATE),
+		read32(INTEL_OVERLAY_TEST), read32(INTEL_OVERLAY_STATUS),
+		*(((uint32*)gInfo->overlay_registers) + 0x68/4),
+		read32(0x30168), read32(0x2024));
 }


@@ -344,8 +348,8 @@ const overlay_buffer*
 intel_allocate_overlay_buffer(color_space colorSpace, uint16 width,
 	uint16 height)
 {
-	TRACE(("intel_allocate_overlay_buffer(width %u, height %u, "
-		"colorSpace %lu)\n", width, height, colorSpace));
+	TRACE("%s(width %u, height %u, colorSpace %lu)\n", __func__, width,
+		height, colorSpace);

 	intel_shared_info &sharedInfo = *gInfo->shared_info;
 	uint32 bytesPerPixel;
@@ -412,9 +416,9 @@ intel_allocate_overlay_buffer(color_space colorSpace, uint16 width,
 	buffer->buffer_dma = (uint8*)gInfo->shared_info->physical_graphics_memory
 		+ overlay->buffer_offset;

-	TRACE(("allocated overlay buffer: base=%x, offset=%x, address=%x, "
-		"physical address=%x\n", overlay->buffer_base, overlay->buffer_offset,
-		buffer->buffer, buffer->buffer_dma));
+	TRACE("%s: base=%x, offset=%x, address=%x, physical address=%x\n",
+		__func__, overlay->buffer_base, overlay->buffer_offset,
+		buffer->buffer, buffer->buffer_dma);

 	return buffer;
 }
@@ -423,7 +427,7 @@ intel_allocate_overlay_buffer(color_space colorSpace, uint16 width,
 status_t
 intel_release_overlay_buffer(const overlay_buffer* buffer)
 {
-	TRACE(("intel_release_overlay_buffer(buffer %p)\n", buffer));
+	CALLED();

 	struct overlay* overlay = (struct overlay*)buffer;

@@ -445,7 +449,7 @@ status_t
 intel_get_overlay_constraints(const display_mode* mode,
 	const overlay_buffer* buffer, overlay_constraints* constraints)
 {
-	TRACE(("intel_get_overlay_constraints(buffer %p)\n", buffer));
+	CALLED();

 	// taken from the Radeon driver...

@@ -507,7 +511,7 @@ intel_get_overlay_constraints(const display_mode* mode,
 overlay_token
 intel_allocate_overlay(void)
 {
-	TRACE(("intel_allocate_overlay()\n"));
+	CALLED();

 	// we only have a single overlay channel
 	if (atomic_or(&gInfo->shared_info->overlay_channel_used, 1) != 0)
@@ -520,7 +524,7 @@ intel_allocate_overlay(void)
 status_t
 intel_release_overlay(overlay_token overlayToken)
 {
-	TRACE(("intel_allocate_overlay(token %ld)\n", (uint32)overlayToken));
+	CALLED();

 	// we only have a single token, which simplifies this
 	if (overlayToken != (overlay_token)gInfo->shared_info->overlay_token)
@@ -537,8 +541,7 @@ intel_configure_overlay(overlay_token overlayToken,
 	const overlay_buffer* buffer, const overlay_window* window,
 	const overlay_view* view)
 {
-	TRACE(("intel_configure_overlay: buffer %p, window %p, view %p\n",
-		buffer, window, view));
+	CALLED();

 	if (overlayToken != (overlay_token)gInfo->shared_info->overlay_token)
 		return B_BAD_VALUE;
@@ -653,9 +656,9 @@ intel_configure_overlay(overlay_token overlayToken,
 		registers->vertical_scale_rgb = verticalScale >> 12;
 		registers->vertical_scale_uv = verticalScaleUV >> 12;

-		TRACE(("scale: h = %ld.%ld, v = %ld.%ld\n", horizontalScale >> 12,
+		TRACE("scale: h = %ld.%ld, v = %ld.%ld\n", horizontalScale >> 12,
 			horizontalScale & 0xfff, verticalScale >> 12,
-			verticalScale & 0xfff));
+			verticalScale & 0xfff);

 		if (verticalScale != gInfo->last_vertical_overlay_scale
 			|| horizontalScale != gInfo->last_horizontal_overlay_scale) {
@@ -195,7 +195,7 @@ scsi_alloc_dma_buffer(dma_buffer *buffer, dma_params *dma_params, uint32 size)
 			// TODO: Use 64 bit addresses, if possible!
 #endif
 		buffer->area = create_area_etc(B_SYSTEM_TEAM, "DMA buffer", size,
-			B_CONTIGUOUS, 0, 0, &virtualRestrictions, &physicalRestrictions,
+			B_CONTIGUOUS, 0, 0, 0, &virtualRestrictions, &physicalRestrictions,
 			(void**)&buffer->address);

 		if (buffer->area < 0) {
@@ -74,7 +74,7 @@ scsi_init_emulation_buffer(scsi_device_info *device, size_t buffer_size)
 	physical_address_restrictions physicalRestrictions = {};
 	physicalRestrictions.alignment = buffer_size;
 	device->buffer_area = create_area_etc(B_SYSTEM_TEAM, "ATAPI buffer",
-		total_size, B_32_BIT_CONTIGUOUS, 0, 0, &virtualRestrictions,
+		total_size, B_32_BIT_CONTIGUOUS, 0, 0, 0, &virtualRestrictions,
 		&physicalRestrictions, &address);
 		// TODO: Use B_CONTIGUOUS, if possible!

@@ -92,7 +92,14 @@ const struct supported_device {
 	{0x0104, 0x0106, INTEL_TYPE_SNBGM, "SandyBridge Mobile GT1"},
 	{0x0104, 0x0116, INTEL_TYPE_SNBGM, "SandyBridge Mobile GT2"},
 	{0x0104, 0x0126, INTEL_TYPE_SNBGM, "SandyBridge Mobile GT2+"},
-	{0x0108, 0x010a, INTEL_TYPE_SNBGS, "SandyBridge Server"}
+	{0x0108, 0x010a, INTEL_TYPE_SNBGS, "SandyBridge Server"},
+
+	{0x0150, 0x0152, INTEL_TYPE_IVBG, "IvyBridge Desktop GT1"},
+	{0x0150, 0x0162, INTEL_TYPE_IVBG, "IvyBridge Desktop GT2"},
+	{0x0154, 0x0156, INTEL_TYPE_IVBGM, "IvyBridge Mobile GT1"},
+	{0x0154, 0x0166, INTEL_TYPE_IVBGM, "IvyBridge Mobile GT2"},
+	{0x0158, 0x015a, INTEL_TYPE_IVBGS, "IvyBridge Server GT1"},
+	{0x0158, 0x016a, INTEL_TYPE_IVBGS, "IvyBridge Server GT2"}
 };

 struct intel_info {
@@ -28,11 +28,14 @@

 #define TRACE_DEVICE
 #ifdef TRACE_DEVICE
-#	define TRACE(x) dprintf x
+#	define TRACE(x...) dprintf("intel_extreme: " x)
 #else
 #	define TRACE(x) ;
 #endif

+#define ERROR(x...) dprintf("intel_extreme: " x)
+#define CALLED(x...) TRACE("CALLED %s\n", __PRETTY_FUNCTION__)
+

 /* device hooks prototypes */

@@ -101,7 +104,7 @@ getset_register(int argc, char** argv)
 static status_t
 device_open(const char* name, uint32 /*flags*/, void** _cookie)
 {
-	TRACE((DEVICE_NAME ": open(name = %s)\n", name));
+	CALLED();
 	int32 id;

 	// find accessed device
@@ -147,7 +150,7 @@ device_open(const char* name, uint32 /*flags*/, void** _cookie)
 static status_t
 device_close(void* /*data*/)
 {
-	TRACE((DEVICE_NAME ": close\n"));
+	CALLED();
 	return B_OK;
 }

@@ -183,7 +186,7 @@ device_ioctl(void* data, uint32 op, void* buffer, size_t bufferLength)
 	switch (op) {
 		case B_GET_ACCELERANT_SIGNATURE:
 			strcpy((char*)buffer, INTEL_ACCELERANT_NAME);
-			TRACE((DEVICE_NAME ": accelerant: %s\n", INTEL_ACCELERANT_NAME));
+			TRACE("accelerant: %s\n", INTEL_ACCELERANT_NAME);
 			return B_OK;

 		// needed to share data between kernel and accelerant
@@ -260,8 +263,8 @@ device_ioctl(void* data, uint32 op, void* buffer, size_t bufferLength)
 		}

 		default:
-			TRACE((DEVICE_NAME ": ioctl() unknown message %ld (length = %ld)\n",
-				op, bufferLength));
+			ERROR("ioctl() unknown message %ld (length = %ld)\n", op,
+				bufferLength);
 			break;
 	}

@@ -24,11 +24,15 @@

 #define TRACE_DRIVER
 #ifdef TRACE_DRIVER
-#	define TRACE(x) dprintf x
+#	define TRACE(x...) dprintf("intel_extreme: " x)
 #else
 #	define TRACE(x) ;
 #endif

+#define ERROR(x...) dprintf("intel_extreme: " x)
+#define CALLED(x...) TRACE("CALLED %s\n", __PRETTY_FUNCTION__)
+
+
 #define MAX_CARDS 4


@@ -90,7 +94,8 @@ const struct supported_device {
 	{0x0162, INTEL_TYPE_IVBG, "IvyBridge Desktop GT2"},
 	{0x0156, INTEL_TYPE_IVBGM, "IvyBridge Mobile GT1"},
 	{0x0166, INTEL_TYPE_IVBGM, "IvyBridge Mobile GT2"},
-	{0x015a, INTEL_TYPE_IVBGS, "IvyBridge Server GT1"}
+	{0x015a, INTEL_TYPE_IVBGS, "IvyBridge Server GT1"},
+	{0x016a, INTEL_TYPE_IVBGS, "IvyBridge Server GT2"},
 };

 int32 api_version = B_CUR_DRIVER_API_VERSION;
@@ -134,7 +139,7 @@ get_next_intel_extreme(int32* _cookie, pci_info &info, uint32 &type)
 extern "C" const char**
 publish_devices(void)
 {
-	TRACE((DEVICE_NAME ": publish_devices()\n"));
+	CALLED();
 	return (const char**)gDeviceNames;
 }

@@ -142,11 +147,11 @@ publish_devices(void)
 extern "C" status_t
 init_hardware(void)
 {
-	TRACE((DEVICE_NAME ": init_hardware()\n"));
+	CALLED();

 	status_t status = get_module(B_PCI_MODULE_NAME,(module_info**)&gPCI);
 	if (status != B_OK) {
-		TRACE((DEVICE_NAME ": pci module unavailable\n"));
+		ERROR("pci module unavailable\n");
 		return status;
 	}

@@ -163,17 +168,17 @@ init_hardware(void)
 extern "C" status_t
 init_driver(void)
 {
-	TRACE((DEVICE_NAME ": init_driver()\n"));
+	CALLED();

 	status_t status = get_module(B_PCI_MODULE_NAME, (module_info**)&gPCI);
 	if (status != B_OK) {
-		TRACE((DEVICE_NAME ": pci module unavailable\n"));
+		ERROR("pci module unavailable\n");
 		return status;
 	}

 	status = get_module(B_AGP_GART_MODULE_NAME, (module_info**)&gGART);
 	if (status != B_OK) {
-		TRACE((DEVICE_NAME ": AGP GART module unavailable\n"));
+		ERROR("AGP GART module unavailable\n");
 		put_module(B_PCI_MODULE_NAME);
 		return status;
 	}
@@ -245,7 +250,7 @@ init_driver(void)
 extern "C" void
 uninit_driver(void)
 {
-	TRACE((DEVICE_NAME ": uninit_driver()\n"));
+	CALLED();

 	mutex_destroy(&gLock);

@@ -264,10 +269,9 @@ uninit_driver(void)
 extern "C" device_hooks*
 find_device(const char* name)
 {
+	CALLED();
+
 	int index;
-
-	TRACE((DEVICE_NAME ": find_device()\n"));
-
 	for (index = 0; gDeviceNames[index] != NULL; index++) {
 		if (!strcmp(name, gDeviceNames[index]))
 			return &gDeviceHooks;
@@ -22,13 +22,16 @@
 #include <util/kernel_cpp.h>


-#define TRACE_DEVICE
-#ifdef TRACE_DEVICE
-#	define TRACE(x) dprintf x
+#define TRACE_INTELEXTREME
+#ifdef TRACE_INTELEXTREME
+#	define TRACE(x...) dprintf("intel_extreme: " x)
 #else
 #	define TRACE(x) ;
 #endif

+#define ERROR(x...) dprintf("intel_extreme: " x)
+#define CALLED(x...) TRACE("intel_extreme: CALLED %s\n", __PRETTY_FUNCTION__)
+

 static void
 init_overlay_registers(overlay_registers* registers)
@@ -161,8 +164,7 @@ init_interrupt_handler(intel_info &info)
 		info.fake_interrupts = true;

 		// TODO: fake interrupts!
-		TRACE((DEVICE_NAME "Fake interrupt mode (no PCI interrupt line "
-			"assigned)"));
+		TRACE("Fake interrupt mode (no PCI interrupt line assigned\n");
 		status = B_ERROR;
 	}

@@ -195,10 +197,13 @@ intel_allocate_memory(intel_info &info, size_t size, size_t alignment,
 status_t
 intel_extreme_init(intel_info &info)
 {
+	CALLED();
 	info.aperture = gGART->map_aperture(info.pci->bus, info.pci->device,
 		info.pci->function, 0, &info.aperture_base);
-	if (info.aperture < B_OK)
+	if (info.aperture < B_OK) {
+		ERROR("error: could not map GART aperture!\n");
 		return info.aperture;
+	}

 	AreaKeeper sharedCreator;
 	info.shared_area = sharedCreator.Create("intel extreme shared info",
@@ -206,6 +211,7 @@ intel_extreme_init(intel_info &info)
 		ROUND_TO_PAGE_SIZE(sizeof(intel_shared_info)) + 3 * B_PAGE_SIZE,
 		B_FULL_LOCK, 0);
 	if (info.shared_area < B_OK) {
+		ERROR("error: could not create shared area!\n");
 		gGART->unmap_aperture(info.aperture);
 		return info.shared_area;
 	}
@@ -238,7 +244,7 @@ intel_extreme_init(intel_info &info)
 		B_ANY_KERNEL_ADDRESS, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA,
 		(void**)&info.registers);
 	if (mmioMapper.InitCheck() < B_OK) {
-		dprintf(DEVICE_NAME ": could not map memory I/O!\n");
+		ERROR("error: could not map memory I/O!\n");
 		gGART->unmap_aperture(info.aperture);
 		return info.registers_area;
 	}
@@ -294,28 +300,31 @@ intel_extreme_init(intel_info &info)
 	// Fix some problems on certain chips (taken from X driver)
 	// TODO: clean this up
 	if (info.pci->device_id == 0x2a02 || info.pci->device_id == 0x2a12) {
-		dprintf("i965GM/i965GME quirk\n");
+		TRACE("i965GM/i965GME quirk\n");
 		write32(info, 0x6204, (1L << 29));
 	} else if (info.device_type.InGroup(INTEL_TYPE_SNB)) {
-		dprintf("SandyBridge clock gating\n");
+		TRACE("SandyBridge clock gating\n");
 		write32(info, 0x42020, (1L << 28) | (1L << 7) | (1L << 5));
+	} else if (info.device_type.InGroup(INTEL_TYPE_IVB)) {
+		TRACE("IvyBridge clock gating\n");
+		write32(info, 0x42020, (1L << 28));
 	} else if (info.device_type.InGroup(INTEL_TYPE_ILK)) {
-		dprintf("IronLake clock gating\n");
+		TRACE("IronLake clock gating\n");
 		write32(info, 0x42020, (1L << 7) | (1L << 5));
 	} else if (info.device_type.InGroup(INTEL_TYPE_G4x)) {
-		dprintf("G4x clock gating\n");
+		TRACE("G4x clock gating\n");
 		write32(info, 0x6204, 0);
 		write32(info, 0x6208, (1L << 9) | (1L << 7) | (1L << 6));
 		write32(info, 0x6210, 0);

 		uint32 gateValue = (1L << 28) | (1L << 3) | (1L << 2);
 		if ((info.device_type.type & INTEL_TYPE_MOBILE) == INTEL_TYPE_MOBILE) {
-			dprintf("G4x mobile clock gating\n");
+			TRACE("G4x mobile clock gating\n");
 		    gateValue |= 1L << 18;
 		}
 		write32(info, 0x6200, gateValue);
 	} else {
-		dprintf("i965 quirk\n");
+		TRACE("i965 quirk\n");
 		write32(info, 0x6204, (1L << 29) | (1L << 23));
 	}
 	write32(info, 0x7408, 0x10);
@@ -384,7 +393,7 @@ intel_extreme_init(intel_info &info)

 	init_interrupt_handler(info);

-	TRACE((DEVICE_NAME "_init() completed successfully!\n"));
+	TRACE("%s: completed successfully!\n", __func__);
 	return B_OK;
 }

@@ -392,7 +401,7 @@ intel_extreme_init(intel_info &info)
 void
 intel_extreme_uninit(intel_info &info)
 {
-	TRACE((DEVICE_NAME": intel_extreme_uninit()\n"));
+	CALLED();

 	if (!info.fake_interrupts && info.shared_info->vblank_sem > 0) {
 		// disable interrupt generation
@@ -4,6 +4,7 @@ SubInclude HAIKU_TOP src add-ons screen_savers butterfly ;
 SubInclude HAIKU_TOP src add-ons screen_savers debugnow ;
 SubInclude HAIKU_TOP src add-ons screen_savers flurry ;
 SubInclude HAIKU_TOP src add-ons screen_savers glife ;
+SubInclude HAIKU_TOP src add-ons screen_savers gravity ;
 SubInclude HAIKU_TOP src add-ons screen_savers haiku ;
 SubInclude HAIKU_TOP src add-ons screen_savers icons ;
 SubInclude HAIKU_TOP src add-ons screen_savers ifs ;
@@ -0,0 +1,17 @@
+/* 
+ * Copyright 2012, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * 		Tri-Edge AI <triedgeai@gmail.com>
+ */ 
+ 
+
+#include "GravityScreenSaver.hpp"
+
+
+extern "C" _EXPORT BScreenSaver* 
+instantiate_screen_saver(BMessage* pbmPrefs, image_id iidImage)
+{
+	return new GravityScreenSaver(pbmPrefs, iidImage);
+}
@@ -0,0 +1,14 @@
+resource app_signature "application/x-vnd.Haiku-GravityScreenSaver";
+
+resource app_name_catalog_entry "x-vnd.Haiku-GravityScreenSaver:System name:Gravity";
+
+resource app_version 
+{
+    major  = 1,
+    middle = 0,
+    minor  = 0,
+    variety = 0,
+    internal = 0,
+    short_info = "1.0",
+    long_info = "The screensaver simulates a gravity hole effect with particles, utilizing the OpenGL interface for Haiku."
+};
@@ -0,0 +1,94 @@
+/* 
+ * Copyright 2012, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ * 
+ * Authors:
+ * 		Tri-Edge AI <triedgeai@gmail.com>
+ */ 
+
+
+#include "GravityConfigView.hpp"
+
+
+class GravityScreenSaver;
+
+GravityConfigView::GravityConfigView(GravityScreenSaver* parent, BRect frame)
+	:
+	BView(frame, "", B_FOLLOW_ALL_SIDES, B_WILL_DRAW)
+{
+	this->parent = parent;
+	
+	SetLayout(new BGroupLayout(B_HORIZONTAL));
+	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+	
+	BStringView* pbsvTitle = new BStringView(frame, B_EMPTY_STRING, 
+		"OpenGL Gravity Effect", B_FOLLOW_LEFT);
+														
+	BStringView* pbsvAuthor = new BStringView(frame, B_EMPTY_STRING, 
+		"by Tri-Edge AI", B_FOLLOW_LEFT);
+	
+	pbsParticleCount = new BSlider(frame, B_EMPTY_STRING, "Particle Count: ",
+		new BMessage('pcnt'), 0, 4, B_BLOCK_THUMB);
+	
+	pbsvShadeText = new BStringView(frame, B_EMPTY_STRING, "Shade: ", 
+		B_FOLLOW_LEFT);
+	
+	pblvShade = new BListView(frame, B_EMPTY_STRING, B_SINGLE_SELECTION_LIST,
+		B_FOLLOW_ALL);
+									
+	pblvShade->SetSelectionMessage(new BMessage('shds'));
+	
+	pblvShade->AddItem(new BStringItem("Red"));
+	pblvShade->AddItem(new BStringItem("Green"));
+	pblvShade->AddItem(new BStringItem("Blue"));
+	pblvShade->AddItem(new BStringItem("Orange"));
+	pblvShade->AddItem(new BStringItem("Purple"));
+	pblvShade->AddItem(new BStringItem("White"));
+	pblvShade->AddItem(new BStringItem("Rainbow"));
+	
+	pblvShade->Select(parent->Config.ShadeID);
+	
+	BScrollView* scroll = new BScrollView(B_EMPTY_STRING, pblvShade, 
+		B_WILL_DRAW | B_FRAME_EVENTS, false, true);
+	
+	pbsParticleCount->SetHashMarks(B_HASH_MARKS_BOTTOM);
+	pbsParticleCount->SetHashMarkCount(5);
+	pbsParticleCount->SetLimitLabels("128", "2048");
+	
+	pbsParticleCount->SetValue(parent->Config.ParticleCount);
+	
+	AddChild(BGroupLayoutBuilder(B_VERTICAL, B_USE_DEFAULT_SPACING)
+			.Add(BGroupLayoutBuilder(B_VERTICAL, 0)
+				.Add(pbsvTitle)
+				.Add(pbsvAuthor)
+			)
+			.Add(pbsvShadeText)
+			.Add(scroll)
+			.Add(pbsParticleCount)
+			.SetInsets(B_USE_DEFAULT_SPACING, 
+				B_USE_DEFAULT_SPACING, 
+				B_USE_DEFAULT_SPACING, 
+				B_USE_DEFAULT_SPACING)
+	);
+}
+
+
+void
+GravityConfigView::AttachedToWindow()
+{
+	pblvShade->SetTarget(this);
+	pbsParticleCount->SetTarget(this);	
+}
+
+
+void
+GravityConfigView::MessageReceived(BMessage* pbmMessage)
+{
+	if (pbmMessage->what == 'pcnt') {
+		parent->Config.ParticleCount = pbsParticleCount->Value();
+	} else if (pbmMessage->what == 'shds') {
+		parent->Config.ShadeID = pblvShade->CurrentSelection();	
+	} else {
+		BView::MessageReceived(pbmMessage);	
+	}
+}
@@ -0,0 +1,42 @@
+/* 
+ * Copyright 2012, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ * 
+ * Authors:
+ * 		Tri-Edge AI <triedgeai@gmail.com>
+ */ 
+#ifndef _GRAVITY_CONFIG_VIEW_HPP_
+#define _GRAVITY_CONFIG_VIEW_HPP_
+
+
+#include "GravityScreenSaver.hpp"
+
+#include <GroupLayout.h>
+#include <GroupLayoutBuilder.h>
+#include <ListView.h>
+#include <ScrollView.h>
+#include <Slider.h>
+#include <StringItem.h>
+#include <StringView.h>
+#include <View.h>
+
+
+class GravityScreenSaver;
+
+class GravityConfigView : public BView
+{
+public:
+	GravityConfigView(GravityScreenSaver* parent, BRect frame);
+	
+	void AttachedToWindow();
+	void MessageReceived(BMessage* pbmMessage);
+	
+private:	
+	GravityScreenSaver* parent;
+	BListView* pblvShade;
+	BStringView* pbsvShadeText;
+	BSlider* pbsParticleCount;
+};
+
+
+#endif /* _GRAVITY_CONFIG_VIEW_HPP_ */
@@ -0,0 +1,79 @@
+/* 
+ * Copyright 2012, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ * 
+ * Authors:
+ * 		Tri-Edge AI <triedgeai@gmail.com>
+ */ 
+
+#include "Particle.hpp"
+#include "GravityHole.hpp"
+
+#include <math.h>
+#include <stdlib.h>
+
+#define frand() ((float)rand() / (float)RAND_MAX)
+
+GravityHole::GravityHole()
+{
+	x = 0.0f;
+	y = 0.0f;
+	z = 0.0f;
+	
+	vx = 0.0f;
+	vy = 0.0f;
+	vz = 0.0f;
+	
+	ax = frand() * 30.0f - 15.0f;
+	ay = frand() * 30.0f - 15.0f;
+	az = frand() * 10.0f - 5.0f;
+}
+
+
+void
+GravityHole::Run()
+{
+	float dx = ax - x;
+	float dy = ay - y;
+	float dz = az - z;
+	
+	float d = dx * dx + dy * dy + dz * dz;
+	
+	vx += dx * 0.005f;
+	vy += dy * 0.005f;
+	vz += dz * 0.005f;
+	
+	x += vx;
+	y += vy;
+	z += vz;
+	
+	vx *= 0.95f;
+	vy *= 0.95f;
+	vz *= 0.95f;
+	
+	if (dx * dx + dy * dy + dz * dz < 10.0f) {
+		ax = frand() * 30.0f - 15.0f;
+		ay = frand() * 30.0f - 15.0f;
+		az = frand() * 10.0f - 5.0f;
+	}
+	
+	for (uint32 i = 0; i < Particle::list.size(); i++) {
+		dx = x - Particle::list[i]->x;
+		dy = y - Particle::list[i]->y;
+		dz = z - Particle::list[i]->z;
+		
+		d = dx * dx + dy * dy + dz * dz;
+		
+		Particle::list[i]->vx += dx / d * 0.5f;
+		Particle::list[i]->vy += dy / d * 0.5f;
+		Particle::list[i]->vz += dz / d * 0.5f;
+		Particle::list[i]->vr += 1.0f / d;
+	}
+}
+
+
+void
+GravityHole::Draw()
+{
+	//...
+}
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2012, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * 		Tri-Edge AI <triedgeai@gmail.com>
+ */
+
+#ifndef _GRAVITY_HOLE_HPP_
+#define _GRAVITY_HOLE_HPP_
+
+#include <GLView.h>
+
+class GravityHole
+{
+public:
+	float x;
+	float y;
+	float z;
+	
+	float vx;
+	float vy;
+	float vz;
+	
+	float ax;
+	float ay;
+	float az;
+	
+	GravityHole();
+	
+	void Run();
+	void Draw();
+};
+
+#endif /* _GRAVITY_HOLE_HPP */
@@ -0,0 +1,95 @@
+/* 
+ * Copyright 2012, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ * 
+ * Authors:
+ * 		Tri-Edge AI <triedgeai@gmail.com>
+ */ 
+
+
+#include <View.h>
+#include <StringView.h>
+
+#include "GravityScreenSaver.hpp"
+
+
+GravityScreenSaver::GravityScreenSaver(BMessage* pbmPrefs, image_id iidImage) 
+	:
+	BScreenSaver(pbmPrefs, iidImage)
+{
+	srand(time(NULL));
+	
+	if (pbmPrefs->IsEmpty()) {
+		Config.ParticleCount = 1;
+		Config.ShadeID = 2;
+	} else {
+		if (pbmPrefs->FindInt32("ParticleCount", &Config.ParticleCount) != B_OK)
+			Config.ParticleCount = 1;	
+		
+		if (pbmPrefs->FindInt32("ShadeID", &Config.ShadeID) != B_OK)
+			Config.ShadeID = 2;	
+	}
+}
+
+
+status_t
+GravityScreenSaver::SaveState(BMessage* pbmPrefs) const
+{
+	pbmPrefs->AddInt32("ParticleCount", Config.ParticleCount);
+	pbmPrefs->AddInt32("ShadeID", Config.ShadeID);
+	return B_OK;	
+}
+
+
+void
+GravityScreenSaver::StartConfig(BView* pbvView)
+{
+	pbvView->AddChild(new GravityConfigView(this, pbvView->Bounds()));
+}
+
+
+status_t
+GravityScreenSaver::StartSaver(BView* pbvView, bool bPreview)
+{
+	if (bPreview) {
+		view = NULL;
+		return B_ERROR;
+	} else {
+		SetTickSize((1000 / 30) * 1000); // ~30 FPS
+	
+		view = new GravityView(this, pbvView->Bounds());
+		pbvView->AddChild(view);
+	
+		return B_OK;
+	}
+}
+
+
+void
+GravityScreenSaver::StopSaver()
+{
+	if (view != NULL) {
+		view->EnableDirectMode(false);
+	}
+}
+
+
+void
+GravityScreenSaver::DirectConnected(direct_buffer_info* pdbiInfo)
+{
+	if (view != NULL) {
+		// TODO: Find out why I had to uncomment this.
+		// view->DirectConnected(pdbiInfo);
+		// view->EnableDirectMode(true);
+	}
+}
+
+
+void
+GravityScreenSaver::DirectDraw(int32 iFrame)
+{
+	view->Run();
+	// Dummy rect
+	BRect rect;
+	view->Draw(rect);
+}
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2012, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * 		Tri-Edge AI <triedgeai@gmail.com>
+ */
+#ifndef _GRAVITY_SCREEN_SAVER_HPP_
+#define _GRAVITY_SCREEN_SAVER_HPP_
+ 
+
+#include "GravityConfigView.hpp"
+#include "GravityView.hpp"
+ 
+#include <OS.h>
+#include <ScreenSaver.h>
+#include <View.h>
+#include <GLView.h>
+
+#include <stdlib.h>
+#include <time.h>
+#include <math.h>
+  
+
+class GravityView;
+ 
+class GravityScreenSaver : public BScreenSaver
+{
+public:
+	struct 
+	{
+		int32 ShadeID;
+		int32 ParticleCount;
+	} Config;
+	
+	GravityScreenSaver(BMessage* pbmPrefs, image_id iidImage);
+
+	status_t SaveState(BMessage* pbmPrefs) const;
+
+	void StartConfig(BView* pbvView);
+	
+	status_t StartSaver(BView* pbvView, bool bPreview);
+	void StopSaver();
+		
+	void DirectConnected(direct_buffer_info* pdbiInfo);
+	void DirectDraw(int32 iFrame);
+ 	
+private:
+	GravityView* view;
+};
+
+
+#endif /* _GRAVITY_SCREEN_SAVER_HPP_ */
@@ -0,0 +1,101 @@
+/* 
+ * Copyright 2012, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ * 
+ * Authors:
+ * 		Tri-Edge AI <triedgeai@gmail.com>
+ */ 
+
+
+#include "GravityView.hpp"
+
+#include <GL/glu.h>
+
+
+GravityView::GravityView(GravityScreenSaver* parent, BRect rect)
+	:
+	BGLView(rect, B_EMPTY_STRING, B_FOLLOW_NONE, 0, 
+		BGL_RGB | BGL_DEPTH | BGL_DOUBLE),
+	fRect(rect)
+{
+	this->parent = parent;
+	
+	int realCount;
+	
+	if (parent->Config.ParticleCount == 0)
+		realCount = 128;
+	else if (parent->Config.ParticleCount == 1)
+		realCount = 256;	
+	else if (parent->Config.ParticleCount == 2)
+		realCount = 512;	
+	else if (parent->Config.ParticleCount == 3)
+		realCount = 1024;	
+	else if (parent->Config.ParticleCount == 4)
+		realCount = 2048;	
+	else
+		realCount = 128; // This shouldn't be happening either.	
+	
+	Particle::Initialize(realCount, parent->Config.ShadeID);
+	
+	LockGL();
+
+	glClearDepth(1.0f);
+	
+	glEnable(GL_TEXTURE_2D);
+	
+	glEnable(GL_BLEND);
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+	
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	gluPerspective(45.0f, rect.Width() / rect.Height(), 2.0f, 20000.0f);
+	glTranslatef(0.0f, 0.0f, -30.0f);
+	
+	glDepthMask(GL_FALSE);
+	
+	glMatrixMode(GL_MODELVIEW);
+	
+	UnlockGL();
+	
+	ghole = new GravityHole();
+}
+
+
+GravityView::~GravityView()
+{
+	delete ghole;
+	Particle::Terminate();
+}
+
+
+void
+GravityView::AttachedToWindow()
+{
+	LockGL();
+	BGLView::AttachedToWindow();
+	UnlockGL();
+}
+
+
+void
+GravityView::Draw(BRect rect)
+{
+	LockGL();
+	
+	glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+	
+	Particle::DrawAll();
+	ghole->Draw();
+
+	SwapBuffers();
+	UnlockGL();
+}
+
+
+void
+GravityView::Run()
+{
+	Particle::RunAll();
+	ghole->Run();
+}
--- a/Show More
+++ b/Show More