Merge branch 'master' into sam460ex

build/jam/HaikuImage

@@ -245,6 +245,7 @@ AddNewDriversToHaikuImage disk scsi	: scsi_cd scsi_disk ;
 AddNewDriversToHaikuImage power : enhanced_speedstep@x86 ;
 AddNewDriversToHaikuImage power : acpi_battery@x86 ;
 #AddNewDriversToHaikuImage power : x86_cpuidle@x86 ;
+#AddNewDriversToHaikuImage display : display_controls@x86 ;
 
 # legacy drivers
 AddDriversToHaikuImage				: console dprintf null

data/catalogs/apps/diskusage/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-DiskUsage	1726021626
+1	french	x-vnd.Haiku-DiskUsage	3848101922
 Scanning %refName%	Scanner		Examen de %refName%
 Size	Info Window		Taille
 Rescan	Pie View		Réexaminer
@@ -9,6 +9,7 @@ no supporting apps	Pie View		aucun support applicatif
 Path	Info Window		Chemin
 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
@@ -16,6 +17,7 @@ DiskUsage	System name		Utilisation Disque
 %d files	Status View		%d fichiers
 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

data/catalogs/apps/expander/de.catkeys

@@ -1,4 +1,4 @@
-1	german	x-vnd.Haiku-Expander	282517174
+1	german	x-vnd.Haiku-Expander	2603318510
 Expand	ExpanderMenu		Entpacken
 Close window when done expanding	ExpanderPreferences		Fenster nach dem Entpacken schließen
 Set destination…	ExpanderMenu		Ziel wählen…
@@ -22,6 +22,7 @@ Cancel	ExpanderPreferences		Abbrechen
 Expansion	ExpanderPreferences		Entpacken
 Are you sure you want to stop expanding this\narchive? The expanded items may not be complete.	ExpanderWindow		Soll das Entpacken wirklich abgebrochen werden? Die entpackten Dateien sind eventuell nicht vollständig.
 Select	DirectoryFilePanel		Auswählen
+Destination folder doesn't exist. Would you like to create it?	ExpanderWindow		Der Zielordner existiert nicht. Soll er angelegt werden?
 Same directory as source (archive) file	ExpanderPreferences		Gleicher Ordner wie Quelldatei
 Expanding '%s'	ExpanderWindow		'%s' wird entpackt
 Settings	ExpanderMenu		Einstellungen
@@ -32,6 +33,8 @@ Show contents	ExpanderWindow		Inhalt zeigen
 Automatically show contents listing	ExpanderPreferences		Dateiliste automatisch anzeigen
 OK	ExpanderPreferences		OK
 Leave destination folder path empty	ExpanderPreferences		Keinen Zielordner vorgeben
+Failed to create the destination folder.	ExpanderWindow		Der Zielordner konnte nicht angelegt werden.
+Create	ExpanderWindow		Anlegen
 The folder was either moved, renamed or not\nsupported.	ExpanderWindow		Der Ordner wurde entweder verschoben, umbenannt oder wird nicht unterstützt.
 The file doesn't exist	ExpanderWindow		Die Datei existiert nicht
 Stop	ExpanderMenu		Stopp

data/catalogs/apps/expander/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-Expander	282517174
+1	french	x-vnd.Haiku-Expander	2603318510
 Expand	ExpanderMenu		Décompresser
 Close window when done expanding	ExpanderPreferences		Fermer la fenêtre après l'extraction
 Set destination…	ExpanderMenu		Choisir la destination…
@@ -22,6 +22,7 @@ Cancel	ExpanderPreferences		Annuler
 Expansion	ExpanderPreferences		Décompression
 Are you sure you want to stop expanding this\narchive? The expanded items may not be complete.	ExpanderWindow		Êtes vous sur de vouloir stopper la décompression cette\narchive? Les fichiers extraits seront peut être incomplets.
 Select	DirectoryFilePanel		Sélectionner
+Destination folder doesn't exist. Would you like to create it?	ExpanderWindow		Le dossier de destination n'existe pas. Voulez-vous le créer ?
 Same directory as source (archive) file	ExpanderPreferences		Même répertoire que le fichier source archivé
 Expanding '%s'	ExpanderWindow		Décompression de « %s »
 Settings	ExpanderMenu		Réglages
@@ -32,6 +33,8 @@ Show contents	ExpanderWindow		Montrer le contenu
 Automatically show contents listing	ExpanderPreferences		Montrer l'inventaire automatiquement
 OK	ExpanderPreferences		OK
 Leave destination folder path empty	ExpanderPreferences		Laissez vide le chemin du dossier de destination
+Failed to create the destination folder.	ExpanderWindow		Impossible de créer le dossier de destination.
+Create	ExpanderWindow		Créer
 The folder was either moved, renamed or not\nsupported.	ExpanderWindow		Le dossier a été renommé, déplacé, ou\nn'est pas supporté.
 The file doesn't exist	ExpanderWindow		Le fichier n'existe pas
 Stop	ExpanderMenu		Arrêt

data/catalogs/apps/expander/ja.catkeys

@@ -1,4 +1,4 @@
-1	japanese	x-vnd.Haiku-Expander	282517174
+1	japanese	x-vnd.Haiku-Expander	2603318510
 Expand	ExpanderMenu		解凍
 Close window when done expanding	ExpanderPreferences		解凍終了後ウィンドウを閉じる
 Set destination…	ExpanderMenu		解凍先を指定…
@@ -22,6 +22,7 @@ Cancel	ExpanderPreferences		キャンセル
 Expansion	ExpanderPreferences		解凍
 Are you sure you want to stop expanding this\narchive? The expanded items may not be complete.	ExpanderWindow		書庫ファイルの解凍はまだ完了していません。それでも中止しますか？
 Select	DirectoryFilePanel		選択
+Destination folder doesn't exist. Would you like to create it?	ExpanderWindow		展開先のフォルダーがありません。作成してもよろしいですか?
 Same directory as source (archive) file	ExpanderPreferences		元ファイル (アーカイブ) と同じ
 Expanding '%s'	ExpanderWindow		'%s' を解凍中
 Settings	ExpanderMenu		設定
@@ -32,6 +33,8 @@ Show contents	ExpanderWindow		内容を表示
 Automatically show contents listing	ExpanderPreferences		内容リストを自動的に表示
 OK	ExpanderPreferences		OK
 Leave destination folder path empty	ExpanderPreferences		パスを空にしておく
+Failed to create the destination folder.	ExpanderWindow		展開先のフォルダーを作成できませんでした:
+Create	ExpanderWindow		作成
 The folder was either moved, renamed or not\nsupported.	ExpanderWindow		指定されたフォルダーが移動されたか、名前が変更されたか、\nサポートされていません。
 The file doesn't exist	ExpanderWindow		ファイルは存在しません
 Stop	ExpanderMenu		中止

data/catalogs/apps/expander/pt_BR.catkeys

@@ -1,4 +1,4 @@
-1	portuguese (brazil)	x-vnd.Haiku-Expander	282517174
+1	portuguese (brazil)	x-vnd.Haiku-Expander	2603318510
 Expand	ExpanderMenu		Expandir
 Close window when done expanding	ExpanderPreferences		Fechar a janela quando concluída a expansão
 Set destination…	ExpanderMenu		Selecionar destino…
@@ -22,6 +22,7 @@ Cancel	ExpanderPreferences		Cancelar
 Expansion	ExpanderPreferences		Expansão
 Are you sure you want to stop expanding this\narchive? The expanded items may not be complete.	ExpanderWindow		Tem certeza que deseja parar de expandir este \narquivo? Os itens expandidos podem não estar completos.
 Select	DirectoryFilePanel		Selecionar
+Destination folder doesn't exist. Would you like to create it?	ExpanderWindow		A pasta de destino não existe. Deseja criá-la?
 Same directory as source (archive) file	ExpanderPreferences		Mesmo diretório como arquivo fonte (conjunto de arquivos)
 Expanding '%s'	ExpanderWindow		Expandindo '%s'
 Settings	ExpanderMenu		Configurações
@@ -32,6 +33,8 @@ Show contents	ExpanderWindow		Mostrar o conteúdo
 Automatically show contents listing	ExpanderPreferences		Exibir automaticamente lista do conteúdo
 OK	ExpanderPreferences		OK
 Leave destination folder path empty	ExpanderPreferences		Deixar caminho da pasta de destino vazio
+Failed to create the destination folder.	ExpanderWindow		Falha ao criar a pasta de destino.
+Create	ExpanderWindow		Criar
 The folder was either moved, renamed or not\nsupported.	ExpanderWindow		A pasta foi movida, renomeada ou não\é suportada.
 The file doesn't exist	ExpanderWindow		O arquivo não existe
 Stop	ExpanderMenu		Parar

data/catalogs/apps/terminal/be.catkeys

@@ -1,11 +1,10 @@
-1	belarusian	x-vnd.Haiku-Terminal	1294209621
+1	belarusian	x-vnd.Haiku-Terminal	2912171349
 Not found.	Terminal TermWindow		Не знойдзена.
 Switch Terminals	Terminal TermWindow		Пераключыць Тэрміналы
 Change directory	Terminal TermView		Змяніць дырэкторыю
 OK	Terminal TermWindow		ОК
 New Terminal	Terminal TermWindow		Новы Тэрмінал
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Тэрмінал не змог запусціць абалонку. Выбачайце.
-Text size	Terminal TermWindow		Памер тэксту
 Match case	Terminal FindWindow		З улікам рэгістру
 Quit	Terminal TermWindow		Выйсці
 Use default shell	Terminal Shell		Ужыць абалонку па змоўчанню
@@ -13,10 +12,8 @@ Confirm exit if active programs exist	Terminal AppearancePrefView		Пытацц
 The pattern specifying the current tab title. The following placeholders\ncan be used:\n	Terminal TermWindow		Шаблон для цякучага імя ўкладкі. Можна ўжываць наступныя\n запаўняльнікі:\n
 Select all	Terminal TermWindow		Выбраць усё
 Close tab	Terminal TermWindow		Закрыць укладку
-Custom	Terminal colors schema		Спецыяльнае
 Save to file…	Terminal PrefWindow		Захаваць у файл…
 OK	Terminal PrefWindow		ОК
-Black on White	Terminal colors schema		Чорны на Белым
 Window title:	Terminal AppearancePrefView		Імя вакна:
 Font:	Terminal AppearancePrefView		Шрыфт:
 Copy here	Terminal TermView		Капіяваць сюды
@@ -34,13 +31,10 @@ Find	Terminal FindWindow		Шукаць
 Appearance	Terminal PrefWindow		Знешні выгляд
 Tab title:	Terminal AppearancePrefView		Імя ўкладкі:
 The pattern specifying the window titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Шаблон для цякучага імя вакна. Можна ўжываць наступныя\n запаўняльнікі:\n
-Color schema:	Terminal AppearancePrefView		Каляровая схема:
 OK	Terminal SetTitleWindow		ОК
 Background	Terminal AppearancePrefView		Фон
 Use selection	Terminal FindWindow		Карыстаць выдзяленне
-Green on Black	Terminal colors schema		Залёны на Белым
 The process \"%1\" is still running.\nIf you close the tab, the process will be killed.	Terminal TermWindow		Працэс \"%1\" яшчэ актыўны.\nКалі вы закрыеце ўкладку, працэс будзе забіты.
-Size:	Terminal AppearancePrefView		Памер:
 Cannot execute \"%command\":\n\t%error	Terminal Shell		Немагчыма выканаць \"%command\":\n\t%error
   -h,     --help               print this help\n  -t,     --title              set window title\n  -f,     --fullscreen         start fullscreen\n	Terminal TermApp		  -h,     --help               вывесцi дапамогу\n  -t,     --title              задаць загаловак вакна\n  -f,     --fullscreen         запусціць на поўны экран\n
 Full screen	Terminal TermWindow		Поўны экран
@@ -61,7 +55,6 @@ Find…	Terminal TermWindow		Пошук…
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Працэс \"%1\" яшчэ актыўны.\nКалі вы закрыеце Тэрмінал, працэс будзе забіты.
 Move here	Terminal TermView		Перамясціць сюды
 \t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\tРабочы каталог актыўнага працэсу\n\t\t\tў цякучай укладцы.Дадаткова можна ўказаць макісмальную колькасць кампанентаў пуці.\n\t\t\t Напрыклад, '%2d' - не больша за два кампаненты.\n\t%i\t-\tІндэкс вакна.\n\t%p\t-\tІмя актыўнага працэсу ў цякучай укладцы.\n\t%t\t-\tІмя цякучай укладкі.\n\t%%\t-\tСімвал '%'.
-White on Black	Terminal colors schema		Белы на Чорным
 Error!	Terminal getString		Памылка!
 New tab	Terminal TermWindow		Новая ўкладка
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Шаблон для імёнаў ўкладак. Можна ўжываць наступныя\n запаўняльнікі:\n

data/catalogs/apps/terminal/de.catkeys

@@ -1,11 +1,11 @@
-1	german	x-vnd.Haiku-Terminal	211651840
+1	german	x-vnd.Haiku-Terminal	1252738083
 Not found.	Terminal TermWindow		Nicht gefunden.
 Switch Terminals	Terminal TermWindow		Terminals wechseln
 Change directory	Terminal TermView		Zum Ordner wechseln
 OK	Terminal TermWindow		OK
 New Terminal	Terminal TermWindow		Neues Terminal
+Cursor text	Terminal AppearancePrefView		Text unter Cursor
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Das Terminal konnte die Konsole leider nicht starten.
-Text size	Terminal TermWindow		Textgröße
 Match case	Terminal FindWindow		Groß-/Kleinschreibung beachten
 Quit	Terminal TermWindow		Beenden
 Use default shell	Terminal Shell		Verwende Standard-Konsole
@@ -13,10 +13,8 @@ Confirm exit if active programs exist	Terminal AppearancePrefView		Beenden best
 The pattern specifying the current tab title. The following placeholders\ncan be used:\n	Terminal TermWindow		Die Formel für diesen Reitertitel. Folgende Variablen\nstehen zur Verfügung:\n
 Select all	Terminal TermWindow		Alles auswählen
 Close tab	Terminal TermWindow		Reiter schließen
-Custom	Terminal colors schema		Benutzerdefiniert
 Save to file…	Terminal PrefWindow		In Datei speichern…
 OK	Terminal PrefWindow		OK
-Black on White	Terminal colors schema		Schwarz auf Weiß
 Window title:	Terminal AppearancePrefView		Fenstertitel:
 Font:	Terminal AppearancePrefView		Schriftart:
 Copy here	Terminal TermView		Hierher kopieren
@@ -34,13 +32,10 @@ Find	Terminal FindWindow		Suchen
 Appearance	Terminal PrefWindow		Darstellung
 Tab title:	Terminal AppearancePrefView		Reitertitel:
 The pattern specifying the window titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Die Formel für Fenstertitel. Folgende Variablen\nstehen zur Verfügung:\n
-Color schema:	Terminal AppearancePrefView		Farbschema:
 OK	Terminal SetTitleWindow		OK
 Background	Terminal AppearancePrefView		Hintergrund
 Use selection	Terminal FindWindow		Verwende Auswahl
-Green on Black	Terminal colors schema		Grün auf Schwarz
 The process \"%1\" is still running.\nIf you close the tab, the process will be killed.	Terminal TermWindow		Der Prozess \"%1\" läuft noch.\nWird der Reiter geschlossen, wird auch dieser Prozess abgebrochen.
-Size:	Terminal AppearancePrefView		Größe:
 Cannot execute \"%command\":\n\t%error	Terminal Shell		\"%command\" kann nicht ausgeführt werden:\n\t%error
   -h,     --help               print this help\n  -t,     --title              set window title\n  -f,     --fullscreen         start fullscreen\n	Terminal TermApp		  -h,     --help               diesen Hilfetext ausgeben\n  -t,     --title              Fenstertitel setzen\n  -f,     --fullscreen         im Vollbildmodus starten\n
 Full screen	Terminal TermWindow		Vollbild
@@ -62,7 +57,6 @@ Find…	Terminal TermWindow		Suchen...
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Der Prozess \"%1\" läuft noch.\nWird das Terminal geschlossen, wird auch dieser Prozess abgebrochen.
 Move here	Terminal TermView		Hierher verschieben
 \t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\tDas aktuelle Arbeitsverzeichnis des aktiven Prozesses\n\t\t\t in diesem Reiter. Optional kann die maximale Anzahl von Pfad-Komponenten\n\t\t\t angegeben werden, z.B. '%2d' für maximal zwei Komponenten.\n\t%i\t-\tDer Index des Fensters.\n\t%p\t-\tDer Titel dieses Reiters.\n\t%%\t-\tDas %-Zeichen.
-White on Black	Terminal colors schema		Weiß auf Schwarz
 Error!	Terminal getString		Fehler!
 New tab	Terminal TermWindow		Neuer Reiter
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Die Formel für Reitertitel. Folgende Variablen\nstehen zur Verfügung:\n
@@ -80,6 +74,7 @@ Set tab title	Terminal TermWindow		Reiter umbenennen
 Settings…	Terminal TermWindow		Einstellungen...
 Abort	Terminal Shell		Abbrechen
 Edit	Terminal TermWindow		Bearbeiten
+Cursor background	Terminal AppearancePrefView		Cursor
 Color:	Terminal AppearancePrefView		Farbe:
 The pattern specifying the window title. The following placeholders\ncan be used:\n	Terminal TermWindow		Die Formel für den Fenstertitel. Folgende Variablen\nstehen zur Verfügung:\n
 Print	Terminal TermWindow		Drucken

data/catalogs/apps/terminal/el.catkeys

@@ -1,11 +1,10 @@
-1	greek, modern (1453-)	x-vnd.Haiku-Terminal	1054657081
+1	greek, modern (1453-)	x-vnd.Haiku-Terminal	2672618809
 Not found.	Terminal TermWindow		Δε βρέθηκε.
 Switch Terminals	Terminal TermWindow		Εναλλαγή Τερματικών
 Change directory	Terminal TermView		Αλλαγή καταλόγου
 OK	Terminal TermWindow		Εντάξει
 New Terminal	Terminal TermWindow		Νέο Τερματικό
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Το Τερματικό δε μπορεί να ξεκινήσει το κέλυφος. Λυπούμαστε.
-Text size	Terminal TermWindow		Μέγεθος κειμένου
 Match case	Terminal FindWindow		Ταίριασμα πεζών/κεφαλαίων
 Quit	Terminal TermWindow		Έξοδος
 Use default shell	Terminal Shell		Χρήση προεπιλεγμένου κέλυφους
@@ -13,10 +12,8 @@ Confirm exit if active programs exist	Terminal AppearancePrefView		Επιβεβ
 The pattern specifying the current tab title. The following placeholders\ncan be used:\n	Terminal TermWindow		Το σχέδιο που προσδιορίζει τον τρέχοντα τίτλο καρτέλας. Τα παρακάτω σύμβολα \nμπορούν να χρησιμοποιηθούν:\n
 Select all	Terminal TermWindow		Επιλογή όλων
 Close tab	Terminal TermWindow		Κλείσιμο καρτέλας
-Custom	Terminal colors schema		Προσαρμοσμένο
 Save to file…	Terminal PrefWindow		Αποθήκευση στο αρχείο...
 OK	Terminal PrefWindow		Εντάξει
-Black on White	Terminal colors schema		Μάυρο πάνω σε Άσπρο
 Window title:	Terminal AppearancePrefView		Τίτλος παραθύρου:
 Font:	Terminal AppearancePrefView		Γραμματοσειρά:
 Copy here	Terminal TermView		Αντιγραφή εδώ
@@ -34,13 +31,10 @@ Find	Terminal FindWindow		Εύρεση
 Appearance	Terminal PrefWindow		Εμφάνιση
 Tab title:	Terminal AppearancePrefView		Τίτλος καρτέλας
 The pattern specifying the window titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Το μοτίβο που προσδιορίζει τους τίτλους παραθύρου. Οι παρακάτω placeholder\n μπορούν να χρησιμοποιηθούν:\n 
-Color schema:	Terminal AppearancePrefView		Σχήμα χρωμάτων:
 OK	Terminal SetTitleWindow		Εντάξει
 Background	Terminal AppearancePrefView		Παρασκήνιο
 Use selection	Terminal FindWindow		Χρήση επιλεγμένου
-Green on Black	Terminal colors schema		Πράσινο πάνω σε Μαύρο
 The process \"%1\" is still running.\nIf you close the tab, the process will be killed.	Terminal TermWindow		Η διεργασία \"%1\" ακόμη εκτελείται.\nΕαν κλείσετε την καρτέλα, η διεργασία θα τερματιστεί.
-Size:	Terminal AppearancePrefView		Μέγεθος:
 Cannot execute \"%command\":\n\t%error	Terminal Shell		Δεν μπορεί να εκτελεστεί \"%command\":\n\t%error
 Full screen	Terminal TermWindow		Πλήρης οθόνη
 Window title…	Terminal TermWindow		Τίτλος παραθύρου...
@@ -60,7 +54,6 @@ Find…	Terminal TermWindow		Εύρεση...
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Η διεργασία \"%1\" ακόμη εκτελείται.\nΕαν κλείσετε τοτερματικό, η διεργασία θα τερματιστεί.
 Move here	Terminal TermView		Μετακίνηση εδώ
 \t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\tΟ τρέχων κατάλογος της ενεργού διεργασίας.\n\t\t\tΠροαιρετικά ο μέγιστος αριθμός στοιχείων της διαδρομής μπορεί να\n\t\t\tπροσδιοριστεί. Π.χ. '%2d' για το πολύ δύο τμήματα.\n\t%i\t-\tΟ κατάλογος περιεχομένων του παραθύρου.\n\t%p\t-\tΤο όνομα της ενεργού διεργασίας στην τρέχουσα καρτέλα..\n\t%t\t-\tΟ τίτλος της τρέχουσας καρτέλας.\t%%\t-\tΟ χαρακτήρας '%'.
-White on Black	Terminal colors schema		Άσπρο πάνω σε Μαύρο
 Error!	Terminal getString		Σφάλμα!
 New tab	Terminal TermWindow		Νέα καρτέλα
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Το σχέδιο που προσδιορίζει τους τρέχοντες τίτλους καρτέλας. Τα παρακάτω σύμβολα \nμπορούν να χρησιμοποιηθούν:\n

data/catalogs/apps/terminal/fi.catkeys

@@ -1,11 +1,10 @@
-1	finnish	x-vnd.Haiku-Terminal	1294209621
+1	finnish	x-vnd.Haiku-Terminal	2912171349
 Not found.	Terminal TermWindow		Ei löytynyt.
 Switch Terminals	Terminal TermWindow		Vaihda pääteikkunoita
 Change directory	Terminal TermView		Vaihda hakemistoa
 OK	Terminal TermWindow		Valmis
 New Terminal	Terminal TermWindow		Uusi Pääteikkuna
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Komentotulkin käynnistäminen Pääteikkunassa epäonnistui.
-Text size	Terminal TermWindow		Tekstikoko
 Match case	Terminal FindWindow		Kirjainkoosta riippuva
 Quit	Terminal TermWindow		Poistu
 Use default shell	Terminal Shell		Käytä oletuskomentotulkkia
@@ -13,10 +12,8 @@ Confirm exit if active programs exist	Terminal AppearancePrefView		Vahvista pois
 The pattern specifying the current tab title. The following placeholders\ncan be used:\n	Terminal TermWindow		Nykyisen välilehtiotsikon määrittävä malli. Seuraavia paikanpitäjiä\nvoidaan käyttää:\n
 Select all	Terminal TermWindow		Valitse kaikki
 Close tab	Terminal TermWindow		Sulje välilehti
-Custom	Terminal colors schema		Räätälöity
 Save to file…	Terminal PrefWindow		Tallenna tiedostoon…
 OK	Terminal PrefWindow		Valmis
-Black on White	Terminal colors schema		Musta valkoisella
 Window title:	Terminal AppearancePrefView		Ikkunaotsikko:
 Font:	Terminal AppearancePrefView		Kirjasintyyppi:
 Copy here	Terminal TermView		Kopioi tänne
@@ -34,13 +31,10 @@ Find	Terminal FindWindow		Etsi
 Appearance	Terminal PrefWindow		Ulkoasu
 Tab title:	Terminal AppearancePrefView		Välilehtiotsikko:
 The pattern specifying the window titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Ikkunaotsikot määrittävä malli. Seuraavia paikanpitäjiä\nvoidaan käyttää:\n
-Color schema:	Terminal AppearancePrefView		Värikaavio:
 OK	Terminal SetTitleWindow		Valmis
 Background	Terminal AppearancePrefView		Tausta
 Use selection	Terminal FindWindow		Käyttövalinta
-Green on Black	Terminal colors schema		Vihreä mustalla
 The process \"%1\" is still running.\nIf you close the tab, the process will be killed.	Terminal TermWindow		Prosessia ”%1” suoritetaan yhä.\nJos suljet välilehden, prosessi tapetaan.
-Size:	Terminal AppearancePrefView		Koko:
 Cannot execute \"%command\":\n\t%error	Terminal Shell		Ei voida suorittaa komentoa ”%command”:\n\t%error
   -h,     --help               print this help\n  -t,     --title              set window title\n  -f,     --fullscreen         start fullscreen\n	Terminal TermApp		  -h,     --help               tulosta tämä opaste\n  -t,     --title              aseta ikkunaotsikko\n  -f,     --fullscreen         käynnistä kokoruutunäyttö\n
 Full screen	Terminal TermWindow		Kokoruutunäyttö
@@ -61,7 +55,6 @@ Find…	Terminal TermWindow		Etsi...
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Prosessia ”%1” suoritetaan yhä.\nJos suljet Pääteikkunan, prosessi tapetaan.
 Move here	Terminal TermView		Siirrä tänne
 \t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\tKäynnissä olevan prosessin nykyinen työhakemisto\n\t\t\tnykyisessä välilehdessä. Valinnaisesti määriteltävien polkukomponenttien\n\t\t\tenimmäismäärä. Esim.: ’%2d’ kahdelle yleisimmälle komponentille.\n\t%i\t-\tIkkunan indeksi.\n\t%p\t-\tKäynnissä olevan prosessin nimi nykyisessä välilehdessä.\n\t%t\t-\tNykyisen välilehden otsikko.\n\t%%\t-\tMerkki ’%’.
-White on Black	Terminal colors schema		Valkoinen mustalla
 Error!	Terminal getString		Virhe!
 New tab	Terminal TermWindow		Uusi välilehti
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Välilehtiotsikot määrittävä malli. Seuraavia paikanpitäjiä\nvoidaan käyttää:\n

data/catalogs/apps/terminal/fr.catkeys

@@ -1,11 +1,10 @@
-1	french	x-vnd.Haiku-Terminal	1294209621
+1	french	x-vnd.Haiku-Terminal	680179617
 Not found.	Terminal TermWindow		Non trouvé.
 Switch Terminals	Terminal TermWindow		Inverser les Terminaux
 Change directory	Terminal TermView		Changer de répertoire
 OK	Terminal TermWindow		OK
 New Terminal	Terminal TermWindow		Nouveau Terminal
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Terminal ne peut pas démarrer l'interpréteur de commande.
-Text size	Terminal TermWindow		Taille du texte
 Match case	Terminal FindWindow		Sensible à la casse
 Quit	Terminal TermWindow		Quitter
 Use default shell	Terminal Shell		Utiliser l'interpréteur de commande par défaut
@@ -13,10 +12,8 @@ Confirm exit if active programs exist	Terminal AppearancePrefView		Demander une
 The pattern specifying the current tab title. The following placeholders\ncan be used:\n	Terminal TermWindow		Le modèle utilisé pour composer le titre de l'onglet actif peut\ncontenir les éléments suivants :\n
 Select all	Terminal TermWindow		Sélectionner tout
 Close tab	Terminal TermWindow		Fermer l'onglet
-Custom	Terminal colors schema		Personnalisé
 Save to file…	Terminal PrefWindow		Enregistrer sous…
 OK	Terminal PrefWindow		OK
-Black on White	Terminal colors schema		Noir sur blanc
 Window title:	Terminal AppearancePrefView		Titre de la fenêtre :
 Font:	Terminal AppearancePrefView		Police :
 Copy here	Terminal TermView		Copier ici
@@ -34,13 +31,10 @@ Find	Terminal FindWindow		Rechercher
 Appearance	Terminal PrefWindow		Apparence
 Tab title:	Terminal AppearancePrefView		Titre de l'onglet :
 The pattern specifying the window titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Le modèle utilisé pour composer le titre des fenêtres peut\ncontenir les éléments suivants :\n
-Color schema:	Terminal AppearancePrefView		Profil de couleurs :
 OK	Terminal SetTitleWindow		OK
 Background	Terminal AppearancePrefView		Fond
 Use selection	Terminal FindWindow		Utiliser la sélection
-Green on Black	Terminal colors schema		Vert sur noir
 The process \"%1\" is still running.\nIf you close the tab, the process will be killed.	Terminal TermWindow		L'application « %1 » fonctionne encore.\nSi vous fermez l'onglet, l'application sera interrompue.
-Size:	Terminal AppearancePrefView		Taille :
 Cannot execute \"%command\":\n\t%error	Terminal Shell		Impossible d'exécuter « %command » :\n\t%error
   -h,     --help               print this help\n  -t,     --title              set window title\n  -f,     --fullscreen         start fullscreen\n	Terminal TermApp		  -h,     --help               affiche cette aide\n  -t,     --title              défini le titre de la fenêtre\n  -f,     --fullscreen         démarre en plein écran\n
 Full screen	Terminal TermWindow		Plein écran
@@ -50,6 +44,7 @@ The following processes are still running:\n\n\t%1\n\nIf you close the Terminal,
 Insert path	Terminal TermView		Insérer un chemin de recherche
 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 et Takashi Murai.\n\nUtilisation : %s [OPTION] [SHELL]\n
 No search string was entered.	Terminal TermWindow		Aucun texte à rechercher n'a été indiqué.
+Blinking cursor	Terminal AppearancePrefView		Curseur clignotant
 Don't save	Terminal PrefWindow		Ne pas sauver
 Set window title	Terminal TermWindow		Changer le titre de la fenêtre
 Terminal	System name		Terminal
@@ -61,7 +56,6 @@ Find…	Terminal TermWindow		Rechercher…
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		L'application « %1 » fonctionne encore.\nSi vous fermez le Terminal, l'application sera interrompue.
 Move here	Terminal TermView		Déplacer ici
 \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-\tLe répertoire de travail courant du processus actif dans l'onglet\n\t\t\tcourant. Optionnellement, le nombre maximum d'élément peut-être\n\t\t\tspécifié. E.g. '%2d' pour au plus 2 éléments.\n\t%i\t-\tL'index de la fenêtre.\n\t%p\t-\tLe nom du processus actif dans l'onglet courant.\n\t%t\t-\tLe titre de l'onglet courant.\n\t%%\t-\tLe caractère '%'.
-White on Black	Terminal colors schema		Blanc sur noir
 Error!	Terminal getString		Erreur !
 New tab	Terminal TermWindow		Nouvel onglet
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Le modèle utilisé pour composer le titre des onglets\ncontenir les éléments suivants :\n
@@ -79,6 +73,7 @@ Set tab title	Terminal TermWindow		Changer le titre de l'onglet
 Settings…	Terminal TermWindow		Réglages…
 Abort	Terminal Shell		Abandonner
 Edit	Terminal TermWindow		Éditer
+Cursor background	Terminal AppearancePrefView		Arrière-plan du curseur
 Color:	Terminal AppearancePrefView		Couleur :
 The pattern specifying the window title. The following placeholders\ncan be used:\n	Terminal TermWindow		Le modèle utilisé pour composer le titre des fenêtres peut\ncontenir les éléments suivants :\n
 Print	Terminal TermWindow		Imprimer

data/catalogs/apps/terminal/hi.catkeys

@@ -1,21 +1,18 @@
-1	hindi	x-vnd.Haiku-Terminal	3000435316
+1	hindi	x-vnd.Haiku-Terminal	323429748
 Not found.	Terminal TermWindow		नहीं मिला.
 Switch Terminals	Terminal TermWindow		स्विच टर्मिनल्स
 Change directory	Terminal TermView		निर्देशिका बदलें
 OK	Terminal TermWindow		ठीक है
 New Terminal	Terminal TermWindow		नया टर्मिनल
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		टर्मिनल शेल नहीं शुरू कर सकता है. माफ़ कीजिए.
-Text size	Terminal TermWindow		टेक्स्ट का आकार
 Match case	Terminal FindWindow		केस मिलाएँ
 Quit	Terminal TermWindow		छोड़ना
 Use default shell	Terminal Shell		डिफ़ॉल्ट शेल का प्रयोग करें
 Confirm exit if active programs exist	Terminal AppearancePrefView		निकास की पुष्टि करें अगर सक्रिय प्रोग्राम मौजूद है
 Select all	Terminal TermWindow		सभी का चयन करें
 Close tab	Terminal TermWindow		टैब बंद करें
-Custom	Terminal colors schema		कस्टम
 Save to file…	Terminal PrefWindow		फ़ाइल सहेजें...
 OK	Terminal PrefWindow		ठीक है
-Black on White	Terminal colors schema		सफेद पर काला
 Window title:	Terminal AppearancePrefView		विंडो शीर्षक:
 Font:	Terminal AppearancePrefView		फ़ॉन्ट:
 Copy here	Terminal TermView		यहाँ प्रतिलिपि बनाएँ
@@ -32,12 +29,9 @@ Selected text	Terminal AppearancePrefView		चयनित टेक्स्ट
 Find	Terminal FindWindow		खोजें
 Appearance	Terminal PrefWindow		दिखावट
 Tab title:	Terminal AppearancePrefView		टैब शीर्षक:
-Color schema:	Terminal AppearancePrefView		रंग स्कीमा:
 OK	Terminal SetTitleWindow		ठीक है
 Background	Terminal AppearancePrefView		पृष्ठभूमि
 Use selection	Terminal FindWindow		चयन का प्रयोग करें
-Green on Black	Terminal colors schema		काले पर हरा
-Size:	Terminal AppearancePrefView		आकार:
 Cannot execute \"%command\":\n\t%error	Terminal Shell		अमल नहीं कर सकते \"%command\" को:\n\t%error
 Full screen	Terminal TermWindow		पूर्ण स्क्रीन
 Window title…	Terminal TermWindow		विंडो शीर्षक...
@@ -53,7 +47,6 @@ Nothing is selected.	Terminal TermWindow		कुछ भी नहीं चु
 Text not found.	Terminal TermWindow		टेक्स्ट नहीं मिला.
 Find…	Terminal TermWindow		खोजें...
 Move here	Terminal TermView		यहाँ ले जाएँ
-White on Black	Terminal colors schema		काले पर सफेद
 Error!	Terminal getString		त्रुटि!
 New tab	Terminal TermWindow		नया टैब
 Selected background	Terminal AppearancePrefView		पृष्ठभूमि चयनित

data/catalogs/apps/terminal/hu.catkeys

@@ -1,4 +1,4 @@
-1	hungarian	x-vnd.Haiku-Terminal	3929743651
+1	hungarian	x-vnd.Haiku-Terminal	1252738083
 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
@@ -6,7 +6,6 @@ OK	Terminal TermWindow		Rendben
 New Terminal	Terminal TermWindow		Új terminál
 Cursor text	Terminal AppearancePrefView		Kurzor szöveg
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Sajnos, a terminálnak nem sikerült elindítani a shellt.
-Text size	Terminal TermWindow		Betűméret
 Match case	Terminal FindWindow		Betűérzékeny
 Quit	Terminal TermWindow		Kilépés
 Use default shell	Terminal Shell		Alapértelmezett shell használata
@@ -14,10 +13,8 @@ Confirm exit if active programs exist	Terminal AppearancePrefView		Kilépés meg
 The pattern specifying the current tab title. The following placeholders\ncan be used:\n	Terminal TermWindow		A jelenlegi lap címét meghatározó minta. A következő kódok használhatóak:\n
 Select all	Terminal TermWindow		Összes kijelölése
 Close tab	Terminal TermWindow		Lap bezárása
-Custom	Terminal colors schema		Egyéni
 Save to file…	Terminal PrefWindow		Mentés fájlba…
 OK	Terminal PrefWindow		Rendben
-Black on White	Terminal colors schema		Fehér alapon fekete
 Window title:	Terminal AppearancePrefView		Ablak címe:
 Font:	Terminal AppearancePrefView		Betűtípus:
 Copy here	Terminal TermView		Másolás
@@ -35,13 +32,10 @@ Find	Terminal FindWindow		Keresés
 Appearance	Terminal PrefWindow		Megjelenés
 Tab title:	Terminal AppearancePrefView		Lap címe:
 The pattern specifying the window titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Az ablakok címét meghatározó minta. A következő kódok használhatóak:\n
-Color schema:	Terminal AppearancePrefView		Színösszeállítás:
 OK	Terminal SetTitleWindow		Rendben
 Background	Terminal AppearancePrefView		Háttér
 Use selection	Terminal FindWindow		Kijelölés használata
-Green on Black	Terminal colors schema		Fekete alapon zöld
 The process \"%1\" is still running.\nIf you close the tab, the process will be killed.	Terminal TermWindow		A folyamat (%1) még fut.\nHa bezárja a lapot, a folyamat megszakad.
-Size:	Terminal AppearancePrefView		Méret:
 Cannot execute \"%command\":\n\t%error	Terminal Shell		Nem sikerült lefuttatni: %command\n\t%error
   -h,     --help               print this help\n  -t,     --title              set window title\n  -f,     --fullscreen         start fullscreen\n	Terminal TermApp		  -h     --help                ez a leírás megjelenítése\n  -t     --title                 ablak címének megadása\n  -f     -fullscreen         indítás teljes képernyőben\n
 Full screen	Terminal TermWindow		Teljes képernyő
@@ -63,7 +57,6 @@ Find…	Terminal TermWindow		Keresés…
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		A folyamat (%1) még fut.\nHa bezárja a Terminált, a folyamat megszakad.
 Move here	Terminal TermView		Mozgatás
 \t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\tAz a mappa amiben a jelenlegi fül az aktív folyamata\n\t\t\tfut épp.Meg lehet adni az elérési út\n\t\t\tkomponenseinek számát. Pl. '%2d' maximum két komponenshez.\n\t%i\t-\tAz ablak indexe.\n\t%p\t-\tA jelenlegi fülben futó folyamat neve.\n\t%t\t-\tA jelenlegi fül címe.\n\t%%\t-\tEgy '%' karakter.
-White on Black	Terminal colors schema		Fekete alapon fehér
 Error!	Terminal getString		Hiba!
 New tab	Terminal TermWindow		Új lap
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		A fülek címét meghatározó minta. A következő kódok használhatóak:

data/catalogs/apps/terminal/ja.catkeys

@@ -1,4 +1,4 @@
-1	japanese	x-vnd.Haiku-Terminal	3929743651
+1	japanese	x-vnd.Haiku-Terminal	1252738083
 Not found.	Terminal TermWindow		これ以上見つかりません。
 Switch Terminals	Terminal TermWindow		ターミナルを切替える
 Change directory	Terminal TermView		ディレクトリを変更
@@ -6,7 +6,6 @@ OK	Terminal TermWindow		OK
 New Terminal	Terminal TermWindow		新しいターミナルを開く
 Cursor text	Terminal AppearancePrefView		カーソル
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		すみません、シェルを起動できませんでした。
-Text size	Terminal TermWindow		テキストサイズ
 Match case	Terminal FindWindow		大文字と小文字を区別する
 Quit	Terminal TermWindow		終了
 Use default shell	Terminal Shell		デフォルトシェルを使用
@@ -14,10 +13,8 @@ Confirm exit if active programs exist	Terminal AppearancePrefView		実行中の
 The pattern specifying the current tab title. The following placeholders\ncan be used:\n	Terminal TermWindow		パターンは現在のタブタイトルを指定します。次のプレースホルダーが\n使用できます:\n
 Select all	Terminal TermWindow		すべて選択
 Close tab	Terminal TermWindow		タブを閉じる
-Custom	Terminal colors schema		カスタム
 Save to file…	Terminal PrefWindow		ファイルに保存…
 OK	Terminal PrefWindow		OK
-Black on White	Terminal colors schema		白地に黒文字
 Window title:	Terminal AppearancePrefView		ウィンドウタイトル:
 Font:	Terminal AppearancePrefView		フォント:
 Copy here	Terminal TermView		カレントディレクトリへコピー
@@ -35,13 +32,10 @@ Find	Terminal FindWindow		検索
 Appearance	Terminal PrefWindow		外観
 Tab title:	Terminal AppearancePrefView		タブタイトル:
 The pattern specifying the window titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		パターンは現在のウィンドウタイトルを指定します。次のプレースホルダーが\n使用できます:\n
-Color schema:	Terminal AppearancePrefView		配色:
 OK	Terminal SetTitleWindow		OK
 Background	Terminal AppearancePrefView		背景
 Use selection	Terminal FindWindow		選択部で検索
-Green on Black	Terminal colors schema		黒地に緑文字
 The process \"%1\" is still running.\nIf you close the tab, the process will be killed.	Terminal TermWindow		プロセス \"%1\" がまだ実行中です。\nタブを閉じると強制終了されます。
-Size:	Terminal AppearancePrefView		サイズ:
 Cannot execute \"%command\":\n\t%error	Terminal Shell		\"%command\" を実行できません:\n\t%error
   -h,     --help               print this help\n  -t,     --title              set window title\n  -f,     --fullscreen         start fullscreen\n	Terminal TermApp		  -h,     --help               print this help\n  -t,     --title              set window title\n  -f,     --fullscreen         start fullscreen\n
 Full screen	Terminal TermWindow		全画面表示
@@ -63,7 +57,6 @@ Find…	Terminal TermWindow		検索…
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		プロセス \"%1\" がまだ実行中です。\nTerminalを閉じると強制終了されます。
 Move here	Terminal TermView		カレントディレクトリへ移動
 \t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\t現在のタブへの実行中プロセスのカレントワーキングディレクトリ\n\t\t\tの表示。オプションでパス要素の最大値を\n\t\t\t指定できます。 例. '%2d' 最大 2 要素。\n\t%i\t-\tThe index of the window.\n\t%p\t-\t実行中プロセス名の現在のタプへの表示。\n\t%t\t-\t現在のタブのタイトル。\n\t%%\t-\t文字 '%' 。
-White on Black	Terminal colors schema		黒地に白文字
 Error!	Terminal getString		エラー!
 New tab	Terminal TermWindow		新しいタブ
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		パターンはタブタイトルを指定します。次のプレースホルダーが\n使用できます:\n

data/catalogs/apps/terminal/lt.catkeys

@@ -1,11 +1,10 @@
-1	lithuanian	x-vnd.Haiku-Terminal	1294209621
+1	lithuanian	x-vnd.Haiku-Terminal	2912171349
 Not found.	Terminal TermWindow		Nerasta.
 Switch Terminals	Terminal TermWindow		Pereiti į kitą terminalą
 Change directory	Terminal TermView		Keisti aplanką
 OK	Terminal TermWindow		Gerai
 New Terminal	Terminal TermWindow		Naujas langas
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Apgailestaujame, terminalui nepavyko paleisti apvalkalo.
-Text size	Terminal TermWindow		Šrifto dydis
 Match case	Terminal FindWindow		Paisyti raidžių registro
 Quit	Terminal TermWindow		Baigti darbą
 Use default shell	Terminal Shell		Naudoti numatytąjį apvalkalą
@@ -13,10 +12,8 @@ Confirm exit if active programs exist	Terminal AppearancePrefView		Prašyti darb
 The pattern specifying the current tab title. The following placeholders\ncan be used:\n	Terminal TermWindow		Aktyvios kortelės antraštės šablonas. Galite naudoti šiuos vietaženklius:\n
 Select all	Terminal TermWindow		Pažymėti viską
 Close tab	Terminal TermWindow		Užverti kortelę
-Custom	Terminal colors schema		Pasirinktinė
 Save to file…	Terminal PrefWindow		Įrašyti į failą…
 OK	Terminal PrefWindow		Gerai
-Black on White	Terminal colors schema		Juodas tekstas baltame fone
 Window title:	Terminal AppearancePrefView		Lango antraštė:
 Font:	Terminal AppearancePrefView		Šriftas:
 Copy here	Terminal TermView		Kopijuoti čia
@@ -34,13 +31,10 @@ Find	Terminal FindWindow		Ieškoti
 Appearance	Terminal PrefWindow		Išvaizda
 Tab title:	Terminal AppearancePrefView		Kortelės antraštė:
 The pattern specifying the window titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Langų antraščių šablonas. Galite naudoti šiuos vietaženklius:\n
-Color schema:	Terminal AppearancePrefView		Spalvų schema:
 OK	Terminal SetTitleWindow		Gerai
 Background	Terminal AppearancePrefView		Fono
 Use selection	Terminal FindWindow		Ieškoti pažymėto teksto
-Green on Black	Terminal colors schema		Žalias tekstas juodame fone
 The process \"%1\" is still running.\nIf you close the tab, the process will be killed.	Terminal TermWindow		Užduotis „%1“ dar vykdoma.\nUžvėrus kortelę, jos darbas bus nutrauktas.
-Size:	Terminal AppearancePrefView		Šrifto dydis:
 Cannot execute \"%command\":\n\t%error	Terminal Shell		Nepavyko įvykdyti „%command“:\n\t%error
   -h,     --help               print this help\n  -t,     --title              set window title\n  -f,     --fullscreen         start fullscreen\n	Terminal TermApp		  -h,     --help               Išvesti šį pranešimą\n  -t,     --title              nurodyti lango antraštę\n  -f,     --fullscreen         paleisti visame ekrane\n
 Full screen	Terminal TermWindow		Visame ekrane
@@ -61,7 +55,6 @@ Find…	Terminal TermWindow		Ieškoti…
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Užduotis „%1“ dar vykdoma.\nUžvėrus langą, jos darbas bus nutrauktas.
 Move here	Terminal TermView		Perkelti čia
 \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-\tAktyvioje kortelėje vydomos aktyvios užduoties veikiamasis \t\t\taplankas. Taip pat galima nurodyti didžiausią kelio komponenčių\n\t\t\tskaičių. Pavyzdžiui, „%2d“ reikš ne daugiau kaip dvi komponentes.\n\t%i\t-\tLango eilės numeris.\n\t%p\t-\tAktyvioje kortelėje vykdomos aktyvios užduoties pavadinimas.\n\t%t\t-\tAktyvios kortelės antraštė.\n\t%%\t-\tSimbolis „%“.
-White on Black	Terminal colors schema		Baltas tekstas juodame fone
 Error!	Terminal getString		Klaida!
 New tab	Terminal TermWindow		Nauja kortelė
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Kortelių antraščių šablonas. Galite naudoti šiuos vietaženklius:\n

data/catalogs/apps/terminal/nl.catkeys

@@ -1,11 +1,10 @@
-1	dutch; flemish	x-vnd.Haiku-Terminal	1294209621
+1	dutch; flemish	x-vnd.Haiku-Terminal	2912171349
 Not found.	Terminal TermWindow		Niet gevonden.
 Switch Terminals	Terminal TermWindow		Wissel van Terminal
 Change directory	Terminal TermView		Directory veranderen
 OK	Terminal TermWindow		Oké
 New Terminal	Terminal TermWindow		Nieuwe Terminal
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Terminal kon de shell niet starten. Sorry.
-Text size	Terminal TermWindow		Tekstgrootte
 Match case	Terminal FindWindow		Hoofd-/kleine-lettergevoelig
 Quit	Terminal TermWindow		Afsluiten
 Use default shell	Terminal Shell		Standaard shell gebruiken
@@ -13,10 +12,8 @@ Confirm exit if active programs exist	Terminal AppearancePrefView		Afsluiten bev
 The pattern specifying the current tab title. The following placeholders\ncan be used:\n	Terminal TermWindow		Het model dat de titel van de huidige tab bepaalt.\nDe volgende plaatsaanduidingen kunnen worden gebruikt:\n
 Select all	Terminal TermWindow		Alles selecteren
 Close tab	Terminal TermWindow		De tab sluiten
-Custom	Terminal colors schema		Aangepast
 Save to file…	Terminal PrefWindow		Opslaan naar bestand...
 OK	Terminal PrefWindow		Oké
-Black on White	Terminal colors schema		Zwart op Wit
 Window title:	Terminal AppearancePrefView		Venstertitel:
 Font:	Terminal AppearancePrefView		Lettertype:
 Copy here	Terminal TermView		Hierheen kopiëren
@@ -34,13 +31,10 @@ Find	Terminal FindWindow		Zoeken
 Appearance	Terminal PrefWindow		Uiterlijk
 Tab title:	Terminal AppearancePrefView		Tabtitel:
 The pattern specifying the window titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Het model dat de venstertitels bepaalt.\nDe volgende plaatsaanduidingen kunnen worden gebruikt:\n
-Color schema:	Terminal AppearancePrefView		Kleurschema:
 OK	Terminal SetTitleWindow		Oké
 Background	Terminal AppearancePrefView		Achtergrond
 Use selection	Terminal FindWindow		Gebruik selectie
-Green on Black	Terminal colors schema		Groen op zwart
 The process \"%1\" is still running.\nIf you close the tab, the process will be killed.	Terminal TermWindow		Het proces \"%1\" is nog gaande.\nAls u de tab sluit, zal het proces afgebroken worden.
-Size:	Terminal AppearancePrefView		Grootte:
 Cannot execute \"%command\":\n\t%error	Terminal Shell		Kan \"%command\" niet uitvoeren:\n\t%error
   -h,     --help               print this help\n  -t,     --title              set window title\n  -f,     --fullscreen         start fullscreen\n	Terminal TermApp		-h,   --help   toon deze hulp\n-t,   --title   stel de venstertitel in\n-f,   --fullscreen   start in volledig scherm\n
 Full screen	Terminal TermWindow		Volledig scherm
@@ -61,7 +55,6 @@ Find…	Terminal TermWindow		Zoeken...
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Het proces \"%1\" is nog gaande.\nAls u Terminal sluit, zal het proces afgebroken worden.
 Move here	Terminal TermView		Hierheen verplaatsen
 \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-\tDe huidige werkmap van het actieve proces in de \n\t\thuidige tab. Optioneel kan het maximale aantal padonderdelen\n\t\tworden opgegeven. Bijvoorbeeld '%2d' voor maximaal 2 onderdelen.\n\t%i\t-\tDe index van het venster.\n\t%p\t-\tDe naam van het actieve proces in de huidige tab.\n\t%t\t-\tDe titel van de huidige tab.\n\t%%\t-\tHet karakter '%'.
-White on Black	Terminal colors schema		Wit op Zwart
 Error!	Terminal getString		Fout!
 New tab	Terminal TermWindow		Nieuwe tab
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Het model dat de tabtitels bepaalt.\nDe volgende plaatsaanduidingen kunnen worden gebruikt:\n

data/catalogs/apps/terminal/pl.catkeys

@@ -1,11 +1,10 @@
-1	polish	x-vnd.Haiku-Terminal	1294209621
+1	polish	x-vnd.Haiku-Terminal	2912171349
 Not found.	Terminal TermWindow		Nie znaleziono.
 Switch Terminals	Terminal TermWindow		Przełącz Terminal
 Change directory	Terminal TermView		Zmień folder
 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.
-Text size	Terminal TermWindow		Rozmiar tekstu
 Match case	Terminal FindWindow		Dopasuj wielkość liter
 Quit	Terminal TermWindow		Wyjdź
 Use default shell	Terminal Shell		Użyj domyślnego shella
@@ -13,10 +12,8 @@ Confirm exit if active programs exist	Terminal AppearancePrefView		Potwierdź wy
 The pattern specifying the current tab title. The following placeholders\ncan be used:\n	Terminal TermWindow		Wzór ustalający tytuł aktywnej karty. Następujące wyznaczniki\nmogą zostać użyte:\n
 Select all	Terminal TermWindow		Zaznacz wszystko
 Close tab	Terminal TermWindow		Zamknij kartę
-Custom	Terminal colors schema		Niestandardowe
 Save to file…	Terminal PrefWindow		Zapisz w pliku…
 OK	Terminal PrefWindow		OK
-Black on White	Terminal colors schema		Czarny na Białym
 Window title:	Terminal AppearancePrefView		Tytuł okna:
 Font:	Terminal AppearancePrefView		Czcionka:
 Copy here	Terminal TermView		Kopiuj tutaj
@@ -34,13 +31,10 @@ Find	Terminal FindWindow		Znajdź
 Appearance	Terminal PrefWindow		Wygląd
 Tab title:	Terminal AppearancePrefView		Tytuł karty:
 The pattern specifying the window titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Wzór ustalający tytuł aktywnego okna. Następujące wyznaczniki\nmogą zostać użyte:\n
-Color schema:	Terminal AppearancePrefView		Motyw kolorów:
 OK	Terminal SetTitleWindow		OK
 Background	Terminal AppearancePrefView		Tło
 Use selection	Terminal FindWindow		Użyj zaznaczenia
-Green on Black	Terminal colors schema		Zielony na czarnym
 The process \"%1\" is still running.\nIf you close the tab, the process will be killed.	Terminal TermWindow		Proces \"%1\" jest wciąż w użyciu.\nJeśli zamkniesz kartę, proces zostanie zatrzymany.
-Size:	Terminal AppearancePrefView		Rozmiar:
 Cannot execute \"%command\":\n\t%error	Terminal Shell		Nie można wykonać \"%command\":\n\t%error
   -h,     --help               print this help\n  -t,     --title              set window title\n  -f,     --fullscreen         start fullscreen\n	Terminal TermApp		  -h,     --help               wyświetlenie tego tekstu pomocy\n  -t,     --title              zmiana tytułu okna\n  -f,     --fullscreen         tryb pełnoekranowy\n
 Full screen	Terminal TermWindow		Pełny ekran
@@ -61,7 +55,6 @@ 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 '%'.
-White on Black	Terminal colors schema		Biały na Czarnym
 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

data/catalogs/apps/terminal/pt_BR.catkeys

@@ -1,4 +1,4 @@
-1	portuguese (brazil)	x-vnd.Haiku-Terminal	3929743651
+1	portuguese (brazil)	x-vnd.Haiku-Terminal	1252738083
 Not found.	Terminal TermWindow		Não localizado.
 Switch Terminals	Terminal TermWindow		Alternar Terminais
 Change directory	Terminal TermView		Mudar de pasta
@@ -6,7 +6,6 @@ OK	Terminal TermWindow		OK
 New Terminal	Terminal TermWindow		Novo Terminal
 Cursor text	Terminal AppearancePrefView		Texto do cursor
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Terminal não pôde iniciar o shell. Desculpe.
-Text size	Terminal TermWindow		Tamanho do texto
 Match case	Terminal FindWindow		Diferenciar maiúsculas de minúsculas
 Quit	Terminal TermWindow		Sair
 Use default shell	Terminal Shell		Utilizar shell padrão
@@ -14,10 +13,8 @@ Confirm exit if active programs exist	Terminal AppearancePrefView		Confirmar sa
 The pattern specifying the current tab title. The following placeholders\ncan be used:\n	Terminal TermWindow		O padrão especificando o título da guia atual. Os seguintes espaços reservados\npodem ser usados:\n
 Select all	Terminal TermWindow		Selecionar tudo
 Close tab	Terminal TermWindow		Fechar aba
-Custom	Terminal colors schema		Personalizado
 Save to file…	Terminal PrefWindow		Salvar para arquivo...
 OK	Terminal PrefWindow		OK
-Black on White	Terminal colors schema		Preto sobre Branco
 Window title:	Terminal AppearancePrefView		Título da janela:
 Font:	Terminal AppearancePrefView		Fonte:
 Copy here	Terminal TermView		Copiar aqui
@@ -35,13 +32,10 @@ Find	Terminal FindWindow		Localizar
 Appearance	Terminal PrefWindow		Aparência
 Tab title:	Terminal AppearancePrefView		Título da guia:
 The pattern specifying the window titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		O padrão especificando os títulos da janela. Os seguintes espaços reservados podem ser utilizados:\n
-Color schema:	Terminal AppearancePrefView		Esquema de cores:
 OK	Terminal SetTitleWindow		OK
 Background	Terminal AppearancePrefView		Plano de fundo
 Use selection	Terminal FindWindow		Usar seleção
-Green on Black	Terminal colors schema		Verde sobre o Preto
 The process \"%1\" is still running.\nIf you close the tab, the process will be killed.	Terminal TermWindow		O processo \"%1\" ainda está executando.\nSe fechar a guia, o processo será morto.
-Size:	Terminal AppearancePrefView		Tamanho:
 Cannot execute \"%command\":\n\t%error	Terminal Shell		Não é possível executar \"%command\":\n\t %error
   -h,     --help               print this help\n  -t,     --title              set window title\n  -f,     --fullscreen         start fullscreen\n	Terminal TermApp		-h,  --help  exibe esta ajuda\n-t,  --title  define o título da janela\n-f,  --fulscreen  inicia tela cheia\n
 Full screen	Terminal TermWindow		Tela inteira
@@ -63,7 +57,6 @@ Find…	Terminal TermWindow		Localizar…
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		O processo \"%1\" ainda está executando.\nSe fechar o Terminal, o processo será morto.
 Move here	Terminal TermView		Mover aqui
 \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 O diretório de trabalho atual do processo ativo na\n\t \t \t guia atual. Opcionalmente o número máximo de componentes do caminho\n\t \t \t pode ser especificado. Por exemplo, '%2d' para o máximo de dois componentes.\n\t %i\t -\t O índice da janela.\n\t %p\t -\t O nome do processo ativo na guia atual.\n\t %t\t -\t O título da guia atual.\n\t %%\t -\t O caractere '%'.
-White on Black	Terminal colors schema		Branco sobre Preto
 Error!	Terminal getString		Erro!
 New tab	Terminal TermWindow		Nova aba
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		O padrão especificando os títulos da guia. Os seguintes espaços reservados podem ser usados:\n

data/catalogs/apps/terminal/ro.catkeys

@@ -1,11 +1,10 @@
-1	romanian	x-vnd.Haiku-Terminal	1054657081
+1	romanian	x-vnd.Haiku-Terminal	2672618809
 Not found.	Terminal TermWindow		Nu a fost găsit.
 Switch Terminals	Terminal TermWindow		Comută terminale
 Change directory	Terminal TermView		Modifică dosar
 OK	Terminal TermWindow		OK
 New Terminal	Terminal TermWindow		Terminal nou
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Terminalul nu a putut porni shell. Îmi pare rău.
-Text size	Terminal TermWindow		Dimensiune text
 Match case	Terminal FindWindow		Potrivire caz
 Quit	Terminal TermWindow		Părăsește
 Use default shell	Terminal Shell		Utilizează shell implicit
@@ -13,10 +12,8 @@ Confirm exit if active programs exist	Terminal AppearancePrefView		Confirmă ie
 The pattern specifying the current tab title. The following placeholders\ncan be used:\n	Terminal TermWindow		Tiparul care specifică titlul tabului curent. Următoarele marcaje\npot fi utilizate:\n
 Select all	Terminal TermWindow		Selectează tot
 Close tab	Terminal TermWindow		Închide tab
-Custom	Terminal colors schema		Personalizat
 Save to file…	Terminal PrefWindow		Salvează în fișier...
 OK	Terminal PrefWindow		OK
-Black on White	Terminal colors schema		Negru pe alb
 Window title:	Terminal AppearancePrefView		Titlu fereastră:
 Font:	Terminal AppearancePrefView		Font:
 Copy here	Terminal TermView		Copiază aici
@@ -34,13 +31,10 @@ Find	Terminal FindWindow		Găsește
 Appearance	Terminal PrefWindow		Aspect
 Tab title:	Terminal AppearancePrefView		Titlu tab:
 The pattern specifying the window titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Tiparul care specifică titlurile ferestrei curente. Următoarele marcaje\npot fi utilizate:\n
-Color schema:	Terminal AppearancePrefView		Schemă de culoare:
 OK	Terminal SetTitleWindow		OK
 Background	Terminal AppearancePrefView		Fundal
 Use selection	Terminal FindWindow		Utilizează selecție
-Green on Black	Terminal colors schema		Verde pe Negru
 The process \"%1\" is still running.\nIf you close the tab, the process will be killed.	Terminal TermWindow		Procesul „%1” încă rulează.\nDacă închideți tabul, procesul va fi oprit.
-Size:	Terminal AppearancePrefView		Dimensiune:
 Cannot execute \"%command\":\n\t%error	Terminal Shell		Nu se poate executa „%command”:\n\t%error
 Full screen	Terminal TermWindow		Pe tot ecranul
 Window title…	Terminal TermWindow		Titlu fereastră...
@@ -60,7 +54,6 @@ Find…	Terminal TermWindow		Caută...
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Procesul „%1” încă rulează.\nDacă închideți Terminalul, procesul va fi oprit.
 Move here	Terminal TermView		Mută aici
 \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-\tDosarul curent al procesuui activ în\n\t\t\ttabul curent. Poate fi specificat numărul maxim de componente ale căii. Ex: „%2d” pentru cel mult două componente.\n\t%i\t-\tIndicele de fereastră.\n\t%p\t-\tNumele procesului activ din tabul curent.\n\t%t\t-\tTitlul tabului curent.\n\t%%\t-\tCaracterul „%”.
-White on Black	Terminal colors schema		Alb pe negru
 Error!	Terminal getString		Eroare!
 New tab	Terminal TermWindow		Tab nou
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Tiparul care specifică titlurile tabului curent. Următoarele marcaje\npot fi utilizate:\n

data/catalogs/apps/terminal/ru.catkeys

@@ -1,11 +1,10 @@
-1	russian	x-vnd.Haiku-Terminal	1294209621
+1	russian	x-vnd.Haiku-Terminal	2912171349
 Not found.	Terminal TermWindow		Текст не найден
 Switch Terminals	Terminal TermWindow		Переключить терминалы
 Change directory	Terminal TermView		Сменить каталог
 OK	Terminal TermWindow		ОК
 New Terminal	Terminal TermWindow		Новый терминал
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Терминал не смог запустить оболочку. Простите.
-Text size	Terminal TermWindow		Размер шрифта
 Match case	Terminal FindWindow		Учитывать регистр
 Quit	Terminal TermWindow		Выход
 Use default shell	Terminal Shell		Использовать оболочку по умолчанию
@@ -13,10 +12,8 @@ Confirm exit if active programs exist	Terminal AppearancePrefView		Подтве
 The pattern specifying the current tab title. The following placeholders\ncan be used:\n	Terminal TermWindow		Этот шаблон описывает заголовок текущей вкладки.\nВозможно использовать следующие переменные:\n
 Select all	Terminal TermWindow		Выделить всё
 Close tab	Terminal TermWindow		Закрыть вкладку
-Custom	Terminal colors schema		Настроена вручную
 Save to file…	Terminal PrefWindow		Сохранить в файл…
 OK	Terminal PrefWindow		ОК
-Black on White	Terminal colors schema		Черный текст на белом фоне
 Window title:	Terminal AppearancePrefView		Заголовок окна:
 Font:	Terminal AppearancePrefView		Шрифт:
 Copy here	Terminal TermView		Копировать сюда
@@ -34,13 +31,10 @@ Find	Terminal FindWindow		Найти
 Appearance	Terminal PrefWindow		Внешний вид
 Tab title:	Terminal AppearancePrefView		Заголовок вкладки:
 The pattern specifying the window titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Этот шаблон описывает заголовки окна.\nВозможно использовать следующие переменные:\n
-Color schema:	Terminal AppearancePrefView		Цветовая схема:
 OK	Terminal SetTitleWindow		ОК
 Background	Terminal AppearancePrefView		Фона
 Use selection	Terminal FindWindow		Использовать выделенный текст
-Green on Black	Terminal colors schema		Зелёный на чёрном
 The process \"%1\" is still running.\nIf you close the tab, the process will be killed.	Terminal TermWindow		Процесс \"%1\" все еще работает.\nЕсли вы закроете вкладку, то этот процесс будет уничтожен.
-Size:	Terminal AppearancePrefView		Размер:
 Cannot execute \"%command\":\n\t%error	Terminal Shell		Невозможно выполнить \"%command\":\n\t%error
   -h,     --help               print this help\n  -t,     --title              set window title\n  -f,     --fullscreen         start fullscreen\n	Terminal TermApp		  -h,     --help               вывести эту справку\n  -t,     --title              задать заголовок окна\n  -f,     --fullscreen         запустить во весь экран\n
 Full screen	Terminal TermWindow		На весь экран
@@ -61,7 +55,6 @@ Find…	Terminal TermWindow		Найти…
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Процесс \"%1\" все еще работает.\nЕсли вы закроете Терминал, то этот процесс будет уничтожен.
 Move here	Terminal TermView		Переместить сюда
 \t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\tТекущая директория активного процесса текущей вкладки.\n\t\t\tОпционально можно указать максимальное число отображаемых компонентов пути.\n\t\t\tНапример '%2d' отобразит последние 2 компонента.\n\t%i\t-\tНомер окна.\n\t%p\t-\tНазвание активного процесса в текущей вкладке.\n\t%t\t-\tЗаголовок текущей вкладки.\n\t%%\t-\tСимвол процента - '%'.
-White on Black	Terminal colors schema		Белый текст на черном фоне
 Error!	Terminal getString		Ошибка!
 New tab	Terminal TermWindow		Новая вкладка
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Этот шаблон описывает заголовки вкладок.\nВозможно использовать следующие переменные:\n

data/catalogs/apps/terminal/sk.catkeys

@@ -1,11 +1,10 @@
-1	slovak	x-vnd.Haiku-Terminal	1294209621
+1	slovak	x-vnd.Haiku-Terminal	2912171349
 Not found.	Terminal TermWindow		Nenájdené.
 Switch Terminals	Terminal TermWindow		Prepnúť terminály
 Change directory	Terminal TermView		Zmeniť adresár
 OK	Terminal TermWindow		OK
 New Terminal	Terminal TermWindow		Nový terminál
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Terminálu sa nepodarilo spustiť shell. Ľutujeme.
-Text size	Terminal TermWindow		Veľkosť textu
 Match case	Terminal FindWindow		Rozlišovať veľkosť písmen
 Quit	Terminal TermWindow		Ukončiť
 Use default shell	Terminal Shell		Použiť predvolený shell
@@ -13,10 +12,8 @@ Confirm exit if active programs exist	Terminal AppearancePrefView		Potvrdiť uko
 The pattern specifying the current tab title. The following placeholders\ncan be used:\n	Terminal TermWindow		Vzor určujúci názov aktuálnej karty. Možno použiť\nnasledovné zástupné symboly:\n
 Select all	Terminal TermWindow		Vybrať všetky
 Close tab	Terminal TermWindow		Zatvoriť okno
-Custom	Terminal colors schema		Vlastné
 Save to file…	Terminal PrefWindow		Uložiť do súboru…
 OK	Terminal PrefWindow		OK
-Black on White	Terminal colors schema		Čierna na bielej
 Window title:	Terminal AppearancePrefView		Titulok okna:
 Font:	Terminal AppearancePrefView		Písmo:
 Copy here	Terminal TermView		Skopírovať sem
@@ -34,13 +31,10 @@ Find	Terminal FindWindow		Nájsť
 Appearance	Terminal PrefWindow		Vzhľad
 Tab title:	Terminal AppearancePrefView		Titulok karty:
 The pattern specifying the window titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Vzor určujúci titulky okien. Možno použiť\nnasledovné zástupné symboly:\n
-Color schema:	Terminal AppearancePrefView		Farebná schéma:
 OK	Terminal SetTitleWindow		OK
 Background	Terminal AppearancePrefView		Pozadie
 Use selection	Terminal FindWindow		Použiť výber
-Green on Black	Terminal colors schema		Zelená na čiernom
 The process \"%1\" is still running.\nIf you close the tab, the process will be killed.	Terminal TermWindow		Proces „%1“ ešte stále beží.\nAk zatvoríte kartu, proces bude zabitý.
-Size:	Terminal AppearancePrefView		Veľkosť:
 Cannot execute \"%command\":\n\t%error	Terminal Shell		Nie je možné vykonať „%command“:\n\t%error
   -h,     --help               print this help\n  -t,     --title              set window title\n  -f,     --fullscreen         start fullscreen\n	Terminal TermApp		  -h,     --help               print this help\n  -t,     --title              set window title\n  -f,     --fullscreen         start fullscreen\n
 Full screen	Terminal TermWindow		Celoobrazovkový režim
@@ -61,7 +55,6 @@ Find…	Terminal TermWindow		Nájsť…
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Proces „%1“ ešte stále beží.\nAk zatvoríte Terminál, proces bude zabitý.
 Move here	Terminal TermView		Presunúť sem
 \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-\tAktuálny adresár aktívneho procesu\n\t\t\tv aktuálnej karte. Nepovinne je možné určiť maximálny počet\n\t\t\tzložiek cesty. Napr. „%2d“ pre najviac dve zložky.\n\t%i\t-\tIndex okna.\n\t%p\t-\tNázov aktívneho procesu v aktuálnej karte.\n\t%t\t-\tTitulok aktuálnej karty.\n\t%%\t-\tZnak „%“.
-White on Black	Terminal colors schema		Biela na čiernej
 Error!	Terminal getString		Chyba!
 New tab	Terminal TermWindow		Nová karta
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Vzor určujúci titulky kariet. Možno použiť\nnasledovné zástupné symboly:\n

data/catalogs/apps/terminal/sv.catkeys

@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Haiku-Terminal	3929743651
+1	swedish	x-vnd.Haiku-Terminal	1252738083
 Not found.	Terminal TermWindow		Hittades ej.
 Switch Terminals	Terminal TermWindow		Växla terminal
 Change directory	Terminal TermView		Byt katalog
@@ -6,7 +6,6 @@ OK	Terminal TermWindow		OK
 New Terminal	Terminal TermWindow		Ny terminal
 Cursor text	Terminal AppearancePrefView		Markörtext
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Terminalen kunde inte starta skalet.
-Text size	Terminal TermWindow		Teckenstorlek
 Match case	Terminal FindWindow		Matcha gemener/versaler
 Quit	Terminal TermWindow		Avsluta
 Use default shell	Terminal Shell		Använd standardskal
@@ -14,10 +13,8 @@ Confirm exit if active programs exist	Terminal AppearancePrefView		Bekräfta avs
 The pattern specifying the current tab title. The following placeholders\ncan be used:\n	Terminal TermWindow		Mönstret bestämmer namn på den aktiva fliken. Följande alternativ finns:\n
 Select all	Terminal TermWindow		Markera allt
 Close tab	Terminal TermWindow		Stäng flik
-Custom	Terminal colors schema		Anpassad
 Save to file…	Terminal PrefWindow		Spara till fil...
 OK	Terminal PrefWindow		OK
-Black on White	Terminal colors schema		Svart på vitt
 Window title:	Terminal AppearancePrefView		Fönstertitel:
 Font:	Terminal AppearancePrefView		Typsnitt:
 Copy here	Terminal TermView		Kopiera hit
@@ -35,13 +32,10 @@ Find	Terminal FindWindow		Sök
 Appearance	Terminal PrefWindow		Utseende
 Tab title:	Terminal AppearancePrefView		Fliktitel:
 The pattern specifying the window titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Mönstret bestämmer namn på fönster. Följande alternativ finns:\n
-Color schema:	Terminal AppearancePrefView		Färgschema:
 OK	Terminal SetTitleWindow		OK
 Background	Terminal AppearancePrefView		Bakgrund
 Use selection	Terminal FindWindow		Använd markering
-Green on Black	Terminal colors schema		Grönt på svart
 The process \"%1\" is still running.\nIf you close the tab, the process will be killed.	Terminal TermWindow		Processen \"%1\" körs fortfarande.\nOm du stänger fliken kommer processen att termineras.
-Size:	Terminal AppearancePrefView		Storlek:
 Cannot execute \"%command\":\n\t%error	Terminal Shell		Kan inte utföra "%command":\n\t%error
   -h,     --help               print this help\n  -t,     --title              set window title\n  -f,     --fullscreen         start fullscreen\n	Terminal TermApp		  -h,     --help               visa denna hjälp\n  -t,     --title             sätt tittel på fönstret\n  -f,     --fullscreen         starta i fullskärm\n
 Full screen	Terminal TermWindow		Helskärm
@@ -63,7 +57,6 @@ 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 '%'.
-White on Black	Terminal colors schema		Vitt på svart
 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

data/catalogs/apps/terminal/uk.catkeys

@@ -1,11 +1,10 @@
-1	ukrainian	x-vnd.Haiku-Terminal	1054657081
+1	ukrainian	x-vnd.Haiku-Terminal	2672618809
 Not found.	Terminal TermWindow		Не знайдено.
 Switch Terminals	Terminal TermWindow		Перемкнути термінали
 Change directory	Terminal TermView		Змінити каталог
 OK	Terminal TermWindow		Гаразд
 New Terminal	Terminal TermWindow		Новий термінал
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		Термінал не зміг запустити оболонку. Прикро.
-Text size	Terminal TermWindow		Розмір тексту
 Match case	Terminal FindWindow		Враховувати регістр
 Quit	Terminal TermWindow		Вийти
 Use default shell	Terminal Shell		Використати оболонку по замовчуванню
@@ -13,10 +12,8 @@ Confirm exit if active programs exist	Terminal AppearancePrefView		Підтве
 The pattern specifying the current tab title. The following placeholders\ncan be used:\n	Terminal TermWindow		Шаблон для поточної вкладки. Наступні заповнювачі\n можуть бути використані:\n
 Select all	Terminal TermWindow		Вибрати все
 Close tab	Terminal TermWindow		Закрити вкладку
-Custom	Terminal colors schema		Спеціальний
 Save to file…	Terminal PrefWindow		Зберегти у файл…
 OK	Terminal PrefWindow		Гаразд
-Black on White	Terminal colors schema		Чорним по білому
 Window title:	Terminal AppearancePrefView		Ім'я вікна:
 Font:	Terminal AppearancePrefView		Шрифт:
 Copy here	Terminal TermView		Копіювати сюди
@@ -34,13 +31,10 @@ Find	Terminal FindWindow		Знайти
 Appearance	Terminal PrefWindow		Зовн. вигляд
 Tab title:	Terminal AppearancePrefView		Ім'я вкладки:
 The pattern specifying the window titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Шаблон для поточного імені вкладки. Наступні заповнювачі\nможуть бути використані:\n
-Color schema:	Terminal AppearancePrefView		Схема кольорів:
 OK	Terminal SetTitleWindow		Гаразд
 Background	Terminal AppearancePrefView		Тло
 Use selection	Terminal FindWindow		Використати вибране
-Green on Black	Terminal colors schema		Зелене на чорному
 The process \"%1\" is still running.\nIf you close the tab, the process will be killed.	Terminal TermWindow		Процес \"%1\" надалі запущено.\nIЯкщо Ви закриєте вкладку, процес буде вбито.
-Size:	Terminal AppearancePrefView		Розмір:
 Cannot execute \"%command\":\n\t%error	Terminal Shell		Неможливо виконати \"%command\":\n\t%error
 Full screen	Terminal TermWindow		У повний екран
 Window title…	Terminal TermWindow		Заголовок вікна…
@@ -60,7 +54,6 @@ Find…	Terminal TermWindow		Знайти…
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Процес \"%1\" надалі запущено.\nЯкщо Ви закриєте Terminal, процес буде вбито.
 Move here	Terminal TermView		Перемістити сюди
 \t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\tПоточний каталог активного процесу\n\t\t\tв поточній вкладці. Додатково можна вказати максимальну кількість компонентів шляху\n\t\t\t Наприклад '%2d' ніж 2 компоненти.\n\t%i\t-\tіндекс вікна.\n\t%p\t-\tІм'я активного процесу поточної вкладки.\n\t%%\t-\tІм'я поточної вкладки.\n\t%%\t-\tСимвол '%'.
-White on Black	Terminal colors schema		Білим по чорному
 Error!	Terminal getString		Помилка!
 New tab	Terminal TermWindow		Нова вкладка
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		Шаблон для імен вікон. Наступні заповнювачі\nможуть бути використані:\n

data/catalogs/apps/terminal/zh_Hans.catkeys

@@ -1,11 +1,10 @@
-1	english	x-vnd.Haiku-Terminal	1294209621
+1	english	x-vnd.Haiku-Terminal	2912171349
 Not found.	Terminal TermWindow		未找到。  
 Switch Terminals	Terminal TermWindow		切换终端
 Change directory	Terminal TermView		更改目录
 OK	Terminal TermWindow		确定
 New Terminal	Terminal TermWindow		新建窗口
 Terminal couldn't start the shell. Sorry.	Terminal TermApp		终端无法启动shell，非常抱歉。
-Text size	Terminal TermWindow		文本大小  
 Match case	Terminal FindWindow		匹配大小写  
 Quit	Terminal TermWindow		退出
 Use default shell	Terminal Shell		使用默认shell  
@@ -13,10 +12,8 @@ Confirm exit if active programs exist	Terminal AppearancePrefView		如果存在
 The pattern specifying the current tab title. The following placeholders\ncan be used:\n	Terminal TermWindow		该图案指定了当前标签标题。可以使用下述的\n占位符：\n
 Select all	Terminal TermWindow		全选
 Close tab	Terminal TermWindow		关闭标签
-Custom	Terminal colors schema		自定义
 Save to file…	Terminal PrefWindow		保存为…
 OK	Terminal PrefWindow		确定
-Black on White	Terminal colors schema		白底黑字
 Window title:	Terminal AppearancePrefView		窗口标题：
 Font:	Terminal AppearancePrefView		字体：
 Copy here	Terminal TermView		复制到此  
@@ -34,13 +31,10 @@ Find	Terminal FindWindow		查找
 Appearance	Terminal PrefWindow		外观
 Tab title:	Terminal AppearancePrefView		标签标题：
 The pattern specifying the window titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		该图案指定了窗口标题。可以使用下述的\n占位符：\n
-Color schema:	Terminal AppearancePrefView		色彩模式：
 OK	Terminal SetTitleWindow		确定
 Background	Terminal AppearancePrefView		背景
 Use selection	Terminal FindWindow		使用选择
-Green on Black	Terminal colors schema		黑底绿字
 The process \"%1\" is still running.\nIf you close the tab, the process will be killed.	Terminal TermWindow		\"%1\" 进程仍在运行。\n如果关闭该标签，该进程将被杀死。
-Size:	Terminal AppearancePrefView		大小：
 Cannot execute \"%command\":\n\t%error	Terminal Shell		无法运行\"%command\":\n\t%错误
   -h,     --help               print this help\n  -t,     --title              set window title\n  -f,     --fullscreen         start fullscreen\n	Terminal TermApp		-h, --help 打印帮助内容\n-t, --title 设置窗口标题\n-f, --fullscreen 全屏启动\n
 Full screen	Terminal TermWindow		全屏
@@ -61,7 +55,6 @@ Find…	Terminal TermWindow		查找…
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		\"%1\" 进程仍在运行。\n如果关闭终端，该进程将被杀死。
 Move here	Terminal TermView		移动到此
 \t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\t当前标签中，活动进程的当前工作目录。\n\t\t组件可以指定的最大路径数量。例如，'%2d'，可以指定至多两个组件。\n\t%i\t-\t窗口的索引。\n\t%p\t-\t当前标签中的活动进程。\n\t%t\t-\t当前标签的标题。\n\t%%\t-\t字符 '%'。
-White on Black	Terminal colors schema		黑底白字
 Error!	Terminal getString		错误！
 New tab	Terminal TermWindow		新建标签
 The pattern specifying the tab titles. The following placeholders\ncan be used:\n	Terminal AppearancePrefView		该图案指定了标签标题。可以使用下述的\n占位符：\n

data/catalogs/kits/fr.catkeys

@@ -1,21 +1,29 @@
-1	french	x-vnd.Haiku-libbe	864109244
+1	french	x-vnd.Haiku-libbe	1916257017
+gamma	AboutWindow		gamma
+beta	AboutWindow		bêta
 %3.2f GiB	StringForSize		%3.2f Gio
 Written by:	AboutWindow		Écrit par :
 About %app%	AboutMenuItem		À propos de %app%
 Cut	TextView		Couper
+Version	AboutWindow		Version
 Cannot create the replicant for \"%description\".\n%error	ZombieReplicantView		Impossible de créer le réplicant pour « %description ».\n%error
+About	AboutWindow		À propos
 Copy	TextView		Copier
 %3.2f KiB	StringForSize		%3.2f Kio
 %d bytes	StringForSize		%d octets
+alpha	AboutWindow		alpha
 Error	PrintJob		Erreur
 No Pages to print!	PrintJob		Aucune page à imprimer !
+All Rights Reserved.	AboutWindow		Tous droits réservés.
 OK	Dragger		OK
 OK	PrintJob		OK
 Green:	ColorControl		Vert :
+Version history:	AboutWindow		Historique des versions :
 Remove replicant	Dragger		Enlever le réplicant
 OK	ZombieReplicantView		OK
 Print Server is not responding.	PrintJob		Le serveur d'impression ne répond pas.
 Paste	TextView		Coller
+Special Thanks:	AboutWindow		Remerciements particuliers :
 %.2f TiB	StringForSize		%.2f Tio
 Cannot locate the application for the replicant. No application signature supplied.\n%error	ZombieReplicantView		Impossible de localiser l'application du réplicant. Aucune signature d'application fournie.\n%error
 Redo	TextView		Refaire
@@ -26,6 +34,7 @@ Undo	TextView		Annuler
 Red:	ColorControl		Rouge :
 %3.2f MiB	StringForSize		%3.2f Mio
 About %app…	Dragger		À propos de %app…
+development	AboutWindow		développement
 Error	ZombieReplicantView		Erreur
 Blue:	ColorControl		Bleu :
 Can't delete this replicant from its original application. Life goes on.	Dragger		Impossible de supprimer ce réplicant à partir de son application d'origine. La vie continue.

data/catalogs/kits/ja.catkeys

@@ -1,4 +1,4 @@
-1	japanese	x-vnd.Haiku-libbe	2804831005
+1	japanese	x-vnd.Haiku-libbe	1560959841
 %3.2f GiB	StringForSize		%3.2f GiB
 Written by:	AboutWindow		作者:
 About %app%	AboutMenuItem		%app% について
@@ -31,4 +31,5 @@ Red:	ColorControl		赤：
 About %app…	Dragger		%appについて…
 Error	ZombieReplicantView		エラー
 Blue:	ColorControl		青：
+gold master	AboutWindow		ゴールデンマスター
 Can't delete this replicant from its original application. Life goes on.	Dragger		このレプリカントを元々のアプリケーションから削除することはできません。現状を維持します。

data/catalogs/kits/tracker/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-libtracker	1301055003
+1	french	x-vnd.Haiku-libtracker	3955647850
 common	B_COMMON_DIRECTORY		commun
 OK	WidgetAttributeText		OK
 Icon view	VolumeWindow		Vue en icônes
@@ -452,6 +452,7 @@ Mount	DeskWindow		Monter
 Mount	ContainerWindow		Monter
 %capacity (%used used -- %free free)	InfoWindow		%capacity (%used utilisés -- %free libres)
 Cancel	FSClipBoard		Annuler
+Restart Deskbar	DeskWindow		Redémarrer la Deskbar
 Cut more	ContainerWindow		Couper plus
 Deleting: 	StatusWindow		Suppression : 
 Empty Trash	InfoWindow		Vider la corbeille

data/catalogs/preferences/appearance/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-Appearance	1428480647
+1	french	x-vnd.Haiku-Appearance	963769669
 Plain font:	Font view		Police simple :
 Control highlight	Colors tab		Mise en valeur de contrôle
 Control border	Colors tab		Bordure des contrôles
@@ -23,27 +23,33 @@ Tooltip background	Colors tab		Arrière plan des bulles d'aide
 Selected menu item background	Colors tab		Arrière plan de l'élément sélectionnée dans le menu
 Antialiasing	APRWindow		Lissage
 Navigation base	Colors tab		Base de navigation
+Selected list item text	Colors tab		Texte de l'élément sélectionné dans la liste
 Window border	Colors tab		Bordure de fenêtre
+Double:	DecorSettingsView		Double :
 Window tab text	Colors tab		Texte des titres de fenêtres
 Document text	Colors tab		Texte du document
 Navigation pulse	Colors tab		Pulsation de navigation
 Window decorator:	DecorSettingsView		Décorateur de fenêtre :
 Selected menu item text	Colors tab		Texte de l'élément sélectionné dans le menu
 Menu background	Colors tab		Arrière plan de menu
+List background	Colors tab		Arrière-plan de la liste
 OK	DecorSettingsView		OK
 Control mark	Colors tab		Point de contrôle
 Size:	Font Selection view		Taille :
+Selected list item background	Colors tab		Arrière plan de l'élément sélectionnée dans la liste
 Panel background	Colors tab		Arrière plan des panneaux
 Menu font:	Font view		Police des menus :
 Colors	APRWindow		Couleurs
 Control background	Colors tab		Arrière plan des contrôles
 Inactive window tab	Colors tab		Titres des fenêtres inactives
+List item text	Colors tab		Texte de l’élément de la liste
 Appearance	System name		Apparence
 Fixed font:	Font view		Police à chasse fixe :
 The quick brown fox jumps over the lazy dog.	Font Selection view	Don't translate this literally ! Use a phrase showing all chars from A to Z.	Voix ambiguë d'un cœur qui au zéphyr préfère les jattes de kiwis . 0123456789
 Reduce colored edges filter strength:	AntialiasingSettingsView		Intensité du filtre de réduction des bords de couleurs :
 Subpixel based anti-aliasing in combination with glyph hinting is not available in this build of Haiku to avoid possible patent issues. To enable this feature, you have to build Haiku yourself and enable certain options in the libfreetype configuration header.	AntialiasingSettingsView		Le lissage sous-pixel n'est pas disponible en même temps que les consignes de glyphes dans cette version d'Haiku afin d'éviter des problèmes de brevets logiciels. Pour activer cette fonctionnalité, vous devez compiler Haiku vous-même et activer certaines options dans l'en-tête de configuration de libfreetype.
 Control text	Colors tab		Texte des contrôles
+Single:	DecorSettingsView		Simple :
 Tooltip text	Colors tab		Texte des bulles d'aide
 Bold font:	Font view		Caractères gras :
 Inactive window border	Colors tab		Bordure de fenêtre inactive

data/catalogs/servers/debug/fr.catkeys

@@ -1,3 +1,4 @@
-1	french	x-vnd.Haiku-debug_server	3203333611
+1	french	x-vnd.Haiku-debug_server	945172012
 Debug	DebugServer		Déboguer
+Kill	DebugServer		Tuer
 The application:\n\n      %app\n\nhas encountered an error which prevents it from continuing. Haiku will terminate the application and clean up.	DebugServer		L'application :\n\n      %app\n\na rencontré une erreur l'empêchant de continuer. Haiku va fermer l'application et libérer ses ressources.

headers/os/drivers/ACPI.h

@@ -236,8 +236,8 @@ struct acpi_module_info {
 
 	/* Control method execution and data acquisition */
 
-	status_t	(*evaluate_object)(const char* object,
+	status_t	(*evaluate_object)(acpi_handle handle, const char* object,
-					acpi_object_type *returnValue, size_t bufferLength);
+					acpi_objects *args, acpi_object_type *returnValue, size_t bufferLength);
 	status_t	(*evaluate_method)(acpi_handle handle, const char *method,
 					acpi_objects *args, acpi_data *returnValue);
 

src/add-ons/kernel/bus_managers/acpi/ACPIPrivate.h

@@ -115,8 +115,9 @@ typedef struct acpi_root_info {
 
 	/* Control method execution and data acquisition */
 
-	status_t	(*evaluate_object)(const char* object,
+	status_t	(*evaluate_object)(acpi_handle handle, const char* object,
-					acpi_object_type *returnValue, size_t bufferLength);
+					acpi_objects *args, acpi_object_type *returnValue,
+					size_t bufferLength);
 	status_t	(*evaluate_method)(acpi_handle handle, const char *method,
 					acpi_objects *args, acpi_data *returnValue);
 
@@ -203,8 +204,8 @@ status_t get_object_typed(const char* path, acpi_object_type** _returnValue,
 	uint32 object_type);
 status_t ns_handle_to_pathname(acpi_handle targetHandle, acpi_data* buffer);
 
-status_t evaluate_object(const char* object, acpi_object_type* returnValue,
+status_t evaluate_object(acpi_handle handle, const char* object,
-	size_t bufferLength);
+	acpi_objects* args, acpi_object_type* returnValue, size_t bufferLength);
 status_t evaluate_method(acpi_handle handle, const char* method,
 	acpi_objects* args, acpi_data* returnValue);
 

src/add-ons/kernel/bus_managers/acpi/BusManager.cpp

@@ -554,8 +554,8 @@ ns_handle_to_pathname(acpi_handle targetHandle, acpi_data *buffer)
 
 
 status_t
-evaluate_object(const char* object, acpi_object_type* returnValue,
+evaluate_object(acpi_handle handle, const char* object, acpi_objects *args,
-	size_t bufferLength)
+	acpi_object_type* returnValue, size_t bufferLength)
 {
 	ACPI_BUFFER buffer;
 	ACPI_STATUS status;
@@ -563,8 +563,8 @@ evaluate_object(const char* object, acpi_object_type* returnValue,
 	buffer.Pointer = returnValue;
 	buffer.Length = bufferLength;
 
-	status = AcpiEvaluateObject(NULL, (ACPI_STRING)object, NULL,
+	status = AcpiEvaluateObject(handle, (ACPI_STRING)object,
-		returnValue != NULL ? &buffer : NULL);
+		(ACPI_OBJECT_LIST*)args, returnValue != NULL ? &buffer : NULL);
 	if (status == AE_BUFFER_OVERFLOW)
 		dprintf("evaluate_object: the passed buffer is too small!\n");
 

src/add-ons/kernel/drivers/Jamfile

@@ -5,6 +5,7 @@ SubInclude HAIKU_TOP src add-ons kernel drivers bus ;
 SubInclude HAIKU_TOP src add-ons kernel drivers audio ;
 SubInclude HAIKU_TOP src add-ons kernel drivers common ;
 SubInclude HAIKU_TOP src add-ons kernel drivers disk ;
+SubInclude HAIKU_TOP src add-ons kernel drivers display ;
 SubInclude HAIKU_TOP src add-ons kernel drivers dvb ;
 SubInclude HAIKU_TOP src add-ons kernel drivers input ;
 SubInclude HAIKU_TOP src add-ons kernel drivers joystick ;

src/add-ons/kernel/drivers/display/Jamfile

@@ -0,0 +1,10 @@
+SubDir HAIKU_TOP src add-ons kernel drivers display ;
+
+UsePrivateHeaders kernel ;
+
+KernelAddon display_controls :
+	display_controls.cpp
+	;
+
+Depends display_controls : acpi ;
+

src/add-ons/kernel/drivers/display/display_controls.cpp

@@ -0,0 +1,279 @@
+#include <KernelExport.h>
+#include <Drivers.h>
+#include <Errors.h>
+#include <string.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <ACPI.h>
+
+
+#define DISPLAYCONTROLS_MODULE_NAME "drivers/display/display_controls/driver_v1"
+
+#define DISPLAYCONTROLS_DEVICE_MODULE_NAME "drivers/display/display_controls/device_v1"
+
+/* Base Namespace devices are published to */
+#define DISPLAYCONTROLS_BASENAME "display/display_controls/%d"
+
+// name of pnp generator of path ids
+#define DISPLAYCONTROLS_PATHID_GENERATOR "displaycontrols/path_id"
+
+
+#define OS_DISPLAY_SWITCH 0
+#define BIOS_DISPLAY_SWITCH 1
+#define LOCK_DISPLAY_SWITCH 2
+#define NOTIFY_DISPLAY_SWITCH 3
+
+#define OS_BRIGHTNESS_CONTROL (1 << 2)
+#define BIOS_BRIGHTNESS_CONTROL (0 << 2)
+
+static device_manager_info *sDeviceManager;
+static acpi_module_info *sAcpi;
+
+
+typedef struct acpi_ns_device_info {
+	device_node *node;
+	acpi_handle acpi_device;
+} displaycontrols_device_info;
+
+
+//	#pragma mark - device module API
+
+
+static status_t
+displaycontrols_init_device(void *_cookie, void **cookie)
+{
+	device_node *node = (device_node *)_cookie;
+	displaycontrols_device_info *device;
+	device_node *parent;
+
+	acpi_objects arguments;
+	acpi_object_type argument;
+
+	const char *path;
+	dprintf("%s: start.\n", __func__);
+
+
+	device = (displaycontrols_device_info *)calloc(1, sizeof(*device));
+	if (device == NULL)
+		return B_NO_MEMORY;
+
+	device->node = node;
+	if (sDeviceManager->get_attr_string(node, ACPI_DEVICE_PATH_ITEM, &path, false)
+			!= B_OK || sAcpi->get_handle(NULL, path, &device->acpi_device) != B_OK) {
+		dprintf("%s: failed to get acpi node.\n", __func__);
+		return B_ERROR;
+	}
+
+	argument.object_type = ACPI_TYPE_INTEGER;
+	argument.data.integer = BIOS_DISPLAY_SWITCH | BIOS_BRIGHTNESS_CONTROL;
+	arguments.count = 1;
+	arguments.pointer = &argument;
+	if (sAcpi->evaluate_object(&device->acpi_device, "_DOS", &arguments, NULL, 0)
+			!= B_OK)
+		dprintf("%s: failed to set _DOS %s\n", __func__, path);
+
+	dprintf("%s: done.\n", __func__);
+	*cookie = device;
+	return B_OK;
+}
+
+
+static void
+displaycontrols_uninit_device(void *_cookie)
+{
+	displaycontrols_device_info *device = (displaycontrols_device_info *)_cookie;
+	free(device);
+}
+
+
+static status_t
+displaycontrols_open(void *_cookie, const char *path, int flags, void** cookie)
+{
+	displaycontrols_device_info *device = (displaycontrols_device_info *)_cookie;
+	*cookie = device;
+	return B_OK;
+}
+
+
+static status_t
+displaycontrols_read(void* _cookie, off_t position, void *buf, size_t* num_bytes)
+{
+	return B_ERROR;
+}
+
+
+static status_t
+displaycontrols_write(void* cookie, off_t position, const void* buffer, size_t* num_bytes)
+{
+	return B_ERROR;
+}
+
+
+static status_t
+displaycontrols_control(void* _cookie, uint32 op, void* arg, size_t len)
+{
+//	displaycontrols_device_info* device = (displaycontrols_device_info*)_cookie;
+
+	return B_ERROR;
+}
+
+
+static status_t
+displaycontrols_close(void* cookie)
+{
+	return B_OK;
+}
+
+
+static status_t
+displaycontrols_free(void* cookie)
+{
+	return B_OK;
+}
+
+
+//	#pragma mark - driver module API
+
+
+static float
+displaycontrols_support(device_node *parent)
+{
+	acpi_handle handle, method;
+//	acpi_object_type dosType;
+
+	const char *bus;
+	const char *path;
+	uint32 device_type;
+
+	// make sure parent is really the ACPI bus manager
+	if (sDeviceManager->get_attr_string(parent, B_DEVICE_BUS, &bus, false))
+		return -1;
+
+	if (strcmp(bus, "acpi"))
+		return 0.0;
+
+	if (sDeviceManager->get_attr_string(parent, ACPI_DEVICE_PATH_ITEM, &path, false) != B_OK)
+		return 0.0;
+
+	// check whether it's really a device
+	if (sDeviceManager->get_attr_uint32(parent, ACPI_DEVICE_TYPE_ITEM, &device_type, false) != B_OK
+		|| device_type != ACPI_TYPE_DEVICE) {
+		return 0.0;
+	}
+
+
+	if (sAcpi->get_handle(NULL, path, &handle) != B_OK)
+		return 0.0;
+
+	if (sAcpi->get_handle(handle, "_DOD", &method) != B_OK ||
+		sAcpi->get_handle(handle, "_DOS", &method) != B_OK) {// ||
+//		sAcpi->get_type(method, &dosType) != B_OK ||
+//		dosType != ACPI_TYPE_METHOD) {
+		return 0.0;
+	}
+
+	dprintf("%s: found at bus: %s path: %s\n", __func__, bus, path);
+	return 0.6;
+}
+
+
+static status_t
+displaycontrols_register_device(device_node *node)
+{
+	device_attr attrs[] = {
+		{ B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "Display Controls" }},
+		{ B_DEVICE_FLAGS, B_UINT32_TYPE, { ui32: B_KEEP_DRIVER_LOADED }},
+		{ NULL }
+	};
+
+	return sDeviceManager->register_node(node, DISPLAYCONTROLS_MODULE_NAME, attrs, NULL, NULL);
+}
+
+
+static status_t
+displaycontrols_init_driver(device_node *node, void **_driverCookie)
+{
+	*_driverCookie = node;
+	return B_OK;
+}
+
+
+static void
+displaycontrols_uninit_driver(void *driverCookie)
+{
+}
+
+
+static status_t
+displaycontrols_register_child_devices(void *_cookie)
+{
+	device_node *node = (device_node*)_cookie;
+	int path_id;
+	char name[128];
+
+	path_id = sDeviceManager->create_id(DISPLAYCONTROLS_PATHID_GENERATOR);
+	if (path_id < 0) {
+		dprintf("displaycontrols_register_child_devices: couldn't create a path_id\n");
+		return B_ERROR;
+	}
+
+	snprintf(name, sizeof(name), DISPLAYCONTROLS_BASENAME, path_id);
+
+	return sDeviceManager->publish_device(node, name, DISPLAYCONTROLS_DEVICE_MODULE_NAME);
+}
+
+
+module_dependency module_dependencies[] = {
+	{ B_DEVICE_MANAGER_MODULE_NAME, (module_info **)&sDeviceManager },
+	{ B_ACPI_MODULE_NAME, (module_info **)&sAcpi},
+	{}
+};
+
+
+driver_module_info displaycontrols_driver_module = {
+	{
+		DISPLAYCONTROLS_MODULE_NAME,
+		0,
+		NULL
+	},
+
+	displaycontrols_support,
+	displaycontrols_register_device,
+	displaycontrols_init_driver,
+	displaycontrols_uninit_driver,
+	displaycontrols_register_child_devices,
+	NULL,	// rescan
+	NULL,	// removed
+};
+
+
+struct device_module_info displaycontrols_device_module = {
+	{
+		DISPLAYCONTROLS_DEVICE_MODULE_NAME,
+		0,
+		NULL
+	},
+
+	displaycontrols_init_device,
+	displaycontrols_uninit_device,
+	NULL,
+
+	displaycontrols_open,
+	displaycontrols_close,
+	displaycontrols_free,
+	displaycontrols_read,
+	displaycontrols_write,
+	NULL,
+	displaycontrols_control,
+
+	NULL,
+	NULL
+};
+
+module_info *modules[] = {
+	(module_info *)&displaycontrols_driver_module,
+	(module_info *)&displaycontrols_device_module,
+	NULL
+};

src/apps/debugger/Jamfile

@@ -193,11 +193,13 @@ Application Debugger :
 	CliContext.cpp
 	CliContinueCommand.cpp
 	CliDebugReportCommand.cpp
+	CliStackFrameCommand.cpp
 	CliStackTraceCommand.cpp
 	CliStopCommand.cpp
 	CliThreadCommand.cpp
 	CliThreadsCommand.cpp
 	CliQuitCommand.cpp
+	CliVariablesCommand.cpp
 	CommandLineUserInterface.cpp
 
 	# user_interface/gui

src/apps/debugger/debug_info/DebuggerImageDebugInfo.cpp

@@ -44,39 +44,8 @@ DebuggerImageDebugInfo::Init()
 status_t
 DebuggerImageDebugInfo::GetFunctions(BObjectList<FunctionDebugInfo>& functions)
 {
-	BObjectList<SymbolInfo> symbols(20, true);
+	return SpecificImageDebugInfo::GetFunctionsFromSymbols(functions,
-	status_t error = fDebuggerInterface->GetSymbolInfos(fImageInfo.TeamID(),
+		fDebuggerInterface, fImageInfo, this);
-		fImageInfo.ImageID(), symbols);
-	if (error != B_OK)
-		return error;
-
-	// sort the symbols -- not necessary, but a courtesy to ImageDebugInfo which
-	// will peform better when inserting functions at the end of a list
-	symbols.SortItems(&_CompareSymbols);
-
-	// create the function infos
-	int32 functionsAdded = 0;
-	for (int32 i = 0; SymbolInfo* symbol = symbols.ItemAt(i); i++) {
-		if (symbol->Type() != B_SYMBOL_TYPE_TEXT)
-			continue;
-
-		FunctionDebugInfo* function = new(std::nothrow) BasicFunctionDebugInfo(
-			this, symbol->Address(), symbol->Size(), symbol->Name(),
-			Demangler::Demangle(symbol->Name()));
-		if (function == NULL || !functions.AddItem(function)) {
-			delete function;
-			int32 index = functions.CountItems() - 1;
-			for (; functionsAdded >= 0; functionsAdded--, index--) {
-				function = functions.RemoveItemAt(index);
-				delete function;
-			}
-			return B_NO_MEMORY;
-		}
-
-		functionsAdded++;
-	}
-
-	return B_OK;
 }
 
 
@@ -144,12 +113,3 @@ DebuggerImageDebugInfo::AddSourceCodeInfo(LocatableFile* file,
 {
 	return B_UNSUPPORTED;
 }
-
-
-/*static*/ int
-DebuggerImageDebugInfo::_CompareSymbols(const SymbolInfo* a,
-	const SymbolInfo* b)
-{
-	return a->Address() < b->Address()
-		? -1 : (a->Address() == b->Address() ? 0 : 1);
-}

src/apps/debugger/debug_info/DebuggerImageDebugInfo.h

@@ -54,10 +54,6 @@ public:
 	virtual	status_t			AddSourceCodeInfo(LocatableFile* file,
 									FileSourceCode* sourceCode);
 
-private:
-	static	int					_CompareSymbols(const SymbolInfo* a,
-									const SymbolInfo* b);
-
 private:
 			ImageInfo			fImageInfo;
 			DebuggerInterface*	fDebuggerInterface;

src/apps/debugger/debug_info/DwarfImageDebugInfo.cpp

@@ -18,11 +18,14 @@
 #include <AutoLocker.h>
 
 #include "Architecture.h"
+#include "BasicFunctionDebugInfo.h"
 #include "CLanguage.h"
 #include "CompilationUnit.h"
 #include "CppLanguage.h"
 #include "CpuState.h"
+#include "DebuggerInterface.h"
 #include "DebugInfoEntries.h"
+#include "Demangler.h"
 #include "Dwarf.h"
 #include "DwarfFile.h"
 #include "DwarfFunctionDebugInfo.h"
@@ -44,6 +47,7 @@
 #include "StackFrame.h"
 #include "Statement.h"
 #include "StringUtils.h"
+#include "SymbolInfo.h"
 #include "TargetAddressRangeList.h"
 #include "TeamMemory.h"
 #include "Tracing.h"
@@ -226,14 +230,14 @@ struct DwarfImageDebugInfo::EntryListWrapper {
 
 
 DwarfImageDebugInfo::DwarfImageDebugInfo(const ImageInfo& imageInfo,
-	Architecture* architecture, TeamMemory* teamMemory,
+	DebuggerInterface* interface, Architecture* architecture,
 	FileManager* fileManager, GlobalTypeLookup* typeLookup,
 	GlobalTypeCache* typeCache, DwarfFile* file)
 	:
 	fLock("dwarf image debug info"),
 	fImageInfo(imageInfo),
+	fDebuggerInterface(interface),
 	fArchitecture(architecture),
-	fTeamMemory(teamMemory),
 	fFileManager(fileManager),
 	fTypeLookup(typeLookup),
 	fTypeCache(typeCache),
@@ -245,6 +249,7 @@ DwarfImageDebugInfo::DwarfImageDebugInfo(const ImageInfo& imageInfo,
 	fPLTSectionStart(0),
 	fPLTSectionEnd(0)
 {
+	fDebuggerInterface->AcquireReference();
 	fFile->AcquireReference();
 	fTypeCache->AcquireReference();
 }
@@ -252,6 +257,7 @@ DwarfImageDebugInfo::DwarfImageDebugInfo(const ImageInfo& imageInfo,
 
 DwarfImageDebugInfo::~DwarfImageDebugInfo()
 {
+	fDebuggerInterface->ReleaseReference();
 	fFile->ReleaseReference();
 	fTypeCache->ReleaseReference();
 }
@@ -397,7 +403,13 @@ DwarfImageDebugInfo::GetFunctions(BObjectList<FunctionDebugInfo>& functions)
 		}
 	}
 
-	return B_OK;
+	if (fFile->CountCompilationUnits() != 0)
+		return B_OK;
+
+	// if we had no compilation units, fall back to providing basic
+	// debug infos with DWARF-supported call frame unwinding
+	return SpecificImageDebugInfo::GetFunctionsFromSymbols(functions,
+		fDebuggerInterface, fImageInfo, this);
 }
 
 
@@ -419,7 +431,7 @@ DwarfImageDebugInfo::GetType(GlobalTypeCache* cache,
 	// create the target interface
 	BasicTargetInterface *inputInterface
 		= new(std::nothrow) BasicTargetInterface(registers, registerCount,
-			fromDwarfMap, fArchitecture, fTeamMemory);
+			fromDwarfMap, fArchitecture, fDebuggerInterface);
 
 	if (inputInterface == NULL)
 		return B_NO_MEMORY;
@@ -508,16 +520,17 @@ DwarfImageDebugInfo::CreateFrame(Image* image,
 {
 	DwarfFunctionDebugInfo* function = dynamic_cast<DwarfFunctionDebugInfo*>(
 		functionInstance->GetFunctionDebugInfo());
-	if (function == NULL)
-		return B_BAD_VALUE;
 
 	FunctionID* functionID = functionInstance->GetFunctionID();
-	if (functionID == NULL)
+	BReference<FunctionID> functionIDReference;
-		return B_NO_MEMORY;
+	if (functionID != NULL)
-	BReference<FunctionID> functionIDReference(functionID, true);
+		functionIDReference.SetTo(functionID, true);
+
+	DIESubprogram* entry = function != NULL
+		? function->SubprogramEntry() : NULL;
 
 	TRACE_CFI("DwarfImageDebugInfo::CreateFrame(): subprogram DIE: %p, "
-		"function: %s\n", function->SubprogramEntry(),
+		"function: %s\n", entry,
 		functionID->FunctionName().String());
 
 	int32 registerCount = fArchitecture->CountRegisters();
@@ -543,7 +556,8 @@ DwarfImageDebugInfo::CreateFrame(Image* image,
 	// create the target interfaces
 	UnwindTargetInterface* inputInterface
 		= new(std::nothrow) UnwindTargetInterface(registers, registerCount,
-			fromDwarfMap, toDwarfMap, cpuState, fArchitecture, fTeamMemory);
+			fromDwarfMap, toDwarfMap, cpuState, fArchitecture,
+			fDebuggerInterface);
 	if (inputInterface == NULL)
 		return B_NO_MEMORY;
 	BReference<UnwindTargetInterface> inputInterfaceReference(inputInterface,
@@ -552,7 +566,7 @@ DwarfImageDebugInfo::CreateFrame(Image* image,
 	UnwindTargetInterface* outputInterface
 		= new(std::nothrow) UnwindTargetInterface(registers, registerCount,
 			fromDwarfMap, toDwarfMap, previousCpuState, fArchitecture,
-			fTeamMemory);
+			fDebuggerInterface);
 	if (outputInterface == NULL)
 		return B_NO_MEMORY;
 	BReference<UnwindTargetInterface> outputInterfaceReference(outputInterface,
@@ -562,8 +576,9 @@ DwarfImageDebugInfo::CreateFrame(Image* image,
 	target_addr_t instructionPointer
 		= cpuState->InstructionPointer() - fRelocationDelta;
 	target_addr_t framePointer;
-	CompilationUnit* unit = function->GetCompilationUnit();
+	CompilationUnit* unit = function != NULL ? function->GetCompilationUnit()
-	error = fFile->UnwindCallFrame(unit, function->SubprogramEntry(),
+			: NULL;
+	error = fFile->UnwindCallFrame(unit, fArchitecture->AddressSize(), entry,
 		instructionPointer, inputInterface, outputInterface, framePointer);
 
 	if (error != B_OK) {
@@ -585,7 +600,8 @@ DwarfImageDebugInfo::CreateFrame(Image* image,
 	)
 
 	// create the stack frame debug info
-	DIESubprogram* subprogramEntry = function->SubprogramEntry();
+	DIESubprogram* subprogramEntry = function != NULL ?
+		function->SubprogramEntry() : NULL;
 	DwarfStackFrameDebugInfo* stackFrameDebugInfo
 		= new(std::nothrow) DwarfStackFrameDebugInfo(fArchitecture,
 			fImageInfo.ImageID(), fFile, unit, subprogramEntry, fTypeLookup,
@@ -616,35 +632,41 @@ DwarfImageDebugInfo::CreateFrame(Image* image,
 		// Note, this is correct, since we actually retrieved the return
 		// address. Our caller will fix the IP for us.
 
-	// create function parameter objects
+	// The subprogram entry may not be available since this may be a case
-	for (DebugInfoEntryList::ConstIterator it = subprogramEntry->Parameters()
+	// where .eh_frame was used to unwind the stack without other DWARF
-			.GetIterator(); DebugInfoEntry* entry = it.Next();) {
+	// info being available.
-		if (entry->Tag() != DW_TAG_formal_parameter)
+	if (subprogramEntry != NULL) {
-			continue;
+		// create function parameter objects
+		for (DebugInfoEntryList::ConstIterator it
+			= subprogramEntry->Parameters().GetIterator();
+			DebugInfoEntry* entry = it.Next();) {
+			if (entry->Tag() != DW_TAG_formal_parameter)
+				continue;
 
-		BString parameterName;
+			BString parameterName;
-		DwarfUtils::GetDIEName(entry, parameterName);
+			DwarfUtils::GetDIEName(entry, parameterName);
-		if (parameterName.Length() == 0)
+			if (parameterName.Length() == 0)
-			continue;
+				continue;
 
-		DIEFormalParameter* parameterEntry
+			DIEFormalParameter* parameterEntry
-			= dynamic_cast<DIEFormalParameter*>(entry);
+				= dynamic_cast<DIEFormalParameter*>(entry);
-		Variable* parameter;
+			Variable* parameter;
-		if (stackFrameDebugInfo->CreateParameter(functionID, parameterEntry,
+			if (stackFrameDebugInfo->CreateParameter(functionID,
-				parameter) != B_OK) {
+				parameterEntry, parameter) != B_OK) {
-			continue;
+				continue;
+			}
+			BReference<Variable> parameterReference(parameter, true);
+
+			if (!frame->AddParameter(parameter))
+				return B_NO_MEMORY;
 		}
-		BReference<Variable> parameterReference(parameter, true);
 
-		if (!frame->AddParameter(parameter))
+		// create objects for the local variables
-			return B_NO_MEMORY;
+		_CreateLocalVariables(unit, frame, functionID, *stackFrameDebugInfo,
+			instructionPointer, functionInstance->Address() - fRelocationDelta,
+			subprogramEntry->Variables(), subprogramEntry->Blocks());
 	}
 
-	// create objects for the local variables
-	_CreateLocalVariables(unit, frame, functionID, *stackFrameDebugInfo,
-		instructionPointer, functionInstance->Address() - fRelocationDelta,
-		subprogramEntry->Variables(), subprogramEntry->Blocks());
-
 	_frame = frameReference.Detach();
 	_previousCpuState = previousCpuStateReference.Detach();
 

src/apps/debugger/debug_info/DwarfImageDebugInfo.h

@@ -1,6 +1,6 @@
 /*
  * Copyright 2009, Ingo Weinhold, [email protected].
- * Copyright 2010, Rene Gollent, [email protected].
+ * Copyright 2010-2012, Rene Gollent, [email protected].
  * Distributed under the terms of the MIT License.
  */
 #ifndef DWARF_IMAGE_DEBUG_INFO_H
@@ -19,6 +19,7 @@
 
 class Architecture;
 class CompilationUnit;
+class DebuggerInterface;
 class DIEType;
 class DwarfStackFrameDebugInfo;
 class DwarfFile;
@@ -30,14 +31,13 @@ class GlobalTypeCache;
 class GlobalTypeLookup;
 class LocatableFile;
 class SourceCode;
-class TeamMemory;
 
 
 class DwarfImageDebugInfo : public SpecificImageDebugInfo {
 public:
 								DwarfImageDebugInfo(const ImageInfo& imageInfo,
+									DebuggerInterface* interface,
 									Architecture* architecture,
-									TeamMemory* teamMemory,
 									FileManager* fileManager,
 									GlobalTypeLookup* typeLookup,
 									GlobalTypeCache* typeCache,
@@ -106,8 +106,8 @@ private:
 private:
 			BLocker				fLock;
 			ImageInfo			fImageInfo;
+			DebuggerInterface*	fDebuggerInterface;
 			Architecture*		fArchitecture;
-			TeamMemory*			fTeamMemory;
 			FileManager*		fFileManager;
 			GlobalTypeLookup*	fTypeLookup;
 			GlobalTypeCache*	fTypeCache;

src/apps/debugger/debug_info/DwarfTeamDebugInfo.cpp

@@ -9,6 +9,7 @@
 
 #include <string.h>
 
+#include "DebuggerInterface.h"
 #include "DwarfFile.h"
 #include "DwarfImageDebugInfo.h"
 #include "DwarfManager.h"
@@ -17,22 +18,24 @@
 
 
 DwarfTeamDebugInfo::DwarfTeamDebugInfo(Architecture* architecture,
-	TeamMemory* teamMemory, FileManager* fileManager,
+	DebuggerInterface* interface, FileManager* fileManager,
 	GlobalTypeLookup* typeLookup, GlobalTypeCache* typeCache)
 	:
 	fArchitecture(architecture),
-	fTeamMemory(teamMemory),
+	fDebuggerInterface(interface),
 	fFileManager(fileManager),
 	fManager(NULL),
 	fTypeLookup(typeLookup),
 	fTypeCache(typeCache)
 {
+	fDebuggerInterface->AcquireReference();
 	fTypeCache->AcquireReference();
 }
 
 
 DwarfTeamDebugInfo::~DwarfTeamDebugInfo()
 {
+	fDebuggerInterface->ReleaseReference();
 	fTypeCache->ReleaseReference();
 	delete fManager;
 }
@@ -75,8 +78,8 @@ DwarfTeamDebugInfo::CreateImageDebugInfo(const ImageInfo& imageInfo,
 
 	// create the image debug info
 	DwarfImageDebugInfo* debugInfo = new(std::nothrow) DwarfImageDebugInfo(
-		imageInfo, fArchitecture, fTeamMemory, fFileManager, fTypeLookup,
+		imageInfo, fDebuggerInterface, fArchitecture, fFileManager,
-		fTypeCache, file);
+		fTypeLookup, fTypeCache, file);
 	if (debugInfo == NULL)
 		return B_NO_MEMORY;
 

src/apps/debugger/debug_info/DwarfTeamDebugInfo.h

@@ -9,6 +9,7 @@
 
 
 class Architecture;
+class DebuggerInterface;
 class DwarfManager;
 class FileManager;
 class ImageInfo;
@@ -20,7 +21,7 @@ class TeamMemory;
 class DwarfTeamDebugInfo : public SpecificTeamDebugInfo {
 public:
 								DwarfTeamDebugInfo(Architecture* architecture,
-									TeamMemory* teamMemory,
+									DebuggerInterface* interface,
 									FileManager* fileManager,
 									GlobalTypeLookup* typeLookup,
 									GlobalTypeCache* typeCache);
@@ -34,7 +35,7 @@ public:
 
 private:
 			Architecture*		fArchitecture;
-			TeamMemory*			fTeamMemory;
+			DebuggerInterface*	fDebuggerInterface;
 			FileManager*		fFileManager;
 			DwarfManager*		fManager;
 			GlobalTypeLookup*	fTypeLookup;

src/apps/debugger/debug_info/SpecificImageDebugInfo.cpp

@@ -5,7 +5,62 @@
 
 #include "SpecificImageDebugInfo.h"
 
+#include "BasicFunctionDebugInfo.h"
+#include "DebuggerInterface.h"
+#include "Demangler.h"
+#include "ImageInfo.h"
+#include "SymbolInfo.h"
+
 
 SpecificImageDebugInfo::~SpecificImageDebugInfo()
 {
 }
+
+
+/*static*/ status_t
+SpecificImageDebugInfo::GetFunctionsFromSymbols(
+	BObjectList<FunctionDebugInfo>& functions, DebuggerInterface* interface,
+	const ImageInfo& imageInfo, SpecificImageDebugInfo* info)
+{
+	BObjectList<SymbolInfo> symbols(20, true);
+	status_t error = interface->GetSymbolInfos(imageInfo.TeamID(),
+		imageInfo.ImageID(), symbols);
+	if (error != B_OK)
+		return error;
+
+	// sort the symbols -- not necessary, but a courtesy to ImageDebugInfo which
+	// will peform better when inserting functions at the end of a list
+	symbols.SortItems(&_CompareSymbols);
+
+	// create the function infos
+	int32 functionsAdded = 0;
+	for (int32 i = 0; SymbolInfo* symbol = symbols.ItemAt(i); i++) {
+		if (symbol->Type() != B_SYMBOL_TYPE_TEXT)
+			continue;
+
+		FunctionDebugInfo* function = new(std::nothrow) BasicFunctionDebugInfo(
+			info, symbol->Address(), symbol->Size(), symbol->Name(),
+			Demangler::Demangle(symbol->Name()));
+		if (function == NULL || !functions.AddItem(function)) {
+			delete function;
+			int32 index = functions.CountItems() - 1;
+			for (; functionsAdded >= 0; functionsAdded--, index--) {
+				function = functions.RemoveItemAt(index);
+				delete function;
+			}
+			return B_NO_MEMORY;
+		}
+
+		functionsAdded++;
+	}
+
+	return B_OK;
+}
+
+/*static*/ int
+SpecificImageDebugInfo::_CompareSymbols(const SymbolInfo* a,
+	const SymbolInfo* b)
+{
+	return a->Address() < b->Address()
+		? -1 : (a->Address() == b->Address() ? 0 : 1);
+}

src/apps/debugger/debug_info/SpecificImageDebugInfo.h

@@ -23,11 +23,13 @@ class FunctionDebugInfo;
 class FunctionInstance;
 class GlobalTypeCache;
 class Image;
+class ImageInfo;
 class LocatableFile;
 class SourceLanguage;
 class SourceLocation;
 class StackFrame;
 class Statement;
+class SymbolInfo;
 class Type;
 class TypeLookupConstraints;
 class ValueLocation;
@@ -76,6 +78,17 @@ public:
 
 	virtual	status_t			AddSourceCodeInfo(LocatableFile* file,
 									FileSourceCode* sourceCode) = 0;
+
+protected:
+	static	status_t			GetFunctionsFromSymbols(
+									BObjectList<FunctionDebugInfo>& functions,
+									DebuggerInterface* interface,
+									const ImageInfo& imageInfo,
+									SpecificImageDebugInfo* info);
+
+private:
+	static	int					_CompareSymbols(const SymbolInfo* a,
+									const SymbolInfo* b);
 };
 
 

src/apps/debugger/debug_managers/ValueNodeManager.cpp

@@ -103,11 +103,12 @@ ValueNodeManager::ValueNodeChanged(ValueNodeChild* nodeChild,
 
 	AutoLocker<ValueNodeContainer> containerLocker(fContainer);
 
+	for (int32 i = fListeners.CountItems() - 1; i >= 0; i--)
+		fListeners.ItemAt(i)->ValueNodeChanged(nodeChild, oldNode, newNode);
+
 	if (oldNode != NULL)
 		newNode->CreateChildren();
 
-	for (int32 i = fListeners.CountItems() - 1; i >= 0; i--)
-		fListeners.ItemAt(i)->ValueNodeChanged(nodeChild, oldNode, newNode);
 }
 
 

src/apps/debugger/dwarf/DwarfFile.cpp

@@ -386,10 +386,16 @@ DwarfFile::Load(const char* fileName)
 	// .eh_frame doesn't appear to get copied into separate debug
 	// info files properly, therefore always use it off the main
 	// executable image
-	fEHFrameSection = fElfFile->GetSection(".eh_frame");
+	if (fEHFrameSection == NULL)
+		fEHFrameSection = fElfFile->GetSection(".eh_frame");
 	fDebugLocationSection = debugInfoFile->GetSection(".debug_loc");
 	fDebugPublicTypesSection = debugInfoFile->GetSection(".debug_pubtypes");
 
+	if (fDebugInfoSection == NULL) {
+		fFinished = true;
+		return B_OK;
+	}
+
 	// iterate through the debug info section
 	DataReader dataReader(fDebugInfoSection->Data(),
 		fDebugInfoSection->Size(), 4);
@@ -570,7 +576,7 @@ DwarfFile::ResolveRangeList(CompilationUnit* unit, uint64 offset) const
 
 
 status_t
-DwarfFile::UnwindCallFrame(CompilationUnit* unit,
+DwarfFile::UnwindCallFrame(CompilationUnit* unit, uint8 addressSize,
 	DIESubprogram* subprogramEntry, target_addr_t location,
 	const DwarfTargetInterface* inputInterface,
 	DwarfTargetInterface* outputInterface, target_addr_t& _framePointer)
@@ -579,15 +585,15 @@ DwarfFile::UnwindCallFrame(CompilationUnit* unit,
 
 	// first try to find the FDE in .debug_frame
 	if (fDebugFrameSection != NULL) {
-		result = _UnwindCallFrame(false, unit, subprogramEntry, location,
+		result = _UnwindCallFrame(false, unit, addressSize, subprogramEntry,
-			inputInterface, outputInterface, _framePointer);
+			location, inputInterface, outputInterface, _framePointer);
 	}
 
 	// if .debug_frame isn't present, or if the FDE wasn't found there,
 	// try .eh_frame
 	if (result == B_ENTRY_NOT_FOUND && fEHFrameSection != NULL) {
-		result = _UnwindCallFrame(true, unit, subprogramEntry, location,
+		result = _UnwindCallFrame(true, unit, addressSize, subprogramEntry,
-			inputInterface, outputInterface, _framePointer);
+			location, inputInterface, outputInterface, _framePointer);
 	}
 
 	return result;
@@ -1329,7 +1335,7 @@ DwarfFile::_ParseLineInfo(CompilationUnit* unit)
 
 status_t
 DwarfFile::_UnwindCallFrame(bool usingEHFrameSection, CompilationUnit* unit,
-	DIESubprogram* subprogramEntry, target_addr_t location,
+	uint8 addressSize, DIESubprogram* subprogramEntry, target_addr_t location,
 	const DwarfTargetInterface* inputInterface,
 	DwarfTargetInterface* outputInterface, target_addr_t& _framePointer)
 {
@@ -1350,7 +1356,8 @@ DwarfFile::_UnwindCallFrame(bool usingEHFrameSection, CompilationUnit* unit,
 	TRACE_CFI("DwarfFile::_UnwindCallFrame(%#" B_PRIx64 ")\n", location);
 
 	DataReader dataReader((uint8*)currentFrameSection->Data(),
-		currentFrameSection->Size(), unit->AddressSize());
+		currentFrameSection->Size(), unit != NULL
+			? unit->AddressSize() : addressSize);
 
 	while (dataReader.BytesRemaining() > 0) {
 		// length
@@ -1448,7 +1455,7 @@ DwarfFile::_UnwindCallFrame(bool usingEHFrameSection, CompilationUnit* unit,
 				// process the CIE
 				CIEAugmentation cieAugmentation;
 				error = _ParseCIE(currentFrameSection, usingEHFrameSection,
-					unit, context, cieID, cieAugmentation);
+					unit, addressSize, context, cieID, cieAugmentation);
 				if (error != B_OK)
 					return error;
 
@@ -1618,20 +1625,22 @@ DwarfFile::_UnwindCallFrame(bool usingEHFrameSection, CompilationUnit* unit,
 
 status_t
 DwarfFile::_ParseCIE(ElfSection* debugFrameSection, bool usingEHFrameSection,
-	CompilationUnit* unit, CfaContext& context,	off_t cieOffset,
+	CompilationUnit* unit, uint8 addressSize, CfaContext& context,
-	CIEAugmentation& cieAugmentation)
+	off_t cieOffset, CIEAugmentation& cieAugmentation)
 {
 	if (cieOffset < 0 || cieOffset >= debugFrameSection->Size())
 		return B_BAD_DATA;
 
 	DataReader dataReader((uint8*)debugFrameSection->Data() + cieOffset,
-		debugFrameSection->Size() - cieOffset, unit->AddressSize());
+		debugFrameSection->Size() - cieOffset, unit != NULL
+			? unit->AddressSize() : addressSize);
 
 	// length
 	bool dwarf64;
 	uint64 length = dataReader.ReadInitialLength(dwarf64);
 	if (length > (uint64)dataReader.BytesRemaining())
 		return B_BAD_DATA;
+
 	off_t lengthOffset = dataReader.Offset();
 
 	// CIE ID/CIE pointer
@@ -2328,7 +2337,12 @@ DwarfFile::_LocateDebugInfo()
 	if (fDebugInfoSection == NULL || fDebugAbbrevSection == NULL) {
 		WARNING("DwarfManager::File::Load(\"%s\"): no "
 			".debug_info or .debug_abbrev.\n", fName);
-		return B_ERROR;
+
+		// if we at least have an EH frame, use that for stack unwinding
+		// if nothing else.
+		fEHFrameSection = fElfFile->GetSection(".eh_frame");
+		if (fEHFrameSection == NULL)
+			return B_ERROR;
 	}
 
 	return B_OK;

src/apps/debugger/dwarf/DwarfFile.h

@@ -48,6 +48,7 @@ public:
 									uint64 offset) const;
 
 			status_t			UnwindCallFrame(CompilationUnit* unit,
+									uint8 addressSize,
 									DIESubprogram* subprogramEntry,
 									target_addr_t location,
 									const DwarfTargetInterface* inputInterface,
@@ -115,6 +116,7 @@ private:
 
 			status_t			_UnwindCallFrame(bool usingEHFrameSection,
 									CompilationUnit* unit,
+									uint8 addressSize,
 									DIESubprogram* subprogramEntry,
 									target_addr_t location,
 									const DwarfTargetInterface* inputInterface,
@@ -124,6 +126,7 @@ private:
 			status_t			_ParseCIE(ElfSection* debugFrameSection,
 									bool usingEHFrameSection,
 									CompilationUnit* unit,
+									uint8 addressSize,
 									CfaContext& context, off_t cieOffset,
 									CIEAugmentation& cieAugmentation);
 			status_t			_ParseFrameInfoInstructions(

src/apps/debugger/user_interface/cli/CliContext.cpp

@@ -1,4 +1,5 @@
 /*
+ * Copyright 2012, Rene Gollent, rene@gollent.com.
  * Copyright 2012, Ingo Weinhold, ingo_weinhold@gmx.de.
  * Distributed under the terms of the MIT License.
  */
@@ -9,8 +10,9 @@
 #include <AutoDeleter.h>
 #include <AutoLocker.h>
 
+#include "StackTrace.h"
 #include "UserInterface.h"
-
+#include "ValueNodeManager.h"
 
 // NOTE: This is a simple work-around for EditLine not having any kind of user
 // data field. Hence in _GetPrompt() we don't have access to the context object.
@@ -55,6 +57,7 @@ CliContext::CliContext()
 	fLock("CliContext"),
 	fTeam(NULL),
 	fListener(NULL),
+	fNodeManager(NULL),
 	fEditLine(NULL),
 	fHistory(NULL),
 	fPrompt(NULL),
@@ -63,7 +66,9 @@ CliContext::CliContext()
 	fEventsOccurred(0),
 	fInputLoopWaiting(false),
 	fTerminating(false),
-	fCurrentThread(NULL)
+	fCurrentThread(NULL),
+	fCurrentStackTrace(NULL),
+	fCurrentStackFrameIndex(-1)
 {
 	sCurrentContext = this;
 }
@@ -110,6 +115,10 @@ CliContext::Init(Team* team, UserInterfaceListener* listener)
 	el_set(fEditLine, EL_EDITOR, "emacs");
 	el_set(fEditLine, EL_PROMPT, &_GetPrompt);
 
+	fNodeManager = new(std::nothrow) ValueNodeManager();
+	if (fNodeManager == NULL)
+		return B_NO_MEMORY;
+
 	return B_OK;
 }
 
@@ -136,6 +145,11 @@ CliContext::Cleanup()
 		fTeam->RemoveListener(this);
 		fTeam = NULL;
 	}
+
+	if (fNodeManager != NULL) {
+		fNodeManager->ReleaseReference();
+		fNodeManager = NULL;
+	}
 }
 
 
@@ -168,8 +182,25 @@ CliContext::SetCurrentThread(Thread* thread)
 
 	fCurrentThread = thread;
 
-	if (fCurrentThread != NULL)
+	if (fCurrentStackTrace != NULL) {
+		fCurrentStackTrace->ReleaseReference();
+		fCurrentStackTrace = NULL;
+		fCurrentStackFrameIndex = -1;
+		fNodeManager->SetStackFrame(NULL, NULL);
+	}
+
+	if (fCurrentThread != NULL) {
 		fCurrentThread->AcquireReference();
+		StackTrace* stackTrace = fCurrentThread->GetStackTrace();
+		// if the thread's stack trace has already been loaded,
+		// set it, otherwise we'll set it when we process the thread's
+		// stack trace changed event.
+		if (stackTrace != NULL) {
+			fCurrentStackTrace = stackTrace;
+			fCurrentStackTrace->AcquireReference();
+			SetCurrentStackFrameIndex(0);
+		}
+	}
 }
 
 
@@ -186,6 +217,24 @@ CliContext::PrintCurrentThread()
 }
 
 
+void
+CliContext::SetCurrentStackFrameIndex(int32 index)
+{
+	AutoLocker<BLocker> locker(fLock);
+
+	if (fCurrentStackTrace == NULL)
+		return;
+	else if (index < 0 || index >= fCurrentStackTrace->CountFrames())
+		return;
+
+	fCurrentStackFrameIndex = index;
+
+	StackFrame* frame = fCurrentStackTrace->FrameAt(index);
+	if (frame != NULL)
+		fNodeManager->SetStackFrame(fCurrentThread, frame);
+}
+
+
 const char*
 CliContext::PromptUser(const char* prompt)
 {
@@ -253,7 +302,7 @@ CliContext::WaitForThreadOrUser()
 
 		if (stoppedThread != NULL) {
 			if (fCurrentThread == NULL)
-				fCurrentThread = stoppedThread;
+				SetCurrentThread(stoppedThread);
 
 			_SignalInputLoop(EVENT_THREAD_STOPPED);
 		}
@@ -300,6 +349,13 @@ CliContext::ProcessPendingEvents()
 				printf("[thread stopped: %" B_PRId32 " \"%s\"]\n",
 					thread->ID(), thread->Name());
 				break;
+			case EVENT_THREAD_STACK_TRACE_CHANGED:
+				if (thread == fCurrentThread) {
+					fCurrentStackTrace = thread->GetStackTrace();
+					fCurrentStackTrace->AcquireReference();
+					SetCurrentStackFrameIndex(0);
+				}
+				break;
 		}
 	}
 }
@@ -335,6 +391,19 @@ CliContext::ThreadStateChanged(const Team::ThreadEvent& threadEvent)
 }
 
 
+void
+CliContext::ThreadStackTraceChanged(const Team::ThreadEvent& threadEvent)
+{
+	if (threadEvent.GetThread()->State() != THREAD_STATE_STOPPED)
+		return;
+
+	_QueueEvent(
+		new(std::nothrow) Event(EVENT_THREAD_STACK_TRACE_CHANGED,
+			threadEvent.GetThread()));
+	_SignalInputLoop(EVENT_THREAD_STACK_TRACE_CHANGED);
+}
+
+
 void
 CliContext::_QueueEvent(Event* event)
 {

src/apps/debugger/user_interface/cli/CliContext.h

@@ -15,18 +15,22 @@
 #include "Team.h"
 
 
+class StackFrame;
+class StackTrace;
 class Team;
 class UserInterfaceListener;
+class ValueNodeManager;
 
 
 class CliContext : private Team::Listener {
 public:
 			enum {
-				EVENT_QUIT					= 0x01,
+				EVENT_QUIT							= 0x01,
-				EVENT_USER_INTERRUPT		= 0x02,
+				EVENT_USER_INTERRUPT				= 0x02,
-				EVENT_THREAD_ADDED			= 0x04,
+				EVENT_THREAD_ADDED					= 0x04,
-				EVENT_THREAD_REMOVED		= 0x08,
+				EVENT_THREAD_REMOVED				= 0x08,
-				EVENT_THREAD_STOPPED		= 0x10,
+				EVENT_THREAD_STOPPED				= 0x10,
+				EVENT_THREAD_STACK_TRACE_CHANGED	= 0x20
 			};
 
 public:
@@ -46,12 +50,20 @@ public:
 			Team*				GetTeam() const	{ return fTeam; }
 			UserInterfaceListener* GetUserInterfaceListener() const
 									{ return fListener; }
+			ValueNodeManager*	GetValueNodeManager() const
+									{ return fNodeManager; }
+			StackTrace*			GetStackTrace() const
+									{ return fCurrentStackTrace; }
 
 			Thread*				CurrentThread() const { return fCurrentThread; }
 			thread_id			CurrentThreadID() const;
 			void				SetCurrentThread(Thread* thread);
 			void				PrintCurrentThread();
 
+			int32				CurrentStackFrameIndex() const
+									{ return fCurrentStackFrameIndex; }
+			void				SetCurrentStackFrameIndex(int32 index);
+
 			const char*			PromptUser(const char* prompt);
 			void				AddLineToInputHistory(const char* line);
 
@@ -72,6 +84,8 @@ private:
 
 	virtual	void				ThreadStateChanged(
 									const Team::ThreadEvent& event);
+	virtual	void				ThreadStackTraceChanged(
+									const Team::ThreadEvent& event);
 
 private:
 			void				_QueueEvent(Event* event);
@@ -86,6 +100,7 @@ private:
 			BLocker				fLock;
 			Team*				fTeam;
 			UserInterfaceListener* fListener;
+			ValueNodeManager*	fNodeManager;
 			EditLine*			fEditLine;
 			History*			fHistory;
 			const char*			fPrompt;
@@ -96,6 +111,8 @@ private:
 	volatile bool				fTerminating;
 
 			Thread*				fCurrentThread;
+			StackTrace*			fCurrentStackTrace;
+			int32				fCurrentStackFrameIndex;
 
 			EventList			fPendingEvents;
 };

src/apps/debugger/user_interface/cli/CliStackFrameCommand.cpp

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2012, Rene Gollent, rene@gollent.com.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include "CliStackFrameCommand.h"
+
+#include <stdio.h>
+
+#include <AutoLocker.h>
+
+#include "CliContext.h"
+#include "FunctionInstance.h"
+#include "StackFrame.h"
+#include "StackTrace.h"
+#include "Team.h"
+
+
+CliStackFrameCommand::CliStackFrameCommand()
+	:
+	CliCommand("set current stack frame",
+		"%s [ <frame number> ]\n"
+		"Sets the current stack frame to <frame number>, if supplied. "
+		"Otherwise\n prints the current frame.")
+{
+}
+
+
+void
+CliStackFrameCommand::Execute(int argc, const char* const* argv,
+	CliContext& context)
+{
+	if (argc > 2) {
+		PrintUsage(argv[0]);
+		return;
+	}
+
+	StackTrace* stackTrace = context.GetStackTrace();
+	if (argc == 1) {
+		int32 currentFrameIndex = context.CurrentStackFrameIndex();
+		if (currentFrameIndex < 0)
+			printf("No current frame.\n");
+		else {
+			StackFrame* frame = stackTrace->FrameAt(currentFrameIndex);
+			printf("Current frame: %" B_PRId32 ": %s\n", currentFrameIndex,
+				frame->Function()->PrettyName().String());
+		}
+		return;
+	}
+	// parse the argument
+	char* endPointer;
+	int32 frameNumber = strtol(argv[1], &endPointer, 0);
+	if (*endPointer != '\0' || frameNumber < 0) {
+		printf("Error: Invalid parameter \"%s\"\n", argv[1]);
+		return;
+	}
+
+	if (stackTrace == NULL || frameNumber >= stackTrace->CountFrames()) {
+		printf("Error: Index %" B_PRId32 " out of range\n", frameNumber);
+		return;
+	} else
+		context.SetCurrentStackFrameIndex(frameNumber);
+}

src/apps/debugger/user_interface/cli/CliStackFrameCommand.h

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2012, Rene Gollent, rene@gollent.com.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef CLI_STACK_FRAME_COMMAND_H
+#define CLI_STACK_FRAME_COMMAND_H
+
+
+#include "CliCommand.h"
+
+
+class CliStackFrameCommand : public CliCommand {
+public:
+								CliStackFrameCommand();
+	virtual	void				Execute(int argc, const char* const* argv,
+									CliContext& context);
+};
+
+
+#endif	// CLI_STACK_FRAME_COMMAND_H

src/apps/debugger/user_interface/cli/CliVariablesCommand.cpp

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2012, Rene Gollent, rene@gollent.com.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include "CliVariablesCommand.h"
+
+#include <stdio.h>
+
+#include <AutoLocker.h>
+
+#include "CliContext.h"
+#include "Team.h"
+#include "ValueNode.h"
+#include "ValueNodeContainer.h"
+#include "ValueNodeManager.h"
+
+
+CliVariablesCommand::CliVariablesCommand()
+	:
+	CliCommand("show current frame variables",
+		"%s\n"
+		"Prints the parameters and variables of the current frame, if "
+			" available.")
+{
+}
+
+
+void
+CliVariablesCommand::Execute(int argc, const char* const* argv,
+	CliContext& context)
+{
+	if (argc > 1) {
+		PrintUsage(argv[0]);
+		return;
+	}
+
+	ValueNodeManager* manager = context.GetValueNodeManager();
+
+	ValueNodeContainer* container = manager->GetContainer();
+	AutoLocker<ValueNodeContainer> containerLocker(container);
+	if (container == NULL || container->CountChildren() == 0) {
+		printf("No variables available.\n");
+		return;
+	}
+
+	printf("Variables:\n");
+	for (int32 i = 0; ValueNodeChild* child = container->ChildAt(i); i++) {
+		printf("  %s\n", child->Name().String());
+	}
+}

src/apps/debugger/user_interface/cli/CliVariablesCommand.h

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2012, Rene Gollent, rene@gollent.com.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef CLI_VARIABLES_COMMAND_H
+#define CLI_VARIABLES_COMMAND_H
+
+
+#include "CliCommand.h"
+
+
+class CliVariablesCommand : public CliCommand {
+public:
+								CliVariablesCommand();
+	virtual	void				Execute(int argc, const char* const* argv,
+									CliContext& context);
+};
+
+
+#endif	// CLI_VARIABLES_COMMAND_H

src/apps/debugger/user_interface/cli/CommandLineUserInterface.cpp

@@ -19,10 +19,12 @@
 #include "CliContinueCommand.h"
 #include "CliDebugReportCommand.h"
 #include "CliQuitCommand.h"
+#include "CliStackFrameCommand.h"
 #include "CliStackTraceCommand.h"
 #include "CliStopCommand.h"
 #include "CliThreadCommand.h"
 #include "CliThreadsCommand.h"
+#include "CliVariablesCommand.h"
 
 
 static const char* kDebuggerPrompt = "debugger> ";
@@ -309,6 +311,7 @@ CommandLineUserInterface::_RegisterCommands()
 
 	if (_RegisterCommand("bt", stackTraceCommandReference.Detach())
 		&& _RegisterCommand("continue", new(std::nothrow) CliContinueCommand)
+		&& _RegisterCommand("frame", new(std::nothrow) CliStackFrameCommand)
 		&& _RegisterCommand("help", new(std::nothrow) HelpCommand(this))
 		&& _RegisterCommand("quit", new(std::nothrow) CliQuitCommand)
 		&& _RegisterCommand("save-report",
@@ -316,7 +319,9 @@ CommandLineUserInterface::_RegisterCommands()
 		&& _RegisterCommand("sc", stackTraceCommandReference2.Detach())
 		&& _RegisterCommand("stop", new(std::nothrow) CliStopCommand)
 		&& _RegisterCommand("thread", new(std::nothrow) CliThreadCommand)
-		&& _RegisterCommand("threads", new(std::nothrow) CliThreadsCommand)) {
+		&& _RegisterCommand("threads", new(std::nothrow) CliThreadsCommand)
+		&& _RegisterCommand("variables",
+			new(std::nothrow) CliVariablesCommand)) {
 		return B_OK;
 	}
 

src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp

@@ -930,8 +930,10 @@ VariablesView::VariableTableModel::ValueNodeChanged(ValueNodeChild* nodeChild,
 	if (modelNode == NULL)
 		return;
 
-	if (oldNode != NULL)
+	if (oldNode != NULL) {
+		ValueNodeChildrenDeleted(oldNode);
 		NotifyNodeChanged(modelNode);
+	}
 }
 
 

src/kits/interface/TextView.cpp

@@ -3505,8 +3505,17 @@ BTextView::_HandleArrowKey(uint32 inArrowKey, bool commandKeyDown)
 			else {
 				float height;
 				BPoint point = PointAt(fCaretOffset, &height);
-				point.y -= height;
+				// find the caret position on the previous
-				fCaretOffset = OffsetAt(point);
+				// line by gently stepping onto this line
+				for (int i = 1; i <= height; i++) {
+					point.y--;
+					int32 offset = OffsetAt(point);
+					if (offset < fCaretOffset || i == height) {
+						fCaretOffset = offset;
+						break;
+					}
+				}
+
 				if (shiftDown && fCaretOffset != lastClickOffset) {
 					if (fCaretOffset < fSelStart) {
 						// extend selection to the top
@@ -4063,7 +4072,9 @@ BTextView::_FindLineBreak(int32 fromOffset, float *outAscent, float *outDescent,
 
 		delta = max_c(delta, 1);
 
-		deltaWidth = _TabExpandedStyledWidth(offset, delta, &ascent, &descent);
+		// do not include B_ENTER-terminator into width & height calculations
+		deltaWidth = _TabExpandedStyledWidth(offset,
+								done ? delta - 1 : delta, &ascent, &descent);
 		strWidth += deltaWidth;
 
 		if (strWidth >= *inOutWidth) {

src/kits/package/Jamfile

@@ -8,9 +8,6 @@ UsePrivateHeaders
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package hpkg ] ;
 
-Includes [ FGristFiles ZlibCompressionBase.cpp ]
-	: $(HAIKU_ZLIB_HEADERS_DEPENDENCY) ;
-
 HPKG_SOURCES =
 	AttributeDataReader.cpp
 	BlockBufferCache.cpp
@@ -44,6 +41,9 @@ HPKG_SOURCES =
 	ZlibDecompressor.cpp
 	;
 
+Includes [ FGristFiles $(HPKG_SOURCES) ]
+	: $(HAIKU_ZLIB_HEADERS_DEPENDENCY) ;
+
 SharedLibrary libpackage.so
 	:
 	ActivateRepositoryCacheJob.cpp