diff --git a/src/apps/terminal/AppearPrefView.cpp b/src/apps/terminal/AppearPrefView.cpp index 536a6d1a00..b7ae0490c1 100644 --- a/src/apps/terminal/AppearPrefView.cpp +++ b/src/apps/terminal/AppearPrefView.cpp @@ -127,7 +127,7 @@ AppearancePrefView::AppearancePrefView(const char* name, new BMessage(MSG_TAB_TITLE_SETTING_CHANGED)); fTabTitle->SetToolTip(BString(B_TRANSLATE( "The pattern specifying the tab titles. The following placeholders\n" - "can be used:")) << "\n" << kTooTipSetTabTitlePlaceholders + "can be used:")) << "\n" << kToolTipSetTabTitlePlaceholders << "\n" << kToolTipCommonTitlePlaceholders); fWindowTitle = new BTextControl("windowTitle", B_TRANSLATE("Window title:"), @@ -136,7 +136,7 @@ AppearancePrefView::AppearancePrefView(const char* name, new BMessage(MSG_WINDOW_TITLE_SETTING_CHANGED)); fWindowTitle->SetToolTip(BString(B_TRANSLATE( "The pattern specifying the window titles. The following placeholders\n" - "can be used:")) << "\n" << kTooTipSetWindowTitlePlaceholders + "can be used:")) << "\n" << kToolTipSetWindowTitlePlaceholders << "\n" << kToolTipCommonTitlePlaceholders); BLayoutBuilder::Group<>(this) diff --git a/src/apps/terminal/TermConst.cpp b/src/apps/terminal/TermConst.cpp index ae4a608a8e..d260e3c0b4 100644 --- a/src/apps/terminal/TermConst.cpp +++ b/src/apps/terminal/TermConst.cpp @@ -13,16 +13,15 @@ #define B_TRANSLATION_CONTEXT "Terminal ToolTips" -const char* const kTooTipSetTabTitlePlaceholders = B_TRANSLATE( +const char* const kToolTipSetTabTitlePlaceholders = B_TRANSLATE( "\t%d\t-\tThe current working directory of the active process.\n" "\t\t\tOptionally the maximum number of path components can be\n" "\t\t\tspecified. E.g. '%2d' for at most two components.\n" "\t%i\t-\tThe index of the tab.\n" "\t%e\t-\tThe encoding of the current tab. Not shown for UTF-8.\n" - "\t%p\t-\tThe name of the active process.\n" - "\t%%\t-\tThe character '%'."); + "\t%p\t-\tThe name of the active process."); -const char* const kTooTipSetWindowTitlePlaceholders = B_TRANSLATE( +const char* const kToolTipSetWindowTitlePlaceholders = B_TRANSLATE( "\t%d\t-\tThe current working directory of the active process in the\n" "\t\t\tcurrent tab. Optionally the maximum number of path components\n" "\t\t\tcan be specified. E.g. '%2d' for at most two components.\n" diff --git a/src/apps/terminal/TermConst.h b/src/apps/terminal/TermConst.h index a8c5f401cb..8f56b22785 100644 --- a/src/apps/terminal/TermConst.h +++ b/src/apps/terminal/TermConst.h @@ -146,8 +146,8 @@ static const char* const PREF_TAB_TITLE = "Tab title"; static const char* const PREF_WINDOW_TITLE = "Window title"; // shared strings -extern const char* const kTooTipSetTabTitlePlaceholders; -extern const char* const kTooTipSetWindowTitlePlaceholders; +extern const char* const kToolTipSetTabTitlePlaceholders; +extern const char* const kToolTipSetWindowTitlePlaceholders; extern const char* const kToolTipCommonTitlePlaceholders; extern const char* const kShellEscapeCharacters; diff --git a/src/apps/terminal/TermWindow.cpp b/src/apps/terminal/TermWindow.cpp index ce0582dc88..22c2e61e97 100644 --- a/src/apps/terminal/TermWindow.cpp +++ b/src/apps/terminal/TermWindow.cpp @@ -1913,7 +1913,8 @@ TermWindow::_OpenSetTabTitleDialog(int32 index) BString toolTip = BString(B_TRANSLATE( "The pattern specifying the current tab title. The following " "placeholders\n" - "can be used:\n")) << kTooTipSetTabTitlePlaceholders; + "can be used:\n")) << kToolTipSetTabTitlePlaceholders << "\n" + << kToolTipCommonTitlePlaceholders; fSetTabTitleDialog = new SetTitleDialog( B_TRANSLATE("Set tab title"), B_TRANSLATE("Tab title:"), toolTip); @@ -1942,7 +1943,8 @@ TermWindow::_OpenSetWindowTitleDialog() BString toolTip = BString(B_TRANSLATE( "The pattern specifying the window title. The following placeholders\n" - "can be used:\n")) << kTooTipSetTabTitlePlaceholders; + "can be used:\n")) << kToolTipSetWindowTitlePlaceholders << "\n" + << kToolTipCommonTitlePlaceholders; fSetWindowTitleDialog = new SetTitleDialog(B_TRANSLATE("Set window title"), B_TRANSLATE("Window title:"), toolTip);