Improving the wording of an error message: the confinement of

an operating directory is not the same as restricted mode.

(In restricted mode, the file browser is not available at all.)

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5772 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 59858872fc71eaa9f64529e7dabfc4c4a5db10c7..d1aeea9bcecf95113ad4dcb653b0a20d43223a7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
        window also when --constantshow is in effect, after a ^J Justify or
        an invalid escape sequence, and when entering a verbatim keystroke.
        Leave the cursor off during Unicode input, for extra feedback.
+       * src/browser.c (do_browser): Improve the wording of a message.
 
 2016-03-28  Benno Schulenberg  <bensberg@justemail.net>
        * src/winio.c (statusbar): Don't bother putting back the cursor in

diff --git a/src/browser.c b/src/browser.c
index 34b563774c2f63ddd1f1150770e68e5ed4535d4f..d7d660e790f7505394e913a7c1566411ff21d854 100644 (file)
--- a/src/browser.c
+++ b/src/browser.c
@@ -240,7 +240,9 @@ char *do_browser(char *path, DIR *dir)
 
 #ifndef DISABLE_OPERATINGDIR
            if (check_operating_dir(new_path, FALSE)) {
-               statusbar(_("Can't go outside of %s in restricted mode"),
+               /* TRANSLATORS: This refers to the option --operatingdir,
+                * not to --restricted. */
+               statusbar(_("Can't go outside of %s in confined mode"),
                                operating_dir);
                free(new_path);
                continue;
@@ -287,7 +289,7 @@ char *do_browser(char *path, DIR *dir)
             * directory if it's ".." or if it's a symlink to a
             * directory outside the operating directory. */
            if (check_operating_dir(filelist[selected], FALSE)) {
-               statusbar(_("Can't go outside of %s in restricted mode"),
+               statusbar(_("Can't go outside of %s in confined mode"),
                                operating_dir);
                beep();
                continue;