[haiku-commits] haiku: hrev44294 - src/kits/tracker
- From: humdingerb@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 4 Jul 2012 08:51:21 +0200 (CEST)
hrev44294 adds 1 changeset to branch 'master'
old head: d061a7009519756006ab8b2430d17883765b43af
new head: 851c719d021e7f867be9f6dd97da23ce881b86ff
----------------------------------------------------------------------------
851c719: Small text changes in alert when renaming/moving special folders.
Since the button was renamed from "Do it!" to the specific action,
an additional explanation in case of special user folders isn't
needed any more.
Split text into paragraphs for better readability.
[ Humdinger <humdingerb@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev44294
Commit: 851c719d021e7f867be9f6dd97da23ce881b86ff
URL: http://cgit.haiku-os.org/haiku/commit/?id=851c719
Author: Humdinger <humdingerb@xxxxxxxxx>
Date: Wed Jul 4 06:42:38 2012 UTC
----------------------------------------------------------------------------
2 files changed, 12 insertions(+), 15 deletions(-)
src/kits/tracker/FSUtils.cpp | 23 ++++++++++-------------
src/kits/tracker/OpenWithWindow.cpp | 4 ++--
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/FSUtils.cpp b/src/kits/tracker/FSUtils.cpp
index ac2c158..fb4e9d2 100644
--- a/src/kits/tracker/FSUtils.cpp
+++ b/src/kits/tracker/FSUtils.cpp
@@ -634,20 +634,20 @@ ConfirmChangeIfWellKnownDirectory(const BEntry *entry,
if (DirectoryMatchesOrContains(entry, B_SYSTEM_DIRECTORY)) {
warning.SetTo(
B_TRANSLATE("If you %ifYouDoAction the system folder or
its "
- "contents, you won't be able to boot %osName! Are you
sure you "
- "want to do this? To %toDoAction the system folder or
its "
+ "contents, you won't be able to boot %osName!\n\nAre
you sure you "
+ "want to do this?\n\nTo %toDoAction the system folder
or its "
"contents anyway, hold down the Shift key and click "
"\"%toConfirmAction\"."));
} else if (DirectoryMatches(entry, B_COMMON_DIRECTORY)) {
warning.SetTo(
B_TRANSLATE("If you %ifYouDoAction the common folder,
%osName "
- "may not behave properly! Are you sure you want to do
this? "
+ "may not behave properly!\n\nAre you sure you want to
do this?\n\n"
"To %toDoAction the common folder anyway, hold down the
"
"Shift key and click \"%toConfirmAction\"."));
} else if (DirectoryMatches(entry, B_USER_DIRECTORY)) {
warning .SetTo(
B_TRANSLATE("If you %ifYouDoAction the home folder,
%osName "
- "may not behave properly! Are you sure you want to do
this? "
+ "may not behave properly!\n\nAre you sure you want to
do this?\n\n"
"To %toDoAction the home folder anyway, hold down the "
"Shift key and click \"%toConfirmAction\"."));
} else if (DirectoryMatchesOrContains(entry, B_USER_CONFIG_DIRECTORY)
@@ -659,24 +659,21 @@ ConfirmChangeIfWellKnownDirectory(const BEntry *entry,
B_COMMON_SETTINGS_DIRECTORY)) {
warning.SetTo(
B_TRANSLATE("If you %ifYouDoAction the mime
settings, "
- "%osName may not behave properly! Are you sure
you want to "
- "do this? To %toDoAction the mime settings
anyway, click "
- "\"%toConfirmAction\"."));
+ "%osName may not behave properly!\n\nAre you
sure you want to "
+ "do this?"));
requireOverride = false;
} else if (DirectoryMatches(entry, B_USER_CONFIG_DIRECTORY)) {
warning.SetTo(
B_TRANSLATE("If you %ifYouDoAction the config
folder, %osName "
- "may not behave properly! Are you sure you want
to do this? "
- "To %toDoAction the config folder anyway, click
"
- "\"%toConfirmAction\"."));
+ "may not behave properly!\n\nAre you sure you
want to do "
+ "this?"));
requireOverride = false;
} else if (DirectoryMatches(entry, B_USER_SETTINGS_DIRECTORY)
|| DirectoryMatches(entry,
B_COMMON_SETTINGS_DIRECTORY)) {
warning.SetTo(
B_TRANSLATE("If you %ifYouDoAction the settings
folder, "
- "%osName may not behave properly! Are you sure
you want to "
- "do this? To %toDoAction the settings folder
anyway, click "
- "\"%toConfirmAction\"."));
+ "%osName may not behave properly!\n\nAre you
sure you want to "
+ "do this?"));
requireOverride = false;
}
}
diff --git a/src/kits/tracker/OpenWithWindow.cpp
b/src/kits/tracker/OpenWithWindow.cpp
index 464a1ee..9b9b8ac 100644
--- a/src/kits/tracker/OpenWithWindow.cpp
+++ b/src/kits/tracker/OpenWithWindow.cpp
@@ -681,8 +681,8 @@ OpenWithPoseView::OpenSelection(BPose *pose, int32 *)
if (!fIterator->GenericFilesOnly()) {
BString warning(B_TRANSLATE(
"The application \"%appname\" does not support
the type of "
- "document you are about to open. Are you sure
you want to "
- "proceed? If you know that the application
supports the "
+ "document you are about to open.\nAre you sure
you want to "
+ "proceed?\n\nIf you know that the application
supports the "
"document type, you should contact the
publisher of the "
"application and ask them to update their
application to list "
"the type of your document as supported."));
Other related posts:
- » [haiku-commits] haiku: hrev44294 - src/kits/tracker - humdingerb
