[haiku-commits] r40980 - in haiku/trunk/src/preferences: appearance backgrounds bluetooth cpufrequency datatranslations ...

  • From: jonas@xxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Wed, 16 Mar 2011 21:33:35 +0100 (CET)

Author: kirilla
Date: 2011-03-16 21:33:35 +0100 (Wed, 16 Mar 2011)
New Revision: 40980
Changeset: http://dev.haiku-os.org/changeset/40980

Modified:
   haiku/trunk/src/preferences/appearance/APRWindow.cpp
   haiku/trunk/src/preferences/backgrounds/Backgrounds.cpp
   haiku/trunk/src/preferences/bluetooth/BluetoothWindow.cpp
   haiku/trunk/src/preferences/bluetooth/InquiryPanel.cpp
   haiku/trunk/src/preferences/cpufrequency/main.cpp
   haiku/trunk/src/preferences/datatranslations/DataTranslationsWindow.cpp
   haiku/trunk/src/preferences/deskbar/DeskbarPreferences.cpp
   haiku/trunk/src/preferences/deskbar/Jamfile
   haiku/trunk/src/preferences/filetypes/FileTypesWindow.cpp
   haiku/trunk/src/preferences/fonts/MainWindow.cpp
   haiku/trunk/src/preferences/keyboard/KeyboardWindow.cpp
   haiku/trunk/src/preferences/keymap/KeymapWindow.cpp
   haiku/trunk/src/preferences/locale/LocaleWindow.cpp
   haiku/trunk/src/preferences/mail/ConfigWindow.cpp
   haiku/trunk/src/preferences/media/MediaWindow.cpp
   haiku/trunk/src/preferences/mouse/MouseWindow.cpp
   haiku/trunk/src/preferences/network/NetworkWindow.cpp
   haiku/trunk/src/preferences/notifications/PrefletWin.cpp
   haiku/trunk/src/preferences/opengl/Jamfile
   haiku/trunk/src/preferences/opengl/OpenGLWindow.cpp
   haiku/trunk/src/preferences/printers/PrintersWindow.cpp
   haiku/trunk/src/preferences/screen/ScreenWindow.cpp
   haiku/trunk/src/preferences/screensaver/ScreenSaverWindow.cpp
   haiku/trunk/src/preferences/shortcuts/ShortcutsWindow.cpp
   haiku/trunk/src/preferences/sounds/HApp.cpp
   haiku/trunk/src/preferences/time/TimeWindow.cpp
   haiku/trunk/src/preferences/touchpad/main.cpp
   haiku/trunk/src/preferences/tracker/Jamfile
   haiku/trunk/src/preferences/tracker/TrackerPreferences.cpp
   haiku/trunk/src/preferences/virtualmemory/SettingsWindow.cpp
Log:
App name localization.

Modified: haiku/trunk/src/preferences/appearance/APRWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/appearance/APRWindow.cpp        2011-03-16 
20:24:13 UTC (rev 40979)
+++ haiku/trunk/src/preferences/appearance/APRWindow.cpp        2011-03-16 
20:33:35 UTC (rev 40980)
@@ -25,9 +25,9 @@
 static const uint32 kMsgRevert = 'rvrt';
 
 APRWindow::APRWindow(BRect frame)
- :     BWindow(frame, B_TRANSLATE("Appearance"), B_TITLED_WINDOW,
-               B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS,
-               B_ALL_WORKSPACES)
+       :
+       BWindow(frame, B_TRANSLATE_APP_NAME("Appearance"), B_TITLED_WINDOW,
+               B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS, B_ALL_WORKSPACES)
 {
 
        SetLayout(new BGroupLayout(B_HORIZONTAL));

Modified: haiku/trunk/src/preferences/backgrounds/Backgrounds.cpp
===================================================================
--- haiku/trunk/src/preferences/backgrounds/Backgrounds.cpp     2011-03-16 
20:24:13 UTC (rev 40979)
+++ haiku/trunk/src/preferences/backgrounds/Backgrounds.cpp     2011-03-16 
20:33:35 UTC (rev 40980)
@@ -90,8 +90,9 @@
 
 BackgroundsWindow::BackgroundsWindow()
        :
-       BWindow(BRect(0, 0, 0, 0), B_TRANSLATE("Backgrounds"), B_TITLED_WINDOW,
-               B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS,
+       BWindow(BRect(0, 0, 0, 0), B_TRANSLATE_APP_NAME("Backgrounds"),
+               B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE
+                       | B_AUTO_UPDATE_SIZE_LIMITS,
                B_ALL_WORKSPACES)
 {
        fBackgroundsView = new BackgroundsView();

Modified: haiku/trunk/src/preferences/bluetooth/BluetoothWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/bluetooth/BluetoothWindow.cpp   2011-03-16 
20:24:13 UTC (rev 40979)
+++ haiku/trunk/src/preferences/bluetooth/BluetoothWindow.cpp   2011-03-16 
20:33:35 UTC (rev 40980)
@@ -34,8 +34,9 @@
 
 
 BluetoothWindow::BluetoothWindow(BRect frame)
- :     BWindow(frame, B_TRANSLATE("Bluetooth"), B_TITLED_WINDOW,
-               B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS)
+       :
+       BWindow(frame, B_TRANSLATE_APP_NAME("Bluetooth"), B_TITLED_WINDOW,
+               B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS)
 {
        SetLayout(new BGroupLayout(B_HORIZONTAL));
 

Modified: haiku/trunk/src/preferences/bluetooth/InquiryPanel.cpp
===================================================================
--- haiku/trunk/src/preferences/bluetooth/InquiryPanel.cpp      2011-03-16 
20:24:13 UTC (rev 40979)
+++ haiku/trunk/src/preferences/bluetooth/InquiryPanel.cpp      2011-03-16 
20:33:35 UTC (rev 40980)
@@ -93,7 +93,7 @@
 
 InquiryPanel::InquiryPanel(BRect frame, LocalDevice* lDevice)
        :
-       BWindow(frame, B_TRANSLATE("Bluetooth"), B_FLOATING_WINDOW,
+       BWindow(frame, B_TRANSLATE_APP_NAME("Bluetooth"), B_FLOATING_WINDOW,
        B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS,     B_ALL_WORKSPACES ),
        fMessenger(this),
        fScanning(false),

Modified: haiku/trunk/src/preferences/cpufrequency/main.cpp
===================================================================
--- haiku/trunk/src/preferences/cpufrequency/main.cpp   2011-03-16 20:24:13 UTC 
(rev 40979)
+++ haiku/trunk/src/preferences/cpufrequency/main.cpp   2011-03-16 20:33:35 UTC 
(rev 40980)
@@ -26,11 +26,10 @@
 
        PreferencesWindow<freq_preferences> *window;
        window = new PreferencesWindow<freq_preferences>(
-                                                                               
                B_TRANSLATE("CPU Frequency"),
-                                                                               
                kPreferencesFileName,
-                                                                               
                kDefaultPreferences);
-       CPUFrequencyView* prefView = new CPUFrequencyView(BRect(0, 0, 400, 350),
-                                                                               
                                window);
+               B_TRANSLATE_APP_NAME("CPUFrequency"), kPreferencesFileName,
+               kDefaultPreferences);
+       CPUFrequencyView* prefView
+               = new CPUFrequencyView(BRect(0, 0, 400, 350), window);
        window->SetPreferencesView(prefView);
        window->Show();
        app->Run();

Modified: 
haiku/trunk/src/preferences/datatranslations/DataTranslationsWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/datatranslations/DataTranslationsWindow.cpp     
2011-03-16 20:24:13 UTC (rev 40979)
+++ haiku/trunk/src/preferences/datatranslations/DataTranslationsWindow.cpp     
2011-03-16 20:33:35 UTC (rev 40980)
@@ -47,7 +47,7 @@
 
 DataTranslationsWindow::DataTranslationsWindow()
        :
-       BWindow(BRect(0, 0, 550, 350), B_TRANSLATE("DataTranslations"),
+       BWindow(BRect(0, 0, 550, 350), B_TRANSLATE_APP_NAME("DataTranslations"),
                B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE
                | B_NOT_RESIZABLE | B_AUTO_UPDATE_SIZE_LIMITS)
 {

Modified: haiku/trunk/src/preferences/deskbar/DeskbarPreferences.cpp
===================================================================
--- haiku/trunk/src/preferences/deskbar/DeskbarPreferences.cpp  2011-03-16 
20:24:13 UTC (rev 40979)
+++ haiku/trunk/src/preferences/deskbar/DeskbarPreferences.cpp  2011-03-16 
20:33:35 UTC (rev 40980)
@@ -10,12 +10,14 @@
 #include "PreferencesWindow.h"
 
 #include <Application.h>
+#include <Catalog.h>
 #include <Roster.h>
 
 
 int 
 main(int argc, char **argv)
 {
+       B_TRANSLATE_MARK_APP_NAME("Deskbar");
        BApplication app("application/x-vnd.Haiku-DeskbarPreferences");
        be_roster->Launch("application/x-vnd.Be-TSKB", new 
BMessage(kConfigShow));
        return 0;

Modified: haiku/trunk/src/preferences/deskbar/Jamfile
===================================================================
--- haiku/trunk/src/preferences/deskbar/Jamfile 2011-03-16 20:24:13 UTC (rev 
40979)
+++ haiku/trunk/src/preferences/deskbar/Jamfile 2011-03-16 20:33:35 UTC (rev 
40980)
@@ -2,9 +2,18 @@
 
 SubDirSysHdrs $(HAIKU_TOP) src apps deskbar ;
 
-Preference <preference>Deskbar :
+Preference <preference>Deskbar
+       :
        DeskbarPreferences.cpp
-       : be
-       : DeskbarPreferences.rdef
-       ;
+       :
+       be $(HAIKU_LOCALE_LIBS)
+       :
+       DeskbarPreferences.rdef
+;
 
+DoCatalogs <preference>Deskbar
+       :
+       x-vnd.Haiku-DeskbarPreferences
+       :
+       DeskbarPreferences.cpp
+;

Modified: haiku/trunk/src/preferences/filetypes/FileTypesWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/filetypes/FileTypesWindow.cpp   2011-03-16 
20:24:13 UTC (rev 40979)
+++ haiku/trunk/src/preferences/filetypes/FileTypesWindow.cpp   2011-03-16 
20:33:35 UTC (rev 40980)
@@ -307,8 +307,9 @@
 
 FileTypesWindow::FileTypesWindow(const BMessage& settings)
        :
-       BWindow(_Frame(settings), B_TRANSLATE("FileTypes"), B_TITLED_WINDOW,
-               B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS | 
B_AUTO_UPDATE_SIZE_LIMITS),
+       BWindow(_Frame(settings), B_TRANSLATE_APP_NAME("FileTypes"),
+               B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS
+               | B_AUTO_UPDATE_SIZE_LIMITS),
        fNewTypeWindow(NULL)
 {
        bool showIcons;

Modified: haiku/trunk/src/preferences/fonts/MainWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/fonts/MainWindow.cpp    2011-03-16 20:24:13 UTC 
(rev 40979)
+++ haiku/trunk/src/preferences/fonts/MainWindow.cpp    2011-03-16 20:33:35 UTC 
(rev 40980)
@@ -39,7 +39,7 @@
 
 
 MainWindow::MainWindow()
-       : BWindow(BRect(0, 0, 1, 1), B_TRANSLATE("Fonts"), B_TITLED_WINDOW,
+       : BWindow(BRect(0, 0, 1, 1), B_TRANSLATE_APP_NAME("Fonts"), 
B_TITLED_WINDOW,
                B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | 
B_AUTO_UPDATE_SIZE_LIMITS)
 {
        fDefaultsButton = new BButton("defaults", B_TRANSLATE("Defaults"),

Modified: haiku/trunk/src/preferences/keyboard/KeyboardWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/keyboard/KeyboardWindow.cpp     2011-03-16 
20:24:13 UTC (rev 40979)
+++ haiku/trunk/src/preferences/keyboard/KeyboardWindow.cpp     2011-03-16 
20:33:35 UTC (rev 40980)
@@ -28,9 +28,10 @@
 #define B_TRANSLATE_CONTEXT "KeyboardWindow"
 
 KeyboardWindow::KeyboardWindow()
-       : BWindow(BRect(0, 0, 200, 200), B_TRANSLATE("Keyboard"), 
B_TITLED_WINDOW,
-               B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS
-               | B_AUTO_UPDATE_SIZE_LIMITS)
+       :
+       BWindow(BRect(0, 0, 200, 200), B_TRANSLATE_APP_NAME("Keyboard"),
+               B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE
+               | B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS)
 {
        MoveTo(fSettings.WindowCorner());
 

Modified: haiku/trunk/src/preferences/keymap/KeymapWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/keymap/KeymapWindow.cpp 2011-03-16 20:24:13 UTC 
(rev 40979)
+++ haiku/trunk/src/preferences/keymap/KeymapWindow.cpp 2011-03-16 20:33:35 UTC 
(rev 40980)
@@ -70,8 +70,8 @@
 
 KeymapWindow::KeymapWindow()
        :
-       BWindow(BRect(80, 50, 880, 380), B_TRANSLATE("Keymap"), B_TITLED_WINDOW,
-               B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS)
+       BWindow(BRect(80, 50, 880, 380), B_TRANSLATE_APP_NAME("Keymap"),
+               B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | 
B_AUTO_UPDATE_SIZE_LIMITS)
 {
        SetLayout(new BGroupLayout(B_VERTICAL));
 

Modified: haiku/trunk/src/preferences/locale/LocaleWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/locale/LocaleWindow.cpp 2011-03-16 20:24:13 UTC 
(rev 40979)
+++ haiku/trunk/src/preferences/locale/LocaleWindow.cpp 2011-03-16 20:33:35 UTC 
(rev 40980)
@@ -66,7 +66,7 @@
 
 LocaleWindow::LocaleWindow()
        :
-       BWindow(BRect(0, 0, 0, 0), B_TRANSLATE("Locale"), B_TITLED_WINDOW,
+       BWindow(BRect(0, 0, 0, 0), B_TRANSLATE_APP_NAME("Locale"), 
B_TITLED_WINDOW,
                B_QUIT_ON_WINDOW_CLOSE | B_ASYNCHRONOUS_CONTROLS
                        | B_AUTO_UPDATE_SIZE_LIMITS),
        fInitialConventionsItem(NULL),

Modified: haiku/trunk/src/preferences/mail/ConfigWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/mail/ConfigWindow.cpp   2011-03-16 20:24:13 UTC 
(rev 40979)
+++ haiku/trunk/src/preferences/mail/ConfigWindow.cpp   2011-03-16 20:33:35 UTC 
(rev 40980)
@@ -305,7 +305,7 @@
 
 ConfigWindow::ConfigWindow()
        :
-       BWindow(BRect(100.0, 100.0, 580.0, 540.0), B_TRANSLATE("E-mail"),
+       BWindow(BRect(100.0, 100.0, 580.0, 540.0), 
B_TRANSLATE_APP_NAME("E-mail"),
                B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE
                | B_NOT_RESIZABLE),
        fLastSelectedAccount(NULL),

Modified: haiku/trunk/src/preferences/media/MediaWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/media/MediaWindow.cpp   2011-03-16 20:24:13 UTC 
(rev 40979)
+++ haiku/trunk/src/preferences/media/MediaWindow.cpp   2011-03-16 20:33:35 UTC 
(rev 40980)
@@ -151,7 +151,7 @@
 // MediaWindow - Constructor
 MediaWindow::MediaWindow(BRect frame)
        :
-       BWindow(frame, B_TRANSLATE("Media"), B_TITLED_WINDOW,
+       BWindow(frame, B_TRANSLATE_APP_NAME("Media"), B_TITLED_WINDOW,
                B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS),
        fCurrentNode(BMessenger(this)),
        fParamWeb(NULL),

Modified: haiku/trunk/src/preferences/mouse/MouseWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/mouse/MouseWindow.cpp   2011-03-16 20:24:13 UTC 
(rev 40979)
+++ haiku/trunk/src/preferences/mouse/MouseWindow.cpp   2011-03-16 20:33:35 UTC 
(rev 40980)
@@ -34,9 +34,9 @@
 
 MouseWindow::MouseWindow(BRect _rect)
        :
-               BWindow(_rect, B_TRANSLATE("Mouse"), B_TITLED_WINDOW,
-                       B_NOT_RESIZABLE | B_NOT_ZOOMABLE | 
B_ASYNCHRONOUS_CONTROLS |
-                               B_AUTO_UPDATE_SIZE_LIMITS)
+       BWindow(_rect, B_TRANSLATE_APP_NAME("Mouse"), B_TITLED_WINDOW,
+               B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS
+               | B_AUTO_UPDATE_SIZE_LIMITS)
 {
        // Add the main settings view
        fSettingsView = new SettingsView(fSettings);

Modified: haiku/trunk/src/preferences/network/NetworkWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/network/NetworkWindow.cpp       2011-03-16 
20:24:13 UTC (rev 40979)
+++ haiku/trunk/src/preferences/network/NetworkWindow.cpp       2011-03-16 
20:33:35 UTC (rev 40980)
@@ -23,9 +23,9 @@
 
 NetworkWindow::NetworkWindow()
        :
-       BWindow(BRect(50, 50, 269, 302), B_TRANSLATE("Network"), 
B_TITLED_WINDOW,
-               B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE
-               | B_AUTO_UPDATE_SIZE_LIMITS | B_QUIT_ON_WINDOW_CLOSE)
+       BWindow(BRect(50, 50, 269, 302), B_TRANSLATE_APP_NAME("Network"),
+               B_TITLED_WINDOW, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS
+               | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS | 
B_QUIT_ON_WINDOW_CLOSE)
 {
        SetLayout(new BGroupLayout(B_HORIZONTAL));
        GetLayout()->AddView(new EthernetSettingsView());

Modified: haiku/trunk/src/preferences/notifications/PrefletWin.cpp
===================================================================
--- haiku/trunk/src/preferences/notifications/PrefletWin.cpp    2011-03-16 
20:24:13 UTC (rev 40979)
+++ haiku/trunk/src/preferences/notifications/PrefletWin.cpp    2011-03-16 
20:33:35 UTC (rev 40980)
@@ -27,9 +27,9 @@
 
 PrefletWin::PrefletWin()
        :
-       BWindow(BRect(0, 0, 1, 1), B_TRANSLATE("Notifications"), 
B_TITLED_WINDOW,
-               B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS
-               | B_AUTO_UPDATE_SIZE_LIMITS)
+       BWindow(BRect(0, 0, 1, 1), B_TRANSLATE_APP_NAME("Notifications"),
+               B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_NOT_RESIZABLE
+               | B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS)
 {
        // Preflet container view
        fMainView = new PrefletView(this);

Modified: haiku/trunk/src/preferences/opengl/Jamfile
===================================================================
--- haiku/trunk/src/preferences/opengl/Jamfile  2011-03-16 20:24:13 UTC (rev 
40979)
+++ haiku/trunk/src/preferences/opengl/Jamfile  2011-03-16 20:33:35 UTC (rev 
40980)
@@ -23,5 +23,6 @@
        ExtensionsList.cpp
        ExtensionsView.cpp
        InfoView.cpp
+       OpenGLWindow.cpp
 ;
        

Modified: haiku/trunk/src/preferences/opengl/OpenGLWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/opengl/OpenGLWindow.cpp 2011-03-16 20:24:13 UTC 
(rev 40979)
+++ haiku/trunk/src/preferences/opengl/OpenGLWindow.cpp 2011-03-16 20:33:35 UTC 
(rev 40980)
@@ -9,14 +9,16 @@
 #include "OpenGLWindow.h"
 
 #include <Application.h>
+#include <Catalog.h>
 #include <GroupLayout.h>
 #include "OpenGLView.h"
 
 
 OpenGLWindow::OpenGLWindow()
-    : BWindow(BRect(50, 50, 450, 400), "OpenGL", B_TITLED_WINDOW,
-        B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE
-        | B_AUTO_UPDATE_SIZE_LIMITS)
+       :
+       BWindow(BRect(50, 50, 450, 400), B_TRANSLATE_APP_NAME("OpenGL"),
+               B_TITLED_WINDOW, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS
+               | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS)
 {
     SetLayout(new BGroupLayout(B_VERTICAL));
     fView = new OpenGLView();

Modified: haiku/trunk/src/preferences/printers/PrintersWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/printers/PrintersWindow.cpp     2011-03-16 
20:24:13 UTC (rev 40979)
+++ haiku/trunk/src/preferences/printers/PrintersWindow.cpp     2011-03-16 
20:33:35 UTC (rev 40980)
@@ -12,7 +12,6 @@
 
 #include <stdio.h>
 
-// BeOS API
 #include <Application.h>
 #include <Button.h>
 #include <Catalog.h>
@@ -39,8 +38,8 @@
 
 PrintersWindow::PrintersWindow(BRect frame)
        :
-       Inherited(BRect(78, 71, 761, 509), B_TRANSLATE("Printers"),     
B_TITLED_WINDOW,
-               0),
+       BWindow(BRect(78, 71, 761, 509), B_TRANSLATE_APP_NAME("Printers"),
+               B_TITLED_WINDOW, 0),
        fSelectedPrinter(NULL),
        fAddingPrinter(false)
 {

Modified: haiku/trunk/src/preferences/screen/ScreenWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/screen/ScreenWindow.cpp 2011-03-16 20:24:13 UTC 
(rev 40979)
+++ haiku/trunk/src/preferences/screen/ScreenWindow.cpp 2011-03-16 20:33:35 UTC 
(rev 40980)
@@ -165,8 +165,8 @@
 
 ScreenWindow::ScreenWindow(ScreenSettings* settings)
        :
-       BWindow(settings->WindowFrame(), B_TRANSLATE("Screen"), B_TITLED_WINDOW,
-               B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS,
+       BWindow(settings->WindowFrame(), B_TRANSLATE_APP_NAME("Screen"),
+               B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS,
                B_ALL_WORKSPACES),
        fBootWorkspaceApplied(false),
        fScreenMode(this),

Modified: haiku/trunk/src/preferences/screensaver/ScreenSaverWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/screensaver/ScreenSaverWindow.cpp       
2011-03-16 20:24:13 UTC (rev 40979)
+++ haiku/trunk/src/preferences/screensaver/ScreenSaverWindow.cpp       
2011-03-16 20:33:35 UTC (rev 40980)
@@ -613,7 +613,7 @@
 
 ScreenSaverWindow::ScreenSaverWindow()
        :
-       BWindow(BRect(50, 50, 496, 375), B_TRANSLATE("ScreenSaver"),
+       BWindow(BRect(50, 50, 496, 375), B_TRANSLATE_APP_NAME("ScreenSaver"),
                B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS)
 {
        fSettings.Load();

Modified: haiku/trunk/src/preferences/shortcuts/ShortcutsWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/shortcuts/ShortcutsWindow.cpp   2011-03-16 
20:24:13 UTC (rev 40979)
+++ haiku/trunk/src/preferences/shortcuts/ShortcutsWindow.cpp   2011-03-16 
20:33:35 UTC (rev 40980)
@@ -95,7 +95,7 @@
 ShortcutsWindow::ShortcutsWindow()
        :
        BWindow(BRect(WINDOW_START_X, WINDOW_START_Y, WINDOW_START_X + 
MIN_WIDTH, 
-               WINDOW_START_Y + MIN_HEIGHT * 2), B_TRANSLATE("Shortcuts"),
+               WINDOW_START_Y + MIN_HEIGHT * 2), 
B_TRANSLATE_APP_NAME("Shortcuts"),
                B_DOCUMENT_WINDOW, 0L), 
        fSavePanel(NULL), 
        fOpenPanel(NULL), 

Modified: haiku/trunk/src/preferences/sounds/HApp.cpp
===================================================================
--- haiku/trunk/src/preferences/sounds/HApp.cpp 2011-03-16 20:24:13 UTC (rev 
40979)
+++ haiku/trunk/src/preferences/sounds/HApp.cpp 2011-03-16 20:33:35 UTC (rev 
40980)
@@ -28,7 +28,7 @@
        BRect rect;
        rect.Set(200, 150, 590, 570);
 
-       HWindow* window = new HWindow(rect, B_TRANSLATE("Sounds"));
+       HWindow* window = new HWindow(rect, B_TRANSLATE_APP_NAME("Sounds"));
        window->Show();
 }
 

Modified: haiku/trunk/src/preferences/time/TimeWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/time/TimeWindow.cpp     2011-03-16 20:24:13 UTC 
(rev 40979)
+++ haiku/trunk/src/preferences/time/TimeWindow.cpp     2011-03-16 20:33:35 UTC 
(rev 40980)
@@ -27,7 +27,9 @@
 #define B_TRANSLATE_CONTEXT "Time"
 
 TTimeWindow::TTimeWindow(BRect rect)
-       : BWindow(rect, B_TRANSLATE("Time"), B_TITLED_WINDOW, B_NOT_RESIZABLE | 
B_NOT_ZOOMABLE)
+       :
+       BWindow(rect, B_TRANSLATE_APP_NAME("Time"), B_TITLED_WINDOW,
+               B_NOT_RESIZABLE | B_NOT_ZOOMABLE)
 {
        _InitWindow();
        _AlignWindow();

Modified: haiku/trunk/src/preferences/touchpad/main.cpp
===================================================================
--- haiku/trunk/src/preferences/touchpad/main.cpp       2011-03-16 20:24:13 UTC 
(rev 40979)
+++ haiku/trunk/src/preferences/touchpad/main.cpp       2011-03-16 20:33:35 UTC 
(rev 40980)
@@ -45,7 +45,7 @@
        BApplication* app = new 
BApplication("application/x-vnd.Haiku-Touchpad");
 
        TouchpadPrefWindow* window = new TouchpadPrefWindow(BRect(50, 50, 450, 
350),
-               B_TRANSLATE("Touchpad"), B_TITLED_WINDOW,
+               B_TRANSLATE_APP_NAME("Touchpad"), B_TITLED_WINDOW,
                B_NOT_RESIZABLE | B_NOT_ZOOMABLE
                        | B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS);
        window->SetLayout(new BGroupLayout(B_HORIZONTAL));

Modified: haiku/trunk/src/preferences/tracker/Jamfile
===================================================================
--- haiku/trunk/src/preferences/tracker/Jamfile 2011-03-16 20:24:13 UTC (rev 
40979)
+++ haiku/trunk/src/preferences/tracker/Jamfile 2011-03-16 20:33:35 UTC (rev 
40980)
@@ -1,7 +1,17 @@
 SubDir HAIKU_TOP src preferences tracker ;
 
-Preference <preference>Tracker :
+Preference <preference>Tracker
+       :
        TrackerPreferences.cpp
-       : be
-       : TrackerPreferences.rdef
-       ;
+       :
+       be $(HAIKU_LOCALE_LIBS)
+       :
+       TrackerPreferences.rdef
+;
+
+DoCatalogs <preference>Tracker
+       :
+       x-vnd.Haiku-TrackerPreferences
+       :
+       TrackerPreferences.cpp
+;

Modified: haiku/trunk/src/preferences/tracker/TrackerPreferences.cpp
===================================================================
--- haiku/trunk/src/preferences/tracker/TrackerPreferences.cpp  2011-03-16 
20:24:13 UTC (rev 40979)
+++ haiku/trunk/src/preferences/tracker/TrackerPreferences.cpp  2011-03-16 
20:33:35 UTC (rev 40980)
@@ -7,12 +7,14 @@
  */
 
 #include <Application.h>
+#include <Catalog.h>
 #include <Roster.h>
 
 
 int 
 main(int argc, char **argv)
 {
+       B_TRANSLATE_MARK_APP_NAME("Tracker");
        BApplication app("application/x-vnd.Haiku-TrackerPreferences");
        
        // launch Tracker if it's not running

Modified: haiku/trunk/src/preferences/virtualmemory/SettingsWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/virtualmemory/SettingsWindow.cpp        
2011-03-16 20:24:13 UTC (rev 40979)
+++ haiku/trunk/src/preferences/virtualmemory/SettingsWindow.cpp        
2011-03-16 20:33:35 UTC (rev 40980)
@@ -129,7 +129,7 @@
 
 SettingsWindow::SettingsWindow()
        :
-       BWindow(BRect(0, 0, 269, 172), B_TRANSLATE("VirtualMemory"),
+       BWindow(BRect(0, 0, 269, 172), B_TRANSLATE_APP_NAME("VirtualMemory"),
                B_TITLED_WINDOW, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS
                | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS),
        fLocked(false)


Other related posts:

  • » [haiku-commits] r40980 - in haiku/trunk/src/preferences: appearance backgrounds bluetooth cpufrequency datatranslations ... - jonas