diff --git a/src/apps/cdplayer/CDPlayer.cpp b/src/apps/cdplayer/CDPlayer.cpp index 43ee120dea..6c29668fa5 100644 --- a/src/apps/cdplayer/CDPlayer.cpp +++ b/src/apps/cdplayer/CDPlayer.cpp @@ -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); diff --git a/src/apps/charactermap/CharacterWindow.cpp b/src/apps/charactermap/CharacterWindow.cpp index 625ecf9002..a9b5fa2be9 100644 --- a/src/apps/charactermap/CharacterWindow.cpp +++ b/src/apps/charactermap/CharacterWindow.cpp @@ -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; diff --git a/src/apps/expander/ExpanderWindow.cpp b/src/apps/expander/ExpanderWindow.cpp index f6e50adb4a..f1535e40ee 100644 --- a/src/apps/expander/ExpanderWindow.cpp +++ b/src/apps/expander/ExpanderWindow.cpp @@ -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(""); diff --git a/src/apps/expander/Jamfile b/src/apps/expander/Jamfile index cd30f68ab8..4f21024e7e 100644 --- a/src/apps/expander/Jamfile +++ b/src/apps/expander/Jamfile @@ -21,6 +21,7 @@ DoCatalogs Expander : : ExpanderApp.cpp ExpanderWindow.cpp + ExpanderPreferences.cpp ExpanderSettings.cpp DirectoryFilePanel.cpp ; diff --git a/src/apps/icon-o-matic/MainWindow.cpp b/src/apps/icon-o-matic/MainWindow.cpp index ff3bd4946c..b0e1932ab7 100644 --- a/src/apps/icon-o-matic/MainWindow.cpp +++ b/src/apps/icon-o-matic/MainWindow.cpp @@ -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); diff --git a/src/apps/launchbox/PadView.cpp b/src/apps/launchbox/PadView.cpp index 9eefd82df0..68409dd8db 100644 --- a/src/apps/launchbox/PadView.cpp +++ b/src/apps/launchbox/PadView.cpp @@ -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; diff --git a/src/apps/mail/Prefs.cpp b/src/apps/mail/Prefs.cpp index d0ab112819..7afcdf5ee8 100644 --- a/src/apps/mail/Prefs.cpp +++ b/src/apps/mail/Prefs.cpp @@ -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); diff --git a/src/libs/icon/transformer/TransformerFactory.cpp b/src/libs/icon/transformer/TransformerFactory.cpp index 3dfc83d0d9..a0467458b7 100644 --- a/src/libs/icon/transformer/TransformerFactory.cpp +++ b/src/libs/icon/transformer/TransformerFactory.cpp @@ -14,7 +14,11 @@ #include "StrokeTransformer.h" #ifdef ICON_O_MATIC -# include +#include +#include + +#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; } diff --git a/src/preferences/screen/MonitorView.cpp b/src/preferences/screen/MonitorView.cpp index 66d8af2c1d..465de39de9 100644 --- a/src/preferences/screen/MonitorView.cpp +++ b/src/preferences/screen/MonitorView.cpp @@ -14,11 +14,16 @@ #include +#include +#include #include #include #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())