Merge branch 'master' into sam460ex

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

@@ -14,7 +14,7 @@ Refuse input format changes	AudioMixer		Bemeneti formátum változtatásainak vi
 Drop/repeat samples	AudioMixer		Minták átugrása/ismétlése
 Output channel sources	AudioMixer		Kimeneti csatorna forrásai
 dB	AudioMixer		dB
-Gain controls	AudioMixer		Előerősítés beállításai
+Gain controls	AudioMixer		Erősítő vezérlői
 Input mapping	AudioMixer		Bemenet leképezése
 Mute	AudioMixer		Némítás
 Input channel destinations	AudioMixer		Bemeneti csatornák céljai

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

@@ -0,0 +1,27 @@
+1	french	x-vnd.Haiku-hmulti_audio.media_addon	1552557772
+Master	MultiAudio		Général
+SPDIF	MultiAudio		SPDIF
+Gain	MultiAudio		Gain
+Extended Setup	MultiAudio		Réglages étendus
+CD	MultiAudio		CD
+Tone control	MultiAudio		Tonalité
+Phone	MultiAudio		Enceintes
+Aux	MultiAudio		Auxiliaire
+Output bass	MultiAudio		Graves
+Headphones	MultiAudio		Casque
+Input	MultiAudio		Entrée
+Output treble	MultiAudio		Aiguës
+General	MultiAudio		Général
+Input & Output	MultiAudio		Entrée & Sortie
+Enhanced Setup	MultiAudio		Réglages fins
+Volume	MultiAudio		Volume
+Output	MultiAudio		Sortie
+Video	MultiAudio		Vidéo
+Line	MultiAudio		Ligne
+Mic	MultiAudio		Micro
+ frequency:	MultiAudio		 fréquence :
+Enable	MultiAudio		Activer
+Mute	MultiAudio		Sourdine
+Wave	MultiAudio		Son
+Setup	MultiAudio		Réglages
+Level	MultiAudio		Niveau

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

@@ -26,7 +26,7 @@ Output	MultiAudio		Kimenet
 Video	MultiAudio		Videó
 Line	MultiAudio		Vonalbemenet
 Mic	MultiAudio		Mikrofon
- frequency:	MultiAudio		 frekvencia:
+ frequency:	MultiAudio		i frekvencia:
 Enable	MultiAudio		Engedélyezés
 Mute	MultiAudio		Némítás
 Wave	MultiAudio		Hanghullám

data/catalogs/apps/diskusage/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-DiskUsage	3710683878
+1	french	x-vnd.Haiku-DiskUsage	3631077986
 Scanning %refName%	Scanner		Examen de %refName%
 Size	Info Window		Taille
 Rescan	Pie View		Réexaminer
@@ -11,6 +11,7 @@ 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		Collecter les informations
 DiskUsage	System name		Utilisation Disque
  in %d files	Info Window		 dans %d fichiers
 %d files	Status View		%d fichiers

data/catalogs/apps/drivesetup/be.catkeys

@@ -1,4 +1,4 @@
-1	belarusian	x-vnd.Haiku-DriveSetup	1372142450
+1	belarusian	x-vnd.Haiku-DriveSetup	644135944
 DriveSetup	System name		Рэдыктар дыскаў
 Delete	MainWindow		Выдаліць
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so!	MainWindow		Сапрўды жадаеце запісаць змены на дыск?\n\nУсе данные на абраным падзеле будуць беззваротна згублены!
@@ -6,21 +6,17 @@ Rescan	MainWindow		Перасканіраваць
 OK	MainWindow		ОК
 Could not aquire partitioning information.	MainWindow		Не ўдалося атрымаць інфармацыю аб падзелах.
 There's no space on the partition where a child partition could be created.	MainWindow		Няма мечца на падзеле для стварэння даччынага падзела.
-%ld MiB	Support		%ld МіБ
 <empty>	PartitionList		<пуста>
 Unable to find the selected partition by ID.	MainWindow		Не ўдалося знайсці абраны падзел па ID.
 Select a partition from the list below.	DiskView		Абярыце падзел са спісу нішэй.
 No disk devices have been recognized.	DiskView		Не знойдзена ніякіх дыскавых прыладаў.
 Failed to initialize the disk %s!\n	MainWindow		Не ўдалося ініцыялізіраваць падзел %s!\n
 The selected disk is read-only.	MainWindow		Абраны дыск толькі для чытання.
-Partition name:	CreateParamsPanel		Імя падзелу:
-Initialize	InitParamsPanel		Ініцыялізаваць
 Are you sure you want to format the partition \"%s\"? You will be asked again before changes are written to the disk.	MainWindow		Вы упэўнены, што жадаеце фарматаваць падзел \"%s\"? Дадатковае пацвержанне спатрэбіцца і непасрэдна перад запісам на дыск.
 Could not mount partition %s.	MainWindow		Не ўдалося змантаваць падзел %s.
 The partition %s has been successfully formatted.\n	MainWindow		Падзел %s паспяхова фарматаваны.\n
 The partition %s is already unmounted.	MainWindow		Падзел %s ужо змантаваны.
 Failed to delete the partition. No changes have been written to disk.	MainWindow		Не ўдалося выдаліць падзел. Змены не былі запісаны на дыск.
-Partition type:	CreateParamsPanel		Тып падзелу:
 Could not delete the selected partition.	MainWindow		Немагчыма выдаліць абраны падзел.
 Initialize	MainWindow		Ініцыялізіраваць
 Error: 	MainWindow	in any error alert	Памылка: 
@@ -33,7 +29,6 @@ There was an error acquiring the partition row.	MainWindow		Адбылася п
 You need to select a partition entry from the list.	MainWindow		Вам патрэбна абраць падзел са спісу.
 The currently selected partition does not have a parent partition.	MainWindow		Абраны падзел не мае бацькоўскага падзелу.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected disk will be irretrievably lost if you do so!	MainWindow		Сапрўды жадаеце запісаць змены на дыск?\n\nУсе данные на абраным падзеле будуць беззваротна згублены!
-Offset: %ld MB	Support		Адступ: %ld MB
 Write changes	MainWindow		Запісаць змены
 There was an error preparing the disk for modifications.	MainWindow		Адбылася памылка пры падрыхтоўцы дыску да мадыфікацый.
 The partition %s is already mounted.	MainWindow		Падзел %s ужо змантаваны.
@@ -46,7 +41,6 @@ The disk has been successfully initialized.\n	MainWindow		Дыск быў пас
 Could not unmount partition %s.	MainWindow		Не ўдалося змантаваць падзел %s.
 Failed to format the partition %s!\n	MainWindow		Не ўдалося фарматаваць падзел %s!\n
 Mount	MainWindow		Змантаваць
-Create	CreateParamsPanel		Стварыць
 Are you sure you want to format a raw disk? (most people initialize the disk with a partitioning system first) You will be asked again before changes are written to the disk.	MainWindow		Вы упэўнены, што жадаеце фарматаваць ўвесь дыск? (у большасці выпадкаў на дыску ствараюць сыстэму падзелаў) Дадатковае пацвержанне спатрэбіцца і непасрэдна перад запісам на дыск.
 Device	PartitionList		Прылада
 Disk	MainWindow		Дыск
@@ -59,7 +53,6 @@ Cannot delete the selected partition.	MainWindow		Немагчыма выдал
 Mount all	MainWindow		Зманатаваць усё
 Cancel	MainWindow		Адмяніць
 Delete partition	MainWindow		Выдаліць падзел
-End: %ld MB	Support		Канец %ld MB
 Eject	MainWindow		Выцягнуць
 Partition	MainWindow		Падзел
 File system	PartitionList		Файлавая сістэма
@@ -70,10 +63,7 @@ Validation of the given initialization parameters failed.	MainWindow		Не уд
 The selected partition does not contain a partitioning system.	MainWindow		Абраны падзел не мае сістымы дзялення.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so!	MainWindow		Сапрўды жадаеце запісаць змены на дыск?\n\nУсе данные на абраным падзеле %s будуць беззваротна згублены!
 The partition %s is currently mounted.	MainWindow		Падзел %s зараз змантаваны.
-Partition size	CreateParamsPanel		Памер падзелу
 Surface test (not implemented)	MainWindow		Тэст паверхні (не ажыццявіма)
-Cancel	InitParamsPanel		Адмяніць
-Cancel	CreateParamsPanel		Адмяніць
 Format	MainWindow		Фарматаваць
 Parameters	PartitionList		Параметры
 Creation of the partition has failed.	MainWindow		Не удалося стварыць падзел.

data/catalogs/apps/drivesetup/de.catkeys

@@ -1,4 +1,4 @@
-1	german	x-vnd.Haiku-DriveSetup	1372142450
+1	german	x-vnd.Haiku-DriveSetup	659039073
 DriveSetup	System name		Datenträgerverwaltung
 Delete	MainWindow		Löschen
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so!	MainWindow		Soll die Änderungen jetzt auf den Datenträger geschrieben werden?\n\nAlle Daten auf der gewählten Partition gehen dabei unwiderruflich verloren!
@@ -6,21 +6,17 @@ Rescan	MainWindow		Aktualisieren
 OK	MainWindow		OK
 Could not aquire partitioning information.	MainWindow		Partitionierungsinformationen konnten nicht ermittelt werden.
 There's no space on the partition where a child partition could be created.	MainWindow		Es gibt keinen Platz auf der Partition, in der eine Tochterpartition angelegt werden könnte.
-%ld MiB	Support		%ld MiB
 <empty>	PartitionList		<leer>
 Unable to find the selected partition by ID.	MainWindow		Die ausgewählte Partition konnte anhand ihrer ID nicht gefunden werden.
 Select a partition from the list below.	DiskView		Bitte eine Partition aus der unten stehenden Liste wählen.
 No disk devices have been recognized.	DiskView		Es wurden keine Datenträger erkannt.
 Failed to initialize the disk %s!\n	MainWindow		Initialisierung der Partition \"%s\" fehlgeschlagen!\n
 The selected disk is read-only.	MainWindow		Vom ausgewählten Datenträger ist schreibgeschützt.
-Partition name:	CreateParamsPanel		Partitionsname:
-Initialize	InitParamsPanel		Initialisieren
 Are you sure you want to format the partition \"%s\"? You will be asked again before changes are written to the disk.	MainWindow		Soll die Partition \"%s\" wirklich formatiert werden? Die Änderungen werden erst nach einer weiteren Bestätigung geschrieben.
 Could not mount partition %s.	MainWindow		Die Partition \"%s\" konnte nicht eingehangen werden.
 The partition %s has been successfully formatted.\n	MainWindow		Die Partition \"%s\" wurde erfolgreich formatiert.\n
 The partition %s is already unmounted.	MainWindow		Die Partition \"%s\" ist bereits ausgehangen.
 Failed to delete the partition. No changes have been written to disk.	MainWindow		Das Löschen der Partition ist fehlgeschlagen. Der Datenträger blieb unverändert.
-Partition type:	CreateParamsPanel		Partitionstyp:
 Could not delete the selected partition.	MainWindow		Die gewählte Partition konnte nicht gelöscht werden.
 Initialize	MainWindow		Initialisieren
 Error: 	MainWindow	in any error alert	Fehler: 
@@ -33,7 +29,6 @@ There was an error acquiring the partition row.	MainWindow		Es ist ein interner
 You need to select a partition entry from the list.	MainWindow		Bitte einen Partitionseintrag aus der Liste wählen.
 The currently selected partition does not have a parent partition.	MainWindow		Die ausgewählte Partition hat keine übergeordnete Partition.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected disk will be irretrievably lost if you do so!	MainWindow		Sollen die Änderungen wirklich auf den Datenträger geschrieben werden?\n\nAlle Daten auf dem gewählten Datenträger gehen dabei unwiderruflich verloren!
-Offset: %ld MB	Support		Versatz: %ld MiB
 Write changes	MainWindow		Änderungen schreiben
 There was an error preparing the disk for modifications.	MainWindow		Beim Vorbereiten der Änderungen trat ein interner Fehler auf.
 The partition %s is already mounted.	MainWindow		Die Partition \"%s\" ist bereits eingehangen.
@@ -46,7 +41,7 @@ The disk has been successfully initialized.\n	MainWindow		Der Datenträger wurde
 Could not unmount partition %s.	MainWindow		Partition \"%s\" konnte nicht ausgehangen werden.
 Failed to format the partition %s!\n	MainWindow		Formatierung der Partition \"%s\" fehlgeschlagen!\n
 Mount	MainWindow		Einhängen
-Create	CreateParamsPanel		Anlegen
+Partition type	PartitionList		Partitionstyp:
 Are you sure you want to format a raw disk? (most people initialize the disk with a partitioning system first) You will be asked again before changes are written to the disk.	MainWindow		Soll der leere Datenträger wirklich formatiert werden (üblicherweise wird zuerst eine Partitionstabelle angelegt)? Die Änderungen werden erst nach einer weiteren Bestätigung geschrieben.
 Device	PartitionList		Gerät
 Disk	MainWindow		Datenträger
@@ -59,7 +54,6 @@ Cannot delete the selected partition.	MainWindow		Gewählte Partition konnte nic
 Mount all	MainWindow		Alle einhängen
 Cancel	MainWindow		Abbrechen
 Delete partition	MainWindow		Partition löschen
-End: %ld MB	Support		Ende: %ld MiB
 Eject	MainWindow		Auswerfen
 Partition	MainWindow		Partition
 File system	PartitionList		Dateisystem
@@ -70,10 +64,7 @@ Validation of the given initialization parameters failed.	MainWindow		Die Überp
 The selected partition does not contain a partitioning system.	MainWindow		Die ausgewählte Partition enthält kein Partitionierungssystem.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so!	MainWindow		Sollen die Änderungen wirklich auf den Datenträger geschrieben werden?\n\nAlle Daten auf der Partition \"%s\" gehen dabei unwiderruflich verloren!
 The partition %s is currently mounted.	MainWindow		Die Partition \"%s\" ist momentan eingehangen.
-Partition size	CreateParamsPanel		Partitionsgröße:
 Surface test (not implemented)	MainWindow		Oberflächentest (nicht implementiert)
-Cancel	InitParamsPanel		Abbrechen
-Cancel	CreateParamsPanel		Abbrechen
 Format	MainWindow		Formatieren
 Parameters	PartitionList		Parameter
 Creation of the partition has failed.	MainWindow		Anlegen der Parition schlug fehl.

data/catalogs/apps/drivesetup/el.catkeys

@@ -1,22 +1,18 @@
-1	greek, modern (1453-)	x-vnd.Haiku-DriveSetup	2952850782
+1	greek, modern (1453-)	x-vnd.Haiku-DriveSetup	2224844276
 DriveSetup	System name		Εγκατάσταση Οδηγού
 Delete	MainWindow		Διαγραφή
 Rescan	MainWindow		Επανάληψη σάρωσης
 OK	MainWindow		Εντάξει
 Could not aquire partitioning information.	MainWindow		Αδυναμία απόκτησης πληροφορίας διαμέρισης.
 There's no space on the partition where a child partition could be created.	MainWindow		Δεν υπάρχει χώρος στη κατάτμηση, όπου θα μπορούσε να δημιουργηθεί νέα κατάτμηση.
-%ld MiB	Support		%ld MiB
 <empty>	PartitionList		<άδειο>
 Unable to find the selected partition by ID.	MainWindow		Αδύνατο να βρεθεί η επιλεγμένη κατάτμηση ID.
 Select a partition from the list below.	DiskView		Επιλέξτε μία κατάτμηση από την παρακάτω λίστα.
 No disk devices have been recognized.	DiskView		Καμία συσκευή δίσκου δεν έχει αναγνωριστεί.
 The selected disk is read-only.	MainWindow		Ο επιλεγμένος δίσκος είναι μόνο για ανάγνωση.
-Partition name:	CreateParamsPanel		Όνομα κατάτμησης:
-Initialize	InitParamsPanel		Αρχικοποίηση
 Could not mount partition %s.	MainWindow		Αδυναμία προσάρτησης της κατάτμησης %s.
 The partition %s is already unmounted.	MainWindow		Η κατάτμηση %s είναι ήδη αποπροσαρτημένη
 Failed to delete the partition. No changes have been written to disk.	MainWindow		Αποτυχία διαγραφής της κατάτμησης. Καμία τροποποίηση δεν έχει γραφτεί στο δίσκο.
-Partition type:	CreateParamsPanel		Τύπος κατάτμησης:
 Could not delete the selected partition.	MainWindow		Αδυναμία διαγραφής της επιλεγμένης κατάτμησης.
 Initialize	MainWindow		Αρχικοποίηση
 Error: 	MainWindow	in any error alert	Σφάλμα:
@@ -27,7 +23,6 @@ Mounted at	PartitionList		Προσαρτήθηκε στο
 There was an error acquiring the partition row.	MainWindow		Υπήρξε ένα σφάλμα κατά την απόκτηση της σειράς κατάτμησης.
 You need to select a partition entry from the list.	MainWindow		Θα χρειαστεί να επιλέξετε μια καταχωρημένη κατάτμηση από τη λίστα.
 The currently selected partition does not have a parent partition.	MainWindow		Η τρέχουσα επιλεγμένη κατάτμηση δεν έχει κατάτμηση γονέα.
-Offset: %ld MB	Support		Μετατόπιση: %ld MB
 Write changes	MainWindow		Εγγραφή αλλαγών
 There was an error preparing the disk for modifications.	MainWindow		Υπήρξε ένα σφάλμα κατά την προετοιμασία του δίσκου για τροποποιήσεις.
 The partition %s is already mounted.	MainWindow		Η κατάτμηση %s είναι ήδη προσαρτημένη.
@@ -37,7 +32,6 @@ Create…	MainWindow		Δημιουργία...
 Disk system \"%s\"\" not found!	MainWindow		Ο δίσκος συστήματος \"%s\"\" δεν βρέθηκε!
 Could not unmount partition %s.	MainWindow		Αδυναμία αποπροσάρτησης της κατάτμησης %s.
 Mount	MainWindow		Προσάρτηση
-Create	CreateParamsPanel		Δημιουργία
 Device	PartitionList		Συσκευή
 Disk	MainWindow		Δίσκος
 Device	DiskView		Συσκευή
@@ -48,7 +42,6 @@ Cannot delete the selected partition.	MainWindow		Δεν μπορείτε να
 Mount all	MainWindow		Προσάρτηση όλων
 Cancel	MainWindow		Άκυρο
 Delete partition	MainWindow		Διαγραφή κατάτμησης
-End: %ld MB	Support		Τέλος: %ld MB
 Eject	MainWindow		Εξαγωγή
 Partition	MainWindow		Κατάτμηση
 Validation of the given creation parameters failed.	MainWindow		Η επικύρωση των δοθέντων παραμέτρων δημιουργίας απέτυχε.
@@ -56,10 +49,7 @@ Size	PartitionList		Μέγεθος
 Validation of the given initialization parameters failed.	MainWindow		Η επικύρωση των δοθέντων παραμέτρων αρχικοποίησης απέτυχε.
 The selected partition does not contain a partitioning system.	MainWindow		Η επιλεγμένη κατάτμηση δεν περιέχει σύστημα διαμέρισης.
 The partition %s is currently mounted.	MainWindow		Η κατάτμηση %s είναι τώρα προσαρτημένη.
-Partition size	CreateParamsPanel		Μέγεθος κατάτμησης
 Surface test (not implemented)	MainWindow		Έλεγχος επιφάνειας (δεν υλοποιήθηκε)
-Cancel	InitParamsPanel		Άκυρο
-Cancel	CreateParamsPanel		Άκυρο
 Parameters	PartitionList		Παράμετροι
 Creation of the partition has failed.	MainWindow		Η δημιουργία της κατάτμησης έχει αποτύχει.
 The currently selected partition is not empty.	MainWindow		Η τρέχουσα επιλεγμένη κατάτμηση δεν είναι άδεια.

data/catalogs/apps/drivesetup/fi.catkeys

@@ -1,4 +1,4 @@
-1	finnish	x-vnd.Haiku-DriveSetup	1372142450
+1	finnish	x-vnd.Haiku-DriveSetup	644135944
 DriveSetup	System name		Levyasema-asetukset
 Delete	MainWindow		Poista
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so!	MainWindow		Oletko varma, että haluat nyt kirjoittaa muutokset takaisin levylle?\n\nKaikki valitun osion tiedot katoavat palauttamattomasti, jos teet niin!
@@ -6,21 +6,17 @@ Rescan	MainWindow		Etsi uudelleen
 OK	MainWindow		Valmis
 Could not aquire partitioning information.	MainWindow		Ei voitu hakea osiointitietoja.
 There's no space on the partition where a child partition could be created.	MainWindow		Osiolla ei ole mitään tilaa, johon olisi voitu luoda tytärosio.
-%ld MiB	Support		%ld mebitavua
 <empty>	PartitionList		<tyhjä>
 Unable to find the selected partition by ID.	MainWindow		Valitun osion löytäminen tunnisteen perusteella epäonnistui.
 Select a partition from the list below.	DiskView		Valitse osio alapuolella olevasta luettelosta.
 No disk devices have been recognized.	DiskView		Levyasemia ei tunnistettu.
 Failed to initialize the disk %s!\n	MainWindow		Levyn %s alustus epäonnistui!\n
 The selected disk is read-only.	MainWindow		Valittu levy on kirjoitussuojattu.
-Partition name:	CreateParamsPanel		Osionimi:
-Initialize	InitParamsPanel		Alusta
 Are you sure you want to format the partition \"%s\"? You will be asked again before changes are written to the disk.	MainWindow		Oletko varma, että haluat alustaa osion \"%s\"? Samaa kysytään uudelleen ennen muutosten kirjoittamista levylle.
 Could not mount partition %s.	MainWindow		Osion %s liittäminen epäonnistui.
 The partition %s has been successfully formatted.\n	MainWindow		Osion %s alustus onnistui.\n
 The partition %s is already unmounted.	MainWindow		Osio %s on jo liitetty.
 Failed to delete the partition. No changes have been written to disk.	MainWindow		Osion poistaminen epäonnistui. Mitään muutoksia ei ole kirjoitettu levylle.
-Partition type:	CreateParamsPanel		Osiotyyppi:
 Could not delete the selected partition.	MainWindow		Valitun osion poistaminen epäonnistui.
 Initialize	MainWindow		Alusta
 Error: 	MainWindow	in any error alert	Virhe: 
@@ -33,7 +29,6 @@ There was an error acquiring the partition row.	MainWindow		Osioriviä haettaess
 You need to select a partition entry from the list.	MainWindow		Sinun täytyy valita osiorivi luettelosta.
 The currently selected partition does not have a parent partition.	MainWindow		Nykyisellä valitulla osiolla ei ole yläosiota.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected disk will be irretrievably lost if you do so!	MainWindow		Oletko varma, että haluat nyt kirjoittaa muutokset takaisin levylle?\n\nKaikki valitun osion tiedot katoavat palauttamattomasti, jos teet niin!
-Offset: %ld MB	Support		Siirros: %ld mebitavua
 Write changes	MainWindow		Kirjoita muutokset
 There was an error preparing the disk for modifications.	MainWindow		Tapahtui virhe valmisteltaessa levyä muutoksia varten.
 The partition %s is already mounted.	MainWindow		Osio %s on jo liitetty.
@@ -46,7 +41,6 @@ The disk has been successfully initialized.\n	MainWindow		Levyn alustus onnistui
 Could not unmount partition %s.	MainWindow		Osion %s irrottaminen epäonnistui.
 Failed to format the partition %s!\n	MainWindow		Osion %s alustus epäonnistui!\n
 Mount	MainWindow		Liitä
-Create	CreateParamsPanel		Luo
 Are you sure you want to format a raw disk? (most people initialize the disk with a partitioning system first) You will be asked again before changes are written to the disk.	MainWindow		Oletko varma, että haluat alustaa raakalevyn? (useimmat ihmiset alustavat levyn ensin osiointijärjestelmällä) Samaa kysytään uudelleen ennen kuin muutokset kirjoitetaan levylle.
 Device	PartitionList		Laite
 Disk	MainWindow		Levy
@@ -59,7 +53,6 @@ Cannot delete the selected partition.	MainWindow		Valitun osion poistaminen epä
 Mount all	MainWindow		Liitä kaikki
 Cancel	MainWindow		Peru
 Delete partition	MainWindow		Poista osio
-End: %ld MB	Support		Loppu: %ld mebitavua
 Eject	MainWindow		Poista asemasta
 Partition	MainWindow		Osio
 File system	PartitionList		Tiedostojärjestelmä
@@ -70,10 +63,7 @@ Validation of the given initialization parameters failed.	MainWindow		Annettujen
 The selected partition does not contain a partitioning system.	MainWindow		Valittu osio ei sisällä osiointijärjestelmää.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so!	MainWindow		Oletko varma, että haluat nyt kirjoittaa muutokset takaisin levylle?\n\nKaikki osion %s tiedot kadotetaan palauttamattomasti, jos teet niin!
 The partition %s is currently mounted.	MainWindow		Osio %s on nykyisin liitetty.
-Partition size	CreateParamsPanel		Osiokoko
 Surface test (not implemented)	MainWindow		Pintatesti (ei toteutettu)
-Cancel	InitParamsPanel		Peru
-Cancel	CreateParamsPanel		Peru
 Format	MainWindow		Alusta
 Parameters	PartitionList		Parametrit
 Creation of the partition has failed.	MainWindow		Osion luominen epäonnistui.

data/catalogs/apps/drivesetup/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-DriveSetup	1372142450
+1	french	x-vnd.Haiku-DriveSetup	659039073
 DriveSetup	System name		Gestionnaire de disque
 Delete	MainWindow		Supprimer
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so!	MainWindow		Êtes-vous sûr de vouloir écrire les changements sur le disque ?\n\nToutes les données de la partition sélectionnée seront effacées si vous le faites !
@@ -6,21 +6,17 @@ Rescan	MainWindow		Analyser
 OK	MainWindow		OK
 Could not aquire partitioning information.	MainWindow		Impossible de récupérer les informations sur les partitions.
 There's no space on the partition where a child partition could be created.	MainWindow		Il n'y a pas de place dans cette partition pour créer une partition fille.
-%ld MiB	Support		%ld Mio
 <empty>	PartitionList		<vide>
 Unable to find the selected partition by ID.	MainWindow		Impossible de trouver la partition sélectionnée par son ID.
 Select a partition from the list below.	DiskView		Sélectionnez une partition dans la liste ci-dessous.
 No disk devices have been recognized.	DiskView		Aucun périphérique disque n'a été reconnu.
 Failed to initialize the disk %s!\n	MainWindow		Impossible d'initialiser le disque %s !\n
 The selected disk is read-only.	MainWindow		Le disque choisi est en lecture seule.
-Partition name:	CreateParamsPanel		Nom de la partition :
-Initialize	InitParamsPanel		Initialiser
 Are you sure you want to format the partition \"%s\"? You will be asked again before changes are written to the disk.	MainWindow		Êtes-vous sûr de vouloir formater la partition « %s » ? Une confirmation vous sera à nouveau demandée avant que les changements ne soient écrits sur le disque.
 Could not mount partition %s.	MainWindow		Impossible de monter la partition %s.
 The partition %s has been successfully formatted.\n	MainWindow		La partition %s a été correctement formatée.\n
 The partition %s is already unmounted.	MainWindow		La partition %s est déjà démontée.
 Failed to delete the partition. No changes have been written to disk.	MainWindow		Impossible de supprimer la partition. Aucun changement n'a été écrit sur le disque.
-Partition type:	CreateParamsPanel		Type de partition :
 Could not delete the selected partition.	MainWindow		Impossible de supprimer la partition sélectionnée.
 Initialize	MainWindow		Initialiser
 Error: 	MainWindow	in any error alert	Erreur : 
@@ -33,7 +29,6 @@ There was an error acquiring the partition row.	MainWindow		Erreur de lecture de
 You need to select a partition entry from the list.	MainWindow		Sélectionnez d'abord une entrée de la table des partitions.
 The currently selected partition does not have a parent partition.	MainWindow		La partition sélectionnée n'a pas de partition parente.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected disk will be irretrievably lost if you do so!	MainWindow		Êtes-vous sur de vouloir écrire les changements sur le disque ?\n\nToutes les données du disque seront définitivement perdues si vous le faites !
-Offset: %ld MB	Support		Déplacement : %ld Mo
 Write changes	MainWindow		Écrire les modifications
 There was an error preparing the disk for modifications.	MainWindow		Une erreur est survenue pendant la préparation des modifications du disque.
 The partition %s is already mounted.	MainWindow		La partition %s est déjà montée.
@@ -46,7 +41,7 @@ The disk has been successfully initialized.\n	MainWindow		Le disque a été corr
 Could not unmount partition %s.	MainWindow		Impossible de démonter la partition %s.
 Failed to format the partition %s!\n	MainWindow		Impossible de formater la partition %s !\n
 Mount	MainWindow		Monter
-Create	CreateParamsPanel		Créer
+Partition type	PartitionList		Type de partition
 Are you sure you want to format a raw disk? (most people initialize the disk with a partitioning system first) You will be asked again before changes are written to the disk.	MainWindow		Êtes-vous sûr de vouloir formater un disque brut ? (la plus part du temps, il convient au préalable d'initialiser le disque avec un système de partitions ) Une confirmation vous sera à nouveau demandée avant que les changements ne soient écrits sur le disque.
 Device	PartitionList		Périphérique
 Disk	MainWindow		Disque
@@ -59,7 +54,6 @@ Cannot delete the selected partition.	MainWindow		La partition sélectionnée ne
 Mount all	MainWindow		Monter tout
 Cancel	MainWindow		Annuler
 Delete partition	MainWindow		Supprimer la partition
-End: %ld MB	Support		Fin : %ld Mo
 Eject	MainWindow		Éjecter
 Partition	MainWindow		Partition
 File system	PartitionList		Système de fichiers
@@ -70,10 +64,7 @@ Validation of the given initialization parameters failed.	MainWindow		Le contrô
 The selected partition does not contain a partitioning system.	MainWindow		La partition sélectionnée ne contient pas de système de partitionnement.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so!	MainWindow		Êtes-vous sûr de vouloir enregistrer les modifications sur le disque maintenant ?\n\nToutes les données sur la partition %s seront définitivement perdues si vous le faites !
 The partition %s is currently mounted.	MainWindow		La partition %s est actuellement montée.
-Partition size	CreateParamsPanel		Taille de la partition
 Surface test (not implemented)	MainWindow		Test de surface (non implémenté)
-Cancel	InitParamsPanel		Annuler
-Cancel	CreateParamsPanel		Annuler
 Format	MainWindow		Formater
 Parameters	PartitionList		Paramètres
 Creation of the partition has failed.	MainWindow		La partition n'a pas pu être créée.

data/catalogs/apps/drivesetup/hu.catkeys

@@ -1,4 +1,4 @@
-1	hungarian	x-vnd.Haiku-DriveSetup	1387045579
+1	hungarian	x-vnd.Haiku-DriveSetup	659039073
 DriveSetup	System name		Lemezkezelő
 Delete	MainWindow		Törlés
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so!	MainWindow		Biztosan jóváhagyja az adatok felírását a lemezre?\n\nEz esetben a partíció teljes tartalma visszavonhatatlanul meg fog semmisülni.
@@ -6,21 +6,17 @@ Rescan	MainWindow		Frissítés
 OK	MainWindow		Rendben
 Could not aquire partitioning information.	MainWindow		A partíciók állapotát nem lehetett lekérdezni.
 There's no space on the partition where a child partition could be created.	MainWindow		Nincs hely már a partíción, ahol alpartíciót kellene létrehozni.
-%ld MiB	Support		%ld MB
 <empty>	PartitionList		<üres>
 Unable to find the selected partition by ID.	MainWindow		Nincs ilyen azonosítójú partíció.
 Select a partition from the list below.	DiskView		Válasszon partíciót a lenti listából!
 No disk devices have been recognized.	DiskView		Nem található tárolóeszköz.
 Failed to initialize the disk %s!\n	MainWindow		Nem sikerült előkészíteni a partíciót: „%s”.\n
 The selected disk is read-only.	MainWindow		A kiválasztott lemez nem írható.
-Partition name:	CreateParamsPanel		Partíció neve:
-Initialize	InitParamsPanel		Előkészítés
 Are you sure you want to format the partition \"%s\"? You will be asked again before changes are written to the disk.	MainWindow		Biztosan meg akarja formázni a partíciót (%s)? A végleleges művelet előtt még egyszer meg kell ezt erősítenie.
 Could not mount partition %s.	MainWindow		A partíció (%s) nem csatolható.
 The partition %s has been successfully formatted.\n	MainWindow		A partíció (%s) hiba nélkül elő lett készítve.\n
 The partition %s is already unmounted.	MainWindow		A partíció (%s) már le van választva!
 Failed to delete the partition. No changes have been written to disk.	MainWindow		Nem sikerült törölni a partíciót, a lemez tartalma érintetlen maradt.
-Partition type:	CreateParamsPanel		Partíció típusa:
 Could not delete the selected partition.	MainWindow		A kiválasztott partíció nem törölhető.
 Initialize	MainWindow		Előkészítés
 Error: 	MainWindow	in any error alert	Hiba: 
@@ -33,7 +29,6 @@ There was an error acquiring the partition row.	MainWindow		Hiba történt a par
 You need to select a partition entry from the list.	MainWindow		Válasszon egyet az alábbi partíciók közül!
 The currently selected partition does not have a parent partition.	MainWindow		A kiválasztott partíciónak nincs főpartíciója.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected disk will be irretrievably lost if you do so!	MainWindow		Biztosan lemezre szeretné írni a kijelölt változtatásokat?\n\nEz esetben a lemez teljes tartalma visszavonhatatlanul meg fog semmisülni.
-Offset: %ld MB	Support		Kezdete: %ld MB
 Write changes	MainWindow		Írás a lemezre
 There was an error preparing the disk for modifications.	MainWindow		Hiba történt a változtatások lemezre írása közben.
 The partition %s is already mounted.	MainWindow		A partíció (%s) már csatolva van.
@@ -46,8 +41,7 @@ The disk has been successfully initialized.\n	MainWindow		A partíció (%s) hiba
 Could not unmount partition %s.	MainWindow		Nem lehet leválasztani a partíciót (%s).
 Failed to format the partition %s!\n	MainWindow		Nem sikerült előkészíteni a partíciót: „%s”.\n
 Mount	MainWindow		Csatol
-Partition type	PartitionList		Partíció típusa:
-Create	CreateParamsPanel		Létrehoz
+Partition type	PartitionList		Partíció típusa
 Are you sure you want to format a raw disk? (most people initialize the disk with a partitioning system first) You will be asked again before changes are written to the disk.	MainWindow		Biztosan formázni szeretné a nyers lemezt? (A legtöbb esetben elő szokták készíteni a lemezt formázás előtt.) Ezt még egyszer meg kell majd erősítenie.
 Device	PartitionList		Eszköz
 Disk	MainWindow		Lemez
@@ -60,7 +54,6 @@ Cannot delete the selected partition.	MainWindow		A kijelölt partíció nem tö
 Mount all	MainWindow		Összes csatolása
 Cancel	MainWindow		Mégse
 Delete partition	MainWindow		Partíció törlése
-End: %ld MB	Support		Vége: %ld MB
 Eject	MainWindow		Kiadás
 Partition	MainWindow		Partíció
 File system	PartitionList		Fájlrendszer
@@ -71,10 +64,7 @@ Validation of the given initialization parameters failed.	MainWindow		Az előké
 The selected partition does not contain a partitioning system.	MainWindow		A kiválasztott partíción nincs particionálási séma.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so!	MainWindow		Biztosan a lemezre szeretné írni a kijelölt változtatásokat?\n\nEz esetben a(z) „%s” partíció teljes tartalma visszavonhatatlanul meg fog semmisülni.
 The partition %s is currently mounted.	MainWindow		A partíció (%s) csatolva van.
-Partition size	CreateParamsPanel		A partíció mérete
 Surface test (not implemented)	MainWindow		Felületellenőrzés (még nem működik)
-Cancel	InitParamsPanel		Mégse
-Cancel	CreateParamsPanel		Mégse
 Format	MainWindow		Formázás
 Parameters	PartitionList		Paraméterek
 Creation of the partition has failed.	MainWindow		Nem sikerült létrehozni a partíciót.

data/catalogs/apps/drivesetup/ja.catkeys

@@ -1,4 +1,4 @@
-1	japanese	x-vnd.Haiku-DriveSetup	1372142450
+1	japanese	x-vnd.Haiku-DriveSetup	659039073
 DriveSetup	System name		DriveSetup
 Delete	MainWindow		削除
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so!	MainWindow		変更を本当にディスクに保存しますか？\n\nその場合、選択されたパーティションのすべてのデータが失われますので、ご注意ください。
@@ -6,21 +6,17 @@ Rescan	MainWindow		ディスクを再検出
 OK	MainWindow		OK
 Could not aquire partitioning information.	MainWindow		パーティション情報の取得に失敗しました。
 There's no space on the partition where a child partition could be created.	MainWindow		子パーティションを作成するスペースがありません。
-%ld MiB	Support		%ld MiB
 <empty>	PartitionList		<空>
 Unable to find the selected partition by ID.	MainWindow		選択されたパーティションを ID で検出できませんでした。
 Select a partition from the list below.	DiskView		下記の一覧からパーティションを一つ選択してください。
 No disk devices have been recognized.	DiskView		ディスクデバイスが検出されませんでした。
 Failed to initialize the disk %s!\n	MainWindow		ディスク %s の初期化に失敗しました！\n
 The selected disk is read-only.	MainWindow		選択されたディスクは読み取り専用です。
-Partition name:	CreateParamsPanel		パーティション名 :
-Initialize	InitParamsPanel		初期化
 Are you sure you want to format the partition \"%s\"? You will be asked again before changes are written to the disk.	MainWindow		パーティション \"%s\" を本当にフォーマットして良いですか?  変更をディスクに書き込む直前に再度確認します。
 Could not mount partition %s.	MainWindow		パーティション %s をマウントできませんでした。
 The partition %s has been successfully formatted.\n	MainWindow		%s パーティションは正常にフォーマットされました。\n
 The partition %s is already unmounted.	MainWindow		パーティション %s はすでにマウント解除されています。
 Failed to delete the partition. No changes have been written to disk.	MainWindow		パーティションの削除に失敗しました。変更は保存されていません。
-Partition type:	CreateParamsPanel		パーティション種別 :
 Could not delete the selected partition.	MainWindow		選択されたパーティションを削除できませんでした。
 Initialize	MainWindow		初期化
 Error: 	MainWindow	in any error alert	エラー : 
@@ -33,7 +29,6 @@ There was an error acquiring the partition row.	MainWindow		パーティショ
 You need to select a partition entry from the list.	MainWindow		一覧からパーティションを一つ選択してください。
 The currently selected partition does not have a parent partition.	MainWindow		選択されたパーティションには親パーティションがありません。
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected disk will be irretrievably lost if you do so!	MainWindow		変更をすぐにディスクに保存しますか？\n\nその場合、選択されたディスクのデータがすべて失われますので、ご注意ください。
-Offset: %ld MB	Support		オフセット： %ld MB
 Write changes	MainWindow		変更を書き込む
 There was an error preparing the disk for modifications.	MainWindow		ディスクの変更のための準備をする際、エラーが発生しました。
 The partition %s is already mounted.	MainWindow		パーティション %s はすでにマウントされています。
@@ -46,7 +41,7 @@ The disk has been successfully initialized.\n	MainWindow		ディスクは正常
 Could not unmount partition %s.	MainWindow		パーティション %s をマウント解除できませんでした。
 Failed to format the partition %s!\n	MainWindow		パーティション %s のフォーマットに失敗しました！\n
 Mount	MainWindow		マウント
-Create	CreateParamsPanel		新規作成
+Partition type	PartitionList		パーティション種別 :
 Are you sure you want to format a raw disk? (most people initialize the disk with a partitioning system first) You will be asked again before changes are written to the disk.	MainWindow		本当にディスク全体をフォーマットして良いですか?  (大抵の人はまずパーティショニングシステムでディスクを初期化します) 変更をディスクに書き込む直前に再度確認します。
 Device	PartitionList		デバイス
 Disk	MainWindow		ディスク
@@ -59,7 +54,6 @@ Cannot delete the selected partition.	MainWindow		選択されたパーティシ
 Mount all	MainWindow		すべてマウント
 Cancel	MainWindow		中止
 Delete partition	MainWindow		パーティションを削除
-End: %ld MB	Support		末端： %ld MB
 Eject	MainWindow		取り出す
 Partition	MainWindow		パーティション
 File system	PartitionList		ファイルシステム
@@ -70,10 +64,7 @@ Validation of the given initialization parameters failed.	MainWindow		初期化
 The selected partition does not contain a partitioning system.	MainWindow		選択されたパーティションにパーティションシステムはありません。
 Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so!	MainWindow		変更をすぐにディスクに保存しますか？\n\nその場合、ディスク %s のデータがすべて失われますので、ご注意ください。
 The partition %s is currently mounted.	MainWindow		%s パーティションが現在マウントされています。
-Partition size	CreateParamsPanel		パーティションサイズ
 Surface test (not implemented)	MainWindow		表面チェック (実装されていません)
-Cancel	InitParamsPanel		中止
-Cancel	CreateParamsPanel		中止
 Format	MainWindow		フォーマット
 Parameters	PartitionList		パラメーター
 Creation of the partition has failed.	MainWindow		パーティションの作成に失敗しました。

data/catalogs/apps/drivesetup/lt.catkeys

@@ -1,4 +1,4 @@
-1	lithuanian	x-vnd.Haiku-DriveSetup	1372142450
+1	lithuanian	x-vnd.Haiku-DriveSetup	644135944
 DriveSetup	System name		Diskų ženklintuvas
 Delete	MainWindow		Šalinti
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so!	MainWindow		Ar tikrai norite pakeitimus dabar įrašyti į diską?\n\nJei tęsite toliau – visi duomenys, esantys pasirinktame skaidinyje, bus negrįžtamai prarasti!
@@ -6,21 +6,17 @@ Rescan	MainWindow		Peržvalgyti
 OK	MainWindow		Gerai
 Could not aquire partitioning information.	MainWindow		Duomenų apie skaidinius nerasta.
 There's no space on the partition where a child partition could be created.	MainWindow		Skaidinyje nepakanka vietos loginiam diskui sukurti.
-%ld MiB	Support		%ld MiB
 <empty>	PartitionList		<tuščia>
 Unable to find the selected partition by ID.	MainWindow		Pasirinkto skaidinio pagal ID rasti nepavyko.
 Select a partition from the list below.	DiskView		Pasirinkite skaidinį iš žemiau esančio sąrašo.
 No disk devices have been recognized.	DiskView		Neatpažintas nė vienas disko įtaisas.
 Failed to initialize the disk %s!\n	MainWindow		Nepavyko suženklinti disko „%s“!\n
 The selected disk is read-only.	MainWindow		Pasirinktas diskas pasiekiamas tik skaitymui.
-Partition name:	CreateParamsPanel		Skaidinio pavadinimas:
-Initialize	InitParamsPanel		Ženklinti
 Are you sure you want to format the partition \"%s\"? You will be asked again before changes are written to the disk.	MainWindow		Ar tikrai norite suženklinti skaidinį „%s“? Prieš įrašant pakeitimus į diską, Jūsų bus paklausta dar kartą.
 Could not mount partition %s.	MainWindow		Skaidinio „%s“ prijungti nepavyko.
 The partition %s has been successfully formatted.\n	MainWindow		Skaidinys „%s“ sėkmingai suženklintas.\n
 The partition %s is already unmounted.	MainWindow		Skaidinys „%s“ jau atjungtas.
 Failed to delete the partition. No changes have been written to disk.	MainWindow		Skaidinio pašalinti nepavyko. Pakeitimai į diską neįrašyti.
-Partition type:	CreateParamsPanel		Skaidinio tipas:
 Could not delete the selected partition.	MainWindow		Pasirinkto skaidinio pašalinti nepavyko.
 Initialize	MainWindow		Ženklinti
 Error: 	MainWindow	in any error alert	Klaida: 
@@ -33,7 +29,6 @@ There was an error acquiring the partition row.	MainWindow		Klaida gaunant skaid
 You need to select a partition entry from the list.	MainWindow		Būtina iš sąrašo pasirinkti skaidinį.
 The currently selected partition does not have a parent partition.	MainWindow		Pasirinkas skaidinys nėra loginis diskas kitame skaidinyje.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected disk will be irretrievably lost if you do so!	MainWindow		Ar tikrai norite pakeitimus dabar įrašyti į diską?\n\nJei tęsite toliau – visi duomenys, esantys pasirinktame diske, bus negrįžtamai prarasti!
-Offset: %ld MB	Support		Poslinkis: %ld MB
 Write changes	MainWindow		Įrašyti pakeitimus
 There was an error preparing the disk for modifications.	MainWindow		Parengiant diską pakeitimams, įvyko klaida.
 The partition %s is already mounted.	MainWindow		Skaidinys „%s“ jau yra prijungtas.
@@ -46,7 +41,6 @@ The disk has been successfully initialized.\n	MainWindow		Diskas sėkmingai suž
 Could not unmount partition %s.	MainWindow		Skaidinio „%s“ atjungti nepavyko.
 Failed to format the partition %s!\n	MainWindow		Skaidinio „%s“ suženklinti nepavyko!\n
 Mount	MainWindow		Prijungti
-Create	CreateParamsPanel		Kurti
 Are you sure you want to format a raw disk? (most people initialize the disk with a partitioning system first) You will be asked again before changes are written to the disk.	MainWindow		Ar tikrai norite suženklinti neskaidytą diską? Dažniausiai, prieš suženklinant, diske sukuriama skaidinių lentelė. Prieš įrašant pakeitimus į diską, Jūsų bus paklausta dar kartą.
 Device	PartitionList		Įrenginys
 Disk	MainWindow		Diskas
@@ -59,7 +53,6 @@ Cannot delete the selected partition.	MainWindow		Pasirinkto skaidinio pašalint
 Mount all	MainWindow		Prijungti visus
 Cancel	MainWindow		Atsisakyti
 Delete partition	MainWindow		Šalinti skaidinį
-End: %ld MB	Support		Pabaiga: %ld MiB
 Eject	MainWindow		Išimti
 Partition	MainWindow		Skaidinys
 File system	PartitionList		Failų sistema
@@ -70,10 +63,7 @@ Validation of the given initialization parameters failed.	MainWindow		Nurodyti n
 The selected partition does not contain a partitioning system.	MainWindow		Pasirinktame skaidinyje nėra skaidinių lentelės.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so!	MainWindow		Ar tikrai norite pakeitimus dabar įrašyti į diską?\n\nJei tęsite toliau – visi duomenys, esantys skaidinyje „%s“, bus negrįžtamai prarasti!
 The partition %s is currently mounted.	MainWindow		Skaidinys „%s“ jau yra prijungtas.
-Partition size	CreateParamsPanel		Skaidinio dydis
 Surface test (not implemented)	MainWindow		Patikrinti paviršių (dar nerealizuota)
-Cancel	InitParamsPanel		Atsisakyti
-Cancel	CreateParamsPanel		Atsisakyti
 Format	MainWindow		Ženklinti
 Parameters	PartitionList		Parametrai
 Creation of the partition has failed.	MainWindow		Nepavyko sukurti skaidinio.

data/catalogs/apps/drivesetup/nl.catkeys

@@ -1,4 +1,4 @@
-1	dutch; flemish	x-vnd.Haiku-DriveSetup	1372142450
+1	dutch; flemish	x-vnd.Haiku-DriveSetup	644135944
 DriveSetup	System name		DriveSetup
 Delete	MainWindow		Verwijderen
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so!	MainWindow		Bent u zeker dat u de veranderingen nu wilt terugschrijven naar de schijf?\n\nU zult alle gegevens op de geselecteerde partitie onherroepelijk kwijt zijn als u dit doet!
@@ -6,21 +6,17 @@ Rescan	MainWindow		Opnieuw afzoeken
 OK	MainWindow		Oké
 Could not aquire partitioning information.	MainWindow		Kon geen partitie-informatie verkrijgen.
 There's no space on the partition where a child partition could be created.	MainWindow		De partitie heeft geen ruimte waarin een onderliggende partitie kan worden gemaakt.
-%ld MiB	Support		%ld MiB
 <empty>	PartitionList		<leeg>
 Unable to find the selected partition by ID.	MainWindow		Kan de geselecteerde partitie niet vinden op basis van ID.
 Select a partition from the list below.	DiskView		Selecteer een partitie uit onderstaande lijst.
 No disk devices have been recognized.	DiskView		Er werden geen schijfapparaten herkend.
 Failed to initialize the disk %s!\n	MainWindow		Initialisatie van de schijf %s is mislukt!\n
 The selected disk is read-only.	MainWindow		De geselecteerde schijf is alleen-lezen.
-Partition name:	CreateParamsPanel		Partitienaam:
-Initialize	InitParamsPanel		Initialiseer
 Are you sure you want to format the partition \"%s\"? You will be asked again before changes are written to the disk.	MainWindow		Weet u zeker dat u de partitie \"%s\" wilt formatteren? U krijgt deze vraag nogmaals voordat de wijzigingen op de schijf weggeschreven worden.
 Could not mount partition %s.	MainWindow		Kon partitie %s niet betrekken.
 The partition %s has been successfully formatted.\n	MainWindow		De partitie %s werd met succes geformatteerd.\n
 The partition %s is already unmounted.	MainWindow		De partitie %s is al onttrokken.
 Failed to delete the partition. No changes have been written to disk.	MainWindow		Kon de partitie niet verwijderen. Er werden geen veranderingen naar de schijf geschreven.
-Partition type:	CreateParamsPanel		Partitiesoort:
 Could not delete the selected partition.	MainWindow		Kon de geselecteerde partitie niet verwijderen.
 Initialize	MainWindow		Initialiseren
 Error: 	MainWindow	in any error alert	Fout:
@@ -33,7 +29,6 @@ There was an error acquiring the partition row.	MainWindow		Er is een fout ontst
 You need to select a partition entry from the list.	MainWindow		U dient een partitie uit de lijst te selecteren.
 The currently selected partition does not have a parent partition.	MainWindow		De nu geselecteerde partitie heeft geen bovenliggende partitie.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected disk will be irretrievably lost if you do so!	MainWindow		Bent u zeker dat u de veranderingen nu wilt terugschrijven naar de schijf?\n\nU zult alle gegevens op de geselecteerde schijf onherroepelijk kwijt zijn als u dit doet!
-Offset: %ld MB	Support		Offset: %ld MB
 Write changes	MainWindow		Veranderingen schrijven
 There was an error preparing the disk for modifications.	MainWindow		Fout tijdens het voorbereiden van de schijf voor aanpassingen.
 The partition %s is already mounted.	MainWindow		De partitie %s is al betrokken.
@@ -46,7 +41,6 @@ The disk has been successfully initialized.\n	MainWindow		De schijf %s werd met
 Could not unmount partition %s.	MainWindow		Kon partitie %s niet onttrekken.
 Failed to format the partition %s!\n	MainWindow		Formatteren van partitie %s is mislukt!\n
 Mount	MainWindow		Betrekken
-Create	CreateParamsPanel		Maken
 Are you sure you want to format a raw disk? (most people initialize the disk with a partitioning system first) You will be asked again before changes are written to the disk.	MainWindow		Weet u zeker dat u een ongepartitioneerde schijf wil formatteren? (de meeste mensen zullen eerst een partitiesysteem op de schijf zetten). Het zal u nogmaals gevraagd worden voordat de gegevens naar de schijf geschreven worden.
 Device	PartitionList		Apparaat
 Disk	MainWindow		Schijf
@@ -59,7 +53,6 @@ Cannot delete the selected partition.	MainWindow		Kan de geselecteerde partitie
 Mount all	MainWindow		Alles betrekken
 Cancel	MainWindow		Annuleren
 Delete partition	MainWindow		Partitie verwijderen
-End: %ld MB	Support		Einde: %ld MB
 Eject	MainWindow		Uitwerpen
 Partition	MainWindow		Partitie
 File system	PartitionList		Bestandssysteem
@@ -70,10 +63,7 @@ Validation of the given initialization parameters failed.	MainWindow		Natrekken
 The selected partition does not contain a partitioning system.	MainWindow		De geselecteerde partitie bevat geen partitioneringssysteem.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so!	MainWindow		Bent u zeker dat u de veranderingen nu wilt terugschrijven naar de schijf?\n\nU zult alle gegevens op de %s partitie onherroepelijk kwijt zijn als u dit doet!
 The partition %s is currently mounted.	MainWindow		De partitie %s is op dit moment gekoppeld.
-Partition size	CreateParamsPanel		Partitiegrootte
 Surface test (not implemented)	MainWindow		Oppervlaktetest (niet geïmplementeerd)
-Cancel	InitParamsPanel		Annuleren
-Cancel	CreateParamsPanel		Annuleren
 Format	MainWindow		Formatteren
 Parameters	PartitionList		Parameters
 Creation of the partition has failed.	MainWindow		Creatie van de partitie is mislukt.

data/catalogs/apps/drivesetup/pl.catkeys

@@ -1,4 +1,4 @@
-1	polish	x-vnd.Haiku-DriveSetup	1372142450
+1	polish	x-vnd.Haiku-DriveSetup	644135944
 DriveSetup	System name		DriveSetup
 Delete	MainWindow		Usuń
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so!	MainWindow		Na pewno chcesz zapisać zmiany na dysk?\n\nWszystkie dane na wybranej partycji bedą bezpowrotnie utracone!
@@ -6,21 +6,17 @@ Rescan	MainWindow		Przeskanuj
 OK	MainWindow		OK
 Could not aquire partitioning information.	MainWindow		Nie można uzyskać informacji na temat partycji.
 There's no space on the partition where a child partition could be created.	MainWindow		Brak miejsca na partycji, gdzie można by utworzyć zagnieżdzoną partycje.
-%ld MiB	Support		%ld MiB
 <empty>	PartitionList		<pusty>
 Unable to find the selected partition by ID.	MainWindow		Nie można znaleźć wybranej partycji po ID.
 Select a partition from the list below.	DiskView		Proszę wybrać partycje z listy poniżej.
 No disk devices have been recognized.	DiskView		Nie rozpoznano żadnych dysków twardych.
 Failed to initialize the disk %s!\n	MainWindow		Błąd podczas inicjalizacji partycji %s!\n
 The selected disk is read-only.	MainWindow		Wybrany dysk jest w trybie tylko do odczytu.
-Partition name:	CreateParamsPanel		Nazwa partycji:
-Initialize	InitParamsPanel		Inicjalizacja
 Are you sure you want to format the partition \"%s\"? You will be asked again before changes are written to the disk.	MainWindow		Czy jesteś pewien, że chcesz sformatować tę partycję \\"%s\"? Zostaniesz zapytany o to ponownie, zanim zmiany zostaną zapisane na dysku.
 Could not mount partition %s.	MainWindow		Nie można zamontować partycji %s.
 The partition %s has been successfully formatted.\n	MainWindow		Partycja %s została poprawnie sformatowana.\n
 The partition %s is already unmounted.	MainWindow		Partycja %s została już odmontowana.
 Failed to delete the partition. No changes have been written to disk.	MainWindow		Błąd podczas usuwaniu partycji. Żadne zmiany nie zostały zapisane na dysk.
-Partition type:	CreateParamsPanel		Typ partycji:
 Could not delete the selected partition.	MainWindow		Nie można usunąć wybranej partycji.
 Initialize	MainWindow		Inicjalizacja
 Error: 	MainWindow	in any error alert	Błąd: 
@@ -33,7 +29,6 @@ There was an error acquiring the partition row.	MainWindow		Wystąpił błąd po
 You need to select a partition entry from the list.	MainWindow		Musisz wybrać partycję docelową z listy.
 The currently selected partition does not have a parent partition.	MainWindow		Wybrana partycja nie posiada partycji nadrzędnej.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected disk will be irretrievably lost if you do so!	MainWindow		Na pewno chcesz zapisać zmiany na dysk?\n\nWszystkie dane na wybranym dysku bedą bezpowrotnie utracone!
-Offset: %ld MB	Support		Przesunięcie: %ld MB
 Write changes	MainWindow		Zapisz zmiany
 There was an error preparing the disk for modifications.	MainWindow		Wystąpił błąd podczas przygotowywania dysku do modyfikacji.
 The partition %s is already mounted.	MainWindow		Partycja %s jest już zamontowana.
@@ -46,7 +41,6 @@ The disk has been successfully initialized.\n	MainWindow		Dysk został poprawnie
 Could not unmount partition %s.	MainWindow		Nie można odmontować partycji %s.
 Failed to format the partition %s!\n	MainWindow		Błąd podczas formatowania partycji %s!\n
 Mount	MainWindow		Montuj
-Create	CreateParamsPanel		Utwórz
 Are you sure you want to format a raw disk? (most people initialize the disk with a partitioning system first) You will be asked again before changes are written to the disk.	MainWindow		Czy jesteś pewien, że chcesz sformatować do surowej partycji RAW (większość ludzi najpierw inicjalizuje dysk z jakimś systemem partycjonowania)? Zostaniesz zapytany ponownie o to, zanim zmiany zostaną zapisane na dysku.
 Device	PartitionList		Urządzenie
 Disk	MainWindow		Dysk
@@ -59,7 +53,6 @@ Cannot delete the selected partition.	MainWindow		Nie mozna usunąć wybranej pa
 Mount all	MainWindow		Zamontuj wszystko
 Cancel	MainWindow		Anuluj
 Delete partition	MainWindow		Usuń partycję
-End: %ld MB	Support		Koniec: %ld MB
 Eject	MainWindow		Wysuń
 Partition	MainWindow		Partycja
 File system	PartitionList		System plików
@@ -70,10 +63,7 @@ Validation of the given initialization parameters failed.	MainWindow		Sprawdzeni
 The selected partition does not contain a partitioning system.	MainWindow		Wybrana partycja nie posiada systemu partycjonowania.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so!	MainWindow		Czy na pewno chcesz zapisać zmiany na dysk?\n\nWszystkie dane na partycji %s zostaną utracone!
 The partition %s is currently mounted.	MainWindow		Partycja %s jest już zamontowana.
-Partition size	CreateParamsPanel		Rozmiar partycji
 Surface test (not implemented)	MainWindow		Test powierzchni (nie zaimplementowano)
-Cancel	InitParamsPanel		Anuluj
-Cancel	CreateParamsPanel		Anuluj
 Format	MainWindow		Format
 Parameters	PartitionList		Parametry
 Creation of the partition has failed.	MainWindow		Próba utworzenia partycji nie powiodła się.

data/catalogs/apps/drivesetup/pt_BR.catkeys

@@ -1,4 +1,4 @@
-1	portuguese (brazil)	x-vnd.Haiku-DriveSetup	1372142450
+1	portuguese (brazil)	x-vnd.Haiku-DriveSetup	644135944
 DriveSetup	System name		Configuração de Unidade
 Delete	MainWindow		Excluir
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so!	MainWindow		Tem certeza que deseja aplicar todas as alterações agora?\n\nTodos os dados na partição selecionada serão perdidos de forma irrecuperável se continuar!
@@ -6,21 +6,17 @@ Rescan	MainWindow		Re-examinar
 OK	MainWindow		OK
 Could not aquire partitioning information.	MainWindow		Não foi possível obter informações sobre a divisão em partições
 There's no space on the partition where a child partition could be created.	MainWindow		Não existe espaço suficiente na partição para criar uma partição dentro dela.
-%ld MiB	Support		%ld MB
 <empty>	PartitionList		<vazio>
 Unable to find the selected partition by ID.	MainWindow		Não foi possível encontrar a partição selecionada pelo ID.
 Select a partition from the list below.	DiskView		Selecione a partição a partir da lista abaixo.
 No disk devices have been recognized.	DiskView		Nenhum dispositivo de disco foi reconhecido.
 Failed to initialize the disk %s!\n	MainWindow		Falha ao inicializar o disco %s!\n
 The selected disk is read-only.	MainWindow		O disco selecionado está marcado como somente leitura
-Partition name:	CreateParamsPanel		Nome da partição:
-Initialize	InitParamsPanel		Inicializar
 Are you sure you want to format the partition \"%s\"? You will be asked again before changes are written to the disk.	MainWindow		Deseja realmente formatar a partição \"%s\"? Você será consultado novamente antes que as alterações sejam gravadas no disco.
 Could not mount partition %s.	MainWindow		Não foi possível montar a partição %s.
 The partition %s has been successfully formatted.\n	MainWindow		A partição %s foi formatada com sucesso.\n
 The partition %s is already unmounted.	MainWindow		A partição %s já está desmontada.
 Failed to delete the partition. No changes have been written to disk.	MainWindow		Falha ao excluir a partição. Nenhuma alteração foi gravada no disco.
-Partition type:	CreateParamsPanel		Tipo de partição:
 Could not delete the selected partition.	MainWindow		Não foi possível excluir a partição selecionada.
 Initialize	MainWindow		Inicializar
 Error: 	MainWindow	in any error alert	Erro:
@@ -33,7 +29,6 @@ There was an error acquiring the partition row.	MainWindow		Ocorreu um erro ao o
 You need to select a partition entry from the list.	MainWindow		Você precisa de selecionar uma partição da lista
 The currently selected partition does not have a parent partition.	MainWindow		A partição selecionada não tem uma partição principal.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected disk will be irretrievably lost if you do so!	MainWindow		Tem certeza que deseja aplicar todas as alterações agora?\n\nTodos os dados na partição selecionada serão perdidos de forma irrecuperável se continuar!
-Offset: %ld MB	Support		Compensação: %ld MB
 Write changes	MainWindow		Gravar alterações
 There was an error preparing the disk for modifications.	MainWindow		Ocorreu um erro ao preparar o disco para modificações.
 The partition %s is already mounted.	MainWindow		A partição %s já está montada.
@@ -46,7 +41,6 @@ The disk has been successfully initialized.\n	MainWindow		O disco foi inicializa
 Could not unmount partition %s.	MainWindow		Não foi possível desmontar a partição %s.
 Failed to format the partition %s!\n	MainWindow		Falha ao formatar a partição %s!\n
 Mount	MainWindow		Montar
-Create	CreateParamsPanel		Criar
 Are you sure you want to format a raw disk? (most people initialize the disk with a partitioning system first) You will be asked again before changes are written to the disk.	MainWindow		Deseja realmente formatar um disco não preparado? (a maioria das pessoas inicializa o disco com um sistema de particionamento primeiro) Você será consultado novamente antes que as alterações sejam gravadas no disco.
 Device	PartitionList		Dispositivo
 Disk	MainWindow		Disco
@@ -59,7 +53,6 @@ Cannot delete the selected partition.	MainWindow		Não foi posível deletar a pa
 Mount all	MainWindow		Montar tudo
 Cancel	MainWindow		Cancelar
 Delete partition	MainWindow		Excluir partição
-End: %ld MB	Support		Fim: %ld MB
 Eject	MainWindow		Ejetar
 Partition	MainWindow		Partição
 File system	PartitionList		Sistema de arquivos
@@ -70,10 +63,7 @@ Validation of the given initialization parameters failed.	MainWindow		A validaç
 The selected partition does not contain a partitioning system.	MainWindow		A partição selecionada não contém um sistema de partições.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so!	MainWindow		Tem certeza que deseja aplicar todas as alterações agora?\n\nTodos os dados na partição selecionada serão perdidos de forma irrecuperável se continuar!
 The partition %s is currently mounted.	MainWindow		A partição %s está atualmente montada.
-Partition size	CreateParamsPanel		Tamanho da partição
 Surface test (not implemented)	MainWindow		Teste de superfície (não implementado)
-Cancel	InitParamsPanel		Cancelar
-Cancel	CreateParamsPanel		Cancelar
 Format	MainWindow		Formatar
 Parameters	PartitionList		Parâmetros
 Creation of the partition has failed.	MainWindow		A criação da partição selecionada falhou.

data/catalogs/apps/drivesetup/ro.catkeys

@@ -1,4 +1,4 @@
-1	romanian	x-vnd.Haiku-DriveSetup	2908539543
+1	romanian	x-vnd.Haiku-DriveSetup	2180533037
 DriveSetup	System name		ConfigurareDiscuri
 Delete	MainWindow		Șterge
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so!	MainWindow		Sigur doriți să scrieți modificările înapoi pe disc acum?\n\nToate datele de pe partiția selectată vor fi pierdute fără posibilitatea de a le recupera dacă faceți acest lucru!
@@ -6,18 +6,14 @@ Rescan	MainWindow		Rescanează
 OK	MainWindow		Bine
 Could not aquire partitioning information.	MainWindow		Nu s-au putut obține infomațiile de partiționare.
 There's no space on the partition where a child partition could be created.	MainWindow		Nu mai există spațiu liber pe partiția unde se poate crea o partiție secundară.
-%ld MiB	Support		%ld MiB
 <empty>	PartitionList		<liber>
 Unable to find the selected partition by ID.	MainWindow		Nu s-a putut găsi partiția selectată după ID.
 Select a partition from the list below.	DiskView		Selectați o partiție din lista de mai jos.
 No disk devices have been recognized.	DiskView		Nu au fost recunoscute dispozitivele de disc.
 The selected disk is read-only.	MainWindow		Discul selectat este protejat la scriere.
-Partition name:	CreateParamsPanel		Nume partiție:
-Initialize	InitParamsPanel		Inițializează
 Could not mount partition %s.	MainWindow		Nu s-a putut monta partiția %s.
 The partition %s is already unmounted.	MainWindow		Partiția %s este deja demontată.
 Failed to delete the partition. No changes have been written to disk.	MainWindow		Ștergerea partiției a eșuat. Nu s-au scris modificări pe disc.
-Partition type:	CreateParamsPanel		Tip de partiție:
 Could not delete the selected partition.	MainWindow		Nu s-a putut șterge partiția selectată.
 Initialize	MainWindow		Inițializează
 Error: 	MainWindow	in any error alert	Eroare:
@@ -30,7 +26,6 @@ There was an error acquiring the partition row.	MainWindow		A apărut o eroare l
 You need to select a partition entry from the list.	MainWindow		Trebuie să selectați o intrare de partiție din listă.
 The currently selected partition does not have a parent partition.	MainWindow		Partiția selectată curent nu are o partiție superioară.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected disk will be irretrievably lost if you do so!	MainWindow		Sigur doriți să scrieți modificările înapoi pe disc acum?\n\nToate datele de pe discul selectat vor fi pierdute fără posibilitatea de a le recupera dacă faceți acest lucru!
-Offset: %ld MB	Support		Decalaj: %ld MiB
 Write changes	MainWindow		Scrie modificări
 There was an error preparing the disk for modifications.	MainWindow		A apărut o eroare la pregătirea discului pentru modificări.
 The partition %s is already mounted.	MainWindow		Partiția %s este deja montată.
@@ -40,7 +35,6 @@ Create…	MainWindow		Crează...
 Disk system \"%s\"\" not found!	MainWindow		Sistemul de disc „%s\”\” nu a fost găsit!
 Could not unmount partition %s.	MainWindow		Nu se poate demonta partiția %s.
 Mount	MainWindow		Montează
-Create	CreateParamsPanel		Crează
 Device	PartitionList		Dispozitiv
 Disk	MainWindow		Disc
 Device	DiskView		Dispozitiv
@@ -51,7 +45,6 @@ Cannot delete the selected partition.	MainWindow		Nu se poate șterge partiția
 Mount all	MainWindow		Montează tot
 Cancel	MainWindow		Anulează
 Delete partition	MainWindow		Șterge partiție
-End: %ld MB	Support		Final: %ld MiB
 Eject	MainWindow		Scoate
 Partition	MainWindow		Partiție
 File system	PartitionList		Sistem de fișiere
@@ -61,10 +54,7 @@ Validation of the given initialization parameters failed.	MainWindow		Validarea
 The selected partition does not contain a partitioning system.	MainWindow		Partiția selectată nu conține un sistem de partiționare.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so!	MainWindow		Sigur doriți să scrieți modificările înapoi pe disc acum?\n\nToate datele de pe partiția %s vor fi pierdute fără posibilitatea de a le recupera dacă faceți acest lucru!
 The partition %s is currently mounted.	MainWindow		Partiția %s este montantă curent.
-Partition size	CreateParamsPanel		Dimensiune partiție
 Surface test (not implemented)	MainWindow		Test de suprafață (nu este implementat)
-Cancel	InitParamsPanel		Anulează
-Cancel	CreateParamsPanel		Anulează
 Parameters	PartitionList		Parametri
 Creation of the partition has failed.	MainWindow		Crearea partiției a eșuat.
 The currently selected partition is not empty.	MainWindow		Partiția curentă selectată nu este liberă.

data/catalogs/apps/drivesetup/ru.catkeys

@@ -1,4 +1,4 @@
-1	russian	x-vnd.Haiku-DriveSetup	1372142450
+1	russian	x-vnd.Haiku-DriveSetup	644135944
 DriveSetup	System name		Разметка диска
 Delete	MainWindow		Удалить
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so!	MainWindow		Вы уверены, что хотите записать изменения на диск прямо сейчас?\n\nЕсли вы продолжите, то все данные на выбранном разделе будут безвозвратно потеряны!
@@ -6,21 +6,17 @@ Rescan	MainWindow		Пересканировать
 OK	MainWindow		ОК
 Could not aquire partitioning information.	MainWindow		Невозможно получить информацию о разделах.
 There's no space on the partition where a child partition could be created.	MainWindow		Недостаточно места на разделе, где можно было бы создать подраздел.
-%ld MiB	Support		%ld МБ
 <empty>	PartitionList		<пусто>
 Unable to find the selected partition by ID.	MainWindow		Невозможно найти выбранный раздел по ID.
 Select a partition from the list below.	DiskView		Выберите раздел из списка ниже
 No disk devices have been recognized.	DiskView		Ни одно из дисковых устройств не распознано.
 Failed to initialize the disk %s!\n	MainWindow		Не удалось инициализировать раздел %s!\n
 The selected disk is read-only.	MainWindow		Выбранный диск доступен только для чтения.
-Partition name:	CreateParamsPanel		Имя раздела:
-Initialize	InitParamsPanel		Инициализировать
 Are you sure you want to format the partition \"%s\"? You will be asked again before changes are written to the disk.	MainWindow		Вы уверены, что хотите инициализировать раздел \"%s\"?\nПовторный запрос будет выдан непосредственно перед записью изменений на диск.
 Could not mount partition %s.	MainWindow		Невозможно подключить раздел %s.
 The partition %s has been successfully formatted.\n	MainWindow		Раздел %s был успешно инициализирован.\n
 The partition %s is already unmounted.	MainWindow		Раздел %s уже отключен.
 Failed to delete the partition. No changes have been written to disk.	MainWindow		Не удалось удалить раздел. Изменения не были записаны на диск.
-Partition type:	CreateParamsPanel		Тип раздела:
 Could not delete the selected partition.	MainWindow		Невозможно удалить выбранный раздел.
 Initialize	MainWindow		Инициализировать
 Error: 	MainWindow	in any error alert	Ошибка: 
@@ -33,7 +29,6 @@ There was an error acquiring the partition row.	MainWindow		Произошла
 You need to select a partition entry from the list.	MainWindow		Вам нужно выбрать раздел из списка.
 The currently selected partition does not have a parent partition.	MainWindow		Выбранный раздел не имеет родительского раздела.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected disk will be irretrievably lost if you do so!	MainWindow		Вы уверены, что хотите записать изменения на диск прямо сейчас?\n\nВсе данные на выбранном диске будут безвозвратно потеряны, если вы продолжите!
-Offset: %ld MB	Support		Смещение: %ld МБ
 Write changes	MainWindow		Записать изменения
 There was an error preparing the disk for modifications.	MainWindow		Произошла ошибка при сохранении изменений на диск.
 The partition %s is already mounted.	MainWindow		Раздел %s уже отключен.
@@ -46,7 +41,6 @@ The disk has been successfully initialized.\n	MainWindow		Диск был усп
 Could not unmount partition %s.	MainWindow		Невозможно отключить раздел %s.
 Failed to format the partition %s!\n	MainWindow		Не удалось инициализировать раздел %s!\n
 Mount	MainWindow		Подключить
-Create	CreateParamsPanel		Создать
 Are you sure you want to format a raw disk? (most people initialize the disk with a partitioning system first) You will be asked again before changes are written to the disk.	MainWindow		Вы уверены, что хотите инициализировать весь диск? (обычно на диске создают систему разделов)\nПовторный запрос будет выдан непосредственно перед записью изменений на диск.
 Device	PartitionList		Устройство
 Disk	MainWindow		Диск
@@ -59,7 +53,6 @@ Cannot delete the selected partition.	MainWindow		Невозможно удал
 Mount all	MainWindow		Подключить все
 Cancel	MainWindow		Отмена
 Delete partition	MainWindow		Удалить раздел
-End: %ld MB	Support		Конец: %ld МБ
 Eject	MainWindow		Извлечь
 Partition	MainWindow		Раздел
 File system	PartitionList		Файловая система
@@ -70,10 +63,7 @@ Validation of the given initialization parameters failed.	MainWindow		Не уд
 The selected partition does not contain a partitioning system.	MainWindow		Выбранный раздел не содержит таблицу разделов.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so!	MainWindow		Вы уверены, что хотите записать изменения на диск прямо сейчас?\n\nЕсли вы продолжите, то все данные на разделе %s будут безвозвратно потеряны!
 The partition %s is currently mounted.	MainWindow		Раздел %s в данный момент подключен.
-Partition size	CreateParamsPanel		Размер раздела
 Surface test (not implemented)	MainWindow		Тест поверхности (еще не реализовано)
-Cancel	InitParamsPanel		Отмена
-Cancel	CreateParamsPanel		Отмена
 Format	MainWindow		Инициализировать
 Parameters	PartitionList		Параметры
 Creation of the partition has failed.	MainWindow		Не удалось создать раздел.

data/catalogs/apps/drivesetup/sk.catkeys

@@ -1,4 +1,4 @@
-1	slovak	x-vnd.Haiku-DriveSetup	1372142450
+1	slovak	x-vnd.Haiku-DriveSetup	644135944
 DriveSetup	System name		Nastavenie diskových oblastí
 Delete	MainWindow		Zmazať
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so!	MainWindow		Ste si istí, že chcete tieto zmeny teraz zapísať na disk?\n\nAk tak urobíte, všetky údaje na vybranej diskovej oblasti budú nenávratne stratené!
@@ -6,21 +6,17 @@ Rescan	MainWindow		Znovu preskúmať
 OK	MainWindow		OK
 Could not aquire partitioning information.	MainWindow		Nepodarilo sa získať informácie o diskových oblastiach.
 There's no space on the partition where a child partition could be created.	MainWindow		Na oblasti nie je miesto, kde by bolo možné vytvoriť podriadenú oblasť.
-%ld MiB	Support		%ld MiB
 <empty>	PartitionList		<prázdne>
 Unable to find the selected partition by ID.	MainWindow		Nebolo možné nájsť vybranú oblasť podľa ID.
 Select a partition from the list below.	DiskView		Vyberte oblasť zo zoznamu dolu.
 No disk devices have been recognized.	DiskView		Neboli rozpoznané žiadne diskové zariadenia.
 Failed to initialize the disk %s!\n	MainWindow		Nepodarilo sa inicializovať disk %s!\n
 The selected disk is read-only.	MainWindow		Vybraný disk je len na čítanie.
-Partition name:	CreateParamsPanel		Názov oblasti:
-Initialize	InitParamsPanel		Inicializovať
 Are you sure you want to format the partition \"%s\"? You will be asked again before changes are written to the disk.	MainWindow		Ste si istí, že chcete naformátovať oblasť „%s“? Pred zapísaním zmien na disk sa vás program znova spýta.
 Could not mount partition %s.	MainWindow		Nepodarilo sa pripojiť oblasť %s.
 The partition %s has been successfully formatted.\n	MainWindow		Oblasť %s bola úspešne naformátovaná.\n
 The partition %s is already unmounted.	MainWindow		Oblasť %s je už odpojená.
 Failed to delete the partition. No changes have been written to disk.	MainWindow		Nepodarilo sa zmazať oblasť. Žiadne zmeny neboli zapísané na disk.
-Partition type:	CreateParamsPanel		Typ oblasti:
 Could not delete the selected partition.	MainWindow		Nepodarilo sa zmazať vybranú oblasť.
 Initialize	MainWindow		Inicializovať
 Error: 	MainWindow	in any error alert	Chyba: 
@@ -33,7 +29,6 @@ There was an error acquiring the partition row.	MainWindow		Vyskytla sa chyba pr
 You need to select a partition entry from the list.	MainWindow		Musíte vybrať záznam oblasti zo zoznamu.
 The currently selected partition does not have a parent partition.	MainWindow		Momentálne vybraná oblasť nemá nadradenú oblasť.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected disk will be irretrievably lost if you do so!	MainWindow		Ste si istí, že chcete tieto zmeny teraz zapísať na disk?\n\nAk tak urobíte, všetky údaje na vybranom disku budú nenávratne stratené!
-Offset: %ld MB	Support		Ofset: %ld MB
 Write changes	MainWindow		Zapísať zmeny
 There was an error preparing the disk for modifications.	MainWindow		Vyskytla sa chyba pri pripravovaní disku na zmeny.
 The partition %s is already mounted.	MainWindow		Oblasť %s je už pripojená.
@@ -46,7 +41,6 @@ The disk has been successfully initialized.\n	MainWindow		Disk bol úspešne ini
 Could not unmount partition %s.	MainWindow		Nepodarilo sa odpojiť oblasť %s.
 Failed to format the partition %s!\n	MainWindow		Nepodarilo sa naformátovať oblasť %s!\n
 Mount	MainWindow		Pripojiť
-Create	CreateParamsPanel		Vytvoriť
 Are you sure you want to format a raw disk? (most people initialize the disk with a partitioning system first) You will be asked again before changes are written to the disk.	MainWindow		Ste si istí, že chcete naformátovať neformátovaný disk? (väčšina ľudí najskôr disk inicializuje pomocou systému na rozdelenie disku) Pred zapísaním zmien na disk sa vás program znova spýta.
 Device	PartitionList		Zariadenie
 Disk	MainWindow		Disk
@@ -59,7 +53,6 @@ Cannot delete the selected partition.	MainWindow		Nie je možné zmazať vybran
 Mount all	MainWindow		Pripojiť všetky
 Cancel	MainWindow		Zrušiť
 Delete partition	MainWindow		Zmazať oblasť
-End: %ld MB	Support		Koniec: %ld MB
 Eject	MainWindow		Vysunúť
 Partition	MainWindow		Oblasť
 File system	PartitionList		Súborový systém
@@ -70,10 +63,7 @@ Validation of the given initialization parameters failed.	MainWindow		Overenie z
 The selected partition does not contain a partitioning system.	MainWindow		Zdá sa, že vybraná disková oblasť neobsahuje systém oblastí.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so!	MainWindow		Ste si istí, že chcete tieto zmeny teraz zapísať na disk?\n\nAk tak urobíte, všetky údaje na diskovej oblasti %s budú nenávratne stratené!
 The partition %s is currently mounted.	MainWindow		Oblasť %s je momentálne pripojená.
-Partition size	CreateParamsPanel		Veľkosť oblasti
 Surface test (not implemented)	MainWindow		Test povrchu disku (neimplementované)
-Cancel	InitParamsPanel		Zrušiť
-Cancel	CreateParamsPanel		Zrušiť
 Format	MainWindow		Naformátovať
 Parameters	PartitionList		Parametre
 Creation of the partition has failed.	MainWindow		Vytvorenie diskovej oblasti zlyhalo.

data/catalogs/apps/drivesetup/sv.catkeys

@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Haiku-DriveSetup	1372142450
+1	swedish	x-vnd.Haiku-DriveSetup	659039073
 DriveSetup	System name		DiskHanterare
 Delete	MainWindow		Ta bort
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so!	MainWindow		Är du säker på att du vill skriva ändringar tillbaka till disken ny?\n\nAlla data på den valda partitionen kommer att raderas om du gör så!
@@ -6,21 +6,17 @@ Rescan	MainWindow		Uppdatera
 OK	MainWindow		OK
 Could not aquire partitioning information.	MainWindow		Kunde inte läsa partitionsinformation.
 There's no space on the partition where a child partition could be created.	MainWindow		Det finns inget utrymme för en underpartition på partitionen.
-%ld MiB	Support		%ld MiB
 <empty>	PartitionList		<tom>
 Unable to find the selected partition by ID.	MainWindow		Kunde inte hitta den valda partitionen via ID.
 Select a partition from the list below.	DiskView		Välj en partition från listan nedan.
 No disk devices have been recognized.	DiskView		Inga diskenheter har identifierats.
 Failed to initialize the disk %s!\n	MainWindow		Misslyckades att initiera partionen %s!\n
 The selected disk is read-only.	MainWindow		Den valda disken är inte skrivbar.
-Partition name:	CreateParamsPanel		Partitionsnamn:
-Initialize	InitParamsPanel		Initiera
 Are you sure you want to format the partition \"%s\"? You will be asked again before changes are written to the disk.	MainWindow		Är du säker att du vill formatera partitionen \"%s\"? Du kommet att få frågan igen innan ändringarna skrivs till disk.
 Could not mount partition %s.	MainWindow		Kunde inte montera partition %s.
 The partition %s has been successfully formatted.\n	MainWindow		Partitionen %s har initierats.\n
 The partition %s is already unmounted.	MainWindow		Partitionen %s är redan avmonterad.
 Failed to delete the partition. No changes have been written to disk.	MainWindow		Kunde inte radera partitionen. Inga ändringar har skrivits till disken.
-Partition type:	CreateParamsPanel		Partitionstyp:
 Could not delete the selected partition.	MainWindow		Kunde inte radera den valda partitionen.
 Initialize	MainWindow		Initiera
 Error: 	MainWindow	in any error alert	Fel: 
@@ -33,7 +29,6 @@ There was an error acquiring the partition row.	MainWindow		Ett fel uppstod när
 You need to select a partition entry from the list.	MainWindow		Du måste välja en partiton från listan.
 The currently selected partition does not have a parent partition.	MainWindow		Den valda partitionen saknar omslutande partition.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected disk will be irretrievably lost if you do so!	MainWindow		Är du säker på att du vill skriva ändringarna till disken?\n\nAll data på partitionen kommer att gå förlorad!
-Offset: %ld MB	Support		Offset: %ld MB
 Write changes	MainWindow		Skriv ändringar
 There was an error preparing the disk for modifications.	MainWindow		Det blev ett fel när diskändringarna förbereddes.
 The partition %s is already mounted.	MainWindow		Partitionen %s är redan monterad.
@@ -46,7 +41,7 @@ The disk has been successfully initialized.\n	MainWindow		Partitionen har initie
 Could not unmount partition %s.	MainWindow		Kunde inte avmontera partition %s.
 Failed to format the partition %s!\n	MainWindow		Misslyckades att formatera partionen %s!\n
 Mount	MainWindow		Montera
-Create	CreateParamsPanel		Skapa
+Partition type	PartitionList		Partitionstyp
 Are you sure you want to format a raw disk? (most people initialize the disk with a partitioning system first) You will be asked again before changes are written to the disk.	MainWindow		Är du säker att du vill formatera en raw disk? (de flesta initierar disken med en partion först) Du kommet att få frågan igen innan ändringarna skrivs till disk.
 Device	PartitionList		Enhet
 Disk	MainWindow		Disk
@@ -59,7 +54,6 @@ Cannot delete the selected partition.	MainWindow		Kan inte radera den valda part
 Mount all	MainWindow		Montera alla
 Cancel	MainWindow		Avbryt
 Delete partition	MainWindow		Radera partition
-End: %ld MB	Support		Slut: %ld MB
 Eject	MainWindow		Mata ut
 Partition	MainWindow		Partition
 File system	PartitionList		Filsystem
@@ -70,10 +64,7 @@ Validation of the given initialization parameters failed.	MainWindow		Utvärderi
 The selected partition does not contain a partitioning system.	MainWindow		Den valda partitionen innehåller inget partitionssystem.
 Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so!	MainWindow		Är du säker på att du vill skriva ändringarna till disken?\n\nAll data på partitionen %s kommer att gå förlorad!
 The partition %s is currently mounted.	MainWindow		Partitionen %s är monterad.
-Partition size	CreateParamsPanel		Partitionsstorlek
 Surface test (not implemented)	MainWindow		Yttest (inte implementerat)
-Cancel	InitParamsPanel		Avbryt
-Cancel	CreateParamsPanel		Avbryt
 Format	MainWindow		Format
 Parameters	PartitionList		Parametrar
 Creation of the partition has failed.	MainWindow		Skapande av partitionen misslyckades.

data/catalogs/apps/drivesetup/uk.catkeys

@@ -1,4 +1,4 @@
-1	ukrainian	x-vnd.Haiku-DriveSetup	58298917
+1	ukrainian	x-vnd.Haiku-DriveSetup	4088461154
 DriveSetup	System name		DriveSetup
 Delete	MainWindow		Видалити
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so!	MainWindow		Ви впевнені, що бажаєте записати зміни на диск зараз?\n\nВсі дані на вибраному розділі будуть безповоротно втрачені!
@@ -6,18 +6,14 @@ Rescan	MainWindow		Пересканувати
 OK	MainWindow		Гаразд
 Could not aquire partitioning information.	MainWindow		Неможливо відобразити інформацію про розмітку.
 There's no space on the partition where a child partition could be created.	MainWindow		Відсутнє місце в розділі , де ви бажаєте створити дочірній розділ.
-%ld MiB	Support		%ld MiB
 <empty>	PartitionList		<пусто>
 Unable to find the selected partition by ID.	MainWindow		Неможливо знайти розділ за ID.
 Select a partition from the list below.	DiskView		Виберіть розділ зі списку нижче.
 No disk devices have been recognized.	DiskView		Не розпізнано жодного дискового пристрою.
 The selected disk is read-only.	MainWindow		Вибраний диск тільки для читання.
-Partition name:	CreateParamsPanel		Ім'я розділу:
-Initialize	InitParamsPanel		Ініціалізувати
 Could not mount partition %s.	MainWindow		Неможливо підмонтувати розділ %s.
 The partition %s is already unmounted.	MainWindow		Розділ %s повністю відмонтований.
 Failed to delete the partition. No changes have been written to disk.	MainWindow		Видалення розділу призупинене. Жодні зміни не були записані на диск.
-Partition type:	CreateParamsPanel		Тип розділу:
 Could not delete the selected partition.	MainWindow		Неможливо видалити вибраний розділ.
 Initialize	MainWindow		Ініціалізація
 Error: 	MainWindow	in any error alert	Помилка:

data/catalogs/apps/drivesetup/zh_Hans.catkeys

@@ -1,4 +1,4 @@
-1	english	x-vnd.Haiku-DriveSetup	1372142450
+1	english	x-vnd.Haiku-DriveSetup	644135944
 DriveSetup	System name		磁盘管理器
 Delete	MainWindow		删除
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected partition will be irretrievably lost if you do so!	MainWindow		您确定将所做修改写入磁盘吗？\n\n如果执行此操作，选中分区上的所有数据将丢失，无法恢复！
@@ -6,21 +6,17 @@ Rescan	MainWindow		重新扫描
 OK	MainWindow		确定
 Could not aquire partitioning information.	MainWindow		无法获取分区信息。
 There's no space on the partition where a child partition could be created.	MainWindow		所选分区没有足够的空间创建子分区。
-%ld MiB	Support		%ld MiB
 <empty>	PartitionList		<空白>
 Unable to find the selected partition by ID.	MainWindow		无法通过ID找到所选分区。
 Select a partition from the list below.	DiskView		请从以下列表选择一个分区。
 No disk devices have been recognized.	DiskView		无可识别的磁盘。  
 Failed to initialize the disk %s!\n	MainWindow		初始化磁盘 %s 失败！\n
 The selected disk is read-only.	MainWindow		所选磁盘是只读的。
-Partition name:	CreateParamsPanel		分区名称：
-Initialize	InitParamsPanel		初始化
 Are you sure you want to format the partition \"%s\"? You will be asked again before changes are written to the disk.	MainWindow		您是否确定格式化分区 \"%s\" ？在磁盘写入修改前，您将需要再次确认。
 Could not mount partition %s.	MainWindow		无法挂载分区 ％s。
 The partition %s has been successfully formatted.\n	MainWindow		分区 %s 已完成初始化。\n
 The partition %s is already unmounted.	MainWindow		分区 ％s 已经卸载。  
 Failed to delete the partition. No changes have been written to disk.	MainWindow		删除分区失败。所作修改未写入磁盘。
-Partition type:	CreateParamsPanel		分区类型：
 Could not delete the selected partition.	MainWindow		无法删除所选分区。  
 Initialize	MainWindow		初始化
 Error: 	MainWindow	in any error alert	错误：
@@ -33,7 +29,6 @@ There was an error acquiring the partition row.	MainWindow		获取分区序列
 You need to select a partition entry from the list.	MainWindow		您需要从列表中选择一个分区。
 The currently selected partition does not have a parent partition.	MainWindow		当前选中分区无父分区。
 Are you sure you want to write the changes back to disk now?\n\nAll data on the selected disk will be irretrievably lost if you do so!	MainWindow		您确定将所做修改写入磁盘吗？\n\n如果执行该操作，选中磁盘中的所有数据将丢失，无法恢复！
-Offset: %ld MB	Support		偏移量：％ld MB
 Write changes	MainWindow		写入修改
 There was an error preparing the disk for modifications.	MainWindow		准备对磁盘写入修改时出现错误。
 The partition %s is already mounted.	MainWindow		分区 %s 已经挂载。
@@ -46,7 +41,6 @@ The disk has been successfully initialized.\n	MainWindow		磁盘 %s 已完成初
 Could not unmount partition %s.	MainWindow		无法卸载分区 %s。
 Failed to format the partition %s!\n	MainWindow		分区 %s 格式化失败！\n
 Mount	MainWindow		挂载
-Create	CreateParamsPanel		创建
 Are you sure you want to format a raw disk? (most people initialize the disk with a partitioning system first) You will be asked again before changes are written to the disk.	MainWindow		您是否确定格式化原始磁盘？（首先需要将磁盘进行初始化分区）在磁盘写入修改前，您将需要再次确认。
 Device	PartitionList		设备
 Disk	MainWindow		磁盘
@@ -59,7 +53,6 @@ Cannot delete the selected partition.	MainWindow		无法删除选中分区。
 Mount all	MainWindow		挂载所有磁盘
 Cancel	MainWindow		取消
 Delete partition	MainWindow		删除分区
-End: %ld MB	Support		结束：%ld MB
 Eject	MainWindow		弹出
 Partition	MainWindow		分区
 File system	PartitionList		文件系统
@@ -70,10 +63,7 @@ Validation of the given initialization parameters failed.	MainWindow		给定初
 The selected partition does not contain a partitioning system.	MainWindow		选中分区不包含分区系统。
 Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so!	MainWindow		您确定将所做修改写入磁盘吗？\n\n执行此操作之后，分区 %s 中的所有数据将丢失，无法恢复！
 The partition %s is currently mounted.	MainWindow		分区 %s 当前已挂载。
-Partition size	CreateParamsPanel		分区大小
 Surface test (not implemented)	MainWindow		表面测试（未执行）
-Cancel	InitParamsPanel		取消
-Cancel	CreateParamsPanel		取消
 Format	MainWindow		格式化
 Parameters	PartitionList		参数
 Creation of the partition has failed.	MainWindow		分区创建失败。

data/catalogs/apps/firstbootprompt/fr.catkeys

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

data/catalogs/apps/firstbootprompt/hu.catkeys

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

data/catalogs/apps/mail/sv.catkeys

@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Be-MAIL	694056289
+1	swedish	x-vnd.Be-MAIL	233997769
 View	Mail		Visa
 %d - Date	Mail		%d - Datum
 Attach attributes:	Mail		Bifoga attribut:
@@ -33,6 +33,7 @@ There is no installed handler for URL links.	Mail		Det finns ingen behandlare in
 Signature	Mail		Signatur
 Find again	Mail		Sök igen
 Bcc:	Mail		Blindkopia:
+Your main text contains %ld unencodable characters. Perhaps a different character set would work better? Hit Send to send it anyway (a substitute character will be used in place of the unencodable ones), or choose Cancel to go back and try fixing it up.	Mail		Din text innehåller %ld tecken som inte kan hanteras. En annan teckenuppsättning kanske skulle fungera bättre? Klicka Skicka för att skicka det ändå (Ersättnings tecken kommer att användas till de tecken som inte kunde översättas), eller välj avbryt och försök att fixa felet.
 Signature:	Mail		Signatur:
 Save changes to this signature?	Mail		Spara ändringar till denna signatur?
 Cc:	Mail		Kopia:
@@ -51,6 +52,7 @@ Include file attributes in attachments	Mail		Inkludera fil attribut i bifogade f
 OK	Mail		OK
 Send	Mail		Skicka
 Show icons only	Mail		Visa iconer bara
+Removing attachments from a forwarded mail is not yet implemented!\nIt will not yet work correctly.	Mail		Att ta bort bilaga från ett mail som skickats vidare är inte implementerat än!\nDet kommer inte att fungera som det ska.
 Hide	Mail		Dölj
 Forward without attachments	Mail		Vidarebefordra utan bifigade filer
 Previous	Mail		Föregående
@@ -58,26 +60,33 @@ Redo	Mail		Upprepa
 Add enclosure…	Mail		Lägg till område…
 Mail	System name		E-post
 Print…	Mail		Skriv ut…
+Warn unencodable:	Mail		Varna för tecken som inte gick att översätta:
 Quit	Mail		Avsluta
 %n - Full name	Mail		%n - Hela namnet
  Read 	Mail		 Läs 
 UTF-8	Mail	This string is used as a key to set default message compose encoding. It must be correct IANA name from http://cgit.haiku-os.org/haiku/tree/src/kits/textencoding/character_sets.cpp Translate it only if you want to change default message compose encoding for your locale. If you don't know what is it and why it may needs changing, just leave \"UTF-8\".	UTF-8
 Trash	Mail		Papperskorg
+Default account:	Mail		Standardkonto:
 Size:	Mail		Storlek:
+Account from mail	Mail		Konto från mail
 Edit signatures…	Mail		Redigera signaturer…
 New	Mail		Nytt
 Attachments: 	Mail		Bilagor: 
 On	Mail		På
 Set to %s	Mail		Ställ in %s
 Forward	Mail		Vidarebefordra
+E-mail draft could not be saved!	Mail		Mailet kunde inte sparas!
 %e wrote:\\n	Mail		%e skrev:\\n
 To:	Mail		Till:
+Only files can be added as attachments.	Mail		Endast filer kan läggas till som bilaga.
 Previous message	Mail		Föregående meddelande
 Attachments:	Mail		Bilagor:
 Title:	Mail		Titel:
+<no account found>	Mail		<inget konto hittades>
 Find…	Mail		Sök...
 Accounts…	Mail		Konto…
 Mail preferences	Mail		E-postinställningar
+Initial spell check mode:	Mail		Initiala rättstavningsmetoden:
 Leave same	Mail		Lämna samma
 Page setup…	Mail		Sidinställningar…
 Text wrapping:	Mail		Textradbrytning:
@@ -85,14 +94,20 @@ Revert	Mail		Återgå
 File	Mail		Arkiv
 mail	B_USER_DIRECTORY/mail		e-post
 None	Mail		Ingen
+(Name unavailable)	Mail		(Namnet kunde inte nås)
+Copy link location	Mail		Kopiera länkplats
 out	B_USER_DIRECTORY/mail/out		ut
 Show header	Mail		Visa header
 %e - E-mail address	Mail		%e - E-postadress
+Resend	Mail		Skicka igen
 Show raw message	Mail		Visa meddelande
 \\n - Newline	Mail		\\n - Ny rad
 Start now	Mail		Starta nu
 Close	Mail		Stäng
 No matches	Mail		Inga träffar
+The mail_daemon is not running. The message is queued and will be sent when the mail_daemon is started.	Mail		mail_daemon körs inte. Meddelandet är satt på kö och kommer att skickas så fort mail_daemon startats.
+Really delete this signature? This cannot be undone.	Mail		Vill du verkligen ta bort signaturen? Det kan inte ångras.
+Save this message as a draft before closing?	Mail		Spara meddelandet som utkast innan programmet stängs?
 Open	Mail		Öppna
 draft	B_USER_DIRECTORY/mail/draft		utkast
 Quote	Mail		Citat
@@ -101,26 +116,50 @@ Next message	Mail		Nästa meddelande
 User interface	Mail		Användargränssnitt
 Cancel	Mail		Avbryt
 Send message	Mail		Skicka meddelande
+Remove enclosure	Mail		Ta bort bilaga
 Account:	Mail		Konto:
 Decoding:	Mail		Avkodar:
+Sorry, could not find an application that supports the 'Person' data type.	Mail		Kunde inte hitta en applikation som supporterar 'Person' datatypen.
 Delete	Mail		Ta bort
+Don't send	Mail		Skicka inte
 Leave as '%s'	Mail		Lämna som '%s'
 Copy	Mail		Kopiera
+Mail couldn't find its dictionary.	Mail		Mail kunde inte hitta arbetskatalogen.
+Reply preamble:	Mail		Skriv Inledning:
 Signatures	Mail		Signaturer
 Next	Mail		Nästa
+Set to…	Mail		Satt till...
 Use default account	Mail		Använd standardkonto
+Sorry	Mail		Tyvärr
 Encoding:	Mail		Kodning:
 Font:	Mail		Typsnitt:
+(Address unavailable)	Mail		(Adresser kunde inte nås)
 Save address	Mail		Spara adress
 Queries	Mail		Sökningar
+Send this message before closing?	Mail		Skicka meddelandet innan programmet stängs?
 Save	Mail		Spara
+Random	Mail		Slumpmässigt
+Close and 	Mail		Stäng och 
+Save as draft	Mail		Spara som utkast
+The mail_daemon could not be started:\n\t	Mail		mail_daemon kunde inte startas:\n\t
+Open attachment	Mail		Öppna bilaga
+sent	B_USER_DIRECTORY/mail/sent		skickat
+(Date unavailable)	Mail		(Datum inte tillgänglig)
+Put your favorite e-mail queries and query templates in this folder.	Mail		Lägg din e-post fråga och frågemall i denna folder.
+Reply	Mail		Svara
 From:	Mail		Från:
+Couldn't open this signature. Sorry.	Mail		Kunde inte öppna denna signatur.
+Open draft	Mail		Öppna utkast
 Cut	Mail		Klipp ut
 Check spelling	Mail		Kontrollera stavning
 Set to Saved	Mail		Set till Sparad
 Open this link	Mail		Öppna denna länk
 Auto signature:	Mail		Autosignatur:
 Add signature	Mail		Lägg till signatur
+Need Tracker to move items to trash	Mail		Tracker behöver flytta objekt till papperskorgen
+Mailing	Mail		e-post
 Unread	Mail		Oläst
+Remove quote	Mail		Ta bort citationstecken
 Move to trash	Mail		Flytta till papperskorg
 Select all	Mail		Markera alla
+An error occurred trying to save this signature.	Mail		Ett fel uppstod när signaturen skulle sparas.

data/catalogs/apps/mediaconverter/fr.catkeys

@@ -1,9 +1,11 @@
-1	french	x-vnd.Haiku-MediaConverter	2955071341
+1	french	x-vnd.Haiku-MediaConverter	2722282283
 Video using parameters form settings	MediaConverter		La vidéo utilise les paramètres de réglages
 Video encoding:	MediaConverter		Encodage vidéo :
+Error read audio frame %lld	MediaConverter		Erreur de lecture de l'échantillon audio %lld
 No audio	Audio codecs list		Pas de son
 Error	MediaConverter		Erreur
 Error loading a file	MediaConverter		Erreur au chargement d'un fichier
+Error read video frame %lld	MediaConverter		Erreur de lecture de l'image vidéo %lld
 File Error	MediaConverter-FileInfo		Erreur Fichier
 Open…	Menu		Ouvrir…
 Start [ms]: 	MediaConverter		Début [ms] : 
@@ -22,6 +24,8 @@ Audio:	MediaConverter-FileInfo		Audio :
 OK	MediaConverter-FileInfo		OK
  seconds	MediaFileInfo		 secondes
 Source files	MediaConverter		Fichiers sources
+Error writing video frame %lld	MediaConverter		Erreur d'écriture de la trame vidéo %lld
+Error writing audio frame %lld	MediaConverter		Erreur d'écriture de l'échantillon audio %lld
 Cancelling	MediaConverter		Annulation
 %d byte 	MediaFileInfo		%d octets 
 Error loading files	MediaConverter		Erreur de chargement des fichiers

data/catalogs/apps/stylededit/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-StyledEdit	94944799
+1	french	x-vnd.Haiku-StyledEdit	3208803155
 StyledEdit	System name		Éditeur stylé
 This file is marked read-only. Save changes to the document \"%s\"? 	SaveAlert		Ce fichier est en lecture seule. Voulez-vous sauvegarder les modifications dans le document « %s » ? 
 Paste	Menus		Coller
@@ -42,6 +42,7 @@ Default	Open_and_SaveAsPanel		Défaut
 Replace next	Menus		Remplacer le suivant
 \"%s\" has unsaved changes.\nRevert it to the last saved version? 	RevertToSavedAlert		« %s » a des modifications en suspens.\nVoulez-vous rétablir la dernière version sauvegardée ? 
 Cancel	FindandReplaceWindow		Annuler
+Text encoding	Menus		Encodage du texte
 Close	Menus		Fermer
 Save	SaveAlert		Sauvegarder
 Words:	Statistics		Mots :
@@ -55,6 +56,7 @@ OK	QuitAlert		OK
 Open…	Menus		Ouvrir…
 Center	Menus		Centré
 Blue	Menus		Bleu
+Unable to unlock file\n\t%s	QuitAlert		Impossible de déverrouiller le fichier\n\t%s
 Cyan	Menus		Cyan
 line %d, column %d	StatusView		ligne %d, colonne %d
 OK	Statistics		OK
@@ -67,13 +69,17 @@ Find:	FindandReplaceWindow		Chercher :
 Error saving \"%s\":\n%s	SaveAlert		Erreur à l'enregistrement de « %s » :\n%s
 Copy	Menus		Copier
 Cut	Menus		Couper
+File \"%file%\" was modified by another application, reload it?	NodeMonitorAlerts		Le fichier « %file% » a été modifié par une autre application, voulez-vous le recharger ?
 Replace	FindandReplaceWindow		Remplacer
 Find again	Menus		Chercher encore
 Cancel	QuitAlert		Annuler
 Find…	Menus		Chercher…
 Select all	Menus		Selectionner tout
 Don't save	SaveAlert		Ne pas enregistrer
+Recover	NodeMonitorAlerts		Récupérer
 Error loading \"%s\":\n\t%s	LoadAlert		Erreur au de chargement de « %s » :\n\t%s
+Ignore	NodeMonitorAlerts		Ignorer
+Read-only	StatusView		Lecture seule
 Undo typing	QuitAlert		Annuler la saisie
 Black	Menus		Noir
 Untitled 	StyledEditWindow		Sans titre
@@ -83,5 +89,6 @@ Encoding	Open_and_SaveAsPanel		Encodage
 Characters:	Statistics		Caractères :
 Save as…	Menus		Enregistrer sous…
 Redo typing	QuitAlert		Rétablir la saisie
+Reload…	Menus		Recharger…
 Replace…	Menus		Remplacer…
 Right	Menus		À droite

data/catalogs/kits/bluetooth/hu.catkeys

@@ -8,7 +8,7 @@ Positioning	DeviceClass		Pozicionálás
 Rendering	DeviceClass		Renderelés
 Phone	DeviceClass		Telefon
 17-33% utilized	DeviceClass		17-33% kihasznált
-#ServerNotReady#Not Valid name	RemoteDevice		#ServerNotReady#Not Valid name
+#ServerNotReady#Not Valid name	RemoteDevice		#AKiszolgálóNincsKész# Érvénytelen név
 Combo keyboard/pointing device	DeviceClass		Billentyűzet/mutató eszköz
 Controller	DeviceClass		Vezérlő
 No service available	DeviceClass		Nincs elérhető szolgáltatás
@@ -60,19 +60,19 @@ Networking	DeviceClass		Hálózat
 Portable audio	DeviceClass		Hordozható audio
 Device conforms to the headset profile	DeviceClass		Az eszköz megfelel a fejhallgató profilnak
 Hands-free	DeviceClass		Szabadkézi
-#CommandFailed#Not Valid name	RemoteDevice		#CommandFailed#Not Valid name
+#CommandFailed#Not Valid name	RemoteDevice		#SikertelenParancs# Érvénytelen név
 Vehicle	DeviceClass		Jármű
 Palm	DeviceClass	A palm-held device	Palm
 Video display and loudspeaker	DeviceClass		Kijelző hangszórókkal
 Peripheral	DeviceClass		Periféria
-#NoOwnerError#Not Valid name	RemoteDevice		#NoOwnerError#Not Valid name
+#NoOwnerError#Not Valid name	RemoteDevice		#TulajdonosHiba# Érvénytelen név
 Wired modem or voice gateway	DeviceClass		Kábelmodem vagy VOIP átjáró
 Jacket	DeviceClass		Jacket
 Unspecified	DeviceClass		Nem meghatározható
 Fully available	DeviceClass		Teljesen elérhető
 67-83% utilized	DeviceClass		67-83% kihasznált
 Not implemented	RemoteDevice		Nincs implementálva
-#NotCompletedRequest#Not Valid name	RemoteDevice		#NotCompletedRequest#Not Valid name
+#NotCompletedRequest#Not Valid name	RemoteDevice		#NemTeljesítettKérés# Érvénytelen név
 Server	DeviceClass		Kiszolgáló
 Video conferencing	DeviceClass		Videókonferencia
 Video camera	DeviceClass		Videókamera

data/catalogs/kits/tracker/be.catkeys

@@ -1,4 +1,4 @@
-1	belarusian	x-vnd.Haiku-libtracker	2580969822
+1	belarusian	x-vnd.Haiku-libtracker	1610004061
 common	B_COMMON_DIRECTORY		агульны
 OK	WidgetAttributeText		ОК
 Icon view	VolumeWindow		Від іконак
@@ -394,7 +394,6 @@ Icon view	DeskWindow		Від іконак
 Select all	QueryContainerWindow		Выбраць усё
 Files cannot be moved or deleted from a read-only volume.	PoseView		Нельга выдаляць або перамяшчаць файла з тома толькі для чытання.
 There was a problem trying to replace \"%name\". The item might be open or busy.	FSUtils		Адбылася памылка пры замене \"%name\". Элемент можа быць заняты або адкрыты.
-You cannot put the Trash, home or Desktop directory into the trash.	FSUtils		Нельга запіхнуць Сметніцу, Рабочы Стол або хатні каталог у саму Сметніцу.
 Owner	FilePermissionsView		Валадар
 There was a problem trying to save in the folder you specified. Please try another one.	FilePanelPriv		Адбылася памылка пры захаванні ў пазначаную папку. Калі ласка, паспрабуйце іншую.
 Restore	ContainerWindow		Аднавіць

data/catalogs/kits/tracker/de.catkeys

@@ -1,4 +1,4 @@
-1	german	x-vnd.Haiku-libtracker	2580969822
+1	german	x-vnd.Haiku-libtracker	1610004061
 common	B_COMMON_DIRECTORY		Allgemein
 OK	WidgetAttributeText		OK
 Icon view	VolumeWindow		Icon-Ansicht
@@ -394,7 +394,6 @@ Icon view	DeskWindow		Icon-Ansicht
 Select all	QueryContainerWindow		Alles auswählen
 Files cannot be moved or deleted from a read-only volume.	PoseView		Dateien können auf einem schreibgeschützten Datenträger nicht verschoben oder gelöscht werden.
 There was a problem trying to replace \"%name\". The item might be open or busy.	FSUtils		Es ist ein Problem beim Ersetzen von \"%name\" aufgetreten. Das Objekt könnte geöffnet oder gerade in Benutzung sein.
-You cannot put the Trash, home or Desktop directory into the trash.	FSUtils		Der Papierkorb, der home-Ordner und der Desktop können nicht in den Papierkorb verschoben werden.
 Owner	FilePermissionsView		Besitzer
 There was a problem trying to save in the folder you specified. Please try another one.	FilePanelPriv		Es ist ein Problem beim Speichern in den angegebenen Ordner aufgetreten. Bitte einen anderen wählen.
 Restore	ContainerWindow		Wiederherstellen

data/catalogs/kits/tracker/el.catkeys

@@ -1,4 +1,4 @@
-1	greek, modern (1453-)	x-vnd.Haiku-libtracker	3419853098
+1	greek, modern (1453-)	x-vnd.Haiku-libtracker	2448887337
 common	B_COMMON_DIRECTORY		κοινό
 OK	WidgetAttributeText		Εντάξει
 Icon view	VolumeWindow		Προβολή εικονιδίου
@@ -369,7 +369,6 @@ Icon view	DeskWindow		Προβολή εικονιδίου
 Select all	QueryContainerWindow		Επιλογή όλων
 Files cannot be moved or deleted from a read-only volume.	PoseView		Τα αρχεία δεν μπορούν να μετακινηθούν ή να διαγραφούν από ένα τόμο μόνο προς ανάγνωση.
 There was a problem trying to replace \"%name\". The item might be open or busy.	FSUtils		Υπήρξε κάποιο πρόβλημα κατά την προσπάθεια αντικατάστασης του \"%name\". Το αντικείμενο μπορεί να είναι ήδη ανοιχτό ή απασχολημένο.
-You cannot put the Trash, home or Desktop directory into the trash.	FSUtils		Δε μπορείτε να τοποθετήσετε τα Απορρίματα, τον αρχικό κατάλογο ή τον κατάλογο της Επιφάνειας Εργασίας στα απορρίματα.
 Owner	FilePermissionsView		Ιδιοκτήτης
 There was a problem trying to save in the folder you specified. Please try another one.	FilePanelPriv		Υπήρξε κάποιο πρόβλημα κατά την προσπάθεια αποθήκευσης στο φάκελο που προσδιορίσατε. Παρακαλώ προσπαθήστε με έναν άλλο.
 Restore	ContainerWindow		Επαναφορά

data/catalogs/kits/tracker/fi.catkeys

@@ -1,4 +1,4 @@
-1	finnish	x-vnd.Haiku-libtracker	2580969822
+1	finnish	x-vnd.Haiku-libtracker	1610004061
 common	B_COMMON_DIRECTORY		yhteinen
 OK	WidgetAttributeText		Valmis
 Icon view	VolumeWindow		Kuvakenäkymä
@@ -394,7 +394,6 @@ Icon view	DeskWindow		Kuvakenäkymä
 Select all	QueryContainerWindow		Valitse kaikki
 Files cannot be moved or deleted from a read-only volume.	PoseView		Tiedostoja ei voi siirtää tai poistaa kirjoitussuojatulta taltiolta.
 There was a problem trying to replace \"%name\". The item might be open or busy.	FSUtils		Kohteen ”%name” korvaaminen epäonnistui. Kohde on ehkä avattu tai se on varattu.
-You cannot put the Trash, home or Desktop directory into the trash.	FSUtils		Et voi laittaa roskakoria, kotihakemistoa tai työpöytähakemistoa roskakoriin.
 Owner	FilePermissionsView		Omistaja
 There was a problem trying to save in the folder you specified. Please try another one.	FilePanelPriv		Tallentaminen haluamaasi kansioon epäonnistui. Kokeile jotain toista kansiota.
 Restore	ContainerWindow		Palauta

data/catalogs/kits/tracker/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-libtracker	3779634732
+1	french	x-vnd.Haiku-libtracker	1610004061
 common	B_COMMON_DIRECTORY		commun
 OK	WidgetAttributeText		OK
 Icon view	VolumeWindow		Vue en icônes
@@ -81,6 +81,7 @@ Decrease size	DeskWindow		Diminuer la taille
 Size	ContainerWindow		Taille
 All disks	AutoMounterSettings		Tout les disques
 Would you like to find some other suitable application?	FSUtils		Souhaitez-vous rechercher une autre application appropriée ?
+Ask before deleting for good	SettingsView		Demander avant de supprimer pour de bon
 Finish: %time - %finishtime left	StatusWindow		Fin : %time - il reste %finishtime
 Could not open \"%document\" with application \"%app\" (Missing libraries: %library). \n	FSUtils		Impossible d'ouvrir « %document » avec l'application « %app » (Il manque la bibliothèque : %library).\n
 no items	CountView		aucun élément
@@ -101,6 +102,7 @@ New folder	FilePanelPriv		Nouveau dossier
 %name info	InfoWindow	InfoWindow Title	Informations sur %name
 Favorites	FavoritesMenu		Favoris
 Add-ons	VolumeWindow		Extensions
+Move deleted files to Trash first	SettingsView		Déplacez les fichiers supprimés dans la corbeille en premier
 Sorry, you can't copy items to the Trash.	PoseView		Désolé, vous ne pouvez pas copier des éléments dans la Corbeille.
 List view	VolumeWindow		Vue en liste
 matches wildcard expression	SelectionWindow		correspond à l'expression générique
@@ -392,7 +394,6 @@ Icon view	DeskWindow		Vue en icônes
 Select all	QueryContainerWindow		Sélectionner tout
 Files cannot be moved or deleted from a read-only volume.	PoseView		Les fichiers d'un volume en lecture-seule ne peuvent être ni déplacés, ni supprimés.
 There was a problem trying to replace \"%name\". The item might be open or busy.	FSUtils		Un problème est survenu en essayant de remplacer « %name ». L'élément est peut-être ouvert ou occupé.
-You cannot put the Trash, home or Desktop directory into the trash.	FSUtils		Vous ne pouvez pas mettre la Corbeille, le Bureau ou votre répertoires personnel à la corbeille.
 Owner	FilePermissionsView		Propriétaire
 There was a problem trying to save in the folder you specified. Please try another one.	FilePanelPriv		Un problème est survenu lors de l'enregistrement dans le dossier que vous avez indiqué. Veuillez en essayer un autre.
 Restore	ContainerWindow		Restaurer

data/catalogs/kits/tracker/hi.catkeys

@@ -1,4 +1,4 @@
-1	hindi	x-vnd.Haiku-libtracker	1862651090
+1	hindi	x-vnd.Haiku-libtracker	891685329
 common	B_COMMON_DIRECTORY		सामान्य
 OK	WidgetAttributeText		ठीक है
 Icon view	VolumeWindow		चिह्न दृश्य
@@ -372,7 +372,6 @@ Icon view	DeskWindow		आइकन का दृश्य
 Select all	QueryContainerWindow		सभी चुनें
 Files cannot be moved or deleted from a read-only volume.	PoseView		केवल पढ़ने के लिए संस्करणों में फाइले कॉपी या हटाए नहीं जा सकती .
 There was a problem trying to replace \"%name\". The item might be open or busy.	FSUtils		वहां एक तरह से बदलने की कोशिश कर समस्या थी \"%name\". आइटम खोलें या व्यस्त हो सकता है.
-You cannot put the Trash, home or Desktop directory into the trash.	FSUtils		आप रद्दी, घर या डेस्कटॉप निर्देशिका रद्दी में नहीं डाल सकते.
 Owner	FilePermissionsView		मालिक
 There was a problem trying to save in the folder you specified. Please try another one.	FilePanelPriv		आपके द्वारा निर्दिष्ट फ़ोल्डर में सहेजने मे समस्या थी.एक और  प्रयास करें.
 Restore	ContainerWindow		पुनर्स्थापित करें

data/catalogs/kits/tracker/hu.catkeys

@@ -1,4 +1,4 @@
-1	hungarian	x-vnd.Haiku-libtracker	2580969822
+1	hungarian	x-vnd.Haiku-libtracker	1610004061
 common	B_COMMON_DIRECTORY		Közös
 OK	WidgetAttributeText		Rendben
 Icon view	VolumeWindow		Ikon nézet
@@ -394,7 +394,6 @@ Icon view	DeskWindow		Ikon nézet
 Select all	QueryContainerWindow		Összes kijelölése
 Files cannot be moved or deleted from a read-only volume.	PoseView		Nem lehet írásvédett lemezen fájlokat mozgatni vagy törölni.
 There was a problem trying to replace \"%name\". The item might be open or busy.	FSUtils		Hiba történt a felülírás közben: %name. Lehet, hogy az elem épp használatban van.
-You cannot put the Trash, home or Desktop directory into the trash.	FSUtils		Nem lehet a Szemetes, a Saját mappa és az Asztal mappákat a Szemetesbe helyezni.
 Owner	FilePermissionsView		Tulajdonos
 There was a problem trying to save in the folder you specified. Please try another one.	FilePanelPriv		Hiba történt a megadott mappába való mentés során. Kérjük próbáljon meg egy másikat.
 Restore	ContainerWindow		Visszaállítás

data/catalogs/kits/tracker/ja.catkeys

@@ -1,4 +1,4 @@
-1	japanese	x-vnd.Haiku-libtracker	2960613375
+1	japanese	x-vnd.Haiku-libtracker	1989647614
 OK	WidgetAttributeText		OK
 Icon view	VolumeWindow		アイコン表示
 Add-ons	FilePanelPriv		アドオン
@@ -389,7 +389,6 @@ Icon view	DeskWindow		アイコン表示
 Select all	QueryContainerWindow		すべて選択
 Files cannot be moved or deleted from a read-only volume.	PoseView		読み取り専用パーティションへの移動やファイルの削除はできません。
 There was a problem trying to replace \"%name\". The item might be open or busy.	FSUtils		\"%name\"を置き換えようとしたら不具合が発生しました。項目は開いた状態か使用中かもしれません。
-You cannot put the Trash, home or Desktop directory into the trash.	FSUtils		ごみ箱、ホームおよびデスクトップフォルダーをごみ箱に捨てることはできません。
 Owner	FilePermissionsView		所有者
 There was a problem trying to save in the folder you specified. Please try another one.	FilePanelPriv		指定されたフォルダーへの保存に失敗しました。別のフォルダーを指定してみてください。
 Restore	ContainerWindow		復元

data/catalogs/kits/tracker/lt.catkeys

@@ -1,4 +1,4 @@
-1	lithuanian	x-vnd.Haiku-libtracker	3779634732
+1	lithuanian	x-vnd.Haiku-libtracker	2808668971
 common	B_COMMON_DIRECTORY		Bendra
 OK	WidgetAttributeText		Gerai
 Icon view	VolumeWindow		Rodyti piktogramas
@@ -392,7 +392,6 @@ Icon view	DeskWindow		Rodyti piktogramas
 Select all	QueryContainerWindow		Pažymėti viską
 Files cannot be moved or deleted from a read-only volume.	PoseView		Perkelti ar šalinti objektų iš tomų, prijungtų tik skaitymui, negalima.
 There was a problem trying to replace \"%name\". The item might be open or busy.	FSUtils		Iškilo nesklandumų bandant pakeisti „%name“. Gali būti, jog objektas atvertas arba užimtas.
-You cannot put the Trash, home or Desktop directory into the trash.	FSUtils		Šiukšlinės, Namų ir Darbalaukio aplankų į Šiukšlinę išmesti negalima.
 Owner	FilePermissionsView		Savininkas
 There was a problem trying to save in the folder you specified. Please try another one.	FilePanelPriv		Iškilo nesklandumų bandant rašyti į nurodytą aplanką. Pabandykite nurodyti kitą.
 Restore	ContainerWindow		Atkurti

data/catalogs/kits/tracker/nl.catkeys

@@ -1,4 +1,4 @@
-1	dutch; flemish	x-vnd.Haiku-libtracker	1125041885
+1	dutch; flemish	x-vnd.Haiku-libtracker	154076124
 common	B_COMMON_DIRECTORY		algemeen
 OK	WidgetAttributeText		OK
 Icon view	VolumeWindow		Icoonweergave
@@ -392,7 +392,6 @@ Icon view	DeskWindow		Icoonweergave
 Select all	QueryContainerWindow		Alles selecteren
 Files cannot be moved or deleted from a read-only volume.	PoseView		Bestanden van een alleen-lezen-gegevensdrager laten zich niet verwijderen of verplaatsen.
 There was a problem trying to replace \"%name\". The item might be open or busy.	FSUtils		Er was een probleem bij het vervangen van \"%name\". Mogelijk is het item geopend of bezig.
-You cannot put the Trash, home or Desktop directory into the trash.	FSUtils		U kunt Prullenbak, de home-map of de Bureaubladmap niet in de prullenbak stoppen.
 Owner	FilePermissionsView		Eigenaar
 There was a problem trying to save in the folder you specified. Please try another one.	FilePanelPriv		Er was een probleem bij het opslaan naar de gespecifieerde map. Kies alstublieft een andere.
 Restore	ContainerWindow		Herstellen

data/catalogs/kits/tracker/pl.catkeys

@@ -1,4 +1,4 @@
-1	polish	x-vnd.Haiku-libtracker	628096147
+1	polish	x-vnd.Haiku-libtracker	3952097682
 common	B_COMMON_DIRECTORY		common
 OK	WidgetAttributeText		OK
 Icon view	VolumeWindow		Widok ikon
@@ -386,7 +386,6 @@ Icon view	DeskWindow		Widok ikon
 Select all	QueryContainerWindow		Zaznacz wszystko
 Files cannot be moved or deleted from a read-only volume.	PoseView		Pliki nie mogą zostać przeniesione do woluminu tylko do odczytu.
 There was a problem trying to replace \"%name\". The item might be open or busy.	FSUtils		Pojawił się problem przy modyfikowaniu \"%name\". Plik może być zajęty lub otwarty przez inny proces.
-You cannot put the Trash, home or Desktop directory into the trash.	FSUtils		Nie możesz przenieść Kosza, folderu domowego, lub Pulpitu do kosza.
 Owner	FilePermissionsView		Właściciel
 There was a problem trying to save in the folder you specified. Please try another one.	FilePanelPriv		Pojawił się problem przy zapisywaniu we wskazanej lokalizacji. Proszę podać inną lokalizację.
 Restore	ContainerWindow		Przywróć

data/catalogs/kits/tracker/pt_BR.catkeys

@@ -1,4 +1,4 @@
-1	portuguese (brazil)	x-vnd.Haiku-libtracker	2580969822
+1	portuguese (brazil)	x-vnd.Haiku-libtracker	1610004061
 common	B_COMMON_DIRECTORY		comum
 OK	WidgetAttributeText		OK
 Icon view	VolumeWindow		Em ícones
@@ -394,7 +394,6 @@ Icon view	DeskWindow		Visualização de ícone
 Select all	QueryContainerWindow		Selecionar tudo
 Files cannot be moved or deleted from a read-only volume.	PoseView		Arquivos não podem ser movidos ou excluídos de um volume em modo somente leitura.
 There was a problem trying to replace \"%name\". The item might be open or busy.	FSUtils		Ocorreu um problema tentando substituir \"%name\". O item deve estar aberto ou ocupado.
-You cannot put the Trash, home or Desktop directory into the trash.	FSUtils		Não é possível colocar a Lixeira ou os diretórios home ou Desktop no lixo.
 Owner	FilePermissionsView		Proprietário
 There was a problem trying to save in the folder you specified. Please try another one.	FilePanelPriv		Ocorreu um problema tentando salvar na pasta especificada. Por favor tente com outra.
 Restore	ContainerWindow		Recuperar

data/catalogs/kits/tracker/ro.catkeys

@@ -1,4 +1,4 @@
-1	romanian	x-vnd.Haiku-libtracker	3235013733
+1	romanian	x-vnd.Haiku-libtracker	2264047972
 OK	WidgetAttributeText		OK
 Icon view	VolumeWindow		Vizualizare pictogramă
 Add-ons	FilePanelPriv		Module
@@ -309,7 +309,6 @@ Copy	FilePanelPriv		Copiază
 Icon view	DeskWindow		Vizualizare pictogramă
 Select all	QueryContainerWindow		Selectează tot
 Files cannot be moved or deleted from a read-only volume.	PoseView		Fișierele nu pot fi mutate sau șterse dintr-un volum protejat la scriere.
-You cannot put the Trash, home or Desktop directory into the trash.	FSUtils		Nu puteți să plasați dosarul gunoi, personal sau desktop în gunoi.
 Owner	FilePermissionsView		Posesor
 There was a problem trying to save in the folder you specified. Please try another one.	FilePanelPriv		A apărut o problemă la încercarea de a salva în dosarul pe care l-ați specificat. Încercați altul.
 Restore	ContainerWindow		Restaurează

data/catalogs/kits/tracker/ru.catkeys

@@ -1,4 +1,4 @@
-1	russian	x-vnd.Haiku-libtracker	1125041885
+1	russian	x-vnd.Haiku-libtracker	154076124
 common	B_COMMON_DIRECTORY		Общие
 OK	WidgetAttributeText		ОК
 Icon view	VolumeWindow		Большие значки
@@ -392,7 +392,6 @@ Icon view	DeskWindow		Большие значки
 Select all	QueryContainerWindow		Выделить все
 Files cannot be moved or deleted from a read-only volume.	PoseView		Невозможно перемещать с раздела в режиме \"только для чтения\".
 There was a problem trying to replace \"%name\". The item might be open or busy.	FSUtils		Ошибка при замене \"%name\". Возможно файл открыт или занят.
-You cannot put the Trash, home or Desktop directory into the trash.	FSUtils		Вы не можете переместить папки Trash, home или Desktop в корзину.
 Owner	FilePermissionsView		Владелец
 There was a problem trying to save in the folder you specified. Please try another one.	FilePanelPriv		Возникла проблема при сохранении в указанную папку. Пожалуйста, выберите другую.
 Restore	ContainerWindow		Восстановить

data/catalogs/kits/tracker/sk.catkeys

@@ -1,4 +1,4 @@
-1	slovak	x-vnd.Haiku-libtracker	4052752235
+1	slovak	x-vnd.Haiku-libtracker	3081786474
 common	B_COMMON_DIRECTORY		spoločné
 OK	WidgetAttributeText		OK
 Icon view	VolumeWindow		Zobrazenie ikon
@@ -391,7 +391,6 @@ Icon view	DeskWindow		Zobrazenie ikon
 Select all	QueryContainerWindow		Vybrať všetky
 Files cannot be moved or deleted from a read-only volume.	PoseView		Súbory nemožno presunúť alebo zmazať na zväzku, ktorý je len na čítanie.
 There was a problem trying to replace \"%name\". The item might be open or busy.	FSUtils		Vyskytol sa problém pri pokuse nahradiť „%name“. Položka môže byť otvorená alebo sa používa.
-You cannot put the Trash, home or Desktop directory into the trash.	FSUtils		Nemôžete dať Kôš, domovský adresár alebo Plochu do Koša.
 Owner	FilePermissionsView		Vlastník
 There was a problem trying to save in the folder you specified. Please try another one.	FilePanelPriv		Vyskytol sa problém pri pokuse ukladať do uvedeného priečinka. Prosím, skúste iný.
 Restore	ContainerWindow		Obnoviť

data/catalogs/kits/tracker/sv.catkeys

@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Haiku-libtracker	2580969822
+1	swedish	x-vnd.Haiku-libtracker	1610004061
 common	B_COMMON_DIRECTORY		gemensam
 OK	WidgetAttributeText		OK
 Icon view	VolumeWindow		Ikonvy
@@ -394,7 +394,6 @@ Icon view	DeskWindow		Ikonvy
 Select all	QueryContainerWindow		Markera allt
 Files cannot be moved or deleted from a read-only volume.	PoseView		Filer kan inte flyttas eller tas bort från en volym som endast är läsbar.
 There was a problem trying to replace \"%name\". The item might be open or busy.	FSUtils		Kunde inte ersätta "%name". Filen kan vara öppen eller upptaget.
-You cannot put the Trash, home or Desktop directory into the trash.	FSUtils		Du kan inte flytta Papperskorgen, din hemkatalog eller Skrivbord till Papperskorgen.
 Owner	FilePermissionsView		Ägare
 There was a problem trying to save in the folder you specified. Please try another one.	FilePanelPriv		Det gick inte att spara i mappen. Vänligen prova en annan mapp.
 Restore	ContainerWindow		Återställ

data/catalogs/kits/tracker/uk.catkeys

@@ -1,4 +1,4 @@
-1	ukrainian	x-vnd.Haiku-libtracker	3504476946
+1	ukrainian	x-vnd.Haiku-libtracker	2533511185
 common	B_COMMON_DIRECTORY		common
 OK	WidgetAttributeText		Гаразд
 Icon view	VolumeWindow		У вигляді іконок
@@ -374,7 +374,6 @@ Icon view	DeskWindow		У вигляді іконок
 Select all	QueryContainerWindow		Вибрати все
 Files cannot be moved or deleted from a read-only volume.	PoseView		Неможливо видалити або перемістити файл з тому тільки для читання.
 There was a problem trying to replace \"%name\". The item might be open or busy.	FSUtils		Виникла проблема при спробі перемістити \"%name\". Елемент може бути відкритим або зайнятим.
-You cannot put the Trash, home or Desktop directory into the trash.	FSUtils		Ви не можете покласти Кошик, home або Робочий стіл в кошик.
 Owner	FilePermissionsView		Власник
 There was a problem trying to save in the folder you specified. Please try another one.	FilePanelPriv		Виникла проблема збереження у визначену папку. Будь-ласка спробуйте іншу.
 Restore	ContainerWindow		Відновити

data/catalogs/kits/tracker/zh_Hans.catkeys

@@ -1,4 +1,4 @@
-1	english	x-vnd.Haiku-libtracker	3779634732
+1	english	x-vnd.Haiku-libtracker	2808668971
 common	B_COMMON_DIRECTORY		常用
 OK	WidgetAttributeText		确定
 Icon view	VolumeWindow		图标视图
@@ -392,7 +392,6 @@ Icon view	DeskWindow		图标视图
 Select all	QueryContainerWindow		全选
 Files cannot be moved or deleted from a read-only volume.	PoseView		无法从只读卷中移动或删除文件。
 There was a problem trying to replace \"%name\". The item might be open or busy.	FSUtils		试图替换 \"%name\" 失败。该项目可能为空或者处于忙碌状态。
-You cannot put the Trash, home or Desktop directory into the trash.	FSUtils		您无法将 Trash，home或者Desktop目录放置到垃圾箱。
 Owner	FilePermissionsView		拥有者
 There was a problem trying to save in the folder you specified. Please try another one.	FilePanelPriv		试图保存到指定目录失败。请尝试其他目录。
 Restore	ContainerWindow		恢复

data/catalogs/preferences/bluetooth/hu.catkeys

@@ -1,5 +1,5 @@
 1	hungarian	x-vnd.Haiku-BluetoothPrefs	3926935355
-About Bluetooth…	Window		A Bluetoothról…
+About Bluetooth…	Window		A Bluetooth-ról…
 Handheld	Settings view		Mobiltelefon
 Default inquiry time:	Settings view		Alapértelmezett lekérdezési időkorlát:
 Manufacturer: 	Device View		Gyártó:

data/catalogs/preferences/notifications/be.catkeys

@@ -1,4 +1,4 @@
-1	belarusian	x-vnd.Haiku-Notifications	3631903554
+1	belarusian	x-vnd.Haiku-Notifications	814394708
 An error occurred saving the preferences.\nIt's possible you are running out of disk space.	GeneralView		Адбылася памылка пры захаванні наладак.\nМагчыма, не хапае месца на дыску.
 Notifications	GeneralView		Паведамленні
 seconds of inactivity	GeneralView		секунд прастою
@@ -8,7 +8,6 @@ Enable notifications	GeneralView		Уключыць паведамленні
 Error	NotificationView		Памылка
 OK	GeneralView		ОК
 Events are not notified	GeneralView		Пра падзеі не паведамляецца
-Save	PrefletWin		Захаваць
 Type	NotificationView		Тып
 Notifications cannot be stopped, because the server can't be reached.	GeneralView		Немагчыма спыніць Notifications, бо сервер недаступны.
 Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed.	GeneralView		Немагчыма уключыць паедамленні, бо сервер не знойдзены.\nГэта сведчыць аб няўдалай усталёўцы InfoPopper.

data/catalogs/preferences/notifications/de.catkeys

@@ -1,4 +1,4 @@
-1	german	x-vnd.Haiku-Notifications	3631903554
+1	german	x-vnd.Haiku-Notifications	814394708
 An error occurred saving the preferences.\nIt's possible you are running out of disk space.	GeneralView		Beim Speichern der Einstellungen ist ein Fehler aufgetreten.\nVermutlich ist nicht mehr genügend Speicher auf dem Datenträger verfügbar.
 Notifications	GeneralView		Notifications - Benachrichtigungen
 seconds of inactivity	GeneralView		Sekunden Leerlauf.
@@ -8,7 +8,6 @@ Enable notifications	GeneralView		Benachrichtigungen aktivieren
 Error	NotificationView		Fehler
 OK	GeneralView		OK
 Events are not notified	GeneralView		Ereignisse werden nicht gemeldet
-Save	PrefletWin		Speichern
 Type	NotificationView		Typ
 Notifications cannot be stopped, because the server can't be reached.	GeneralView		Benachrichtigungen können nicht angehalten werden, weil der Server nicht erreicht werden kann.
 Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed.	GeneralView		Benachrichtigungen können nicht aktiviert werden, weil der Server nicht gefunden wurde.\nDas bedeutet, dass die InfoPopper Installation nicht erfolgreich war.

data/catalogs/preferences/notifications/el.catkeys

@@ -1,4 +1,4 @@
-1	greek, modern (1453-)	x-vnd.Haiku-Notifications	3631903554
+1	greek, modern (1453-)	x-vnd.Haiku-Notifications	814394708
 An error occurred saving the preferences.\nIt's possible you are running out of disk space.	GeneralView		Ένα σφάλμα παρουσιάστικε κατά την διαδικάσια αποθήκευσεις των προτιμήσεων.\nΠιθανα να μην υπάρχει αρκετός αποθηκευτικός χώρος στο δίσκο. 
 Notifications	GeneralView		Κοινοποιήσεις
 seconds of inactivity	GeneralView		δευτερόλεπτα αδράνειας
@@ -8,7 +8,6 @@ Enable notifications	GeneralView		Ενεργοποίηση κοινοποιήσ
 Error	NotificationView		Λάθος
 OK	GeneralView		Εντάξει
 Events are not notified	GeneralView		Τα γεγονότα δεν ειδοποιούνται
-Save	PrefletWin		Αποθήκευσει
 Type	NotificationView		Τύπος
 Notifications cannot be stopped, because the server can't be reached.	GeneralView		Αδύνατη η επικοινωνία με το σέρβερ. Οι ειδοποιήσεις δεν μπορούν να σταματήσουν.
 Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed.	GeneralView		Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed.

data/catalogs/preferences/notifications/fi.catkeys

@@ -1,4 +1,4 @@
-1	finnish	x-vnd.Haiku-Notifications	3631903554
+1	finnish	x-vnd.Haiku-Notifications	814394708
 An error occurred saving the preferences.\nIt's possible you are running out of disk space.	GeneralView		Tapahtui virhe tallennettaessa asetuksia.\nOn mahdollista, että levytila on loppunut.
 Notifications	GeneralView		Ilmoitukset
 seconds of inactivity	GeneralView		joutilaisuussekunnit
@@ -8,7 +8,6 @@ Enable notifications	GeneralView		Ota käyttöön ilmoitukset
 Error	NotificationView		Virhe
 OK	GeneralView		Valmis
 Events are not notified	GeneralView		Tapahtumia ei ole ilmoitettu
-Save	PrefletWin		Tallenna
 Type	NotificationView		Tyyppi
 Notifications cannot be stopped, because the server can't be reached.	GeneralView		Ilmoitusten pysäyttäminen epäonnistui, koska palvelinta ei tavoiteta.
 Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed.	GeneralView		Ilmoitusten käyttöönotto epäonnistui, koska palvelinta ei löydy.\nTämä tarkoittaa, että InfoPopper-asennus ei ole onnistunut.

data/catalogs/preferences/notifications/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-Notifications	3631903554
+1	french	x-vnd.Haiku-Notifications	814394708
 An error occurred saving the preferences.\nIt's possible you are running out of disk space.	GeneralView		Une erreur est survenue lors de la sauvegarde des préférences.\nVous n'avez peut-être plus suffisamment d'espace libre sur votre disque.
 Notifications	GeneralView		Notifications
 seconds of inactivity	GeneralView		secondes d'inactivités
@@ -8,7 +8,6 @@ Enable notifications	GeneralView		Activer les notifications
 Error	NotificationView		Erreur
 OK	GeneralView		OK
 Events are not notified	GeneralView		Les événements ne sont pas notifiés
-Save	PrefletWin		Enregistrer
 Type	NotificationView		Type
 Notifications cannot be stopped, because the server can't be reached.	GeneralView		Les notifications ne peuvent pas être arrêtées, parce qu'il est impossible d'atteindre le serveur.
 Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed.	GeneralView		Impossible d'activer les notifications, car le serveur est introuvable.\nCela signifie que votre installation d'InfoPopper ne s'est par terminée correctement.

data/catalogs/preferences/notifications/hi.catkeys

@@ -1,4 +1,4 @@
-1	hindi	x-vnd.Haiku-Notifications	3631903554
+1	hindi	x-vnd.Haiku-Notifications	814394708
 An error occurred saving the preferences.\nIt's possible you are running out of disk space.	GeneralView		एक त्रुटि हो गई,वरीयताओं को सहेजने मे.\nयह संभव है आपकी डिस्क स्पेस खत्म हो गयी है
 Notifications	GeneralView		सूचनाएँ
 seconds of inactivity	GeneralView		निष्क्रियता के सेकेंड
@@ -8,7 +8,6 @@ Enable notifications	GeneralView		अधिसूचना सक्रिय
 Error	NotificationView		त्रुटि
 OK	GeneralView		ठीक है
 Events are not notified	GeneralView		घटनाक्रम नहीं अधिसूचित कर रहे हैं
-Save	PrefletWin		सुरक्षित करना
 Type	NotificationView		टाइप
 Notifications cannot be stopped, because the server can't be reached.	GeneralView		सूचनाएं नहीं रोकी जा सकती है,क्योंकि सर्वर तक पहुँचा नहीं जा सका.
 Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed.	GeneralView		सूचनाएँ सक्षम नहीं कर सकते क्योंकि सर्वर नहीं पाया जा सका है.\nइसका मतलब यह है कि आपकी जानकारी पॉपर की स्थापना सफलतापूर्वक पूरी नहीं की गयी थी.

data/catalogs/preferences/notifications/hu.catkeys

@@ -1,4 +1,4 @@
-1	hungarian	x-vnd.Haiku-Notifications	3631903554
+1	hungarian	x-vnd.Haiku-Notifications	814394708
 An error occurred saving the preferences.\nIt's possible you are running out of disk space.	GeneralView		Hiba történt a beállítások mentése során.\nLehet hogy elfogyott a hely a lemezen.
 Notifications	GeneralView		Értesítések
 seconds of inactivity	GeneralView		másodpercnyi inaktivitás után
@@ -8,7 +8,6 @@ Enable notifications	GeneralView		Értesítések engedélyezése
 Error	NotificationView		Hiba
 OK	GeneralView		Rendben
 Events are not notified	GeneralView		Az eseményekről nem lesz értesítés
-Save	PrefletWin		Mentés
 Type	NotificationView		Típus
 Notifications cannot be stopped, because the server can't be reached.	GeneralView		Nem lehet leállítani az értesítéseket, mert nem sikerült elérni a kiszolgálót.
 Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed.	GeneralView		Nem lehet leállítani az értesítéseket, mert nem sikerült elérni a kiszolgálót.\nEbből következően az InfoPopper telepítése sem volt sikeres.

data/catalogs/preferences/notifications/ja.catkeys

@@ -1,4 +1,4 @@
-1	japanese	x-vnd.Haiku-Notifications	3631903554
+1	japanese	x-vnd.Haiku-Notifications	814394708
 An error occurred saving the preferences.\nIt's possible you are running out of disk space.	GeneralView		設定ファイルの保存中にエラーが発生しました。\nおそらく、ディスク容量が不足しています。
 Notifications	GeneralView		通知
 seconds of inactivity	GeneralView		秒後に画面から隠されます。
@@ -8,7 +8,6 @@ Enable notifications	GeneralView		通知を有効にする
 Error	NotificationView		エラー
 OK	GeneralView		OK
 Events are not notified	GeneralView		イベントは通知されません
-Save	PrefletWin		保存
 Type	NotificationView		タイプ
 Notifications cannot be stopped, because the server can't be reached.	GeneralView		サーバーと通信できないので通知を止めることができません。
 Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed.	GeneralView		サーバーが見つからないので通知を有効にできません。\nこれは、InfoPopper のインストールがうまく完了していないことを示しています。

data/catalogs/preferences/notifications/lt.catkeys

@@ -1,4 +1,4 @@
-1	lithuanian	x-vnd.Haiku-Notifications	3631903554
+1	lithuanian	x-vnd.Haiku-Notifications	814394708
 An error occurred saving the preferences.\nIt's possible you are running out of disk space.	GeneralView		Įrašant nuostatas, įvyko klaida.\nGali būti, jog diske nepakanka laisvos vietos.
 Notifications	GeneralView		Pranešimai
 seconds of inactivity	GeneralView		sek. pasyvumo
@@ -8,7 +8,6 @@ Enable notifications	GeneralView		Įjungti pranešimus
 Error	NotificationView		Klaida
 OK	GeneralView		Gerai
 Events are not notified	GeneralView		Apie įvykius nepranešama
-Save	PrefletWin		Įrašyti
 Type	NotificationView		Tipas
 Notifications cannot be stopped, because the server can't be reached.	GeneralView		Pranešimų tarnybos sustabdyti nepavyko, nes ji nepasiekiama.
 Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed.	GeneralView		Nepavyko įgalinti pranešimų, nes pranešimų tarnyba nerasta.\nTai reiškia, jog pranešimų tarnyba nebuvo sėkmingai įdiegta.

data/catalogs/preferences/notifications/nl.catkeys

@@ -1,4 +1,4 @@
-1	dutch; flemish	x-vnd.Haiku-Notifications	3631903554
+1	dutch; flemish	x-vnd.Haiku-Notifications	814394708
 An error occurred saving the preferences.\nIt's possible you are running out of disk space.	GeneralView		Er ontstond een fout tijdens het opslaan van de voorkeuren.\nHet is mogelijk dat uw schijfruimte opraakt.
 Notifications	GeneralView		Aankondigingen
 seconds of inactivity	GeneralView		seconden inactief
@@ -8,7 +8,6 @@ Enable notifications	GeneralView		Aankondigingen aanzetten
 Error	NotificationView		Fout
 OK	GeneralView		Oké
 Events are not notified	GeneralView		Gebeurtenissen worden niet aangekondigd
-Save	PrefletWin		Opslaan
 Type	NotificationView		Soort
 Notifications cannot be stopped, because the server can't be reached.	GeneralView		Aankondigingen kan niet worden gestopt, omdat de server niet bereikt kan worden.
 Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed.	GeneralView		Kan aankondigingen niet aanzetten omdat de server niet gevonden kan worden.\nDit betekent dat uw InfoPopper-installatie niet succesvol werd afgerond.

data/catalogs/preferences/notifications/pl.catkeys

@@ -1,4 +1,4 @@
-1	polish	x-vnd.Haiku-Notifications	3631903554
+1	polish	x-vnd.Haiku-Notifications	814394708
 An error occurred saving the preferences.\nIt's possible you are running out of disk space.	GeneralView		Wystąpił błąd przy zapisie ustawień.\nByć może zabrakło miejsca na dysku.
 Notifications	GeneralView		Powiadomienia
 seconds of inactivity	GeneralView		sekund nieaktywności
@@ -8,7 +8,6 @@ Enable notifications	GeneralView		Włącz powiadomienia
 Error	NotificationView		Błąd
 OK	GeneralView		OK
 Events are not notified	GeneralView		Zdarzenie nie są powiadamiane
-Save	PrefletWin		Zapisz
 Type	NotificationView		Typ
 Notifications cannot be stopped, because the server can't be reached.	GeneralView		Powiadomienie nie mogą być zatrzymane, bo nie można skontaktować się z serwerem.
 Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed.	GeneralView		Nie można włączyć powiadomień bo nie można odnaleźć serwera.\nTo oznacza, że instalacja InfoPopper nie została pomyślnie ukończona.

data/catalogs/preferences/notifications/pt_BR.catkeys

@@ -1,4 +1,4 @@
-1	portuguese (brazil)	x-vnd.Haiku-Notifications	3631903554
+1	portuguese (brazil)	x-vnd.Haiku-Notifications	814394708
 An error occurred saving the preferences.\nIt's possible you are running out of disk space.	GeneralView		Um erro ocorreu salvando as preferências.\nÉ possível que esteja executando fora do espaço de disco.
 Notifications	GeneralView		Notificações
 seconds of inactivity	GeneralView		segundos de inatividade
@@ -8,7 +8,6 @@ Enable notifications	GeneralView		Habilitar notificações
 Error	NotificationView		Erro
 OK	GeneralView		OK
 Events are not notified	GeneralView		Eventos não são notificados
-Save	PrefletWin		Salvar
 Type	NotificationView		Tipo
 Notifications cannot be stopped, because the server can't be reached.	GeneralView		Notificações não podem ser paradas porque o servidor não pode ser alcançado.
 Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed.	GeneralView		Não é possível habilitar as notificações porque o servidor não pôde ser encontrado.\nIsto significa que a instalação do InfoPopper não foi completada com sucesso.

data/catalogs/preferences/notifications/ro.catkeys

@@ -1,4 +1,4 @@
-1	romanian	x-vnd.Haiku-Notifications	3631903554
+1	romanian	x-vnd.Haiku-Notifications	814394708
 An error occurred saving the preferences.\nIt's possible you are running out of disk space.	GeneralView		A apărut o eroare la salvarea preferințelor.\nEste posibil să fi rămas fără spațiu pe disc.
 Notifications	GeneralView		Înștiințări
 seconds of inactivity	GeneralView		secunde de inactivitate
@@ -8,7 +8,6 @@ Enable notifications	GeneralView		Activează înștiințări
 Error	NotificationView		Eroare
 OK	GeneralView		OK
 Events are not notified	GeneralView		Evenimentele nu sunt înștiințate
-Save	PrefletWin		Salvează
 Type	NotificationView		Tip
 Notifications cannot be stopped, because the server can't be reached.	GeneralView		Înștiințările nu pot fi oprite, deoarece serverul nu poate fi contactat.
 Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed.	GeneralView		Nu se pot activa înștiințările deoarece serverul nu poate fi găsit.\nÎnseamnă că instalarea InfoPopper nu a fost completată cu succes.

data/catalogs/preferences/notifications/ru.catkeys

@@ -1,4 +1,4 @@
-1	russian	x-vnd.Haiku-Notifications	3631903554
+1	russian	x-vnd.Haiku-Notifications	814394708
 An error occurred saving the preferences.\nIt's possible you are running out of disk space.	GeneralView		Произошла ошибка при сохранении настроек\nВозможно, что закончилось свободное место на диске.
 Notifications	GeneralView		Уведомления
 seconds of inactivity	GeneralView		секунд бездействия
@@ -8,7 +8,6 @@ Enable notifications	GeneralView		Включить уведомления
 Error	NotificationView		Ошибка
 OK	GeneralView		ОК
 Events are not notified	GeneralView		События не уведомляются
-Save	PrefletWin		Сохранить
 Type	NotificationView		Тип
 Notifications cannot be stopped, because the server can't be reached.	GeneralView		Невозможно остановить уведомления, потому что сервер уведомлений недоступен.
 Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed.	GeneralView		Невозможно включить уведомления, потому что сервер уведомлений не найден.\nЭто означает, что сервер уведомлений может быть поврежден.

data/catalogs/preferences/notifications/sk.catkeys

@@ -1,4 +1,4 @@
-1	slovak	x-vnd.Haiku-Notifications	3631903554
+1	slovak	x-vnd.Haiku-Notifications	814394708
 An error occurred saving the preferences.\nIt's possible you are running out of disk space.	GeneralView		Vyskytla sa chyba pri ukladaní nastavení.\nJe možné, že vám dochádza miesto na disku.
 Notifications	GeneralView		Oznamy
 seconds of inactivity	GeneralView		sekundách nečinnosti
@@ -8,7 +8,6 @@ Enable notifications	GeneralView		Zapnúť upozornenia
 Error	NotificationView		Chyba
 OK	GeneralView		OK
 Events are not notified	GeneralView		Udalosti sa neoznamujú
-Save	PrefletWin		Uložiť
 Type	NotificationView		Typ
 Notifications cannot be stopped, because the server can't be reached.	GeneralView		Oznámenia nemožno zastaviť, pretože server nebolo možné kontaktovať.
 Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed.	GeneralView		Oznámenia nemožno zapnúť, pretože server nebol nájdený.\nTo znamená, že vaša inštalácia InfoPopper nebola úspešne dokončená.

data/catalogs/preferences/notifications/sv.catkeys

@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Haiku-Notifications	3631903554
+1	swedish	x-vnd.Haiku-Notifications	814394708
 An error occurred saving the preferences.\nIt's possible you are running out of disk space.	GeneralView		Ett fel uppstod när inställningarna skulle sparas.\nDet är möjligt att hårddiskutrymmet håller på att ta slut.
 Notifications	GeneralView		Aviseringar
 seconds of inactivity	GeneralView		sekunder av inaktivitet
@@ -8,7 +8,6 @@ Enable notifications	GeneralView		Aktivera aviseringar
 Error	NotificationView		Fel
 OK	GeneralView		OK
 Events are not notified	GeneralView		Händelser aviseras ej
-Save	PrefletWin		Spara
 Type	NotificationView		Typ
 Notifications cannot be stopped, because the server can't be reached.	GeneralView		Aviseringarna kunde inte stoppas eftersom servern inte kunde nås.
 Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed.	GeneralView		Kan inte aktivera aviseringar eftersom servern inte kunde hittas.\Det betyder att din InfoPopper-installation inte avslutades korrekt.

data/catalogs/preferences/notifications/uk.catkeys

@@ -1,4 +1,4 @@
-1	ukrainian	x-vnd.Haiku-Notifications	3631903554
+1	ukrainian	x-vnd.Haiku-Notifications	814394708
 An error occurred saving the preferences.\nIt's possible you are running out of disk space.	GeneralView		Виникла помилка збереження настройок.\nМожливо, що закінчилось місце на диску.
 Notifications	GeneralView		Повідомлення
 seconds of inactivity	GeneralView		секунд бездіяльності
@@ -8,7 +8,6 @@ Enable notifications	GeneralView		Включити повідомлення
 Error	NotificationView		Помилка
 OK	GeneralView		Гаразд
 Events are not notified	GeneralView		Події не повідомлені
-Save	PrefletWin		Зберегти
 Type	NotificationView		Тип
 Notifications cannot be stopped, because the server can't be reached.	GeneralView		Повідомлення не можуть бути зупинені, бо сервер недоступний.
 Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed.	GeneralView		Неможливо включити повідомлення бо сервер не знайдено.\nЦе означає, що ваш InfoPopper встановлений не повністю.

data/catalogs/preferences/notifications/zh_Hans.catkeys

@@ -1,4 +1,4 @@
-1	english	x-vnd.Haiku-Notifications	3631903554
+1	english	x-vnd.Haiku-Notifications	814394708
 An error occurred saving the preferences.\nIt's possible you are running out of disk space.	GeneralView		首选项保存出错。\n您可能已经用尽了磁盘空间。
 Notifications	GeneralView		通知
 seconds of inactivity	GeneralView		静止秒数
@@ -8,7 +8,6 @@ Enable notifications	GeneralView		启用通知
 Error	NotificationView		错误
 OK	GeneralView		确定
 Events are not notified	GeneralView		事件未通知
-Save	PrefletWin		保存
 Type	NotificationView		类型
 Notifications cannot be stopped, because the server can't be reached.	GeneralView		由于无法获取服务，无法禁用通知。
 Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed.	GeneralView		由于未发现服务，无法启用通知。\n也就意味着，您的 InfoPopper 未成功的完成安装。

data/catalogs/preferences/shortcuts/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-Shortcuts	3397621807
+1	french	x-vnd.Haiku-Shortcuts	341885426
 Error, NULL state description?\n	ShortcutsSpec		Erreur : description d'état NULL ?\n
 MoveMouse	ShortcutsSpec		BougerSouris
 OK	ShortcutsWindow		OK
@@ -20,6 +20,7 @@ Shortcuts was couldn't open your KeySet file!	ShortcutsWindow		Raccourcis n'a pa
 *Multi \"*MoveMouseTo 100% 0\" \"*MouseButton 1\"	ShortcutsWindow		*Multi « *BougerSourisEn 100% 0 » « *BoutonSouris 1 »
 SendMessage	ShortcutsSpec		EnvoiMessage
 MoveMouseTo	ShortcutsSpec		BougerSourisEn
+Option	ShortcutsSpec	Name for modifier on keyboard	Option
 Save	ShortcutsWindow		Enregistrer
 *MouseButton 1	ShortcutsWindow		*BoutonSouris 1
 *MoveMouse +20 +0	ShortcutsWindow		*BougeSouris +20 +0

data/catalogs/preferences/virtualmemory/fr.catkeys

@@ -1,5 +1,6 @@
-1	french	x-vnd.Haiku-VirtualMemory	4238590117
+1	french	x-vnd.Haiku-VirtualMemory	2090796060
 Quit	SettingsWindow		Quitter
+Automatic swap management	SettingsWindow		Gestion automatique du fichier d'échange
 Turn off	SettingsWindow		Désactiver
 Disabling virtual memory will have unwanted effects on system stability once the memory is used up.\nVirtual memory does not affect system performance until this point is reached.\n\nAre you really sure you want to turn it off?	SettingsWindow		Désactiver la mémoire virtuelle perturbe le système quand la mémoire est pleine.\nLa mémoire virtuelle n'affecte pas les performances avant que ce point soit atteint.\n\nÊtes-vous vraiment sur de vouloir la désactiver ?
 Requested swap file size:	SettingsWindow		Taille demandée pour le fichier d'échange :

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

@@ -0,0 +1,31 @@
+1	french	x-vnd.Haiku-Playground	584609351
+Line	Playground		Ligne
+Fill	Playground		Remplir
+Over	Playground		Dessus
+Quit	Playground		Quitter
+Rect	Playground		Rectangle
+Select	Playground		Sélection
+Click and drag to draw an object	Playground		Cliquez et faites glisser pour dessiner un objet
+Controls	Playground		Contrôles
+Round rect	Playground		Rectangle arrondi
+Alpha:	Playground		Alpha :
+Mode:	Playground		Mode :
+Submenu	Playground		Sous-menu
+Copy	Playground		Copier
+Cancel	Playground		Annuler
+Clear	Playground		Effacer
+Min	Playground		Min
+Blend	Playground		Mélanger
+Invert	Playground		Inverser
+Clear all drawing objects?	Playground		Effacer tous les objets dessinés ?
+Width:	Playground		Largeur :
+Alpha	Playground		Alpha
+New object	Playground		Nouvel objet
+Test	Playground		Tester
+Max	Playground		Max
+Add	Playground		Ajouter
+Erase	Playground		Effacer
+File	Playground		Fichier
+Subtract	Playground		Soustraire
+<pick>	Playground		<choisir>
+Ellipse	Playground		Ellipse

docs/user/interface/Alert.dox

@@ -6,8 +6,8 @@
  *		John Scipione, [email protected]
  *
  * Corresponds to:
- *		/trunk/headers/os/interface/Alert.h	 rev 42274
- *		/trunk/src/kits/interface/Alert.cpp	 rev 42274
+ *		headers/os/interface/Alert.h	 rev 42274
+ *		src/kits/interface/Alert.cpp	 rev 42274
  */
 
 

docs/user/interface/Bitmap.dox

@@ -7,8 +7,8 @@
  *		John Scipione, [email protected]
  *
  * Corresponds to:
- *		/trunk/headers/os/interface/Bitmap.h	 rev 42274
- *		/trunk/src/kits/interface/Bitmap.cpp	 rev 42274
+ *		headers/os/interface/Bitmap.h	 rev 42274
+ *		src/kits/interface/Bitmap.cpp	 rev 42274
  */
 
 

docs/user/interface/Box.dox

@@ -8,8 +8,8 @@
  *		John Scipione <[email protected]>
  *
  * Corresponds to:
- *		/trunk/headers/os/interface/Box.h	 rev 42274
- *		/trunk/src/kits/interface/Box.cpp	 rev 42274
+ *		headers/os/interface/Box.h	 rev 42274
+ *		src/kits/interface/Box.cpp	 rev 42274
 
 
 /*!

docs/user/interface/Button.dox

@@ -6,8 +6,8 @@
  *		John Scipione, [email protected]
  *
  * Corresponds to:
- *		/trunk/headers/os/interface/Button.h	 rev 42794
- *		/trunk/src/kits/interface/Button.cpp	 rev 42794
+ *		headers/os/interface/Button.h	 rev 42794
+ *		src/kits/interface/Button.cpp	 rev 42794
 
 
 /*!

docs/user/interface/CheckBox.dox

@@ -8,8 +8,8 @@
  *		John Scipione, [email protected]
  *
  * Corresponds to:
- *		/trunk/headers/os/interface/CheckBox.h	 rev 42794
- *		/trunk/src/kits/interface/CheckBox.cpp	 rev 42794
+ *		headers/os/interface/CheckBox.h	 rev 42794
+ *		src/kits/interface/CheckBox.cpp	 rev 42794
  */
 
 

docs/user/interface/ColorControl.dox

@@ -6,8 +6,8 @@
  *		John Scipione, [email protected]
  *
  * Corresponds to:
- *		/trunk/headers/os/interface/ColorControl.h	 rev 42794
- *		/trunk/src/kits/interface/ColorControl.cpp	 rev 42794
+ *		headers/os/interface/ColorControl.h	 rev 42794
+ *		src/kits/interface/ColorControl.cpp	 rev 42794
  */
 
 

docs/user/interface/Control.dox

@@ -6,8 +6,8 @@
  *		John Scipione, [email protected]
  *
  * Corresponds to:
- *		/trunk/headers/os/interface/Control.h	 rev 42794
- *		/trunk/src/kits/interface/Control.cpp	 rev 42794
+ *		headers/os/interface/Control.h	 rev 42794
+ *		src/kits/interface/Control.cpp	 rev 42794
  */
 
 

docs/user/interface/Dragger.dox

@@ -6,8 +6,8 @@
  *		John Scipione, [email protected]
  *
  * Corresponds to:
- *		/trunk/headers/os/interface/Dragger.h	 hrev45050
- *		/trunk/src/kits/interface/Dragger.cpp	 hrev45050
+ *		headers/os/interface/Dragger.h	 hrev45050
+ *		src/kits/interface/Dragger.cpp	 hrev45050
 
 
 /*!

docs/user/interface/Font.dox

@@ -6,8 +6,8 @@
  *		John Scipione, [email protected]
  *
  * Corresponds to:
- *		/trunk/headers/os/interface/Font.h	 hrev45178
- *		/trunk/src/kits/interface/Font.cpp	 hrev45178
+ *		headers/os/interface/Font.h	 hrev45178
+ *		src/kits/interface/Font.cpp	 hrev45178
  */
 
 

docs/user/interface/LayoutBuilder.Group.dox

@@ -7,8 +7,8 @@
  *		Ingo Weinhold, [email protected]
  * 
  * Corresponds to:
- *		/trunk/headers/os/interface/GroupLayoutBuilder.h	 rev 42274
- *		/trunk/src/kits/interface/GroupLayoutBuilder.cpp	 rev 42274
+ *		headers/os/interface/GroupLayoutBuilder.h	 rev 42274
+ *		src/kits/interface/GroupLayoutBuilder.cpp	 rev 42274
  */
 
 

docs/user/interface/Screen.dox

@@ -8,8 +8,8 @@
  *		John Scipione, [email protected]
  *
  * Corresponds to:
- *		/trunk/headers/os/interface/Screen.h	rev 42759
- *		/trunk/src/kits/interface/Screen.cpp	rev 42759
+ *		headers/os/interface/Screen.h	rev 42759
+ *		src/kits/interface/Screen.cpp	rev 42759
  */
 
 

docs/user/locale/Locale.dox

@@ -8,8 +8,8 @@
  *		Oliver Tappe, [email protected].
  *
  * Corresponds to:
- *		/trunk/headers/os/locale/Locale.h	 rev 43095
- *		/trunk/src/kits/locale/Locale.cpp	 rev 43095
+ *		headers/os/locale/Locale.h	 rev 43095
+ *		src/kits/locale/Locale.cpp	 rev 43095
  */
 
 

docs/user/storage/FindDirectory.dox

@@ -6,8 +6,8 @@
  *		Adrien Destugues, [email protected]
  *
  * Corresponds to:
- *		/trunk/headers/os/storage/FindDirectory.h	 rev 42600
- *		/trunk/src/kits/storage/FindDirectory.cpp	 rev 42600
+ *		headers/os/storage/FindDirectory.h	 rev 42600
+ *		src/kits/storage/FindDirectory.cpp	 rev 42600
  */
 
 

docs/user/storage/Mime.dox

@@ -7,8 +7,8 @@
  *		John Scipione, [email protected]
  *
  * Corresponds to:
- *		/trunk/headers/os/storage/Mime.h	 hrev45224
- *		/trunk/src/kits/storage/Mime.cpp	 hrev45224
+ *		headers/os/storage/Mime.h	 hrev45224
+ *		src/kits/storage/Mime.cpp	 hrev45224
  */
 
 

docs/user/storage/MimeType.dox

@@ -280,9 +280,9 @@
 
 
 /*!
-	\fn status_t BMimeType::GetPreferredApp(char *signature, app_verb verb)
-		const
-	\brief Fetches the signature of the MIME type's preferred application from
+	\fn status_t BMimeType::GetPreferredApp(char *signature,
+		app_verb verb) const
+	\brief Fetches the signature of the preferred application from
 		the MIME database.
 
 	The preferred app is the application that's used to access a file when,

docs/user/storage/Node.dox

@@ -8,8 +8,8 @@
  *		Ingo Weinhold, [email protected]
  *
  * Corresponds to:
- *		/trunk/headers/os/app/Node.h	rev 42803
- *		/trunk/src/kits/app/Node.cpp	rev 42803
+ *		headers/os/storage/Node.h	rev 42803
+ *		src/kits/storage/Node.cpp	rev 42803
  */
 
 

docs/user/storage/NodeInfo.dox

@@ -0,0 +1,431 @@
+/*
+ * Copyright 2013 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Axel Dörfler, [email protected]
+ *		John Scipione, [email protected]
+ *		Ingo Weinhold, [email protected]
+ *
+ * Corresponds to:
+ *		headers/os/storage/NodeInfo.h	hrev45253
+ *		src/kits/storage/NodeInfo.cpp	hrev45253
+ */
+
+
+/*!
+	\file NodeInfo.h
+	\ingroup storage
+	\ingroup libbe
+	\brief Provides the BNodeInfo class.
+*/
+
+
+/*!
+	\class BNodeInfo
+	\ingroup storage
+	\ingroup libbe
+	\brief Provides access to file type meta data on a node.
+
+	BNodeInfo provides a nice wrapper to all sorts of useful meta data such as
+	the MIME-type, the file's icon and the application that will open
+	the file.
+*/
+
+
+/*!
+	\fn BNodeInfo::BNodeInfo()
+	\brief Creates an uninitialized BNodeInfo object.
+
+	After created a BNodeInfo with this, you should call SetTo().
+
+	\see SetTo(BNode *node)
+*/
+
+
+/*!
+	\fn BNodeInfo::BNodeInfo(BNode *node)
+	\brief Creates a BNodeInfo object and initializes it to the supplied
+	       \a node.
+
+	\param node The \a node to gather information on.
+*/
+
+
+/*!
+	\fn BNodeInfo::~BNodeInfo()
+	\brief Frees the object and associated resources.
+
+	The internal BNode object is not deleted.
+*/
+
+
+/*!
+	\name Constructor helper methods
+*/
+
+
+//! @{
+
+
+/*!
+	\fn status_t BNodeInfo::SetTo(BNode *node)
+	\brief Initializes the BNodeInfo to the supplied \a node.
+
+	The BNodeInfo object does not copy the supplied \a node object, it uses it
+	directly instead. You must not delete the supply \a node while the
+	BNodeInfo object exists. The BNodeInfo does not take over ownership of the
+	\a node and it doesn't delete it on destruction either.
+
+	\param node The \a node to gather information on.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_BAD_VALUE The node was not properly initialized.
+*/
+
+
+/*!
+	\fn status_t BNodeInfo::InitCheck() const
+	\brief Checks whether or not the object has been properly initialized.
+
+	\returns A status code.
+	\retval B_OK The object was properly initialized.
+	\retval B_BAD_VALUE The object was \b not properly initialized.
+*/
+
+
+//! @}
+
+
+/*!
+	\name MIME-type methods
+*/
+
+
+//! @{
+
+
+/*!
+	\fn status_t BNodeInfo::GetType(char *type) const
+	\brief Writes the MIME-type of the node into \a type.
+
+	The source of the type information is the \c BEOS:TYPE attribute of the
+	node. The \a type buffer should be pre-allocated before it is passed into
+	GetType(), it should be at least \c B_MIME_TYPE_LENGTH in length.
+
+	\param type A pointer to a pre-allocated char buffer of at least
+	       \c B_MIME_TYPE_LENGTH length into which the MIME-type of the
+	       node is written.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_NO_INIT The object is not properly initialized.
+	\retval B_BAD_VALUE \c NULL \a type or the type string stored in the
+	        attribute is longer than \c B_MIME_TYPE_LENGTH.
+	\retval B_BAD_TYPE The stored type string attribute has the wrong type.
+	\retval B_ENTRY_NOT_FOUND No type is set on the node.
+*/
+
+
+/*!
+	\fn status_t BNodeInfo::SetType(const char *type)
+	\brief Sets the MIME-type of the node. If \a type is \c NULL the
+	       \c BEOS:TYPE attribute is removed instead.
+
+	The \a type string is written into the \c BEOS:TYPE attribute of the node.
+	If \a type is \c NULL, the \c BEOS:TYPE attribute is removed instead. The
+	\a type parameter may not by longer than \c B_MIME_TYPE_LENGTH in length
+	including the terminating \c NUL character.
+
+	\param type The MIME-type to be assigned to the \a node. Must not be
+	       longer than \c B_MIME_TYPE_LENGTH (including the terminating
+	       \c NUL). May be \c NULL to remove the attribute.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_NO_INIT The object was not properly initialized.
+	\retval B_BAD_VALUE \a type is longer than \c B_MIME_TYPE_LENGTH.
+*/
+
+
+//! @}
+
+
+/*!
+	\name Icon methods
+*/
+
+
+//! @{
+
+
+/*!
+	\fn status_t BNodeInfo::GetIcon(BBitmap *icon, icon_size k) const
+	\brief Gets the icon of the node.
+
+	The icon stored in the \c BEOS:L:STD_ICON attribute (large) or
+	\c BEOS:M:STD_ICON attribute (mini) is retrieved.
+
+	\param icon A pointer to a pre-allocated BBitmap object of the correct
+		   dimension to store the requested icon: 16x16 for the mini or
+		   32x32 for the large icon.
+	\param k The size of the icon to be retrieved: \c B_MINI_ICON for a 16x16
+	       icon and \c B_LARGE_ICON for a 32x32 icon.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_NO_INIT The object was not properly initialized.
+	\retval B_BAD_VALUE \c NULL \a icon, unsupported icon size \a k or bitmap
+		    dimensions (\a icon) and icon size (\a k) do not match.
+*/
+
+
+/*!
+	\fn status_t BNodeInfo::SetIcon(const BBitmap *icon, icon_size k)
+	\brief Sets the icon of the node. If \a icon is \c NULL, the attribute is
+		   removed instead.
+
+	The icon is stored in the \c BEOS:L:STD_ICON attribute (large) or
+	\c BEOS:M:STD_ICON attribute (mini). If \a icon is \c NULL the respective
+	attribute is removed instead.
+
+	\param icon A pointer to a BBitmap object containing the icon to be set.
+		   May be \c NULL.
+	\param k The size of the icon to be set: \c B_MINI_ICON for the mini or
+	       \c B_LARGE_ICON for the large icon.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_NO_INIT The object is not properly initialized.
+	\retval B_BAD_VALUE Unknown icon size \a k or bitmap dimensions (\a icon)
+		    and icon size (\a k) do not match.
+*/
+
+
+/*!
+	\fn status_t BNodeInfo::GetIcon(uint8** data, size_t* size,
+		type_code* type) const
+	\brief Gets the icon of the node.
+
+	The icon stored in the \c BEOS:ICON attribute of the node is retrieved.
+	The caller is responsible to <tt>delete[]</tt> the data if the icon was
+	retrieved.
+
+	\param data A pointer in which a pointer to the icon data
+		   will be returned.
+	\param size A pointer in which the size of the found icon data
+		   will be returned.
+	\param type A pointer in which the type of the found icon data
+		   will be returned.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_NO_INIT The object was not properly initialized.
+	\retval B_BAD_VALUE \c NULL \a data, \c NULL \a size or \c NULL \a type.
+	\retval B_NO_MEMORY No memory to allocate the \a data buffer.
+*/
+
+
+/*!
+	\fn status_t BNodeInfo::SetIcon(const uint8* data, size_t size)
+	\brief Sets the node icon of the node. If \a data is \c NULL or \a size
+	       is 0, the \c BEOS:ICON attribute is removed instead.
+
+	The icon is stored in the \c BEOS:ICON attribute of the node.
+
+	\param data A pointer to valid icon data. May be \c NULL.
+	\param size The size of the provided data buffer. May be 0.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_NO_INIT The object was not properly initialized.
+*/
+
+
+/*!
+	\fn status_t BNodeInfo::GetTrackerIcon(BBitmap *icon,
+		icon_size iconSize) const
+	\brief Gets the icon displayed by Tracker for the icon.
+
+	This method tries really hard to find an icon for the node:
+	- If the node has no type this method returns the icon for
+	  \c B_FILE_MIME_TYPE if it's a regular file or
+	  \c B_DIRECTORY_MIME_TYPE if it's a directory, even if the node has its
+	  own icon!
+	- Next it will ask GetIcon() for an icon.
+	- If this fails it will get the preferred application and ask the MIME
+	  database if the application has an icon for the file type of the
+	  node.
+	- Next it will ask the MIME database whether there is an icon for the file
+	  type of the node.
+	- Then it will ask the MIME database for the preferred application for
+	  the file type of the node and whether this application has a special
+	  icon for the type.
+	- Finally it will return a generic icon for whatever type of file type
+	  (file/dir/etc.) the node is from the MIME database.
+
+	The first action that provides an icon is used. In the case that none of
+	them yield an icon this method fails, this is very unlikely though.
+
+	\remarks You can set \a iconSize to get a scaled icon instead of using
+	         a predefined icon_size constant, pass in an integer casted
+	         to icon_size. For example to get a 64x64 icon pass in:
+\code
+(icon_size)64
+\endcode
+
+	\param icon A pointer to a pre-allocated BBitmap of the correct dimension
+		   to store the requested icon (16x16 for the mini and 32x32 for the
+		   large icon).
+	\param iconSize The size of the icon to be retrieved: \c B_MINI_ICON
+		   for a 16x16 icon or \c B_LARGE_ICON for a 32x32 icon.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_NO_INIT The object was not properly initialized.
+	\retval B_BAD_VALUE \c NULL \a icon, unsupported icon size \a iconSize
+	        or bitmap dimensions (\a icon) and icon size (\a iconSize) do
+	        not match.
+*/
+
+
+/*!
+	\fn status_t BNodeInfo::GetTrackerIcon(const entry_ref *ref,
+		BBitmap *icon, icon_size iconSize)
+	\brief Gets the icon displayed by Tracker for the node referred to by
+	       \a ref.
+
+	This methods works similarly to the non-static version but \a ref
+	identifies the node. \a icon must be pre-allocated to the size requested
+	using \a iconSize before being passed to this method.
+
+	\param ref An entry_ref referring to the node for which the icon is
+	       retrieved.
+	\param icon A pointer to a pre-allocated BBitmap object of the correct
+	       dimension to store the requested icon (16x16 for the mini and 32x32
+	       for the large icon).
+	\param iconSize The size of the icon to be retrieved: \c B_MINI_ICON
+	       for a 16x16 icon or \c B_LARGE_ICON for a 32x32 icon.
+
+	\returns A status code.
+	\retval B_OK: Everything went fine.
+	\retval B_NO_INIT: The object is not properly initialized.
+	\retval B_BAD_VALUE: \c NULL ref or \a icon, unsupported icon size
+	        \a iconSize or bitmap dimensions (\a icon) and icon size
+	        (\a iconSize) do not match.
+*/
+
+
+//! @}
+
+
+/*!
+	\name Preferred application methods
+*/
+
+
+//! @{
+
+
+/*!
+	\fn status_t BNodeInfo::GetPreferredApp(char *signature,
+		app_verb verb) const
+	\brief Gets the preferred application of the node.
+
+	Writes the contents of the \c BEOS:PREF_APP attribute into the
+	\a signature buffer. The preferred application can be identified by its
+	signature. \a signature should be at least \c B_MIME_TYPE_LENGTH or
+	longer and pre-allocated before it is passed into this method.
+
+	\param signature A pointer to a pre-allocated character buffer of size
+	       \c B_MIME_TYPE_LENGTH or larger into which the MIME-type of the
+	       preferred application is written.
+	\param verb The type of access the preferred application is requested.
+	       Currently \c B_OPEN is the only meaningful option.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_NO_INIT The object was not properly initialized.
+	\retval B_BAD_VALUE \c NULL \a signature or bad app_verb.
+*/
+
+
+/*!
+	\fn status_t BNodeInfo::SetPreferredApp(const char *signature,
+		app_verb verb)
+	\brief Sets the preferred application of the node. If \a signature is
+	       \c NULL, the \c BEOS:PREF_APP attribute is removed instead.
+
+	The supplied string is written into the \c BEOS:PREF_APP attribute of the
+	node. If \a signature is \c NULL, the respective attribute is removed
+	instead. \a signature must not be longer than \c B_MIME_TYPE_LENGTH
+	       (including the terminating \c NUL).
+
+	\param signature The signature of the preferred application to be set.
+	       May be \c NULL.
+	\param verb The type of access set to the preferred application.
+	       Currently only \c B_OPEN is meaningful.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_NO_INIT The object is not properly initialized.
+	\retval B_BAD_VALUE \c NULL \a signature, \a signature is longer than
+	        \c B_MIME_TYPE_LENGTH or bad app_verb.
+*/
+
+
+//! @}
+
+
+/*!
+	\name Application hint methods
+*/
+
+
+//! @{
+
+
+/*!
+	\fn status_t BNodeInfo::GetAppHint(entry_ref *ref) const
+	\brief Fills out \a ref with a pointer to a hint about the application
+	       that will open this node.
+
+	The path contained in the \c BEOS:PPATH attribute of the node is converted
+	into an entry_ref and returned. \a ref should be pre-allocated before being
+	passed into this method.
+
+	\param ref A pointer to a pre-allocated entry_ref into which the app hint
+	       is written.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_BAD_DATA Attribute size greater than \c B_PATH_NAME_LENGTH.
+	\retval B_BAD_TYPE The stored type string attribute has the wrong type.
+	\retval B_BAD_VALUE The \a ref object passed in was \c NULL.
+	\retval B_ERROR Unable to read \c BEOS:PPATH attribute.
+	\retval B_NO_INIT The object was not properly initialized.
+*/
+
+
+/*!
+	\fn status_t BNodeInfo::SetAppHint(const entry_ref *ref)
+	\brief Sets the application that will open the file type of the node. If
+	       \a ref is \c NULL, the \c BEOS:PPATH attribute is removed instead.
+
+	\a ref is converted into a path and stored in the \c BEOS:PPATH attribute
+	of the node. If \a ref is NULL \c BEOS:PPATH is removed instead.
+
+	\param ref A pointer to an entry_ref referring to the application.
+	       May be \c NULL.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_BAD_VALUE The \a ref object passed in was \c NULL.
+	\retval B_ENTRY_NOT_FOUND \c BEOS:PPATH attribute not found.
+	\retval B_ERROR Unable to write \c BEOS:PPATH attribute.
+	\retval B_NO_INIT The object was not properly initialized.
+*/
+
+
+//! @}

docs/user/storage/NodeMonitor.dox

@@ -0,0 +1,406 @@
+/*
+ * Copyright 2003-2013 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Axel Dörfler, [email protected]
+ *		John Scipione, [email protected]
+ *		Ingo Weinhold, [email protected]
+ *		Clemens Zeidler, [email protected]
+ *
+ * Corresponds to:
+ *		headers/os/storage/NodeMonitor.h	hrev45253
+ *		src/kits/storage/NodeMonitor.cpp	hrev45253
+ */
+
+
+/*!
+	\file NodeMonitor.h
+	\ingroup storage
+	\ingroup libbe
+	\brief Provides functions and constants for monitoring changes to a node.
+
+	The are three main node monitoring functions are watch_volume(),
+	watch_node() and stop_watching().
+	- watch_volume() starts watching a volume and sends a message
+	  when a requested event occurs.
+	- watch_node() starts or stops watching a node, or watches for volumes
+	  to be mounted and unmounted, and sends a message when an event occurs.
+	- stop_watching() stops monitoring a node or volume and no longer sends
+	  messages.
+*/
+
+
+/*!
+	\var B_STOP_WATCHING
+
+	Flag for watch_node(). Unsubscribe from watching a node.
+*/
+
+
+/*!
+	\var B_WATCH_NAME
+
+	Flag for watch_volume() and watch_node(). Subscribe to watching for
+	change to the name of a node.
+*/
+
+
+/*!
+	\var B_WATCH_STAT
+
+	Flag for watch_volume() and watch_node(). Subscribe to watching for
+	changes to the stat information of a node.
+*/
+
+
+/*!
+	\var B_WATCH_ATTR
+
+	Flag for watch_volume() and watch_node(). Subscribe to watching for
+	changes to the attributes of a node.
+*/
+
+
+/*!
+	\var B_WATCH_DIRECTORY
+
+	Flag for watch_node(). Subscribe to watching for changes to the contents
+	of a directory.
+*/
+
+
+/*!
+	\var B_WATCH_ALL
+
+	Flag for watch_node(). Subscribe to watching for changes to all
+	information of a node except \c B_WATCH_MOUNT.
+*/
+
+
+/*!
+	\var B_WATCH_MOUNT
+
+	Flag for watch_node(). Subscribe to watching for when a volume is mounted
+	or unmounted. You may prefer to use BVolumeRoster for volume watching
+	instead.
+*/
+
+
+/*!
+	\var B_WATCH_INTERIM_STAT
+
+	\internal Implementation detail. Not in Be Book.
+
+	To avoid a flood of messages for small and frequent write operations on an
+	open file the file system can limit the number of notifications and mark
+	them with the \c B_WATCH_INTERIM_STAT flag.
+*/
+
+
+/*!
+	\def B_ENTRY_CREATED
+
+	\c B_NODE_MONITOR notification message "opcode" is set when entry is
+	created.
+*/
+
+
+/*!
+	\def B_ENTRY_REMOVED
+
+	\c B_NODE_MONITOR notification message "opcode" is set when entry is
+	removed.
+*/
+
+
+/*!
+	\def B_ENTRY_MOVED
+
+	\c B_NODE_MONITOR notification message "opcode" is set when entry is
+	moved.
+*/
+
+
+/*!
+	\def B_STAT_CHANGED
+
+	\c B_NODE_MONITOR notification message "opcode" set when stat info
+	changes. More information can be found in the "fields" field.
+*/
+
+
+/*!
+	\def B_ATTR_CHANGED
+
+	\c B_NODE_MONITOR notification message "opcode" set when attribute
+	changes. More information can be found in the "cause" field.
+*/
+
+
+/*!
+	\def B_DEVICE_MOUNTED
+
+	\c B_NODE_MONITOR notification message "opcode" set when device is
+	mounted.
+*/
+
+
+/*!
+	\def B_DEVICE_UNMOUNTED
+
+	\c B_NODE_MONITOR notification message "opcode" set when device is
+	unmounted.
+*/
+
+
+/*!
+	\def B_ATTR_CREATED
+
+	\c B_ATTR_CHANGED notification message "cause" set when attribute is
+	created. (Haiku only)
+*/
+
+
+/*!
+	\def B_ATTR_REMOVED
+
+	\c B_ATTR_CHANGED notification message "cause" set when attribute is
+	removed. (Haiku only)
+*/
+
+
+/*!
+	\var B_STAT_MODE
+
+	\c B_STAT_CHANGED notification messages "fields" flag set when stat mode
+	changes.
+*/
+
+
+/*!
+	\var B_STAT_UID
+
+	\c B_STAT_CHANGED notification messages "fields" flag set when UID
+	changes.
+*/
+
+
+/*!
+	\var B_STAT_GID
+
+	\c B_STAT_CHANGED notification messages "fields" flag set when GID
+	changes.
+*/
+
+
+/*!
+	\var B_STAT_SIZE
+
+	\c B_STAT_CHANGED notification messages "fields" flag set when stat size
+	changes.
+*/
+
+
+/*!
+	\var B_STAT_ACCESS_TIME
+
+	\c B_STAT_CHANGED notification messages "fields" flag set when access time
+	changes.
+*/
+
+
+/*!
+	\var B_STAT_MODIFICATION_TIME
+
+	\c B_STAT_CHANGED notification messages "fields" flag set when
+	modification time changes.
+*/
+
+
+/*!
+	\var B_STAT_CREATION_TIME
+
+	\c B_STAT_CHANGED notification messages "fields" flag set when creation
+	time changes.
+*/
+
+
+/*!
+	\var B_STAT_CHANGE_TIME
+
+	\c B_STAT_CHANGED notification messages "fields" flag set when access,
+	modification or creation time changes.
+*/
+
+
+/*!
+	\var B_STAT_INTERIM_UPDATE
+
+	\internal Implementation detail. Not in Be Book.
+
+	\c B_STAT_CHANGED notification messages "fields" flag set when file is
+	written to.
+*/
+
+
+/*!
+	\fn status_t watch_volume(dev_t volume, uint32 flags, BMessenger target)
+	\brief Subscribes \a target to watch node changes on \a volume.
+
+	Depending of \a flags the action performed by this function varies:
+	- \a flags contains at least one of \c B_WATCH_NAME, \c B_WATCH_STAT,
+	  or <tt>B_WATCH_ATTR</tt>: The target is subscribed to watching the specified
+	  aspects of any node on the volume.
+
+	\a flags may include:
+	- \c B_WATCH_NAME
+	- \c B_WATCH_STAT
+	- \c B_WATCH_ATTR
+
+	\c B_WATCH_VOLUME flag is assumed.
+
+	\param volume dev_t referring to the volume to be watched.
+	\param flags Flags indicating the actions to be performed.
+	\param target Messenger referring to the target. Must be valid.
+
+	\return A status code.
+	\retval B_OK Everything went fine.
+	\retval B_BAD_VALUE \a flags did not include one of \c B_WATCH_NAME,
+	        \c B_WATCH_STAT, or \c B_WATCH_ATTR.
+*/
+
+
+/*!
+	\fn status_t watch_volume(dev_t volume, uint32 flags,
+		const BHandler *handler, const BLooper *looper)
+	\brief Subscribes \a handler or \a looper to watch node changes on
+	       \a volume.
+
+	Depending of \a flags the action performed by this function varies:
+	- \a flags contains at least one of \c B_WATCH_NAME, \c B_WATCH_STAT,
+	  or <tt>B_WATCH_ATTR</tt>: The target is subscribed to watching the specified
+	  aspects of any node on the volume.
+
+	\a flags may include:
+	- \c B_WATCH_NAME
+	- \c B_WATCH_STAT
+	- \c B_WATCH_ATTR
+
+	\c B_WATCH_VOLUME flag is assumed.
+
+	\param volume dev_t referring to the volume to be watched.
+	\param flags Flags indicating the actions to be performed.
+	\param handler The target \a handler. May be \c NULL, if \a looper is not
+	       \c NULL. Then the preferred handler of the looper is targeted.
+	\param looper The target \a looper. May be \c NULL, if \a handler is not
+	       \c NULL. Then the handler's looper is the target looper.
+
+	\return A status code.
+	\retval B_OK Everything went fine.
+	\retval B_BAD_VALUE \a flags did not include one of \c B_WATCH_NAME,
+	        \c B_WATCH_STAT, or \c B_WATCH_ATTR.
+*/
+
+
+/*!
+	\fn status_t watch_node(const node_ref *node, uint32 flags,
+		BMessenger target)
+	\brief Subscribes or unsubscribes \a target to node and/or mount watching.
+
+	Depending of \a flags the action performed by this function varies:
+	- \a flags is 0: The target is unsubscribed from watching the node.
+	  \a node must not be \c NULL in this case.
+	- \a flags contains \c B_WATCH_MOUNT: The target is subscribed to mount
+	  watching.
+	- \a flags contains at least one of \c B_WATCH_NAME, \c B_WATCH_STAT,
+	  \c B_WATCH_ATTR, or <tt>B_WATCH_DIRECTORY</tt>: The target is subscribed to
+	  watching the specified aspects of the node. \a node must not be \c NULL
+	  in this case.
+
+	\a flags may include:
+	- \c B_STOP_WATCHING
+
+	or one or more of the following:
+	- \c B_WATCH_NAME
+	- \c B_WATCH_STAT
+	- \c B_WATCH_ATTR
+	- \c B_WATCH_DIRECTORY
+	- \c B_WATCH_ALL
+	- \c B_WATCH_MOUNT
+
+	Note, that the latter two cases are not mutual exclusive, i.e. mount and
+	node watching can be requested with a single call.
+
+	\param node node_ref referring to the node to be watched. May be \c NULL,
+	       if only mount watching is requested.
+	\param flags Flags indicating the actions to be performed.
+	\param target Messenger referring to the target. Must be valid.
+
+	\return \c B_OK if everything went fine, an error code otherwise.
+*/
+
+
+/*!
+	\fn status_t watch_node(const node_ref *node, uint32 flags,
+		const BHandler *handler, const BLooper *looper)
+	\brief Subscribes or unsubscribes \a handler or \a looper to node and/or
+	       mount watching.
+
+	Depending of \a flags the action performed by this function varies:
+	- \a flags is 0: The target is unsubscribed from watching the node.
+	  \a node must not be \c NULL in this case.
+	- \a flags contains \c B_WATCH_MOUNT: The target is subscribed to mount
+	  watching.
+	- \a flags contains at least one of \c B_WATCH_NAME, \c B_WATCH_STAT,
+	  \c B_WATCH_ATTR, or <tt>B_WATCH_DIRECTORY</tt>: The target is subscribed to
+	  watching the specified aspects of the node. \a node must not be \c NULL
+	  in this case.
+
+	\a flags may include:
+	- \c B_STOP_WATCHING
+
+	or one or more of the following:
+	- \c B_WATCH_NAME
+	- \c B_WATCH_STAT
+	- \c B_WATCH_ATTR
+	- \c B_WATCH_DIRECTORY
+	- \c B_WATCH_ALL
+	- \c B_WATCH_MOUNT
+
+	Note, that the latter two cases are not mutual exlusive, i.e. mount and
+	node watching can be requested with a single call.
+
+	\param node node_ref referring to the node to be watched. May be \c NULL,
+	       if only mount watching is requested.
+	\param flags Flags indicating the actions to be performed.
+	\param handler The target handler. May be \c NULL, if \a looper is not
+	       \c NULL. Then the preferred handler of the looper is targeted.
+	\param looper The target looper. May be \c NULL, if \a handler is not
+	       \c NULL. Then the handler's looper is the target looper.
+
+	\return \c B_OK if everything went fine, an error code otherwise.
+*/
+
+
+/*!
+	\fn status_t stop_watching(BMessenger target)
+	\brief Unsubscribes \a target from node and mount monitoring.
+
+	\param target Messenger referring to the target. Must be valid.
+
+	\return \c B_OK if everything went fine, an error code otherwise.
+*/
+
+
+/*!
+	\fn status_t stop_watching(const BHandler *handler, const BLooper *looper)
+	\brief Unsubscribes \a target from node and mount monitoring.
+
+	\param handler The target handler. May be \c NULL, if \a looper is not
+	       \c NULL. Then the preferred handler of the looper is targeted.
+	\param looper The target looper. May be \c NULL, if \a handler is not
+	       \c NULL. Then the handler's looper is the target looper.
+
+	\return \c B_OK if everything went fine, an error code otherwise.
+*/

docs/user/storage/Path.dox

@@ -0,0 +1,503 @@
+/*
+ * Copyright 2002-2013 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Tyler Dauwalder
+ *		Axel Dörfler, [email protected]
+ *		John Scipione, [email protected]
+ *		Ingo Weinhold, [email protected]
+ *
+ * Corresponds to:
+ *		headers/os/storage/Path.h	hrev45260
+ *		src/kits/storage/Path.cpp	hrev45260
+ */
+
+
+/*!
+	\file Path.h
+	\ingroup storage
+	\ingroup libbe
+	Provides the BPath class.
+*/
+
+
+/*!
+	\class BPath
+	\ingroup storage
+	\ingroup libbe
+	\brief A class representing a file system path.
+*/
+
+
+/*!
+	\fn BPath::BPath()
+	\brief Creates an uninitialized BPath object.
+
+	\see SetTo()
+*/
+
+
+/*!
+	\fn BPath::BPath(const BPath& path)
+	\brief Creates a copy of the given BPath object.
+
+	\param path the object to be copied.
+*/
+
+
+/*!
+	\fn BPath::BPath(const entry_ref* ref)
+	\brief Creates a BPath object and initializes it to the filesystem entry
+	       specified by the passed in entry_ref struct.
+
+	\param ref the entry_ref to initialize from.
+*/
+
+
+/*!
+	\fn BPath::BPath(const BEntry* entry)
+	\brief Creates a BPath object and initializes it to the filesystem entry
+	       specified by the passed in BEntry object.
+
+	\param entry the BEntry object to initialize from.
+*/
+
+
+/*!
+	\fn BPath::BPath(const char* dir, const char* leaf, bool normalize)
+	\brief Creates a BPath object and initializes it to the specified path or
+	       path and filename combination.
+
+	\param dir The base component of the pathname. May be absolute or relative.
+	       If relative, it is based off the current working directory.
+	\param leaf The (optional) leaf component of the pathname. Must be
+	       relative. The value of \a leaf is concatenated to the end of \a dir
+	       (a "/" will be added as a separator, if necessary).
+	\param normalize boolean flag used to force normalization; normalization
+	       may sometimes occur even if \c false. The following items require
+	       normalization:
+	       - Relative pathnames (after concatenation; e.g. "boot/ltj")
+	       - The presence of "." or ".." ("/boot/ltj/../ltj/./gwar")
+	       - Redundant slashes ("/boot//ltj")
+	       - A trailing slash ("/boot/ltj/")
+	
+*/
+
+
+/*!
+	\fn BPath::BPath(const BDirectory* dir, const char* leaf, bool normalize)
+	\brief Creates a BPath object and initializes it to the specified directory
+	       and filename combination.
+
+	\param dir The directory that provides the base component of the pathname.
+	\param leaf The (optional) leaf component of the pathname. Must be
+	       relative. The value of \a leaf is concatenated to the end of \a dir
+	       (a "/" will be added as a separator, if necessary).
+	\param normalize boolean flag used to force normalization; normalization
+	       may sometimes occur even if \c false. The following items require
+	       normalization:
+	       - Relative pathnames (after concatenation; e.g. "boot/ltj")
+	       - The presence of "." or ".." ("/boot/ltj/../ltj/./gwar")
+	       - Redundant slashes ("/boot//ltj")
+	       - A trailing slash ("/boot/ltj/")
+*/
+
+
+/*!
+	\fn BPath::~BPath()
+	\brief Destroys the BPath object and frees any of its associated resources.
+*/
+
+
+/*!
+	\name Constructor helper methods
+*/
+
+
+//! @{
+
+
+/*!
+	\fn status_t BPath::InitCheck() const
+	\brief Checks whether or not the object was properly initialized.
+
+	\return \c B_OK, if the BPath object was properly initialized, an error
+	        code otherwise.
+*/
+
+
+/*!
+	\fn status_t BPath::SetTo(const entry_ref* ref)
+	\brief Reinitializes the object to the filesystem entry specified by the
+	       passed in entry_ref struct.
+	\param ref The entry_ref to reinitialize the entry from.
+
+	\returns A status code.
+	\retval B_OK Initialization was successful.
+	\retval B_BAD_VALUE \c NULL \a ref.
+	\retval B_NAME_TOO_LONG The pathname was longer than \c B_PATH_NAME_LENGTH.
+*/
+
+
+/*!
+	\fn status_t BPath::SetTo(const BEntry* entry)
+	\brief Reinitializes the object to the specified filesystem entry.
+
+	\param entry The BEntry to reinitialize the entry from.
+
+	\returns A status code.
+	\retval B_OK Initialization was successful.
+	\retval B_BAD_VALUE \c NULL \a ref.
+	\retval B_NAME_TOO_LONG The pathname was longer than \c B_PATH_NAME_LENGTH.
+*/
+
+
+/*!
+	\fn status_t BPath::SetTo(const char* path, const char* leaf, bool normalize)
+	\brief Reinitializes the object to the passed in \a path or \a path and
+	       \a leaf combination.
+
+	\remarks The following pseudocode is safe:
+	         \code path.SetTo(path.Path(), "new leaf") \endcode
+
+	\param path The \a path name to use.
+	\param leaf The \a leaf name to use (may be \c NULL).
+	\param normalize Boolean flag used to force normalization; normalization
+	       may sometimes occur even if \c false. The following items require
+	       normalization:
+	       - Relative pathnames (after concatenation; e.g. "boot/ltj")
+	       - The presence of "." or ".." ("/boot/ltj/../ltj/./gwar")
+	       - Redundant slashes ("/boot//ltj")
+	       - A trailing slash ("/boot/ltj/")
+
+	\returns A status code.
+	\retval B_OK Initialization was successful.
+	\retval B_BAD_VALUE \c NULL \a ref.
+	\retval B_NAME_TOO_LONG The pathname was longer than \c B_PATH_NAME_LENGTH.
+*/
+
+
+/*!
+	\fn status_t BPath::SetTo(const BDirectory* dir, const char* path,
+		bool normalize)
+	\brief Reinitializes the object to the passed in \a dir and relative
+	       \a path combination.
+
+	\param dir The directory that provides the base component of the pathname.
+	\param path the relative \a path name (may be \c NULL).
+	\param normalize boolean flag used to force normalization; normalization
+	       may sometimes occur even if \c false. The following items require
+	       normalization:
+	       - Relative pathnames (after concatenation; e.g. "boot/ltj")
+	       - The presence of "." or ".." ("/boot/ltj/../ltj/./gwar")
+	       - Redundant slashes ("/boot//ltj")
+	       - A trailing slash ("/boot/ltj/")
+
+	\returns A status code.
+	\retval B_OK Initialization was successful.
+	\retval B_BAD_VALUE \c NULL \a ref.
+	\retval B_NAME_TOO_LONG The pathname was longer than \c B_PATH_NAME_LENGTH.
+*/
+
+
+/*!
+	\fn void BPath::Unset()
+	\brief Returns the object to an uninitialized state.
+	
+	Frees any resources it allocated and marks the object as uninitialized.
+*/
+
+
+//! @}
+
+
+/*!
+	\name Path manipulation methods
+*/
+
+
+//! @{
+
+
+/*!
+	\fn status_t BPath::Append(const char* path, bool normalize)
+	\brief Appends the passed in relative path to the end of the current path.
+
+	This method fails if the path is absolute or the BPath object is
+	uninitialized.
+
+	\param path Relative pathname to append to current path (may be \c NULL).
+	\param normalize Boolean flag used to force normalization; normalization
+	       may sometimes occur even if \c false. The following items require
+	       normalization:
+	       - Relative pathnames (after concatenation; e.g. "boot/ltj")
+	       - The presence of "." or ".." ("/boot/ltj/../ltj/./gwar")
+	       - Redundant slashes ("/boot//ltj")
+	       - A trailing slash ("/boot/ltj/")
+
+	\returns A status code.
+	\retval B_OK Initialization was successful.
+	\retval B_BAD_VALUE \c NULL \a ref.
+	\retval B_NAME_TOO_LONG The pathname was longer than \c B_PATH_NAME_LENGTH.
+*/
+
+
+//! @}
+
+
+/*!
+	\name Path information methods
+*/
+
+
+//! @{
+
+
+/*!
+	\fn const char* BPath::Path() const
+	\brief Gets the entire path of the object.
+
+	\returns The path name of the object, or \c NULL if it is not properly
+	         initialized.
+*/
+
+
+/*!
+	\fn const char* BPath::Leaf() const
+	\brief Gets the leaf portion of the path.
+
+	The leaf portion of the path is defined to be the string after the last
+	\c '/'. For the root path (\c "/") it is an empty string (\c "").
+
+	\returns The leaf portion of the path or \c NULL if it is not properly
+	         initialized.
+*/
+
+
+/*!
+	\fn status_t BPath::GetParent(BPath* path) const
+	\brief Initializes \a path with the parent directory of the BPath object.
+
+	No normalization is performed on the path.
+
+	\param path The BPath object to be initialized to the parent directory.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_BAD_VALUE \c NULL \a path.
+	\retval B_ENTRY_NOT_FOUND The BPath object represents the root path and
+	        thus has no parent.
+*/
+
+
+/*!
+	\fn bool BPath::IsAbsolute() const
+	\brief Gets whether or not the path is absolute or relative.
+
+	\warning This method returns \c false if the object is initialized.
+
+	\returns \c true if the path is absolute, \c false if relative or if the
+	         object is uninitialized.
+*/
+
+
+//! @}
+
+
+/*!
+	\name Operator overload methods
+*/
+
+
+//! @{
+
+
+/*!
+	\fn bool BPath::operator==(const BPath& item) const
+	\brief Performs a simple (string-wise) comparison of paths for equality.
+
+	\warning No normalization takes place, two uninitialized BPath objects are
+	         considered equal.
+
+	\param item the BPath object to compare.
+
+	\return \c true, if the paths are equal, \c false otherwise.
+*/
+
+
+/*!
+	\fn bool BPath::operator==(const char* path) const
+	\brief Performs a simple (string-wise) comparison of paths for equality.
+
+	\warning No normalization takes place.
+
+	\param path The path to compare.
+
+	\return \c true, if the path names are equal, \c false otherwise.
+*/
+
+
+/*!
+	\fn bool BPath::operator!=(const BPath& item) const
+	\brief Performs a simple (string-wise) comparison of paths for inequality.
+
+	\warning No normalization takes place, two uninitialized BPath objects are
+	         considered equal.
+
+	\param item the BPath object to compare.
+
+	\return \c true, if the path names are \b not equal, \c false otherwise.
+*/
+
+
+/*!
+	\fn bool BPath::operator!=(const char* path) const
+	\brief Performs a simple (string-wise) comparison of paths for inequality.
+
+	\warning No normalization takes place.
+
+	\param path The path to compare.
+
+	\return \c true, if the path names are \b not equal, \c false otherwise.
+*/
+
+
+/*!
+	\fn BPath& BPath::operator=(const BPath& item)
+	\brief Initializes the object as a copy of \a item.
+
+	\param item The BPath object to copy
+
+	\return A pointer to the newly initialized BPath object.
+*/
+
+
+/*!
+	\fn BPath& BPath::operator=(const char* path)
+	\brief Initializes the object with the passed in \a path.
+
+	Has the same effect as \code SetTo(path) \endcode
+
+	\param path the path to be assign to this object.
+
+	\return A pointer to the newly initialized BPath object.
+*/
+
+
+//! @}
+
+
+/*!
+	\name BFlattenable override methods
+*/
+
+
+//! @{
+
+
+/*!
+	\fn bool BPath::IsFixedSize() const
+	\brief Overrides BFlattenable::IsFixedSize(). Always returns \c false.
+
+	\return \c false
+*/
+
+
+/*!
+	\fn type_code BPath::TypeCode() const
+	\brief Overrides BFlattenable::TypeCode() Always returns \c B_REF_TYPE.
+
+	\return \c B_REF_TYPE
+*/
+
+
+/*!
+	\fn ssize_t BPath::FlattenedSize() const
+	\brief Overrides BFlattenable::FlattenedSize() Gets the size of the
+	       flattened entry_ref struct that represents the path in bytes.
+
+	\return The size of the flattened entry_ref struct that represents the
+	        path in bytes.
+*/
+
+
+/*!
+	\fn status_t BPath::Flatten(void* buffer, ssize_t size) const
+	\brief Overrides BFlattenable::Flatten(). Converts the path of the object
+	       to an entry_ref and writes it into <em>buffer</em>.
+
+	\param buffer The buffer that the data is to be stored in.
+	\param size Size of <em>buffer</em>.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_BAD_VALUE \c NULL buffer or the buffer is of insufficient size.
+*/
+
+
+/*!
+	\fn bool BPath::AllowsTypeCode(type_code code) const
+	\brief Overrides BFlattenable::AllowsTypeCode(). Checks if type code is
+	       equal to \c B_REF_TYPE.
+
+	\param code The type code to test.
+
+	\return \c true if code is \c B_REF_TYPE, \c false otherwise.
+*/
+
+
+/*!
+	\fn status_t BPath::Unflatten(type_code code, const void* buffer,
+		ssize_t size)
+	\brief Overrides BFlattenable::Unflatten(). Initializes the object with
+	       the flattened entry_ref data from the passed in buffer.
+
+	The type code must be set to \c B_REF_TYPE.
+
+	\param code The type code of the flattened data, must be \c B_REF_TYPE.
+	\param buf A pointer to the flattened data.
+	\param size The size of \a buffer in bytes.
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_BAD_VALUE \a buffer is \c NULL or doesn't contain an entry_ref.
+*/
+
+
+//! @}
+
+
+/// private methods, won't show up in docs
+
+
+/*!
+	status_t BPath::_SetPath(const char* path)
+	\brief Sets the supplied path.
+
+	The path is copied. If \a path is \c NULL path of the object is set to
+	\c NULL as well. The object's old path is deleted.
+
+	\param path the path to be set
+
+	\returns A status code.
+	\retval B_OK Everything went fine.
+	\retval B_NO_MEMORY Insufficient memory.
+*/
+
+
+/*!
+	bool BPath::_MustNormalize(const char* path, status_t* _error)
+	\brief Checks a path to see if normalization is required.
+
+	The following items require normalization:
+	- Relative pathnames (after concatenation; e.g. "boot/ltj")
+	- The presence of "." or ".." ("/boot/ltj/../ltj/./gwar")
+	- Redundant slashes ("/boot//ltj")
+	- A trailing slash ("/boot/ltj/")
+
+	\param _error A pointer to an error variable that will be set if the input
+		is not a valid path.
+
+	\return \c true if \a path requires normalization, \c false otherwise.
+*/

headers/os/storage/NodeInfo.h

@@ -18,11 +18,6 @@ class BBitmap;
 class BResources;
 
 
-/*!	\brief BNodeInfo provides file type information
-	BNodeInfo provides a nice wrapper to all sorts of usefull meta data. 
-	Like it's mime type, the files icon and the application which will load
-	the file.
-*/
 class BNodeInfo {
 public:
 								BNodeInfo();

headers/os/storage/NodeMonitor.h

@@ -9,11 +9,10 @@
 #include <StorageDefs.h>
 
 
-/* Flags for the watch_node() call.
- *
- * Note that B_WATCH_MOUNT is NOT included in B_WATCH_ALL.
- * You may prefer to use BVolumeRoster for volume watching.
- */
+// Flags for the watch_node() call.
+
+// Note that B_WATCH_MOUNT is NOT included in B_WATCH_ALL.
+// You may prefer to use BVolumeRoster for volume watching.
 
 enum {
 	B_STOP_WATCHING			= 0x0000,
@@ -28,11 +27,10 @@ enum {
 };
 
 
-/* The "opcode" field of the B_NODE_MONITOR notification message you get.
- *
- * The presence and meaning of the other fields in that message specifying what
- * exactly caused the notification depend on this value.
- */
+// The "opcode" field of the B_NODE_MONITOR notification message you get.
+
+// The presence and meaning of the other fields in that message specifying what
+// exactly caused the notification depend on this value.
 
 #define	B_ENTRY_CREATED		1
 #define	B_ENTRY_REMOVED		2
@@ -67,11 +65,10 @@ enum {
 };
 
 
-/* C++ callable Prototypes
- *
- * Since you are not able to parse BMessages from plain C, there is no
- * API exported.
- */
+// C++ callable Prototypes
+
+// Since you are not able to parse BMessages from plain C, there is no
+// API exported.
 
 #if defined(__cplusplus) && !defined(_KERNEL_MODE)
 
@@ -95,6 +92,6 @@ extern status_t watch_node(const node_ref *node, uint32 flags,
 extern status_t stop_watching(BMessenger target);
 extern status_t stop_watching(const BHandler *handler, const BLooper *looper = NULL);
 
-#endif	/* __cplusplus && !_KERNEL_MODE */
+#endif	// __cplusplus && !_KERNEL_MODE
 
-#endif	/* _NODE_MONITOR_H*/
+#endif	// _NODE_MONITOR_H

headers/os/storage/Path.h

@@ -76,7 +76,9 @@ private:
 			uint32			_reserved[4];
 
 			char*			fName;
+								// Pointer to the path string of the object.
 			status_t		fCStatus;
+								// The initialization status of the object.
 };
 
 #endif	// _PATH_H

src/kits/storage/NodeInfo.cpp

@@ -36,12 +36,6 @@ static const char *kNILargeIconAttribute	= NI_BEOS ":L:STD_ICON";
 static const char *kNIIconAttribute			= NI_BEOS ":ICON";
 
 
-/*!	\brief Creates an uninitialized BNodeInfo object.
-
-	After created a BNodeInfo with this, you should call SetTo().
-
-	\see SetTo(BNode *node)
-*/
 BNodeInfo::BNodeInfo()
 	:
 	fNode(NULL),
@@ -49,13 +43,7 @@ BNodeInfo::BNodeInfo()
 {
 }
 
-// constructor
-/*!	\brief Creates a BNodeInfo object and initializes it to the supplied node.
 
-	\param node The node to gather information on. Can be any flavor.
-
-	\see SetTo(BNode *node)
-*/
 BNodeInfo::BNodeInfo(BNode *node)
 	:
 	fNode(NULL),
@@ -64,29 +52,13 @@ BNodeInfo::BNodeInfo(BNode *node)
 	fCStatus = SetTo(node);
 }
 
-// destructor
-/*!	\brief Frees all resources associated with this object.
 
-	The BNode object passed to the constructor or to SetTo() is not deleted.
-*/
 BNodeInfo::~BNodeInfo()
 {
 }
 
-// SetTo
-/*!	\brief Initializes the BNodeInfo to the supplied node.
 
-	The BNodeInfo object does not copy the supplied object, but uses it
-	directly. You must not delete the object you supply while the BNodeInfo
-	does exist. The BNodeInfo does not take over ownership of the BNode and
-	it doesn't delete it on destruction.
-
-	\param node The node to play with
-
-	\return
-	- \c B_OK: Everything went fine.
-	- \c B_BAD_VALUE: The node was bad.
-*/
+// Initializes the BNodeInfo to the supplied node.
 status_t
 BNodeInfo::SetTo(BNode *node)
 {
@@ -95,42 +67,21 @@ BNodeInfo::SetTo(BNode *node)
 	fCStatus = (node && node->InitCheck() == B_OK ? B_OK : B_BAD_VALUE);
 	if (fCStatus == B_OK)
 		fNode = node;
+
 	return fCStatus;
 }
 
-// InitCheck
-/*!	\brief returns whether the object has been properly initialized.
 
-	\return
-	- \c B_OK: Everything went fine.
-	- \c B_NO_INIT: The node is not properly initialized.
-*/
-status_t 
+// Returns whether the object has been properly initialized.
+status_t
 BNodeInfo::InitCheck() const
 {
 	return fCStatus;
 }
 
-// GetType
-/*!	\brief Gets the node's MIME type.
 
-	Writes the contents of the "BEOS:TYPE" attribute into the supplied buffer
-	\a type.
-
-	\param type A pointer to a pre-allocated character buffer of size
-		   \c B_MIME_TYPE_LENGTH or larger into which the MIME type of the
-		   node shall be written.
-	\return
-	- \c B_OK: Everything went fine.
-	- \c B_NO_INIT: The object is not properly initialized.
-	- \c B_BAD_VALUE: \c NULL \a type or the type string stored in the
-	  attribute is longer than \c B_MIME_TYPE_LENGTH.
-	- \c B_BAD_TYPE: The attribute the type string is stored in has the wrong
-	   type.
-	- \c B_ENTRY_NOT_FOUND: No type is set on the node.
-	- other error codes
-*/
-status_t 
+// Writes the MIME type of the node into type.
+status_t
 BNodeInfo::GetType(char *type) const
 {
 	// check parameter and initialization
@@ -160,25 +111,12 @@ BNodeInfo::GetType(char *type) const
 			type[min_c(attrInfo.size, B_MIME_TYPE_LENGTH - 1)] = '\0';
 		}
 	}
+
 	return error;
 }
 
-// SetType
-/*!	\brief Sets the node's MIME type.
-
-	The supplied string is written into the node's "BEOS:TYPE" attribute.
-
-	If \a type is \c NULL, the respective attribute is removed.
-
-	\param type The MIME type to be assigned to the node. Must not be longer
-		   than \c B_MIME_TYPE_LENGTH (including the terminating null).
-		   May be \c NULL.
-	\return
-	- \c B_OK: Everything went fine.
-	- \c B_NO_INIT: The object is not properly initialized.
-	- \c B_BAD_VALUE: \a type is longer than \c B_MIME_TYPE_LENGTH.
-	- other error codes
-*/
+// Sets the MIME type of the node. If type is NULL the BEOS:TYPE attribute is
+// removed instead.
 status_t
 BNodeInfo::SetType(const char *type)
 {
@@ -206,24 +144,8 @@ BNodeInfo::SetType(const char *type)
 	return error;
 }
 
-// GetIcon
-/*!	\brief Gets the node's icon.
 
-	The icon stored in the node's "BEOS:L:STD_ICON" (large) or
-	"BEOS:M:STD_ICON" (mini) attribute is retrieved.
-
-	\param icon A pointer to a pre-allocated BBitmap of the correct dimension
-		   to store the requested icon (16x16 for the mini and 32x32 for the
-		   large icon).
-	\param k Specifies the size of the icon to be retrieved: \c B_MINI_ICON
-		   for the mini and \c B_LARGE_ICON for the large icon.
-	\return
-	- \c B_OK: Everything went fine.
-	- \c B_NO_INIT: The object is not properly initialized.
-	- \c B_BAD_VALUE: \c NULL \a icon, unsupported icon size \a k or bitmap
-		 dimensions (\a icon) and icon size (\a k) do not match.
-	- other error codes
-*/
+// Gets the icon of the node.
 status_t
 BNodeInfo::GetIcon(BBitmap *icon, icon_size k) const
 {
@@ -311,26 +233,10 @@ BNodeInfo::GetIcon(BBitmap *icon, icon_size k) const
 //	return error;
 }
 
-// SetIcon
-/*!	\brief Sets the node's icon.
 
-	The icon is stored in the node's "BEOS:L:STD_ICON" (large) or
-	"BEOS:M:STD_ICON" (mini) attribute.
-
-	If \a icon is \c NULL, the respective attribute is removed.
-
-	\param icon A pointer to the BBitmap containing the icon to be set.
-		   May be \c NULL.
-	\param k Specifies the size of the icon to be set: \c B_MINI_ICON
-		   for the mini and \c B_LARGE_ICON for the large icon.
-	\return
-	- \c B_OK: Everything went fine.
-	- \c B_NO_INIT: The object is not properly initialized.
-	- \c B_BAD_VALUE: Unknown icon size \a k or bitmap dimensions (\a icon)
-		 and icon size (\a k) do not match.
-	- other error codes
-*/
-status_t 
+// Sets the icon of the node. If icon is NULL, the attribute is removed
+// instead.
+status_t
 BNodeInfo::SetIcon(const BBitmap *icon, icon_size k)
 {
 	status_t error = B_OK;
@@ -396,26 +302,7 @@ BNodeInfo::SetIcon(const BBitmap *icon, icon_size k)
 }
 
 
-// GetIcon
-/*!	\brief Gets the node's icon.
-
-	The icon stored in the node's "BEOS:ICON" attribute is retrieved.
-	The caller is responsible to \c delete[] the returned data if the
-	function was successful.
-
-	\param data A pointer in which a pointer to the icon data
-		   will be returned.
-	\param size A pointer in which the size of the found icon data
-		   will be returned.
-	\param type A pointer in which the type of the found icon data
-		   will be returned.
-	\return
-	- \c B_OK: Everything went fine.
-	- \c B_NO_INIT: The object is not properly initialized.
-	- \c B_BAD_VALUE: \c NULL \a data, \c NULL size or \c NULL \a type.
-	- \c B_NO_MEMORY: No memory to allocate the data buffer.
-	- other error codes
-*/
+// Gets the icon of the node.
 status_t
 BNodeInfo::GetIcon(uint8** data, size_t* size, type_code* type) const
 {
@@ -456,22 +343,10 @@ BNodeInfo::GetIcon(uint8** data, size_t* size, type_code* type) const
 	return B_OK;
 }
 
-// SetIcon
-/*!	\brief Sets the node's icon.
 
-	The icon is stored in the node's "BEOS:ICON" attribute.
-
-	If \a data is \c NULL, the respective attribute is removed.
-
-	\param data A pointer to valid vector icon data.
-		   May be \c NULL.
-	\param size Specifies the size of the provided data buffer.
-	\return
-	- \c B_OK: Everything went fine.
-	- \c B_NO_INIT: The object is not properly initialized.
-	- other error codes
-*/
-status_t 
+// Sets the node icon of the node. If data is NULL of size is 0, the
+// "BEOS:ICON" attribute is removed instead.
+status_t
 BNodeInfo::SetIcon(const uint8* data, size_t size)
 {
 	// check initialization
@@ -489,31 +364,17 @@ BNodeInfo::SetIcon(const uint8* data, size_t size)
 			error = (status_t)written;
 		else if (written != (ssize_t)size)
 			error = B_ERROR;
-	} else	// no icon given => remove
+	} else {
+		// no icon given => remove
 		error = fNode->RemoveAttr(kNIIconAttribute);
+	}
 
 	return error;
 }
 
-// GetPreferredApp
-/*!	\brief Gets the node's preferred application.
 
-	Writes the contents of the "BEOS:PREF_APP" attribute into the supplied
-	buffer \a signature. The preferred application is identifief by its
-	signature.
-
-	\param signature A pointer to a pre-allocated character buffer of size
-		   \c B_MIME_TYPE_LENGTH or larger into which the MIME type of the
-		   preferred application shall be written.
-	\param verb Specifies the type of access the preferred application is
-		   requested for. Currently only \c B_OPEN is meaningful.
-	\return
-	- \c B_OK: Everything went fine.
-	- \c B_NO_INIT: The object is not properly initialized.
-	- \c B_BAD_VALUE: \c NULL \a signature or bad app_verb \a verb.
-	- other error codes
-*/
-status_t 
+// Gets the preferred application of the node.
+status_t
 BNodeInfo::GetPreferredApp(char *signature, app_verb verb) const
 {
 	// check parameter and initialization
@@ -547,26 +408,10 @@ BNodeInfo::GetPreferredApp(char *signature, app_verb verb) const
 	return error;
 }
 
-// SetPreferredApp
-/*!	\brief Sets the node's preferred application.
 
-	The supplied string is written into the node's "BEOS:PREF_APP" attribute.
-
-	If \a signature is \c NULL, the respective attribute is removed.
-
-	\param signature The signature of the preferred application to be set.
-		   Must not be longer than \c B_MIME_TYPE_LENGTH (including the
-		   terminating null). May be \c NULL.
-	\param verb Specifies the type of access the preferred application shall
-		   be set for. Currently only \c B_OPEN is meaningful.
-	\return
-	- \c B_OK: Everything went fine.
-	- \c B_NO_INIT: The object is not properly initialized.
-	- \c B_BAD_VALUE: \c NULL \a signature, \a signature is longer than
-	  \c B_MIME_TYPE_LENGTH or bad app_verb \a verb.
-	- other error codes
-*/
-status_t 
+// Sets the preferred application of the node. If signature is NULL, the
+// "BEOS:PREF_APP" attribute is removed instead.
+status_t
 BNodeInfo::SetPreferredApp(const char *signature, app_verb verb)
 {
 	// check parameters and initialization
@@ -593,22 +438,10 @@ BNodeInfo::SetPreferredApp(const char *signature, app_verb verb)
 	return error;
 }
 
-// GetAppHint
-/*!	\brief Returns a hint in form of and entry_ref to the application that
-		   shall be used to open this node.
 
-	The path contained in the node's "BEOS:PPATH" attribute is converted into
-	an entry_ref and returned in \a ref.
-
-	\param ref A pointer to a pre-allocated entry_ref into which the requested
-		   app hint shall be written.
-	\return
-	- \c B_OK: Everything went fine.
-	- \c B_NO_INIT: The object is not properly initialized.
-	- \c B_BAD_VALUE: \c NULL \a ref.
-	- other error codes
-*/
-status_t 
+// Fills out ref with a pointer to a hint about what application will open
+// this node.
+status_t
 BNodeInfo::GetAppHint(entry_ref *ref) const
 {
 	// check parameter and initialization
@@ -646,23 +479,10 @@ BNodeInfo::GetAppHint(entry_ref *ref) const
 	return error;
 }
 
-// SetAppHint
-/*!	\brief Sets the node's app hint.
 
-	The supplied entry_ref is converted into a path and stored in the node's
-	"BEOS:PPATH" attribute.
-
-	If \a ref is \c NULL, the respective attribute is removed.
-
-	\param ref A pointer to an entry_ref referring to the application.
-		   May be \c NULL.
-	\return
-	- \c B_OK: Everything went fine.
-	- \c B_NO_INIT: The object is not properly initialized.
-	- \c B_BAD_VALUE: \c NULL \a ref.
-	- other error codes
-*/
-status_t 
+// Sets the app hint of the node. If ref is NULL, the "BEOS:PPATH" attribute
+// is removed instead.
+status_t
 BNodeInfo::SetAppHint(const entry_ref *ref)
 {
 	// check parameter and initialization
@@ -691,37 +511,9 @@ BNodeInfo::SetAppHint(const entry_ref *ref)
 	return error;
 }
 
-// GetTrackerIcon
-/*!	\brief Gets the icon which tracker displays.
 
-	This method tries real hard to find an icon for the node:
-	- If the node has no type, return the icon for B_FILE_MIME_TYPE if it's a
-	  regular file, for B_DIRECTORY_MIME_TYPE if it's a directory, etc. from
-	  the MIME database. Even, if the node has an own icon!
-	- Ask GetIcon().
-	- Get the preferred application and ask the MIME database, if that
-	  application has a special icon for the node's file type.
-	- Ask the MIME database whether there is an icon for the node's file type.
-	- Ask the MIME database for the preferred application for the node's
-	  file type and whether this application has a special icon for the type.
-	- Return the icon for whatever type of node (file/dir/etc.) from the MIME database.
-	This list is processed in the given order and the icon the first
-	successful attempt provides is returned. In case none of them yields an
-	icon, this method fails. This is very unlikely though.
-
-	\param icon A pointer to a pre-allocated BBitmap of the correct dimension
-		   to store the requested icon (16x16 for the mini and 32x32 for the
-		   large icon).
-	\param iconSize Specifies the size of the icon to be retrieved: \c B_MINI_ICON
-		   for the mini and \c B_LARGE_ICON for the large icon.
-	\return
-	- \c B_OK: Everything went fine.
-	- \c B_NO_INIT: The object is not properly initialized.
-	- \c B_BAD_VALUE: \c NULL \a icon, unsupported icon size \a iconSize or bitmap
-		 dimensions (\a icon) and icon size (\a iconSize) do not match.
-	- other error codes
-*/
-status_t 
+// Gets the icon displayed by Tracker for the icon.
+status_t
 BNodeInfo::GetTrackerIcon(BBitmap *icon, icon_size iconSize) const
 {
 	if (!icon)
@@ -754,8 +546,8 @@ BNodeInfo::GetTrackerIcon(BBitmap *icon, icon_size iconSize) const
 	if (GetIcon(icon, iconSize) == B_OK)
 		return B_OK;
 
-	// If not successful, see if the node has a type available at all. If no type
-	// is available, use one of the standard types depending on 
+	// If not successful, see if the node has a type available at all.
+	// If no type is available, use one of the standard types.
 	status_t error = B_OK;
 	char mimeString[B_MIME_TYPE_LENGTH];
 	if (GetType(mimeString) != B_OK) {
@@ -765,7 +557,8 @@ BNodeInfo::GetTrackerIcon(BBitmap *icon, icon_size iconSize) const
 		struct stat stat;
 		error = fNode->GetStat(&stat);
 		if (error == B_OK) {
-			// no type available -- get the icon for the appropriate type (file/dir/etc.)
+			// no type available -- get the icon for the appropriate type
+			// (file/dir/etc.)
 			if (S_ISREG(stat.st_mode)) {
 				// is it an application (executable) or just a regular file?
 				if ((stat.st_mode & S_IXUSR) != 0)
@@ -775,20 +568,20 @@ BNodeInfo::GetTrackerIcon(BBitmap *icon, icon_size iconSize) const
 			} else if (S_ISDIR(stat.st_mode)) {
 				// it's either a volume or just a standard directory
 				fs_info info;
-				if (fs_stat_dev(stat.st_dev, &info) == 0 && stat.st_ino == info.root)
+				if (fs_stat_dev(stat.st_dev, &info) == 0
+					&& stat.st_ino == info.root) {
 					type.SetTo(B_VOLUME_MIME_TYPE);
-				else
+				} else
 					type.SetTo(B_DIRECTORY_MIME_TYPE);
 			} else if (S_ISLNK(stat.st_mode))
 				type.SetTo(B_SYMLINK_MIME_TYPE);
 		} else {
-			// GetStat() failed.
-			// Return the icon for "application/octet-stream" from the MIME database.
+			// GetStat() failed. Return the icon for
+			// "application/octet-stream" from the MIME database.
 			type.SetTo(B_FILE_MIME_TYPE);
 		}
 
 		return type.GetIcon(icon, iconSize);
-
 	} else {
 		// We know the mimetype of the node.
 		bool success = false;
@@ -801,29 +594,34 @@ BNodeInfo::GetTrackerIcon(BBitmap *icon, icon_size iconSize) const
 			success = type.GetIconForType(mimeString, icon, iconSize) == B_OK;
 		}
 
-		// TODO: Confirm Tracker asks preferred app icons before asking mime icons.
+		// ToDo: Confirm Tracker asks preferred app icons before asking
+		// mime icons.
 
 		BMimeType nodeType(mimeString);
 
 		// Ask the MIME database for the preferred application for the node's
-		// file type and whether this application has a special icon for the type.
+		// file type and whether this application has a special icon for the
+		// type.
 		if (!success && nodeType.GetPreferredApp(signature) == B_OK) {
 			BMimeType type(signature);
 			success = type.GetIconForType(mimeString, icon, iconSize) == B_OK;
 		}
 
-		// Ask the MIME database whether there is an icon for the node's file type.
+		// Ask the MIME database whether there is an icon for the node's file
+		// type.
 		if (!success)
 			success = nodeType.GetIcon(icon, iconSize) == B_OK;
 
 		// Get the super type if still no success.
 		BMimeType superType;
 		if (!success && nodeType.GetSupertype(&superType) == B_OK) {
-			// Ask the MIME database for the preferred application for the node's
-			// super type and whether this application has a special icon for the type.
+			// Ask the MIME database for the preferred application for the
+			// node's super type and whether this application has a special
+			// icon for the type.
 			if (superType.GetPreferredApp(signature) == B_OK) {
 				BMimeType type(signature);
-				success = type.GetIconForType(superType.Type(), icon, iconSize) == B_OK;
+				success = type.GetIconForType(superType.Type(), icon,
+					iconSize) == B_OK;
 			}
 			// Get the icon of the super type itself.
 			if (!success)
@@ -837,28 +635,9 @@ BNodeInfo::GetTrackerIcon(BBitmap *icon, icon_size iconSize) const
 	return B_ERROR;
 }
 
-// GetTrackerIcon
-/*!	\brief Gets the icon which tracker displays for the node referred to by
-		   the supplied entry_ref.
 
-	This methods works similar to the non-static version. The first argument
-	\a ref identifies the node in question.
-
-	\param ref An entry_ref referring to the node for which the icon shall be
-		   retrieved.
-	\param icon A pointer to a pre-allocated BBitmap of the correct dimension
-		   to store the requested icon (16x16 for the mini and 32x32 for the
-		   large icon).
-	\param iconSize Specifies the size of the icon to be retrieved: \c B_MINI_ICON
-		   for the mini and \c B_LARGE_ICON for the large icon.
-	\return
-	- \c B_OK: Everything went fine.
-	- \c B_NO_INIT: The object is not properly initialized.
-	- \c B_BAD_VALUE: \c NULL ref or \a icon, unsupported icon size \a iconSize or
-		 bitmap dimensions (\a icon) and icon size (\a iconSize) do not match.
-	- other error codes
-*/
-status_t 
+// Gets the icon displayed by Tracker for the node referred to by ref.
+status_t
 BNodeInfo::GetTrackerIcon(const entry_ref *ref, BBitmap *icon, icon_size iconSize)
 {
 	// check ref param
@@ -880,8 +659,9 @@ BNodeInfo::GetTrackerIcon(const entry_ref *ref, BBitmap *icon, icon_size iconSiz
 	return error;
 }
 
-// TODO: just here for providing binary compatibility
-// (for example "Guido" needs this)
+
+// NOTE: The following method is provided for binary compatibility purposes
+// (for example the program "Guido" depends on this.)
 extern "C"
 status_t
 GetTrackerIcon__9BNodeInfoP9entry_refP7BBitmap9icon_size(
@@ -892,33 +672,36 @@ GetTrackerIcon__9BNodeInfoP9entry_refP7BBitmap9icon_size(
 	return BNodeInfo::GetTrackerIcon(ref, bitmap, iconSize);
 }
 
+
 void 
 BNodeInfo::_ReservedNodeInfo1()
 {
 }
 
+
 void 
 BNodeInfo::_ReservedNodeInfo2()
 {
 }
 
+
 void 
 BNodeInfo::_ReservedNodeInfo3()
 {
 }
 
-// =
-/*!	\brief Privatized assignment operator to prevent usage.
-*/
+
+// Assignment operator is declared private to prevent it from being created
+// automatically by the compiler.
 BNodeInfo &
 BNodeInfo::operator=(const BNodeInfo &nodeInfo)
 {
 	return *this;
 }
 
-// copy constructor
-/*!	\brief Privatized copy constructor to prevent usage.
-*/
+
+// Copy constructor is declared private to prevent it from being created
+// automatically by the compiler.
 BNodeInfo::BNodeInfo(const BNodeInfo &)
 {
 }
@@ -926,11 +709,11 @@ BNodeInfo::BNodeInfo(const BNodeInfo &)
 
 //	#pragma mark -
 
+
 namespace BPrivate {
 
-/*!
-	Private function used by Tracker. Should be moved into the Tracker sources.
-*/
+// Private method used by Tracker. This should be moved to the Tracker
+// source.
 extern bool
 CheckNodeIconHintPrivate(const BNode *node, bool checkMiniIconOnly)
 {

src/kits/storage/NodeMonitor.cpp

@@ -22,19 +22,7 @@
 // TODO: Tests!
 
 
-// watch_volume
-/*!	\brief Subscribes a target to watch node changes on a volume.
-
-	Depending of \a flags the action performed by this function varies:
-	- \a flags contains at least one of \c B_WATCH_NAME, \c B_WATCH_STAT,
-	  or \c B_WATCH_ATTR: The target is subscribed to
-	  watching the specified aspects of any node on the volume.
-
-	\param volume dev_t referring to the volume to be watched.
-	\param flags Flags indicating the actions to be performed.
-	\param target Messenger referring to the target. Must be valid.
-	\return \c B_OK, if everything went fine, another error code otherwise.
-*/
+// Subscribes a target to watch node changes on a volume.
 status_t
 watch_volume(dev_t volume, uint32 flags, BMessenger target)
 {
@@ -58,29 +46,7 @@ watch_volume(dev_t volume, uint32 flags, const BHandler *handler,
 }
 
 
-// watch_node
-/*!	\brief Subscribes a target to node and/or mount watching, or unsubscribes
-		   it from node watching.
-
-	Depending of \a flags the action performed by this function varies:
-	- \a flags is \c 0: The target is unsubscribed from watching the node.
-	  \a node must not be \c NULL in this case.
-	- \a flags contains \c B_WATCH_MOUNT: The target is subscribed to mount
-	  watching.
-	- \a flags contains at least one of \c B_WATCH_NAME, \c B_WATCH_STAT,
-	  \c B_WATCH_ATTR, or \c B_WATCH_DIRECTORY: The target is subscribed to
-	  watching the specified aspects of the node. \a node must not be \c NULL
-	  in this case.
-
-	Note, that the latter two cases are not mutual exlusive, i.e. mount and
-	node watching can be requested with a single call.
-
-	\param node node_ref referring to the node to be watched. May be \c NULL,
-		   if only mount watching is requested.
-	\param flags Flags indicating the actions to be performed.
-	\param target Messenger referring to the target. Must be valid.
-	\return \c B_OK, if everything went fine, another error code otherwise.
-*/
+// Subscribes or unsubscribes a target to node and/or mount watching.
 status_t
 watch_node(const node_ref *node, uint32 flags, BMessenger target)
 {
@@ -122,32 +88,9 @@ watch_node(const node_ref *node, uint32 flags, BMessenger target)
 	return B_OK;
 }
 
-// watch_node
-/*!	\brief Subscribes a target to node and/or mount watching, or unsubscribes
-		   it from node watching.
 
-	Depending of \a flags the action performed by this function varies:
-	- \a flags is \c 0: The target is unsubscribed from watching the node.
-	  \a node must not be \c NULL in this case.
-	- \a flags contains \c B_WATCH_MOUNT: The target is subscribed to mount
-	  watching.
-	- \a flags contains at least one of \c B_WATCH_NAME, \c B_WATCH_STAT,
-	  \c B_WATCH_ATTR, or \c B_WATCH_DIRECTORY: The target is subscribed to
-	  watching the specified aspects of the node. \a node must not be \c NULL
-	  in this case.
-
-	Note, that the latter two cases are not mutual exlusive, i.e. mount and
-	node watching can be requested with a single call.
-
-	\param node node_ref referring to the node to be watched. May be \c NULL,
-		   if only mount watching is requested.
-	\param flags Flags indicating the actions to be performed.
-	\param handler The target handler. May be \c NULL, if \a looper is not
-		   \c NULL. Then the preferred handler of the looper is targeted.
-	\param looper The target looper. May be \c NULL, if \a handler is not
-		   \c NULL. Then the handler's looper is the target looper.
-	\return \c B_OK, if everything went fine, another error code otherwise.
-*/
+// Subscribes or unsubscribes a handler or looper to node and/or mount
+// watching.
 status_t
 watch_node(const node_ref *node, uint32 flags, const BHandler *handler,
 	const BLooper *looper)
@@ -156,10 +99,7 @@ watch_node(const node_ref *node, uint32 flags, const BHandler *handler,
 }
 
 
-/*!	\brief Unsubscribes a target from node and mount monitoring.
-	\param target Messenger referring to the target. Must be valid.
-	\return \c B_OK, if everything went fine, another error code otherwise.
-*/
+// Unsubscribes a target from node and mount monitoring.
 status_t
 stop_watching(BMessenger target)
 {
@@ -174,13 +114,7 @@ stop_watching(BMessenger target)
 }
 
 
-/*!	\brief Unsubscribes a target from node and mount monitoring.
-	\param handler The target handler. May be \c NULL, if \a looper is not
-		   \c NULL. Then the preferred handler of the looper is targeted.
-	\param looper The target looper. May be \c NULL, if \a handler is not
-		   \c NULL. Then the handler's looper is the target looper.
-	\return \c B_OK, if everything went fine, another error code otherwise.
-*/
+// Unsubscribes a target from node and mount monitoring.
 status_t
 stop_watching(const BHandler *handler, const BLooper *looper)
 {

src/kits/storage/Path.cpp

@@ -4,16 +4,11 @@
  *
  * Authors:
  *		Tyler Dauwalder
+ *		Axel Dörfler, axeld@pinc-software.de
  *		Ingo Weinhold, bonefish@users.sf.net
  */
 
 
-/*!
-	\file Path.cpp
-	BPath implementation.
-*/
-
-
 #include <Path.h>
 
 #include <new>
@@ -30,7 +25,7 @@
 using namespace std;
 
 
-//! Creates an uninitialized BPath object.
+// Creates an uninitialized BPath object.
 BPath::BPath()
 	:
 	fName(NULL),
@@ -39,9 +34,7 @@ BPath::BPath()
 }
 
 
-/*! Creates a copy of the given BPath object.
-	\param path the object to be copied
-*/
+// Creates a copy of the given BPath object.
 BPath::BPath(const BPath& path)
 	:
 	fName(NULL),
@@ -51,10 +44,8 @@ BPath::BPath(const BPath& path)
 }
 
 
-/*!	\brief Creates a BPath object and initializes it to the filesystem entry
-	specified by the given entry_ref struct.
-	\param ref the entry_ref
-*/
+// Creates a BPath object and initializes it to the filesystem entry
+// specified by the passed in entry_ref struct.
 BPath::BPath(const entry_ref* ref)
 	:
 	fName(NULL),
@@ -64,10 +55,8 @@ BPath::BPath(const entry_ref* ref)
 }
 
 
-/*!	\brief Creates a BPath object and initializes it to the filesystem entry
-	specified by the given BEntry object.
-	\param entry the BEntry object
-*/
+// Creates a BPath object and initializes it to the filesystem entry
+// specified by the passed in BEntry object.
 BPath::BPath(const BEntry* entry)
 	:
 	fName(NULL),
@@ -77,17 +66,8 @@ BPath::BPath(const BEntry* entry)
 }
 
 
-/*! \brief Creates a BPath object and initializes it to the specified path or
-		   path and filename combination.
-
-	\param dir The base component of the pathname. May be absolute or relative.
-		   If relative, it is reckoned off the current working directory.
-	\param leaf The (optional) leaf component of the pathname. Must be
-		   relative. The value of leaf is concatenated to the end of \a dir
-		   (a "/" will be added as a separator, if necessary).
-	\param normalize boolean flag used to force normalization; normalization
-		   may occur even if false (see \ref _MustNormalize).
-*/
+// Creates a BPath object and initializes it to the specified path or
+// path and filename combination.
 BPath::BPath(const char* dir, const char* leaf, bool normalize)
 	:
 	fName(NULL),
@@ -97,16 +77,8 @@ BPath::BPath(const char* dir, const char* leaf, bool normalize)
 }
 
 
-/*! \brief Creates a BPath object and initializes it to the specified directory
-	 and filename combination.
-	\param dir Refers to the directory that provides the base component of the
-		   pathname.
-	\param leaf The (optional) leaf component of the pathname. Must be
-		   relative. The value of leaf is concatenated to the end of \a dir
-		   (a "/" will be added as a separator, if necessary).
-	\param normalize boolean flag used to force normalization; normalization
-		   may occur even if false (see \ref _MustNormalize).
-*/
+// Creates a BPath object and initializes it to the specified directory
+// and filename combination.
 BPath::BPath(const BDirectory* dir, const char* leaf, bool normalize)
 	:
 	fName(NULL),
@@ -116,17 +88,14 @@ BPath::BPath(const BDirectory* dir, const char* leaf, bool normalize)
 }
 
 
-//! Destroys the BPath object and frees any of its associated resources.
+// Destroys the BPath object and frees any of its associated resources.
 BPath::~BPath()
 {
 	Unset();
 }
 
 
-/*! \brief Returns the status of the most recent construction or SetTo() call.
-	\return \c B_OK, if the BPath object is properly initialized, an error
-			code otherwise.
-*/
+// Checks whether or not the object was properly initialized.
 status_t
 BPath::InitCheck() const
 {
@@ -134,15 +103,8 @@ BPath::InitCheck() const
 }
 
 
-/*! \brief Reinitializes the object to the filesystem entry specified by the
-	given entry_ref struct.
-	\param ref the entry_ref
-	\return
-	- \c B_OK: The initialization was successful.
-	- \c B_BAD_VALUE: \c NULL \a ref.
-	- \c B_NAME_TOO_LONG: The pathname is longer than \c B_PATH_NAME_LENGTH.
-	- other error codes.
-*/
+// Reinitializes the object to the filesystem entry specified by the
+// passed in entry_ref struct.
 status_t
 BPath::SetTo(const entry_ref* ref)
 {
@@ -162,14 +124,7 @@ BPath::SetTo(const entry_ref* ref)
 }
 
 
-/*! \brief Reinitializes the object to the specified filesystem entry.
-	\param entry the BEntry
-	\return
-	- \c B_OK: The initialization was successful.
-	- \c B_BAD_VALUE: \c NULL \a entry.
-	- \c B_NAME_TOO_LONG: The pathname is longer than \c B_PATH_NAME_LENGTH.
-	- other error codes.
-*/
+// Reinitializes the object to the specified filesystem entry.
 status_t
 BPath::SetTo(const BEntry* entry)
 {
@@ -186,19 +141,8 @@ BPath::SetTo(const BEntry* entry)
 }
 
 
-/*!	\brief Reinitializes the object to the specified path or path and file
-	name combination.
-	\param path the path name
-	\param leaf the leaf name (may be \c NULL)
-	\param normalize boolean flag used to force normalization; normalization
-		   may occur even if false (see \ref _MustNormalize).
-	\return
-	- \c B_OK: The initialization was successful.
-	- \c B_BAD_VALUE: \c NULL \a path or absolute \a leaf.
-	- \c B_NAME_TOO_LONG: The pathname is longer than \c B_PATH_NAME_LENGTH.
-	- other error codes.
-	\note \code path.SetTo(path.Path(), "new leaf") \endcode is safe.
-*/
+// Reinitializes the object to the passed in path or path and
+// leaf combination.
 status_t
 BPath::SetTo(const char* path, const char* leaf, bool normalize)
 {
@@ -255,19 +199,7 @@ BPath::SetTo(const char* path, const char* leaf, bool normalize)
 }
 
 
-/*!	\brief Reinitializes the object to the specified directory and relative
-	path combination.
-	\param dir Refers to the directory that provides the base component of the
-		   pathname.
-	\param path the relative path name (may be \c NULL)
-	\param normalize boolean flag used to force normalization; normalization
-		   may occur even if false (see \ref _MustNormalize).
-	\return
-	- \c B_OK: The initialization was successful.
-	- \c B_BAD_VALUE: \c NULL \a dir or absolute \a path.
-	- \c B_NAME_TOO_LONG: The pathname is longer than \c B_PATH_NAME_LENGTH.
-	- other error codes.
-*/
+// Reinitializes the object to the passed in dir and relative path combination.
 status_t
 BPath::SetTo(const BDirectory* dir, const char* path, bool normalize)
 {
@@ -289,9 +221,7 @@ BPath::SetTo(const BDirectory* dir, const char* path, bool normalize)
 }
 
 
-/*!	\brief Returns the object to an uninitialized state. The object frees any
-	resources it allocated and marks itself as uninitialized.
-*/
+// Returns the object to an uninitialized state.
 void
 BPath::Unset()
 {
@@ -300,18 +230,7 @@ BPath::Unset()
 }
 
 
-/*!	\brief Appends the given (relative) path to the end of the current path.
-	This call fails if the path is absolute or the object to which you're
-	appending is uninitialized.
-	\param path relative pathname to append to current path (may be \c NULL).
-	\param normalize boolean flag used to force normalization; normalization
-		   may occur even if false (see \ref _MustNormalize).
-	\return
-	- \c B_OK: The initialization was successful.
-	- \c B_BAD_VALUE: The object is not properly initialized.
-	- \c B_NAME_TOO_LONG: The pathname is longer than \c B_PATH_NAME_LENGTH.
-	- other error codes.
-*/
+// Appends the passed in relative path to the end of the current path.
 status_t
 BPath::Append(const char* path, bool normalize)
 {
@@ -325,11 +244,7 @@ BPath::Append(const char* path, bool normalize)
 }
 
 
-/*! \brief Returns the object's complete path name.
-	\return
-	- the object's path name, or
-	- \c NULL, if it is not properly initialized.
-*/
+// Gets the entire path of the object.
 const char*
 BPath::Path() const
 {
@@ -337,13 +252,7 @@ BPath::Path() const
 }
 
 
-/*! \brief Returns the leaf portion of the object's path name.
-	The leaf portion is defined as the string after the last \c '/'. For
-	the root path (\c "/") it is the empty string (\c "").
-	\return
-	- the leaf portion of the object's path name, or
-	- \c NULL, if it is not properly initialized.
-*/
+// Gets the leaf portion of the path.
 const char*
 BPath::Leaf() const
 {
@@ -362,17 +271,7 @@ BPath::Leaf() const
 }
 
 
-/*! \brief Calls the argument's SetTo() method with the name of the
-	object's parent directory.
-	No normalization is done.
-	\param path the BPath object to be initialized to the parent directory's
-		   path name.
-	\return
-	- \c B_OK: Everything went fine.
-	- \c B_BAD_VALUE: \c NULL \a path.
-	- \c B_ENTRY_NOT_FOUND: The object represents \c "/".
-	- other error code returned by SetTo().
-*/
+// Initializes path with the parent directory of the BPath object.
 status_t
 BPath::GetParent(BPath* path) const
 {
@@ -404,6 +303,7 @@ BPath::GetParent(BPath* path) const
 }
 
 
+// Gets whether or not the path is absolute or relative.
 bool
 BPath::IsAbsolute() const
 {
@@ -414,12 +314,7 @@ BPath::IsAbsolute() const
 }
 
 
-/*! \brief Performs a simple (string-wise) comparison of paths.
-	No normalization takes place! Uninitialized BPath objects are considered
-	to be equal.
-	\param item the BPath object to be compared with
-	\return \c true, if the path names are equal, \c false otherwise.
-*/
+// Performs a simple (string-wise) comparison of paths for equality.
 bool
 BPath::operator==(const BPath& item) const
 {
@@ -427,11 +322,7 @@ BPath::operator==(const BPath& item) const
 }
 
 
-/*! \brief Performs a simple (string-wise) comparison of paths.
-	No normalization takes place!
-	\param path the path name to be compared with
-	\return \c true, if the path names are equal, \c false otherwise.
-*/
+// Performs a simple (string-wise) comparison of paths for equality.
 bool
 BPath::operator==(const char* path) const
 {
@@ -440,12 +331,7 @@ BPath::operator==(const char* path) const
 }
 
 
-/*! \brief Performs a simple (string-wise) comparison of paths.
-	No normalization takes place! Uninitialized BPath objects are considered
-	to be equal.
-	\param item the BPath object to be compared with
-	\return \c true, if the path names are not equal, \c false otherwise.
-*/
+// Performs a simple (string-wise) comparison of paths for inequality.
 bool
 BPath::operator!=(const BPath& item) const
 {
@@ -453,11 +339,7 @@ BPath::operator!=(const BPath& item) const
 }
 
 
-/*! \brief Performs a simple (string-wise) comparison of paths.
-	No normalization takes place!
-	\param path the path name to be compared with
-	\return \c true, if the path names are not equal, \c false otherwise.
-*/
+// Performs a simple (string-wise) comparison of paths for inequality.
 bool
 BPath::operator!=(const char* path) const
 {
@@ -465,10 +347,7 @@ BPath::operator!=(const char* path) const
 }
 
 
-/*! \brief Initializes the object to be a copy of the argument.
-	\param item the BPath object to be copied
-	\return \c *this
-*/
+// Initializes the object as a copy of item.
 BPath&
 BPath::operator=(const BPath& item)
 {
@@ -478,11 +357,7 @@ BPath::operator=(const BPath& item)
 }
 
 
-/*! \brief Initializes the object to be a copy of the argument.
-	Has the same effect as \code SetTo(path) \endcode.
-	\param path the path name to be assigned to this object
-	\return \c *this
-*/
+// Initializes the object with the passed in path.
 BPath&
 BPath::operator=(const char* path)
 {
@@ -509,10 +384,7 @@ static const size_t flattened_entry_ref_size
 	= sizeof(dev_t) + sizeof(ino_t);
 
 
-/*! \brief Returns \c false.
-	Implements BFlattenable.
-	\return \c false
-*/
+// Overrides BFlattenable::IsFixedSize()
 bool
 BPath::IsFixedSize() const
 {
@@ -520,10 +392,7 @@ BPath::IsFixedSize() const
 }
 
 
-/*! \brief Returns \c B_REF_TYPE.
-	Implements BFlattenable.
-	\return \c B_REF_TYPE
-*/
+// Overrides BFlattenable::TypeCode()
 type_code
 BPath::TypeCode() const
 {
@@ -531,11 +400,8 @@ BPath::TypeCode() const
 }
 
 
-/*!	\brief Returns the size of the flattened entry_ref structure that
-	represents the pathname.
-	Implements BFlattenable.
-	\return the size needed for flattening.
-*/
+// Gets the size of the flattened entry_ref struct that represents
+// the path in bytes.
 ssize_t
 BPath::FlattenedSize() const
 {
@@ -551,23 +417,14 @@ BPath::FlattenedSize() const
 }
 
 
-/*!	\brief Converts the object's pathname to an entry_ref and writes it into
-	buffer.
-	Implements BFlattenable.
-	\param buffer the buffer the data shall be stored in
-	\param size the size of \a buffer
-	\return
-	- \c B_OK: Everything went fine.
-	- \c B_BAD_VALUE: \c NULL buffer or the buffer is of insufficient size.
-	- other error codes.
-	\todo Reimplement for performance reasons: Don't call FlattenedSize().
-*/
+// Converts the path of the object to an entry_ref and writes it into buffer.
 status_t
 BPath::Flatten(void* buffer, ssize_t size) const
 {
 	if (buffer == NULL)
 		return B_BAD_VALUE;
 
+	// ToDo: Re-implement for performance reasons: Don't call FlattenedSize().
 	ssize_t flattenedSize = FlattenedSize();
 	if (flattenedSize < 0)
 		return flattenedSize;
@@ -597,11 +454,7 @@ BPath::Flatten(void* buffer, ssize_t size) const
 }
 
 
-/*! \brief Returns \c true if code is \c B_REF_TYPE, and false otherwise.
-	Implements BFlattenable.
-	\param code the type code in question
-	\return \c true if code is \c B_REF_TYPE, and false otherwise.
-*/
+// Checks if type code is equal to B_REF_TYPE.
 bool
 BPath::AllowsTypeCode(type_code code) const
 {
@@ -609,19 +462,8 @@ BPath::AllowsTypeCode(type_code code) const
 }
 
 
-/*!	\brief Initializes the BPath with the flattened entry_ref data that's
-	found in the supplied buffer.
-	The type code must be \c B_REF_TYPE.
-	Implements BFlattenable.
-	\param code the type code of the flattened data
-	\param buf a pointer to the flattened data
-	\param size the number of bytes contained in \a buf
-	\return
-	- \c B_OK: Everything went fine.
-	- \c B_BAD_VALUE: \c NULL buffer or the buffer doesn't contain an
-	  entry_ref.
-	- other error codes.
-*/
+// Initializes the object with the flattened entry_ref data from the passed
+// in buffer.
 status_t
 BPath::Unflatten(type_code code, const void* buffer, ssize_t size)
 {
@@ -655,14 +497,7 @@ void BPath::_WarPath2() {}
 void BPath::_WarPath3() {}
 
 
-/*!	\brief Sets the supplied path.
-	The path is copied. If \c NULL, the object's path is set to NULL as well.
-	The object's old path is deleted.
-	\param path the path to be set
-	\return
-	- \c B_OK: Everything went fine.
-	- \c B_NO_MEMORY: Insufficient memory.
-*/
+// Sets the supplied path.
 status_t
 BPath::_SetPath(const char* path)
 {
@@ -684,20 +519,7 @@ BPath::_SetPath(const char* path)
 }
 
 
-/*! \brief Checks a path to see if normalization is required.
-
-	The following items require normalization:
-		- Relative pathnames (after concatenation; e.g. "boot/ltj")
-		- The presence of "." or ".." ("/boot/ltj/../ltj/./gwar")
-		- Redundant slashes ("/boot//ltj")
-		- A trailing slash ("/boot/ltj/")
-
-	\param _error A pointer to an error variable that will be set if the input
-		is not a valid path.
-	\return
-		- \c true: \a path requires normalization
-		- \c false: \a path does not require normalization
-*/
+// Checks a path to see if normalization is required.
 bool
 BPath::_MustNormalize(const char* path, status_t* _error)
 {
@@ -773,14 +595,3 @@ BPath::_MustNormalize(const char* path, status_t* _error)
 		return false;
 	}
 }
-
-
-/*!
-	\var char *BPath::fName
-	\brief Pointer to the object's path name string.
-*/
-
-/*!
-	\var status_t BPath::fCStatus
-	\brief The object's initialization status.
-*/

src/servers/app/Desktop.cpp

@@ -1914,8 +1914,10 @@ Desktop::SetFocusWindow(Window* nextFocus)
 			// If the last window having focus is a window that cannot make it
 			// to the front, we use that as the next focus
 			Window* lastFocus = fFocusList.LastWindow();
-			if (!lastFocus->SupportsFront() && _WindowCanHaveFocus(lastFocus))
+			if (lastFocus != NULL && !lastFocus->SupportsFront()
+				&& _WindowCanHaveFocus(lastFocus)) {
 				nextFocus = lastFocus;
+			}
 		}
 	}
 

src/servers/app/Jamfile

@@ -5,6 +5,9 @@ UsePrivateHeaders app graphics input interface kernel shared storage support ;
 
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing interface local ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing interface remote ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing interface html5 ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app stackandtile ] ;
 
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app decorator ] ;
@@ -92,8 +95,8 @@ Server app_server :
 	# libraries
 	:
 	libtranslation.so libbe.so libbnetapi.so
-	libasdrawing.a $(BROKEN_64)libasremote.a $(BROKEN_64)libashtml5.a 
-	libpainter.a libagg.a $(HAIKU_FREETYPE_LIB)
+	libaslocal.a $(BROKEN_64)libasremote.a $(BROKEN_64)libashtml5.a 
+	libasdrawing.a libpainter.a libagg.a $(HAIKU_FREETYPE_LIB)
 	libstackandtile.a liblinprog.a libtextencoding.so libshared.a
 	$(TARGET_LIBSTDC++)
 

src/servers/app/ScreenManager.cpp

@@ -14,8 +14,8 @@
 #include "Screen.h"
 #include "ServerConfig.h"
 
-#include "remote/RemoteHWInterface.h"
-#include "html5/HTML5HWInterface.h"
+#include "RemoteHWInterface.h"
+#include "HTML5HWInterface.h"
 
 #include <Autolock.h>
 #include <Entry.h>

src/servers/app/drawing/Jamfile

@@ -16,8 +16,6 @@ Includes [ FGristFiles DrawingEngine.cpp ]
 	: $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
 
 StaticLibrary libasdrawing.a :
-	AccelerantBuffer.cpp
-	AccelerantHWInterface.cpp
 	BitmapBuffer.cpp
 	drawing_support.cpp
 	DrawingEngine.cpp
@@ -32,5 +30,4 @@ StaticLibrary libasdrawing.a :
 ;
 
 SubInclude HAIKU_TOP src servers app drawing Painter ;
-SubInclude HAIKU_TOP src servers app drawing remote ;
-SubInclude HAIKU_TOP src servers app drawing html5 ;
+SubInclude HAIKU_TOP src servers app drawing interface ;

src/servers/app/drawing/interface/Jamfile

@@ -0,0 +1,5 @@
+SubDir HAIKU_TOP src servers app drawing interface ;
+
+SubInclude HAIKU_TOP src servers app drawing interface html5 ;
+SubInclude HAIKU_TOP src servers app drawing interface local ;
+SubInclude HAIKU_TOP src servers app drawing interface remote ;