From 5421c7d682a251f1cbcdfa1bf870ca1170584135 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.ath.cx>
Date: Tue, 20 Jul 2010 13:11:13 +0000
Subject: [PATCH]  * Fix all localized applications, as an include was missing
 in some of them  * dstcheck : the generated catalog is now 'dstcheck.catkeys'
 instead of 'en.catkeys', so that it does not conflict with other localized
 apps in the bin/ folder.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37617 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/bootman/BootManagerController.cpp    |  1 +
 src/apps/bootman/BootManagerWindow.cpp        |  1 +
 src/apps/bootman/DefaultPartitionPage.cpp     |  1 +
 src/apps/bootman/EntryPage.cpp                |  1 +
 src/apps/bootman/FileSelectionPage.cpp        |  1 +
 src/apps/bootman/LegacyBootDrive.cpp          |  1 +
 src/apps/bootman/PartitionsPage.cpp           |  1 +
 src/apps/bootman/UninstallPage.cpp            |  1 +
 src/apps/bootman/WizardView.cpp               |  1 +
 src/apps/drivesetup/CreateParamsPanel.cpp     |  1 +
 src/apps/drivesetup/DiskView.cpp              |  1 +
 src/apps/drivesetup/InitParamsPanel.cpp       |  1 +
 src/apps/drivesetup/MainWindow.cpp            |  1 +
 src/apps/drivesetup/PartitionList.cpp         |  1 +
 src/apps/drivesetup/Support.cpp               |  1 +
 src/apps/installer/PackageViews.cpp           |  1 +
 src/apps/installer/ProgressReporter.cpp       |  1 +
 src/apps/installer/WorkerThread.cpp           |  1 +
 src/apps/mail/Prefs.cpp                       | 21 +++++++++----------
 .../readonlybootprompt/BootPromptWindow.cpp   |  3 ++-
 src/bin/Jamfile                               |  1 +
 src/preferences/locale/LanguageListView.cpp   |  3 ++-
 src/preferences/print/AddPrinterDialog.cpp    |  3 ++-
 src/preferences/print/JobListView.cpp         |  1 +
 src/preferences/print/PrinterListView.cpp     |  1 +
 src/preferences/print/PrintersWindow.cpp      |  1 +
 src/preferences/touchpad/TouchpadPrefView.cpp |  1 +
 src/servers/print/PrintServerApp.R5.cpp       |  1 +
 28 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/src/apps/bootman/BootManagerController.cpp b/src/apps/bootman/BootManagerController.cpp
index 0a82b4e78a..445b81700e 100644
--- a/src/apps/bootman/BootManagerController.cpp
+++ b/src/apps/bootman/BootManagerController.cpp
@@ -31,6 +31,7 @@
 #include <Catalog.h>
 #include <File.h>
 #include <FindDirectory.h>
+#include <Locale.h>
 #include <Path.h>
 #include <String.h>
 
diff --git a/src/apps/bootman/BootManagerWindow.cpp b/src/apps/bootman/BootManagerWindow.cpp
index 4bd2ae919f..5724eb7b40 100644
--- a/src/apps/bootman/BootManagerWindow.cpp
+++ b/src/apps/bootman/BootManagerWindow.cpp
@@ -17,6 +17,7 @@
 
 #include <Application.h>
 #include <Catalog.h>
+#include <Locale.h>
 #include <Roster.h>
 #include <Screen.h>
 
diff --git a/src/apps/bootman/DefaultPartitionPage.cpp b/src/apps/bootman/DefaultPartitionPage.cpp
index 81e889db85..5901baad32 100644
--- a/src/apps/bootman/DefaultPartitionPage.cpp
+++ b/src/apps/bootman/DefaultPartitionPage.cpp
@@ -12,6 +12,7 @@
 
 #include <Catalog.h>
 #include <ControlLook.h>
+#include <Locale.h>
 #include <Message.h>
 #include <MenuItem.h>
 #include <MenuField.h>
diff --git a/src/apps/bootman/EntryPage.cpp b/src/apps/bootman/EntryPage.cpp
index 995d8cf02f..a78083b10a 100644
--- a/src/apps/bootman/EntryPage.cpp
+++ b/src/apps/bootman/EntryPage.cpp
@@ -11,6 +11,7 @@
 
 
 #include <Catalog.h>
+#include <Locale.h>
 #include <RadioButton.h>
 #include <TextView.h>
 
diff --git a/src/apps/bootman/FileSelectionPage.cpp b/src/apps/bootman/FileSelectionPage.cpp
index 6f35f7be22..f8fe4d6423 100644
--- a/src/apps/bootman/FileSelectionPage.cpp
+++ b/src/apps/bootman/FileSelectionPage.cpp
@@ -12,6 +12,7 @@
 
 #include <Button.h>
 #include <Catalog.h>
+#include <Locale.h>
 #include <Path.h>
 #include <RadioButton.h>
 #include <TextControl.h>
diff --git a/src/apps/bootman/LegacyBootDrive.cpp b/src/apps/bootman/LegacyBootDrive.cpp
index 79538bafcb..ca84cb1b5c 100644
--- a/src/apps/bootman/LegacyBootDrive.cpp
+++ b/src/apps/bootman/LegacyBootDrive.cpp
@@ -15,6 +15,7 @@
 #include <DiskDevice.h>
 #include <DiskDeviceRoster.h>
 #include <DiskDeviceVisitor.h>
+#include <Locale.h>
 #include <Partition.h>
 #include <Path.h>
 #include <String.h>
diff --git a/src/apps/bootman/PartitionsPage.cpp b/src/apps/bootman/PartitionsPage.cpp
index b42aeda8f3..1be63bc15e 100644
--- a/src/apps/bootman/PartitionsPage.cpp
+++ b/src/apps/bootman/PartitionsPage.cpp
@@ -13,6 +13,7 @@
 
 #include <Catalog.h>
 #include <CheckBox.h>
+#include <Locale.h>
 #include <RadioButton.h>
 #include <ScrollView.h>
 #include <StringView.h>
diff --git a/src/apps/bootman/UninstallPage.cpp b/src/apps/bootman/UninstallPage.cpp
index 90bbb03110..5b926b476b 100644
--- a/src/apps/bootman/UninstallPage.cpp
+++ b/src/apps/bootman/UninstallPage.cpp
@@ -11,6 +11,7 @@
 
 
 #include <Catalog.h>
+#include <Locale.h>
 #include <RadioButton.h>
 #include <TextView.h>
 
diff --git a/src/apps/bootman/WizardView.cpp b/src/apps/bootman/WizardView.cpp
index 395bece630..1fee38f475 100644
--- a/src/apps/bootman/WizardView.cpp
+++ b/src/apps/bootman/WizardView.cpp
@@ -13,6 +13,7 @@
 
 #include <Box.h>
 #include <Catalog.h>
+#include <Locale.h>
 
 
 #undef B_TRANSLATE_CONTEXT
diff --git a/src/apps/drivesetup/CreateParamsPanel.cpp b/src/apps/drivesetup/CreateParamsPanel.cpp
index 4429791a49..cab043b89c 100644
--- a/src/apps/drivesetup/CreateParamsPanel.cpp
+++ b/src/apps/drivesetup/CreateParamsPanel.cpp
@@ -18,6 +18,7 @@
 #include <GridLayoutBuilder.h>
 #include <GroupLayout.h>
 #include <GroupLayoutBuilder.h>
+#include <Locale.h>
 #include <MenuField.h>
 #include <MenuItem.h>
 #include <Message.h>
diff --git a/src/apps/drivesetup/DiskView.cpp b/src/apps/drivesetup/DiskView.cpp
index 4802df205d..2ce23a76d2 100644
--- a/src/apps/drivesetup/DiskView.cpp
+++ b/src/apps/drivesetup/DiskView.cpp
@@ -12,6 +12,7 @@
 #include <GroupLayout.h>
 #include <HashMap.h>
 #include <LayoutItem.h>
+#include <Locale.h>
 #include <PartitioningInfo.h>
 #include <String.h>
 
diff --git a/src/apps/drivesetup/InitParamsPanel.cpp b/src/apps/drivesetup/InitParamsPanel.cpp
index 2d7b6478fd..566716e72e 100644
--- a/src/apps/drivesetup/InitParamsPanel.cpp
+++ b/src/apps/drivesetup/InitParamsPanel.cpp
@@ -18,6 +18,7 @@
 #include <ControlLook.h>
 #include <GroupLayout.h>
 #include <GroupLayoutBuilder.h>
+#include <Locale.h>
 #include <Message.h>
 #include <MessageFilter.h>
 #include <String.h>
diff --git a/src/apps/drivesetup/MainWindow.cpp b/src/apps/drivesetup/MainWindow.cpp
index 9f3a7c8cbf..045f3f0665 100644
--- a/src/apps/drivesetup/MainWindow.cpp
+++ b/src/apps/drivesetup/MainWindow.cpp
@@ -24,6 +24,7 @@
 #include <DiskDeviceVisitor.h>
 #include <DiskDeviceTypes.h>
 #include <DiskSystem.h>
+#include <Locale.h>
 #include <MenuItem.h>
 #include <MenuBar.h>
 #include <Menu.h>
diff --git a/src/apps/drivesetup/PartitionList.cpp b/src/apps/drivesetup/PartitionList.cpp
index 02761de1e7..401557533c 100644
--- a/src/apps/drivesetup/PartitionList.cpp
+++ b/src/apps/drivesetup/PartitionList.cpp
@@ -12,6 +12,7 @@
 
 #include <Catalog.h>
 #include <ColumnTypes.h>
+#include <Locale.h>
 #include <Path.h>
 
 #include "Support.h"
diff --git a/src/apps/drivesetup/Support.cpp b/src/apps/drivesetup/Support.cpp
index 86cbe95c5d..49e59bdba7 100644
--- a/src/apps/drivesetup/Support.cpp
+++ b/src/apps/drivesetup/Support.cpp
@@ -14,6 +14,7 @@
 #include <stdio.h>
 
 #include <Catalog.h>
+#include <Locale.h>
 #include <Partition.h>
 #include <String.h>
 
diff --git a/src/apps/installer/PackageViews.cpp b/src/apps/installer/PackageViews.cpp
index 33249516f3..f1b410be54 100644
--- a/src/apps/installer/PackageViews.cpp
+++ b/src/apps/installer/PackageViews.cpp
@@ -14,6 +14,7 @@
 #include <Entry.h>
 #include <fs_attr.h>
 #include <LayoutUtils.h>
+#include <Locale.h>
 #include <Messenger.h>
 #include <ScrollBar.h>
 #include <String.h>
diff --git a/src/apps/installer/ProgressReporter.cpp b/src/apps/installer/ProgressReporter.cpp
index 30dda53281..7f8c6b5042 100644
--- a/src/apps/installer/ProgressReporter.cpp
+++ b/src/apps/installer/ProgressReporter.cpp
@@ -8,6 +8,7 @@
 #include <stdio.h>
 
 #include <Catalog.h>
+#include <Locale.h>
 
 
 #undef B_TRANSLATE_CONTEXT
diff --git a/src/apps/installer/WorkerThread.cpp b/src/apps/installer/WorkerThread.cpp
index c77f8d6651..581ae9d4b5 100644
--- a/src/apps/installer/WorkerThread.cpp
+++ b/src/apps/installer/WorkerThread.cpp
@@ -15,6 +15,7 @@
 #include <DiskDeviceVisitor.h>
 #include <DiskDeviceTypes.h>
 #include <FindDirectory.h>
+#include <Locale.h>
 #include <Menu.h>
 #include <MenuItem.h>
 #include <Message.h>
diff --git a/src/apps/mail/Prefs.cpp b/src/apps/mail/Prefs.cpp
index 63f6217f67..8b69347e84 100644
--- a/src/apps/mail/Prefs.cpp
+++ b/src/apps/mail/Prefs.cpp
@@ -38,20 +38,19 @@ of their respective holders. All rights reserved.
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <InterfaceKit.h>
-#include <StorageKit.h>
-#include <E-mail.h>
+
 #include <Application.h>
-
-# include <GridView.h>
-# include <GroupLayoutBuilder.h>
-
-#include <MailSettings.h>
-#include <mail_encoding.h>
-
-#include <String.h>
 #include <CharacterSet.h>
 #include <CharacterSetRoster.h>
+#include <E-mail.h>
+#include <GridView.h>
+#include <GroupLayoutBuilder.h>
+#include <InterfaceKit.h>
+#include <Locale.h>
+#include <MailSettings.h>
+#include <mail_encoding.h>
+#include <StorageKit.h>
+#include <String.h>
 
 using namespace BPrivate;
 
diff --git a/src/apps/readonlybootprompt/BootPromptWindow.cpp b/src/apps/readonlybootprompt/BootPromptWindow.cpp
index d578e91398..609ccd3d93 100644
--- a/src/apps/readonlybootprompt/BootPromptWindow.cpp
+++ b/src/apps/readonlybootprompt/BootPromptWindow.cpp
@@ -178,7 +178,8 @@ void
 BootPromptWindow::_InitCatalog(bool saveSettings)
 {
 	// Initilialize the Locale Kit
-	BCatalogStub::ForceReload();
+	// TODO : not possible with the current API !
+	// sCatalogInitOnce = false;
 
 	// Generate a settings file
 	// TODO: This should not be necessary.
diff --git a/src/bin/Jamfile b/src/bin/Jamfile
index 9026b6960f..9ef8195ee4 100644
--- a/src/bin/Jamfile
+++ b/src/bin/Jamfile
@@ -217,6 +217,7 @@ StdBinCommands
 DoCatalogs dstcheck :
 	x-vnd.Haiku-cmd-dstconfig
 	: dstcheck.cpp
+	: dstcheck
 ;
 
 SubInclude HAIKU_TOP src bin addattr ;
diff --git a/src/preferences/locale/LanguageListView.cpp b/src/preferences/locale/LanguageListView.cpp
index 55db29f817..db8e1043af 100644
--- a/src/preferences/locale/LanguageListView.cpp
+++ b/src/preferences/locale/LanguageListView.cpp
@@ -17,8 +17,9 @@
 #include <new>
 
 #include <Bitmap.h>
-#include <Country.h>
 #include <Catalog.h>
+#include <Country.h>
+#include <Locale.h>
 #include <Window.h>
 
 
diff --git a/src/preferences/print/AddPrinterDialog.cpp b/src/preferences/print/AddPrinterDialog.cpp
index b5aafccb5b..160f6c8375 100644
--- a/src/preferences/print/AddPrinterDialog.cpp
+++ b/src/preferences/print/AddPrinterDialog.cpp
@@ -18,9 +18,10 @@
 #include <GridLayout.h>
 #include <GridLayoutBuilder.h>
 #include <GroupLayoutBuilder.h>
+#include <Layout.h>
+#include <Locale.h>
 #include <MenuField.h>
 #include <MenuItem.h>
-#include <Layout.h>
 #include <NodeInfo.h>
 #include <Path.h>
 
diff --git a/src/preferences/print/JobListView.cpp b/src/preferences/print/JobListView.cpp
index bc057c1d08..fd61ac59c7 100644
--- a/src/preferences/print/JobListView.cpp
+++ b/src/preferences/print/JobListView.cpp
@@ -12,6 +12,7 @@
 #include <stdio.h>
 
 #include <Catalog.h>
+#include <Locale.h>
 #include <MimeType.h>
 #include <Roster.h>
 #include <Window.h>
diff --git a/src/preferences/print/PrinterListView.cpp b/src/preferences/print/PrinterListView.cpp
index bb953f90f4..7342a539df 100644
--- a/src/preferences/print/PrinterListView.cpp
+++ b/src/preferences/print/PrinterListView.cpp
@@ -12,6 +12,7 @@
 #include <Bitmap.h>
 #include <Catalog.h>
 #include <Directory.h>
+#include <Locale.h>
 #include <Mime.h>
 #include <NodeInfo.h>
 #include <String.h>
diff --git a/src/preferences/print/PrintersWindow.cpp b/src/preferences/print/PrintersWindow.cpp
index 0c169b375f..c96793f02f 100644
--- a/src/preferences/print/PrintersWindow.cpp
+++ b/src/preferences/print/PrintersWindow.cpp
@@ -15,6 +15,7 @@
 #include <Catalog.h>
 #include <FindDirectory.h>
 #include <ListView.h>
+#include <Locale.h>
 #include <ScrollView.h>
 
 #include "pr_server.h"
diff --git a/src/preferences/touchpad/TouchpadPrefView.cpp b/src/preferences/touchpad/TouchpadPrefView.cpp
index 8fdff468a7..dcdd6a51b8 100644
--- a/src/preferences/touchpad/TouchpadPrefView.cpp
+++ b/src/preferences/touchpad/TouchpadPrefView.cpp
@@ -19,6 +19,7 @@
 #include <FindDirectory.h>
 #include <Input.h>
 #include <LayoutBuilder.h>
+#include <Locale.h>
 #include <MenuField.h>
 #include <MenuItem.h>
 #include <Message.h>
diff --git a/src/servers/print/PrintServerApp.R5.cpp b/src/servers/print/PrintServerApp.R5.cpp
index 112bae099b..3190160ef1 100644
--- a/src/servers/print/PrintServerApp.R5.cpp
+++ b/src/servers/print/PrintServerApp.R5.cpp
@@ -16,6 +16,7 @@
 #include <Alert.h>
 #include <Autolock.h>
 #include <Catalog.h>
+#include <Locale.h>
 #include <PrintJob.h>