[haiku-commits] r36679 - haiku/trunk/src/apps/stylededit
- From: mattmadia@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 7 May 2010 00:51:05 +0200 (CEST)
Author: mmadia
Date: 2010-05-07 00:51:05 +0200 (Fri, 07 May 2010)
New Revision: 36679
Changeset: http://dev.haiku-os.org/changeset/36679/haiku
Ticket: http://dev.haiku-os.org/ticket/5408
Modified:
haiku/trunk/src/apps/stylededit/FindWindow.cpp
haiku/trunk/src/apps/stylededit/ReplaceWindow.cpp
haiku/trunk/src/apps/stylededit/StyledEditApp.cpp
haiku/trunk/src/apps/stylededit/StyledEditWindow.cpp
Log:
Updated to use B_TRANSLATE* macros. relates to #5408.
Modified: haiku/trunk/src/apps/stylededit/FindWindow.cpp
===================================================================
--- haiku/trunk/src/apps/stylededit/FindWindow.cpp 2010-05-06 22:39:04 UTC
(rev 36678)
+++ haiku/trunk/src/apps/stylededit/FindWindow.cpp 2010-05-06 22:51:05 UTC
(rev 36679)
@@ -33,14 +33,16 @@
{
AddShortcut('W', B_COMMAND_KEY, new BMessage(B_QUIT_REQUESTED));
- fSearchString = new BTextControl("", TR("Find:"), NULL, NULL);
- fCaseSensBox = new BCheckBox("", TR("Case-sensitive"), NULL);
- fWrapBox = new BCheckBox("", TR("Wrap-around search"), NULL);
- fBackSearchBox = new BCheckBox("", TR("Search backwards"), NULL);
- fCancelButton = new BButton("", TR("Cancel"), new
BMessage(B_QUIT_REQUESTED));
- fSearchButton = new BButton("", TR("Find"), new BMessage(MSG_SEARCH));
+ fSearchString = new BTextControl("", B_TRANSLATE("Find:"), NULL, NULL);
+ fCaseSensBox = new BCheckBox("", B_TRANSLATE("Case-sensitive"), NULL);
+ fWrapBox = new BCheckBox("", B_TRANSLATE("Wrap-around search"), NULL);
+ fBackSearchBox = new BCheckBox("", B_TRANSLATE("Search backwards"),
NULL);
+ fCancelButton = new BButton("", B_TRANSLATE("Cancel"),
+ 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)
.Add(BGridLayoutBuilder(6, 2)
.Add(fSearchString->CreateLabelLayoutItem(), 0,
0)
@@ -49,13 +51,13 @@
.Add(fWrapBox, 1, 2)
.Add(fBackSearchBox, 1, 3)
)
- .AddGroup(B_HORIZONTAL, 10)
- .AddGlue()
- .Add(fCancelButton)
- .Add(fSearchButton)
- .End()
- .SetInsets(10, 10, 10, 10)
- );
+ .AddGroup(B_HORIZONTAL, 10)
+ .AddGlue()
+ .Add(fCancelButton)
+ .Add(fSearchButton)
+ .End()
+ .SetInsets(10, 10, 10, 10)
+ );
fSearchButton->MakeDefault(true);
fHandler = _handler;
@@ -84,7 +86,7 @@
default:
BWindow::MessageReceived(msg);
- break;
+ break;
}
}
Modified: haiku/trunk/src/apps/stylededit/ReplaceWindow.cpp
===================================================================
--- haiku/trunk/src/apps/stylededit/ReplaceWindow.cpp 2010-05-06 22:39:04 UTC
(rev 36678)
+++ haiku/trunk/src/apps/stylededit/ReplaceWindow.cpp 2010-05-06 22:51:05 UTC
(rev 36679)
@@ -33,25 +33,28 @@
bool caseState, bool wrapState, bool backState)
: BWindow(frame, "ReplaceWindow", B_MODAL_WINDOW,
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));
-
- fSearchString = new BTextControl("", TR("Find:"), NULL, NULL);
- fReplaceString = new BTextControl("", TR("Replace with:"), NULL, NULL);
- fCaseSensBox = new BCheckBox("", TR("Case-sensitive"), NULL);
- fWrapBox = new BCheckBox("", TR("Wrap-around search"), NULL);
- fBackSearchBox = new BCheckBox("", TR("Search backwards"), NULL);
- fAllWindowsBox = new BCheckBox("", TR("Replace in all windows"),
+
+ fSearchString = new BTextControl("", B_TRANSLATE("Find:"), NULL, NULL);
+ fReplaceString = new BTextControl("", B_TRANSLATE("Replace with:"),
+ NULL, NULL);
+ fCaseSensBox = new BCheckBox("", B_TRANSLATE("Case-sensitive"), NULL);
+ fWrapBox = new BCheckBox("", B_TRANSLATE("Wrap-around search"), NULL);
+ fBackSearchBox = new BCheckBox("", B_TRANSLATE("Search backwards"),
NULL);
+ fAllWindowsBox = new BCheckBox("", B_TRANSLATE("Replace in all
windows"),
new BMessage(CHANGE_WINDOW));
fUIchange = false;
- fReplaceAllButton = new BButton("", TR("Replace all"),
+ fReplaceAllButton = new BButton("", B_TRANSLATE("Replace all"),
new BMessage(MSG_REPLACE_ALL));
- fCancelButton = new BButton("", TR("Cancel"), new
BMessage(B_QUIT_REQUESTED));
- fReplaceButton = new BButton("", TR("Replace"), new
BMessage(MSG_REPLACE));
+ fCancelButton = new BButton("", B_TRANSLATE("Cancel"),
+ 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)
.Add(BGridLayoutBuilder(6, 2)
.Add(fSearchString->CreateLabelLayoutItem(), 0,
0)
@@ -63,21 +66,21 @@
.Add(fBackSearchBox, 1, 4)
.Add(fAllWindowsBox, 1, 5)
)
- .AddGroup(B_HORIZONTAL, 10)
- .Add(fReplaceAllButton)
- .AddGlue()
- .Add(fCancelButton)
- .Add(fReplaceButton)
- .End()
- .SetInsets(10, 10, 10, 10)
- );
+ .AddGroup(B_HORIZONTAL, 10)
+ .Add(fReplaceAllButton)
+ .AddGlue()
+ .Add(fCancelButton)
+ .Add(fReplaceButton)
+ .End()
+ .SetInsets(10, 10, 10, 10)
+ );
fReplaceButton->MakeDefault(true);
fHandler = _handler;
const char* searchtext = searchString->String();
- const char* replacetext = replaceString->String();
+ const char* replacetext = replaceString->String();
fSearchString->SetText(searchtext);
fReplaceString->SetText(replacetext);
@@ -101,11 +104,11 @@
break;
case MSG_REPLACE_ALL:
_SendMessage(MSG_REPLACE_ALL);
- break;
+ break;
default:
BWindow::MessageReceived(msg);
- break;
+ break;
}
}
@@ -137,7 +140,7 @@
if (key == B_ESCAPE) {
message->MakeEmpty();
message->what = B_QUIT_REQUESTED;
-
+
// This is a hack, but it actually does what is
expected,
// unlike the hack above. This kind of key
filtering probably
// ought to be handled by a BMessageFilter,
though.
Modified: haiku/trunk/src/apps/stylededit/StyledEditApp.cpp
===================================================================
--- haiku/trunk/src/apps/stylededit/StyledEditApp.cpp 2010-05-06 22:39:04 UTC
(rev 36678)
+++ haiku/trunk/src/apps/stylededit/StyledEditApp.cpp 2010-05-06 22:51:05 UTC
(rev 36679)
@@ -36,7 +36,7 @@
BRect gWindowRect(7-15, 26-15, 507, 426);
-namespace
+namespace
{
void
cascade()
@@ -51,7 +51,7 @@
if (top + gWindowRect.Height() > screenBorder.bottom)
top = 26;
- gWindowRect.OffsetTo(BPoint(left, top));
+ gWindowRect.OffsetTo(BPoint(left, top));
}
@@ -73,7 +73,7 @@
top = top - ((int)left % 15) + 26;
}
- gWindowRect.OffsetTo(BPoint(left, top));
+ gWindowRect.OffsetTo(BPoint(left, top));
}
}
@@ -94,7 +94,7 @@
dynamic_cast<BMenuBar*>(fOpenPanel->Window()->FindView("MenuBar"));
fOpenAsEncoding = 0;
- fOpenPanelEncodingMenu= new BMenu(TR("Encoding"));
+ fOpenPanelEncodingMenu= new BMenu(B_TRANSLATE("Encoding"));
menuBar->AddItem(fOpenPanelEncodingMenu);
fOpenPanelEncodingMenu->SetRadioMode(true);
@@ -103,7 +103,7 @@
while (roster.GetNextCharacterSet(&charset) == B_NO_ERROR) {
BString name;
if (charset.GetFontID() == B_UNICODE_UTF8)
- name = TR("Default");
+ name = B_TRANSLATE("Default");
else
name = charset.GetPrintName();
@@ -159,7 +159,7 @@
default:
BApplication::MessageReceived(message);
break;
- }
+ }
}
@@ -181,7 +181,7 @@
if (entry.IsDirectory()) {
BPath path(&entry);
- fprintf(stderr,
+ fprintf(stderr,
"Can't open directory \"%s\" for editing.\n",
path.Path());
return B_ERROR;
@@ -191,7 +191,7 @@
entry.GetParent(&parent);
if (!entry.Exists() && !parent.Exists()) {
- fprintf(stderr,
+ fprintf(stderr,
"Can't create file. Missing parent directory.\n");
return B_ERROR;
}
@@ -253,7 +253,7 @@
StyledEditApp::ArgvReceived(int32 argc, char* argv[])
{
// 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
// relative to the cwd of the invocation, if they are not
// absolute. This cwd we find as a string named "cwd" in
@@ -276,9 +276,9 @@
// patch relative paths only
}
- entry_ref ref;
+ entry_ref ref;
get_ref_for_path(path.Path(), &ref);
-
+
status_t status;
status = OpenDocument(&ref);
@@ -288,8 +288,8 @@
}
-void
-StyledEditApp::ReadyToRun()
+void
+StyledEditApp::ReadyToRun()
{
if (fWindowCount > 0)
return;
Modified: haiku/trunk/src/apps/stylededit/StyledEditWindow.cpp
===================================================================
--- haiku/trunk/src/apps/stylededit/StyledEditWindow.cpp 2010-05-06
22:39:04 UTC (rev 36678)
+++ haiku/trunk/src/apps/stylededit/StyledEditWindow.cpp 2010-05-06
22:51:05 UTC (rev 36679)
@@ -76,7 +76,7 @@
: BWindow(frame, "untitled", B_DOCUMENT_WINDOW, B_ASYNCHRONOUS_CONTROLS)
{
InitWindow(encoding);
- BString unTitled(TR("Untitled "));
+ BString unTitled(B_TRANSLATE("Untitled "));
unTitled << id;
SetTitle(unTitled.String());
fSaveItem->SetEnabled(true);
@@ -157,97 +157,102 @@
fTextView->MakeFocus(true);
// Add "File"-menu:
- BMenu* menu = new BMenu(TR("File"));
+ BMenu* menu = new BMenu(B_TRANSLATE("File"));
fMenuBar->AddItem(menu);
BMenuItem* menuItem;
- menu->AddItem(menuItem = new BMenuItem(TR("New"),
+ menu->AddItem(menuItem = new BMenuItem(B_TRANSLATE("New"),
new BMessage(MENU_NEW), 'N'));
menuItem->SetTarget(be_app);
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->SetTarget(be_app);
menu->AddSeparatorItem();
- menu->AddItem(fSaveItem = new BMenuItem(TR("Save"),
+ menu->AddItem(fSaveItem = new BMenuItem(B_TRANSLATE("Save"),
new BMessage(MENU_SAVE), 'S'));
fSaveItem->SetEnabled(false);
- menu->AddItem(menuItem = new BMenuItem(TR("Save as" B_UTF8_ELLIPSIS),
- new BMessage(MENU_SAVEAS)));
+ menu->AddItem(menuItem = new BMenuItem(
+ B_TRANSLATE("Save as" B_UTF8_ELLIPSIS), new
BMessage(MENU_SAVEAS)));
menuItem->SetShortcut('S', B_SHIFT_KEY);
menuItem->SetEnabled(true);
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)));
fRevertItem->SetEnabled(false);
- menu->AddItem(menuItem = new BMenuItem(TR("Close"),
+ menu->AddItem(menuItem = new BMenuItem(B_TRANSLATE("Close"),
new BMessage(MENU_CLOSE), 'W'));
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)));
- 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'));
menu->AddSeparatorItem();
- menu->AddItem(menuItem = new BMenuItem(TR("Quit"),
+ menu->AddItem(menuItem = new BMenuItem(B_TRANSLATE("Quit"),
new BMessage(MENU_QUIT), 'Q'));
// Add the "Edit"-menu:
- menu = new BMenu(TR("Edit"));
+ menu = new BMenu(B_TRANSLATE("Edit"));
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'));
fUndoItem->SetEnabled(false);
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->SetTarget(fTextView);
- menu->AddItem(fCopyItem = new BMenuItem(TR("Copy"),
+ menu->AddItem(fCopyItem = new BMenuItem(B_TRANSLATE("Copy"),
new BMessage(B_COPY), 'C'));
fCopyItem->SetEnabled(false);
fCopyItem->SetTarget(fTextView);
- menu->AddItem(menuItem = new BMenuItem(TR("Paste"),
+ menu->AddItem(menuItem = new BMenuItem(B_TRANSLATE("Paste"),
new BMessage(B_PASTE), 'V'));
menuItem->SetTarget(fTextView);
- menu->AddItem(fClearItem = new BMenuItem(TR("Clear"),
+ menu->AddItem(fClearItem = new BMenuItem(B_TRANSLATE("Clear"),
new BMessage(MENU_CLEAR)));
fClearItem->SetEnabled(false);
fClearItem->SetTarget(fTextView);
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'));
menuItem->SetTarget(fTextView);
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'));
- menu->AddItem(fFindAgainItem= new BMenuItem(TR("Find again"),
+ menu->AddItem(fFindAgainItem= new BMenuItem(B_TRANSLATE("Find again"),
new BMessage(MENU_FIND_AGAIN), 'G'));
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'));
- 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'));
- menu->AddItem(fReplaceSameItem = new BMenuItem(TR("Replace same"),
+ menu->AddItem(fReplaceSameItem = new BMenuItem(B_TRANSLATE("Replace
same"),
new BMessage(MENU_REPLACE_SAME), 'T'));
fReplaceSameItem->SetEnabled(false);
// Add the "Font"-menu:
- fFontMenu = new BMenu(TR("Font"));
+ fFontMenu = new BMenu(B_TRANSLATE("Font"));
fMenuBar->AddItem(fFontMenu);
//"Size"-subMenu
- fFontSizeMenu = new BMenu(TR("Size"));
+ fFontSizeMenu = new BMenu(B_TRANSLATE("Size"));
fFontSizeMenu->SetRadioMode(true);
fFontMenu->AddItem(fFontSizeMenu);
@@ -265,25 +270,25 @@
}
// "Color"-subMenu
- fFontColorMenu = new BMenu(TR("Color"));
+ fFontColorMenu = new BMenu(B_TRANSLATE("Color"));
fFontColorMenu->SetRadioMode(true);
fFontMenu->AddItem(fFontColorMenu);
- fFontColorMenu->AddItem(fBlackItem = new BMenuItem(TR("Black"),
+ fFontColorMenu->AddItem(fBlackItem = new BMenuItem(B_TRANSLATE("Black"),
new BMessage(FONT_COLOR)));
fBlackItem->SetMarked(true);
- fFontColorMenu->AddItem(fRedItem = new ColorMenuItem(TR("Red"), RED,
- new BMessage(FONT_COLOR)));
- fFontColorMenu->AddItem(fGreenItem = new ColorMenuItem(TR("Green"),
GREEN,
- new BMessage(FONT_COLOR)));
- fFontColorMenu->AddItem(fBlueItem = new ColorMenuItem(TR("Blue"), BLUE,
- new BMessage(FONT_COLOR)));
- fFontColorMenu->AddItem(fCyanItem = new ColorMenuItem(TR("Cyan"), CYAN,
- new BMessage(FONT_COLOR)));
- fFontColorMenu->AddItem(fMagentaItem = new ColorMenuItem(TR("Magenta"),
MAGENTA,
- new BMessage(FONT_COLOR)));
- fFontColorMenu->AddItem(fYellowItem = new ColorMenuItem(TR("Yellow"),
YELLOW,
- new BMessage(FONT_COLOR)));
+ fFontColorMenu->AddItem(fRedItem = new ColorMenuItem(B_TRANSLATE("Red"),
+ RED, new BMessage(FONT_COLOR)));
+ fFontColorMenu->AddItem(fGreenItem = new
ColorMenuItem(B_TRANSLATE("Green"),
+ GREEN, new BMessage(FONT_COLOR)));
+ fFontColorMenu->AddItem(fBlueItem = new
ColorMenuItem(B_TRANSLATE("Blue"),
+ BLUE, new BMessage(FONT_COLOR)));
+ fFontColorMenu->AddItem(fCyanItem = new
ColorMenuItem(B_TRANSLATE("Cyan"),
+ CYAN, new BMessage(FONT_COLOR)));
+ fFontColorMenu->AddItem(fMagentaItem = new
ColorMenuItem(B_TRANSLATE("Magenta"),
+ MAGENTA, new BMessage(FONT_COLOR)));
+ fFontColorMenu->AddItem(fYellowItem = new
ColorMenuItem(B_TRANSLATE("Yellow"),
+ YELLOW, new BMessage(FONT_COLOR)));
fFontMenu->AddSeparatorItem();
// Available fonts
@@ -314,23 +319,23 @@
}
// Add the "Document"-menu:
- menu = new BMenu(TR("Document"));
+ menu = new BMenu(B_TRANSLATE("Document"));
fMenuBar->AddItem(menu);
// "Align"-subMenu:
- subMenu = new BMenu(TR("Align"));
+ subMenu = new BMenu(B_TRANSLATE("Align"));
subMenu->SetRadioMode(true);
- subMenu->AddItem(fAlignLeft = new BMenuItem(TR("Left"),
+ subMenu->AddItem(fAlignLeft = new BMenuItem(B_TRANSLATE("Left"),
new BMessage(ALIGN_LEFT)));
fAlignLeft->SetMarked(true);
- subMenu->AddItem(fAlignCenter = new BMenuItem(TR("Center"),
+ subMenu->AddItem(fAlignCenter = new BMenuItem(B_TRANSLATE("Center"),
new BMessage(ALIGN_CENTER)));
- subMenu->AddItem(fAlignRight = new BMenuItem(TR("Right"),
+ subMenu->AddItem(fAlignRight = new BMenuItem(B_TRANSLATE("Right"),
new BMessage(ALIGN_RIGHT)));
menu->AddItem(subMenu);
- menu->AddItem(fWrapItem = new BMenuItem(TR("Wrap lines"),
+ menu->AddItem(fWrapItem = new BMenuItem(B_TRANSLATE("Wrap lines"),
new BMessage(WRAP_LINES)));
fWrapItem->SetMarked(true);
@@ -668,7 +673,7 @@
// set mode
fCanUndo = false;
fCanRedo = true;
- fUndoItem->SetLabel(TR("Redo typing"));
+ fUndoItem->SetLabel(B_TRANSLATE("Redo typing"));
fUndoItem->SetEnabled(true);
fUndoFlag = false;
} else {
@@ -688,7 +693,7 @@
// set mode
fCanUndo = true;
fCanRedo = false;
- fUndoItem->SetLabel(TR("Undo typing"));
+ fUndoItem->SetLabel(B_TRANSLATE("Undo typing"));
fUndoItem->SetEnabled(true);
fRedoFlag = false;
}
@@ -875,10 +880,11 @@
return true;
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"),
- B_WARNING_ALERT);
+ int32 index = _ShowAlert(alertText, B_TRANSLATE("Cancel"),
+ B_TRANSLATE("Don't save"), B_TRANSLATE("Save"),
B_WARNING_ALERT);
if (index == 0)
return false; // "cancel": dont save, dont close the window
@@ -928,10 +934,11 @@
|| (getgid() == st.st_gid && (S_IWGRP &
st.st_mode))
|| (S_IWOTH & st.st_mode))) {
BString alertText;
- bs_printf(&alertText, TR("This file is marked
Read-Only. "
- "Save changes to the document \"%s\"?
"), name);
- switch (_ShowAlert(alertText, TR("Cancel"),
TR("Don't save"),
- TR("Save"), B_WARNING_ALERT)) {
+ bs_printf(&alertText, B_TRANSLATE("This file is
marked "
+ "Read-Only. Save changes to the
document \"%s\"? "), name);
+ switch (_ShowAlert(alertText,
B_TRANSLATE("Cancel"),
+ B_TRANSLATE("Don't save"),
+ B_TRANSLATE("Save"), B_WARNING_ALERT)) {
case 0:
return B_CANCELED;
case 1:
@@ -947,10 +954,10 @@
if (status != B_OK) {
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));
- _ShowAlert(alertText, TR("OK"), "", "", B_STOP_ALERT);
+ _ShowAlert(alertText, B_TRANSLATE("OK"), "", "", B_STOP_ALERT);
return status;
}
@@ -997,7 +1004,7 @@
BMenuBar* menuBar = dynamic_cast<BMenuBar*>(
fSavePanel->Window()->FindView("MenuBar"));
- fSavePanelEncodingMenu= new BMenu(TR("Encoding"));
+ fSavePanelEncodingMenu= new BMenu(B_TRANSLATE("Encoding"));
menuBar->AddItem(fSavePanelEncodingMenu);
fSavePanelEncodingMenu->SetRadioMode(true);
@@ -1060,15 +1067,17 @@
BEntry entry(ref, true);
char name[B_FILE_NAME_LENGTH];
if (entry.GetName(name) != B_OK)
- strcpy(name, TR("???"));
+ strcpy(name, B_TRANSLATE("???"));
BString text;
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
- 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;
}
@@ -1146,14 +1155,17 @@
if (status != B_OK || !entry.Exists()) {
BString alertText;
- bs_printf(&alertText, TR("Cannot revert, file not found:
\"%s\"."), name);
- _ShowAlert(alertText, TR("OK"), "", "", B_STOP_ALERT);
+ bs_printf(&alertText,
+ B_TRANSLATE("Cannot revert, file not found: \"%s\"."),
name);
+ _ShowAlert(alertText, B_TRANSLATE("OK"), "", "", B_STOP_ALERT);
return;
}
BString alertText;
- bs_printf(&alertText, TR("Revert to the last version of \"%s\"? "),
Title());
- if (_ShowAlert(alertText, TR("Cancel"), TR("OK"), "", B_WARNING_ALERT)
!= 1)
+ bs_printf(&alertText,
+ B_TRANSLATE("Revert to the last version of \"%s\"? "), Title());
+ if (_ShowAlert(alertText, B_TRANSLATE("Cancel"), B_TRANSLATE("OK"),
+ "", B_WARNING_ALERT) != 1)
return;
fTextView->Reset();
@@ -1164,7 +1176,7 @@
#define TR_CONTEXT "Menus"
// clear undo modes
- fUndoItem->SetLabel(TR("Can't undo"));
+ fUndoItem->SetLabel(B_TRANSLATE("Can't undo"));
fUndoItem->SetEnabled(false);
fUndoFlag = false;
fCanUndo = false;
@@ -1500,7 +1512,7 @@
fRedoCleans = false;
fRevertItem->SetEnabled(fSaveMessage != NULL);
fSaveItem->SetEnabled(true);
- fUndoItem->SetLabel(TR("Can't Undo"));
+ fUndoItem->SetLabel(B_TRANSLATE("Can't Undo"));
fUndoItem->SetEnabled(false);
fCanUndo = false;
fCanRedo = false;
Other related posts:
- » [haiku-commits] r36679 - haiku/trunk/src/apps/stylededit - mattmadia
