i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch by Humdinger:

Browse Source 
Switched strings to sentence case in servers and kits. This is the
case-servers+kits.diff applied from #5169. Couldn't spot any possibly
problematic changes.
Thanks a lot!


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35044 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2010-01-13 10:58:34 +00:00
parent 9563f44bfd
commit 3e6fa229d8
23 changed files with 314 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/bluetooth/CommandManager.cpp
+237 -237
View File
@@ -341,37 +341,37 @@ const char* bluetoothManufacturers[] = {
const char* linkControlCommands[] = { const char* linkControlCommands[] = {
"Inquiry", "Inquiry",
"Inquiry Cancel", "Inquiry cancel",
"Periodic Inquiry Mode", "Periodic inquiry mode",
"Exit Periodic Inquiry Mode", "Exit periodic inquiry mode",
"Create Connection", "Create connection",
"Disconnect", "Disconnect",
"Add SCO Connection", // not on 2.1 "Add SCO connection", // not on 2.1
"Cancel Create Connection", "Cancel create connection",
"Accept Connection Request", "Accept connection request",
"Reject Connection Request", "Reject connection request",
"Link Key Request Reply", "Link key request reply",
"Link Key Request Negative Reply", "Link key request negative reply",
"PIN Code Request Reply", "PIN code request reply",
"PIN Code Request Negative Reply", "PIN code request negative reply",
"Change Connection Packet Type", "Change connection packet type",
"Reserved", // not on 2.1", "Reserved", // not on 2.1",
"Authentication Requested", "Authentication requested",
"Reserved", // not on 2.1", "Reserved", // not on 2.1",
"Set Connection Encryption", "Set connection encryption",
"Reserved", // not on 2.1", "Reserved", // not on 2.1",
"Change Connection Link Key", "Change connection link key",
"Reserved", // not on 2.1", "Reserved", // not on 2.1",
"Master Link Key", "Master link key",
"Reserved", // not on 2.1", "Reserved", // not on 2.1",
"Remote Name Request", "Remote name request",
"Cancel Remote Name Request", "Cancel remote name request",
"Read Remote Supported Features", "Read remote supported features",
"Read Remote Extended Features", "Read remote extended features",
"Read Remote Version Information", "Read remote version information",
"Reserved", // not on 2.1", "Reserved", // not on 2.1",
"Read Clock Offset", "Read clock offset",
"Read LMP Handle", "Read LMP handle",
"Reserved", "Reserved",
"Reserved", "Reserved",
"Reserved", "Reserved",
@@ -379,117 +379,117 @@ const char* linkControlCommands[] = {
"Reserved", "Reserved",
"Reserved", "Reserved",
"Reserved", "Reserved",
"Setup Synchronous Connection", "Setup synchronous connection",
"Accept Synchronous Connection", "Accept synchronous connection",
"Reject Synchronous Connection", "Reject synchronous connection",
"IO Capability Request Reply", "IO capability request reply",
"User Confirmation Request Reply", "User confirmation request reply",
"User Confirmation Request Negative Reply", "User confirmation request negative reply",
"User Passkey Request Reply", "User passkey request reply",
"User Passkey Request Negative Reply", "User passkey request negative reply",
"Remote OOB Data Request Reply", "Remote OOB data request reply",
"Reserved", "Reserved",
"Reserved", "Reserved",
"Remote OOB Data Request Negative Reply", "Remote OOB data request negative reply",
"IO Capabilities Response Negative Reply" "IO capabilities response negative reply"
}; };
const char* linkPolicyCommands[] = { const char* linkPolicyCommands[] = {
"Hold Mode", "Hold mode",
"Reserved", "Reserved",
"Sniff Mode", "Sniff mode",
"Exit Sniff Mode", "Exit sniff mode",
"Park State", "Park state",
"Exit Park State", "Exit park state",
"QoS Setup", "QoS setup",
"Reserved", "Reserved",
"Role Discovery", "Role discovery",
"Reserved", "Reserved",
"Switch Role", "Switch role",
"Read Link Policy Settings", "Read link policy settings",
"Write Link Policy Settings", "Write link policy settings",
"Read Default Link Policy Settings", "Read default link policy settings",
"Write Default Link Policy Settings", "Write default link policy settings",
"Flow Specification", "Flow specification",
"Sniff Subrating" "Sniff subrating"
}; };
const char* controllerBasebandCommands[] = { const char* controllerBasebandCommands[] = {
"Set Event Mask", "Set event mask",
"Reserved", "Reserved",
"Reset", "Reset",
"Reserved", "Reserved",
"Set Event Filter", "Set event filter",
"Reserved", "Reserved",
"Reserved", "Reserved",
"Flush", "Flush",
"Read PIN Type", "Read PIN type",
"Write PIN Type", "Write PIN type",
"Create New Unit Key", "Create new unit key",
"Reserved", "Reserved",
"Read Stored Link Key", "Read stored link key",
"Reserved", "Reserved",
"Reserved", "Reserved",
"Reserved", "Reserved",
"Write Stored Link Key", "Write stored link key",
"Delete Stored Link Key", "Delete stored link key",
"Write Local Name", "Write local name",
"Read Local Name", "Read local name",
"Read Connection Accept Timeout", "Read connection accept timeout",
"Write Connection Accept Timeout", "Write connection accept timeout",
"Read Page Timeout", "Read page timeout",
"Write Page Timeout", "Write page timeout",
"Read Scan Enable", "Read scan enable",
"Write Scan Enable", "Write scan enable",
"Read Page Scan Activity", "Read page scan activity",
"Write Page Scan Activity", "Write page scan activity",
"Read Inquiry Scan Activity", "Read inquiry scan activity",
"Write Inquiry Scan Activity", "Write inquiry scan activity",
"Read Authentication Enable", "Read authentication enable",
"Write Authentication Enable", "Write authentication enable",
"Read Encryption Mode", // not 2.1 "Read encryption mode", // not 2.1
"Write Encryption Mode",// not 2.1 "Write encryption mode",// not 2.1
"Read Class Of Device", "Read class of device",
"Write Class Of Device", "Write class of device",
"Read Voice Setting", "Read voice setting",
"Write Voice Setting", "Write voice setting",
"Read Automatic Flush Timeout", "Read automatic flush timeout",
"Write Automatic Flush Timeout", "Write automatic flush timeout",
"Read Num Broadcast Retransmissions", "Read num broadcast retransmissions",
"Write Num Broadcast Retransmissions", "Write num broadcast retransmissions",
"Read Hold Mode Activity", "Read hold mode activity",
"Write Hold Mode Activity", "Write hold mode activity",
"Read Transmit Power Level", "Read transmit power level",
"Read Synchronous Flow Control Enable", "Read synchronous flow control enable",
"Write Synchronous Flow Control Enable", "Write synchronous flow control enable",
"Reserved", "Reserved",
"Set Host Controller To Host Flow Control", "Set host controller to host flow control",
"Reserved", "Reserved",
"Host Buffer Size", "Host buffer size",
"Reserved", "Reserved",
"Host Number Of Completed Packets", "Host number of completed packets",
"Read Link Supervision Timeout", "Read link supervision timeout",
"Write Link Supervision Timeout", "Write link supervision timeout",
"Read Number of Supported IAC", "Read number of supported IAC",
"Read Current IAC LAP", "Read current IAC LAP",
"Write Current IAC LAP", "Write current IAC LAP",
"Read Page Scan Period Mode", // not 2.1 "Read page scan period mode", // not 2.1
"Write Page Scan Period Mode", // not 2.1 "Write page scan period mode", // not 2.1
"Read Page Scan Mode", // not 2.1 "Read page scan mode", // not 2.1
"Write Page Scan Mode", // not 2.1 "Write page scan mode", // not 2.1
"Set AFH Channel Classification", "Set AFH channel classification",
"Reserved", "Reserved",
"Reserved", "Reserved",
"Read Inquiry Scan Type", "Read inquiry scan type",
"Write Inquiry Scan Type", "Write inquiry scan type",
"Read Inquiry Mode", "Read inquiry mode",
"Write Inquiry Mode", "Write inquiry mode",
"Read Page Scan Type", "Read page scan type",
"Write Page Scan Type", "Write page scan type",
"Read AFH Channel Assessment Mode", "Read AFH channel assessment mode",
"Write AFH Channel Assessment Mode", "Write AFH channel assessment mode",
"Reserved", "Reserved",
"Reserved", "Reserved",
"Reserved", "Reserved",
@@ -497,93 +497,93 @@ const char* controllerBasebandCommands[] = {
"Reserved", "Reserved",
"Reserved", "Reserved",
"Reserved", "Reserved",
"Read Extended Inquiry Response", "Read extended inquiry response",
"Write Extended Inquiry Response", "Write extended inquiry response",
"Refresh Encryption Key", "Refresh encryption key",
"Reserved", "Reserved",
"Read Simple Pairing Mode", "Read simple pairing mode",
"Write Simple Pairing Mode", "Write simple pairing mode",
"Read Local OOB Data", "Read local OOB data",
"Read Inquiry Transmit Power Level", "Read inquiry transmit power level",
"Write Inquiry Transmit Power Level", "Write inquiry transmit power level",
"Read Default Erroneous Data Reporting", "Read default erroneous data reporting",
"Write Default Erroneous Data Reporting", "Write default erroneous data reporting",
"Reserved", "Reserved",
"Reserved", "Reserved",
"Reserved", "Reserved",
"Enhanced Flush", "Enhanced flush",
"Send Keypress Notification" "Send keypress notification"
}; };
const char* informationalParametersCommands[] = { const char* informationalParametersCommands[] = {
"Read Local Version Information", "Read local version information",
"Read Local Supported Commands", "Read local supported commands",
"Read Local Supported Features", "Read local supported features",
"Read Local Extended Features", "Read local extended features",
"Read Buffer Size", "Read buffer size",
"Reserved", "Reserved",
"Read Country Code", // not 2.1 "Read country code", // not 2.1
"Reserved", "Reserved",
"Read BD ADDR" "Read BD ADDR"
}; };
const char* statusParametersCommands[] = { const char* statusParametersCommands[] = {
"Read Failed Contact Counter", "Read failed contact counter",
"Reset Failed Contact Counter", "Reset failed contact counter",
"Read Link Quality", "Read link quality",
"Reserved", "Reserved",
"Read RSSI", "Read RSSI",
"Read AFH Channel Map", "Read AFH channel map",
"Read Clock", "Read clock",
}; };
const char* testingCommands[] = { const char* testingCommands[] = {
"Read Loopback Mode", "Read loopback mode",
"Write Loopback Mode", "Write loopback mode",
"Enable Device Under Test Mode", "Enable device under test mode",
"Write Simple Pairing Debug Mode", "Write simple pairing debug mode",
}; };
const char* bluetoothEvents[] = { const char* bluetoothEvents[] = {
"Inquiry Complete", "Inquiry complete",
"Inquiry Result", "Inquiry result",
"Conn Complete", "Conn complete",
"Conn Request", "Conn request",
"Disconnection Complete", "Disconnection complete",
"Auth Complete", "Auth complete",
"Remote Name Request Complete", "Remote name request complete",
"Encrypt Change", "Encrypt change",
"Change Conn Link Key Complete", "Change conn link key complete",
"Master Link Key Compl", "Master link key compl",
"Rmt Features", "Rmt features",
"Rmt Version", "Rmt version",
"Qos Setup Complete", "QoS setup complete",
"Command Complete", "Command complete",
"Command Status", "Command status",
"Hardware Error", "Hardware error",
"Flush Occur", "Flush occur",
"Role Change", "Role change",
"Num Comp Pkts", "Num comp Pkts",
"Mode Change", "Mode change",
"Return Link Keys", "Return link keys",
"Pin Code Req", "Pin code req",
"Link Key Req", "Link key req",
"Link Key Notify", "Link key notify",
"Loopback Command", "Loopback command",
"Data Buffer Overflow", "Data buffer overflow",
"Max Slot Change", "Max slot change",
"Read Clock Offset Compl", "Read clock offset compl",
"Con Pkt Type Changed", "Con Pkt type changed",
"Qos Violation", "QoS violation",
"Reserved", "Reserved",
"Page Scan Rep Mode Change", "Page scan Rep mode change",
"Flow Specification", "Flow specification",
"Inquiry Result With Rssi", "Inquiry result with RSSI",
"Remote Extended Features", "Remote extended features",
"Reserved", "Reserved",
"Reserved", "Reserved",
"Reserved", "Reserved",
@@ -592,84 +592,84 @@ const char* bluetoothEvents[] = {
"Reserved", "Reserved",
"Reserved", "Reserved",
"Reserved", "Reserved",
"Synchronous Connection Completed", "Synchronous connection completed",
"Synchronous Connection Changed", "Synchronous connection changed",
"Reserved", "Reserved",
"Extended Inquiry Result", "Extended inquiry result",
"Encryption Key Refresh Complete", "Encryption key refresh complete",
"Io Capability Request", "IO capability request",
"Io Capability Response", "IO capability response",
"User Confirmation Request", "User confirmation request",
"User Passkey Request", "User passkey request",
"Oob Data Request", "OOB data request",
"Simple Pairing Complete", "Simple pairing complete",
"Reserved", "Reserved",
"Link Supervision Timeout Changed", "Link supervision timeout changed",
"Enhanced Flush Complete", "Enhanced flush complete",
"Reserved", "Reserved",
"Reserved", "Reserved",
"Keypress Notification", "Keypress notification",
"Remote Host Supported Features Notification" "Remote host supported features notification"
}; };
const char* bluetoothErrors[] = { const char* bluetoothErrors[] = {
"No Error", "No error",
"Unknown Command", "Unknown command",
"No Connection", "No connection",
"Hardware Failure", "Hardware failure",
"Page Timeout", "Page timeout",
"Authentication Failure", "Authentication failure",
"Pin Or Key Missing", "Pin or key missing",
"Memory Full", "Memory full",
"Connection Timeout", "Connection timeout",
"Max Number Of Connections", "Max number of connections",
"Max Number Of Sco Connections", "Max number of SCO connections",
"Acl Connection Exists", "Acl connection exists",
"Command Disallowed", "Command disallowed",
"Rejected Limited Resources", "Rejected limited resources",
"Rejected Security", "Rejected security",
"Rejected Personal", "Rejected personal",
"Host Timeout", "Host timeout",
"Unsupported Feature", "Unsupported feature",
"Invalid Parameters", "Invalid parameters",
"Remote User Ended Connection", "Remote user ended connection",
"Remote Low Resources", "Remote low resources",
"Remote Power Off", "Remote power off",
"Connection Terminated", "Connection terminated",
"Repeated Attempts", "Repeated attempts",
"Pairing Not Allowed", "Pairing not allowed",
"Unknown Lmp Pdu", "Unknown LMP Pdu",
"Unsupported Remote Feature", "Unsupported remote feature",
"Sco Offset Rejected", "SCO offset rejected",
"Sco Interval Rejected", "SCO interval rejected",
"Air Mode Rejected", "Air mode rejected",
"Invalid Lmp Parameters", "Invalid LMP parameters",
"Unspecified Error", "Unspecified error",
"Unsupported Lmp Parameter Value", "Unsupported LMP parameter value",
"Role Change Not Allowed", "Role change not allowed",
"Lmp Response Timeout", "LMP response timeout",
"Lmp Error Transaction Collision", "LMP error transaction collision",
"Lmp Pdu Not Allowed", "LMP Pdu not allowed",
"Encryption Mode Not Accepted", "Encryption mode not accepted",
"Unit Link Key Used", "Unit link key used",
"Qos Not Supported", "QoS not supported",
"Instant Passed", "Instant passed",
"Pairing With Unit Key Not Supported", "Pairing with unit key not supported",
"Different Transaction Collision", "Different transaction collision",
"Qos Unacceptable Parameter", "QoS unacceptable parameter",
"Qos Rejected", "QoS rejected",
"Classification Not Supported", "Classification not supported",
"Insufficient Security", "Insufficient security",
"Parameter Out Of Range", "Parameter out of range",
"Reserved", "Reserved",
"Role Switch Pending", "Role switch pending",
"Reserved", "Reserved",
"Slot Violation", "Slot violation",
"Role Switch Failed", "Role switch failed",
"Extended Inquiry Response Too Large", "Extended inquiry response too Large",
"Simple Pairing Not Supported By Host", "Simple pairing not supported by host",
"Host Busy Pairing" "Host busy pairing"
}; };
@@ -741,7 +741,7 @@ BluetoothEvent(uint8 event) {
if (event < sizeof(bluetoothEvents) / sizeof(const char*)) { if (event < sizeof(bluetoothEvents) / sizeof(const char*)) {
return bluetoothEvents[event-1]; return bluetoothEvents[event-1];
} else { } else {
return "Event out of Range!"; return "Event out of range!";
} }
} }
src/kits/bluetooth/DeviceClass.cpp
+18 -18
View File
@@ -11,7 +11,7 @@ void
DeviceClass::GetServiceClass(BString& serviceClass) DeviceClass::GetServiceClass(BString& serviceClass)
{ {
static const char *services[] = { "Positioning", "Networking", static const char *services[] = { "Positioning", "Networking",
"Rendering", "Capturing", "Object Transfer", "Rendering", "Capturing", "Object transfer",
"Audio", "Telephony", "Information" }; "Audio", "Telephony", "Information" };
if (ServiceClass() != 0) { if (ServiceClass() != 0) {
@@ -39,10 +39,10 @@ void
DeviceClass::GetMajorDeviceClass(BString& majorClass) DeviceClass::GetMajorDeviceClass(BString& majorClass)
{ {
static const char *major_devices[] = { "Miscellaneous", "Computer", "Phone", static const char *major_devices[] = { "Miscellaneous", "Computer", "Phone",
"LAN Access", "Audio/Video", "Peripheral", "Imaging", "Uncategorized" }; "LAN access", "Audio/Video", "Peripheral", "Imaging", "Uncategorized" };
if (MajorDeviceClass() >= sizeof(major_devices) / sizeof(*major_devices)) if (MajorDeviceClass() >= sizeof(major_devices) / sizeof(*major_devices))
majorClass << "Invalid Device Class!\n"; majorClass << "Invalid device class!\n";
else else
majorClass << major_devices[MajorDeviceClass()]; majorClass << major_devices[MajorDeviceClass()];
@@ -102,10 +102,10 @@ DeviceClass::GetMinorDeviceClass(BString& minorClass)
minorClass << "Wired modem or voice gateway"; minorClass << "Wired modem or voice gateway";
break; break;
case 5: case 5:
minorClass << "Common ISDN Access"; minorClass << "Common ISDN access";
break; break;
case 6: case 6:
minorClass << "Sim Card Reader"; minorClass << "SIM card reader";
break; break;
} }
break; break;
@@ -147,7 +147,7 @@ DeviceClass::GetMinorDeviceClass(BString& minorClass)
minorClass << "Uncategorized"; minorClass << "Uncategorized";
break; break;
case 1: case 1:
minorClass << "Device conforms to the Headset profile"; minorClass << "Device conforms to the headset profile";
break; break;
case 2: case 2:
minorClass << "Hands-free"; minorClass << "Hands-free";
@@ -163,34 +163,34 @@ DeviceClass::GetMinorDeviceClass(BString& minorClass)
minorClass << "Headphones"; minorClass << "Headphones";
break; break;
case 7: case 7:
minorClass << "Portable Audio"; minorClass << "Portable audio";
break; break;
case 8: case 8:
minorClass << "Car Audio"; minorClass << "Car audio";
break; break;
case 9: case 9:
minorClass << "Set-top box"; minorClass << "Set-top box";
break; break;
case 10: case 10:
minorClass << "HiFi Audio Device"; minorClass << "HiFi audio device";
break; break;
case 11: case 11:
minorClass << "VCR"; minorClass << "VCR";
break; break;
case 12: case 12:
minorClass << "Video Camera"; minorClass << "Video camera";
break; break;
case 13: case 13:
minorClass << "Camcorder"; minorClass << "Camcorder";
break; break;
case 14: case 14:
minorClass << "Video Monitor"; minorClass << "Video monitor";
break; break;
case 15: case 15:
minorClass << "Video Display and Loudspeaker"; minorClass << "Video display and loudspeaker";
break; break;
case 16: case 16:
minorClass << "Video Conferencing"; minorClass << "Video conferencing";
break; break;
/* 17 is reserved */ /* 17 is reserved */
case 18: case 18:
@@ -258,7 +258,7 @@ DeviceClass::GetMinorDeviceClass(BString& minorClass)
case 7: /* wearable */ case 7: /* wearable */
switch(minor) { switch(minor) {
case 1: case 1:
minorClass << "Wrist Watch"; minorClass << "Wrist watch";
break; break;
case 2: case 2:
minorClass << "Pager"; minorClass << "Pager";
@@ -283,7 +283,7 @@ DeviceClass::GetMinorDeviceClass(BString& minorClass)
minorClass << "Vehicle"; minorClass << "Vehicle";
break; break;
case 3: case 3:
minorClass << "Doll / Action Figure"; minorClass << "Doll/Action figure";
break; break;
case 4: case 4:
minorClass << "Controller"; minorClass << "Controller";
@@ -306,13 +306,13 @@ DeviceClass::GetMinorDeviceClass(BString& minorClass)
void void
DeviceClass::DumpDeviceClass(BString& string) DeviceClass::DumpDeviceClass(BString& string)
{ {
string << "Service Classes: "; string << "Service classes: ";
GetServiceClass(string); GetServiceClass(string);
string << " | "; string << " | ";
string << "Major Class: "; string << "Major class: ";
GetMajorDeviceClass(string); GetMajorDeviceClass(string);
string << " | "; string << " | ";
string << "Minor Class: "; string << "Minor class: ";
GetMinorDeviceClass(string); GetMinorDeviceClass(string);
string << "."; string << ".";
} }
src/kits/bluetooth/UI/ConnectionIncoming.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ void ConnectionView::Pulse()
//--------------------------------------------------------------- //---------------------------------------------------------------
ConnectionIncoming::ConnectionIncoming(RemoteDevice* rDevice) ConnectionIncoming::ConnectionIncoming(RemoteDevice* rDevice)
: BWindow(BRect(700, 100, 900, 150), "Connection Completed", : BWindow(BRect(700, 100, 900, 150), "Connection completed",
B_FLOATING_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, B_FLOATING_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
B_NOT_ZOOMABLE | B_NOT_RESIZABLE) B_NOT_ZOOMABLE | B_NOT_RESIZABLE)
{ {
src/kits/bluetooth/UI/PincodeWindow.cpp
+2 -2
View File
@@ -47,7 +47,7 @@ namespace Bluetooth {
#endif #endif
PincodeWindow::PincodeWindow(bdaddr_t address, hci_id hid) PincodeWindow::PincodeWindow(bdaddr_t address, hci_id hid)
: BWindow(BRect(800, 200, 900, 300), "Pincode Request", : BWindow(BRect(800, 200, 900, 300), "Pincode request",
B_FLOATING_WINDOW, B_FLOATING_WINDOW,
B_WILL_ACCEPT_FIRST_CLICK | B_NOT_RESIZABLE| B_NOT_ZOOMABLE B_WILL_ACCEPT_FIRST_CLICK | B_NOT_RESIZABLE| B_NOT_ZOOMABLE
| B_AUTO_UPDATE_SIZE_LIMITS, | B_AUTO_UPDATE_SIZE_LIMITS,
@@ -62,7 +62,7 @@ PincodeWindow::PincodeWindow(bdaddr_t address, hci_id hid)
PincodeWindow::PincodeWindow(RemoteDevice* rDevice) PincodeWindow::PincodeWindow(RemoteDevice* rDevice)
: BWindow(BRect(800, 200, 900, 300), "Pincode Request", : BWindow(BRect(800, 200, 900, 300), "Pincode request",
B_FLOATING_WINDOW, B_FLOATING_WINDOW,
B_WILL_ACCEPT_FIRST_CLICK | B_NOT_ZOOMABLE | B_NOT_RESIZABLE B_WILL_ACCEPT_FIRST_CLICK | B_NOT_ZOOMABLE | B_NOT_RESIZABLE
| B_AUTO_UPDATE_SIZE_LIMITS, | B_AUTO_UPDATE_SIZE_LIMITS,
src/kits/interface/Dragger.cpp
+1 -1
View File
@@ -727,7 +727,7 @@ BDragger::_BuildDefaultPopUp()
fPopUp->AddItem(new BMenuItem(about, msg)); fPopUp->AddItem(new BMenuItem(about, msg));
fPopUp->AddSeparatorItem(); fPopUp->AddSeparatorItem();
fPopUp->AddItem(new BMenuItem("Remove Replicant", fPopUp->AddItem(new BMenuItem("Remove replicant",
new BMessage(kDeleteReplicant))); new BMessage(kDeleteReplicant)));
} }
src/kits/mail/ChainRunner.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ show_error(alert_type type, const char *message, const char *tag)
if (window == NULL) { if (window == NULL) {
window = new ErrorLogWindow(BRect(200, 200, 500, 250), window = new ErrorLogWindow(BRect(200, 200, 500, 250),
"Mail Daemon Status Log", B_TITLED_WINDOW); "Mail daemon status log", B_TITLED_WINDOW);
} }
lock.Unlock(); lock.Unlock();
src/kits/mail/ProtocolConfigView.cpp
+3 -3
View File
@@ -116,7 +116,7 @@ BMailProtocolConfigView::BMailProtocolConfigView(uint32 options_mask)
rect.bottom = rect.top - 2 + sItemHeight; rect.bottom = rect.top - 2 + sItemHeight;
if (options_mask & B_MAIL_PROTOCOL_HAS_HOSTNAME) if (options_mask & B_MAIL_PROTOCOL_HAS_HOSTNAME)
AddChild(AddTextField(rect,"host",MDR_DIALECT_CHOICE ("Mail Server:","サーバ名　："))); AddChild(AddTextField(rect,"host",MDR_DIALECT_CHOICE ("Mail server:","サーバ名　：")));
if (options_mask & B_MAIL_PROTOCOL_HAS_USERNAME) if (options_mask & B_MAIL_PROTOCOL_HAS_USERNAME)
AddChild(AddTextField(rect,"user",MDR_DIALECT_CHOICE ("Username:","ユーザーID："))); AddChild(AddTextField(rect,"user",MDR_DIALECT_CHOICE ("Username:","ユーザーID：")));
@@ -128,10 +128,10 @@ BMailProtocolConfigView::BMailProtocolConfigView(uint32 options_mask)
} }
if (options_mask & B_MAIL_PROTOCOL_HAS_FLAVORS) if (options_mask & B_MAIL_PROTOCOL_HAS_FLAVORS)
AddChild(AddMenuField(rect,"flavor","Connection Type:")); AddChild(AddMenuField(rect,"flavor","Connection type:"));
if (options_mask & B_MAIL_PROTOCOL_HAS_AUTH_METHODS) if (options_mask & B_MAIL_PROTOCOL_HAS_AUTH_METHODS)
AddChild(AddMenuField(rect,"auth_method",MDR_DIALECT_CHOICE ("Login Type:","認証方法　："))); AddChild(AddMenuField(rect,"auth_method",MDR_DIALECT_CHOICE ("Login type:","認証方法　：")));
// set divider // set divider
float width = FindWidestLabel(this); float width = FindWidestLabel(this);
src/kits/mail/StatusWindow.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ BMailStatusWindow::BMailStatusWindow(BRect rect, const char *name,
frame.InsetBy(90.0 + 5.0, 5.0); frame.InsetBy(90.0 + 5.0, 5.0);
fCheckNowButton = new BButton(frame, "check_mail", fCheckNowButton = new BButton(frame, "check_mail",
MDR_DIALECT_CHOICE ("Check Mail Now","メールチェック"), MDR_DIALECT_CHOICE ("Check mail now","メールチェック"),
new BMessage('mbth'), B_FOLLOW_LEFT_RIGHT, new BMessage('mbth'), B_FOLLOW_LEFT_RIGHT,
B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE | B_NAVIGABLE); B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE | B_NAVIGABLE);
fCheckNowButton->ResizeToPreferred(); fCheckNowButton->ResizeToPreferred();
src/kits/media/DefaultMediaTheme.cpp
+1 -1
View File
@@ -774,7 +774,7 @@ DiscreteMessageFilter::Filter(BMessage *message, BHandler **target)
DefaultMediaTheme::DefaultMediaTheme() DefaultMediaTheme::DefaultMediaTheme()
: BMediaTheme("Haiku Theme", "Haiku built-in theme version 0.1") : BMediaTheme("Haiku theme", "Haiku built-in theme version 0.1")
{ {
CALLED(); CALLED();
} }
src/kits/media/TimeSourceObject.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ TimeSourceObject::TimeSourceObject(const media_node& node)
ASSERT(fKinds == node.kind); ASSERT(fKinds == node.kind);
if (node.node == NODE_SYSTEM_TIMESOURCE_ID) { if (node.node == NODE_SYSTEM_TIMESOURCE_ID) {
strcpy(fName, "System Clock"); strcpy(fName, "System clock");
fIsRealtime = true; fIsRealtime = true;
} else { } else {
live_node_info liveNodeInfo; live_node_info liveNodeInfo;
src/kits/print/JobSetupPanel.cpp
+4 -4
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2008 Haiku Inc. All rights reserved. * Copyright 2008-2009, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -32,7 +32,7 @@ namespace BPrivate {
BJobSetupPanel::BJobSetupPanel(BPrinter* printer) BJobSetupPanel::BJobSetupPanel(BPrinter* printer)
: BPrintPanel("Print Document") : BPrintPanel("Print document")
, fPrinter(printer) , fPrinter(printer)
, fPrinterRoster(NULL) , fPrinterRoster(NULL)
, fPrintRange(B_ALL_PAGES) , fPrintRange(B_ALL_PAGES)
@@ -44,7 +44,7 @@ BJobSetupPanel::BJobSetupPanel(BPrinter* printer)
BJobSetupPanel::BJobSetupPanel(BPrinter* printer, uint32 flags) BJobSetupPanel::BJobSetupPanel(BPrinter* printer, uint32 flags)
: BPrintPanel("Print Document") : BPrintPanel("Print document")
, fPrinter(printer) , fPrinter(printer)
, fPrinterRoster(NULL) , fPrinterRoster(NULL)
, fPrintRange(B_ALL_PAGES) , fPrintRange(B_ALL_PAGES)
@@ -314,7 +314,7 @@ BJobSetupPanel::_SetupInterface()
box = new BBox(B_FANCY_BORDER, view); box = new BBox(B_FANCY_BORDER, view);
box->SetLabel(BGroupLayoutBuilder() box->SetLabel(BGroupLayoutBuilder()
.Add(new BStringView("", "Page Range")) .Add(new BStringView("", "Page range"))
.SetInsets(2.0, 0.0, 2.0, 0.0)); .SetInsets(2.0, 0.0, 2.0, 0.0));
// copies // copies
src/kits/storage/disk_device/PartitioningDialog.cpp
+1 -1
View File
@@ -22,7 +22,7 @@ enum {
// constructor // constructor
PartitioningDialog::PartitioningDialog(BRect dialogCenter) PartitioningDialog::PartitioningDialog(BRect dialogCenter)
: BWindow(BRect(100, 100, 100, 100), "Partitioning Parameters", : BWindow(BRect(100, 100, 100, 100), "Partitioning parameters",
B_TITLED_WINDOW, B_TITLED_WINDOW,
B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE), B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE),
fEditor(NULL), fEditor(NULL),
src/servers/bluetooth/DeskbarReplicant.cpp
+6 -6
View File
@@ -177,7 +177,7 @@ DeskbarReplicant::MouseDown(BPoint where)
BPopUpMenu* menu = new BPopUpMenu(B_EMPTY_STRING, false, false); BPopUpMenu* menu = new BPopUpMenu(B_EMPTY_STRING, false, false);
menu->AddItem(new BMenuItem("Open Preferences"B_UTF8_ELLIPSIS, menu->AddItem(new BMenuItem("Preferences"B_UTF8_ELLIPSIS,
new BMessage(kMsgOpenBluetoothPreferences))); new BMessage(kMsgOpenBluetoothPreferences)));
// TODO show list of known/paired devices // TODO show list of known/paired devices
@@ -187,10 +187,10 @@ DeskbarReplicant::MouseDown(BPoint where)
*/ */
menu->AddSeparatorItem(); menu->AddSeparatorItem();
menu->AddItem(new BMenuItem("Show Server Console" B_UTF8_ELLIPSIS, menu->AddItem(new BMenuItem("Show server console" B_UTF8_ELLIPSIS,
new BMessage(kMsgShowBluetoothServerConsole))); new BMessage(kMsgShowBluetoothServerConsole)));
menu->AddItem(new BMenuItem("Stop Server", menu->AddItem(new BMenuItem("Stop server",
new BMessage(kMsgQuitBluetoothServer))); new BMessage(kMsgQuitBluetoothServer)));
menu->SetTargetForItems(this); menu->SetTargetForItems(this);
@@ -218,7 +218,7 @@ DeskbarReplicant::_ShowBluetoothServerConsole()
status_t status = BMessenger(BLUETOOTH_SIGNATURE).SendMessage( status_t status = BMessenger(BLUETOOTH_SIGNATURE).SendMessage(
BT_MSG_SERVER_SHOW_CONSOLE); BT_MSG_SERVER_SHOW_CONSOLE);
if (status < B_OK) { if (status < B_OK) {
_ShowErrorAlert("Showing the Bluetooth Server Console failed.", status); _ShowErrorAlert("Showing the Bluetooth server console failed.", status);
} }
} }
@@ -232,7 +232,7 @@ DeskbarReplicant::_QuitBluetoothServer()
status_t status = BMessenger(BLUETOOTH_SIGNATURE).SendMessage( status_t status = BMessenger(BLUETOOTH_SIGNATURE).SendMessage(
B_QUIT_REQUESTED); B_QUIT_REQUESTED);
if (status < B_OK) { if (status < B_OK) {
_ShowErrorAlert("Stopping the Bluetooth Server failed.", status); _ShowErrorAlert("Stopping the Bluetooth server failed.", status);
} }
} }
@@ -241,7 +241,7 @@ void
DeskbarReplicant::_ShowErrorAlert(BString msg, status_t status) DeskbarReplicant::_ShowErrorAlert(BString msg, status_t status)
{ {
msg << "\n\nError: " << strerror(status); msg << "\n\nError: " << strerror(status);
BAlert* alert = new BAlert("Bluetooth Error", msg.String(), "Ok"); BAlert* alert = new BAlert("Bluetooth error", msg.String(), "OK");
alert->Go(NULL); alert->Go(NULL);
} }
src/servers/mail/DeskbarView.cpp
+6 -6
View File
@@ -417,7 +417,7 @@ DeskbarView::_BuildMenu()
menu->SetFont(be_plain_font); menu->SetFont(be_plain_font);
menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ( menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE (
"Create New Message", "N) 新規メッセージ作成")B_UTF8_ELLIPSIS, "Create new message", "N) 新規メッセージ作成")B_UTF8_ELLIPSIS,
new BMessage(MD_OPEN_NEW))); new BMessage(MD_OPEN_NEW)));
menu->AddSeparatorItem(); menu->AddSeparatorItem();
@@ -525,7 +525,7 @@ DeskbarView::_BuildMenu()
if (modifiers() & B_SHIFT_KEY) { if (modifiers() & B_SHIFT_KEY) {
BMenu *chainMenu = new BMenu( BMenu *chainMenu = new BMenu(
MDR_DIALECT_CHOICE ("Check For Mails Only","R) メール受信のみ")); MDR_DIALECT_CHOICE ("Check for mails only","R) メール受信のみ"));
BFont font; BFont font;
menu->GetFont(&font); menu->GetFont(&font);
chainMenu->SetFont(&font); chainMenu->SetFont(&font);
@@ -551,11 +551,11 @@ DeskbarView::_BuildMenu()
// menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ( // menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE (
// "Check For Mails Only","メール受信のみ"), new BMessage(MD_CHECK_FOR_MAILS))); // "Check For Mails Only","メール受信のみ"), new BMessage(MD_CHECK_FOR_MAILS)));
menu->AddItem(new BMenuItem( menu->AddItem(new BMenuItem(
MDR_DIALECT_CHOICE ("Send Pending Mails", "M) 保留メールを送信"), MDR_DIALECT_CHOICE ("Send pending mails", "M) 保留メールを送信"),
new BMessage(MD_SEND_MAILS))); new BMessage(MD_SEND_MAILS)));
} else { } else {
menu->AddItem(item = new BMenuItem( menu->AddItem(item = new BMenuItem(
MDR_DIALECT_CHOICE ("Check For Mail Now", "C) メールチェック"), MDR_DIALECT_CHOICE ("Check for mail now", "C) メールチェック"),
new BMessage(MD_CHECK_SEND_NOW))); new BMessage(MD_CHECK_SEND_NOW)));
if (list.IsEmpty()) if (list.IsEmpty())
item->SetEnabled(false); item->SetEnabled(false);
@@ -563,12 +563,12 @@ DeskbarView::_BuildMenu()
menu->AddSeparatorItem(); menu->AddSeparatorItem();
menu->AddItem(new BMenuItem( menu->AddItem(new BMenuItem(
MDR_DIALECT_CHOICE ("Edit Preferences", "P) メール環境設定") B_UTF8_ELLIPSIS, MDR_DIALECT_CHOICE ("Preferences", "P) メール環境設定") B_UTF8_ELLIPSIS,
new BMessage(MD_OPEN_PREFS))); new BMessage(MD_OPEN_PREFS)));
if (modifiers() & B_SHIFT_KEY) { if (modifiers() & B_SHIFT_KEY) {
menu->AddItem(new BMenuItem( menu->AddItem(new BMenuItem(
MDR_DIALECT_CHOICE ("Shutdown Mail Services", "Q) 終了"), MDR_DIALECT_CHOICE ("Shutdown mail services", "Q) 終了"),
new BMessage(B_QUIT_REQUESTED))); new BMessage(B_QUIT_REQUESTED)));
} }
src/servers/mail/install.japanese.sh
+1 -1
View File
@@ -46,7 +46,7 @@ fi
# This should be translated # This should be translated
if [[ `uname -m` == BePC ]] && test ! -e ~/config/lib/libssl.so; then if [[ `uname -m` == BePC ]] && test ! -e ~/config/lib/libssl.so; then
RETURN=`alert "You don't seem to have OpenSSL installed, which is required for IMAP." "Get OpenSSL" "I Don't Care"` RETURN=`alert "You don't seem to have OpenSSL installed, which is required for IMAP." "Get OpenSSL" "I don't care"`
if [[ $RETURN = "Get OpenSSL" ]] if [[ $RETURN = "Get OpenSSL" ]]
then then
src/servers/mail/install.sh
+1 -1
View File
@@ -92,4 +92,4 @@ else # Need to explicitly restart the daemon.
/boot/beos/system/servers/mail_daemon > /dev/null & /boot/beos/system/servers/mail_daemon > /dev/null &
fi fi
alert "Finished installing" "Thanks" alert "Finished installing" "OK"
src/servers/media_addon/SystemTimeSource.cpp
+2 -2
View File
@@ -27,7 +27,7 @@
SystemTimeSource::SystemTimeSource() SystemTimeSource::SystemTimeSource()
: BMediaNode("System Clock"), : BMediaNode("System clock"),
BTimeSource(), BTimeSource(),
fControlThread(-1) fControlThread(-1)
{ {
@@ -66,7 +66,7 @@ SystemTimeSource::TimeSourceOp(const time_source_op_info & op, void * _reserved)
SystemTimeSource::NodeRegistered() SystemTimeSource::NodeRegistered()
{ {
ASSERT(fControlThread == -1); ASSERT(fControlThread == -1);
fControlThread = spawn_thread(_ControlThreadStart, "System Clock control", 12, this); fControlThread = spawn_thread(_ControlThreadStart, "System clock control", 12, this);
resume_thread(fControlThread); resume_thread(fControlThread);
} }
src/servers/mount/AutoMounter.cpp
+5 -5
View File
@@ -394,8 +394,8 @@ suggest_mount_flags(const BPartition* partition, uint32* _flags)
} }
string << "This will prevent unintentional data loss because of " string << "This will prevent unintentional data loss because of "
"errors in Haiku."; "errors in Haiku.";
BAlert* alert = new BAlert("Mount Warning", string.String(), BAlert* alert = new BAlert("Mount warning", string.String(),
"Mount Read/Write", "Cancel", "Mount Read-only", "Mount read/write", "Cancel", "Mount read-only",
B_WIDTH_FROM_WIDEST, B_WARNING_ALERT); B_WIDTH_FROM_WIDEST, B_WARNING_ALERT);
alert->SetShortcut(1, B_ESCAPE); alert->SetShortcut(1, B_ESCAPE);
int32 choice = alert->Go(); int32 choice = alert->Go();
@@ -548,7 +548,7 @@ AutoMounter::_MountVolume(const BMessage* message)
if (status < B_OK) { if (status < B_OK) {
BString string; BString string;
string << "Error mounting volume. (" << strerror(status) << ")"; string << "Error mounting volume. (" << strerror(status) << ")";
(new BAlert("", string.String(), "Ok"))->Go(NULL); (new BAlert("", string.String(), "OK"))->Go(NULL);
} }
} }
@@ -560,10 +560,10 @@ AutoMounter::_SuggestForceUnmount(const char* name, status_t error)
text << "Could not unmount disk \"" << name << "\":\n\t"; text << "Could not unmount disk \"" << name << "\":\n\t";
text << strerror(error); text << strerror(error);
text << "\n\nShould unmounting be forced?\n\n" text << "\n\nShould unmounting be forced?\n\n"
"Note: if an application is currently writing to the volume, " "Note: If an application is currently writing to the volume, "
"unmounting it now might result in loss of data.\n"; "unmounting it now might result in loss of data.\n";
BAlert* alert = new BAlert("", text.String(), "Cancel", "Force Unmount", BAlert* alert = new BAlert("", text.String(), "Cancel", "Force unmount",
NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
alert->SetShortcut(0, B_ESCAPE); alert->SetShortcut(0, B_ESCAPE);
int32 choice = alert->Go(); int32 choice = alert->Go();
src/servers/net/NetServer.cpp
+1 -1
View File
@@ -257,7 +257,7 @@ void
NetServer::AboutRequested() NetServer::AboutRequested()
{ {
BAlert *alert = new BAlert("about", "Networking Server\n" BAlert *alert = new BAlert("about", "Networking Server\n"
"\tCopyright " B_UTF8_COPYRIGHT "2006, Haiku.\n", "Ok"); "\tCopyright " B_UTF8_COPYRIGHT "2006, Haiku.\n", "OK");
BTextView *view = alert->TextView(); BTextView *view = alert->TextView();
BFont font; BFont font;
src/servers/print/ConfigWindow.cpp
+9 -9
View File
@@ -103,7 +103,7 @@ LeftAlign(BView* view)
ConfigWindow::ConfigWindow(config_setup_kind kind, Printer* defaultPrinter, ConfigWindow::ConfigWindow(config_setup_kind kind, Printer* defaultPrinter,
BMessage* settings, AutoReply* sender) BMessage* settings, AutoReply* sender)
: BWindow(ConfigWindow::GetWindowFrame(), "Page Setup", : BWindow(ConfigWindow::GetWindowFrame(), "Page setup",
B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS) B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS)
, fKind(kind) , fKind(kind)
, fDefaultPrinter(defaultPrinter) , fDefaultPrinter(defaultPrinter)
@@ -117,7 +117,7 @@ ConfigWindow::ConfigWindow(config_setup_kind kind, Printer* defaultPrinter,
PrinterForMimeType(); PrinterForMimeType();
if (kind == kJobSetup) if (kind == kJobSetup)
SetTitle("Print Setup"); SetTitle("Print setup");
BView* panel = new BBox(Bounds(), "temporary", B_FOLLOW_ALL, B_WILL_DRAW); BView* panel = new BBox(Bounds(), "temporary", B_FOLLOW_ALL, B_WILL_DRAW);
AddChild(panel); AddChild(panel);
@@ -125,27 +125,27 @@ ConfigWindow::ConfigWindow(config_setup_kind kind, Printer* defaultPrinter,
BRect dummyRect(0, 0, 1, 1); BRect dummyRect(0, 0, 1, 1);
// print selection pop up menu // print selection pop up menu
BPopUpMenu* menu = new BPopUpMenu("Select a Printer"); BPopUpMenu* menu = new BPopUpMenu("Select a printer");
SetupPrintersMenu(menu); SetupPrintersMenu(menu);
fPrinters = new BMenuField("Printer:", menu, NULL); fPrinters = new BMenuField("Printer:", menu, NULL);
// page format button // page format button
fPageSetup = AddPictureButton(panel, dummyRect, "Page Format", "PAGE_SETUP_ON", fPageSetup = AddPictureButton(panel, dummyRect, "Page format", "PAGE_SETUP_ON",
"PAGE_SETUP_OFF", MSG_PAGE_SETUP); "PAGE_SETUP_OFF", MSG_PAGE_SETUP);
// add description to button // add description to button
BStringView *pageFormatTitle = new BStringView("pageFormatTitle", "Paper Setup:"); BStringView *pageFormatTitle = new BStringView("pageFormatTitle", "Paper setup:");
fPageFormatText = new BStringView("pageFormatText", ""); fPageFormatText = new BStringView("pageFormatText", "");
// page selection button // page selection button
fJobSetup = NULL; fJobSetup = NULL;
BStringView* jobSetupTitle = NULL; BStringView* jobSetupTitle = NULL;
if (kind == kJobSetup) { if (kind == kJobSetup) {
fJobSetup = AddPictureButton(panel, dummyRect, "Page Selection", "JOB_SETUP_ON", fJobSetup = AddPictureButton(panel, dummyRect, "Page selection", "JOB_SETUP_ON",
"JOB_SETUP_OFF", MSG_JOB_SETUP); "JOB_SETUP_OFF", MSG_JOB_SETUP);
// add description to button // add description to button
jobSetupTitle = new BStringView("jobSetupTitle", "Pages to Print:"); jobSetupTitle = new BStringView("jobSetupTitle", "Pages to print:");
fJobSetupText = new BStringView("jobSetupText", ""); fJobSetupText = new BStringView("jobSetupText", "");
} }
@@ -269,7 +269,7 @@ void ConfigWindow::MessageReceived(BMessage* m)
static const char* static const char*
kAbout = kAbout =
"Printer Server\n" "Printer server\n"
"© 2001-2009 Haiku\n" "© 2001-2009 Haiku\n"
"\n" "\n"
"\tIthamar R. Adema\n" "\tIthamar R. Adema\n"
@@ -280,7 +280,7 @@ kAbout =
void void
ConfigWindow::AboutRequested() ConfigWindow::AboutRequested()
{ {
BAlert *about = new BAlert("About Printer Server", kAbout, "OK"); BAlert *about = new BAlert("About printer server", kAbout, "OK");
about->Go(); about->Go();
} }
src/servers/print/ResourceManager.cpp
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2006, Haiku. All rights reserved. * Copyright 2002-2009, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -33,7 +33,7 @@ bool Resource::NeedsLocking() {
// or in case of "Preview" printer it // or in case of "Preview" printer it
// is set on R5 to "NONE" IIRC and the Haiku // is set on R5 to "NONE" IIRC and the Haiku
// preflet sets an empty string. // preflet sets an empty string.
return !(fTransport == "Print To File" return !(fTransport == "Print to file"
|| fTransport == "NONE" || fTransport == "NONE"
|| fTransport == ""); || fTransport == "");
} }
src/servers/registrar/ShutdownProcess.cpp
+9 -9
View File
@@ -224,7 +224,7 @@ private:
class ShutdownProcess::ShutdownWindow : public BWindow { class ShutdownProcess::ShutdownWindow : public BWindow {
public: public:
ShutdownWindow() ShutdownWindow()
: BWindow(BRect(0, 0, 200, 100), "Shutdown Status", : BWindow(BRect(0, 0, 200, 100), "Shutdown status",
B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
B_ASYNCHRONOUS_CONTROLS | B_NOT_RESIZABLE | B_NOT_MINIMIZABLE B_ASYNCHRONOUS_CONTROLS | B_NOT_RESIZABLE | B_NOT_MINIMIZABLE
| B_NOT_ZOOMABLE | B_NOT_CLOSABLE, B_ALL_WORKSPACES), | B_NOT_ZOOMABLE | B_NOT_CLOSABLE, B_ALL_WORKSPACES),
@@ -272,7 +272,7 @@ public:
// kill app button // kill app button
fKillAppButton = new(nothrow) BButton(BRect(0, 0, 10, 10), "kill app", fKillAppButton = new(nothrow) BButton(BRect(0, 0, 10, 10), "kill app",
"Kill Application", NULL, B_FOLLOW_NONE); "Kill application", NULL, B_FOLLOW_NONE);
if (!fKillAppButton) if (!fKillAppButton)
return B_NO_MEMORY; return B_NO_MEMORY;
fRootView->AddChild(fKillAppButton); fRootView->AddChild(fKillAppButton);
@@ -287,7 +287,7 @@ public:
// cancel shutdown button // cancel shutdown button
fCancelShutdownButton = new(nothrow) BButton(BRect(0, 0, 10, 10), fCancelShutdownButton = new(nothrow) BButton(BRect(0, 0, 10, 10),
"cancel shutdown", "Cancel Shutdown", NULL, B_FOLLOW_NONE); "cancel shutdown", "Cancel shutdown", NULL, B_FOLLOW_NONE);
if (!fCancelShutdownButton) if (!fCancelShutdownButton)
return B_NO_MEMORY; return B_NO_MEMORY;
fRootView->AddChild(fCancelShutdownButton); fRootView->AddChild(fCancelShutdownButton);
@@ -300,7 +300,7 @@ public:
// reboot system button // reboot system button
fRebootSystemButton = new(nothrow) BButton(BRect(0, 0, 10, 10), fRebootSystemButton = new(nothrow) BButton(BRect(0, 0, 10, 10),
"reboot", "Restart System", NULL, B_FOLLOW_NONE); "reboot", "Restart system", NULL, B_FOLLOW_NONE);
if (!fRebootSystemButton) if (!fRebootSystemButton)
return B_NO_MEMORY; return B_NO_MEMORY;
fRebootSystemButton->Hide(); fRebootSystemButton->Hide();
@@ -479,7 +479,7 @@ public:
fRebootSystemButton->MakeDefault(true); fRebootSystemButton->MakeDefault(true);
fRebootSystemButton->Show(); fRebootSystemButton->Show();
SetTitle("System is Shut Down"); SetTitle("System is shut down");
fTextView->SetText("It's now safe to turn off the computer."); fTextView->SetText("It's now safe to turn off the computer.");
} }
@@ -492,7 +492,7 @@ public:
// TODO: Temporary work-around for a Haiku bug. // TODO: Temporary work-around for a Haiku bug.
fAbortedOKButton->Invalidate(); fAbortedOKButton->Invalidate();
SetTitle("Shutdown Aborted"); SetTitle("Shutdown aborted");
} }
private: private:
@@ -1235,12 +1235,12 @@ ShutdownProcess::_WorkerDoShutdown()
// ask the user to confirm the shutdown, if desired // ask the user to confirm the shutdown, if desired
bool askUser; bool askUser;
if (fHasGUI && fRequest->FindBool("confirm", &askUser) == B_OK && askUser) { if (fHasGUI && fRequest->FindBool("confirm", &askUser) == B_OK && askUser) {
const char* title = fReboot ? "Restart?" : "Shut Down?"; const char* title = fReboot ? "Restart?" : "Shut down?";
const char* text = fReboot const char* text = fReboot
? "Do you really want to restart the system?" ? "Do you really want to restart the system?"
: "Do you really want to shut down the system?"; : "Do you really want to shut down the system?";
const char* defaultText = fReboot ? "Restart" : "Shut Down"; const char* defaultText = fReboot ? "Restart" : "Shut down";
const char* otherText = fReboot ? "Shut Down" : "Restart"; const char* otherText = fReboot ? "Shut down" : "Restart";
BAlert* alert = new BAlert(title, text, "Cancel", otherText, defaultText, BAlert* alert = new BAlert(title, text, "Cancel", otherText, defaultText,
B_WIDTH_AS_USUAL, B_WARNING_ALERT); B_WIDTH_AS_USUAL, B_WARNING_ALERT);
alert->SetShortcut(0, B_ESCAPE); alert->SetShortcut(0, B_ESCAPE);
src/servers/syslog_daemon/SyslogDaemon.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ SyslogDaemon::AboutRequested()
"all system messages and write them to the " "all system messages and write them to the "
"system-wide log at \"%s\".\n\n", path.Path()); "system-wide log at \"%s\".\n\n", path.Path());
BAlert *alert = new BAlert("Syslog Daemon", message, "Ok"); BAlert *alert = new BAlert("Syslog daemon", message, "OK");
BTextView *view = alert->TextView(); BTextView *view = alert->TextView();
BFont font; BFont font;