Skip to content

Commit

Permalink
Translatable string fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Malcolm Hunter authored and Marco van Wieringen committed May 11, 2014
1 parent 0bc4860 commit 2dc3267
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 28 deletions.
24 changes: 12 additions & 12 deletions src/dird/authenticate.c
View file
Expand Up @@ -101,13 +101,13 @@ bool authenticate_storage_daemon(JCR *jcr, STORERES *store)
if (!auth_success) {
stop_bsock_timer(tid);
Dmsg0(dbglvl, _("Director and Storage daemon passwords or names not the same.\n"));
Jmsg2(jcr, M_FATAL, 0,
_("Director unable to authenticate with Storage daemon at \"%s:%d\". Possible causes:\n"
"Passwords or names not the same or\n"
"Maximum Concurrent Jobs exceeded on the SD or\n"
"SD networking messed up (restart daemon).\n"
"Please see " MANUAL_AUTH_URL " for help.\n"),
sd->host(), sd->port());
Jmsg(jcr, M_FATAL, 0,
_("Director unable to authenticate with Storage daemon at \"%s:%d\". Possible causes:\n"
"Passwords or names not the same or\n"
"Maximum Concurrent Jobs exceeded on the SD or\n"
"SD networking messed up (restart daemon).\n"
"Please see %s for help.\n"),
sd->host(), sd->port(), MANUAL_AUTH_URL);
return 0;
}

Expand Down Expand Up @@ -212,11 +212,11 @@ int authenticate_file_daemon(JCR *jcr)
Dmsg0(dbglvl, _("Director and File daemon passwords or names not the same.\n"));
Jmsg(jcr, M_FATAL, 0,
_("Unable to authenticate with File daemon at \"%s:%d\". Possible causes:\n"
"Passwords or names not the same or\n"
"Maximum Concurrent Jobs exceeded on the FD or\n"
"FD networking messed up (restart daemon).\n"
"Please see " MANUAL_AUTH_URL " for help.\n"),
fd->host(), fd->port());
"Passwords or names not the same or\n"
"Maximum Concurrent Jobs exceeded on the FD or\n"
"FD networking messed up (restart daemon).\n"
"Please see %s for help.\n"),
fd->host(), fd->port(), MANUAL_AUTH_URL);
return 0;
}

Expand Down
2 changes: 1 addition & 1 deletion src/filed/authenticate.c
View file
Expand Up @@ -255,7 +255,7 @@ int authenticate_storagedaemon(JCR *jcr)

if (!auth_success) {
Jmsg(jcr, M_FATAL, 0, _("Authorization key rejected by Storage daemon.\n"
"Please see " MANUAL_AUTH_URL " for help.\n"));
"Please see %s for help.\n"), MANUAL_AUTH_URL);
goto auth_fatal;
}

Expand Down
10 changes: 6 additions & 4 deletions src/lib/bsock.c
View file
Expand Up @@ -1087,10 +1087,12 @@ bool BSOCK::authenticate_director(const char *name, const char *password,
bail_out:
dir->stop_timer();
bsnprintf(response, response_len, _("Authorization problem with Director at \"%s:%d\"\n"
"Most likely the passwords do not agree.\n"
"If you are using TLS, there may have been a certificate validation error during the TLS handshake.\n"
"Please see " MANUAL_AUTH_URL " for help.\n"),
dir->host(), dir->port());
"Most likely the passwords do not agree.\n"
"If you are using TLS, there may have been a certificate "
"validation error during the TLS handshake.\n"
"Please see %s for help.\n"),
dir->host(), dir->port(), MANUAL_AUTH_URL);

return false;
}

Expand Down
8 changes: 4 additions & 4 deletions src/qt-tray-monitor/authenticate.cpp
View file
Expand Up @@ -76,9 +76,9 @@ static int authenticate_director(JCR *jcr)
if (!cram_md5_respond(dir, password, &tls_remote_need, &compatible) ||
!cram_md5_challenge(dir, password, tls_local_need, compatible)) {
stop_bsock_timer(tid);
Jmsg0(jcr, M_FATAL, 0, _("Director authorization problem.\n"
"Most likely the passwords do not agree.\n"
"Please see " MANUAL_AUTH_URL " for help.\n"));
Jmsg(jcr, M_FATAL, 0, _("Director authorization problem.\n"
"Most likely the passwords do not agree.\n"
"Please see %s for help.\n"), MANUAL_AUTH_URL);
return 0;
}

Expand Down Expand Up @@ -177,7 +177,7 @@ static int authenticate_file_daemon(JCR *jcr, CLIENTRES* client)
!cram_md5_challenge(fd, client->password, tls_local_need, compatible)) {
stop_bsock_timer(tid);
Jmsg(jcr, M_FATAL, 0, _("Director and File daemon passwords or names not the same.\n"
"Please see " MANUAL_AUTH_URL " for help.\n"));
"Please see %s for help.\n"), MANUAL_AUTH_URL);
return 0;
}
Dmsg1(116, ">filed: %s", fd->msg);
Expand Down
13 changes: 6 additions & 7 deletions src/stored/authenticate.c
View file
Expand Up @@ -79,9 +79,9 @@ static int authenticate(int rcode, BSOCK *bs, JCR* jcr)
if (!director) {
Dmsg2(dbglvl, "Connection from unknown Director %s at %s rejected.\n",
dirname, bs->who());
Jmsg2(jcr, M_FATAL, 0, _("Connection from unknown Director %s at %s rejected.\n"
"Please see " MANUAL_AUTH_URL " for help.\n"),
dirname, bs->who());
Jmsg(jcr, M_FATAL, 0, _("Connection from unknown Director %s at %s rejected.\n"
"Please see %s for help.\n"),
dirname, bs->who(), MANUAL_AUTH_URL);
free_pool_memory(dirname);
return 0;
}
Expand Down Expand Up @@ -116,8 +116,8 @@ static int authenticate(int rcode, BSOCK *bs, JCR* jcr)
}

if (!auth_success) {
Jmsg0(jcr, M_FATAL, 0, _("Incorrect password given by Director.\n"
"Please see " MANUAL_AUTH_URL " for help.\n"));
Jmsg(jcr, M_FATAL, 0, _("Incorrect password given by Director.\n"
"Please see %s for help.\n"), MANUAL_AUTH_URL);
auth_success = false;
goto auth_fatal;
}
Expand Down Expand Up @@ -227,8 +227,7 @@ int authenticate_filed(JCR *jcr)

if (!auth_success) {
Jmsg(jcr, M_FATAL, 0, _("Incorrect authorization key from File daemon at %s rejected.\n"
"Please see " MANUAL_AUTH_URL " for help.\n"),
fd->who());
"Please see %s for help.\n"), fd->who(), MANUAL_AUTH_URL);
auth_success = false;
goto auth_fatal;
}
Expand Down

0 comments on commit 2dc3267

Please sign in to comment.