03Dec05

[bacula/bacula] / bacula / src / dird / next_vol.c

diff --git a/bacula/src/dird/next_vol.c b/bacula/src/dird/next_vol.c
index 6954d2ddfc2b86196870787794c969afff02a237..9a64bf3921cd31da480325f94d24ead8acbb2cf0 100644 (file)
--- a/bacula/src/dird/next_vol.c
+++ b/bacula/src/dird/next_vol.c
@@ -12,19 +12,14 @@
    Copyright (C) 2001-2005 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
@@ -259,7 +254,7 @@ void check_if_volume_valid_or_recyclable(JCR *jcr, MEDIA_DBR *mr, const char **r
 
    /*  Check if a duration or limit has expired */
    if (has_volume_expired(jcr, mr)) {
-      *reason = "volume has expired";
+      *reason = _("volume has expired");
       /* Keep going because we may be able to recycle volume */
    }
 
@@ -277,18 +272,18 @@ void check_if_volume_valid_or_recyclable(JCR *jcr, MEDIA_DBR *mr, const char **r
     */
    if (strcmp(mr->VolStatus, "Purged") == 0) {
       if (recycle_volume(jcr, mr)) {
-         Jmsg(jcr, M_INFO, 0, "Recycled current volume \"%s\"\n", mr->VolumeName);
+         Jmsg(jcr, M_INFO, 0, _("Recycled current volume \"%s\"\n"), mr->VolumeName);
          *reason = NULL;
          return;
       } else {
          /* In principle this shouldn't happen */
-         *reason = "and recycling of current volume failed";
+         *reason = _("and recycling of current volume failed");
          return;
       }
    }
 
    /* At this point, the volume is not valid for writing */
-   *reason = "but should be Append, Purged or Recycle";
+   *reason = _("but should be Append, Purged or Recycle");
 
    /*
     * What we're trying to do here is see if the current volume is
@@ -313,15 +308,15 @@ void check_if_volume_valid_or_recyclable(JCR *jcr, MEDIA_DBR *mr, const char **r
       if (ok) {
          /* If fully purged, recycle current volume */
          if (recycle_volume(jcr, mr)) {
-            Jmsg(jcr, M_INFO, 0, "Recycled current volume \"%s\"\n", mr->VolumeName);
+            Jmsg(jcr, M_INFO, 0, _("Recycled current volume \"%s\"\n"), mr->VolumeName);
             *reason = NULL;
          } else {
-            *reason = "but should be Append, Purged or Recycle (recycling of the "
-               "current volume failed)";
+            *reason = _("but should be Append, Purged or Recycle (recycling of the "
+               "current volume failed)");
          }
       } else {
-         *reason = "but should be Append, Purged or Recycle (cannot automatically "
-            "recycle current volume, as it still contains unpruned data)";
+         *reason = _("but should be Append, Purged or Recycle (cannot automatically "
+            "recycle current volume, as it still contains unpruned data)");
       }
    }
 }