Made some more strings localizable, removed some unnecessary localizations from CDPlayer. I hope everything's OK...

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40436 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Joachim Seemer 2011-02-10 22:03:51 +00:00
parent a24bc8d9a3
commit c16bcdfcb7
9 changed files with 35 additions and 24 deletions

View File

@ -144,23 +144,23 @@ CDPlayer::BuildGUI()
r.bottom = r.top + labelHeight;
r.OffsetBy(0, r.Height() + 5);
fCurrentTrack = new BStringView(r, B_TRANSLATE("TrackNumber"),
fCurrentTrack = new BStringView(r, "TrackNumber",
"", B_FOLLOW_LEFT_RIGHT);
box->AddChild(fCurrentTrack);
r.OffsetBy(0, r.Height() + 5);
r.right = r.left + (r.Width() / 2);
fTrackTime = new BStringView(r, B_TRANSLATE("TrackTime"),
fTrackTime = new BStringView(r, "TrackTime",
"Track: 88:88 / 88:88", B_FOLLOW_LEFT_RIGHT);
fTrackTime->ResizeToPreferred();
fTrackTime->SetText("Track: --:-- / --:--");
fTrackTime->SetText(B_TRANSLATE("Track: --:-- / --:--"));
box->AddChild(fTrackTime);
r.OffsetTo(fTrackTime->Frame().right + 5, r.top);
fDiscTime = new BStringView(r, B_TRANSLATE("DiscTime"),
fDiscTime = new BStringView(r, "DiscTime",
"Disc: 88:88 / 88:88", B_FOLLOW_RIGHT);
fDiscTime->ResizeToPreferred();
fDiscTime->SetText("Disc: --:-- / --:--");
fDiscTime->SetText(B_TRANSLATE("Disc: --:-- / --:--"));
box->AddChild(fDiscTime);
float maxWidth = max_c(fDiscTime->Frame().right, fCDTitle->Frame().right);

View File

@ -216,7 +216,7 @@ CharacterWindow::CharacterWindow()
// Add menu
// "File" menu
BMenu* menu = new BMenu("File");
BMenu* menu = new BMenu(B_TRANSLATE("File"));
BMenuItem* item;
menu->AddItem(item = new BMenuItem(B_TRANSLATE("About CharacterMap"
@ -230,7 +230,7 @@ CharacterWindow::CharacterWindow()
item->SetTarget(be_app);
menuBar->AddItem(menu);
menu = new BMenu("View");
menu = new BMenu(B_TRANSLATE("View"));
menu->AddItem(item = new BMenuItem(B_TRANSLATE("Show private blocks"),
new BMessage(kMsgPrivateBlocks)));
item->SetMarked(fCharacterView->IsShowingPrivateBlocks());
@ -493,7 +493,7 @@ CharacterWindow::_SetFont(const char* family, const char* style)
BMenu*
CharacterWindow::_CreateFontMenu()
{
BMenu* menu = new BMenu("Font");
BMenu* menu = new BMenu(B_TRANSLATE("Font"));
BMenuItem* item;
font_family currentFamily;

View File

@ -721,8 +721,9 @@ ExpanderWindow::StartListing()
BEntry entry(&fSourceRef);
BPath path(&entry);
BString text(B_TRANSLATE("Creating listing for "));
text.Append(path.Leaf());
BString text(B_TRANSLATE("Creating listing for %s"));
text.ReplaceFirst("%s", path.Leaf());
// text.Append(path.Leaf());
fStatusView->SetText(text.String());
fListingText->SetText("");

View File

@ -21,6 +21,7 @@ DoCatalogs Expander :
:
ExpanderApp.cpp
ExpanderWindow.cpp
ExpanderPreferences.cpp
ExpanderSettings.cpp
DirectoryFilePanel.cpp
;

View File

@ -862,7 +862,7 @@ MainWindow::_CreateMenuBar(BRect frame)
BMenu* filterModeMenu = new BMenu(B_TRANSLATE("Snap to grid"));
BMessage* message = new BMessage(MSG_MOUSE_FILTER_MODE);
message->AddInt32("mode", SNAPPING_OFF);
filterModeMenu->AddItem(new BMenuItem("Off", message, '4'));
filterModeMenu->AddItem(new BMenuItem(B_TRANSLATE("Off"), message, '4'));
message = new BMessage(MSG_MOUSE_FILTER_MODE);
message->AddInt32("mode", SNAPPING_64);

View File

@ -353,7 +353,7 @@ PadView::DisplayMenu(BPoint where, LaunchButton* button) const
}
menu->AddSeparatorItem();
// window settings
BMenu* settingsM = new BMenu("Settings");
BMenu* settingsM = new BMenu(B_TRANSLATE("Settings"));
settingsM->SetFont(be_plain_font);
const char* toggleLayoutLabel;

View File

@ -385,7 +385,7 @@ TPrefsWindow::MessageReceived(BMessage* msg)
if ((item = fReplyToMenu->FindItem(label)) != NULL)
item->SetMarked(true);
strcpy(label, fWrap ? "On" : "Off");
strcpy(label, fWrap ? B_TRANSLATE("On") : B_TRANSLATE("Off"));
if ((item = fWrapMenu->FindItem(label)) != NULL)
item->SetMarked(true);
@ -395,7 +395,7 @@ TPrefsWindow::MessageReceived(BMessage* msg)
if ((item = fAttachAttributesMenu->FindItem(label)) != NULL)
item->SetMarked(true);
strcpy(label, fColoredQuotes ? "On" : "Off");
strcpy(label, fColoredQuotes ? B_TRANSLATE("On") : B_TRANSLATE("Off"));
if ((item = fColoredQuotesMenu->FindItem(label)) != NULL)
item->SetMarked(true);
@ -420,11 +420,11 @@ TPrefsWindow::MessageReceived(BMessage* msg)
}
}
strcpy(label, fWarnUnencodable ? "On" : "Off");
strcpy(label, fWarnUnencodable ? B_TRANSLATE("On") : B_TRANSLATE("Off"));
if ((item = fWarnUnencodableMenu->FindItem(label)) != NULL)
item->SetMarked(true);
strcpy(label, fSpellCheckStartOn ? "On" : "Off");
strcpy(label, fSpellCheckStartOn ? B_TRANSLATE("On") : B_TRANSLATE("Off"));
if ((item = fSpellCheckStartOnMenu->FindItem(label)) != NULL)
item->SetMarked(true);
} else
@ -787,13 +787,13 @@ TPrefsWindow::_BuildBoolMenu(uint32 what, const char* boolItem, bool isTrue)
menu = new BPopUpMenu("");
msg = new BMessage(what);
msg->AddBool(boolItem, true);
menu->AddItem(item = new BMenuItem("On", msg));
menu->AddItem(item = new BMenuItem(B_TRANSLATE("On"), msg));
if (isTrue)
item->SetMarked(true);
msg = new BMessage(what);
msg->AddInt32(boolItem, false);
menu->AddItem(item = new BMenuItem("Off", msg));
menu->AddItem(item = new BMenuItem(B_TRANSLATE("Off"), msg));
if (!isTrue)
item->SetMarked(true);

View File

@ -14,7 +14,11 @@
#include "StrokeTransformer.h"
#ifdef ICON_O_MATIC
# include <Message.h>
#include <Catalog.h>
#include <Message.h>
#undef B_TRANSLATE_CONTEXT
#define B_TRANSLATE_CONTEXT "Transformation"
#endif
@ -69,16 +73,16 @@ TransformerFactory::NextType(int32* cookie, uint32* type, BString* name)
switch (*type) {
case 0:
*name = "Transformation";
*name = B_TRANSLATE("Transformation");
return true;
case 1:
*name = "Perspective";
*name = B_TRANSLATE("Perspective");
return true;
case 2:
*name = "Contour";
*name = B_TRANSLATE("Contour");
return true;
case 3:
*name = "Stroke";
*name = B_TRANSLATE("Stroke");
return true;
}

View File

@ -14,11 +14,16 @@
#include <stdio.h>
#include <Catalog.h>
#include <Locale.h>
#include <Roster.h>
#include <Screen.h>
#include "Constants.h"
#undef B_TRANSLATE_CONTEXT
#define B_TRANSLATE_CONTEXT "Monitor View"
MonitorView::MonitorView(BRect rect, const char *name, int32 width, int32 height)
: BView(rect, name, B_FOLLOW_ALL, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE),
@ -106,7 +111,7 @@ MonitorView::Draw(BRect updateRect)
float height = ceilf(fontHeight.ascent + fontHeight.descent);
char text[64];
snprintf(text, sizeof(text), "%ld dpi", fDPI);
snprintf(text, sizeof(text), B_TRANSLATE("%ld dpi"), fDPI);
float width = StringWidth(text);
if (width > innerRect.Width() || height > innerRect.Height())