hrev52039 adds 1 changeset to branch 'master'
old head: e79c33c93fe3a3c78cbf5b6173bff90cbee68ba3
new head: cbadcae1d0f3a95658f74fbc8a4102e66e563cde
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=cbadcae1d0f3+%5Ee79c33c93fe3
----------------------------------------------------------------------------
cbadcae1d0f3: Small string changes in HaikuDepot GUI
* Don't translate internally used names in BMenuBars.
* Use presentable strings for the title of BAlerts.
* Make the wording a bit less technical.
Should the HaikuServer URL be part of the update/remove rating alert?
Change-Id: I0a984082eadbc5834ac6b8b2b1955e66098d1c8a
[ Humdinger <humdingerb@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52039
Commit: cbadcae1d0f3a95658f74fbc8a4102e66e563cde
URL: https://git.haiku-os.org/haiku/commit/?id=cbadcae1d0f3
Author: Humdinger <humdingerb@xxxxxxxxx>
Date: Sun Jun 24 17:17:26 2018 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Wed Jun 27 22:54:40 2018 UTC
----------------------------------------------------------------------------
3 files changed, 14 insertions(+), 13 deletions(-)
src/apps/haikudepot/ui/App.cpp | 7 ++++---
src/apps/haikudepot/ui/MainWindow.cpp | 12 ++++++------
src/apps/haikudepot/ui/RatePackageWindow.cpp | 8 ++++----
----------------------------------------------------------------------------
diff --git a/src/apps/haikudepot/ui/App.cpp b/src/apps/haikudepot/ui/App.cpp
index a28aafaf47..8a818402a4 100644
--- a/src/apps/haikudepot/ui/App.cpp
+++ b/src/apps/haikudepot/ui/App.cpp
@@ -404,7 +404,8 @@ void
App::_CheckPackageDaemonRuns()
{
while (!be_roster->IsRunning(kPackageDaemonSignature)) {
- BAlert* alert = new BAlert("start_package_daemon",
+ BAlert* alert = new BAlert(
+ B_TRANSLATE("Start package daemon"),
B_TRANSLATE("HaikuDepot needs the package daemon to
function, "
"and it appears to be not running.\n"
"Would you like to start it now?"),
@@ -431,8 +432,8 @@ App::_LaunchPackageDaemon()
= B_TRANSLATE("Starting the package daemon
failed:\n\n%Error%");
errorMessage.ReplaceAll("%Error%", strerror(ret));
- BAlert* alert = new BAlert("package_daemon_problem",
- errorMessage,
+ BAlert* alert = new BAlert(
+ B_TRANSLATE("Package daemon problem"), errorMessage,
B_TRANSLATE("Quit HaikuDepot"),
B_TRANSLATE("Try again"), NULL, B_WIDTH_AS_USUAL,
B_WARNING_ALERT);
diff --git a/src/apps/haikudepot/ui/MainWindow.cpp
b/src/apps/haikudepot/ui/MainWindow.cpp
index d15b7f7d66..f6f81ce113 100644
--- a/src/apps/haikudepot/ui/MainWindow.cpp
+++ b/src/apps/haikudepot/ui/MainWindow.cpp
@@ -137,10 +137,10 @@ MainWindow::MainWindow(const BMessage& settings)
fSinglePackageMode(false),
fModelWorker(B_BAD_THREAD_ID)
{
- BMenuBar* menuBar = new BMenuBar(B_TRANSLATE("Main Menu"));
+ BMenuBar* menuBar = new BMenuBar("Main Menu");
_BuildMenu(menuBar);
- BMenuBar* userMenuBar = new BMenuBar(B_TRANSLATE("User Menu"));
+ BMenuBar* userMenuBar = new BMenuBar("User Menu");
_BuildUserMenu(userMenuBar);
set_small_font(userMenuBar);
userMenuBar->SetExplicitMaxSize(BSize(B_SIZE_UNSET,
@@ -1510,10 +1510,10 @@ MainWindow::_RatePackage()
{
if (!_SelectedPackageHasWebAppRepositoryCode()) {
BAlert* alert = new(std::nothrow) BAlert(
- B_TRANSLATE("rating_not_possible"),
- B_TRANSLATE("Because there is no representation for
this package "
- "on the HaikuDepot server system, it is not
possible to create "
- "a new rating or edit an existing rating."),
+ B_TRANSLATE("Rating not possible"),
+ B_TRANSLATE("This package doesn't seem to be on the
HaikuDepot "
+ "Server, so it's not possible to create a new
rating "
+ "or edit an existing rating."),
B_TRANSLATE("OK"));
alert->Go();
return;
diff --git a/src/apps/haikudepot/ui/RatePackageWindow.cpp
b/src/apps/haikudepot/ui/RatePackageWindow.cpp
index 585eaa3e91..13c74c744a 100644
--- a/src/apps/haikudepot/ui/RatePackageWindow.cpp
+++ b/src/apps/haikudepot/ui/RatePackageWindow.cpp
@@ -365,10 +365,10 @@ RatePackageWindow::MessageReceived(BMessage* message)
case MSG_DID_ADD_USER_RATING:
{
BAlert* alert = new(std::nothrow) BAlert(
- B_TRANSLATE("user_rating"),
+ B_TRANSLATE("User rating"),
B_TRANSLATE("Your rating was uploaded
successfully. "
- "You can update or remove it at any
time by visiting the "
- "server application on the web."),
+ "You can update or remove it at the
HaikuDepot Server "
+ "website."),
B_TRANSLATE("Close"), NULL, NULL,
B_WIDTH_AS_USUAL, B_WARNING_ALERT);
alert->Go();
@@ -379,7 +379,7 @@ RatePackageWindow::MessageReceived(BMessage* message)
case MSG_DID_UPDATE_USER_RATING:
{
BAlert* alert = new(std::nothrow) BAlert(
- B_TRANSLATE("user_rating"),
+ B_TRANSLATE("User rating"),
B_TRANSLATE("Your rating was updated."),
B_TRANSLATE("Close"), NULL, NULL,
B_WIDTH_AS_USUAL, B_WARNING_ALERT);
