From ef4ed1b76b69c8775d46153501862fd4aa082dc8 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Wed, 15 Aug 2012 09:53:38 +0200 Subject: [PATCH] Replaced "Preferences"/"Options" with "Settings" Replaced remaining "Preferences" and "Options" with "Settings" as that is generally used for app settings instead of the system preferences found in the preference panels. Renamed Tracker's "Preferences" to "Tracker preferences" to be similar to the entries in the Deskbar and e.g. the Media replicant in the Deskbar tray. --- src/apps/3dmov/MainWindow.cpp | 2 +- src/apps/glteapot/TeapotWindow.cpp | 2 +- src/apps/icon-o-matic/MainWindow.cpp | 2 +- src/apps/mail/MailWindow.cpp | 2 +- src/kits/tracker/ContainerWindow.cpp | 2 +- src/servers/bluetooth/DeskbarReplicant.cpp | 2 +- src/servers/mail/DeskbarView.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/apps/3dmov/MainWindow.cpp b/src/apps/3dmov/MainWindow.cpp index 155b094f8a..09c30b2afc 100644 --- a/src/apps/3dmov/MainWindow.cpp +++ b/src/apps/3dmov/MainWindow.cpp @@ -112,7 +112,7 @@ void MainWindow :: SetupMenuBar(BRect frame) menu_shape->AddItem(new BMenuItem("Sphere", new BMessage(MSG_SHAPE_SPHERE), '3')); // Options - BMenu *menu_options = new BMenu("Options"); + BMenu *menu_options = new BMenu("Settings"); menu_options->AddItem(new BMenuItem("Wireframe", new BMessage(MSG_OPTION_WIREFRAME), 'S')); //menu_options->AddItem(new BMenuItem("Fullscreen", new BMessage(MSG_FULLSCREEN), 'F')); diff --git a/src/apps/glteapot/TeapotWindow.cpp b/src/apps/glteapot/TeapotWindow.cpp index 443cbd4e4c..cce9493439 100644 --- a/src/apps/glteapot/TeapotWindow.cpp +++ b/src/apps/glteapot/TeapotWindow.cpp @@ -56,7 +56,7 @@ TeapotWindow::TeapotWindow(BRect rect, const char* name, window_type wt, new BMessage(B_QUIT_REQUESTED), 'Q')); item->SetTarget(be_app); msg.RemoveName("num"); - menuBar->AddItem(menu = new BMenu(B_TRANSLATE("Options"))); + menuBar->AddItem(menu = new BMenu(B_TRANSLATE("Settings"))); menu->AddItem(item = new BMenuItem(B_TRANSLATE("Perspective"), new BMessage(kMsgPerspective))); item->SetTarget(fObjectView); diff --git a/src/apps/icon-o-matic/MainWindow.cpp b/src/apps/icon-o-matic/MainWindow.cpp index 4842e5ed46..5d7c015a6f 100644 --- a/src/apps/icon-o-matic/MainWindow.cpp +++ b/src/apps/icon-o-matic/MainWindow.cpp @@ -1144,7 +1144,7 @@ MainWindow::_CreateMenuBar() BMenu* fileMenu = new BMenu(B_TRANSLATE("File")); BMenu* editMenu = new BMenu(B_TRANSLATE("Edit")); - BMenu* settingsMenu = new BMenu(B_TRANSLATE("Options")); + BMenu* settingsMenu = new BMenu(B_TRANSLATE("Settings")); fPathMenu = new BMenu(B_TRANSLATE("Path")); fStyleMenu = new BMenu(B_TRANSLATE("Style")); fShapeMenu = new BMenu(B_TRANSLATE("Shape")); diff --git a/src/apps/mail/MailWindow.cpp b/src/apps/mail/MailWindow.cpp index 99daf47071..7151aa5fe7 100644 --- a/src/apps/mail/MailWindow.cpp +++ b/src/apps/mail/MailWindow.cpp @@ -355,7 +355,7 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app, } menu->AddSeparatorItem(); menu->AddItem(item = new BMenuItem( - B_TRANSLATE("Preferences" B_UTF8_ELLIPSIS), + B_TRANSLATE("Settings" B_UTF8_ELLIPSIS), new BMessage(M_PREFS),',')); item->SetTarget(be_app); fMenuBar->AddItem(menu); diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp index fe161831e0..f9b4752eb6 100644 --- a/src/kits/tracker/ContainerWindow.cpp +++ b/src/kits/tracker/ContainerWindow.cpp @@ -2085,7 +2085,7 @@ BContainerWindow::AddWindowMenu(BMenu* menu) menu->AddSeparatorItem(); - item = new BMenuItem(B_TRANSLATE("Preferences" B_UTF8_ELLIPSIS), + item = new BMenuItem(B_TRANSLATE("Tracker preferences" B_UTF8_ELLIPSIS), new BMessage(kShowSettingsWindow)); item->SetTarget(be_app); menu->AddItem(item); diff --git a/src/servers/bluetooth/DeskbarReplicant.cpp b/src/servers/bluetooth/DeskbarReplicant.cpp index b5a57e1272..81bb6933db 100644 --- a/src/servers/bluetooth/DeskbarReplicant.cpp +++ b/src/servers/bluetooth/DeskbarReplicant.cpp @@ -177,7 +177,7 @@ DeskbarReplicant::MouseDown(BPoint where) BPopUpMenu* menu = new BPopUpMenu(B_EMPTY_STRING, false, false); - menu->AddItem(new BMenuItem("Preferences"B_UTF8_ELLIPSIS, + menu->AddItem(new BMenuItem("Settings" B_UTF8_ELLIPSIS, new BMessage(kMsgOpenBluetoothPreferences))); // TODO show list of known/paired devices diff --git a/src/servers/mail/DeskbarView.cpp b/src/servers/mail/DeskbarView.cpp index 22618bfe38..eca435cfd0 100644 --- a/src/servers/mail/DeskbarView.cpp +++ b/src/servers/mail/DeskbarView.cpp @@ -603,7 +603,7 @@ DeskbarView::_BuildMenu() } menu->AddSeparatorItem(); - menu->AddItem(new BMenuItem(B_TRANSLATE("Preferences" B_UTF8_ELLIPSIS), + menu->AddItem(new BMenuItem(B_TRANSLATE("Settings" B_UTF8_ELLIPSIS), new BMessage(MD_OPEN_PREFS))); if (modifiers() & B_SHIFT_KEY) {