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

Updated to use B_TRANSLATE* macros. relates to #5408.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36679 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-05-06 22:51:05 +00:00
parent 75eb45a737
commit 906db3030b
4 changed files with 137 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/stylededit/FindWindow.cpp
+17 -15
View File
@@ -33,14 +33,16 @@ FindWindow::FindWindow(BRect frame, BHandler* _handler, BString* searchString,
{ {
AddShortcut('W', B_COMMAND_KEY, new BMessage(B_QUIT_REQUESTED)); AddShortcut('W', B_COMMAND_KEY, new BMessage(B_QUIT_REQUESTED));
fSearchString = new BTextControl("", TR("Find:"), NULL, NULL); fSearchString = new BTextControl("", B_TRANSLATE("Find:"), NULL, NULL);
fCaseSensBox = new BCheckBox("", TR("Case-sensitive"), NULL); fCaseSensBox = new BCheckBox("", B_TRANSLATE("Case-sensitive"), NULL);
fWrapBox = new BCheckBox("", TR("Wrap-around search"), NULL); fWrapBox = new BCheckBox("", B_TRANSLATE("Wrap-around search"), NULL);
fBackSearchBox = new BCheckBox("", TR("Search backwards"), NULL); fBackSearchBox = new BCheckBox("", B_TRANSLATE("Search backwards"), NULL);
fCancelButton = new BButton("", TR("Cancel"), new BMessage(B_QUIT_REQUESTED)); fCancelButton = new BButton("", B_TRANSLATE("Cancel"),
fSearchButton = new BButton("", TR("Find"), new BMessage(MSG_SEARCH)); new BMessage(B_QUIT_REQUESTED));
fSearchButton = new BButton("", B_TRANSLATE("Find"),
new BMessage(MSG_SEARCH));
SetLayout(new BGroupLayout(B_HORIZONTAL)); SetLayout(new BGroupLayout(B_HORIZONTAL));
AddChild(BGroupLayoutBuilder(B_VERTICAL, 4) AddChild(BGroupLayoutBuilder(B_VERTICAL, 4)
.Add(BGridLayoutBuilder(6, 2) .Add(BGridLayoutBuilder(6, 2)
.Add(fSearchString->CreateLabelLayoutItem(), 0, 0) .Add(fSearchString->CreateLabelLayoutItem(), 0, 0)
@@ -49,13 +51,13 @@ FindWindow::FindWindow(BRect frame, BHandler* _handler, BString* searchString,
.Add(fWrapBox, 1, 2) .Add(fWrapBox, 1, 2)
.Add(fBackSearchBox, 1, 3) .Add(fBackSearchBox, 1, 3)
) )
.AddGroup(B_HORIZONTAL, 10) .AddGroup(B_HORIZONTAL, 10)
.AddGlue() .AddGlue()
.Add(fCancelButton) .Add(fCancelButton)
.Add(fSearchButton) .Add(fSearchButton)
.End() .End()
.SetInsets(10, 10, 10, 10) .SetInsets(10, 10, 10, 10)
); );
fSearchButton->MakeDefault(true); fSearchButton->MakeDefault(true);
fHandler = _handler; fHandler = _handler;
@@ -84,7 +86,7 @@ FindWindow::MessageReceived(BMessage* msg)
default: default:
BWindow::MessageReceived(msg); BWindow::MessageReceived(msg);
break; break;
} }
} }
src/apps/stylededit/ReplaceWindow.cpp
+27 -24
View File
@@ -33,25 +33,28 @@ ReplaceWindow::ReplaceWindow(BRect frame, BHandler* _handler,
bool caseState, bool wrapState, bool backState) bool caseState, bool wrapState, bool backState)
: BWindow(frame, "ReplaceWindow", B_MODAL_WINDOW, : BWindow(frame, "ReplaceWindow", B_MODAL_WINDOW,
B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS,
B_CURRENT_WORKSPACE) B_CURRENT_WORKSPACE)
{ {
AddShortcut('W', B_COMMAND_KEY, new BMessage(B_QUIT_REQUESTED)); AddShortcut('W', B_COMMAND_KEY, new BMessage(B_QUIT_REQUESTED));
fSearchString = new BTextControl("", TR("Find:"), NULL, NULL); fSearchString = new BTextControl("", B_TRANSLATE("Find:"), NULL, NULL);
fReplaceString = new BTextControl("", TR("Replace with:"), NULL, NULL); fReplaceString = new BTextControl("", B_TRANSLATE("Replace with:"),
fCaseSensBox = new BCheckBox("", TR("Case-sensitive"), NULL); NULL, NULL);
fWrapBox = new BCheckBox("", TR("Wrap-around search"), NULL); fCaseSensBox = new BCheckBox("", B_TRANSLATE("Case-sensitive"), NULL);
fBackSearchBox = new BCheckBox("", TR("Search backwards"), NULL); fWrapBox = new BCheckBox("", B_TRANSLATE("Wrap-around search"), NULL);
fAllWindowsBox = new BCheckBox("", TR("Replace in all windows"), fBackSearchBox = new BCheckBox("", B_TRANSLATE("Search backwards"), NULL);
fAllWindowsBox = new BCheckBox("", B_TRANSLATE("Replace in all windows"),
new BMessage(CHANGE_WINDOW)); new BMessage(CHANGE_WINDOW));
fUIchange = false; fUIchange = false;
fReplaceAllButton = new BButton("", TR("Replace all"), fReplaceAllButton = new BButton("", B_TRANSLATE("Replace all"),
new BMessage(MSG_REPLACE_ALL)); new BMessage(MSG_REPLACE_ALL));
fCancelButton = new BButton("", TR("Cancel"), new BMessage(B_QUIT_REQUESTED)); fCancelButton = new BButton("", B_TRANSLATE("Cancel"),
fReplaceButton = new BButton("", TR("Replace"), new BMessage(MSG_REPLACE)); new BMessage(B_QUIT_REQUESTED));
fReplaceButton = new BButton("", B_TRANSLATE("Replace"),
new BMessage(MSG_REPLACE));
SetLayout(new BGroupLayout(B_HORIZONTAL)); SetLayout(new BGroupLayout(B_HORIZONTAL));
AddChild(BGroupLayoutBuilder(B_VERTICAL, 4) AddChild(BGroupLayoutBuilder(B_VERTICAL, 4)
.Add(BGridLayoutBuilder(6, 2) .Add(BGridLayoutBuilder(6, 2)
.Add(fSearchString->CreateLabelLayoutItem(), 0, 0) .Add(fSearchString->CreateLabelLayoutItem(), 0, 0)
@@ -63,21 +66,21 @@ ReplaceWindow::ReplaceWindow(BRect frame, BHandler* _handler,
.Add(fBackSearchBox, 1, 4) .Add(fBackSearchBox, 1, 4)
.Add(fAllWindowsBox, 1, 5) .Add(fAllWindowsBox, 1, 5)
) )
.AddGroup(B_HORIZONTAL, 10) .AddGroup(B_HORIZONTAL, 10)
.Add(fReplaceAllButton) .Add(fReplaceAllButton)
.AddGlue() .AddGlue()
.Add(fCancelButton) .Add(fCancelButton)
.Add(fReplaceButton) .Add(fReplaceButton)
.End() .End()
.SetInsets(10, 10, 10, 10) .SetInsets(10, 10, 10, 10)
); );
fReplaceButton->MakeDefault(true); fReplaceButton->MakeDefault(true);
fHandler = _handler; fHandler = _handler;
const char* searchtext = searchString->String(); const char* searchtext = searchString->String();
const char* replacetext = replaceString->String(); const char* replacetext = replaceString->String();
fSearchString->SetText(searchtext); fSearchString->SetText(searchtext);
fReplaceString->SetText(replacetext); fReplaceString->SetText(replacetext);
@@ -101,11 +104,11 @@ ReplaceWindow::MessageReceived(BMessage* msg)
break; break;
case MSG_REPLACE_ALL: case MSG_REPLACE_ALL:
_SendMessage(MSG_REPLACE_ALL); _SendMessage(MSG_REPLACE_ALL);
break; break;
default: default:
BWindow::MessageReceived(msg); BWindow::MessageReceived(msg);
break; break;
} }
} }
@@ -137,7 +140,7 @@ ReplaceWindow::DispatchMessage(BMessage* message, BHandler* handler)
if (key == B_ESCAPE) { if (key == B_ESCAPE) {
message->MakeEmpty(); message->MakeEmpty();
message->what = B_QUIT_REQUESTED; message->what = B_QUIT_REQUESTED;
// This is a hack, but it actually does what is expected, // This is a hack, but it actually does what is expected,
// unlike the hack above. This kind of key filtering probably // unlike the hack above. This kind of key filtering probably
// ought to be handled by a BMessageFilter, though. // ought to be handled by a BMessageFilter, though.
src/apps/stylededit/StyledEditApp.cpp
+13 -13
View File
@@ -36,7 +36,7 @@ StyledEditApp * styled_edit_app;
BRect gWindowRect(7-15, 26-15, 507, 426); BRect gWindowRect(7-15, 26-15, 507, 426);
namespace namespace
{ {
void void
cascade() cascade()
@@ -51,7 +51,7 @@ namespace
if (top + gWindowRect.Height() > screenBorder.bottom) if (top + gWindowRect.Height() > screenBorder.bottom)
top = 26; top = 26;
gWindowRect.OffsetTo(BPoint(left, top)); gWindowRect.OffsetTo(BPoint(left, top));
} }
@@ -73,7 +73,7 @@ namespace
top = top - ((int)left % 15) + 26; top = top - ((int)left % 15) + 26;
} }
gWindowRect.OffsetTo(BPoint(left, top)); gWindowRect.OffsetTo(BPoint(left, top));
} }
} }
@@ -94,7 +94,7 @@ StyledEditApp::StyledEditApp()
dynamic_cast<BMenuBar*>(fOpenPanel->Window()->FindView("MenuBar")); dynamic_cast<BMenuBar*>(fOpenPanel->Window()->FindView("MenuBar"));
fOpenAsEncoding = 0; fOpenAsEncoding = 0;
fOpenPanelEncodingMenu= new BMenu(TR("Encoding")); fOpenPanelEncodingMenu= new BMenu(B_TRANSLATE("Encoding"));
menuBar->AddItem(fOpenPanelEncodingMenu); menuBar->AddItem(fOpenPanelEncodingMenu);
fOpenPanelEncodingMenu->SetRadioMode(true); fOpenPanelEncodingMenu->SetRadioMode(true);
@@ -103,7 +103,7 @@ StyledEditApp::StyledEditApp()
while (roster.GetNextCharacterSet(&charset) == B_NO_ERROR) { while (roster.GetNextCharacterSet(&charset) == B_NO_ERROR) {
BString name; BString name;
if (charset.GetFontID() == B_UNICODE_UTF8) if (charset.GetFontID() == B_UNICODE_UTF8)
name = TR("Default"); name = B_TRANSLATE("Default");
else else
name = charset.GetPrintName(); name = charset.GetPrintName();
@@ -159,7 +159,7 @@ StyledEditApp::MessageReceived(BMessage* message)
default: default:
BApplication::MessageReceived(message); BApplication::MessageReceived(message);
break; break;
} }
} }
@@ -181,7 +181,7 @@ StyledEditApp::OpenDocument(entry_ref* ref)
if (entry.IsDirectory()) { if (entry.IsDirectory()) {
BPath path(&entry); BPath path(&entry);
fprintf(stderr, fprintf(stderr,
"Can't open directory \"%s\" for editing.\n", "Can't open directory \"%s\" for editing.\n",
path.Path()); path.Path());
return B_ERROR; return B_ERROR;
@@ -191,7 +191,7 @@ StyledEditApp::OpenDocument(entry_ref* ref)
entry.GetParent(&parent); entry.GetParent(&parent);
if (!entry.Exists() && !parent.Exists()) { if (!entry.Exists() && !parent.Exists()) {
fprintf(stderr, fprintf(stderr,
"Can't create file. Missing parent directory.\n"); "Can't create file. Missing parent directory.\n");
return B_ERROR; return B_ERROR;
} }
@@ -253,7 +253,7 @@ void
StyledEditApp::ArgvReceived(int32 argc, char* argv[]) StyledEditApp::ArgvReceived(int32 argc, char* argv[])
{ {
// If StyledEdit is already running and gets invoked again // If StyledEdit is already running and gets invoked again
// we need to account for a possible mismatch in current // we need to account for a possible mismatch in current
// working directory. The paths of the new arguments are // working directory. The paths of the new arguments are
// relative to the cwd of the invocation, if they are not // relative to the cwd of the invocation, if they are not
// absolute. This cwd we find as a string named "cwd" in // absolute. This cwd we find as a string named "cwd" in
@@ -276,9 +276,9 @@ StyledEditApp::ArgvReceived(int32 argc, char* argv[])
// patch relative paths only // patch relative paths only
} }
entry_ref ref; entry_ref ref;
get_ref_for_path(path.Path(), &ref); get_ref_for_path(path.Path(), &ref);
status_t status; status_t status;
status = OpenDocument(&ref); status = OpenDocument(&ref);
@@ -288,8 +288,8 @@ StyledEditApp::ArgvReceived(int32 argc, char* argv[])
} }
void void
StyledEditApp::ReadyToRun() StyledEditApp::ReadyToRun()
{ {
if (fWindowCount > 0) if (fWindowCount > 0)
return; return;
src/apps/stylededit/StyledEditWindow.cpp
+80 -68
View File
@@ -76,7 +76,7 @@ StyledEditWindow::StyledEditWindow(BRect frame, int32 id, uint32 encoding)
: BWindow(frame, "untitled", B_DOCUMENT_WINDOW, B_ASYNCHRONOUS_CONTROLS) : BWindow(frame, "untitled", B_DOCUMENT_WINDOW, B_ASYNCHRONOUS_CONTROLS)
{ {
InitWindow(encoding); InitWindow(encoding);
BString unTitled(TR("Untitled ")); BString unTitled(B_TRANSLATE("Untitled "));
unTitled << id; unTitled << id;
SetTitle(unTitled.String()); SetTitle(unTitled.String());
fSaveItem->SetEnabled(true); fSaveItem->SetEnabled(true);
@@ -157,97 +157,102 @@ StyledEditWindow::InitWindow(uint32 encoding)
fTextView->MakeFocus(true); fTextView->MakeFocus(true);
// Add "File"-menu: // Add "File"-menu:
BMenu* menu = new BMenu(TR("File")); BMenu* menu = new BMenu(B_TRANSLATE("File"));
fMenuBar->AddItem(menu); fMenuBar->AddItem(menu);
BMenuItem* menuItem; BMenuItem* menuItem;
menu->AddItem(menuItem = new BMenuItem(TR("New"), menu->AddItem(menuItem = new BMenuItem(B_TRANSLATE("New"),
new BMessage(MENU_NEW), 'N')); new BMessage(MENU_NEW), 'N'));
menuItem->SetTarget(be_app); menuItem->SetTarget(be_app);
menu->AddItem(menuItem = new BMenuItem(fRecentMenu = menu->AddItem(menuItem = new BMenuItem(fRecentMenu =
new BMenu(TR("Open" B_UTF8_ELLIPSIS)), new BMessage(MENU_OPEN))); new BMenu(B_TRANSLATE("Open" B_UTF8_ELLIPSIS)),
new BMessage(MENU_OPEN)));
menuItem->SetShortcut('O', 0); menuItem->SetShortcut('O', 0);
menuItem->SetTarget(be_app); menuItem->SetTarget(be_app);
menu->AddSeparatorItem(); menu->AddSeparatorItem();
menu->AddItem(fSaveItem = new BMenuItem(TR("Save"), menu->AddItem(fSaveItem = new BMenuItem(B_TRANSLATE("Save"),
new BMessage(MENU_SAVE), 'S')); new BMessage(MENU_SAVE), 'S'));
fSaveItem->SetEnabled(false); fSaveItem->SetEnabled(false);
menu->AddItem(menuItem = new BMenuItem(TR("Save as" B_UTF8_ELLIPSIS), menu->AddItem(menuItem = new BMenuItem(
new BMessage(MENU_SAVEAS))); B_TRANSLATE("Save as" B_UTF8_ELLIPSIS), new BMessage(MENU_SAVEAS)));
menuItem->SetShortcut('S', B_SHIFT_KEY); menuItem->SetShortcut('S', B_SHIFT_KEY);
menuItem->SetEnabled(true); menuItem->SetEnabled(true);
menu->AddItem(fRevertItem = menu->AddItem(fRevertItem =
new BMenuItem(TR("Revert to saved" B_UTF8_ELLIPSIS), new BMenuItem(B_TRANSLATE("Revert to saved" B_UTF8_ELLIPSIS),
new BMessage(MENU_REVERT))); new BMessage(MENU_REVERT)));
fRevertItem->SetEnabled(false); fRevertItem->SetEnabled(false);
menu->AddItem(menuItem = new BMenuItem(TR("Close"), menu->AddItem(menuItem = new BMenuItem(B_TRANSLATE("Close"),
new BMessage(MENU_CLOSE), 'W')); new BMessage(MENU_CLOSE), 'W'));
menu->AddSeparatorItem(); menu->AddSeparatorItem();
menu->AddItem(menuItem = new BMenuItem(TR("Page setup" B_UTF8_ELLIPSIS), menu->AddItem(menuItem = new BMenuItem(
B_TRANSLATE("Page setup" B_UTF8_ELLIPSIS),
new BMessage(MENU_PAGESETUP))); new BMessage(MENU_PAGESETUP)));
menu->AddItem(menuItem = new BMenuItem(TR("Print" B_UTF8_ELLIPSIS), menu->AddItem(menuItem = new BMenuItem(
B_TRANSLATE("Print" B_UTF8_ELLIPSIS),
new BMessage(MENU_PRINT), 'P')); new BMessage(MENU_PRINT), 'P'));
menu->AddSeparatorItem(); menu->AddSeparatorItem();
menu->AddItem(menuItem = new BMenuItem(TR("Quit"), menu->AddItem(menuItem = new BMenuItem(B_TRANSLATE("Quit"),
new BMessage(MENU_QUIT), 'Q')); new BMessage(MENU_QUIT), 'Q'));
// Add the "Edit"-menu: // Add the "Edit"-menu:
menu = new BMenu(TR("Edit")); menu = new BMenu(B_TRANSLATE("Edit"));
fMenuBar->AddItem(menu); fMenuBar->AddItem(menu);
menu->AddItem(fUndoItem = new BMenuItem(TR("Can't undo"), menu->AddItem(fUndoItem = new BMenuItem(B_TRANSLATE("Can't undo"),
new BMessage(B_UNDO), 'Z')); new BMessage(B_UNDO), 'Z'));
fUndoItem->SetEnabled(false); fUndoItem->SetEnabled(false);
menu->AddSeparatorItem(); menu->AddSeparatorItem();
menu->AddItem(fCutItem = new BMenuItem(TR("Cut"), new BMessage(B_CUT), 'X')); menu->AddItem(fCutItem = new BMenuItem(B_TRANSLATE("Cut"),
new BMessage(B_CUT), 'X'));
fCutItem->SetEnabled(false); fCutItem->SetEnabled(false);
fCutItem->SetTarget(fTextView); fCutItem->SetTarget(fTextView);
menu->AddItem(fCopyItem = new BMenuItem(TR("Copy"), menu->AddItem(fCopyItem = new BMenuItem(B_TRANSLATE("Copy"),
new BMessage(B_COPY), 'C')); new BMessage(B_COPY), 'C'));
fCopyItem->SetEnabled(false); fCopyItem->SetEnabled(false);
fCopyItem->SetTarget(fTextView); fCopyItem->SetTarget(fTextView);
menu->AddItem(menuItem = new BMenuItem(TR("Paste"), menu->AddItem(menuItem = new BMenuItem(B_TRANSLATE("Paste"),
new BMessage(B_PASTE), 'V')); new BMessage(B_PASTE), 'V'));
menuItem->SetTarget(fTextView); menuItem->SetTarget(fTextView);
menu->AddItem(fClearItem = new BMenuItem(TR("Clear"), menu->AddItem(fClearItem = new BMenuItem(B_TRANSLATE("Clear"),
new BMessage(MENU_CLEAR))); new BMessage(MENU_CLEAR)));
fClearItem->SetEnabled(false); fClearItem->SetEnabled(false);
fClearItem->SetTarget(fTextView); fClearItem->SetTarget(fTextView);
menu->AddSeparatorItem(); menu->AddSeparatorItem();
menu->AddItem(menuItem = new BMenuItem(TR("Select all"), menu->AddItem(menuItem = new BMenuItem(B_TRANSLATE("Select all"),
new BMessage(B_SELECT_ALL), 'A')); new BMessage(B_SELECT_ALL), 'A'));
menuItem->SetTarget(fTextView); menuItem->SetTarget(fTextView);
menu->AddSeparatorItem(); menu->AddSeparatorItem();
menu->AddItem(menuItem = new BMenuItem(TR("Find" B_UTF8_ELLIPSIS), menu->AddItem(menuItem = new BMenuItem(B_TRANSLATE("Find" B_UTF8_ELLIPSIS),
new BMessage(MENU_FIND), 'F')); new BMessage(MENU_FIND), 'F'));
menu->AddItem(fFindAgainItem= new BMenuItem(TR("Find again"), menu->AddItem(fFindAgainItem= new BMenuItem(B_TRANSLATE("Find again"),
new BMessage(MENU_FIND_AGAIN), 'G')); new BMessage(MENU_FIND_AGAIN), 'G'));
fFindAgainItem->SetEnabled(false); fFindAgainItem->SetEnabled(false);
menu->AddItem(menuItem = new BMenuItem(TR("Find selection"), menu->AddItem(menuItem = new BMenuItem(B_TRANSLATE("Find selection"),
new BMessage(MENU_FIND_SELECTION), 'H')); new BMessage(MENU_FIND_SELECTION), 'H'));
menu->AddItem(menuItem = new BMenuItem(TR("Replace" B_UTF8_ELLIPSIS), menu->AddItem(menuItem = new BMenuItem(
B_TRANSLATE("Replace" B_UTF8_ELLIPSIS),
new BMessage(MENU_REPLACE), 'R')); new BMessage(MENU_REPLACE), 'R'));
menu->AddItem(fReplaceSameItem = new BMenuItem(TR("Replace same"), menu->AddItem(fReplaceSameItem = new BMenuItem(B_TRANSLATE("Replace same"),
new BMessage(MENU_REPLACE_SAME), 'T')); new BMessage(MENU_REPLACE_SAME), 'T'));
fReplaceSameItem->SetEnabled(false); fReplaceSameItem->SetEnabled(false);
// Add the "Font"-menu: // Add the "Font"-menu:
fFontMenu = new BMenu(TR("Font")); fFontMenu = new BMenu(B_TRANSLATE("Font"));
fMenuBar->AddItem(fFontMenu); fMenuBar->AddItem(fFontMenu);
//"Size"-subMenu //"Size"-subMenu
fFontSizeMenu = new BMenu(TR("Size")); fFontSizeMenu = new BMenu(B_TRANSLATE("Size"));
fFontSizeMenu->SetRadioMode(true); fFontSizeMenu->SetRadioMode(true);
fFontMenu->AddItem(fFontSizeMenu); fFontMenu->AddItem(fFontSizeMenu);
@@ -265,25 +270,25 @@ StyledEditWindow::InitWindow(uint32 encoding)
} }
// "Color"-subMenu // "Color"-subMenu
fFontColorMenu = new BMenu(TR("Color")); fFontColorMenu = new BMenu(B_TRANSLATE("Color"));
fFontColorMenu->SetRadioMode(true); fFontColorMenu->SetRadioMode(true);
fFontMenu->AddItem(fFontColorMenu); fFontMenu->AddItem(fFontColorMenu);
fFontColorMenu->AddItem(fBlackItem = new BMenuItem(TR("Black"), fFontColorMenu->AddItem(fBlackItem = new BMenuItem(B_TRANSLATE("Black"),
new BMessage(FONT_COLOR))); new BMessage(FONT_COLOR)));
fBlackItem->SetMarked(true); fBlackItem->SetMarked(true);
fFontColorMenu->AddItem(fRedItem = new ColorMenuItem(TR("Red"), RED, fFontColorMenu->AddItem(fRedItem = new ColorMenuItem(B_TRANSLATE("Red"),
new BMessage(FONT_COLOR))); RED, new BMessage(FONT_COLOR)));
fFontColorMenu->AddItem(fGreenItem = new ColorMenuItem(TR("Green"), GREEN, fFontColorMenu->AddItem(fGreenItem = new ColorMenuItem(B_TRANSLATE("Green"),
new BMessage(FONT_COLOR))); GREEN, new BMessage(FONT_COLOR)));
fFontColorMenu->AddItem(fBlueItem = new ColorMenuItem(TR("Blue"), BLUE, fFontColorMenu->AddItem(fBlueItem = new ColorMenuItem(B_TRANSLATE("Blue"),
new BMessage(FONT_COLOR))); BLUE, new BMessage(FONT_COLOR)));
fFontColorMenu->AddItem(fCyanItem = new ColorMenuItem(TR("Cyan"), CYAN, fFontColorMenu->AddItem(fCyanItem = new ColorMenuItem(B_TRANSLATE("Cyan"),
new BMessage(FONT_COLOR))); CYAN, new BMessage(FONT_COLOR)));
fFontColorMenu->AddItem(fMagentaItem = new ColorMenuItem(TR("Magenta"), MAGENTA, fFontColorMenu->AddItem(fMagentaItem = new ColorMenuItem(B_TRANSLATE("Magenta"),
new BMessage(FONT_COLOR))); MAGENTA, new BMessage(FONT_COLOR)));
fFontColorMenu->AddItem(fYellowItem = new ColorMenuItem(TR("Yellow"), YELLOW, fFontColorMenu->AddItem(fYellowItem = new ColorMenuItem(B_TRANSLATE("Yellow"),
new BMessage(FONT_COLOR))); YELLOW, new BMessage(FONT_COLOR)));
fFontMenu->AddSeparatorItem(); fFontMenu->AddSeparatorItem();
// Available fonts // Available fonts
@@ -314,23 +319,23 @@ StyledEditWindow::InitWindow(uint32 encoding)
} }
// Add the "Document"-menu: // Add the "Document"-menu:
menu = new BMenu(TR("Document")); menu = new BMenu(B_TRANSLATE("Document"));
fMenuBar->AddItem(menu); fMenuBar->AddItem(menu);
// "Align"-subMenu: // "Align"-subMenu:
subMenu = new BMenu(TR("Align")); subMenu = new BMenu(B_TRANSLATE("Align"));
subMenu->SetRadioMode(true); subMenu->SetRadioMode(true);
subMenu->AddItem(fAlignLeft = new BMenuItem(TR("Left"), subMenu->AddItem(fAlignLeft = new BMenuItem(B_TRANSLATE("Left"),
new BMessage(ALIGN_LEFT))); new BMessage(ALIGN_LEFT)));
fAlignLeft->SetMarked(true); fAlignLeft->SetMarked(true);
subMenu->AddItem(fAlignCenter = new BMenuItem(TR("Center"), subMenu->AddItem(fAlignCenter = new BMenuItem(B_TRANSLATE("Center"),
new BMessage(ALIGN_CENTER))); new BMessage(ALIGN_CENTER)));
subMenu->AddItem(fAlignRight = new BMenuItem(TR("Right"), subMenu->AddItem(fAlignRight = new BMenuItem(B_TRANSLATE("Right"),
new BMessage(ALIGN_RIGHT))); new BMessage(ALIGN_RIGHT)));
menu->AddItem(subMenu); menu->AddItem(subMenu);
menu->AddItem(fWrapItem = new BMenuItem(TR("Wrap lines"), menu->AddItem(fWrapItem = new BMenuItem(B_TRANSLATE("Wrap lines"),
new BMessage(WRAP_LINES))); new BMessage(WRAP_LINES)));
fWrapItem->SetMarked(true); fWrapItem->SetMarked(true);
@@ -668,7 +673,7 @@ StyledEditWindow::MessageReceived(BMessage* message)
// set mode // set mode
fCanUndo = false; fCanUndo = false;
fCanRedo = true; fCanRedo = true;
fUndoItem->SetLabel(TR("Redo typing")); fUndoItem->SetLabel(B_TRANSLATE("Redo typing"));
fUndoItem->SetEnabled(true); fUndoItem->SetEnabled(true);
fUndoFlag = false; fUndoFlag = false;
} else { } else {
@@ -688,7 +693,7 @@ StyledEditWindow::MessageReceived(BMessage* message)
// set mode // set mode
fCanUndo = true; fCanUndo = true;
fCanRedo = false; fCanRedo = false;
fUndoItem->SetLabel(TR("Undo typing")); fUndoItem->SetLabel(B_TRANSLATE("Undo typing"));
fUndoItem->SetEnabled(true); fUndoItem->SetEnabled(true);
fRedoFlag = false; fRedoFlag = false;
} }
@@ -875,10 +880,11 @@ StyledEditWindow::QuitRequested()
return true; return true;
BString alertText; BString alertText;
bs_printf(&alertText, TR("Save changes to the document \"%s\"? "), Title()); bs_printf(&alertText,
B_TRANSLATE("Save changes to the document \"%s\"? "), Title());
int32 index = _ShowAlert(alertText, TR("Cancel"), TR("Don't save"), TR("Save"), int32 index = _ShowAlert(alertText, B_TRANSLATE("Cancel"),
B_WARNING_ALERT); B_TRANSLATE("Don't save"), B_TRANSLATE("Save"), B_WARNING_ALERT);
if (index == 0) if (index == 0)
return false; // "cancel": dont save, dont close the window return false; // "cancel": dont save, dont close the window
@@ -928,10 +934,11 @@ StyledEditWindow::Save(BMessage* message)
|| (getgid() == st.st_gid && (S_IWGRP & st.st_mode)) || (getgid() == st.st_gid && (S_IWGRP & st.st_mode))
|| (S_IWOTH & st.st_mode))) { || (S_IWOTH & st.st_mode))) {
BString alertText; BString alertText;
bs_printf(&alertText, TR("This file is marked Read-Only. " bs_printf(&alertText, B_TRANSLATE("This file is marked "
"Save changes to the document \"%s\"? "), name); "Read-Only. Save changes to the document \"%s\"? "), name);
switch (_ShowAlert(alertText, TR("Cancel"), TR("Don't save"), switch (_ShowAlert(alertText, B_TRANSLATE("Cancel"),
TR("Save"), B_WARNING_ALERT)) { B_TRANSLATE("Don't save"),
B_TRANSLATE("Save"), B_WARNING_ALERT)) {
case 0: case 0:
return B_CANCELED; return B_CANCELED;
case 1: case 1:
@@ -947,10 +954,10 @@ StyledEditWindow::Save(BMessage* message)
if (status != B_OK) { if (status != B_OK) {
BString alertText; BString alertText;
bs_printf(&alertText, TR("Error saving \"%s\":\n%s"), name, bs_printf(&alertText, B_TRANSLATE("Error saving \"%s\":\n%s"), name,
strerror(status)); strerror(status));
_ShowAlert(alertText, TR("OK"), "", "", B_STOP_ALERT); _ShowAlert(alertText, B_TRANSLATE("OK"), "", "", B_STOP_ALERT);
return status; return status;
} }
@@ -997,7 +1004,7 @@ StyledEditWindow::SaveAs(BMessage* message)
BMenuBar* menuBar = dynamic_cast<BMenuBar*>( BMenuBar* menuBar = dynamic_cast<BMenuBar*>(
fSavePanel->Window()->FindView("MenuBar")); fSavePanel->Window()->FindView("MenuBar"));
fSavePanelEncodingMenu= new BMenu(TR("Encoding")); fSavePanelEncodingMenu= new BMenu(B_TRANSLATE("Encoding"));
menuBar->AddItem(fSavePanelEncodingMenu); menuBar->AddItem(fSavePanelEncodingMenu);
fSavePanelEncodingMenu->SetRadioMode(true); fSavePanelEncodingMenu->SetRadioMode(true);
@@ -1060,15 +1067,17 @@ StyledEditWindow::_LoadFile(entry_ref* ref)
BEntry entry(ref, true); BEntry entry(ref, true);
char name[B_FILE_NAME_LENGTH]; char name[B_FILE_NAME_LENGTH];
if (entry.GetName(name) != B_OK) if (entry.GetName(name) != B_OK)
strcpy(name, TR("???")); strcpy(name, B_TRANSLATE("???"));
BString text; BString text;
if (status == B_BAD_TYPE) if (status == B_BAD_TYPE)
bs_printf(&text, TR("Error loading \"%s\":\n\tUnsupported format"), name); bs_printf(&text,
B_TRANSLATE("Error loading \"%s\":\n\tUnsupported format"), name);
else else
bs_printf(&text, TR("Error loading \"%s\":\n\t%s"), name, strerror(status)); bs_printf(&text, B_TRANSLATE("Error loading \"%s\":\n\t%s"),
name, strerror(status));
_ShowAlert(text, TR("OK"), "", "", B_STOP_ALERT); _ShowAlert(text, B_TRANSLATE("OK"), "", "", B_STOP_ALERT);
return status; return status;
} }
@@ -1146,14 +1155,17 @@ StyledEditWindow::RevertToSaved()
if (status != B_OK || !entry.Exists()) { if (status != B_OK || !entry.Exists()) {
BString alertText; BString alertText;
bs_printf(&alertText, TR("Cannot revert, file not found: \"%s\"."), name); bs_printf(&alertText,
_ShowAlert(alertText, TR("OK"), "", "", B_STOP_ALERT); B_TRANSLATE("Cannot revert, file not found: \"%s\"."), name);
_ShowAlert(alertText, B_TRANSLATE("OK"), "", "", B_STOP_ALERT);
return; return;
} }
BString alertText; BString alertText;
bs_printf(&alertText, TR("Revert to the last version of \"%s\"? "), Title()); bs_printf(&alertText,
if (_ShowAlert(alertText, TR("Cancel"), TR("OK"), "", B_WARNING_ALERT) != 1) B_TRANSLATE("Revert to the last version of \"%s\"? "), Title());
if (_ShowAlert(alertText, B_TRANSLATE("Cancel"), B_TRANSLATE("OK"),
"", B_WARNING_ALERT) != 1)
return; return;
fTextView->Reset(); fTextView->Reset();
@@ -1164,7 +1176,7 @@ StyledEditWindow::RevertToSaved()
#define TR_CONTEXT "Menus" #define TR_CONTEXT "Menus"
// clear undo modes // clear undo modes
fUndoItem->SetLabel(TR("Can't undo")); fUndoItem->SetLabel(B_TRANSLATE("Can't undo"));
fUndoItem->SetEnabled(false); fUndoItem->SetEnabled(false);
fUndoFlag = false; fUndoFlag = false;
fCanUndo = false; fCanUndo = false;
@@ -1500,7 +1512,7 @@ StyledEditWindow::_UpdateCleanUndoRedoSaveRevert()
fRedoCleans = false; fRedoCleans = false;
fRevertItem->SetEnabled(fSaveMessage != NULL); fRevertItem->SetEnabled(fSaveMessage != NULL);
fSaveItem->SetEnabled(true); fSaveItem->SetEnabled(true);
fUndoItem->SetLabel(TR("Can't Undo")); fUndoItem->SetLabel(B_TRANSLATE("Can't Undo"));
fUndoItem->SetEnabled(false); fUndoItem->SetEnabled(false);
fCanUndo = false; fCanUndo = false;
fCanRedo = false; fCanRedo = false;