From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 5 Aug 2014 05:39:00 +0000 (+0200)
Subject: Make selection by Volume Name or MediaId a bit clearer
X-Git-Tag: Release-7.2.0~144
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9dc9444b4fcb54432d3c82dc9505e94e0b3b6234;p=bacula%2Fbacula

Make selection by Volume Name or MediaId a bit clearer
---

diff --git a/bacula/src/cats/sql_get.c b/bacula/src/cats/sql_get.c
index c1f9016161..5aa39750ef 100644
--- a/bacula/src/cats/sql_get.c
+++ b/bacula/src/cats/sql_get.c
@@ -1091,10 +1091,10 @@ bool db_get_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
          }
       } else {
          if (mr->MediaId != 0) {
-            Mmsg1(mdb->errmsg, _("Media record MediaId=%s not found.\n"),
+            Mmsg1(mdb->errmsg, _("Media record with MediaId=%s not found.\n"),
                edit_int64(mr->MediaId, ed1));
          } else {
-            Mmsg1(mdb->errmsg, _("Media record for Volume \"%s\" not found.\n"),
+            Mmsg1(mdb->errmsg, _("Media record for Volume name \"%s\" not found.\n"),
                   mr->VolumeName);
          }
       }
@@ -1104,7 +1104,7 @@ bool db_get_media_record(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
          Mmsg(mdb->errmsg, _("Media record for MediaId=%u not found in Catalog.\n"),
             mr->MediaId);
        } else {
-         Mmsg(mdb->errmsg, _("Media record for Vol=%s not found in Catalog.\n"),
+         Mmsg(mdb->errmsg, _("Media record for Volume Name \"%s\" not found in Catalog.\n"),
             mr->VolumeName);
    }   }
    db_unlock(mdb);
diff --git a/bacula/src/dird/ua_select.c b/bacula/src/dird/ua_select.c
index 72a5d619fd..95a0308bb3 100644
--- a/bacula/src/dird/ua_select.c
+++ b/bacula/src/dird/ua_select.c
@@ -619,7 +619,7 @@ int select_media_dbr(UAContext *ua, MEDIA_DBR *mr)
       }
       mr->PoolId = pr.PoolId;
       db_list_media_records(ua->jcr, ua->db, mr, prtit, ua, HORZ_LIST);
-      if (!get_cmd(ua, _("Enter *MediaId or Volume name: "))) {
+      if (!get_cmd(ua, _("Enter a Volume name or *MediaId: "))) {
          goto bail_out;
       }
       if (ua->cmd[0] == '*' && is_a_number(ua->cmd+1)) {