- Continue implementing migration.

[bacula/bacula] / bacula / src / gnome2-console / console_conf.c

diff --git a/bacula/src/gnome2-console/console_conf.c b/bacula/src/gnome2-console/console_conf.c
index e0601dcc8588875e5dac76215fb9f6459090ead4..ac4ad05fcecf36e9909061e017f2e8fdcaba9d24 100644 (file)
--- a/bacula/src/gnome2-console/console_conf.c
+++ b/bacula/src/gnome2-console/console_conf.c
@@ -69,8 +69,8 @@ static RES_ITEM dir_items[] = {
    {"dirport",     store_int,      ITEM(dir_res.DIRport),  0, ITEM_DEFAULT, 9101},
    {"address",     store_str,      ITEM(dir_res.address),  0, ITEM_REQUIRED, 0},
    {"password",    store_password, ITEM(dir_res.password), 0, 0, 0},
-   {"tlsenable",      store_yesno,     ITEM(dir_res.tls_enable), 1, ITEM_DEFAULT, 0},
-   {"tlsrequire",     store_yesno,     ITEM(dir_res.tls_require), 1, ITEM_DEFAULT, 0},
+   {"tlsenable",      store_yesno,     ITEM(dir_res.tls_enable), 1, 0, 0},
+   {"tlsrequire",     store_yesno,     ITEM(dir_res.tls_require), 1, 0, 0},
    {"tlscacertificatefile", store_dir, ITEM(dir_res.tls_ca_certfile), 0, 0, 0},
    {"tlscacertificatedir", store_dir,  ITEM(dir_res.tls_ca_certdir), 0, 0, 0},
    {"tlscertificate", store_dir,       ITEM(dir_res.tls_certfile), 0, 0, 0},
@@ -82,8 +82,8 @@ static RES_ITEM con_items[] = {
    {"name",        store_name,     ITEM(con_res.hdr.name), 0, ITEM_REQUIRED, 0},
    {"description", store_str,      ITEM(con_res.hdr.desc), 0, 0, 0},
    {"password",    store_password, ITEM(con_res.password), 0, ITEM_REQUIRED, 0},
-   {"tlsenable",      store_yesno,     ITEM(con_res.tls_enable), 1, ITEM_DEFAULT, 0},
-   {"tlsrequire",     store_yesno,     ITEM(con_res.tls_require), 1, ITEM_DEFAULT, 0},
+   {"tlsenable",      store_yesno,     ITEM(con_res.tls_enable), 1, 0, 0},
+   {"tlsrequire",     store_yesno,     ITEM(con_res.tls_require), 1, 0, 0},
    {"tlscacertificatefile", store_dir, ITEM(con_res.tls_ca_certfile), 0, 0, 0},
    {"tlscacertificatedir", store_dir,  ITEM(con_res.tls_ca_certdir), 0, 0, 0},
    {"tlscertificate", store_dir,       ITEM(con_res.tls_certfile), 0, 0, 0},
@@ -119,7 +119,7 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm
    bool recurse = true;
 
    if (res == NULL) {
-      printf("No record for %d %s\n", type, res_to_str(type));
+      printf(_("No record for %d %s\n"), type, res_to_str(type));
       return;
    }
    if (type < 0) {                    /* no recursion */
@@ -128,18 +128,18 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm
    }
    switch (type) {
    case R_DIRECTOR:
-      printf("Director: name=%s address=%s DIRport=%d\n", reshdr->name,
+      printf(_("Director: name=%s address=%s DIRport=%d\n"), reshdr->name,
               res->dir_res.address, res->dir_res.DIRport);
       break;
    case R_CONSOLE:
-      printf("Console: name=%s\n", reshdr->name);
+      printf(_("Console: name=%s\n"), reshdr->name);
       break;
    case R_CONSOLE_FONT:
-      printf("ConsoleFont: name=%s font face=%s\n",
+      printf(_("ConsoleFont: name=%s font face=%s\n"),
              reshdr->name, NPRT(res->con_font.fontface));
       break;
    default:
-      printf("Unknown resource type %d\n", type);
+      printf(_("Unknown resource type %d\n"), type);
    }
    if (recurse && res->dir_res.hdr.next) {
       dump_resource(type, res->dir_res.hdr.next, sendit, sock);
@@ -217,7 +217,7 @@ void free_resource(RES *sres, int type)
       }
       break;
    default:
-      printf("Unknown resource type %d\n", type);
+      printf(_("Unknown resource type %d\n"), type);
    }
    /* Common stuff again -- free the resource, recurse to next one */
    free(res);
@@ -243,7 +243,7 @@ void save_resource(int type, RES_ITEM *items, int pass)
    for (i=0; items[i].name; i++) {
       if (items[i].flags & ITEM_REQUIRED) {
             if (!bit_is_set(i, res_all.dir_res.hdr.item_present)) {
-               Emsg2(M_ABORT, 0, "%s item is required in %s resource, but not found.\n",
+               Emsg2(M_ABORT, 0, _("%s item is required in %s resource, but not found.\n"),
                  items[i].name, resources[rindex]);
              }
       }
@@ -265,7 +265,7 @@ void save_resource(int type, RES_ITEM *items, int pass)
          break;
 
       default:
-         Emsg1(M_ERROR, 0, "Unknown resource type %d\n", type);
+         Emsg1(M_ERROR, 0, _("Unknown resource type %d\n"), type);
          error = 1;
          break;
       }
@@ -295,7 +295,7 @@ void save_resource(int type, RES_ITEM *items, int pass)
       size = sizeof(CONRES);
       break;
    default:
-      printf("Unknown resource type %d\n", type);
+      printf(_("Unknown resource type %d\n"), type);
       error = 1;
       break;
    }