diff --git a/src/apps/terminal/AppearPrefView.cpp b/src/apps/terminal/AppearPrefView.cpp index bc17d81def..3c8e9b8763 100644 --- a/src/apps/terminal/AppearPrefView.cpp +++ b/src/apps/terminal/AppearPrefView.cpp @@ -73,10 +73,10 @@ AppearancePrefView::AppearancePrefView(const char* name, fTerminalMessenger(messenger) { const char* kColorTable[] = { - PREF_TEXT_FORE_COLOR, - PREF_TEXT_BACK_COLOR, - PREF_SELECT_FORE_COLOR, - PREF_SELECT_BACK_COLOR, + B_TRANSLATE(PREF_TEXT_FORE_COLOR), + B_TRANSLATE(PREF_TEXT_BACK_COLOR), + B_TRANSLATE(PREF_SELECT_FORE_COLOR), + B_TRANSLATE(PREF_SELECT_BACK_COLOR), NULL }; @@ -94,12 +94,12 @@ AppearancePrefView::AppearancePrefView(const char* name, fFont = new BMenuField(B_TRANSLATE("Font:"), fontMenu); fFontSize = new BMenuField(B_TRANSLATE("Size:"), sizeMenu); - BPopUpMenu* schemasPopUp =_MakeColorSchemaMenu(MSG_COLOR_SCHEMA_CHANGED, + BPopUpMenu* schemasPopUp = _MakeColorSchemaMenu(MSG_COLOR_SCHEMA_CHANGED, gPredefinedSchemas, gPredefinedSchemas[0]); fColorSchemaField = new BMenuField(B_TRANSLATE("Color schema:"), schemasPopUp); - BPopUpMenu* colorsPopUp =_MakeMenu(MSG_COLOR_FIELD_CHANGED, kColorTable, + BPopUpMenu* colorsPopUp = _MakeMenu(MSG_COLOR_FIELD_CHANGED, kColorTable, kColorTable[0]); fColorField = new BMenuField(B_TRANSLATE("Color:"), @@ -213,7 +213,7 @@ AppearancePrefView::AttachedToWindow() _SetCurrentColorSchema(fColorSchemaField); bool enableCustomColors = !strcmp(fColorSchemaField->Menu()->FindMarked()->Label(), - "Custom"); + gCustomSchema.name); _EnableCustomColors(enableCustomColors); } diff --git a/src/apps/terminal/Colors.cpp b/src/apps/terminal/Colors.cpp index 512e199804..df8cbc707e 100644 --- a/src/apps/terminal/Colors.cpp +++ b/src/apps/terminal/Colors.cpp @@ -5,11 +5,18 @@ #include "Colors.h" +#include + + +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Terminal colors schema" + + const rgb_color kBlack= { 0, 0, 0, 255 }; const rgb_color kWhite = { 255, 255, 255, 255 }; const struct color_schema kBlackOnWhite = { - "Black on White", + B_TRANSLATE("Black on White"), kBlack, kWhite, kWhite, @@ -20,7 +27,7 @@ const struct color_schema kBlackOnWhite = { const struct color_schema kWhiteOnBlack = { - "White on Black", + B_TRANSLATE("White on Black"), kWhite, kBlack, kBlack, @@ -31,7 +38,7 @@ const struct color_schema kWhiteOnBlack = { struct color_schema gCustomSchema = { - "Custom" + B_TRANSLATE("Custom") }; const color_schema* gPredefinedSchemas[] = {