diff --git a/src/apps/webpositive/AuthenticationPanel.cpp b/src/apps/webpositive/AuthenticationPanel.cpp index a6db7ecad7..79112712c0 100644 --- a/src/apps/webpositive/AuthenticationPanel.cpp +++ b/src/apps/webpositive/AuthenticationPanel.cpp @@ -53,7 +53,7 @@ static const uint32 kHidePassword = 'hdpw'; AuthenticationPanel::AuthenticationPanel(BRect parentFrame) : BWindow(BRect(-1000, -1000, -900, -900), - B_TRANSLATE("Authentication Required"), B_TITLED_WINDOW_LOOK, + B_TRANSLATE("Authentication required"), B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL, B_ASYNCHRONOUS_CONTROLS | B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_CLOSE_ON_ESCAPE | B_AUTO_UPDATE_SIZE_LIMITS), m_parentWindowFrame(parentFrame), diff --git a/src/apps/webpositive/BrowserWindow.cpp b/src/apps/webpositive/BrowserWindow.cpp index 85fb8d1d25..28cc4357e8 100644 --- a/src/apps/webpositive/BrowserWindow.cpp +++ b/src/apps/webpositive/BrowserWindow.cpp @@ -356,7 +356,7 @@ BrowserWindow::BrowserWindow(BRect frame, SettingsMessage* appSettings, menu->AddItem(fZoomTextOnlyMenuItem); menu->AddSeparatorItem(); - fFullscreenItem = new BMenuItem(B_TRANSLATE("Fullscreen"), + fFullscreenItem = new BMenuItem(B_TRANSLATE("Full screen"), new BMessage(TOGGLE_FULLSCREEN), B_RETURN); menu->AddItem(fFullscreenItem); menu->AddItem(new BMenuItem(B_TRANSLATE("Page source"), @@ -1234,8 +1234,8 @@ BrowserWindow::LoadNegotiating(const BString& url, BWebView* view) fURLInputGroup->SetText(url.String()); - BString status(B_TRANSLATE("Requesting: ")); - status << url; + BString status(B_TRANSLATE("Requesting %url")); + status.ReplaceFirst("%url", url); view->WebPage()->SetStatusMessage(status); } @@ -1249,8 +1249,8 @@ BrowserWindow::LoadCommitted(const BString& url, BWebView* view) // This hook is invoked when the load is commited. fURLInputGroup->SetText(url.String()); - BString status(B_TRANSLATE("Loading: ")); - status << url; + BString status(B_TRANSLATE("Loading %url")); + status.ReplaceFirst("%url", url); view->WebPage()->SetStatusMessage(status); } @@ -1275,7 +1275,7 @@ BrowserWindow::LoadFailed(const BString& url, BWebView* view) if (view != CurrentWebView()) return; - BString status(B_TRANSLATE_COMMENT("%url failed.", "Loading URL failed. " + BString status(B_TRANSLATE_COMMENT("%url failed", "Loading URL failed. " "Don't translate variable %url.")); status.ReplaceFirst("%url", url); view->WebPage()->SetStatusMessage(status); @@ -1290,7 +1290,7 @@ BrowserWindow::LoadFinished(const BString& url, BWebView* view) if (view != CurrentWebView()) return; - BString status(B_TRANSLATE_COMMENT("%url finished.", "Loading URL " + BString status(B_TRANSLATE_COMMENT("%url finished", "Loading URL " "finished. Don't translate variable %url.")); status.ReplaceFirst("%url", url); view->WebPage()->SetStatusMessage(status); diff --git a/src/apps/webpositive/SettingsWindow.cpp b/src/apps/webpositive/SettingsWindow.cpp index 66639f24b0..39fa27a49c 100644 --- a/src/apps/webpositive/SettingsWindow.cpp +++ b/src/apps/webpositive/SettingsWindow.cpp @@ -326,22 +326,22 @@ SettingsWindow::_CreateGeneralPage(float spacing) fDaysInHistoryMenuControl->TextView()->DisallowChar(i); fShowTabsIfOnlyOnePage = new BCheckBox("show tabs if only one page", - B_TRANSLATE("Show tabs if only one page is open."), + B_TRANSLATE("Show tabs if only one page is open"), new BMessage(MSG_TAB_DISPLAY_BEHAVIOR_CHANGED)); fShowTabsIfOnlyOnePage->SetValue(B_CONTROL_ON); fAutoHideInterfaceInFullscreenMode = new BCheckBox("auto-hide interface", - B_TRANSLATE("Auto-hide interface in fullscreen mode."), + B_TRANSLATE("Auto-hide interface in full screen mode"), new BMessage(MSG_AUTO_HIDE_INTERFACE_BEHAVIOR_CHANGED)); fAutoHideInterfaceInFullscreenMode->SetValue(B_CONTROL_OFF); fAutoHidePointer = new BCheckBox("auto-hide pointer", - B_TRANSLATE("Auto-hide mouse pointer."), + B_TRANSLATE("Auto-hide mouse pointer"), new BMessage(MSG_AUTO_HIDE_POINTER_BEHAVIOR_CHANGED)); fAutoHidePointer->SetValue(B_CONTROL_OFF); fShowHomeButton = new BCheckBox("show home button", - B_TRANSLATE("Show Home Button"), + B_TRANSLATE("Show home button"), new BMessage(MSG_SHOW_HOME_BUTTON_CHANGED)); fShowHomeButton->SetValue(B_CONTROL_ON); @@ -445,7 +445,7 @@ BView* SettingsWindow::_CreateProxyPage(float spacing) { fUseProxyCheckBox = new BCheckBox("use proxy", - B_TRANSLATE("Use proxy server to connect to the internet."), + B_TRANSLATE("Use proxy server to connect to the internet"), new BMessage(MSG_USE_PROXY_CHANGED)); fUseProxyCheckBox->SetValue(B_CONTROL_ON);