[haiku-commits] Change in haiku[master]: Make alert text clearer

  • From: Gerrit <review@xxxxxxxxxxxxxxxxxxx>
  • To: waddlesplash <waddlesplash@xxxxxxxxx>, haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 14 Jun 2020 16:09:51 +0000

From humdinger <humdingerb@xxxxxxxxx>:

humdinger has uploaded this change for review. ( 
https://review.haiku-os.org/c/haiku/+/2919 ;)


Change subject: Make alert text clearer
......................................................................

Make alert text clearer

* Put 'settings' folder in quotes, just like 'system'.

* Break down the very long sentence.

* The "its" in "...will retain its settings folder" refers to the
  source folder, when it's actually the target that is kept.

* 'whereas' isn't the right word IMO, as the following text is more
  an explanation what 'merging' entails.
---
M src/apps/installer/WorkerThread.cpp
1 file changed, 5 insertions(+), 5 deletions(-)



  git pull ssh://git.haiku-os.org:22/haiku refs/changes/19/2919/1

diff --git a/src/apps/installer/WorkerThread.cpp 
b/src/apps/installer/WorkerThread.cpp
index 07d92d9..4c8acff 100644
--- a/src/apps/installer/WorkerThread.cpp
+++ b/src/apps/installer/WorkerThread.cpp
@@ -467,11 +467,11 @@
        if (entries != 0) {
                BAlert* alert = new BAlert("", B_TRANSLATE("The target volume 
is not "
                        "empty. Are you sure you want to install 
anyway?\n\nNote: The "
-                       "'system' folder will be a clean copy from the source 
volume but "
-                       "will retain its settings folder, all other folders 
will be "
-                       "merged, whereas files and links that exist on both the 
source "
-                       "and target volume will be overwritten with the source 
volume "
-                       "version."),
+                       "'system' folder will be a clean copy from the source 
volume while "
+                       "the existing 'settings' folder is retained. All other 
folders "
+                       "will be merged, in which files and links that exist on 
both the "
+                       "source and target volume will be overwritten with the 
source "
+                       "volume version."),
                        B_TRANSLATE("Install anyway"), B_TRANSLATE("Cancel"), 0,
                        B_WIDTH_AS_USUAL, B_STOP_ALERT);
                alert->SetShortcut(1, B_ESCAPE);

--
To view, visit https://review.haiku-os.org/c/haiku/+/2919
To unsubscribe, or for help writing mail filters, visit 
https://review.haiku-os.org/settings

Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: Iae2f1768fdf897b4c6ffb02be6800fdd85e2cde8
Gerrit-Change-Number: 2919
Gerrit-PatchSet: 1
Gerrit-Owner: humdinger <humdingerb@xxxxxxxxx>
Gerrit-MessageType: newchange

Other related posts:

  • » [haiku-commits] Change in haiku[master]: Make alert text clearer - Gerrit