Merge branch 'master' into sam460ex

ReadMe.IntroductionToHaiku

@@ -58,9 +58,11 @@ This is the Haiku project's development tracker.
 http://haiku.it.su.se:8180/source
 http://grok.bikemonkey.org/source
 http://code.metager.de/source/xref/haiku
+https://github.com/search?q=repo%3Ahaiku%2Fhaiku&type=Code
 
 Graciously provided by Janne Johansson, Landon Fuller and MetaGer respectively.
 This allows you to quickly and easily search Haiku's source code.
+GitHub, while not {OpenGrok, also provides search functionality.
 
 
 Coding Guidelines

build/jam/BuildSetup

@@ -145,6 +145,12 @@ if $(HAIKU_GCC_VERSION[1]) >= 4 {
 	HAIKU_GCC_BASE_FLAGS += -Wno-array-bounds ;
 }
 
+# activating graphite optimizations
+if $(HAIKU_USE_GCC_GRAPHITE) = 1 {
+	HAIKU_GCC_BASE_FLAGS += -floop-interchange -ftree-loop-distribution
+		-floop-strip-mine -floop-block ;
+}
+
 if $(HOST_GCC_VERSION[1]) >= 3 {
 	HOST_GCC_BASE_FLAGS += -fno-strict-aliasing -fno-tree-vrp ;
 }

build/scripts/build_cross_tools_gcc4

@@ -95,8 +95,7 @@ fi
 # (which apparently doesn't work reliably on all the different host 
 # configurations and changes files which in turn appear as local changes
 # to the VCS).
-find $binutilsSourceDir -name \*.info -print0 | xargs -0 touch
+find $binutilsSourceDir $gccSourceDir -name \*.info -print0 | xargs -0 touch
-find $gccSourceDir -name \*.info -print0 | xargs -0 touch
 
 # create the object and installation directories for the cross compilation tools
 installDir=$haikuOutputDir/cross-tools
@@ -113,6 +112,22 @@ mkdir -p $installDir $objDir $binutilsObjDir $gccObjDir $stdcxxObjDir \
 	$tmpIncludeDir $tmpLibDir || exit 1
 mkdir -p $installDir/lib/gcc/$haikuMachine/$gccVersion
 
+if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
+	cloogSourceDir=$buildToolsDir/cloog
+	gmpSourceDir=$buildToolsDir/gcc/gmp
+	pplSourceDir=$buildToolsDir/ppl
+
+	pplObjDir=$objDir/ppl
+	gmpObjDir=$objDir/gmp
+	cloogObjDir=$objDir/cloog
+	mkdir -p $pplObjDir $gmpObjDir $cloogObjDir || exit 1
+	
+	gccConfigureArgs="$gccConfigureArgs --with-cloog=$installDir \
+		--enable-cloog-backend=isl --with-ppl=$installDir \
+		--disable-cloog-version-check --with-gmp=$installDir \
+		--with-host-libstdcxx=\"-lstdc++\""
+fi
+
 # force the POSIX locale, as the build (makeinfo) might choke otherwise
 export LC_ALL=POSIX
 
@@ -126,6 +141,32 @@ $MAKE $additionalMakeArgs install || exit 1
 
 export PATH=$PATH:$installDir/bin
 
+if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
+	# build gmp
+	cd $gmpObjDir
+	$gmpSourceDir/configure --prefix=$installDir \
+		--disable-shared --enable-cxx || exit 1
+	$MAKE $additionalMakeArgs || exit 1
+	$MAKE $additionalMakeArgs install || exit 1
+	
+	# build ppl
+	cd $pplObjDir
+	CFLAGS="-O2" CXXFLAGS="-O2" $pplSourceDir/configure --prefix=$installDir \
+		--disable-nls --disable-shared --disable-watchdog \
+		--disable-maintainer-mode || exit 1
+	$MAKE $additionalMakeArgs AUTOCONF:=true AUTOHEADER:=true ACLOCAL:=true \
+		AUTOMAKE:=true || exit 1
+	$MAKE $additionalMakeArgs install AUTOCONF:=true AUTOHEADER:=true \
+		ACLOCAL:=true AUTOMAKE:=true || exit 1
+
+	# build cloog
+	cd $cloogObjDir
+	CFLAGS="-O2" CXXFLAGS="-O2" $cloogSourceDir/configure \
+		--prefix=$installDir --disable-nls --disable-shared \
+		--with-gmp-prefix=$installDir || exit 1
+	$MAKE $additionalMakeArgs || exit 1
+	$MAKE $additionalMakeArgs install || exit 1
+fi
 
 # build gcc
 

configure

@@ -77,6 +77,8 @@ options:
                               as first option!]
   --use-gcc-pipe              Build with GCC option -pipe. Speeds up the build
                               process, but uses more memory.
+  --use-gcc-graphite          Build with GCC Graphite engine for loop
+                              optimizations. Only for gcc 4.
   --use-32bit                 Use -m32 flag on 64bit host gcc compiler.
   --use-xattr                 Use Linux xattr support for BeOS attribute
                               emulation. Warning: Make sure your file system
@@ -170,6 +172,13 @@ standard_gcc_settings()
 
 	HAIKU_GCC_RAW_VERSION=`$HAIKU_CC -dumpversion`
 	HAIKU_GCC_MACHINE=`$HAIKU_CC -dumpmachine`
+	if [ "$HAIKU_USE_GCC_GRAPHITE" != 0 ]; then
+		UNUSED=`echo "int main() {}" | $HAIKU_CC -xc -c -floop-block - 2>&1`
+		if [ $? != 0 ]; then
+			echo "GCC Graphite loop optimizations cannot be used"
+			HAIKU_USE_GCC_GRAPHITE=0
+		fi
+	fi
 
 	HAIKU_GCC_LIB_DIR=${gccdir}
 	HAIKU_GCC_LIBGCC=${gccdir}/libgcc.a
@@ -345,6 +354,7 @@ HAIKU_ENABLE_MULTIUSER=0
 HAIKU_DISTRO_COMPATIBILITY=default
 TARGET_PLATFORM=haiku
 HAIKU_USE_GCC_PIPE=0
+HAIKU_USE_GCC_GRAPHITE=0
 HAIKU_HOST_USE_32BIT=0
 HAIKU_HOST_USE_XATTR=0
 HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR=
@@ -459,6 +469,7 @@ while [ $# -gt 0 ] ; do
         -j*)				buildCrossToolsJobs="$1"; shift 1;;
 		--target=*)     TARGET_PLATFORM=`echo $1 | cut -d'=' -f2-`; shift 1;;
 		--use-gcc-pipe)	HAIKU_USE_GCC_PIPE=1; shift 1;;
+		--use-gcc-graphite)	HAIKU_USE_GCC_GRAPHITE=1; shift 1;;
 		--use-32bit)	HAIKU_HOST_USE_32BIT=1; shift 1;;
 		--use-xattr)	HAIKU_HOST_USE_XATTR=1; shift 1;;
 		*)				echo Invalid argument: \`$1\'; exit 1;;
@@ -519,6 +530,7 @@ mkdir -p "$buildOutputDir" || exit 1
 
 # build cross tools from sources
 if [ -n "$buildCrossTools" ]; then
+	export HAIKU_USE_GCC_GRAPHITE
 	"$buildCrossToolsScript" $buildCrossToolsMachine "$sourceDir" \
 		"$buildCrossTools" "$outputDir" $buildCrossToolsJobs || exit 1
 	crossToolsPrefix="$outputDir/cross-tools/bin/${HAIKU_GCC_MACHINE}-"
@@ -574,6 +586,7 @@ HAIKU_INCLUDE_3RDPARTY				?= "${HAIKU_INCLUDE_3RDPARTY}" ;
 HAIKU_ENABLE_MULTIUSER				?= "${HAIKU_ENABLE_MULTIUSER}" ;
 HAIKU_DISTRO_COMPATIBILITY			?= "${HAIKU_DISTRO_COMPATIBILITY}" ;
 HAIKU_USE_GCC_PIPE					?= "${HAIKU_USE_GCC_PIPE}" ;
+HAIKU_USE_GCC_GRAPHITE				?= "${HAIKU_USE_GCC_GRAPHITE}" ;
 HAIKU_HOST_USE_32BIT				?= "${HAIKU_HOST_USE_32BIT}" ;
 HAIKU_HOST_USE_XATTR				?= "${HAIKU_HOST_USE_XATTR}" ;
 HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR	?= ${HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR} ;

data/catalogs/add-ons/disk_systems/intel/fr.catkeys

@@ -1,2 +1,2 @@
-1	french	x-vnd.Haiku-IntelDiskAddOn	4191422532
+1	french	x-vnd.Haiku-IntelDiskAddOn	946918966
-Active partition	BFS_Creation_Parameter		Partition active
+Active partition	PrimaryPartitionEditor		Activer la partition

data/catalogs/add-ons/disk_systems/intel/lt.catkeys

@@ -1,2 +1,2 @@
-1	lithuanian	x-vnd.Haiku-IntelDiskAddOn	4191422532
+1	lithuanian	x-vnd.Haiku-IntelDiskAddOn	946918966
-Active partition	BFS_Creation_Parameter		Paleidimo skaidinys
+Active partition	PrimaryPartitionEditor		Aktyvus skaidinys

data/catalogs/add-ons/disk_systems/ntfs/fr.catkeys

@@ -0,0 +1,2 @@
+1	french	x-vnd.Haiku-NTFSDiskAddOn	25755486
+Name:	NTFS_Initialize_Parameter		Label :

data/catalogs/add-ons/disk_systems/ntfs/lt.catkeys

@@ -0,0 +1,2 @@
+1	lithuanian	x-vnd.Haiku-NTFSDiskAddOn	25755486
+Name:	NTFS_Initialize_Parameter		Pavadinimas:

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

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-hmulti_audio.media_addon	1552557772
+1	french	x-vnd.Haiku-hmulti_audio.media_addon	1510080944
 Master	MultiAudio		Général
 SPDIF	MultiAudio		SPDIF
 Gain	MultiAudio		Gain
@@ -9,11 +9,16 @@ Phone	MultiAudio		Téléphone
 Aux	MultiAudio		Auxiliaire
 Output bass	MultiAudio		Graves
 Headphones	MultiAudio		Casque
+Beep	MultiAudio		Bip
+Output mono mix	MultiAudio		Sortie mélangeur mono
+Output stereo mix	MultiAudio		Sortie mélangeur stéréo
 Input	MultiAudio		Entrée
 Output treble	MultiAudio		Aiguës
+Mono mix	MultiAudio		Mélangeur mono
 General	MultiAudio		Général
 Input & Output	MultiAudio		Entrée & Sortie
 Enhanced Setup	MultiAudio		Réglages fins
+Stereo mix	MultiAudio		Mélangeur stéréo
 Volume	MultiAudio		Volume
 Output	MultiAudio		Sortie
 Video	MultiAudio		Vidéo

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

@@ -0,0 +1,5 @@
+1	lithuanian	x-vnd.Haiku-hmulti_audio.media_addon	36206598
+Master	MultiAudio		Pagrindinis
+SPDIF	MultiAudio		SPDIF
+Output 3D center	MultiAudio		3D išvesties centras
+CD	MultiAudio		CD

data/catalogs/apps/activitymonitor/de.catkeys

@@ -1,8 +1,9 @@
-1	german	x-vnd.Haiku-ActivityMonitor	3704566709
+1	german	x-vnd.Haiku-ActivityMonitor	1913625522
 P-faults	DataSource		Seitenfehler
 Media nodes	DataSource		Media-Nodes
 Threads	DataSource		Threads
 MB	DataSource		MiB
+Always on top	ActivityWindow		Immer im Vordergrund
 Add graph	ActivityWindow		Graphen hinzufügen
 Teams	DataSource		Teams
 Hide legend	ActivityView		Legende ausblenden

data/catalogs/apps/activitymonitor/fi.catkeys

@@ -1,8 +1,9 @@
-1	finnish	x-vnd.Haiku-ActivityMonitor	3704566709
+1	finnish	x-vnd.Haiku-ActivityMonitor	1913625522
 P-faults	DataSource		P-viat
 Media nodes	DataSource		Mediasolmut
 Threads	DataSource		Säikeet
 MB	DataSource		Mt
+Always on top	ActivityWindow		Aina päällimmäisenä
 Add graph	ActivityWindow		Lisää kuvaaja
 Teams	DataSource		Ryhmät
 Hide legend	ActivityView		Piilota merkin selitys

data/catalogs/apps/activitymonitor/fr.catkeys

@@ -1,8 +1,9 @@
-1	french	x-vnd.Haiku-ActivityMonitor	3704566709
+1	french	x-vnd.Haiku-ActivityMonitor	1913625522
 P-faults	DataSource		P-fautes
 Media nodes	DataSource		Nœuds média
 Threads	DataSource		Tâches
 MB	DataSource		Mo
+Always on top	ActivityWindow		Toujours au-dessus
 Add graph	ActivityWindow		Ajouter un graphe
 Teams	DataSource		Processus
 Hide legend	ActivityView		Cacher la légende

data/catalogs/apps/deskbar/de.catkeys

@@ -1,15 +1,19 @@
-1	german	x-vnd.Be-TSKB	1398106986
+1	german	x-vnd.Be-TSKB	2335730970
 Power off	DeskbarMenu		Ausschalten
+Sort applications by name	PreferencesWindow		Laufende Anwendungen sortieren
 Suspend	DeskbarMenu		Ruhezustand
 Hide clock	TimeView		Uhr ausblenden
+Applications	PreferencesWindow		Anwendungen
 Time preferences…	TimeView		Datum & Zeit Einstellungen…
 About Haiku	DeskbarMenu		Über Haiku
+Edit in Tracker…	PreferencesWindow		Im Tracker bearbeiten…
 Recent documents:	PreferencesWindow		Letzte Dokumente:
 Recent applications	DeskbarMenu		Letzte Anwendungen
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		Anwendungen
 Find…	DeskbarMenu		Suchen…
 Show clock	Tray		Uhr anzeigen
 Window	PreferencesWindow		Fenster
+Defaults	PreferencesWindow		Standardwerte
 Menu	PreferencesWindow		Menü
 Recent documents	DeskbarMenu		Letzte Dokumente
 Auto-hide	PreferencesWindow		Automatisch ausblenden
@@ -27,6 +31,7 @@ Restart Tracker	DeskbarMenu		Tracker neu starten
 Close all	WindowMenu		Alle schließen
 Deskbar preferences	PreferencesWindow		Deskbar-Einstellungen
 Mount	DeskbarMenu		Einhängen
+Revert	PreferencesWindow		Anfangswerte
 Small	PreferencesWindow		Klein
 Recent applications:	PreferencesWindow		Letzte Anwendungen:
 Shutdown…	DeskbarMenu		Herunterfahren…

data/catalogs/apps/deskbar/fi.catkeys

@@ -1,16 +1,19 @@
-1	finnish	x-vnd.Be-TSKB	1042823442
+1	finnish	x-vnd.Be-TSKB	2335730970
 Power off	DeskbarMenu		Sammuta virta
+Sort applications by name	PreferencesWindow		Lajittele sovellukset nimen perusteella
 Suspend	DeskbarMenu		Keskeytystila
 Hide clock	TimeView		Piilota kello
 Applications	PreferencesWindow		Sovellukset
 Time preferences…	TimeView		Aika-asetukset...
 About Haiku	DeskbarMenu		Haikusta
+Edit in Tracker…	PreferencesWindow		Muokkaa Seuraajassa…
 Recent documents:	PreferencesWindow		Äskettäiset asiakirjat:
 Recent applications	DeskbarMenu		Äskettäiset sovellukset
 Applications	B_USER_DESKBAR_DIRECTORY/Applications		Sovellukset
 Find…	DeskbarMenu		Etsi...
 Show clock	Tray		Näytä kello
 Window	PreferencesWindow		Ikkuna
+Defaults	PreferencesWindow		Oletukset
 Menu	PreferencesWindow		Valikko
 Recent documents	DeskbarMenu		Äskettäiset asiakirjat
 Auto-hide	PreferencesWindow		Piilota automaattisesti
@@ -28,6 +31,7 @@ Restart Tracker	DeskbarMenu		Käynnistä Seuraaja uudelleen
 Close all	WindowMenu		Sulje kaikki
 Deskbar preferences	PreferencesWindow		Työpöytäpalkin asetukset
 Mount	DeskbarMenu		Liitä
+Revert	PreferencesWindow		Palauta
 Small	PreferencesWindow		Pieni
 Recent applications:	PreferencesWindow		Äskettäiset sovellukset:
 Shutdown…	DeskbarMenu		Sammuttaminen...

data/catalogs/apps/deskbar/fr.catkeys

@@ -1,5 +1,6 @@
-1	french	x-vnd.Be-TSKB	1042823442
+1	french	x-vnd.Be-TSKB	4028879882
 Power off	DeskbarMenu		Éteindre
+Sort applications by name	PreferencesWindow		Trier les applications par nom
 Suspend	DeskbarMenu		Mettre en veille
 Hide clock	TimeView		Masquer l'horloge
 Applications	PreferencesWindow		Applications

data/catalogs/apps/drivesetup/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-DriveSetup	1767229522
+1	french	x-vnd.Haiku-DriveSetup	12870063
 DriveSetup	System name		Gestionnaire de disque
 Cancel	AbstractParametersPanel		Annuler
 Delete	MainWindow		Supprimer
@@ -18,6 +18,7 @@ The selected disk is read-only.	MainWindow		Le disque choisi est en lecture seul
 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
+Change parameters	MainWindow		Modifier les paramètres
 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.
 Could not delete the selected partition.	MainWindow		Impossible de supprimer la partition sélectionnée.
@@ -36,39 +37,50 @@ 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.
 Are you sure you want to format the partition? You will be asked again before changes are written to the disk.	MainWindow		Êtes-vous sûr de vouloir formater la partition ? Une confirmation vous sera à nouveau demandée avant que les changements ne soient écrits sur le disque.
+Partition name:	ChangeParametersPanel		Label de partition :
+Change	ChangeParametersPanel		Modifier
 Are you sure you want to write the changes back to disk now?\n\nAll data on the disk %s will be irretrievably lost if you do so!	MainWindow		Êtes-vous sûr de vouloir écrire les modifications sur disque maintenant ?\n\nToutes les données du disque %s seront irrémédiablement perdues si vous le faites !
 Are you sure you want to delete the selected partition?\n\nAll data on the partition will be irretrievably lost if you do so!	MainWindow		Êtes-vous sûr de vouloir supprimer la partition sélectionnée ?\n\nToutes les données sur la partition seront définitivement perdues si vous le faites !
 Create…	MainWindow		Créer…
 Disk system \"%s\"\" not found!	MainWindow		Le disque système « %s » est introuvable !
 The disk has been successfully initialized.\n	MainWindow		Le disque a été correctement initialisée.\n
 Could not unmount partition %s.	MainWindow		Impossible de démonter la partition %s.
+Failed to change the parameters of the partition. No changes have been written to disk.	MainWindow		La modification des paramètres de la partition a échoué. Aucune modification n'a été écrite sur le disque.
 Failed to format the partition %s!\n	MainWindow		Impossible de formater la partition %s !\n
 Mount	MainWindow		Monter
 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.
+The panel experienced a problem!	MainWindow		La fenêtre a rencontré un problème !
+Change parameters…	MainWindow		Modifier les paramètres…
 Device	PartitionList		Périphérique
 Disk	MainWindow		Disque
 Are you sure you want to initialize the selected disk? All data will be lost. You will be asked again before changes are written to the disk.\n	MainWindow		Êtes-vous sûr de vouloir initialiser le disque sélectionné ? Toutes les données seront perdues. Une confirmation vous sera à nouveau demandée avant que les changements ne soient écrits sur le disque.\n
+Partition size	CreateParametersPanel		Taille de la partition
 Device	DiskView		Périphérique
 Active	PartitionList		Active
 Volume name	PartitionList		Nom de volume
 Continue	MainWindow		Continuer
 Cannot delete the selected partition.	MainWindow		La partition sélectionnée ne peut pas être supprimée.
 Mount all	MainWindow		Monter tout
+End: %s	Support		Fin : %s
 Cancel	MainWindow		Annuler
 Delete partition	MainWindow		Supprimer la partition
 Eject	MainWindow		Éjecter
 Partition	MainWindow		Partition
+Create	CreateParametersPanel		Créer
 File system	PartitionList		Système de fichiers
 Validation of the given creation parameters failed.	MainWindow		Le contrôle des paramètres de création donnés a échoué.
+Partition type:	ChangeParametersPanel		Type de la partition :
 Size	PartitionList		Taille
 Wipe (not implemented)	MainWindow		Effacer (non implémenté)
 Validation of the given initialization parameters failed.	MainWindow		Le contrôle des paramètres d'initialisation donnés a échoué.
 The selected partition does not contain a partitioning system.	MainWindow		La partition sélectionnée ne contient pas de système de partitionnement.
+Offset: %s	Support		Offset : %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		Ê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.
 Surface test (not implemented)	MainWindow		Test de surface (non implémenté)
 Format	MainWindow		Formater
+Could not change the parameters of the selected partition.	MainWindow		Impossible de modifier les paramètres de la partition sélectionnée.
 Parameters	PartitionList		Paramètres
 Creation of the partition has failed.	MainWindow		La partition n'a pas pu être créée.
 The currently selected partition is not empty.	MainWindow		La partition sélectionnée n'est pas vide.

data/catalogs/apps/drivesetup/zh_Hans.catkeys

@@ -1,11 +1,14 @@
-1	english	x-vnd.Haiku-DriveSetup	644135944
+1	english	x-vnd.Haiku-DriveSetup	1752326393
 DriveSetup	System name		磁盘管理器
+Cancel	AbstractParametersPanel		取消
 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如果执行此操作，选中分区上的所有数据将丢失，无法恢复！
 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		所选分区没有足够的空间创建子分区。
+Initialize	InitializeParametersPanel		初始化
+OK	AbstractParametersPanel		确定
 <empty>	PartitionList		<空白>
 Unable to find the selected partition by ID.	MainWindow		无法通过ID找到所选分区。
 Select a partition from the list below.	DiskView		请从以下列表选择一个分区。

data/catalogs/apps/firstbootprompt/fr.catkeys

@@ -1,5 +1,6 @@
-1	french	x-vnd.Haiku-FirstBootPrompt	988630706
+1	french	x-vnd.Haiku-FirstBootPrompt	2649051796
 Custom	BootPromptWindow		Personnalisé
+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 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
 Language	BootPromptWindow		Langue
 Welcome to Haiku!	BootPromptWindow		Bienvenue dans Haiku !

data/catalogs/apps/launchbox/fi.catkeys

@@ -1,4 +1,4 @@
-1	finnish	x-vnd.Haiku-LaunchBox	3016105370
+1	finnish	x-vnd.Haiku-LaunchBox	3692177981
 New	LaunchBox		Uusi
 Set description…	LaunchBox		Aseta kuvaus...
 Vertical layout	LaunchBox		Pystysuora sijoittelu
@@ -6,6 +6,7 @@ OK	LaunchBox		Valmis
 Pad 1	LaunchBox		Alusta 1
 last chance	LaunchBox		viimeinen mahdollisuus
 Quit	LaunchBox		Poistu
+Open containing folder	LaunchBox		Avaa sisältyvä kansio
 Clear button	LaunchBox		Nollaa painike
 LaunchBox	System name		Käynnistysikkuna
 Ignore double-click	LaunchBox		Ohita kaksoisnapsautukset

data/catalogs/apps/launchbox/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-LaunchBox	3016105370
+1	french	x-vnd.Haiku-LaunchBox	3692177981
 New	LaunchBox		Nouveau
 Set description…	LaunchBox		Ajouter une description…
 Vertical layout	LaunchBox		Disposition verticale
@@ -6,6 +6,7 @@ OK	LaunchBox		OK
 Pad 1	LaunchBox		Pavé 1
 last chance	LaunchBox		dernière chance
 Quit	LaunchBox		Quitter
+Open containing folder	LaunchBox		Ouvrir le dossier hôte
 Clear button	LaunchBox		Vider le bouton
 LaunchBox	System name		Lanceur rapide
 Ignore double-click	LaunchBox		Ignorer le double click

data/catalogs/apps/terminal/de.catkeys

@@ -1,4 +1,4 @@
-1	german	x-vnd.Haiku-Terminal	2645209895
+1	german	x-vnd.Haiku-Terminal	2967760334
 Not found.	Terminal TermWindow		Nicht gefunden.
 Switch Terminals	Terminal TermWindow		Terminals wechseln
 Change directory	Terminal TermView		Zum Ordner wechseln
@@ -62,7 +62,6 @@ Text not found.	Terminal TermWindow		Der Suchbegriff wurde nicht gefunden.
 Find…	Terminal TermWindow		Suchen...
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Der Prozess \"%1\" läuft noch.\nWird das Terminal geschlossen, wird auch dieser Prozess abgebrochen.
 Move here	Terminal TermView		Hierher verschieben
-\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%T\t-\tThe Terminal application name for the current locale.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\tArbeitsverzeichnis des gerade im aktuellen Reiter\n\t\t\tlaufenden Prozesses. Optional kann auch die maximale\n\t\t\tAnzahl der Pfadkomponenten angegeben werden.\n\t\t\tZum Beispiel: '%2d' für maximal zwei Komponenten.\n\t%T\t-\tName der Terminalanwendung in der aktuellen Systemsprache\n\t%i\t-\tLaufende Nummer des Fensters\n\t%p\t-\tName des laufenden Prozesses im aktuellen Reiter\n\t%t\t-\tTitel des aktuellen Reiters\n\t%%\t-\tDas Zeichen '%'
 Retro	Terminal colors scheme		Retro
 Error!	Terminal getString		Fehler!
 New tab	Terminal TermWindow		Neuer Reiter
@@ -80,6 +79,7 @@ Clear all	Terminal TermWindow		Bildschirm leeren
 Text encoding	Terminal TermWindow		Kodierung
 size	Terminal TermView		Größe
 Close window	Terminal TermWindow		Fenster schließen
+\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%T\t-\tThe Terminal application name for the current locale.\n\t%e\t-\tThe encoding of the current tab. Not shown for UTF-8.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\tArbeitsverzeichnis des gerade im aktuellen Reiter\n\t\t\tlaufenden Prozesses. Optional kann auch die maximale\n\t\t\tAnzahl der Pfadkomponenten angegeben werden.\n\t\t\tZum Beispiel: '%2d' für maximal zwei Komponenten.\n\t%T\t-\tName der Terminalanwendung in der aktuellen Systemsprache\n\t%T\t-\tKodierung des aktuellen Reiters. Unterdrückt bei UTF-8\n\t%i\t-\tLaufende Nummer des Fensters\n\t%p\t-\tName des laufenden Prozesses im aktuellen Reiter\n\t%t\t-\tTitel des aktuellen Reiters\n\t%%\t-\tDas Zeichen '%'
 Save as default	Terminal TermWindow		Als Standard speichern
 Set tab title	Terminal TermWindow		Reiter umbenennen
 Settings…	Terminal TermWindow		Einstellungen...

data/catalogs/apps/terminal/fi.catkeys

@@ -1,4 +1,4 @@
-1	finnish	x-vnd.Haiku-Terminal	2645209895
+1	finnish	x-vnd.Haiku-Terminal	2967760334
 Not found.	Terminal TermWindow		Ei löytynyt.
 Switch Terminals	Terminal TermWindow		Vaihda pääteikkunoita
 Change directory	Terminal TermView		Vaihda hakemistoa
@@ -62,7 +62,6 @@ Text not found.	Terminal TermWindow		Tekstiä ei löydy.
 Find…	Terminal TermWindow		Etsi...
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Prosessia ”%1” suoritetaan yhä.\nJos suljet Pääteikkunan, prosessi tapetaan.
 Move here	Terminal TermView		Siirrä tänne
-\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%T\t-\tThe Terminal application name for the current locale.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\tAktiivin prosessin nykyinen työhakemisto on nykyisessä\n\t\t\tvälilehdessä. Valinnaisesti voidaan määritellä polkukomponenttien\n\t\t\tenimmäismäärä. Esim.: '%2d' vähintään kahdelle komponentille.\n\t%T\t-\tPääteikkunan nimi nykyisillä paikallisasetuksilla.\n\t%i\t-\tIkkunaindeksi.\n\t%p\t-\tAktiivin prosessin nimi nykyisessä välilehdessä.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tMerkki '%'.
 Retro	Terminal colors scheme		Retro
 Error!	Terminal getString		Virhe!
 New tab	Terminal TermWindow		Uusi välilehti
@@ -80,6 +79,7 @@ Clear all	Terminal TermWindow		Tyhjennä kaikki
 Text encoding	Terminal TermWindow		Tekstikoodaus
 size	Terminal TermView		koko
 Close window	Terminal TermWindow		Sulje ikkuna
+\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%T\t-\tThe Terminal application name for the current locale.\n\t%e\t-\tThe encoding of the current tab. Not shown for UTF-8.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\tAktiivin prosessin työhakemisto nykyisessä\n\t\t\tvälilehdessä. Valinnaisesti voidaan määritellä polkukompo-\n\t\t\tnenttien enimmäismäärä. Esim.: '%2d' useimmille kahdelle komponentille.\n\t%T\t-\tPääteikkunasovelluksen nimi nykyiselle paikallisasetukselle.\n\t%e\t-\tNykyisen välilehden koodaus. Ei näytetä, jos koodaus on UTF-8.\n\t%i\t-\tIkkunan indeksi.\n\t%p\t-\tAktiivin prosessin nimi nykyisessä välilehdessä.\n\t%t\t-\tNykyisen välilehden otsikko.\n\t%%\t-\tKirjain '%'.
 Save as default	Terminal TermWindow		Tallenna oletuksena
 Set tab title	Terminal TermWindow		Aseta välilehtiotsikko
 Settings…	Terminal TermWindow		Asetukset...

data/catalogs/apps/terminal/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-Terminal	766764238
+1	french	x-vnd.Haiku-Terminal	328707356
 Not found.	Terminal TermWindow		Non trouvé.
 Switch Terminals	Terminal TermWindow		Inverser les Terminaux
 Change directory	Terminal TermView		Changer de répertoire
@@ -21,6 +21,7 @@ Font:	Terminal AppearancePrefView		Police :
 Copy here	Terminal TermView		Copier ici
 Really close?	Terminal TermWindow		Êtes-vous sûr de vouloir fermer ?
 Copy	Terminal TermWindow		Copier
+Terminal	Terminal TermWindow	The title for the main window menubar entry related to terminal sessions	Terminal
 Color scheme:	Terminal AppearancePrefView		Profil de couleurs :
 Window title:	Terminal TermWindow		Titre de la fenêtre :
 Unrecognized option \"%s\"\n	Terminal arguments parsing		Option « %s » non reconnue\n

data/catalogs/apps/terminal/hu.catkeys

@@ -1,4 +1,4 @@
-1	hungarian	x-vnd.Haiku-Terminal	2645209895
+1	hungarian	x-vnd.Haiku-Terminal	2967760334
 Not found.	Terminal TermWindow		Nem található.
 Switch Terminals	Terminal TermWindow		Terminálok közti váltás
 Change directory	Terminal TermView		Mappa váltása
@@ -62,7 +62,6 @@ Text not found.	Terminal TermWindow		Nem található a szöveg.
 Find…	Terminal TermWindow		Keresés…
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		A folyamat (%1) még fut.\nHa bezárja a Terminált, a folyamat megszakad.
 Move here	Terminal TermView		Mozgatás
-\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%T\t-\tThe Terminal application name for the current locale.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\tAz aktuális fülön belül épp futó folyamat munka-mappája.\n\t\t\tTovábbá az útvonal elemeinek a maximális száma is megadható.\n\t\t\tPéldául '%2d' maximum 2 elem megjelenítéséhez.\n\t%T\t-\tA Terminál program neve az aktuális nyelven.\n\t%i\t-\tAz ablak sorszáma.\n\t%p\t-\tA fülön futtatott folyamat neve.\n\t%t\t-\tAz aktuális fül címe.\n\t%%\t-\t'%' karakter.
 Retro	Terminal colors scheme		Retro
 Error!	Terminal getString		Hiba!
 New tab	Terminal TermWindow		Új lap
@@ -80,6 +79,7 @@ Clear all	Terminal TermWindow		Összes törlése
 Text encoding	Terminal TermWindow		Szöveg kódolása
 size	Terminal TermView		méret
 Close window	Terminal TermWindow		Ablak bezárása
+\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%T\t-\tThe Terminal application name for the current locale.\n\t%e\t-\tThe encoding of the current tab. Not shown for UTF-8.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t %d\t -\t A jelenlegi mappa az aktuális fülön.\n\t \t \t Kiegészítésként a maximálisan megjelenő mappá száma\n\t \t \t is megadható. Például '%2d' a legutóbbi 2 részre.\n\t %T\t -\t A Terminál program neve az aktuális nyelven.\n\t %e\t -\t Az aktuális fül kódolása. UTF-8 esetében nem jelenik meg.\n\t %i\t -\t Az ablak sorszáma.\n\t %p\t -\t Az aktív parancs neve az aktuális fülön.\n\t %t\t -\t Aktuális fül címe.\n\t %%\t -\t '%' karakter.
 Save as default	Terminal TermWindow		Mentés alapértelmezettként
 Set tab title	Terminal TermWindow		Lap címének beállítása
 Settings…	Terminal TermWindow		Beállítások…

data/catalogs/apps/terminal/ja.catkeys

@@ -1,4 +1,4 @@
-1	japanese	x-vnd.Haiku-Terminal	2645209895
+1	japanese	x-vnd.Haiku-Terminal	2967760334
 Not found.	Terminal TermWindow		これ以上見つかりません。
 Switch Terminals	Terminal TermWindow		ターミナルを切替える
 Change directory	Terminal TermView		ディレクトリを変更
@@ -62,7 +62,6 @@ Text not found.	Terminal TermWindow		検索テキストが見つかりません
 Find…	Terminal TermWindow		検索…
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		プロセス \"%1\" がまだ実行中です。\nTerminalを閉じると強制終了されます。
 Move here	Terminal TermView		カレントディレクトリへ移動
-\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%T\t-\tThe Terminal application name for the current locale.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\t動作中のプロセスのカレントワーキングディレクトリを\n\t\t\t現在のタブに表示します。オプションでパス要素の最大値を\n\t\t\t指定できます。例. '%2d' は最大2要素です。\n\t%T\t-\t現在のロケールでの Terminal アプリケーションの名前\n\t%i\t-\tウィンドウのインデックス\n\t%p\t-\t動作中のプロセス名を現在のタブに表示\n\t%t\t-\t現在のタブのタイトル\n\t%%\t-\t文字 '%'
 Retro	Terminal colors scheme		レトロ
 Error!	Terminal getString		エラー!
 New tab	Terminal TermWindow		新しいタブ
@@ -80,6 +79,7 @@ Clear all	Terminal TermWindow		すべて消去
 Text encoding	Terminal TermWindow		テキストエンコーディング
 size	Terminal TermView		サイズ
 Close window	Terminal TermWindow		ウィンドウを閉じる
+\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%T\t-\tThe Terminal application name for the current locale.\n\t%e\t-\tThe encoding of the current tab. Not shown for UTF-8.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\tタブ内で動作中のプロセスの作業中のフォルダー\n\t\t\tオプションでパスの最大要素を指定できます。\n\t\t\t例. '%2d' は2 つの要素を示します。\n\t%T\t-\t現在のロケールでの Terminal アプリケーション名\n\t%e\t-\tタブのエンコーディング。UTF-8 の場合は表示されません。\n\t%i\t-\tウィンドウのインデックス\n\t%p\t-\tタブ内で実行中のプロセス名\n\t%t\t-\tタブのタイトル.\n\t%%\t-\t文字 '%'
 Save as default	Terminal TermWindow		デフォルトとして保存
 Set tab title	Terminal TermWindow		タブのタイトルを設定
 Settings…	Terminal TermWindow		設定…

data/catalogs/apps/terminal/pl.catkeys

@@ -1,4 +1,4 @@
-1	polish	x-vnd.Haiku-Terminal	2645209895
+1	polish	x-vnd.Haiku-Terminal	328707356
 Not found.	Terminal TermWindow		Nie znaleziono.
 Switch Terminals	Terminal TermWindow		Przełącz Terminal
 Change directory	Terminal TermView		Zmień folder
@@ -62,7 +62,6 @@ Text not found.	Terminal TermWindow		Tekst nie znaleziony.
 Find…	Terminal TermWindow		Znajdź…
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Proces \"%1\" jest wciąż w użyciu.\nJeśli zamkniesz terminal, proces zostanie zatrzymany.
 Move here	Terminal TermView		Przenieś tutaj
-\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%T\t-\tThe Terminal application name for the current locale.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\tBieżący katalog roboczy dla aktywnego procesu w danej\n\t\t\tzakładce. Opcjonalnie maksymalna liczba elementów ścieżki\n\t\t\tjaka ma być określona. Np. '%2d' dla co najwyżej dwóch elementów.\n\t%T\t-\tNazwa programu Terminala dla obecnych ustawień localizacyjnych (locale).\n\t%i\t-\tLiczba porządkowa okna (index).\n\t%p\t-\tNazwa aktywnego okna w bieżącej zakładce.\n\t%t\t-\tTytuł bieżącej zakładki.\n\t%%\t-\tZnak '%'.
 Retro	Terminal colors scheme		Retro
 Error!	Terminal getString		Błąd!
 New tab	Terminal TermWindow		Nowa karta

data/catalogs/apps/terminal/pt_BR.catkeys

@@ -1,4 +1,4 @@
-1	portuguese (brazil)	x-vnd.Haiku-Terminal	2645209895
+1	portuguese (brazil)	x-vnd.Haiku-Terminal	328707356
 Not found.	Terminal TermWindow		Não localizado.
 Switch Terminals	Terminal TermWindow		Alternar Terminais
 Change directory	Terminal TermView		Mudar de pasta
@@ -62,7 +62,6 @@ Text not found.	Terminal TermWindow		Texto não encontrado.
 Find…	Terminal TermWindow		Localizar…
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		O processo \"%1\" ainda está executando.\nSe fechar o Terminal, o processo será morto.
 Move here	Terminal TermView		Mover aqui
-\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%T\t-\tThe Terminal application name for the current locale.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t %d\t -\t O diretório de trabalho atual do processo ativo na\n\t \t\t aba atual. Opcionalmente o número máximo de componentes do caminho\n\t \t\t pode ser especificado. Por exemplo, '%2d' para no máximo dois componentes.\n\t %T\t -\t O nome do aplicativo Terminal para a localidade atual.\n\t %i\t -\t O índice da janela.\n\t %p\t -\t O nome do processo ativo na guia atual.\n\t %t\t -\t O título da guia atual.\n\t %%\t -\t O caractere '%'.
 Retro	Terminal colors scheme		Retrô
 Error!	Terminal getString		Erro!
 New tab	Terminal TermWindow		Nova aba

data/catalogs/apps/terminal/ru.catkeys

@@ -1,4 +1,4 @@
-1	russian	x-vnd.Haiku-Terminal	2645209895
+1	russian	x-vnd.Haiku-Terminal	328707356
 Not found.	Terminal TermWindow		Текст не найден
 Switch Terminals	Terminal TermWindow		Переключить терминалы
 Change directory	Terminal TermView		Сменить каталог
@@ -62,7 +62,6 @@ Text not found.	Terminal TermWindow		Текст не найден
 Find…	Terminal TermWindow		Найти…
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Процесс \"%1\" все еще работает.\nЕсли вы закроете Терминал, то этот процесс будет уничтожен.
 Move here	Terminal TermView		Переместить сюда
-\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%T\t-\tThe Terminal application name for the current locale.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\tТекущая директория активного процесса текущей вкладки.\n\t\t\tОпционально можно указать максимальное число отображаемых компонентов пути.\n\t\t\tНапример '%2d' отобразит последние 2 компонента.\n\t%T\t-\tИмя приложения Терминал для текущей локали.\n\t%i\t-\tНомер окна.\n\t%p\t-\tНазвание активного процесса в текущей вкладке.\n\t%t\t-\tЗаголовок текущей вкладки.\n\t%%\t-\tСимвол процента - '%'.
 Retro	Terminal colors scheme		Ретро
 Error!	Terminal getString		Ошибка!
 New tab	Terminal TermWindow		Новая вкладка

data/catalogs/apps/terminal/sv.catkeys

@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Haiku-Terminal	2645209895
+1	swedish	x-vnd.Haiku-Terminal	328707356
 Not found.	Terminal TermWindow		Hittades ej.
 Switch Terminals	Terminal TermWindow		Växla terminal
 Change directory	Terminal TermView		Byt katalog
@@ -62,7 +62,6 @@ Text not found.	Terminal TermWindow		Text hittades inte.
 Find…	Terminal TermWindow		Sök...
 The process \"%1\" is still running.\nIf you close the Terminal, the process will be killed.	Terminal TermWindow		Processen \"%1\" körs fortfarande.\nOm du stänger Terminalen kommer processen att termineras.
 Move here	Terminal TermView		Flytta hit
-\t%d\t-\tThe current working directory of the active process in the\n\t\t\tcurrent tab. Optionally the maximum number of path components\n\t\t\tcan be specified. E.g. '%2d' for at most two components.\n\t%T\t-\tThe Terminal application name for the current locale.\n\t%i\t-\tThe index of the window.\n\t%p\t-\tThe name of the active process in the current tab.\n\t%t\t-\tThe title of the current tab.\n\t%%\t-\tThe character '%'.	Terminal ToolTips		\t%d\t-\t Arbetskatalogen till den aktiva processen på den valda tabben\n\t\t\t eller de maximala antal sökvägs komponenter kan bli specificerade.\n\t\t\t E.g. '%2d' för att ange två komponenter.\n\t%T\t-\tTerminal applikationsnamnet för denna översättning.\n\t%i\t-\t Indexet för detta fönster.\n\t%p\t-\tNamnet på den aktiva processen io den valda tabben.\n\t%t\t-\tNamnet på den valda tabben.\n\t%%\t-\t Tecknet '%'.
 Retro	Terminal colors scheme		Retro
 Error!	Terminal getString		Fel!
 New tab	Terminal TermWindow		Ny flik

data/catalogs/apps/terminal/zh_Hans.catkeys

@@ -1,4 +1,4 @@
-1	english	x-vnd.Haiku-Terminal	766764238
+1	english	x-vnd.Haiku-Terminal	328707356
 Not found.	Terminal TermWindow		未找到。  
 Switch Terminals	Terminal TermWindow		切换终端
 Change directory	Terminal TermView		更改目录
@@ -21,6 +21,7 @@ Font:	Terminal AppearancePrefView		字体：
 Copy here	Terminal TermView		复制到此  
 Really close?	Terminal TermWindow		确定关闭吗？
 Copy	Terminal TermWindow		复制
+Terminal	Terminal TermWindow	The title for the main window menubar entry related to terminal sessions	终端
 Color scheme:	Terminal AppearancePrefView		色彩模式：
 Window title:	Terminal TermWindow		窗口标题：
 Unrecognized option \"%s\"\n	Terminal arguments parsing		无法识别的选项\"%s\"\n

data/catalogs/apps/webpositive/fi.catkeys

@@ -1,4 +1,4 @@
-1	finnish	x-vnd.Haiku-WebPositive	233049275
+1	finnish	x-vnd.Haiku-WebPositive	3577331897
 Show home button	Settings Window		Näytä aloitussivupainike
 Username:	Authentication Panel		Käyttäjätunnus:
 Copy URL to clipboard	Download Window		Kopioi verkko-osoite leikepöydälle
@@ -16,6 +16,7 @@ Start page:	Settings Window		Aloitussivu:
 History	WebPositive Window		Historia
 Error opening downloads folder	Download Window		Virhe avattaessa latauskansiota
 Paste	WebPositive Window		Liitä
+Proxy username:	Settings Window		Välityspalvelimen käyttäjätunnus:
 Settings	Settings Window		Asetukset
 %seconds seconds left	Download Window		%seconds sekuntia jäljellä
 Confirmation	WebPositive Window		Vahvistus
@@ -41,6 +42,7 @@ Quit	WebPositive Window		Lopeta
 Full screen	WebPositive Window		Koko näyttö
 Open download error	Download Window		Avaa latausvirhe
 Standard font:	Settings Window		Vakiokirjasin:
+Find previous occurrence of search terms	WebPositive Window	find bar previous button tooltip	Etsi haettavien merkkijonojen edellinen esiintymä
 Restart	Download Window		Käynnistä uudelleen
 Proxy server	Settings Window		Välityspalvelin
 Open containing folder	Download Window		Avaa kansio, josta tiedosto löytyy
@@ -58,6 +60,7 @@ Cut	WebPositive Window		Leikkaa
 Bookmark this page	WebPositive Window		Merkitse tämä sivu kirjanmerkillä
 There was an error trying to show the Bookmarks folder.\n\nError: %error	WebPositive Window	Don't translate variable %error	Virhe yritettäessä näyttää kirjanmerkkikansiota.\n\nVirhe: %error
 Open downloads folder	Download Window		Avaa latauskansio
+Proxy password:	Settings Window		Välityspalvelimen salasana:
 Number of days to keep links in History menu:	Settings Window		Kuinka monta päivää linkit pidetään historiavalikossa:
 Hide	Download Window		Piilota
 Reset size	WebPositive Window		Nollaa koko
@@ -67,6 +70,7 @@ There was an error retrieving the bookmark folder.\n\nError: %error	WebPositive
 Over 1 day left	Download Window		Yli 1 päivää jäljellä
 Downloads	WebPositive Window		Lataukset
 Requesting %url	WebPositive Window		Pyydetään %url
+Find next occurrence of search terms	WebPositive Window	find bar next button tooltip	Etsi haettavien merkkijonojen seuraava esiintymä
 Apply	Settings Window		Käytä
 Bookmark info	WebPositive Window		Kirjanmerkkitiedot
 Size:	Font Selection view		Koko:
@@ -80,6 +84,7 @@ Open blank page	Settings Window		Avaa tyhjä sivu
 New tabs:	Settings Window		Uudet välilehdet:
 Cancel	WebPositive Window		Peru
 Open all	WebPositive Window		Avaa kaikki
+Proxy server requires authentication	Settings Window		Välityspalvelin vaatii tunnistautumista
 Clear	URL Bar		Tyhjennä
 Cut	URL Bar		Leikkaa
 Clear	WebPositive Window		Tyhjennä

data/catalogs/apps/webpositive/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-WebPositive	233049275
+1	french	x-vnd.Haiku-WebPositive	3577331897
 Show home button	Settings Window		Afficher le bouton de la page d'accueil
 Username:	Authentication Panel		Utilisateur :
 Copy URL to clipboard	Download Window		Copier l'URL dans le presse-papiers
@@ -16,6 +16,7 @@ Start page:	Settings Window		Page de départ :
 History	WebPositive Window		Historique
 Error opening downloads folder	Download Window		Impossible d'ouvrir le dossier de téléchargement
 Paste	WebPositive Window		Coller
+Proxy username:	Settings Window		Nom d'utilisateur du serveur mandataire :
 Settings	Settings Window		Réglages
 %seconds seconds left	Download Window		%seconds secondes restantes
 Confirmation	WebPositive Window		Confirmation
@@ -41,6 +42,7 @@ Quit	WebPositive Window		Quitter
 Full screen	WebPositive Window		Plein écran
 Open download error	Download Window		Erreur à l'ouverture du téléchargement
 Standard font:	Settings Window		Police standard :
+Find previous occurrence of search terms	WebPositive Window	find bar previous button tooltip	Rechercher la précédente occurrence de la chaîne
 Restart	Download Window		Recommencer
 Proxy server	Settings Window		Serveur mandataire
 Open containing folder	Download Window		Ouvrir le dossier contenant le fichier
@@ -58,6 +60,7 @@ Cut	WebPositive Window		Couper
 Bookmark this page	WebPositive Window		Poser un signet sur cette page
 There was an error trying to show the Bookmarks folder.\n\nError: %error	WebPositive Window	Don't translate variable %error	Une erreur est survenue essayant d'afficher le dossier des signets.\n\nErreur : %error
 Open downloads folder	Download Window		Ouvrir le dossier des téléchargements
+Proxy password:	Settings Window		Mot de passe du serveur mandataire :
 Number of days to keep links in History menu:	Settings Window		Nombre de jours de conservation de l'historique :
 Hide	Download Window		Cacher
 Reset size	WebPositive Window		Réinitialiser la taille
@@ -67,6 +70,7 @@ There was an error retrieving the bookmark folder.\n\nError: %error	WebPositive
 Over 1 day left	Download Window		Plus d'un jour restant
 Downloads	WebPositive Window		Téléchargements
 Requesting %url	WebPositive Window		Requête de %url
+Find next occurrence of search terms	WebPositive Window	find bar next button tooltip	Rechercher la prochaine occurrence de la chaîne
 Apply	Settings Window		Appliquer
 Bookmark info	WebPositive Window		Informations sur le signet
 Size:	Font Selection view		Taille :
@@ -80,6 +84,7 @@ Open blank page	Settings Window		Ouvrir une page blanche
 New tabs:	Settings Window		Nouvel onglet :
 Cancel	WebPositive Window		Annuler
 Open all	WebPositive Window		Tout ouvrir
+Proxy server requires authentication	Settings Window		Le serveur mandataire requiert une authentification
 Clear	URL Bar		Vider
 Cut	URL Bar		Couper
 Clear	WebPositive Window		Vider

data/catalogs/apps/webpositive/ru.catkeys

@@ -11,7 +11,7 @@ Open location	WebPositive Window		Открыть адрес
 Clear history	WebPositive Window		Очистить историю
 WebPositive	System name		WebPositive
 Yesterday	WebPositive Window		Вчера
-Default standard font size:	Settings Window		Размер стандартного шрифта по умолчанию:
+Default standard font size:	Settings Window		Размер стандартного шрифта:
 Start page:	Settings Window		Начальная страница:
 History	WebPositive Window		История
 Error opening downloads folder	Download Window		Ошибка открытия каталога загрузок

data/catalogs/apps/webpositive/zh_Hans.catkeys

@@ -1,4 +1,4 @@
-1	english	x-vnd.Haiku-WebPositive	233049275
+1	english	x-vnd.Haiku-WebPositive	2633177086
 Show home button	Settings Window		显示 home 按钮
 Username:	Authentication Panel		用户名：
 Copy URL to clipboard	Download Window		复制 URL 到剪贴板
@@ -16,6 +16,7 @@ Start page:	Settings Window		开始页面：
 History	WebPositive Window		历史
 Error opening downloads folder	Download Window		打开下载目录出错
 Paste	WebPositive Window		粘贴
+Proxy username:	Settings Window		代理服务器 用户名：
 Settings	Settings Window		设置
 %seconds seconds left	Download Window		剩余 %seconds 秒
 Confirmation	WebPositive Window		确认
@@ -58,6 +59,7 @@ Cut	WebPositive Window		剪切
 Bookmark this page	WebPositive Window		添为书签页
 There was an error trying to show the Bookmarks folder.\n\nError: %error	WebPositive Window	Don't translate variable %error	书签页目录显示出错。\n\n错误：%error
 Open downloads folder	Download Window		打开下载目录
+Proxy password:	Settings Window		代理服务器密码：
 Number of days to keep links in History menu:	Settings Window		历史菜单链接保留天数：
 Hide	Download Window		隐藏
 Reset size	WebPositive Window		重设大小
@@ -67,6 +69,7 @@ There was an error retrieving the bookmark folder.\n\nError: %error	WebPositive
 Over 1 day left	Download Window		剩余 1 天
 Downloads	WebPositive Window		下载
 Requesting %url	WebPositive Window		请求 %url
+Find next occurrence of search terms	WebPositive Window	find bar next button tooltip	查找搜索项出现的下个位置
 Apply	Settings Window		应用
 Bookmark info	WebPositive Window		书签信息
 Size:	Font Selection view		大小：
@@ -80,6 +83,7 @@ Open blank page	Settings Window		打开空白页
 New tabs:	Settings Window		新建标签页：
 Cancel	WebPositive Window		取消
 Open all	WebPositive Window		打开所有
+Proxy server requires authentication	Settings Window		代理服务器需要认证
 Clear	URL Bar		清除
 Cut	URL Bar		剪切
 Clear	WebPositive Window		清除

data/catalogs/kits/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-libbe	1916257017
+1	french	x-vnd.Haiku-libbe	672385853
 gamma	AboutWindow		gamma
 beta	AboutWindow		bêta
 %3.2f GiB	StringForSize		%3.2f Gio
@@ -37,4 +37,5 @@ About %app…	Dragger		À propos de %app…
 development	AboutWindow		développement
 Error	ZombieReplicantView		Erreur
 Blue:	ColorControl		Bleu :
+gold master	AboutWindow		finale
 Can't delete this replicant from its original application. Life goes on.	Dragger		Impossible de supprimer ce réplicant à partir de son application d'origine. La vie continue.

data/catalogs/kits/tracker/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-libtracker	3375521561
+1	french	x-vnd.Haiku-libtracker	4167158175
 common	B_COMMON_DIRECTORY		commun
 OK	WidgetAttributeText		OK
 Icon view	VolumeWindow		Vue en icônes
@@ -74,6 +74,7 @@ Arrange by	ContainerWindow		Trier par
 Mount server error	AutoMounterSettings		Erreur du serveur de montage
 Search	FindPanel		Chercher
 Preparing to empty Trash…	StatusWindow		Préparation au vidage de la Corbeille…
+You cannot put the selected item(s) into the trash.	FSUtils		Vous ne pouvez pas déplacer l(es) élément(s) sélectionné(s) vers la corbeille.
 Disks	Model		Disques
 Create link	ContainerWindow		Créer un lien
 develop	B_COMMON_DEVELOP_DIRECTORY		développement

data/catalogs/preferences/appearance/de.catkeys

@@ -1,4 +1,4 @@
-1	german	x-vnd.Haiku-Appearance	76206318
+1	german	x-vnd.Haiku-Appearance	2993758435
 Plain font:	Font view		Normal:
 Control highlight	Colors tab		Steuerelement - Ausgewählt
 Control border	Colors tab		Steuerelement - Rahmen
@@ -9,12 +9,14 @@ Defaults	APRWindow		Standardwerte
 Grayscale	AntialiasingSettingsView		Graustufen
 Shine	Colors tab		Glanz
 About	DecorSettingsView		Über
+About decorator	DecorSettingsView		Dekorator Info
 Off	AntialiasingSettingsView		Aus
 Choose Decorator	DecorSettingsView		Dekorator wählen
 Success	Colors tab		Erfolg
 Inactive window tab text	Colors tab		Reiter - Text (inaktiv)
 Failure	Colors tab		Fehler
 Hinting menu	AntialiasingSettingsView		Hinting-Menü
+Scroll bar:	DecorSettingsView		Scroll-Leiste:
 Document background	Colors tab		Dokument - Hintergrund
 Revert	APRWindow		Anfangswerte
 Window tab	Colors tab		Reiter
@@ -34,6 +36,7 @@ List background	Colors tab		Liste - Hintergrund
 OK	DecorSettingsView		OK
 Control mark	Colors tab		Steuerelement - Markierung
 Size:	Font Selection view		Größe:
+Decorator:	DecorSettingsView		Dekorator:
 Selected list item background	Colors tab		Liste - Hintergrund (ausgewählt)
 Panel background	Colors tab		Oberfläche - Hintergrund
 Menu font:	Font view		Menü:
@@ -44,6 +47,7 @@ List item text	Colors tab		Liste - Text
 Appearance	System name		Erscheinungsbild
 Fixed font:	Font view		Feste Breite:
 The quick brown fox jumps over the lazy dog.	Font Selection view	Don't translate this literally ! Use a phrase showing all chars from A to Z.	Franz jagt im total verwahrlosten Taxi quer durch Bayern.
+%decorName\n\nAuthors:\n\t%decorAuthors\n\nURL: %decorURL\nLicense: %decorLic\n\n%decorDesc\n	DecorSettingsView		%decorName\n\nAutoren:\n\t%decorAuthors\n\nURL: %decorURL\nLizens: %decorLic\n\n%decorDesc\n
 Reduce colored edges filter strength:	AntialiasingSettingsView		Farbsaumfilter:
 Subpixel based anti-aliasing in combination with glyph hinting is not available in this build of Haiku to avoid possible patent issues. To enable this feature, you have to build Haiku yourself and enable certain options in the libfreetype configuration header.	AntialiasingSettingsView		Zur Vermeidung von möglichen Patentproblemen ist die Kombination von Subpixel-Kantenglättung und Glyph-Hinting deaktiviert. Um diese Funktion zu aktivieren, müssen spezielle Optionen im Konfigurationsheader der Freetype-Bibliothek freigeschaltet und anschließend Haiku neu kompiliert werden.
 Control text	Colors tab		Steuerelement - Text

data/catalogs/preferences/appearance/fi.catkeys

@@ -1,4 +1,4 @@
-1	finnish	x-vnd.Haiku-Appearance	76206318
+1	finnish	x-vnd.Haiku-Appearance	2993758435
 Plain font:	Font view		Pelkkä kirjasin:
 Control highlight	Colors tab		Kontrollin korostus
 Control border	Colors tab		Kontrollin reuna
@@ -9,12 +9,14 @@ Defaults	APRWindow		Oletusasetukset
 Grayscale	AntialiasingSettingsView		Harmaasävy
 Shine	Colors tab		Hohto
 About	DecorSettingsView		Ohjelmasta
+About decorator	DecorSettingsView		Koristeluohjelmasta
 Off	AntialiasingSettingsView		Pois päältä
 Choose Decorator	DecorSettingsView		Valitse koristelu
 Success	Colors tab		Onnistuminen
 Inactive window tab text	Colors tab		Epäaktiivisen ikkunavälilehden tekstin väri
 Failure	Colors tab		Epäonnistuminen
 Hinting menu	AntialiasingSettingsView		Vinkkausvalikko
+Scroll bar:	DecorSettingsView		Vierityspalkki:
 Document background	Colors tab		Dokumentin tausta
 Revert	APRWindow		Palauta
 Window tab	Colors tab		Ikkunan välilehti
@@ -34,6 +36,7 @@ List background	Colors tab		Luettelotausta
 OK	DecorSettingsView		Valmis
 Control mark	Colors tab		Ohjausmerkki
 Size:	Font Selection view		Koko:
+Decorator:	DecorSettingsView		Koristelija:
 Selected list item background	Colors tab		Valitun luettelorivin tausta
 Panel background	Colors tab		Paneelin tausta
 Menu font:	Font view		Valikkokirjasin:
@@ -44,6 +47,7 @@ List item text	Colors tab		Luettelorivin teksti
 Appearance	System name		Ulkoasuasetukset
 Fixed font:	Font view		Tasalevyinen kirjasin:
 The quick brown fox jumps over the lazy dog.	Font Selection view	Don't translate this literally ! Use a phrase showing all chars from A to Z.	Albert osti fagotin ja töräytti puhkuvan melodian.
+%decorName\n\nAuthors:\n\t%decorAuthors\n\nURL: %decorURL\nLicense: %decorLic\n\n%decorDesc\n	DecorSettingsView		%decorName\n\nTekijät:\n\t%decorAuthors\n\nVerkko-osoite: %decorURL\nLisenssi: %decorLic\n\n%decorDesc\n
 Reduce colored edges filter strength:	AntialiasingSettingsView		Vähennä värillisten reunojen suodatuksen vahvuutta:
 Subpixel based anti-aliasing in combination with glyph hinting is not available in this build of Haiku to avoid possible patent issues. To enable this feature, you have to build Haiku yourself and enable certain options in the libfreetype configuration header.	AntialiasingSettingsView		Alipikselipohjainen reunanpehmennys yhdistettynä kirjoitusmerkkiviimeistelyyn ei ole saatavilla tässä Haiku-versiossa patenttisyiden takia. Ominaisuuden saaminen käyttöön vaatii Haikun uudelleenkääntämistä ja eräiden optioiden aktivoimista libfreetype:n määrittelytiedostoissa.
 Control text	Colors tab		Kontrollin teksti

data/catalogs/preferences/appearance/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-Appearance	76206318
+1	french	x-vnd.Haiku-Appearance	2993758435
 Plain font:	Font view		Police simple :
 Control highlight	Colors tab		Mise en valeur de contrôle
 Control border	Colors tab		Bordure des contrôles
@@ -9,12 +9,14 @@ Defaults	APRWindow		Défaut
 Grayscale	AntialiasingSettingsView		Niveaux de gris
 Shine	Colors tab		Lumière
 About	DecorSettingsView		À propos
+About decorator	DecorSettingsView		À propos du décorateur
 Off	AntialiasingSettingsView		Désactivé
 Choose Decorator	DecorSettingsView		Choisir un décorateur
 Success	Colors tab		Réussite
 Inactive window tab text	Colors tab		Texte des titres de fenêtres inactives
 Failure	Colors tab		Échec
 Hinting menu	AntialiasingSettingsView		Menu ajustement
+Scroll bar:	DecorSettingsView		Barre de défilement :
 Document background	Colors tab		Arrière plan du document
 Revert	APRWindow		Rétablir
 Window tab	Colors tab		Titre des fenêtres
@@ -34,6 +36,7 @@ List background	Colors tab		Arrière-plan de la liste
 OK	DecorSettingsView		OK
 Control mark	Colors tab		Point de contrôle
 Size:	Font Selection view		Taille :
+Decorator:	DecorSettingsView		Décorateur :
 Selected list item background	Colors tab		Arrière plan de l'élément sélectionnée dans la liste
 Panel background	Colors tab		Arrière plan des panneaux
 Menu font:	Font view		Police des menus :
@@ -44,6 +47,7 @@ List item text	Colors tab		Texte de l’élément de la liste
 Appearance	System name		Apparence
 Fixed font:	Font view		Police à chasse fixe :
 The quick brown fox jumps over the lazy dog.	Font Selection view	Don't translate this literally ! Use a phrase showing all chars from A to Z.	Voix ambiguë d'un cœur qui au zéphyr préfère les jattes de kiwis . 0123456789
+%decorName\n\nAuthors:\n\t%decorAuthors\n\nURL: %decorURL\nLicense: %decorLic\n\n%decorDesc\n	DecorSettingsView		%decorName\n\nAuteurs :\n\t%decorAuthors\n\nURL : %decorURL\nLicence : %decorLic\n\n%decorDesc\n
 Reduce colored edges filter strength:	AntialiasingSettingsView		Intensité du filtre de réduction des bords de couleurs :
 Subpixel based anti-aliasing in combination with glyph hinting is not available in this build of Haiku to avoid possible patent issues. To enable this feature, you have to build Haiku yourself and enable certain options in the libfreetype configuration header.	AntialiasingSettingsView		Le lissage sous-pixel n'est pas disponible en même temps que les consignes de glyphes dans cette version d'Haiku afin d'éviter des problèmes de brevets logiciels. Pour activer cette fonctionnalité, vous devez compiler Haiku vous-même et activer certaines options dans l'en-tête de configuration de libfreetype.
 Control text	Colors tab		Texte des contrôles

data/catalogs/preferences/appearance/hu.catkeys

@@ -1,4 +1,4 @@
-1	hungarian	x-vnd.Haiku-Appearance	1457181689
+1	hungarian	x-vnd.Haiku-Appearance	727801787
 Plain font:	Font view		Alap betűtípus:
 Control highlight	Colors tab		Kiválasztott vezérlőelem
 Control border	Colors tab		Vezérlőelem kerete
@@ -16,6 +16,7 @@ Success	Colors tab		Sikerült
 Inactive window tab text	Colors tab		Inaktív ablak címszövege
 Failure	Colors tab		Nem sikerült
 Hinting menu	AntialiasingSettingsView		Körvonalmenü
+Scroll bar:	DecorSettingsView		Görgetősáv:
 Document background	Colors tab		Dokumentum háttere
 Revert	APRWindow		Visszaállít
 Window tab	Colors tab		Ablakfül
@@ -49,6 +50,7 @@ The quick brown fox jumps over the lazy dog.	Font Selection view	Don't translate
 %decorName\n\nAuthors:\n\t%decorAuthors\n\nURL: %decorURL\nLicense: %decorLic\n\n%decorDesc\n	DecorSettingsView		%decorName\n\nKészítette:\n\t%decorAuthors\n\nURL: %decorURL\nLicense: %decorLic\n\n%decorDesc\n
 Reduce colored edges filter strength:	AntialiasingSettingsView		A színezett betűszélek szűrőjének erősségi szintje:
 Subpixel based anti-aliasing in combination with glyph hinting is not available in this build of Haiku to avoid possible patent issues. To enable this feature, you have to build Haiku yourself and enable certain options in the libfreetype configuration header.	AntialiasingSettingsView		A betűkép-körvonalasítással összevont szubpixel-alapú élsimítás nem használható a Haiku ezen kiadásában, mivel lehetséges szabadalmi viták forrása lehet. E funckió használatához magának kell megépítenie saját Haiku-rendszerét és beállítania bizonyos opciókat a libfreetype konfigurációs fejlécében.
+Scroll bar thumb	Colors tab		Görgetősáv megjelenése
 Control text	Colors tab		Vezérlőelem szövege
 Single:	DecorSettingsView		Egyszeres:
 Tooltip text	Colors tab		Buboréksúgó szövege

data/catalogs/preferences/appearance/ja.catkeys

@@ -1,4 +1,4 @@
-1	japanese	x-vnd.Haiku-Appearance	1457181689
+1	japanese	x-vnd.Haiku-Appearance	727801787
 Plain font:	Font view		標準フォント：
 Control highlight	Colors tab		コントロールのハイライト
 Control border	Colors tab		コントロールの境界
@@ -16,6 +16,7 @@ Success	Colors tab		成功
 Inactive window tab text	Colors tab		非アクティブウィンドウタブの文字
 Failure	Colors tab		失敗
 Hinting menu	AntialiasingSettingsView		ヒンティングメニュー
+Scroll bar:	DecorSettingsView		スクロールバー:
 Document background	Colors tab		ドキュメントの背景
 Revert	APRWindow		元に戻す
 Window tab	Colors tab		ウィンドウのタブ
@@ -49,6 +50,7 @@ The quick brown fox jumps over the lazy dog.	Font Selection view	Don't translate
 %decorName\n\nAuthors:\n\t%decorAuthors\n\nURL: %decorURL\nLicense: %decorLic\n\n%decorDesc\n	DecorSettingsView		%decorName\n\n作者:\n\t%decorAuthors\n\nURL: %decorURL\nライセンス: %decorLic\n\n%decorDesc\n
 Reduce colored edges filter strength:	AntialiasingSettingsView		カラーエッジフィルターの強度を下げる
 Subpixel based anti-aliasing in combination with glyph hinting is not available in this build of Haiku to avoid possible patent issues. To enable this feature, you have to build Haiku yourself and enable certain options in the libfreetype configuration header.	AntialiasingSettingsView		このHaikuのビルドでは、グリフのヒンティングと組合せたサブピクセルベースのアンチエイリアスは特許問題の可能性を回避するため使用できません。有効にするには、Haikuをソースからビルドして、libfreetypeの設定ヘッダーファイル中の特定のオプションを有効にしなければなりません。
+Scroll bar thumb	Colors tab		スクロールバーサム
 Control text	Colors tab		コントロールの文字
 Single:	DecorSettingsView		一方向:
 Tooltip text	Colors tab		ツールチップの文字

data/catalogs/preferences/appearance/pl.catkeys

@@ -1,4 +1,4 @@
-1	polish	x-vnd.Haiku-Appearance	1082331497
+1	polish	x-vnd.Haiku-Appearance	2464466870
 Plain font:	Font view		Zwykła czcionka:
 Control highlight	Colors tab		Podkreślenie kontrolki
 Control border	Colors tab		Obramowanie kontrolki
@@ -9,12 +9,14 @@ Defaults	APRWindow		Ustaw domyślne
 Grayscale	AntialiasingSettingsView		Skala odcieni szarości
 Shine	Colors tab		Połysk
 About	DecorSettingsView		O
+About decorator	DecorSettingsView		O dekoratorze
 Off	AntialiasingSettingsView		Wyłącz
 Choose Decorator	DecorSettingsView		Wybierz Dekorator
 Success	Colors tab		Sukces
 Inactive window tab text	Colors tab		Tekst nieaktywnej zakładki okna
 Failure	Colors tab		Niepowodzenie
 Hinting menu	AntialiasingSettingsView		Menu hintingu
+Scroll bar:	DecorSettingsView		Pasek przewijania:
 Document background	Colors tab		Tło dokumentu
 Revert	APRWindow		Przywróć ustawienia
 Window tab	Colors tab		Zakładka okna
@@ -24,6 +26,7 @@ Antialiasing	APRWindow		Antyaliasing
 Navigation base	Colors tab		Nawigacja
 Selected list item text	Colors tab		Tekst zaznaczonego elementu listy
 Window border	Colors tab		Obramowanie okna
+Double:	DecorSettingsView		Podwójne:
 Window tab text	Colors tab		Tekst zakładki okna
 Document text	Colors tab		Tekst dokumentu
 Navigation pulse	Colors tab		Puls nawigacji
@@ -43,6 +46,7 @@ The quick brown fox jumps over the lazy dog.	Font Selection view	Don't translate
 Reduce colored edges filter strength:	AntialiasingSettingsView		Zmniejszenie siły kolorowych filtrów krawędzi:
 Subpixel based anti-aliasing in combination with glyph hinting is not available in this build of Haiku to avoid possible patent issues. To enable this feature, you have to build Haiku yourself and enable certain options in the libfreetype configuration header.	AntialiasingSettingsView		Antyaliasing podpikselowy w połączeniu z hintowaniem czcionek jest niedostępny w tym buildzie Haiku w celu uniknięcia problemów patentowych. Aby włączyć tę funkcjonalność, musisz zbudować Haiku samemu i włączyć niektóre opcje w pliku nagłówkowym biblioteki libfreetype.
 Control text	Colors tab		Tekst kontrolki
+Single:	DecorSettingsView		Pojedynczy:
 Tooltip text	Colors tab		Tekst podpowiedzi
 Bold font:	Font view		Czcionka pogrubiona:
 Inactive window border	Colors tab		Nieaktywne obramowanie okna

data/catalogs/preferences/appearance/ru.catkeys

@@ -1,4 +1,4 @@
-1	russian	x-vnd.Haiku-Appearance	1457181689
+1	russian	x-vnd.Haiku-Appearance	2993758435
 Plain font:	Font view		Простой шрифт:
 Control highlight	Colors tab		Подсветка элемента
 Control border	Colors tab		Граница элемента
@@ -16,6 +16,7 @@ Success	Colors tab		Успех
 Inactive window tab text	Colors tab		Текст заголовка неактивного окна
 Failure	Colors tab		Неудача
 Hinting menu	AntialiasingSettingsView		Корректировка (хинтинг)
+Scroll bar:	DecorSettingsView		Полоса прокрутки:
 Document background	Colors tab		Фон документа
 Revert	APRWindow		Вернуть
 Window tab	Colors tab		Заголовок окна

data/catalogs/preferences/appearance/sv.catkeys

@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Haiku-Appearance	1457181689
+1	swedish	x-vnd.Haiku-Appearance	2993758435
 Plain font:	Font view		Vanlig font:
 Control highlight	Colors tab		Framhävd kontroll
 Control border	Colors tab		Kontrollkant
@@ -16,6 +16,7 @@ Success	Colors tab		Framgång
 Inactive window tab text	Colors tab		Fliktext för inaktiva fönster
 Failure	Colors tab		Misslyckande
 Hinting menu	AntialiasingSettingsView		Betoningsmeny
+Scroll bar:	DecorSettingsView		Rullningslist:
 Document background	Colors tab		Dokument bakgrund
 Revert	APRWindow		Återgå
 Window tab	Colors tab		Fösterflik

data/catalogs/preferences/bluetooth/de.catkeys

@@ -1,4 +1,4 @@
-1	german	x-vnd.Haiku-BluetoothPrefs	1628593228
+1	german	x-vnd.Haiku-BluetoothPrefs	3212620536
 About Bluetooth…	Window		Über Bluetooth…
 Handheld	Settings view		Handheld
 Default inquiry time:	Settings view		Suchdauer:
@@ -55,6 +55,7 @@ Always ask	Settings view		Immer fragen
 Retrieving name of %1	Inquiry panel		Name für %1 wird abgerufen
 Check that the Bluetooth capabilities of your remote device are activated. Press 'Inquiry' to start scanning. The needed time for the retrieval of the names is unknown, although should not take more than 3 seconds per device. Afterwards you will be able to add them to your main list, where you will be able to pair with them.	Inquiry panel		Bitte stellen Sie sicher, dass Bluetooth auf dem gesuchten Gerät aktiviert ist.\nDrücken Sie Suchen um andere Bluetooth-Geräte zu finden.\nFür gewöhnlich dauert das Ermitteln des Namens pro Gerät 3 Sekunden. Gefundene Bluetooth-Geräte können anschließend der Geräteliste hinzugefügt werden.\nWechseln Sie zur Liste der bekannten Geräte, wenn Sie eine Verbindung herstellen möchten.
 Authenticate	Extended local device view		Authentifizieren
+Pick device...	Settings view		Gerät wählen...
 Retrieving names...	Inquiry panel		Empfangen der Namen...
 Help	Window		Hilfe
 Add…	Remote devices		Hinzu…

data/catalogs/preferences/bluetooth/fi.catkeys

@@ -1,4 +1,4 @@
-1	finnish	x-vnd.Haiku-BluetoothPrefs	1628593228
+1	finnish	x-vnd.Haiku-BluetoothPrefs	3212620536
 About Bluetooth…	Window		Bluetooth-ohjelmasta…
 Handheld	Settings view		Kädessäpidettävät
 Default inquiry time:	Settings view		Oletuskyselyn pituus:
@@ -55,6 +55,7 @@ Always ask	Settings view		Kysy joka kerta
 Retrieving name of %1	Inquiry panel		Noudetaan %1-nimi
 Check that the Bluetooth capabilities of your remote device are activated. Press 'Inquiry' to start scanning. The needed time for the retrieval of the names is unknown, although should not take more than 3 seconds per device. Afterwards you will be able to add them to your main list, where you will be able to pair with them.	Inquiry panel		Tarkista, että etälaitteen bluetoothominaisuudet on aktivoitu. Paina ’Kysely’ käynnistääksesi haun. Nimien noutoon tarvittavan ajan määrä ei ole tiedossa, mutta sen ei pitäisi viedä yli 3 sekuntia per laite. Myöhemmin voit lisätä ne päälistaasi, jossa pystyt yhdistämään ne.
 Authenticate	Extended local device view		Todenna
+Pick device...	Settings view		Valitse laite...
 Retrieving names...	Inquiry panel		Noudetaan nimiä...
 Help	Window		Opaste
 Add…	Remote devices		Lisää…

data/catalogs/preferences/bluetooth/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-BluetoothPrefs	1628593228
+1	french	x-vnd.Haiku-BluetoothPrefs	3212620536
 About Bluetooth…	Window		À propos de Bluetooth…
 Handheld	Settings view		Appareil de poche
 Default inquiry time:	Settings view		Temps de requête par défaut :
@@ -55,6 +55,7 @@ Always ask	Settings view		Toujours demander
 Retrieving name of %1	Inquiry panel		Récupérer le nom de %1
 Check that the Bluetooth capabilities of your remote device are activated. Press 'Inquiry' to start scanning. The needed time for the retrieval of the names is unknown, although should not take more than 3 seconds per device. Afterwards you will be able to add them to your main list, where you will be able to pair with them.	Inquiry panel		Vérifiez que les fonctionnalités Bluetooth de votre appareil distant soient activées. Appuyez sur « Examiner » pour lancer la recherche. Le temps nécessaire pour récupérer les noms n'est pas connu, mais ça ne devrait pas prendre plus de 3 secondes par appareil. Ensuite, vous pourrez les ajouter à la liste principale, où vous pourrez vous associer avec eux.
 Authenticate	Extended local device view		Authentification
+Pick device...	Settings view		Choisir un périphérique...
 Retrieving names...	Inquiry panel		Récupération des noms…
 Help	Window		Aide
 Add…	Remote devices		Ajouter…

data/catalogs/preferences/network/fi.catkeys

@@ -1,22 +1,27 @@
-1	finnish	x-vnd.Haiku-Network	365183238
+1	finnish	x-vnd.Haiku-Network	1341378870
 Choose automatically	EthernetSettingsView		Valitse automaattisesti
 Gateway:	EthernetSettingsView		Yhdyskäytävä:
 Netmask:	EthernetSettingsView		Verkkopeite:
 DHCP	EthernetSettingsView		DHCP
 DNS #2:	EthernetSettingsView		DNS nr2:
 Apply	EthernetSettingsView		Käytä
+Netmask is invalid	EthernetSettingsView		Verkkopeite on virheellinen
 OK	EthernetSettingsView		Valmis
 DNS #1:	EthernetSettingsView		DNS nr1:
 IP address:	EthernetSettingsView		IP-osoite:
 Adapter:	EthernetSettingsView		Adapteri:
 Domain:	EthernetSettingsView		Verkkoalue:
+Gateway is invalid	EthernetSettingsView		Yhdyskäytävä on virheellinen
+DNS #1 is invalid	EthernetSettingsView		DNS nro 1 on virheellinen
 Revert	EthernetSettingsView		Palauta
 <no wireless networks found>	EthernetSettingsView		<langatonta verkkoa ei löytynyt>
 Network	System name		Verkkotila-asetukset
 Mode:	EthernetSettingsView		Tila:
+IP address is invalid	EthernetSettingsView		IP-osoite on virheellinen
 Network:	EthernetSettingsView		Verkko:
 The net_server needs to run for the auto configuration!	EthernetSettingsView		Automaattiasetusta varten net_server on suoritettava!
 Disabled	EthernetSettingsView		Ota pois käytöstä
 Auto-configuring failed: 	EthernetSettingsView		Automaattiasetus epäonnistui: 
 Static	EthernetSettingsView		Staattinen
+DNS #2 is invalid	EthernetSettingsView		DNS nro 2 on virheellinen
 <no adapter>	EthernetSettingsView		<ei ajuria>

data/catalogs/preferences/network/fr.catkeys

@@ -1,22 +1,27 @@
-1	french	x-vnd.Haiku-Network	365183238
+1	french	x-vnd.Haiku-Network	1341378870
 Choose automatically	EthernetSettingsView		Choisir automatiquement
 Gateway:	EthernetSettingsView		Passerelle :
 Netmask:	EthernetSettingsView		Masque réseau :
 DHCP	EthernetSettingsView		DHCP
 DNS #2:	EthernetSettingsView		DNS n°2 :
 Apply	EthernetSettingsView		Appliquer
+Netmask is invalid	EthernetSettingsView		Le masque réseau est invalide
 OK	EthernetSettingsView		OK
 DNS #1:	EthernetSettingsView		DNS n°1 :
 IP address:	EthernetSettingsView		Adresse IP :
 Adapter:	EthernetSettingsView		Adaptateur :
 Domain:	EthernetSettingsView		Domaine :
+Gateway is invalid	EthernetSettingsView		La passerelle est invalide
+DNS #1 is invalid	EthernetSettingsView		Le DNS n°1 est invalide
 Revert	EthernetSettingsView		Rétablir
 <no wireless networks found>	EthernetSettingsView		<aucun réseau sans fil disponible>
 Network	System name		Réseau
 Mode:	EthernetSettingsView		Mode :
+IP address is invalid	EthernetSettingsView		L'adresse IP est invalide
 Network:	EthernetSettingsView		Réseau :
 The net_server needs to run for the auto configuration!	EthernetSettingsView		Le net_server doit être lancé pour la configuration automatique !
 Disabled	EthernetSettingsView		Désactivé
 Auto-configuring failed: 	EthernetSettingsView		Échec de la configuration automatique : 
 Static	EthernetSettingsView		Statique
+DNS #2 is invalid	EthernetSettingsView		Le DNS n°2 est invalide
 <no adapter>	EthernetSettingsView		<aucun adaptateur>

data/catalogs/preferences/notifications/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-Notifications	814394708
+1	french	x-vnd.Haiku-Notifications	2177286129
 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
@@ -17,6 +17,7 @@ Cannot disable notifications because the server can't be reached.	GeneralView		I
 Progress	NotificationView		Progression
 Last Received	NotificationView		Dernière reçue
 General	PrefletView		Général
+Apply	PrefletWin		Appliquer
 Display	PrefletView		Affichage
 Can't enable notifications at startup time, you probably don't have write permission to the boot settings directory.	GeneralView		Impossible d'activer les notifications au démarrage. Vous n'avez probablement pas le droit d'écrire dans le répertoire des réglages du démarrage.
 Search:	NotificationView		Rechercher :

data/catalogs/preferences/printers/pl.catkeys

@@ -10,7 +10,7 @@ Add printer	AddPrinterDialog		Dodaj drukarkę
 Green	TestPageView		Zielony
 Printers	PrintersWindow		Drukarki
 Default Printer	PrinterListView		Domyślna drukarka
-Transport: %transport% %transport_address%	PrinterListView		Transport: %transport% %transport_address%
+Transport: %transport% %transport_address%	PrinterListView		Podsystem transportu: %transport%, adres: %transport_address%
 No pending jobs.	PrinterListView		Brak oczekujących zadań.
 pages	JobListView		strony
 Printers	System name		Drukarki
@@ -23,13 +23,13 @@ Black	TestPageView		Czarny
 Restart job	PrintersWindow		Zrestartuj zadanie
 Add	AddPrinterDialog		Dodaj
 Make default	PrintersWindow		Ustaw jako domyślną drukarkę
-Transport: %transport% %transport_address%	TestPageView		Transport: %transport%, adres: %transport_address%
+Transport: %transport% %transport_address%	TestPageView		Podsystem transportu: %transport%, adres: %transport_address%
 Cancel job	PrintersWindow		Anuluj zadanie
 Yellow	TestPageView		Żółty
 Blue	TestPageView		Niebieski
 1 pending job.	PrinterListView		1 zadanie w toku.
 Remove	PrintersWindow		Usuń
-<pick one>	AddPrinterDialog		<wybierz jeden>
+<pick one>	AddPrinterDialog		<wybierz>
 Add …	PrintersWindow		Dodaj …
 Print jobs for 	PrintersWindow		Drukowanie dla 
 Failed	JobListView		Nie wykonano

data/catalogs/preferences/time/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-Time	3544635877
+1	french	x-vnd.Haiku-Time	3259467657
 GMT (UNIX compatible)	Time		GMT (compatible UNIX)
 OK	Time		OK
 Asia	Time		Asie
@@ -11,6 +11,7 @@ Preview time:	Time		Aperçu de l'heure :
 Synchronize	Time		Synchroniser
 Revert	Time		Rétablir
 Pacific	Time		Pacifique
+Show day of week	Time		Afficher le jour de la semaine
 Add	Time		Ajouter
 Date and time	Time		Date et heure
 about	Time		À propos
@@ -26,6 +27,7 @@ Time	Time		Heure
 Indian	Time		Indien
 Sending request failed	Time		L'envoi d'une requête a échoué
 Arctic	Time		Arctique
+Display time with seconds	Time		Afficher l'heure avec les secondes
 Time	System name		Heure
 America	Time		Amérique
 Reset	Time		Réinitialiser
@@ -33,6 +35,8 @@ Synchronize at boot	Time		Synchroniser au démarrage
 Time & Date, written by:\n\n\tAndrew Edward McCall\n\tMike Berg\n\tJulun\n\tPhilippe Saint-Pierre\n\nCopyright 2004-2012, Haiku.	Time		Date & Heure, écrit par :\n\n\tAndrew Edward McCall\n\tMike Berg\n\tJulun\n\tPhilippe Saint-Pierre\n\nCopyright 2004-2012, Haiku.
 Received invalid time	Time		Une heure non valide a été reçue
 Antarctica	Time		Antarctique
+Show time zone	Time		Afficher le fuseau horaire
+Show clock in Deskbar	Time		Afficher l'heure dans la Deskbar
 The following error occured while synchronizing:r\n%s: %s	Time		L'erreur suivante est survenue lors de la synchronisation :\n%s : %s
 <Other>	Time		<Autre>
 Current time:	Time		Heure actuelle :

data/catalogs/servers/print/de.catkeys

@@ -1,4 +1,4 @@
-1	german	x-vnd.Be-PSRV	1761631281
+1	german	x-vnd.Be-PSRV	123334776
 Undefined	ConfigWindow		Unbestimmt
 Return the number of available transports	PrintServerApp Scripting		Anzahl der verfügbaren Transporte melden
 Return the number of available printers	PrintServerApp Scripting		Meldet die Anzahl der verfügbaren Drucker
@@ -9,6 +9,7 @@ Retrieve a specific printer	PrintServerApp Scripting		Einen bestimmten Drucker h
 Page %1 to %2	ConfigWindow		Seite %1 bis %2
 Get name of the printer add-on used for this printer	Printer Scripting		Name des von diesem Drucker verwendeten Add-ons anzeigen
 Page setup:	ConfigWindow		Seite einrichten:
+B5 (JIS)	ConfigWindow	JIS P0138 B5, a Japanese paper size	B5 (JIS)
 OK	ConfigWindow		OK
 Cancel	ConfigWindow		Abbrechen
 Printer server	ConfigWindow		Druckserver

data/catalogs/servers/print/fi.catkeys

@@ -1,4 +1,4 @@
-1	finnish	x-vnd.Be-PSRV	1761631281
+1	finnish	x-vnd.Be-PSRV	123334776
 Undefined	ConfigWindow		Määrittelemätön
 Return the number of available transports	PrintServerApp Scripting		Palauta käytettävissä olevien siirtojen lukumäärä
 Return the number of available printers	PrintServerApp Scripting		Palauta käytettävissä olevien tulostimien lukumäärä
@@ -9,6 +9,7 @@ Retrieve a specific printer	PrintServerApp Scripting		Nouda tietty tulostin
 Page %1 to %2	ConfigWindow		Sivu %1 ... %2
 Get name of the printer add-on used for this printer	Printer Scripting		Hae tämän tulostimen käyttämän tulostinlisäosan nimi
 Page setup:	ConfigWindow		Sivuasetus:
+B5 (JIS)	ConfigWindow	JIS P0138 B5, a Japanese paper size	B5 (JIS)
 OK	ConfigWindow		Valmis
 Cancel	ConfigWindow		Peru
 Printer server	ConfigWindow		Tulostinpalvelin

data/catalogs/servers/print/fr.catkeys

@@ -1,4 +1,4 @@
-1	french	x-vnd.Be-PSRV	1761631281
+1	french	x-vnd.Be-PSRV	123334776
 Undefined	ConfigWindow		Indéfini
 Return the number of available transports	PrintServerApp Scripting		Renvoyer le nombre de liaisons disponibles
 Return the number of available printers	PrintServerApp Scripting		Renvoyer le nombre d'imprimante disponible
@@ -9,6 +9,7 @@ Retrieve a specific printer	PrintServerApp Scripting		Récupérer une imprimante
 Page %1 to %2	ConfigWindow		Page %1 sur %2
 Get name of the printer add-on used for this printer	Printer Scripting		Obtenir le nom de l'extension d'impression utilisée pour cette imprimante
 Page setup:	ConfigWindow		Réglages de page :
+B5 (JIS)	ConfigWindow	JIS P0138 B5, a Japanese paper size	B5 (JIS)
 OK	ConfigWindow		OK
 Cancel	ConfigWindow		Annuler
 Printer server	ConfigWindow		Serveur d'impression

data/catalogs/servers/print/hu.catkeys

@@ -1,4 +1,4 @@
-1	hungarian	x-vnd.Be-PSRV	1761631281
+1	hungarian	x-vnd.Be-PSRV	123334776
 Undefined	ConfigWindow		Nem meghatározott
 Return the number of available transports	PrintServerApp Scripting		Megadja az elérhető transzporterek számát
 Return the number of available printers	PrintServerApp Scripting		Megadja az elérhető nyomtatók számát
@@ -9,6 +9,7 @@ Retrieve a specific printer	PrintServerApp Scripting		Megad egy válaszott nyomt
 Page %1 to %2	ConfigWindow		%1 - %2 oldal
 Get name of the printer add-on used for this printer	Printer Scripting		Megadja a nyomtatón használt nyomtatóbővítményt
 Page setup:	ConfigWindow		Oldalbeállítás:
+B5 (JIS)	ConfigWindow	JIS P0138 B5, a Japanese paper size	B5 (JIS)
 OK	ConfigWindow		Rendben
 Cancel	ConfigWindow		Mégse
 Printer server	ConfigWindow		Nyomtatókiszolgáló

data/catalogs/servers/print/ja.catkeys

@@ -1,4 +1,4 @@
-1	japanese	x-vnd.Be-PSRV	1761631281
+1	japanese	x-vnd.Be-PSRV	123334776
 Undefined	ConfigWindow		未定義
 Return the number of available transports	PrintServerApp Scripting		トランスポートの数を取得
 Return the number of available printers	PrintServerApp Scripting		プリンターの数を取得
@@ -9,6 +9,7 @@ Retrieve a specific printer	PrintServerApp Scripting		特定のプリンター
 Page %1 to %2	ConfigWindow		ページ %1 からページ %2 まで
 Get name of the printer add-on used for this printer	Printer Scripting		このプリンターが使うプリンターアドオンを取得
 Page setup:	ConfigWindow		ページ設定：
+B5 (JIS)	ConfigWindow	JIS P0138 B5, a Japanese paper size	JIS B5 (182 x 257 mm)
 OK	ConfigWindow		OK
 Cancel	ConfigWindow		中止
 Printer server	ConfigWindow		プリンターサーバー
@@ -21,7 +22,7 @@ A6	ConfigWindow	ISO 216 paper size	A6 (105 x 148 mm)
 Portrait	ConfigWindow		縦
 All pages	ConfigWindow		全ページ
 There is no default printer set up.	PrintServerApp		デフォルトプリンターが設定されていません。
-B5	ConfigWindow	ISO 216 paper size	ISO B5 (176 x 250 mm)
+B5	ConfigWindow	ISO 216 paper size	B5 (176 x 250 mm)
 A0	ConfigWindow	ISO 216 paper size	A0 (841 x 1189 mm)
 Letter	ConfigWindow	ANSI A (letter), a North American paper size	Letter (216 x 279 mm)
 Printer:	ConfigWindow		プリンター：

data/catalogs/servers/print/ru.catkeys

@@ -1,4 +1,4 @@
-1	russian	x-vnd.Be-PSRV	1761631281
+1	russian	x-vnd.Be-PSRV	123334776
 Undefined	ConfigWindow		не определены
 Return the number of available transports	PrintServerApp Scripting		Возвращает количество доступных транспортов
 Return the number of available printers	PrintServerApp Scripting		Возвращает количество доступных принтеров
@@ -9,6 +9,7 @@ Retrieve a specific printer	PrintServerApp Scripting		Запросить ука
 Page %1 to %2	ConfigWindow		Страница %1 из %2
 Get name of the printer add-on used for this printer	Printer Scripting		Получить имя дополнения принтера, используемого для этого принтера
 Page setup:	ConfigWindow		Настройки печати:
+B5 (JIS)	ConfigWindow	JIS P0138 B5, a Japanese paper size	B5 (JIS)
 OK	ConfigWindow		ОК
 Cancel	ConfigWindow		Отмена
 Printer server	ConfigWindow		Сервер печати

data/catalogs/servers/print/sv.catkeys

@@ -1,4 +1,4 @@
-1	swedish	x-vnd.Be-PSRV	1761631281
+1	swedish	x-vnd.Be-PSRV	123334776
 Undefined	ConfigWindow		Odefinierad
 Return the number of available transports	PrintServerApp Scripting		Visa antalet tillgängliga åtkomstmetoder
 Return the number of available printers	PrintServerApp Scripting		Visa antal tillgängliga skrivare
@@ -9,6 +9,7 @@ Retrieve a specific printer	PrintServerApp Scripting		Visa en specifik skrivare
 Page %1 to %2	ConfigWindow		Sida %1 till %2
 Get name of the printer add-on used for this printer	Printer Scripting		Visa namnet till skrivartillägget för denna skrivare
 Page setup:	ConfigWindow		Sidinställningar:
+B5 (JIS)	ConfigWindow	JIS P0138 B5, a Japanese paper size	B5 (JIS)
 OK	ConfigWindow		OK
 Cancel	ConfigWindow		Avbryt
 Printer server	ConfigWindow		Utskriftsserver

data/catalogs/tests/kits/net/preflet/InterfacesAddOn/de.catkeys

@@ -0,0 +1,33 @@
+1	german	x-vnd.Haiku-InterfacesAddOn	160108912
+Interface	InterfaceWindow		Interface
+Configure…	InterfacesListView		Konfiguriere…
+Static	IntefaceAddressView		Statisch
+None	InterfacesListView		Keine
+IP:	InterfacesListView	IPv4 address label	IP:
+Status:	IntefaceHardwareView		Status:
+IPv6:	InterfacesListView	IPv6 address label	IPv6:
+Save	InterfaceWindow		Speichern
+Link speed:	IntefaceHardwareView		Geschwindigkeit:
+Renegotiate	InterfacesAddOn		Neu verhandeln
+The method for obtaining an IP address	IntefaceAddressView		Die Art eine IP Adresse zu erhalten
+Your gateway	IntefaceAddressView		Das Gateway
+Enable	InterfacesListView		Aktivieren
+Received:	IntefaceHardwareView		Empfangen:
+Revert	InterfaceWindow		Anfangswerte
+connected	IntefaceHardwareView		verbunden
+Gateway:	IntefaceAddressView		Gateway:
+Disable	InterfacesListView		Deaktivieren
+Sent:	IntefaceHardwareView		Gesendet:
+Disable	InterfacesAddOn		Deaktivieren
+Configure…	InterfacesAddOn		Konfiguriere...
+Renegotiate Address	InterfacesListView		Adresse neu verhandeln
+DHCP	IntefaceAddressView		DHCP
+Mode:	IntefaceAddressView		Modus:
+Your netmask	IntefaceAddressView		Netzmaske
+IP Address:	IntefaceAddressView		IP Adresse:
+Off	IntefaceAddressView		Aus
+MAC address:	IntefaceHardwareView		MAC Adresse:
+Netmask:	IntefaceAddressView		Netzmaske:
+Your IP address	IntefaceAddressView		IP Adresse
+%llu KBytes	IntefaceHardwareView		%llu KByte
+disconnected	IntefaceHardwareView		getrennt

data/catalogs/tests/kits/net/preflet/InterfacesAddOn/fi.catkeys

@@ -0,0 +1,29 @@
+1	finnish	x-vnd.Haiku-InterfacesAddOn	1172292901
+Configure…	InterfacesListView		Aseta…
+Static	IntefaceAddressView		Staattinen
+None	InterfacesListView		Ei mitään
+IP:	InterfacesListView	IPv4 address label	IP:
+Status:	IntefaceHardwareView		Tila:
+IPv6:	InterfacesListView	IPv6 address label	IPv6:
+Save	InterfaceWindow		Tallenna
+Link speed:	IntefaceHardwareView		Yhteysnopeus:
+Renegotiate	InterfacesAddOn		Neuvottele uudelleen
+The method for obtaining an IP address	IntefaceAddressView		IP-osoitteen hakumenetelmä
+Your gateway	IntefaceAddressView		Yhdyskäytäväsi
+Enable	InterfacesListView		Käytössä
+Revert	InterfaceWindow		Palauta
+connected	IntefaceHardwareView		yhdistetty
+Gateway:	IntefaceAddressView		Yhdyskäytävä:
+Disable	InterfacesListView		Ei ole käytössä
+Disable	InterfacesAddOn		Ei ole käytössä
+Configure…	InterfacesAddOn		Aseta…
+Renegotiate Address	InterfacesListView		Neuvottele osoite uudelleen
+DHCP	IntefaceAddressView		DHCP
+Mode:	IntefaceAddressView		Tila:
+Your netmask	IntefaceAddressView		Verkopeitteesi
+IP Address:	IntefaceAddressView		IP-osoite:
+Off	IntefaceAddressView		Pois käytöstä
+MAC address:	IntefaceHardwareView		MAC-osoite:
+Netmask:	IntefaceAddressView		Verkkopeite:
+Your IP address	IntefaceAddressView		IP-osoitteesi
+disconnected	IntefaceHardwareView		yhteys katkaistu

data/catalogs/tests/kits/net/preflet/InterfacesAddOn/hu.catkeys

@@ -0,0 +1,33 @@
+1	hungarian	x-vnd.Haiku-InterfacesAddOn	160108912
+Interface	InterfaceWindow		Eszköz
+Configure…	InterfacesListView		Beállítás…
+Static	IntefaceAddressView		Állandó
+None	InterfacesListView		Nincs
+IP:	InterfacesListView	IPv4 address label	IP:
+Status:	IntefaceHardwareView		Állapot:
+IPv6:	InterfacesListView	IPv6 address label	IPv6:
+Save	InterfaceWindow		Mentés
+Link speed:	IntefaceHardwareView		Kapcsolat sebessége:
+Renegotiate	InterfacesAddOn		Megújítás
+The method for obtaining an IP address	IntefaceAddressView		Az IP-cím lekérésének módja
+Your gateway	IntefaceAddressView		Átjáró
+Enable	InterfacesListView		Engedélyezés
+Received:	IntefaceHardwareView		Fogadott:
+Revert	InterfaceWindow		Visszaállítás
+connected	IntefaceHardwareView		csatlakozva
+Gateway:	IntefaceAddressView		Átjáró:
+Disable	InterfacesListView		Letiltás
+Sent:	IntefaceHardwareView		Küldött:
+Disable	InterfacesAddOn		Letiltás
+Configure…	InterfacesAddOn		Beállítás…
+Renegotiate Address	InterfacesListView		Cím újra lekérése
+DHCP	IntefaceAddressView		DHCP
+Mode:	IntefaceAddressView		Mód:
+Your netmask	IntefaceAddressView		Hálózati maszk
+IP Address:	IntefaceAddressView		IP-cím:
+Off	IntefaceAddressView		Kikapcsolva
+MAC address:	IntefaceHardwareView		MAC-cím:
+Netmask:	IntefaceAddressView		Hálózati maszk:
+Your IP address	IntefaceAddressView		IP cím
+%llu KBytes	IntefaceHardwareView		%llu KByte
+disconnected	IntefaceHardwareView		leválasztva

data/catalogs/tests/kits/net/preflet/InterfacesAddOn/ja.catkeys

@@ -0,0 +1,33 @@
+1	japanese	x-vnd.Haiku-InterfacesAddOn	160108912
+Interface	InterfaceWindow		インターフェース
+Configure…	InterfacesListView		構成…
+Static	IntefaceAddressView		静的
+None	InterfacesListView		なし
+IP:	InterfacesListView	IPv4 address label	IP:
+Status:	IntefaceHardwareView		状態:
+IPv6:	InterfacesListView	IPv6 address label	IPv6:
+Save	InterfaceWindow		保存
+Link speed:	IntefaceHardwareView		リンクスピード:
+Renegotiate	InterfacesAddOn		再ネゴシエート
+The method for obtaining an IP address	IntefaceAddressView		IP アドレスを取得する方法
+Your gateway	IntefaceAddressView		ゲートウェイ
+Enable	InterfacesListView		有効
+Received:	IntefaceHardwareView		受信:
+Revert	InterfaceWindow		取り消し
+connected	IntefaceHardwareView		接続しました
+Gateway:	IntefaceAddressView		ゲートウェイ:
+Disable	InterfacesListView		無効
+Sent:	IntefaceHardwareView		送信:
+Disable	InterfacesAddOn		無効
+Configure…	InterfacesAddOn		構成…
+Renegotiate Address	InterfacesListView		アドレスを再ネゴシエートする
+DHCP	IntefaceAddressView		DHCP
+Mode:	IntefaceAddressView		モード:
+Your netmask	IntefaceAddressView		ネットマスク
+IP Address:	IntefaceAddressView		IP アドレス:
+Off	IntefaceAddressView		オフ
+MAC address:	IntefaceHardwareView		MAC アドレス:
+Netmask:	IntefaceAddressView		ネットマスク:
+Your IP address	IntefaceAddressView		IP アドレス
+%llu KBytes	IntefaceHardwareView		%llu KBytes
+disconnected	IntefaceHardwareView		切断されました

data/catalogs/tests/kits/net/preflet/InterfacesAddOn/sv.catkeys

@@ -0,0 +1,29 @@
+1	swedish	x-vnd.Haiku-InterfacesAddOn	1172292901
+Configure…	InterfacesListView		Konfigurera...
+Static	IntefaceAddressView		Statisk
+None	InterfacesListView		Ingen
+IP:	InterfacesListView	IPv4 address label	IP:
+Status:	IntefaceHardwareView		Status:
+IPv6:	InterfacesListView	IPv6 address label	IPv6:
+Save	InterfaceWindow		Spara
+Link speed:	IntefaceHardwareView		Länkhastighet:
+Renegotiate	InterfacesAddOn		Omförhandla
+The method for obtaining an IP address	IntefaceAddressView		Metoden för att få en IP adress
+Your gateway	IntefaceAddressView		Min gateway
+Enable	InterfacesListView		Aktivera
+Revert	InterfaceWindow		Återgå
+connected	IntefaceHardwareView		ansluten
+Gateway:	IntefaceAddressView		Gateway:
+Disable	InterfacesListView		Inaktivera
+Disable	InterfacesAddOn		Inaktivera
+Configure…	InterfacesAddOn		Konfigurera…
+Renegotiate Address	InterfacesListView		Omförhandla Adressen
+DHCP	IntefaceAddressView		DHCP
+Mode:	IntefaceAddressView		Läge:
+Your netmask	IntefaceAddressView		Min nätmask
+IP Address:	IntefaceAddressView		IP-adress:
+Off	IntefaceAddressView		Av
+MAC address:	IntefaceHardwareView		MAC-adress
+Netmask:	IntefaceAddressView		Nätmask:
+Your IP address	IntefaceAddressView		Din IP-adress
+disconnected	IntefaceHardwareView		koppla från 

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

@@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-Playground	584609351
+1	french	x-vnd.Haiku-Playground	1375574837
 Line	Playground		Ligne
 Fill	Playground		Remplir
 Over	Playground		Dessus
@@ -24,6 +24,7 @@ New object	Playground		Nouvel objet
 Test	Playground		Tester
 Max	Playground		Max
 Add	Playground		Ajouter
+Playground	System name		Aire de jeu
 Erase	Playground		Effacer
 File	Playground		Fichier
 Subtract	Playground		Soustraire

docs/user/drivers/fs_interface.dox

@@ -325,8 +325,11 @@
 
 	Invoked by the VFS when it is asked to unmount the volume. The function must
 	free all resources associated with the mounted volume, including the volume
-	handle. Although the mount() hook called publish_vnode() for the root node
+	handle. Before unmount() is called, the VFS calls
-	of the volume, unmount() must not invoke put_vnode().
+	file_system_module_info::put_vnode() respectively
+	file_system_module_info::remove_vnode() for each of the volume's nodes. That
+	is although the mount() hook called publish_vnode() for the volume's root
+	node, unmount() must not invoke put_vnode().
 
 	\param volume The volume object.
 	\return \c B_OK if everything went fine, another error code otherwise. The

headers/os/interface/ControlLook.h

@@ -61,7 +61,11 @@ public:
 		B_LEFT_ARROW		= 0,
 		B_RIGHT_ARROW		= 1,
 		B_UP_ARROW			= 2,
-		B_DOWN_ARROW		= 3
+		B_DOWN_ARROW		= 3,
+		B_LEFT_UP_ARROW		= 4,
+		B_RIGHT_UP_ARROW	= 5,
+		B_RIGHT_DOWN_ARROW	= 6,
+		B_LEFT_DOWN_ARROW	= 7
 	};
 
 	enum {

headers/os/interface/InterfaceDefs.h

@@ -311,6 +311,8 @@ enum color_which {
 	B_LIST_ITEM_TEXT_COLOR = 30,
 	B_LIST_SELECTED_ITEM_TEXT_COLOR = 31,
 
+	B_SCROLL_BAR_THUMB_COLOR = 32,
+
 	B_TOOL_TIP_BACKGROUND_COLOR = 20,
 	B_TOOL_TIP_TEXT_COLOR = 21,
 
@@ -329,9 +331,9 @@ enum color_which {
 	B_KEYBOARD_NAVIGATION_COLOR = B_NAVIGATION_BASE_COLOR,
 	B_MENU_SELECTION_BACKGROUND_COLOR = B_MENU_SELECTED_BACKGROUND_COLOR,
 
-	// These are deprecated -- do not use in new code.  See BScreen for
+	// The following constants are deprecated, do not use in new code.
-	// the replacement for B_DESKTOP_COLOR.
 	B_DESKTOP_COLOR = 5
+		// see BScreen class for B_DESKTOP_COLOR replacement
 };
 
 

headers/os/interface/ListView.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009, Haiku, Inc. All rights reserved.
+ * Copyright 2002-2013 Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _LIST_VIEW_H
@@ -14,6 +14,7 @@
 
 struct track_data;
 
+
 enum list_view_type {
 	B_SINGLE_SELECTION_LIST,
 	B_MULTIPLE_SELECTION_LIST
@@ -58,13 +59,13 @@ public:
 	virtual void				MessageReceived(BMessage* message);
 	virtual void				KeyDown(const char* bytes, int32 numBytes);
 	virtual void				MouseDown(BPoint where);
-	virtual void				MouseUp(BPoint point);
+	virtual void				MouseUp(BPoint where);
-	virtual void				MouseMoved(BPoint point, uint32 code,
+	virtual void				MouseMoved(BPoint where, uint32 code,
 									const BMessage* dragMessage);
 
 	virtual void				ResizeToPreferred();
-	virtual void				GetPreferredSize(float* _width,
+	virtual void				GetPreferredSize(float *_width,
-									float* _height);
+									float *_height);
 
 	virtual	BSize				MinSize();
 	virtual	BSize				MaxSize();

headers/os/interface/Menu.h

@@ -214,7 +214,7 @@ private:
 									bool moveItems, float* width,
 									float* height);
 			void				_ComputeColumnLayout(int32 index, bool bestFit,
-									bool moveItems, BRect& outRect);
+									bool moveItems, BRect* override, BRect& outRect);
 			void				_ComputeRowLayout(int32 index, bool bestFit,
 									bool moveItems, BRect& outRect);		
 			void				_ComputeMatrixLayout(BRect& outRect);

headers/os/kernel/OS.h

@@ -73,11 +73,14 @@ typedef struct area_info {
 #define	B_32_BIT_CONTIGUOUS		6	/* B_CONTIGUOUS, < 4 GB physical address */
 
 /* address spec for create_area(), and clone_area() */
-#define B_ANY_ADDRESS			0
+#define B_ANY_ADDRESS				0
-#define B_EXACT_ADDRESS			1
+#define B_EXACT_ADDRESS				1
-#define B_BASE_ADDRESS			2
+#define B_BASE_ADDRESS				2
-#define B_CLONE_ADDRESS			3
+#define B_CLONE_ADDRESS				3
-#define	B_ANY_KERNEL_ADDRESS	4
+#define	B_ANY_KERNEL_ADDRESS		4
+/* B_ANY_KERNEL_BLOCK_ADDRESS		5 */
+#define B_RANDOMIZED_ANY_ADDRESS	6
+#define B_RANDOMIZED_BASE_ADDRESS	7
 
 /* area protection */
 #define B_READ_AREA				1

headers/os/locale/UnicodeChar.h

@@ -8,6 +8,7 @@ enum unicode_char_category
 	// Non-category for unassigned and non-character code points.
 	B_UNICODE_UNASSIGNED				= 0,
 
+	B_UNICODE_GENERAL_OTHER_TYPES		= 0,	// Cn
 	B_UNICODE_UPPERCASE_LETTER			= 1,	// Lu
 	B_UNICODE_LOWERCASE_LETTER			= 2,	// Ll
 	B_UNICODE_TITLECASE_LETTER			= 3,	// Lt
@@ -37,152 +38,289 @@ enum unicode_char_category
 	B_UNICODE_OTHER_SYMBOL				= 27,	// So
 	B_UNICODE_INITIAL_PUNCTUATION		= 28,	// Pi
 	B_UNICODE_FINAL_PUNCTUATION			= 29,	// Pf
-	B_UNICODE_GENERAL_OTHER_TYPES		= 30,	// Cn
 
 	B_UNICODE_CATEGORY_COUNT
 };
 
 
-/**
+// This specifies the language directional property of a character set.
- * This specifies the language directional property of a character set.
- */
 
 enum unicode_char_direction {
-	B_UNICODE_LEFT_TO_RIGHT               = 0,
+	B_UNICODE_LEFT_TO_RIGHT					= 0,
-	B_UNICODE_RIGHT_TO_LEFT               = 1,
+	B_UNICODE_RIGHT_TO_LEFT					= 1,
-	B_UNICODE_EUROPEAN_NUMBER             = 2,
+	B_UNICODE_EUROPEAN_NUMBER				= 2,
-	B_UNICODE_EUROPEAN_NUMBER_SEPARATOR   = 3,
+	B_UNICODE_EUROPEAN_NUMBER_SEPARATOR		= 3,
-	B_UNICODE_EUROPEAN_NUMBER_TERMINATOR  = 4,
+	B_UNICODE_EUROPEAN_NUMBER_TERMINATOR	= 4,
-	B_UNICODE_ARABIC_NUMBER               = 5,
+	B_UNICODE_ARABIC_NUMBER					= 5,
-	B_UNICODE_COMMON_NUMBER_SEPARATOR     = 6,
+	B_UNICODE_COMMON_NUMBER_SEPARATOR		= 6,
-	B_UNICODE_BLOCK_SEPARATOR             = 7,
+	B_UNICODE_BLOCK_SEPARATOR				= 7,
-	B_UNICODE_SEGMENT_SEPARATOR           = 8,
+	B_UNICODE_SEGMENT_SEPARATOR				= 8,
-	B_UNICODE_WHITE_SPACE_NEUTRAL         = 9,
+	B_UNICODE_WHITE_SPACE_NEUTRAL			= 9,
-	B_UNICODE_OTHER_NEUTRAL               = 10,
+	B_UNICODE_OTHER_NEUTRAL					= 10,
-	B_UNICODE_LEFT_TO_RIGHT_EMBEDDING     = 11,
+	B_UNICODE_LEFT_TO_RIGHT_EMBEDDING		= 11,
-	B_UNICODE_LEFT_TO_RIGHT_OVERRIDE      = 12,
+	B_UNICODE_LEFT_TO_RIGHT_OVERRIDE		= 12,
-	B_UNICODE_RIGHT_TO_LEFT_ARABIC        = 13,
+	B_UNICODE_RIGHT_TO_LEFT_ARABIC			= 13,
-	B_UNICODE_RIGHT_TO_LEFT_EMBEDDING     = 14,
+	B_UNICODE_RIGHT_TO_LEFT_EMBEDDING		= 14,
-	B_UNICODE_RIGHT_TO_LEFT_OVERRIDE      = 15,
+	B_UNICODE_RIGHT_TO_LEFT_OVERRIDE		= 15,
-	B_UNICODE_POP_DIRECTIONAL_FORMAT      = 16,
+	B_UNICODE_POP_DIRECTIONAL_FORMAT		= 16,
-	B_UNICODE_DIR_NON_SPACING_MARK        = 17,
+	B_UNICODE_DIR_NON_SPACING_MARK			= 17,
-	B_UNICODE_BOUNDARY_NEUTRAL            = 18,
+	B_UNICODE_BOUNDARY_NEUTRAL				= 18,
 
 	B_UNICODE_DIRECTION_COUNT
 };
 
 
-/**
+// Script range as defined in the Unicode standard.
- * Script range as defined in the Unicode standard.
- */
 
 enum unicode_char_script {
-	// Script names
+	// New No_Block value in Unicode 4.
-	B_UNICODE_BASIC_LATIN,
+	B_UNICODE_NO_BLOCK								= 0, // [none] Special range
-	B_UNICODE_LATIN_1_SUPPLEMENT,
+	B_UNICODE_BASIC_LATIN							= 1, // [0000]
-	B_UNICODE_LATIN_EXTENDED_A,
+	B_UNICODE_LATIN_1_SUPPLEMENT					= 2, // [0080]
-	B_UNICODE_LATIN_EXTENDED_B,
+	B_UNICODE_LATIN_EXTENDED_A						= 3, // [0100]
-	B_UNICODE_IPA_EXTENSIONS,
+	B_UNICODE_LATIN_EXTENDED_B						= 4, // [0180]
-	B_UNICODE_SPACING_MODIFIER_LETTERS,
+	B_UNICODE_IPA_EXTENSIONS						= 5, // [0250]
-	B_UNICODE_COMBINING_DIACRITICAL_MARKS,
+	B_UNICODE_SPACING_MODIFIER_LETTERS				= 6, // [02B0]
-	B_UNICODE_GREEK,
+	B_UNICODE_COMBINING_DIACRITICAL_MARKS			= 7, // [0300]
-	B_UNICODE_CYRILLIC,
+	B_UNICODE_GREEK									= 8, // [0370]
-	B_UNICODE_ARMENIAN,
+	B_UNICODE_CYRILLIC								= 9, // [0400]
-	B_UNICODE_HEBREW,
+	B_UNICODE_ARMENIAN								= 10, // [0530]
-	B_UNICODE_ARABIC,
+	B_UNICODE_HEBREW								= 11, // [0590]
-	B_UNICODE_SYRIAC,
+	B_UNICODE_ARABIC								= 12, // [0600]
-	B_UNICODE_THAANA,
+	B_UNICODE_SYRIAC								= 13, // [0700]
-	B_UNICODE_DEVANAGARI,
+	B_UNICODE_THAANA								= 14, // [0780]
-	B_UNICODE_BENGALI,
+	B_UNICODE_DEVANAGARI							= 15, // [0900]
-	B_UNICODE_GURMUKHI,
+	B_UNICODE_BENGALI								= 16, // [0980]
-	B_UNICODE_GUJARATI,
+	B_UNICODE_GURMUKHI								= 17, // [0A00]
-	B_UNICODE_ORIYA,
+	B_UNICODE_GUJARATI								= 18, // [0A80]
-	B_UNICODE_TAMIL,
+	B_UNICODE_ORIYA									= 19, // [0B00]
-	B_UNICODE_TELUGU,
+	B_UNICODE_TAMIL									= 20, // [0B80]
-	B_UNICODE_KANNADA,
+	B_UNICODE_TELUGU								= 21, // [0C00]
-	B_UNICODE_MALAYALAM,
+	B_UNICODE_KANNADA								= 22, // [0C80]
-	B_UNICODE_SINHALA,
+	B_UNICODE_MALAYALAM								= 23, // [0D00]
-	B_UNICODE_THAI,
+	B_UNICODE_SINHALA								= 24, // [0D80]
-	B_UNICODE_LAO,
+	B_UNICODE_THAI									= 25, // [0E00]
-	B_UNICODE_TIBETAN,
+	B_UNICODE_LAO									= 26, // [0E80]
-	B_UNICODE_MYANMAR,
+	B_UNICODE_TIBETAN								= 27, // [0F00]
-	B_UNICODE_GEORGIAN,
+	B_UNICODE_MYANMAR								= 28, // [1000]
-	B_UNICODE_HANGUL_JAMO,
+	B_UNICODE_GEORGIAN								= 29, // [10A0]
-	B_UNICODE_ETHIOPIC,
+	B_UNICODE_HANGUL_JAMO							= 30, // [1100]
-	B_UNICODE_CHEROKEE,
+	B_UNICODE_ETHIOPIC								= 31, // [1200]
-	B_UNICODE_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS,
+	B_UNICODE_CHEROKEE								= 32, // [13A0]
-	B_UNICODE_OGHAM,
+	B_UNICODE_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS	= 33, // [1400]
-	B_UNICODE_RUNIC,
+	B_UNICODE_OGHAM									= 34, // [1680]
-	B_UNICODE_KHMER,
+	B_UNICODE_RUNIC									= 35, // [16A0]
-	B_UNICODE_MONGOLIAN,
+	B_UNICODE_KHMER									= 36, // [1780]
-	B_UNICODE_LATIN_EXTENDED_ADDITIONAL,
+	B_UNICODE_MONGOLIAN								= 37, // [1800]
-	B_UNICODE_GREEK_EXTENDED,
+	B_UNICODE_LATIN_EXTENDED_ADDITIONAL				= 38, // [1E00]
-	B_UNICODE_GENERAL_PUNCTUATION,
+	B_UNICODE_GREEK_EXTENDED						= 39, // [1F00]
-	B_UNICODE_SUPERSCRIPTS_AND_SUBSCRIPTS,
+	B_UNICODE_GENERAL_PUNCTUATION					= 40, // [2000]
-	B_UNICODE_CURRENCY_SYMBOLS,
+	B_UNICODE_SUPERSCRIPTS_AND_SUBSCRIPTS			= 41, // [2070]
-	B_UNICODE_COMBINING_MARKS_FOR_SYMBOLS,
+	B_UNICODE_CURRENCY_SYMBOLS						= 42, // [20A0]
-	B_UNICODE_LETTERLIKE_SYMBOLS,
+	B_UNICODE_COMBINING_MARKS_FOR_SYMBOLS			= 43, // [20D0]
-	B_UNICODE_NUMBER_FORMS,
+	B_UNICODE_LETTERLIKE_SYMBOLS					= 44, // [2100]
-	B_UNICODE_ARROWS,
+	B_UNICODE_NUMBER_FORMS							= 45, // [2150]
-	B_UNICODE_MATHEMATICAL_OPERATORS,
+	B_UNICODE_ARROWS								= 46, // [2190]
-	B_UNICODE_MISCELLANEOUS_TECHNICAL,
+	B_UNICODE_MATHEMATICAL_OPERATORS				= 47, // [2200]
-	B_UNICODE_CONTROL_PICTURES,
+	B_UNICODE_MISCELLANEOUS_TECHNICAL				= 48, // [2300]
-	B_UNICODE_OPTICAL_CHARACTER_RECOGNITION,
+	B_UNICODE_CONTROL_PICTURES						= 49, // [2400]
-	B_UNICODE_ENCLOSED_ALPHANUMERICS,
+	B_UNICODE_OPTICAL_CHARACTER_RECOGNITION			= 50, // [2440]
-	B_UNICODE_BOX_DRAWING,
+	B_UNICODE_ENCLOSED_ALPHANUMERICS				= 51, // [2460]
-	B_UNICODE_BLOCK_ELEMENTS,
+	B_UNICODE_BOX_DRAWING							= 52, // [2500]
-	B_UNICODE_GEOMETRIC_SHAPES,
+	B_UNICODE_BLOCK_ELEMENTS						= 53, // [2580]
-	B_UNICODE_MISCELLANEOUS_SYMBOLS,
+	B_UNICODE_GEOMETRIC_SHAPES						= 54, // [25A0]
-	B_UNICODE_DINGBATS,
+	B_UNICODE_MISCELLANEOUS_SYMBOLS					= 55, // [2600]
-	B_UNICODE_BRAILLE_PATTERNS,
+	B_UNICODE_DINGBATS								= 56, // [2700]
-	B_UNICODE_CJK_RADICALS_SUPPLEMENT,
+	B_UNICODE_BRAILLE_PATTERNS						= 57, // [2800]
-	B_UNICODE_KANGXI_RADICALS,
+	B_UNICODE_CJK_RADICALS_SUPPLEMENT				= 58, // [2E80]
-	B_UNICODE_IDEOGRAPHIC_DESCRIPTION_CHARACTERS,
+	B_UNICODE_KANGXI_RADICALS						= 59, // [2F00]
-	B_UNICODE_CJK_SYMBOLS_AND_PUNCTUATION,
+	B_UNICODE_IDEOGRAPHIC_DESCRIPTION_CHARACTERS	= 60, // [2FF0]
-	B_UNICODE_HIRAGANA,
+	B_UNICODE_CJK_SYMBOLS_AND_PUNCTUATION			= 61, // [3000]
-	B_UNICODE_KATAKANA,
+	B_UNICODE_HIRAGANA								= 62, // [3040]
-	B_UNICODE_BOPOMOFO,
+	B_UNICODE_KATAKANA								= 63, // [30A0]
-	B_UNICODE_HANGUL_COMPATIBILITY_JAMO,
+	B_UNICODE_BOPOMOFO								= 64, // [3100]
-	B_UNICODE_KANBUN,
+	B_UNICODE_HANGUL_COMPATIBILITY_JAMO				= 65, // [3130]
-	B_UNICODE_BOPOMOFO_EXTENDED,
+	B_UNICODE_KANBUN								= 66, // [3190]
-	B_UNICODE_ENCLOSED_CJK_LETTERS_AND_MONTHS,
+	B_UNICODE_BOPOMOFO_EXTENDED						= 67, // [31A0]
-	B_UNICODE_CJK_COMPATIBILITY,
+	B_UNICODE_ENCLOSED_CJK_LETTERS_AND_MONTHS		= 68, // [3200]
-	B_UNICODE_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A,
+	B_UNICODE_CJK_COMPATIBILITY						= 69, // [3300]
-	B_UNICODE_CJK_UNIFIED_IDEOGRAPHS,
+	B_UNICODE_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A	= 70, // [3400]
-	B_UNICODE_YI_SYLLABLES,
+	B_UNICODE_CJK_UNIFIED_IDEOGRAPHS				= 71, // [4E00]
-	B_UNICODE_YI_RADICALS,
+	B_UNICODE_YI_SYLLABLES							= 72, // [A000]
-	B_UNICODE_HANGUL_SYLLABLES,
+	B_UNICODE_YI_RADICALS							= 73, // [A490]
-	B_UNICODE_HIGH_SURROGATES,
+	B_UNICODE_HANGUL_SYLLABLES						= 74, // [AC00]
-	B_UNICODE_HIGH_PRIVATE_USE_SURROGATES,
+	B_UNICODE_HIGH_SURROGATES						= 75, // [D800]
-	B_UNICODE_LOW_SURROGATES,
+	B_UNICODE_HIGH_PRIVATE_USE_SURROGATES			= 76, // [DB80]
-	B_UNICODE_PRIVATE_USE_AREA,
+	B_UNICODE_LOW_SURROGATES						= 77, // [DC00]
-	B_UNICODE_CJK_COMPATIBILITY_IDEOGRAPHS,
+	B_UNICODE_PRIVATE_USE							= 78,
-	B_UNICODE_ALPHABETIC_PRESENTATION_FORMS,
+	B_UNICODE_PRIVATE_USE_AREA = B_UNICODE_PRIVATE_USE, // [E000]
-	B_UNICODE_ARABIC_PRESENTATION_FORMS_A,
+	B_UNICODE_CJK_COMPATIBILITY_IDEOGRAPHS			= 79, // [F900]
-	B_UNICODE_COMBINING_HALF_MARKS,
+	B_UNICODE_ALPHABETIC_PRESENTATION_FORMS			= 80, // [FB00]
-	B_UNICODE_CJK_COMPATIBILITY_FORMS,
+	B_UNICODE_ARABIC_PRESENTATION_FORMS_A			= 81, // [FB50]
-	B_UNICODE_SMALL_FORM_VARIANTS,
+	B_UNICODE_COMBINING_HALF_MARKS					= 82, // [FE20]
-	B_UNICODE_ARABIC_PRESENTATION_FORMS_B,
+	B_UNICODE_CJK_COMPATIBILITY_FORMS				= 83, // [FE30]
-	B_UNICODE_SPECIALS,
+	B_UNICODE_SMALL_FORM_VARIANTS					= 84, // [FE50]
-	B_UNICODE_HALFWIDTH_AND_FULLWIDTH_FORMS,
+	B_UNICODE_ARABIC_PRESENTATION_FORMS_B			= 85, // [FE70]
+	B_UNICODE_SPECIALS								= 86, // [FFF0]
+	B_UNICODE_HALFWIDTH_AND_FULLWIDTH_FORMS			= 87, // [FF00]
 
-	B_UNICODE_SCRIPT_COUNT,
+	// New blocks in Unicode 3.1
-	B_UNICODE_NO_SCRIPT = B_UNICODE_SCRIPT_COUNT
+	B_UNICODE_OLD_ITALIC							= 88, // [10300]
+	B_UNICODE_GOTHIC								= 89, // [10330]
+	B_UNICODE_DESERET								= 90, // [10400]
+	B_UNICODE_BYZANTINE_MUSICAL_SYMBOLS				= 91, // [1D000]
+	B_UNICODE_MUSICAL_SYMBOLS						= 92, // [1D100]
+	B_UNICODE_MATHEMATICAL_ALPHANUMERIC_SYMBOLS		= 93, // [1D400]
+	B_UNICODE_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B	= 94, // [20000]
+	B_UNICODE_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT = 95, // [2F800]
+	B_UNICODE_TAGS									= 96, // [E0000]
+
+	// New blocks in Unicode
+	B_UNICODE_CYRILLIC_SUPPLEMENTARY				= 97,
+	B_UNICODE_CYRILLIC_SUPPLEMENT = B_UNICODE_CYRILLIC_SUPPLEMENTARY, // [0500]
+	B_UNICODE_TAGALOG								= 98, // [1700]
+	B_UNICODE_HANUNOO								= 99, // [1720]
+	B_UNICODE_BUHID									= 100, // [1740]
+	B_UNICODE_TAGBANWA								= 101, // [1760]
+	B_UNICODE_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A	= 102, // [27C0]
+	B_UNICODE_SUPPLEMENTAL_ARROWS_A					= 103, // [27F0]
+	B_UNICODE_SUPPLEMENTAL_ARROWS_B					= 104, // [2900]
+	B_UNICODE_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B	= 105, // [2980]
+	B_UNICODE_SUPPLEMENTAL_MATHEMATICAL_OPERATORS	= 106, // [2A00]
+	B_UNICODE_KATAKANA_PHONETIC_EXTENSIONS			= 107, // [31F0]
+	B_UNICODE_VARIATION_SELECTORS					= 108, // [FE00]
+	B_UNICODE_SUPPLEMENTARY_PRIVATE_USE_AREA_A		= 109, // [F0000]
+	B_UNICODE_SUPPLEMENTARY_PRIVATE_USE_AREA_B		= 110, // [100000]
+
+	// New blocks in Unicode 4
+	B_UNICODE_LIMBU									= 111, // [1900]
+	B_UNICODE_TAI_LE								= 112, // [1950]
+	B_UNICODE_KHMER_SYMBOLS							= 113, // [19E0]
+	B_UNICODE_PHONETIC_EXTENSIONS					= 114, // [1D00]
+	B_UNICODE_MISCELLANEOUS_SYMBOLS_AND_ARROWS		= 115, // [2B00]
+	B_UNICODE_YIJING_HEXAGRAM_SYMBOLS				= 116, // [4DC0]
+	B_UNICODE_LINEAR_B_SYLLABARY					= 117, // [10000]
+	B_UNICODE_LINEAR_B_IDEOGRAMS					= 118, // [10080]
+	B_UNICODE_AEGEAN_NUMBERS						= 119, // [10100]
+	B_UNICODE_UGARITIC								= 120, // [10380]
+	B_UNICODE_SHAVIAN								= 121, // [10450]
+	B_UNICODE_OSMANYA								= 122, // [10480]
+	B_UNICODE_CYPRIOT_SYLLABARY						= 123, // [10800]
+	B_UNICODE_TAI_XUAN_JING_SYMBOLS					= 124, // [1D300]
+	B_UNICODE_VARIATION_SELECTORS_SUPPLEMENT		= 125, // [E0100]
+
+	// New blocks in Unicode 4.1
+	B_UNICODE_ANCIENT_GREEK_MUSICAL_NOTATION		= 126, // [1D200]
+	B_UNICODE_ANCIENT_GREEK_NUMBERS					= 127, // [10140]
+	B_UNICODE_ARABIC_SUPPLEMENT						= 128, // [0750]
+	B_UNICODE_BUGINESE								= 129, // [1A00]
+	B_UNICODE_CJK_STROKES							= 130, // [31C0]
+	B_UNICODE_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT = 131, // [1DC0]
+	B_UNICODE_COPTIC								= 132, // [2C80]
+	B_UNICODE_ETHIOPIC_EXTENDED						= 133, // [2D80]
+	B_UNICODE_ETHIOPIC_SUPPLEMENT					= 134, // [1380]
+	B_UNICODE_GEORGIAN_SUPPLEMENT					= 135, // [2D00]
+	B_UNICODE_GLAGOLITIC							= 136, // [2C00]
+	B_UNICODE_KHAROSHTHI							= 137, // [10A00]
+	B_UNICODE_MODIFIER_TONE_LETTERS					= 138, // [A700]
+	B_UNICODE_NEW_TAI_LUE							= 139, // [1980]
+	B_UNICODE_OLD_PERSIAN							= 140, // [103A0]
+	B_UNICODE_PHONETIC_EXTENSIONS_SUPPLEMENT		= 141, // [1D80]
+	B_UNICODE_SUPPLEMENTAL_PUNCTUATION				= 142, // [2E00]
+	B_UNICODE_SYLOTI_NAGRI							= 143, // [A800]
+	B_UNICODE_TIFINAGH								= 144, // [2D30]
+	B_UNICODE_VERTICAL_FORMS						= 145, // [FE10]
+
+	// New blocks in Unicode 5.0
+	B_UNICODE_NKO									= 146, // [07C0]
+	B_UNICODE_BALINESE								= 147, // [1B00]
+	B_UNICODE_LATIN_EXTENDED_C						= 148, // [2C60]
+	B_UNICODE_LATIN_EXTENDED_D						= 149, // [A720]
+	B_UNICODE_PHAGS_PA								= 150, // [A840]
+	B_UNICODE_PHOENICIAN							= 151, // [10900]
+	B_UNICODE_CUNEIFORM								= 152, // [12000]
+	B_UNICODE_CUNEIFORM_NUMBERS_AND_PUNCTUATION		= 153, // [12400]
+	B_UNICODE_COUNTING_ROD_NUMERALS					= 154, // [1D360]
+
+	//  New blocks in Unicode 5.1
+	B_UNICODE_SUNDANESE								= 155, // [1B80]
+	B_UNICODE_LEPCHA								= 156, // [1C00]
+	B_UNICODE_OL_CHIKI								= 157, // [1C50]
+	B_UNICODE_CYRILLIC_EXTENDED_A					= 158, // [2DE0]
+	B_UNICODE_VAI									= 159, // [A500]
+	B_UNICODE_CYRILLIC_EXTENDED_B					= 160, // [A640]
+	B_UNICODE_SAURASHTRA							= 161, // [A880]
+	B_UNICODE_KAYAH_LI								= 162, // [A900]
+	B_UNICODE_REJANG								= 163, // [A930]
+	B_UNICODE_CHAM									= 164, // [AA00]
+	B_UNICODE_ANCIENT_SYMBOLS						= 165, // [10190]
+	B_UNICODE_PHAISTOS_DISC							= 166, // [101D0]
+	B_UNICODE_LYCIAN								= 167, // [10280]
+	B_UNICODE_CARIAN								= 168, // [102A0]
+	B_UNICODE_LYDIAN								= 169, // [10920]
+	B_UNICODE_MAHJONG_TILES							= 170, // [1F000]
+	B_UNICODE_DOMINO_TILES							= 171, // [1F030]
+
+	//  New blocks in Unicode 5.2
+	B_UNICODE_SAMARITAN								= 172, // [0800]
+	B_UNICODE_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED = 173, // [18B0]
+	B_UNICODE_TAI_THAM								= 174, // [1A20]
+	B_UNICODE_VEDIC_EXTENSIONS						= 175, // [1CD0]
+	B_UNICODE_LISU									= 176, // [A4D0]
+	B_UNICODE_BAMUM									= 177, // [A6A0]
+	B_UNICODE_COMMON_INDIC_NUMBER_FORMS				= 178, // [A830]
+	B_UNICODE_DEVANAGARI_EXTENDED					= 179, // [A8E0]
+	B_UNICODE_HANGUL_JAMO_EXTENDED_A				= 180, // [A960]
+	B_UNICODE_JAVANESE								= 181, // [A980]
+	B_UNICODE_MYANMAR_EXTENDED_A					= 182, // [AA60]
+	B_UNICODE_TAI_VIET								= 183, // [AA80]
+	B_UNICODE_MEETEI_MAYEK							= 184, // [ABC0]
+	B_UNICODE_HANGUL_JAMO_EXTENDED_B				= 185, // [D7B0]
+	B_UNICODE_IMPERIAL_ARAMAIC						= 186, // [10840]
+	B_UNICODE_OLD_SOUTH_ARABIAN						= 187, // [10A60]
+	B_UNICODE_AVESTAN								= 188, // [10B00]
+	B_UNICODE_INSCRIPTIONAL_PARTHIAN				= 189, // [10B40]
+	B_UNICODE_INSCRIPTIONAL_PAHLAVI					= 190, // [10B60]
+	B_UNICODE_OLD_TURKIC							= 191, // [10C00]
+	B_UNICODE_RUMI_NUMERAL_SYMBOLS					= 192, // [10E60]
+	B_UNICODE_KAITHI								= 193, // [11080]
+	B_UNICODE_EGYPTIAN_HIEROGLYPHS					= 194, // [13000]
+	B_UNICODE_ENCLOSED_ALPHANUMERIC_SUPPLEMENT		= 195, // [1F100]
+	B_UNICODE_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT		= 196, // [1F200]
+	B_UNICODE_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C	= 197, // [2A700]
+
+	//  New blocks in Unicode 6.0
+	B_UNICODE_MANDAIC								= 198, // [0840]
+	B_UNICODE_BATAK									= 199, // [1BC0]
+	B_UNICODE_ETHIOPIC_EXTENDED_A					= 200, // [AB00]
+	B_UNICODE_BRAHMI								= 201, // [11000]
+	B_UNICODE_BAMUM_SUPPLEMENT						= 202, // [16800]
+	B_UNICODE_KANA_SUPPLEMENT						= 203, // [1B000]
+	B_UNICODE_PLAYING_CARDS							= 204, // [1F0A0]
+	B_UNICODE_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS	= 205, // [1F300]
+	B_UNICODE_EMOTICONS								= 206, // [1F600]
+	B_UNICODE_TRANSPORT_AND_MAP_SYMBOLS				= 207, // [1F680]
+	B_UNICODE_ALCHEMICAL_SYMBOLS					= 208, // [1F700]
+	B_UNICODE_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D	= 209, // [2B740]
+
+	B_UNICODE_SCRIPT_COUNT							= 210,
+	B_UNICODE_NO_SCRIPT = B_UNICODE_SCRIPT_COUNT,
+
+	B_UNICODE_INVALID_CODE							= -1
 };
 
 
-/**
+// East Asian Width constants.
- * Values returned by the u_getCellWidth() function.
- */
 
-enum unicode_cell_width
+enum unicode_east_asian_width
 {
-    B_UNICODE_ZERO_WIDTH              = 0,
+	B_UNICODE_EA_NEUTRAL,   // [N]
-    B_UNICODE_HALF_WIDTH              = 1,
+	B_UNICODE_EA_AMBIGUOUS, // [A]
-    B_UNICODE_FULL_WIDTH              = 2,
+	B_UNICODE_EA_HALFWIDTH, // [H]
-    B_UNICODE_NEUTRAL_WIDTH           = 3,
+	B_UNICODE_EA_FULLWIDTH, // [F]
-
+	B_UNICODE_EA_NARROW,	// [Na]
-    B_UNICODE_CELL_WIDTH_COUNT
+	B_UNICODE_EA_WIDE,		// [W]
+	B_UNICODE_EA_COUNT
 };
 
 
@@ -209,6 +347,7 @@ class BUnicodeChar {
 		static uint32 ToUpper(uint32 c);
 		static uint32 ToTitle(uint32 c);
 		static int32 DigitValue(uint32 c);
+		static unicode_east_asian_width EastAsianWidth(uint32 c);
 
 		static void ToUTF8(uint32 c, char **out);
 		static uint32 FromUTF8(const char **in);
@@ -230,4 +369,4 @@ BUnicodeChar::FromUTF8(const char *in)
 }
 
 
-#endif	/* _UNICODE_CHAR_H_ */
+#endif	//  _UNICODE_CHAR_H_

headers/os/support/UTF8.h

@@ -39,7 +39,8 @@ enum {
 	B_ISO15_CONVERSION,
 	B_BIG5_CONVERSION,				// Chinese Big5
 	B_GBK_CONVERSION,				// Chinese GB18030
-	B_UTF16_CONVERSION				// Unicode UTF-16
+	B_UTF16_CONVERSION,				// Unicode UTF-16
+	B_MS_WINDOWS_1250_CONVERSION	// Windows Central European Codepage
 };
 
 

headers/posix/resolv.h

@@ -238,6 +238,7 @@ union res_sockaddr_union {
 #define RES_NOTLDQUERY	0x00100000	/* don't unqualified name as a tld */
 #define RES_USE_DNSSEC	0x00200000	/* use DNSSEC using OK bit in OPT */
 /* #define RES_DEBUG2	0x00400000 */	/* nslookup internal */
+#define RES_USE_INET4	0x00800000	/* use IPv4 in gethostbyname() */
 /* KAME extensions: use higher bit to avoid conflict with ISC use */
 #define RES_USE_DNAME	0x10000000	/* use DNAME */
 #define RES_USE_EDNS0	0x40000000	/* use EDNS0 if configured */

headers/private/app/ServerReadOnlyMemory.h

@@ -13,23 +13,25 @@
 #include <InterfaceDefs.h>
 
 
-static const int32 kNumColors = 34;
+// Update this constant with the largest color constant excluding
+// B_SUCCESS_COLOR and B_FAILURE_COLOR.
+// If you add a constant with index greater than 100 you'll have to add
+// to the second operand.
+static const int32 kColorWhichCount = B_SCROLL_BAR_THUMB_COLOR + 3;
+
 
 struct server_read_only_memory {
-	rgb_color	colors[kNumColors];
+	rgb_color	colors[kColorWhichCount];
 };
 
 
-// NOTE: these functions must be kept in sync with InterfaceDefs.h color_which!
-
 static inline int32
 color_which_to_index(color_which which)
 {
-	// NOTE: this must be kept in sync with InterfaceDefs.h color_which!
+	if (which <= kColorWhichCount - 3)
-	if (which <= B_LIST_SELECTED_ITEM_TEXT_COLOR)
 		return which - 1;
 	if (which >= B_SUCCESS_COLOR && which <= B_FAILURE_COLOR)
-		return which - B_SUCCESS_COLOR + B_LIST_SELECTED_ITEM_TEXT_COLOR;
+		return which - B_SUCCESS_COLOR + kColorWhichCount - 3;
 
 	return -1;
 }
@@ -38,12 +40,12 @@ color_which_to_index(color_which which)
 static inline color_which
 index_to_color_which(int32 index)
 {
-	if (index >= 0 && index < kNumColors) {
+	if (index >= 0 && index < kColorWhichCount) {
-		if ((color_which)index < B_LIST_SELECTED_ITEM_TEXT_COLOR)
+		if ((color_which)index < kColorWhichCount - 3)
 			return (color_which)(index + 1);
 		else {
 			return (color_which)(index + B_SUCCESS_COLOR
-			  - B_LIST_SELECTED_ITEM_TEXT_COLOR);
+				- kColorWhichCount - 3);
 		}
 	}
 

headers/private/kernel/arch/arm/arch_kernel.h

@@ -25,7 +25,7 @@
 #define USER_SIZE		(0x80000000 - (0x10000 + 0x100000))
 #define USER_TOP		(USER_BASE + (USER_SIZE - 1))
 
-#define KERNEL_USER_DATA_BASE	0x6fff0000
+#define KERNEL_USER_DATA_BASE	0x60000000
 #define USER_STACK_REGION	0x70000000
 #define USER_STACK_REGION_SIZE	((USER_TOP - USER_STACK_REGION) + 1)
 

headers/private/kernel/arch/m68k/arch_kernel.h

@@ -25,7 +25,7 @@
 #define USER_SIZE     (0x80000000 - (0x10000 + 0x100000))
 #define USER_TOP      (USER_BASE + (USER_SIZE - 1))
 
-#define KERNEL_USER_DATA_BASE  0x6fff0000
+#define KERNEL_USER_DATA_BASE	0x60000000
 #define USER_STACK_REGION              0x70000000
 #define USER_STACK_REGION_SIZE ((USER_TOP - USER_STACK_REGION) + 1)
 

headers/private/kernel/arch/mipsel/arch_kernel.h

@@ -28,7 +28,7 @@
 #define USER_SIZE     (0x80000000 - (0x10000 + 0x100000))
 #define USER_TOP      (USER_BASE + (USER_SIZE - 1))
 
-#define KERNEL_USER_DATA_BASE  0x6fff0000
+#define KERNEL_USER_DATA_BASE	0x60000000
 #define USER_STACK_REGION              0x70000000
 #define USER_STACK_REGION_SIZE ((USER_TOP - USER_STACK_REGION) + 1)
 

headers/private/kernel/arch/ppc/arch_kernel.h

@@ -25,7 +25,7 @@
 #define USER_SIZE     (0x80000000 - (0x10000 + 0x100000))
 #define USER_TOP      (USER_BASE + (USER_SIZE - 1))
 
-#define KERNEL_USER_DATA_BASE  0x6fff0000
+#define KERNEL_USER_DATA_BASE	0x60000000
 #define USER_STACK_REGION              0x70000000
 #define USER_STACK_REGION_SIZE ((USER_TOP - USER_STACK_REGION) + 1)
 

headers/private/kernel/arch/x86/arch_cpu.h

@@ -39,6 +39,11 @@
 
 #define IA32_MSR_EFER					0xc0000080
 
+// MSR EFER bits
+// reference
+#define IA32_MSR_EFER_SYSCALL			(1 << 0)
+#define IA32_MSR_EFER_NX				(1 << 11)
+
 // x86_64 MSRs.
 #define IA32_MSR_STAR					0xc0000081
 #define IA32_MSR_LSTAR					0xc0000082
@@ -131,6 +136,13 @@
 #define IA32_FEATURE_AMD_EXT_3DNOWEXT	(1 << 30) // 3DNow! extensions
 #define IA32_FEATURE_AMD_EXT_3DNOW		(1 << 31) // 3DNow!
 
+// some of the features from cpuid eax 0x80000001, edx register (AMD) are also
+// available on Intel processors
+#define IA32_FEATURES_INTEL_EXT			(IA32_FEATURE_AMD_EXT_SYSCALL		\
+											| IA32_FEATURE_AMD_EXT_NX		\
+											| IA32_FEATURE_AMD_EXT_RDTSCP	\
+											| IA32_FEATURE_AMD_EXT_LONG)
+
 // x86 defined features from cpuid eax 6, eax register
 // reference http://www.intel.com/Assets/en_US/PDF/appnote/241618.pdf (Table 5-11)
 #define IA32_FEATURE_DTS	(1 << 0) //Digital Thermal Sensor

headers/private/kernel/arch/x86/arch_kernel.h

@@ -48,8 +48,8 @@
 #define USER_SIZE				(0x800000000000 - 0x200000)
 #define USER_TOP				(USER_BASE + (USER_SIZE - 1))
 
-#define KERNEL_USER_DATA_BASE	0x7fffefff0000
+#define KERNEL_USER_DATA_BASE	0x7f0000000000
-#define USER_STACK_REGION		0x7ffff0000000
+#define USER_STACK_REGION		0x7f0000000000
 #define USER_STACK_REGION_SIZE	((USER_TOP - USER_STACK_REGION) + 1)
 
 
@@ -76,7 +76,7 @@
 #define USER_SIZE				(KERNEL_BASE - 0x10000)
 #define USER_TOP				(USER_BASE + (USER_SIZE - 1))
 
-#define KERNEL_USER_DATA_BASE	0x6fff0000
+#define KERNEL_USER_DATA_BASE	0x60000000
 #define USER_STACK_REGION		0x70000000
 #define USER_STACK_REGION_SIZE	((USER_TOP - USER_STACK_REGION) + 1)
 

headers/private/kernel/commpage.h

@@ -18,8 +18,9 @@ extern "C" {
 status_t	commpage_init(void);
 status_t	commpage_init_post_cpus(void);
 void*		allocate_commpage_entry(int entry, size_t size);
-void*		fill_commpage_entry(int entry, const void* copyFrom, size_t size);
+addr_t		fill_commpage_entry(int entry, const void* copyFrom, size_t size);
 image_id	get_commpage_image();
+area_id		clone_commpage_area(team_id team, void** address);
 
 // implemented in the architecture specific part
 status_t	arch_commpage_init(void);

headers/private/kernel/ksignal.h

@@ -52,6 +52,7 @@ struct signal_frame_data {
 	int32		thread_flags;
 	uint64		syscall_restart_return_value;
 	uint8		syscall_restart_parameters[SYSCALL_RESTART_PARAMETER_SIZE];
+	void*		commpage_address;
 };
 
 

headers/private/kernel/thread_types.h

@@ -259,6 +259,8 @@ struct Team : TeamThreadIteratorEntry<team_id>, KernelReferenceable,
 	size_t			used_user_data;
 	struct free_user_thread* free_user_threads;
 
+	void*			commpage_address;
+
 	struct team_debug_info debug_info;
 
 	// protected by scheduler lock

headers/private/kernel/util/Random.h

@@ -0,0 +1,87 @@
+/*
+ * Copyright 2013 Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Paweł Dziepak, pdziepak@quarnos.org
+ */
+#ifndef KERNEL_UTIL_RANDOM_H
+#define KERNEL_UTIL_RANDOM_H
+
+
+#include <smp.h>
+#include <SupportDefs.h>
+
+
+#define MAX_FAST_RANDOM_VALUE		0x7fff
+#define MAX_RANDOM_VALUE			0x7fffffffu
+#define MAX_SECURE_RANDOM_VALUE		0xffffffffu
+
+static const int	kFastRandomShift		= 15;
+static const int	kRandomShift			= 31;
+static const int	kSecureRandomShift		= 32;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+unsigned int	fast_random_value(void);
+unsigned int	random_value(void);
+unsigned int	secure_random_value(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#ifdef __cplusplus
+
+template<typename T>
+T
+fast_get_random()
+{
+	size_t shift = 0;
+	T random = 0;
+	while (shift < sizeof(T) * 8) {
+		random |= (T)fast_random_value() << shift;
+		shift += kFastRandomShift;
+	}
+
+	return random;
+}
+
+
+template<typename T>
+T
+get_random()
+{
+	size_t shift = 0;
+	T random = 0;
+	while (shift < sizeof(T) * 8) {
+		random |= (T)random_value() << shift;
+		shift += kRandomShift;
+	}
+
+	return random;
+}
+
+
+template<typename T>
+T
+secure_get_random()
+{
+	size_t shift = 0;
+	T random = 0;
+	while (shift < sizeof(T) * 8) {
+		random |= (T)secure_random_value() << shift;
+		shift += kSecureRandomShift;
+	}
+
+	return random;
+}
+
+
+#endif	// __cplusplus
+
+#endif	// KERNEL_UTIL_RANDOM_H
+

headers/private/kernel/vm/vm.h

@@ -121,6 +121,8 @@ status_t vm_delete_area(team_id teamID, area_id areaID, bool kernel);
 status_t vm_create_vnode_cache(struct vnode *vnode, struct VMCache **_cache);
 status_t vm_set_area_memory_type(area_id id, phys_addr_t physicalBase,
 			uint32 type);
+status_t vm_set_area_protection(team_id team, area_id areaID,
+			uint32 newProtection, bool kernel);
 status_t vm_get_page_mapping(team_id team, addr_t vaddr, phys_addr_t *paddr);
 bool vm_test_map_modification(struct vm_page *page);
 void vm_clear_map_flags(struct vm_page *page, uint32 flags);

headers/private/kernel/vm/vm_priv.h

@@ -28,7 +28,7 @@ extern "C" {
 
 // Should only be used by vm internals
 status_t vm_page_fault(addr_t address, addr_t faultAddress, bool isWrite,
-	bool isUser, addr_t *newip);
+	bool isExecute, bool isUser, addr_t *newip);
 void vm_unreserve_memory(size_t bytes);
 status_t vm_try_reserve_memory(size_t bytes, int priority, bigtime_t timeout);
 status_t vm_daemon_init(void);

headers/private/libroot/libroot_private.h

@@ -34,7 +34,7 @@ void __init_env(const struct user_space_program_args *args);
 void __init_heap(void);
 void __init_heap_post_env(void);
 
-void __init_time(void);
+void __init_time(addr_t commPageTable);
 void __arch_init_time(struct real_time_data *data, bool setDefaults);
 bigtime_t __arch_get_system_time_offset(struct real_time_data *data);
 bigtime_t __get_system_time_offset();

headers/private/net/NetServer.h

@@ -19,6 +19,7 @@
 #define kMsgRemovePersistentNetwork	'RPnw'
 #define kMsgJoinNetwork				'JNnw'
 #define kMsgLeaveNetwork			'LVnw'
+#define kMsgAutoJoinNetwork			'AJnw'
 
 
 #endif	// _NET_SERVER_H

headers/private/runtime_loader/runtime_loader.h

@@ -51,6 +51,7 @@ struct rld_export {
 	void (*call_termination_hooks)();
 
 	const struct user_space_program_args *program_args;
+	const void* commpage_address;
 };
 
 extern struct rld_export *__gRuntimeLoader;

headers/private/shared/cpu_type.h

@@ -19,7 +19,7 @@ extern "C" {
 #endif
 
 const char *get_cpu_vendor_string(enum cpu_types type);
-const char *get_cpu_model_string(system_info *info);
+const char *get_cpu_model_string(const system_info *info);
 void get_cpu_type(char *vendorBuffer, size_t vendorSize,
 		char *modelBuffer, size_t modelSize);
 int32 get_rounded_cpu_speed(void);
@@ -257,7 +257,7 @@ get_cpuid_model_string(char *name)
 
 
 const char *
-get_cpu_model_string(system_info *info)
+get_cpu_model_string(const system_info *info)
 {
 #if defined(__INTEL__) || defined(__x86_64__)
 	char cpuidName[49];

headers/private/system/arch/arm/arch_commpage_defs.h

@@ -12,8 +12,4 @@
 //#define COMMPAGE_ENTRY_M68K_SYSCALL	(COMMPAGE_ENTRY_FIRST_ARCH_SPECIFIC + 0)
 //#define COMMPAGE_ENTRY_M68K_MEMCPY	(COMMPAGE_ENTRY_FIRST_ARCH_SPECIFIC + 1)
 
-/* 0xffff0000 colides with IO space mapped with TT1 on Atari */
-#warning ARM: determine good place for compage..
-#define ARCH_USER_COMMPAGE_ADDR (0xfeff0000)
-
 #endif	/* _SYSTEM_ARCH_M68K_COMMPAGE_DEFS_H */

headers/private/system/arch/m68k/arch_commpage_defs.h

@@ -12,7 +12,4 @@
 #define COMMPAGE_ENTRY_M68K_SYSCALL	(COMMPAGE_ENTRY_FIRST_ARCH_SPECIFIC + 0)
 #define COMMPAGE_ENTRY_M68K_MEMCPY	(COMMPAGE_ENTRY_FIRST_ARCH_SPECIFIC + 1)
 
-/* 0xffff0000 colides with IO space mapped with TT1 on Atari */
-#define ARCH_USER_COMMPAGE_ADDR (0xfeff0000)
-
 #endif	/* _SYSTEM_ARCH_M68K_COMMPAGE_DEFS_H */

headers/private/system/arch/mipsel/arch_commpage_defs.h

@@ -14,7 +14,5 @@
 #define COMMPAGE_ENTRY_MIPSEL_SYSCALL	(COMMPAGE_ENTRY_FIRST_ARCH_SPECIFIC + 0)
 #define COMMPAGE_ENTRY_MIPSEL_MEMCPY	(COMMPAGE_ENTRY_FIRST_ARCH_SPECIFIC + 1)
 
-#define ARCH_USER_COMMPAGE_ADDR (0xffff0000)
-
 #endif	/* _SYSTEM_ARCH_MIPSEL_COMMPAGE_DEFS_H */
 

headers/private/system/arch/ppc/arch_commpage_defs.h

@@ -12,6 +12,4 @@
 #define COMMPAGE_ENTRY_PPC_SYSCALL	(COMMPAGE_ENTRY_FIRST_ARCH_SPECIFIC + 0)
 #define COMMPAGE_ENTRY_PPC_MEMCPY	(COMMPAGE_ENTRY_FIRST_ARCH_SPECIFIC + 1)
 
-#define ARCH_USER_COMMPAGE_ADDR (0xffff0000)
-
 #endif	/* _SYSTEM_ARCH_PPC_COMMPAGE_DEFS_H */

headers/private/system/arch/x86/arch_commpage_defs.h

@@ -16,7 +16,7 @@
 									(COMMPAGE_ENTRY_FIRST_ARCH_SPECIFIC + 3)
 #define COMMPAGE_ENTRY_X86_SIGNAL_HANDLER_BEOS \
 									(COMMPAGE_ENTRY_FIRST_ARCH_SPECIFIC + 4)
-
+#define COMMPAGE_ENTRY_X86_THREAD_EXIT \
-#define ARCH_USER_COMMPAGE_ADDR (0xffff0000)
+									(COMMPAGE_ENTRY_FIRST_ARCH_SPECIFIC + 5)
 
 #endif	/* _SYSTEM_ARCH_x86_COMMPAGE_DEFS_H */

headers/private/system/arch/x86_64/arch_commpage_defs.h

@@ -13,7 +13,7 @@
 #define COMMPAGE_ENTRY_X86_MEMSET	(COMMPAGE_ENTRY_FIRST_ARCH_SPECIFIC + 1)
 #define COMMPAGE_ENTRY_X86_SIGNAL_HANDLER \
 									(COMMPAGE_ENTRY_FIRST_ARCH_SPECIFIC + 2)
-
+#define COMMPAGE_ENTRY_X86_THREAD_EXIT \
-#define ARCH_USER_COMMPAGE_ADDR		(0xffffffffffff0000)
+									(COMMPAGE_ENTRY_FIRST_ARCH_SPECIFIC + 3)
 
 #endif	/* _SYSTEM_ARCH_x86_64_COMMPAGE_DEFS_H */

headers/private/system/commpage_defs.h

@@ -19,11 +19,6 @@
 #define COMMPAGE_SIGNATURE 'COMM'
 #define COMMPAGE_VERSION 1
 
-#define USER_COMMPAGE_ADDR	ARCH_USER_COMMPAGE_ADDR
-	// set by the architecture specific implementation
-
-#define USER_COMMPAGE_TABLE	((void**)(USER_COMMPAGE_ADDR))
-
 #include <arch_commpage_defs.h>
 
 #endif	/* _SYSTEM_COMMPAGE_DEFS_H */

headers/private/system/thread_defs.h

@@ -15,7 +15,7 @@
 #define USER_STACK_GUARD_SIZE		(4 * B_PAGE_SIZE)		// 16 kB
 #define USER_MAIN_THREAD_STACK_SIZE	(16 * 1024 * 1024)		// 16 MB
 #define USER_STACK_SIZE				(256 * 1024)			// 256 kB
-#define MIN_USER_STACK_SIZE			(4 * 1024)				// 4 KB
+#define MIN_USER_STACK_SIZE			(8 * 1024)				// 8 kB
 #define MAX_USER_STACK_SIZE			(16 * 1024 * 1024)		// 16 MB