Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* fixed all build warnings by collectcatkeys that I found

Browse Source 
* automatic whitespace cleanup

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37747 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe 2010-07-25 22:58:29 +00:00
parent ad51686353
commit 8eff03f570
23 changed files with 252 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/apps/bootman/DefaultPartitionPage.cpp
View File

@ -250,7 +250,7 @@ DefaultPartitionPage::_CreatePopUpMenu()
void
DefaultPartitionPage::_GetTimeoutLabel(int32 timeout, BString& label)
{
const char* text = B_TRANSLATE(get_label_for_timeout(timeout));
const char* text = B_TRANSLATE_NOCOLLECT(get_label_for_timeout(timeout));
label = B_TRANSLATE("Timeout: %s");
label.ReplaceFirst("%s", text);
}

15
src/apps/deskbar/BeMenu.cpp
View File

@ -170,8 +170,9 @@ TBeMenu::AddNextItem()
bool enabled = false;
for (int i = 0; i < recentTypes; i++) {
recentItem[i] = new TRecentsMenu(B_TRANSLATE(recentTitle[i]),
fBarView, recentType[i]);
recentItem[i]
= new TRecentsMenu(B_TRANSLATE_NOCOLLECT(recentTitle[i]),
fBarView, recentType[i]);
if (recentItem[i])
enabled |= recentItem[i]->RecentsEnabled();
@ -252,9 +253,9 @@ TBeMenu::AddStandardBeMenuItems()
item = new BMenuItem(
#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
B_TRANSLATE(kAboutHaikuMenuItemStr)
B_TRANSLATE_NOCOLLECT(kAboutHaikuMenuItemStr)
#else
B_TRANSLATE(kAboutThisSystemMenuItemStr)
B_TRANSLATE_NOCOLLECT(kAboutThisSystemMenuItemStr)
#endif
, new BMessage(kShowSplash));
item->SetEnabled(!dragging);
@ -268,7 +269,7 @@ TBeMenu::AddStandardBeMenuItems()
TrackerBuildRecentFindItemsMenu(kFindMenuItemStr),
new BMessage(kFindButton));
#else
item = new BMenuItem(B_TRANSLATE(kFindMenuItemStr),
item = new BMenuItem(B_TRANSLATE_NOCOLLECT(kFindMenuItemStr),
new BMessage(kFindButton));
#endif
item->SetEnabled(!dragging);
@ -284,7 +285,7 @@ TBeMenu::AddStandardBeMenuItems()
#ifdef MOUNT_MENU_IN_DESKBAR
DeskbarMountMenu* mountMenu = new DeskbarMountMenu(
B_TRANSLATE(kMountMenuStr));
B_TRANSLATE_NOCOLLECT(kMountMenuStr));
mountMenu->SetEnabled(!dragging);
AddItem(mountMenu);
#endif
@ -307,7 +308,7 @@ TBeMenu::AddStandardBeMenuItems()
static const char* kSuspendMenuItemStr = B_TRANSLATE_MARK("Suspend");
if (_kapm_control_(APM_CHECK_ENABLED) == B_OK) {
item = new BMenuItem(B_TRANSLATE(kSuspendMenuItemStr),
item = new BMenuItem(B_TRANSLATE_NOCOLLECT(kSuspendMenuItemStr),
new BMessage(kSuspendSystem));
item->SetEnabled(!dragging);
shutdownMenu->AddItem(item);

2
src/apps/pairs/PairsWindow.cpp
View File

@ -232,7 +232,7 @@ PairsWindow::MessageReceived(BMessage* message)
strAbout.Replace("%s", score.String(), 1);
BAlert* alert = new BAlert("about",
B_TRANSLATE(strAbout.String()),
strAbout.String(),
B_TRANSLATE("New game"),
B_TRANSLATE("Quit game"));

5
src/apps/screenshot/ScreenshotWindow.cpp
View File

@ -131,7 +131,7 @@ ScreenshotWindow::ScreenshotWindow(const Utility& utility, bool silent,
_ReadSettings();
// _NewScreenshot() needs a valid fNameControl
BString name(B_TRANSLATE(fUtility.sDefaultFileNameBase));
BString name(B_TRANSLATE_NOCOLLECT(fUtility.sDefaultFileNameBase));
name << 1;
name = _FindValidFileName(name.String());
fNameControl = new BTextControl("", B_TRANSLATE("Name:"), name, NULL);
@ -681,7 +681,8 @@ ScreenshotWindow::_FindValidFileName(const char* name)
if (!BEntry(outputPath.Path()).Exists())
return fileName;
if (baseName.FindFirst(B_TRANSLATE(fUtility.sDefaultFileNameBase)) == 0)
if (baseName.FindFirst(B_TRANSLATE_NOCOLLECT(
fUtility.sDefaultFileNameBase)) == 0)
baseName.SetTo(fUtility.sDefaultFileNameBase);
BEntry entry;

4
src/apps/screenshot/Utility.cpp
View File

@ -97,8 +97,8 @@ Utility::Save(BBitmap** screenshot, const char* fileName, uint32 imageType)
BString extension = GetFileNameExtension(imageType);
do {
fileNameString.SetTo(homePath.Path());
fileNameString << "/" << B_TRANSLATE(sDefaultFileNameBase) << index++
<< extension;
fileNameString << "/" << B_TRANSLATE_NOCOLLECT(sDefaultFileNameBase)
<< index++ << extension;
entry.SetTo(fileNameString.String());
} while (entry.Exists());
}

56
src/kits/tracker/FSUtils.cpp
View File

@ -781,7 +781,8 @@ InitCopy(CopyLoopControl* loopControl, uint32 moveMode,
// check for free space before starting copy
if ((totalSize + (4 * kKBSize)) >= dstVol->FreeBytes()) {
BAlert* alert = new BAlert("",
B_TRANSLATE(kNoFreeSpace), B_TRANSLATE("Cancel"),
B_TRANSLATE_NOCOLLECT(kNoFreeSpace),
B_TRANSLATE("Cancel"),
0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
alert->SetShortcut(0, B_ESCAPE);
alert->Go();
@ -1084,8 +1085,8 @@ CopyFile(BEntry *srcFile, StatStruct *srcStat, BDirectory *destDir,
// check for free space first
if ((srcStat->st_size + kKBSize) >= volume.FreeBytes()) {
loopControl->FileError(B_TRANSLATE(kNoFreeSpace), "", B_DEVICE_FULL,
false);
loopControl->FileError(B_TRANSLATE_NOCOLLECT(kNoFreeSpace), "",
B_DEVICE_FULL, false);
throw (status_t)B_DEVICE_FULL;
}
@ -1131,8 +1132,8 @@ CopyFile(BEntry *srcFile, StatStruct *srcStat, BDirectory *destDir,
throw (status_t)err;
if (err != B_OK) {
if (!loopControl->FileError(B_TRANSLATE(kFileErrorString), destName,
err, true)) {
if (!loopControl->FileError(B_TRANSLATE_NOCOLLECT(kFileErrorString),
destName, err, true)) {
throw (status_t)err;
} else {
// user selected continue in spite of error, update status bar
@ -1453,8 +1454,8 @@ CopyFolder(BEntry *srcEntry, BDirectory *destDir, CopyLoopControl *loopControl,
}
#endif
if (err != B_OK) {
if (!loopControl->FileError(B_TRANSLATE(kFolderErrorString),
destName, err, true)) {
if (!loopControl->FileError(B_TRANSLATE_NOCOLLECT(
kFolderErrorString), destName, err, true)) {
throw err;
}
@ -1956,7 +1957,7 @@ PreFlightNameCheck(BObjectList<entry_ref> *srcList, const BDirectory *destDir,
if (*collisionCount > 1) {
const char* verb = (moveMode == kMoveSelectionTo)
? B_TRANSLATE("moving") : B_TRANSLATE("copying");
BString replaceMsg(B_TRANSLATE(kReplaceManyStr));
BString replaceMsg(B_TRANSLATE_NOCOLLECT(kReplaceManyStr));
replaceMsg.ReplaceAll("%verb", verb);
BAlert* alert = new BAlert("", replaceMsg.String(),
@ -2081,10 +2082,10 @@ CheckName(uint32 moveMode, const BEntry *sourceEntry,
BString replaceMsg;
if (moveMode == kCreateLink || moveMode == kCreateRelativeLink) {
replaceMsg.SetTo(B_TRANSLATE(kSymLinkReplaceStr));
replaceMsg.SetTo(B_TRANSLATE_NOCOLLECT(kSymLinkReplaceStr));
replaceMsg.ReplaceFirst("%name", name);
} else if (sourceEntry->IsDirectory()) {
replaceMsg.SetTo(B_TRANSLATE(kDirectoryReplaceStr));
replaceMsg.SetTo(B_TRANSLATE_NOCOLLECT(kDirectoryReplaceStr));
replaceMsg.ReplaceFirst("%name", name);
replaceMsg.ReplaceFirst("%verb",
moveMode == kMoveSelectionTo
@ -2105,7 +2106,7 @@ CheckName(uint32 moveMode, const BEntry *sourceEntry,
else
destBuffer[0] = '\0';
replaceMsg.SetTo(B_TRANSLATE(kReplaceStr));
replaceMsg.SetTo(B_TRANSLATE_NOCOLLECT(kReplaceStr));
replaceMsg.ReplaceAll("%name", name);
replaceMsg.ReplaceFirst("%dest", destBuffer);
replaceMsg.ReplaceFirst("%src", sourceBuffer);
@ -2195,8 +2196,8 @@ FSDeleteFolder(BEntry *dir_entry, CopyLoopControl *loopControl,
else if (err == B_OK)
dir.Rewind();
else {
loopControl->FileError(B_TRANSLATE(kFileDeleteErrorString),
ref.name, err, false);
loopControl->FileError(B_TRANSLATE_NOCOLLECT(
kFileDeleteErrorString), ref.name, err, false);
}
}
@ -2781,9 +2782,10 @@ _DeleteTask(BObjectList<entry_ref> *list, bool confirm)
if (!dontMoveToTrash) {
BAlert* alert = new BAlert("",
B_TRANSLATE(kDeleteConfirmationStr), B_TRANSLATE("Cancel"),
B_TRANSLATE("Move to Trash"), B_TRANSLATE("Delete"),
B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_WARNING_ALERT);
B_TRANSLATE_NOCOLLECT(kDeleteConfirmationStr),
B_TRANSLATE("Cancel"), B_TRANSLATE("Move to Trash"),
B_TRANSLATE("Delete"), B_WIDTH_AS_USUAL, B_OFFSET_SPACING,
B_WARNING_ALERT);
alert->SetShortcut(0, B_ESCAPE);
alert->SetShortcut(1, 'm');
@ -2799,9 +2801,9 @@ _DeleteTask(BObjectList<entry_ref> *list, bool confirm)
}
} else {
BAlert* alert = new BAlert("",
B_TRANSLATE(kDeleteConfirmationStr), B_TRANSLATE("Cancel"),
B_TRANSLATE("Delete"), NULL, B_WIDTH_AS_USUAL,
B_OFFSET_SPACING, B_WARNING_ALERT);
B_TRANSLATE_NOCOLLECT(kDeleteConfirmationStr),
B_TRANSLATE("Cancel"), B_TRANSLATE("Delete"), NULL,
B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_WARNING_ALERT);
alert->SetShortcut(0, B_ESCAPE);
alert->SetShortcut(1, 'd');
@ -3191,7 +3193,7 @@ _TrackerLaunchAppWithDocuments(const entry_ref *appRef, const BMessage *refs,
alertString.ReplaceFirst("%name", appRef->name);
alertString.ReplaceFirst("%error", strerror(error));
if (refs && openWithOK && error != B_SHUTTING_DOWN) {
alertString << B_TRANSLATE(kFindAlternativeStr);
alertString << B_TRANSLATE_NOCOLLECT(kFindAlternativeStr);
BAlert* alert = new BAlert("", alertString.String(),
B_TRANSLATE("Cancel"), B_TRANSLATE("Find"), 0, B_WIDTH_AS_USUAL,
B_WARNING_ALERT);
@ -3348,7 +3350,7 @@ _TrackerLaunchDocuments(const entry_ref */*doNotUse*/, const BMessage *refs,
alertString.ReplaceFirst("%name", documentRef.name);
alertString.ReplaceFirst("%error", strerror(error));
if (openWithOK)
alternative = B_TRANSLATE(kFindApplicationStr);
alternative = B_TRANSLATE_NOCOLLECT(kFindApplicationStr);
break;
} else {
@ -3431,19 +3433,19 @@ _TrackerLaunchDocuments(const entry_ref */*doNotUse*/, const BMessage *refs,
return;
}
alternative = B_TRANSLATE(kFindApplicationStr);
alternative = B_TRANSLATE_NOCOLLECT(kFindApplicationStr);
} else if (error == B_LAUNCH_FAILED_APP_IN_TRASH) {
alertString.SetTo(B_TRANSLATE("Could not open \"%document\" "
"because application \"%app\" is in the Trash. "));
alertString.ReplaceFirst("%document", documentRef.name);
alertString.ReplaceFirst("%app", app.name);
alternative = B_TRANSLATE(kFindAlternativeStr);
alternative = B_TRANSLATE_NOCOLLECT(kFindAlternativeStr);
} else if (error == B_LAUNCH_FAILED_APP_NOT_FOUND) {
alertString.SetTo(
B_TRANSLATE("Could not open \"%name\" (%error). "));
alertString.ReplaceFirst("%name", documentRef.name);
alertString.ReplaceFirst("%error", strerror(error));
alternative = B_TRANSLATE(kFindAlternativeStr);
alternative = B_TRANSLATE_NOCOLLECT(kFindAlternativeStr);
} else if (error == B_MISSING_SYMBOL
&& LoaderErrorDetails(&app, loaderErrorString) == B_OK) {
if (openedDocuments) {
@ -3458,7 +3460,7 @@ _TrackerLaunchDocuments(const entry_ref */*doNotUse*/, const BMessage *refs,
alertString.ReplaceFirst("%document", documentRef.name);
alertString.ReplaceFirst("%symbol", loaderErrorString.String());
}
alternative = B_TRANSLATE(kFindAlternativeStr);
alternative = B_TRANSLATE_NOCOLLECT(kFindAlternativeStr);
} else if (error == B_MISSING_LIBRARY
&& LoaderErrorDetails(&app, loaderErrorString) == B_OK) {
if (openedDocuments) {
@ -3474,14 +3476,14 @@ _TrackerLaunchDocuments(const entry_ref */*doNotUse*/, const BMessage *refs,
alertString.ReplaceFirst("%document", documentRef.name);
alertString.ReplaceFirst("%library", loaderErrorString.String());
}
alternative = B_TRANSLATE(kFindAlternativeStr);
alternative = B_TRANSLATE_NOCOLLECT(kFindAlternativeStr);
} else {
alertString.SetTo(B_TRANSLATE("Could not open \"%document\" with "
"application \"%app\" (%error). "));
alertString.ReplaceFirst("%document", documentRef.name);
alertString.ReplaceFirst("%app", app.name);
alertString.ReplaceFirst("%error", strerror(error));
alternative = B_TRANSLATE(kFindAlternativeStr);
alternative = B_TRANSLATE_NOCOLLECT(kFindAlternativeStr);
}
}

12
src/kits/tracker/FindPanel.cpp
View File

@ -733,9 +733,9 @@ FindPanel::FindPanel(BRect frame, BFile *node, FindWindow *parent,
dragNDropMessage.AddString("be:filetypes", kDragNDropTypes[0]);
dragNDropMessage.AddString("be:filetypes", kDragNDropTypes[1]);
dragNDropMessage.AddString("be:actionspecifier",
B_TRANSLATE(kDragNDropActionSpecifiers[0]));
B_TRANSLATE_NOCOLLECT(kDragNDropActionSpecifiers[0]));
dragNDropMessage.AddString("be:actionspecifier",
B_TRANSLATE(kDragNDropActionSpecifiers[1]));
B_TRANSLATE_NOCOLLECT(kDragNDropActionSpecifiers[1]));
BMessenger self(this);
fDraggableIcon = new DraggableQueryIcon(DraggableIcon::PreferredRect(draggableIconOrigin,
@ -1132,11 +1132,13 @@ FindPanel::MessageReceived(BMessage *message)
if (actionSpecifier
&& strcasecmp(actionSpecifier,
B_TRANSLATE(kDragNDropActionSpecifiers[0])) == 0) {
B_TRANSLATE_NOCOLLECT(
kDragNDropActionSpecifiers[0])) == 0) {
query = true;
} else if (actionSpecifier
&& strcasecmp(actionSpecifier,
B_TRANSLATE(kDragNDropActionSpecifiers[1])) == 0) {
B_TRANSLATE_NOCOLLECT(
kDragNDropActionSpecifiers[1])) == 0) {
queryTemplate = true;
} else if (mimeType && strcasecmp(mimeType,
kDragNDropTypes[0]) == 0) {
@ -2391,7 +2393,7 @@ TAttrView::TAttrView(BRect frame, int32 index)
for (int32 i = 0; i < 5; i++) {
message = new BMessage(kAttributeItem);
message->AddInt32("operator", operators[i]);
submenu->AddItem(new BMenuItem(B_TRANSLATE(operatorLabels[i]),
submenu->AddItem(new BMenuItem(B_TRANSLATE_NOCOLLECT(operatorLabels[i]),
message));
}

6
src/kits/tracker/Model.cpp
View File

@ -339,17 +339,17 @@ Model::Name() const
switch (fBaseType) {
case kRootNode:
return B_TRANSLATE(kRootNodeName);
return B_TRANSLATE_NOCOLLECT(kRootNodeName);
case kVolumeNode:
if (fVolumeName)
return fVolumeName;
break;
case kTrashNode:
return B_TRANSLATE(kTrashNodeName);
return B_TRANSLATE_NOCOLLECT(kTrashNodeName);
case kDesktopNode:
return B_TRANSLATE(kDesktopNodeName);
return B_TRANSLATE_NOCOLLECT(kDesktopNodeName);
default:
break;

2
src/preferences/appearance/APRView.cpp
View File

@ -85,7 +85,7 @@ APRView::APRView(const char *name, uint32 flags)
for (int32 i = 0; i < color_description_count(); i++) {
const ColorDescription& description = *get_color_description(i);
const char* text = B_TRANSLATE(description.text);
const char* text = B_TRANSLATE_NOCOLLECT(description.text);
color_which which = description.which;
fAttrList->AddItem(new ColorWhichItem(text, which));
}

21
src/preferences/appearance/AntialiasingSettingsView.cpp
View File

@ -235,14 +235,15 @@ AntialiasingSettingsView::_BuildAntialiasingMenu()
BMessage* message = new BMessage(kMsgSetAntialiasing);
message->AddBool("antialiasing", false);
BMenuItem* item = new BMenuItem(B_TRANSLATE(kGrayscaleLabel), message);
BMenuItem* item
= new BMenuItem(B_TRANSLATE_NOCOLLECT(kGrayscaleLabel), message);
fAntialiasingMenu->AddItem(item);
message = new BMessage(kMsgSetAntialiasing);
message->AddBool("antialiasing", true);
item = new BMenuItem(B_TRANSLATE(kSubpixelLabel), message);
item = new BMenuItem(B_TRANSLATE_NOCOLLECT(kSubpixelLabel), message);
fAntialiasingMenu->AddItem(item);
}
@ -255,18 +256,18 @@ AntialiasingSettingsView::_BuildHintingMenu()
BMessage* message = new BMessage(kMsgSetHinting);
message->AddInt8("hinting", HINTING_MODE_OFF);
fHintingMenu->AddItem(new BMenuItem(B_TRANSLATE(kNoHintingLabel),
fHintingMenu->AddItem(new BMenuItem(B_TRANSLATE_NOCOLLECT(kNoHintingLabel),
message));
message = new BMessage(kMsgSetHinting);
message->AddInt8("hinting", HINTING_MODE_ON);
fHintingMenu->AddItem(new BMenuItem(B_TRANSLATE(kFullHintingLabel),
message));
fHintingMenu->AddItem(new BMenuItem(
B_TRANSLATE_NOCOLLECT(kFullHintingLabel), message));
message = new BMessage(kMsgSetHinting);
message->AddInt8("hinting", HINTING_MODE_MONOSPACED_ONLY);
fHintingMenu->AddItem(new BMenuItem(B_TRANSLATE(kMonospacedHintingLabel),
message));
fHintingMenu->AddItem(new BMenuItem(
B_TRANSLATE_NOCOLLECT(kMonospacedHintingLabel), message));
}
@ -275,8 +276,8 @@ AntialiasingSettingsView::_SetCurrentAntialiasing()
{
BMenuItem *item = fAntialiasingMenu->FindItem(
fCurrentSubpixelAntialiasing
? B_TRANSLATE(kSubpixelLabel)
: B_TRANSLATE(kGrayscaleLabel));
? B_TRANSLATE_NOCOLLECT(kSubpixelLabel)
: B_TRANSLATE_NOCOLLECT(kGrayscaleLabel));
if (item != NULL)
item->SetMarked(true);
if (fCurrentSubpixelAntialiasing)
@ -300,7 +301,7 @@ AntialiasingSettingsView::_SetCurrentHinting()
break;
}
BMenuItem *item = fHintingMenu->FindItem(B_TRANSLATE(label));
BMenuItem *item = fHintingMenu->FindItem(B_TRANSLATE_NOCOLLECT(label));
if (item != NULL)
item->SetMarked(true);
}

1
src/preferences/bluetooth/BluetoothDeviceView.cpp
View File

@ -18,6 +18,7 @@
#include <TextView.h>
#undef B_TRANSLATE_CONTEXT
#define B_TRANSLATE_CONTEXT "Device View"
BluetoothDeviceView::BluetoothDeviceView(BRect frame, BluetoothDevice* bDevice,

1
src/preferences/bluetooth/BluetoothMain.cpp
View File

@ -15,6 +15,7 @@
#include "defs.h"
#undef B_TRANSLATE_CONTEXT
#define B_TRANSLATE_CONTEXT "main"
BluetoothApplication::BluetoothApplication(void)

19
src/preferences/bluetooth/BluetoothSettingsView.cpp
View File

@ -26,6 +26,8 @@
#include "defs.h"
#include "BluetoothWindow.h"
#undef B_TRANSLATE_CONTEXT
#define B_TRANSLATE_CONTEXT "Settings view"
static const int32 kMsgSetAntialiasing = 'anti';
@ -203,18 +205,18 @@ BluetoothSettingsView::_BuildConnectionPolicy()
BMessage* message = new BMessage(kMsgSetAntialiasing);
message->AddBool("antialiasing", false);
BMenuItem* item = new BMenuItem(B_TRANSLATE(kAllLabel), message);
BMenuItem* item = new BMenuItem(B_TRANSLATE_NOCOLLECT(kAllLabel), message);
fPolicyMenu->AddItem(item);
message = new BMessage(kMsgSetAntialiasing);
message->AddBool("antialiasing", true);
item = new BMenuItem(B_TRANSLATE(kTrustedLabel), message);
item = new BMenuItem(B_TRANSLATE_NOCOLLECT(kTrustedLabel), message);
fPolicyMenu->AddItem(item);
BMenuItem* item2 = new BMenuItem(B_TRANSLATE(kAlwaysLabel), NULL);
BMenuItem* item2 = new BMenuItem(B_TRANSLATE_NOCOLLECT(kAlwaysLabel), NULL);
fPolicyMenu->AddItem(item2);
@ -229,23 +231,24 @@ BluetoothSettingsView::_BuildClassMenu()
BMessage* message;
message = new BMessage(kMsgSetDeviceClassDesktop);
BMenuItem* item = new BMenuItem(B_TRANSLATE(kDesktopLabel), message);
BMenuItem* item
= new BMenuItem(B_TRANSLATE_NOCOLLECT(kDesktopLabel), message);
fClassMenu->AddItem(item);
message = new BMessage(kMsgSetDeviceClassServer);
item = new BMenuItem(B_TRANSLATE(kServerLabel), message);
item = new BMenuItem(B_TRANSLATE_NOCOLLECT(kServerLabel), message);
fClassMenu->AddItem(item);
message = new BMessage(kMsgSetDeviceClassLaptop);
item = new BMenuItem(B_TRANSLATE(kLaptopLabel), message);
item = new BMenuItem(B_TRANSLATE_NOCOLLECT(kLaptopLabel), message);
fClassMenu->AddItem(item);
message = new BMessage(kMsgSetDeviceClassHandheld);
item = new BMenuItem(B_TRANSLATE(kHandheldLabel), message);
item = new BMenuItem(B_TRANSLATE_NOCOLLECT(kHandheldLabel), message);
fClassMenu->AddItem(item);
message = new BMessage(kMsgSetDeviceClassSmartPhone);
item = new BMenuItem(B_TRANSLATE(kPhoneLabel), message);
item = new BMenuItem(B_TRANSLATE_NOCOLLECT(kPhoneLabel), message);
fClassMenu->AddItem(item);
}

2
src/preferences/bluetooth/BluetoothWindow.cpp
View File

@ -20,6 +20,8 @@
#include "defs.h"
#undef B_TRANSLATE_CONTEXT
#define B_TRANSLATE_CONTEXT "Window"
static const uint32 kMsgSetDefaults = 'dflt';

2
src/preferences/bluetooth/ExtendedLocalDeviceView.cpp
View File

@ -16,6 +16,8 @@
#include <SpaceLayoutItem.h>
#include <StringView.h>
#undef B_TRANSLATE_CONTEXT
#define B_TRANSLATE_CONTEXT "Extended local device view"
ExtendedLocalDeviceView::ExtendedLocalDeviceView(BRect frame,

2
src/preferences/bluetooth/InquiryPanel.cpp
View File

@ -26,6 +26,8 @@
#include "DeviceListItem.h"
#include "InquiryPanel.h"
#undef B_TRANSLATE_CONTEXT
#define B_TRANSLATE_CONTEXT "Inquiry panel"
using Bluetooth::DeviceListItem;

2
src/preferences/bluetooth/RemoteDevicesView.cpp
View File

@ -26,6 +26,8 @@
#include "InquiryPanel.h"
#include "RemoteDevicesView.h"
#undef B_TRANSLATE_CONTEXT
#define B_TRANSLATE_CONTEXT "Remote devices"
static const uint32 kMsgAddDevices = 'ddDv';

4
src/preferences/mouse/SettingsView.cpp
View File

@ -131,7 +131,7 @@ SettingsView::SettingsView(MouseSettings &settings)
BMessage *message = new BMessage(kMsgMouseFocusMode);
message->AddInt32("mode", focusModes[i]);
fFocusMenu->AddItem(new BMenuItem(B_TRANSLATE(focusLabels[i]),
fFocusMenu->AddItem(new BMenuItem(B_TRANSLATE_NOCOLLECT(focusLabels[i]),
message));
}
@ -154,7 +154,7 @@ SettingsView::SettingsView(MouseSettings &settings)
focusFollowsMouseModes[i]);
fFocusFollowsMouseMenu->AddItem(new BMenuItem(
B_TRANSLATE(focusFollowsMouseLabels[i]), message));
B_TRANSLATE_NOCOLLECT(focusFollowsMouseLabels[i]), message));
}
BMenuField *fFocusFollowsMouseField = new BMenuField(

11
src/preferences/virtualmemory/SettingsWindow.cpp
View File

@ -66,8 +66,12 @@ byte_string(int64 size)
if (value < 1024)
snprintf(string, sizeof(string), B_TRANSLATE("%Ld B"), size);
else {
static const char *units[] = {B_TRANSLATE_MARK("KB"),
B_TRANSLATE_MARK("MB"), B_TRANSLATE_MARK("GB"), NULL};
static const char *units[] = {
B_TRANSLATE_MARK("KB"),
B_TRANSLATE_MARK("MB"),
B_TRANSLATE_MARK("GB"),
NULL
};
int32 i = -1;
do {
@ -76,7 +80,8 @@ byte_string(int64 size)
} while (value >= 1024 && units[i + 1]);
off_t rounded = off_t(value * 100LL);
sprintf(string, "%g %s", rounded / 100.0, B_TRANSLATE(units[i]));
sprintf(string, "%g %s", rounded / 100.0,
B_TRANSLATE_NOCOLLECT(units[i]));
}
return string;

2
src/servers/print/ConfigWindow.cpp
View File

@ -102,7 +102,7 @@ GetPageFormat(float w, float h, BString& label)
struct PageFormat& pf = pageFormat[i];
if ((pf.width == w && pf.height == h) || (pf.width == h
&& pf.height == w)) {
label = B_TRANSLATE(pf.label);
label = B_TRANSLATE_NOCOLLECT(pf.label);
return;
}
}

2
src/servers/print/PrintServerApp.Scripting.cpp
View File

@ -260,7 +260,7 @@ PrintServerApp::GetSupportedSuites(BMessage* msg)
if (!localized) {
localized = true;
for (int i = 0; prop_list[i].name != NULL; i ++)
prop_list[i].usage = B_TRANSLATE(prop_list[i].usage);
prop_list[i].usage = B_TRANSLATE_NOCOLLECT(prop_list[i].usage);
}
BPropertyInfo prop_info(prop_list);

2
src/servers/print/Printer.Scripting.cpp
View File

@ -110,7 +110,7 @@ Printer::GetSupportedSuites(BMessage* msg)
if (!localized) {
localized = true;
for (int i = 0; prop_list[i].name != NULL; i ++)
prop_list[i].usage = B_TRANSLATE(prop_list[i].usage);
prop_list[i].usage = B_TRANSLATE_NOCOLLECT(prop_list[i].usage);
}
BPropertyInfo prop_info(prop_list);

2
src/servers/print/Transport.Scripting.cpp
View File

@ -104,7 +104,7 @@ Transport::GetSupportedSuites(BMessage* msg)
if (!localized) {
localized = true;
for (int i = 0; prop_list[i].name != NULL; i ++)
prop_list[i].usage = B_TRANSLATE(prop_list[i].usage);
prop_list[i].usage = B_TRANSLATE_NOCOLLECT(prop_list[i].usage);
}
BPropertyInfo prop_info(prop_list);