hrev54262 adds 1 changeset to branch 'master'
old head: 60d011e07fb5d10fb13a92817f2ba86d39a57cd5
new head: 548467a97d28d14f312d5c44c1addbb3740b883f
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=548467a97d28+%5E60d011e07fb5
----------------------------------------------------------------------------
548467a97d28: HaikuDepot: Alert Naming
Change capitalization in the titles of alerts. Change
alerts' warnings to avoid the word "Haiku".
Resolves #16117
Change-Id: Id9aacf83d7e8364a1e9b0bfa9a98532108f906e3
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2808
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
[ Andrew Lindesay <apl@xxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev54262
Commit: 548467a97d28d14f312d5c44c1addbb3740b883f
URL: https://git.haiku-os.org/haiku/commit/?id=548467a97d28
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Mon May 25 05:12:22 2020 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Mon May 25 16:04:12 2020 UTC
Ticket: https://dev.haiku-os.org/ticket/16117
----------------------------------------------------------------------------
1 file changed, 8 insertions(+), 8 deletions(-)
src/apps/haikudepot/server/ServerHelper.cpp | 16 ++++++++--------
----------------------------------------------------------------------------
diff --git a/src/apps/haikudepot/server/ServerHelper.cpp
b/src/apps/haikudepot/server/ServerHelper.cpp
index 947ce08606..6bca7911ae 100644
--- a/src/apps/haikudepot/server/ServerHelper.cpp
+++ b/src/apps/haikudepot/server/ServerHelper.cpp
@@ -77,12 +77,12 @@ ServerHelper::AlertServerJsonRpcError(BMessage*
responseEnvelopeMessage)
default:
alertText.SetToFormat(
B_TRANSLATE("An unexpected error has been sent
from the"
- " HaikuDepot server [%" B_PRIi32 "]"),
errorCode);
+ " server [%" B_PRIi32 "]"), errorCode);
break;
}
BAlert* alert = new BAlert(
- B_TRANSLATE("Server Error"),
+ B_TRANSLATE("Server error"),
alertText,
B_TRANSLATE("OK"));
@@ -125,7 +125,7 @@ ServerHelper::AlertTransportError(BMessage* message)
switch (errno) {
case HD_NETWORK_INACCESSIBLE:
- errorDescription = B_TRANSLATE("Network Error");
+ errorDescription = B_TRANSLATE("Network error");
break;
default:
errorDescription.SetTo(strerror(errno));
@@ -133,11 +133,11 @@ ServerHelper::AlertTransportError(BMessage* message)
}
alertText.SetToFormat(B_TRANSLATE("A network transport error has arisen"
- " communicating with the HaikuDepot server system: %s"),
+ " communicating with the server system: %s"),
errorDescription.String());
BAlert* alert = new BAlert(
- B_TRANSLATE("Network Transport Error"),
+ B_TRANSLATE("Network transport error"),
alertText,
B_TRANSLATE("OK"));
@@ -175,9 +175,9 @@ ServerHelper::AlertClientTooOld(BMessage* message)
alertText.SetToFormat(
B_TRANSLATE("This application is too old to communicate with
the"
- " HaikuDepot server system. Obtain a newer version of
HaikuDepot"
- " by updating your Haiku system. The minimum version of"
- " HaikuDepot required is \"%s\"."),
minimumVersion.String());
+ " server system. Obtain a newer version of this
application"
+ " by updating your system. The minimum required version
of this"
+ " application is \"%s\"."), minimumVersion.String());
BAlert* alert = new BAlert(
B_TRANSLATE("Client version too old"),
