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@36671 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-05-06 21:47:06 +00:00
parent a936f4b5ff
commit 99d126bd7c
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/pairs/PairsView.cpp
+4 -4
View File
@@ -168,11 +168,11 @@ PairsView::_ReadRandomIcons()
BBitmap* bitmap = ((BBitmap*)bitmaps.RemoveItem(index)); BBitmap* bitmap = ((BBitmap*)bitmaps.RemoveItem(index));
if (bitmap == NULL) { if (bitmap == NULL) {
char buffer[512]; char buffer[512];
snprintf(buffer, sizeof(buffer), TR("Pairs did not find enough " snprintf(buffer, sizeof(buffer), B_TRANSLATE("Pairs did not find "
"vector icons in the system; it needs at least %d."), "enough vector icons in the system; it needs at least %d."),
fNumOfCards / 2); fNumOfCards / 2);
BAlert* alert = new BAlert("fatal", buffer, TR("OK"), NULL, NULL, BAlert* alert = new BAlert("fatal", buffer, B_TRANSLATE("OK"),
B_WIDTH_FROM_WIDEST, B_STOP_ALERT); NULL, NULL, B_WIDTH_FROM_WIDEST, B_STOP_ALERT);
alert->Go(); alert->Go();
exit(1); exit(1);
} }
src/apps/pairs/PairsWindow.cpp
+15 -13
View File
@@ -39,7 +39,7 @@ const uint32 MENU_QUIT = 'MGqu';
PairsWindow::PairsWindow() PairsWindow::PairsWindow()
: :
BWindow(BRect(100, 100, 405, 423), TR("Pairs"), B_TITLED_WINDOW, BWindow(BRect(100, 100, 405, 423), B_TRANSLATE("Pairs"), B_TITLED_WINDOW,
B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE
| B_NOT_RESIZABLE | B_NOT_ZOOMABLE), | B_NOT_RESIZABLE | B_NOT_ZOOMABLE),
fPairComparing(NULL), fPairComparing(NULL),
@@ -71,42 +71,42 @@ PairsWindow::_MakeMenuBar()
fMenuBar = new BMenuBar(BRect(0, 0, 0, 0), "menubar"); fMenuBar = new BMenuBar(BRect(0, 0, 0, 0), "menubar");
AddChild(fMenuBar); AddChild(fMenuBar);
BMenu* menu = new BMenu(TR("Game")); BMenu* menu = new BMenu(B_TRANSLATE("Game"));
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'));
menu->AddSeparatorItem(); menu->AddSeparatorItem();
BMenu* sizeMenu = new BMenu(TR("Size")); BMenu* sizeMenu = new BMenu(B_TRANSLATE("Size"));
sizeMenu->SetRadioMode(true); sizeMenu->SetRadioMode(true);
BMessage* sizeMessage = new BMessage(MENU_SIZE); BMessage* sizeMessage = new BMessage(MENU_SIZE);
sizeMessage->AddInt32("width", 4); sizeMessage->AddInt32("width", 4);
sizeMessage->AddInt32("height", 4); sizeMessage->AddInt32("height", 4);
sizeMenu->AddItem(menuItem = new BMenuItem(TR("Beginner (4x4)"), sizeMenu->AddItem(menuItem = new BMenuItem(B_TRANSLATE("Beginner (4x4)"),
sizeMessage)); sizeMessage));
menuItem->SetMarked(true); menuItem->SetMarked(true);
sizeMessage = new BMessage(MENU_SIZE); sizeMessage = new BMessage(MENU_SIZE);
sizeMessage->AddInt32("width", 6); sizeMessage->AddInt32("width", 6);
sizeMessage->AddInt32("height", 6); sizeMessage->AddInt32("height", 6);
sizeMenu->AddItem(menuItem = new BMenuItem(TR("Intermediate (6x6)"), sizeMenu->AddItem(menuItem = new BMenuItem(
sizeMessage)); B_TRANSLATE("Intermediate (6x6)"), sizeMessage));
sizeMessage = new BMessage(MENU_SIZE); sizeMessage = new BMessage(MENU_SIZE);
sizeMessage->AddInt32("width", 8); sizeMessage->AddInt32("width", 8);
sizeMessage->AddInt32("height", 8); sizeMessage->AddInt32("height", 8);
sizeMenu->AddItem(menuItem = new BMenuItem(TR("Expert (8x8)"), sizeMenu->AddItem(menuItem = new BMenuItem(B_TRANSLATE("Expert (8x8)"),
sizeMessage)); sizeMessage));
menu->AddItem(sizeMenu); menu->AddItem(sizeMenu);
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'));
} }
@@ -223,16 +223,18 @@ PairsWindow::MessageReceived(BMessage* message)
BString score; BString score;
score << fButtonClicks; score << fButtonClicks;
strAbout strAbout
<< TR("Pairs\n" << B_TRANSLATE("Pairs\n"
"\twritten by Ralf Schülke\n" "\twritten by Ralf Schülke\n"
"\tCopyright 2008-2010, Haiku Inc.\n" "\tCopyright 2008-2010, Haiku Inc.\n"
"\n" "\n"
"You completed the game in %s clicks.\n"); "You completed the game in %s clicks.\n");
strAbout.Replace("%s", score.String(), 1); strAbout.Replace("%s", score.String(), 1);
BAlert* alert = new BAlert("about", TR(strAbout.String()), BAlert* alert = new BAlert("about",
TR("New game"), TR("Quit game")); B_TRANSLATE(strAbout.String()),
B_TRANSLATE("New game"),
B_TRANSLATE("Quit game"));
BTextView* view = alert->TextView(); BTextView* view = alert->TextView();
BFont font; BFont font;