diff --git a/lib/search/lib.c b/lib/search/lib.c index 2218b014a..e5a3f23e0 100644 --- a/lib/search/lib.c +++ b/lib/search/lib.c @@ -39,10 +39,10 @@ /*** global variables ****************************************************************************/ -const char * STR_E_NOTFOUND = N_(" Search string not found "); -const char * STR_E_UNKNOWN_TYPE = N_(" Not implemented yet "); -const char * STR_E_RPL_NOT_EQ_TO_FOUND = N_(" Num of replace tokens not equal to num of found tokens "); -const char * STR_E_RPL_INVALID_TOKEN = N_(" Invalid token number %d "); +const char * STR_E_NOTFOUND = N_("Search string not found"); +const char * STR_E_UNKNOWN_TYPE = N_("Not implemented yet"); +const char * STR_E_RPL_NOT_EQ_TO_FOUND = N_("Num of replace tokens not equal to num of found tokens"); +const char * STR_E_RPL_INVALID_TOKEN = N_("Invalid token number %d"); /*** file scope macro definitions ****************************************************************/ diff --git a/lib/search/regex.c b/lib/search/regex.c index 8fe9eed37..7516bf62f 100644 --- a/lib/search/regex.c +++ b/lib/search/regex.c @@ -265,7 +265,7 @@ mc_search__regex_found_cond_one (mc_search_t * lc_mc_search, mc_search_regex_t * { lc_mc_search->error = MC_SEARCH_E_REGEX; lc_mc_search->error_str = - str_conv_gerror_message (error, _(" Regular expression error ")); + str_conv_gerror_message (error, _("Regular expression error")); g_error_free (error); return COND__FOUND_ERROR; } @@ -545,7 +545,7 @@ mc_search__cond_struct_new_init_regex (const char *charset, mc_search_t * lc_mc_ if (error != NULL) { lc_mc_search->error = MC_SEARCH_E_REGEX_COMPILE; - lc_mc_search->error_str = str_conv_gerror_message (error, _(" Regular expression error ")); + lc_mc_search->error_str = str_conv_gerror_message (error, _("Regular expression error")); g_error_free (error); return; } diff --git a/lib/utilunix.c b/lib/utilunix.c index ee335e52d..88e447e3b 100644 --- a/lib/utilunix.c +++ b/lib/utilunix.c @@ -388,12 +388,12 @@ open_error_pipe (void) { if (pipe (error_pipe) < 0) { - message (D_NORMAL, _("Warning"), _(" Pipe failed ")); + message (D_NORMAL, _("Warning"), _("Pipe failed")); } old_error = dup (2); if (old_error < 0 || close (2) || dup (error_pipe[1]) != 2) { - message (D_NORMAL, _("Warning"), _(" Dup failed ")); + message (D_NORMAL, _("Warning"), _("Dup failed")); close (error_pipe[0]); error_pipe[0] = -1; @@ -448,7 +448,7 @@ close_error_pipe (int error, const char *text) { if (dup2 (old_error, 2) == -1) { - message (error, MSG_ERROR, "%s", _("Error dup'ing old error pipe")); + message (error, MSG_ERROR, _("Error dup'ing old error pipe")); return 1; } close (old_error); @@ -472,7 +472,7 @@ close_error_pipe (int error, const char *text) else { /* Show given text and possible message from pipe */ - message (error, title, " %s \n %s ", text, msg); + message (error, title, "%s\n%s", text, msg); } return 1; } diff --git a/lib/vfs/mc-vfs/direntry.c b/lib/vfs/mc-vfs/direntry.c index 36f6a117f..b5859d864 100644 --- a/lib/vfs/mc-vfs/direntry.c +++ b/lib/vfs/mc-vfs/direntry.c @@ -457,11 +457,11 @@ vfs_s_free_super (struct vfs_class *me, struct vfs_s_super *super) #if 0 /* FIXME: We currently leak small ammount of memory, sometimes. Fix it if you can. */ if (super->ino_usage) - message (D_ERROR, " Direntry warning ", + message (D_ERROR, "Direntry warning", "Super ino_usage is %d, memory leak", super->ino_usage); if (super->want_stale) - message (D_ERROR, " Direntry warning ", "Super has want_stale set"); + message (D_ERROR, "Direntry warning", "%s", "Super has want_stale set"); #endif if (super->prevp) diff --git a/lib/vfs/mc-vfs/fish.c b/lib/vfs/mc-vfs/fish.c index b1b172dde..84224fe39 100644 --- a/lib/vfs/mc-vfs/fish.c +++ b/lib/vfs/mc-vfs/fish.c @@ -304,13 +304,14 @@ fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super) if (!SUP.password) { char *p, *op; - p = g_strconcat (_(" fish: Password required for "), SUP.user, " ", (char *) NULL); + p = g_strdup_printf (_("fish: Password is required for %s"), SUP.user); op = vfs_get_password (p); g_free (p); if (op == NULL) ERRNOR (EPERM, -1); SUP.password = op; } + print_vfs_message (_("fish: Sending password...")); { diff --git a/lib/vfs/mc-vfs/ftpfs.c b/lib/vfs/mc-vfs/ftpfs.c index 6eb2d3040..502010424 100644 --- a/lib/vfs/mc-vfs/ftpfs.c +++ b/lib/vfs/mc-vfs/ftpfs.c @@ -507,7 +507,7 @@ ftpfs_login_server (struct vfs_class *me, struct vfs_s_super *super, const char { /* ask user */ char *p; - p = g_strconcat (_(" FTP: Password required for "), SUP.user, " ", (char *) NULL); + p = g_strdup_printf (_("FTP: Password required for %s"), SUP.user); op = vfs_get_password (p); g_free (p); if (op == NULL) @@ -2104,7 +2104,7 @@ ftpfs_netrc_bad_mode (const char *netrcname) if (be_angry) { message (D_ERROR, MSG_ERROR, - _("~/.netrc file has incorrect mode.\n" "Remove password or correct mode.")); + _("~/.netrc file has incorrect mode\nRemove password or correct mode")); be_angry = 0; } return 1; diff --git a/lib/vfs/mc-vfs/mcfs.c b/lib/vfs/mc-vfs/mcfs.c index bcce7edf3..70d6ace8a 100644 --- a/lib/vfs/mc-vfs/mcfs.c +++ b/lib/vfs/mc-vfs/mcfs.c @@ -137,8 +137,8 @@ mcfs_login_server (int my_socket, char *user, int port, return 0; if (result != MC_VERSION_OK) { - message (D_ERROR, _(" MCFS "), - _(" The server does not support this version ")); + message (D_ERROR, _("MCFS"), + _("The server does not support this version")); close (my_socket); return 0; } @@ -155,9 +155,9 @@ mcfs_login_server (int my_socket, char *user, int port, int v; v = query_dialog (_("Warning"), _ - (" The remote server is not running on a system port \n" - " you need a password to log in, but the information may \n" - " not be safe on the remote side. Continue? \n"), + ("The remote server is not running on a system port\n" + "you need a password to log in, but the information may\n" + "not be safe on the remote side. Continue?\n"), D_ERROR, 2, _("&Yes"), _("&No")); if (v == 1) { @@ -168,7 +168,7 @@ mcfs_login_server (int my_socket, char *user, int port, if (netrcpass != NULL) pass = g_strdup (netrcpass); else - pass = vfs_get_password (_(" MCFS Password required ")); + pass = vfs_get_password (_("MCFS Password required")); if (!pass) { rpc_send (my_socket, RPC_INT, MC_QUIT, RPC_END); close (my_socket); @@ -182,7 +182,7 @@ mcfs_login_server (int my_socket, char *user, int port, return 0; if (result != MC_LOGINOK) { - message (D_ERROR, _(" MCFS "), _(" Invalid password ")); + message (D_ERROR, _("MCFS"), _("Invalid password")); rpc_send (my_socket, RPC_INT, MC_QUIT, RPC_END); close (my_socket); return 0; @@ -245,7 +245,7 @@ mcfs_create_tcp_link (const char *host, int *port, int *version, const char *cal } else { hp = gethostbyname (host); if (hp == NULL) { - message (D_ERROR, caller, _(" Cannot locate hostname: %s "), + message (D_ERROR, caller, _("Cannot locate hostname: %s"), host); return 0; } @@ -264,13 +264,13 @@ mcfs_create_tcp_link (const char *host, int *port, int *version, const char *cal server_address.sin_port = htons (*port); my_socket = socket (AF_INET, SOCK_STREAM, 0); if (my_socket < 0) { - message (D_ERROR, caller, _(" Cannot create socket: %s "), + message (D_ERROR, caller, _("Cannot create socket: %s"), unix_error_string (errno)); return 0; } if (connect (my_socket, (struct sockaddr *) &server_address, sizeof (server_address)) < 0) { - message (D_ERROR, caller, _(" Cannot connect to server: %s "), + message (D_ERROR, caller, _("Cannot connect to server: %s"), unix_error_string (errno)); close (my_socket); return 0; @@ -340,7 +340,7 @@ mcfs_open_link (char *host, char *user, int *port, char *netrcpass) return &mcfs_connections[i]; } if (mcfs_open_connections == MCFS_MAX_CONNECTIONS) { - message (D_ERROR, MSG_ERROR, _(" Too many open connections ")); + message (D_ERROR, MSG_ERROR, _("Too many open connections")); return 0; } sock = mcfs_open_tcp_link (host, user, port, netrcpass, &version); diff --git a/lib/vfs/mc-vfs/smbfs.c b/lib/vfs/mc-vfs/smbfs.c index d32a85816..b4218c34b 100644 --- a/lib/vfs/mc-vfs/smbfs.c +++ b/lib/vfs/mc-vfs/smbfs.c @@ -619,7 +619,7 @@ smbfs_reconnect(smbfs_connection *conn, int *retries) if (!(conn->cli = smbfs_do_connect(host, conn->service))) { message (D_ERROR, MSG_ERROR, - _(" reconnect to %s failed\n "), conn->host); + _("reconnect to %s failed"), conn->host); g_free(host); return False; } @@ -1176,7 +1176,7 @@ smbfs_open_link (char *host, char *path, const char *user, int *port, if (my_errno != EPERM) return 0; - message (D_ERROR, MSG_ERROR, _(" Authentication failed ")); + message (D_ERROR, MSG_ERROR, _("Authentication failed")); /* authentication failed, try again */ smbfs_auth_remove (bucket->host, bucket->service); @@ -1699,7 +1699,7 @@ smbfs_mkdir (struct vfs_class * me, const char *path, mode_t mode) if (!cli_mkdir (sc->cli, cpath)) { my_errno = cli_error (sc->cli, NULL, &err, NULL); - message (D_ERROR, MSG_ERROR, _(" Error %s creating directory %s "), + message (D_ERROR, MSG_ERROR, _("Error %s creating directory %s"), cli_errstr (sc->cli), CNV_LANG (cpath)); g_free (cpath); return -1; @@ -1725,7 +1725,7 @@ smbfs_rmdir (struct vfs_class *me, const char *path) if (!cli_rmdir(sc->cli, cpath)) { my_errno = cli_error(sc->cli, NULL, &err, NULL); - message (D_ERROR, MSG_ERROR, _(" Error %s removing directory %s "), + message (D_ERROR, MSG_ERROR, _("Error %s removing directory %s"), cli_errstr(sc->cli), CNV_LANG(cpath)); g_free (cpath); return -1; @@ -1827,7 +1827,7 @@ smbfs_open_readwrite (smbfs_handle *remote_handle, char *rname, int flags, int m flags : O_RDONLY, DENY_NONE); #endif if (remote_handle->fnum == -1) { - message (D_ERROR, MSG_ERROR, _(" %s opening remote file %s "), + message (D_ERROR, MSG_ERROR, _("%s opening remote file %s"), cli_errstr (remote_handle->cli), CNV_LANG (rname)); DEBUG (1, ("smbfs_open(rname:%s) error:%s\n", rname, cli_errstr (remote_handle->cli))); @@ -1843,7 +1843,7 @@ smbfs_open_readwrite (smbfs_handle *remote_handle, char *rname, int flags, int m NULL) && !cli_getattrE (remote_handle->cli, remote_handle->fnum, &remote_handle->attr, &size, NULL, NULL, NULL)) { - message (D_ERROR, MSG_ERROR, " getattrib: %s ", + message (D_ERROR, MSG_ERROR, "getattrib: %s", cli_errstr (remote_handle->cli)); DEBUG (1, ("smbfs_open(rname:%s) getattrib:%s\n", rname, @@ -1906,7 +1906,7 @@ smbfs_unlink (struct vfs_class *me, const char *path) remote_file = free_after(smbfs_convert_path (remote_file, FALSE), remote_file); if (!cli_unlink(sc->cli, remote_file)) { - message (D_ERROR, MSG_ERROR, _(" %s removing remote file %s "), + message (D_ERROR, MSG_ERROR, _("%s removing remote file %s"), cli_errstr(sc->cli), CNV_LANG(remote_file)); g_free (remote_file); return -1; @@ -1941,7 +1941,7 @@ smbfs_rename (struct vfs_class *me, const char *a, const char *b) g_free (rb); if (!retval) { - message (D_ERROR, MSG_ERROR, _(" %s renaming files\n"), + message (D_ERROR, MSG_ERROR, _("%s renaming files\n"), cli_errstr(sc->cli)); return -1; } diff --git a/lib/vfs/mc-vfs/tar.c b/lib/vfs/mc-vfs/tar.c index e92eda5d7..1f9db9eaa 100644 --- a/lib/vfs/mc-vfs/tar.c +++ b/lib/vfs/mc-vfs/tar.c @@ -697,7 +697,7 @@ tar_open_archive (struct vfs_class *me, struct vfs_s_super *archive, case STATUS_EOFMARK: message (D_ERROR, MSG_ERROR, _ - ("Hmm,...\n%s\ndoesn't look like a tar archive."), + ("%s\ndoesn't look like a tar archive."), name); /* FALL THRU */ diff --git a/lib/vfs/mc-vfs/undelfs.c b/lib/vfs/mc-vfs/undelfs.c index 532f5ac2d..cc6fcb9f6 100644 --- a/lib/vfs/mc-vfs/undelfs.c +++ b/lib/vfs/mc-vfs/undelfs.c @@ -90,7 +90,7 @@ static struct lsdel_struct lsd; static struct deleted_info *delarray; static int num_delarray, max_delarray; static char *block_buf; -static const char *undelfserr = N_(" undelfs: error "); +static const char *undelfserr = N_("undelfs: error"); static int readdir_ptr; static int undelfs_usage; static struct vfs_class vfs_undelfs_ops; @@ -197,25 +197,25 @@ undelfs_loaddel (void) delarray = g_try_malloc (sizeof (struct deleted_info) * max_delarray); if (!delarray) { - message (D_ERROR, undelfserr, _(" not enough memory ")); + message (D_ERROR, undelfserr, _("not enough memory")); return 0; } block_buf = g_try_malloc (fs->blocksize * 3); if (!block_buf) { - message (D_ERROR, undelfserr, _(" while allocating block buffer ")); + message (D_ERROR, undelfserr, _("while allocating block buffer")); goto free_delarray; } retval = ext2fs_open_inode_scan (fs, 0, &scan); if (retval != 0) { - message (D_ERROR, undelfserr, _(" open_inode_scan: %d "), retval); + message (D_ERROR, undelfserr, _("open_inode_scan: %d"), retval); goto free_block_buf; } retval = ext2fs_get_next_inode (scan, &ino, &inode); if (retval != 0) { - message (D_ERROR, undelfserr, _(" while starting inode scan %d "), retval); + message (D_ERROR, undelfserr, _("while starting inode scan %d"), retval); goto error_out; } count = 0; @@ -237,7 +237,7 @@ undelfs_loaddel (void) retval = ext2fs_block_iterate (fs, ino, 0, block_buf, undelfs_lsdel_proc, &lsd); if (retval) { - message (D_ERROR, undelfserr, _(" while calling ext2_block_iterate %d "), retval); + message (D_ERROR, undelfserr, _("while calling ext2_block_iterate %d"), retval); goto next; } if (lsd.free_blocks && !lsd.bad_blocks) @@ -249,7 +249,7 @@ undelfs_loaddel (void) (max_delarray + 50)); if (!delarray_new) { - message (D_ERROR, undelfserr, _(" no more memory while reallocating array ")); + message (D_ERROR, undelfserr, _("no more memory while reallocating array")); goto error_out; } delarray = delarray_new; @@ -271,7 +271,7 @@ undelfs_loaddel (void) retval = ext2fs_get_next_inode (scan, &ino, &inode); if (retval) { - message (D_ERROR, undelfserr, _(" while doing inode scan %d "), retval); + message (D_ERROR, undelfserr, _("while doing inode scan %d"), retval); goto error_out; } } @@ -305,7 +305,7 @@ com_err (const char *whoami, long err_code, const char *fmt, ...) str = g_strdup_vprintf (fmt, ap); va_end (ap); - message (D_ERROR, _(" Ext2lib error "), " %s (%s: %ld) ", str, whoami, err_code); + message (D_ERROR, _("Ext2lib error"), "%s (%s: %ld)", str, whoami, err_code); g_free (str); } @@ -336,19 +336,19 @@ undelfs_opendir (struct vfs_class *me, const char *dirname) if (ext2fs_open (ext2_fname, 0, 0, 0, unix_io_manager, &fs)) { - message (D_ERROR, undelfserr, _(" Cannot open file %s "), ext2_fname); + message (D_ERROR, undelfserr, _("Cannot open file %s"), ext2_fname); return 0; } print_vfs_message (_("undelfs: reading inode bitmap...")); if (ext2fs_read_inode_bitmap (fs)) { - message (D_ERROR, undelfserr, _(" Cannot load inode bitmap from: \n %s \n"), ext2_fname); + message (D_ERROR, undelfserr, _("Cannot load inode bitmap from:\n%s"), ext2_fname); goto quit_opendir; } print_vfs_message (_("undelfs: reading block bitmap...")); if (ext2fs_read_block_bitmap (fs)) { - message (D_ERROR, undelfserr, _(" Cannot load block bitmap from: \n %s \n"), ext2_fname); + message (D_ERROR, undelfserr, _("Cannot load block bitmap from:\n%s"), ext2_fname); goto quit_opendir; } /* Now load the deleted information */ @@ -372,7 +372,7 @@ undelfs_readdir (void *vfs_info) if (vfs_info != fs) { - message (D_ERROR, undelfserr, _(" vfs_info is not fs! ")); + message (D_ERROR, undelfserr, _("vfs_info is not fs!")); return NULL; } if (readdir_ptr == num_delarray) @@ -431,7 +431,7 @@ undelfs_open (struct vfs_class *me, const char *fname, int flags, int mode) if (!ext2_fname || strcmp (ext2_fname, file)) { - message (D_ERROR, undelfserr, _(" You have to chdir to extract files first ")); + message (D_ERROR, undelfserr, _("You have to chdir to extract files first")); g_free (file); g_free (f); return 0; @@ -571,7 +571,7 @@ undelfs_read (void *vfs_info, char *buffer, int count) retval = ext2fs_block_iterate (fs, p->inode, 0, NULL, undelfs_dump_read, p); if (retval) { - message (D_ERROR, undelfserr, _(" while iterating over blocks ")); + message (D_ERROR, undelfserr, _("while iterating over blocks")); return -1; } if (p->error_code && !p->finished) @@ -636,7 +636,7 @@ undelfs_lstat (struct vfs_class *me, const char *path, struct stat *buf) if (!ext2_fname || strcmp (ext2_fname, file)) { - message (D_ERROR, undelfserr, _(" You have to chdir to extract files first ")); + message (D_ERROR, undelfserr, _("You have to chdir to extract files first")); g_free (file); g_free (f); return 0; @@ -678,7 +678,7 @@ undelfs_chdir (struct vfs_class *me, const char *path) fd = open (file, O_RDONLY); if (fd == -1) { - message (D_ERROR, undelfserr, _(" Cannot open file %s "), file); + message (D_ERROR, undelfserr, _("Cannot open file \"%s\""), file); g_free (f); g_free (file); return -1; diff --git a/src/achown.c b/src/achown.c index ef6bfefeb..6efa8582b 100644 --- a/src/achown.c +++ b/src/achown.c @@ -582,7 +582,7 @@ init_chown_advanced (void) ch_dlg = create_dlg (0, 0, dlg_h, dlg_w, dialog_colors, advanced_chown_callback, - "[Advanced Chown]", _(" Chown advanced command "), + "[Advanced Chown]", _("Chown advanced command"), DLG_CENTER | DLG_REVERSE); #define XTRACT(i) BY+chown_advanced_but[i].y, BX+chown_advanced_but[i].x, \ @@ -640,12 +640,12 @@ static void apply_advanced_chowns (struct stat *sf) lc_fname = current_panel->dir.list[current_file].fname; need_update = end_chown = 1; if (mc_chmod (lc_fname, get_mode ()) == -1) - message (D_ERROR, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "), + message (D_ERROR, MSG_ERROR, _("Cannot chmod \"%s\"\n%s"), lc_fname, unix_error_string (errno)); /* call mc_chown only, if mc_chmod didn't fail */ else if (mc_chown (lc_fname, (ch_flags[9] == '+') ? sf->st_uid : (uid_t) -1, (ch_flags[10] == '+') ? sf->st_gid : (gid_t) -1) == -1) - message (D_ERROR, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "), + message (D_ERROR, MSG_ERROR, _("Cannot chown \"%s\"\n%s"), lc_fname, unix_error_string (errno)); do_file_mark (current_panel, current_file, 0); @@ -656,12 +656,12 @@ static void apply_advanced_chowns (struct stat *sf) break; ch_cmode = sf->st_mode; if (mc_chmod (lc_fname, get_mode ()) == -1) - message (D_ERROR, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "), + message (D_ERROR, MSG_ERROR, _("Cannot chmod \"%s\"\n%s"), lc_fname, unix_error_string (errno)); /* call mc_chown only, if mc_chmod didn't fail */ else if (mc_chown (lc_fname, (ch_flags[9] == '+') ? a_uid : (uid_t) -1, (ch_flags[10] == '+') ? a_gid : (gid_t) -1) == -1) - message (D_ERROR, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "), + message (D_ERROR, MSG_ERROR, _("Cannot chown \"%s\"\n%s"), lc_fname, unix_error_string (errno)); do_file_mark (current_panel, current_file, 0); @@ -703,12 +703,12 @@ chown_advanced_cmd (void) case B_ENTER: need_update = 1; if (mc_chmod (fname, get_mode ()) == -1) - message (D_ERROR, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "), + message (D_ERROR, MSG_ERROR, _("Cannot chmod \"%s\"\n%s"), fname, unix_error_string (errno)); /* call mc_chown only, if mc_chmod didn't fail */ else if (mc_chown (fname, (ch_flags[9] == '+') ? sf_stat->st_uid : (uid_t) -1, (ch_flags[10] == '+') ? sf_stat->st_gid : (gid_t) -1) == -1) - message (D_ERROR, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "), + message (D_ERROR, MSG_ERROR, _("Cannot chown \"%s\"\n%s"), fname, unix_error_string (errno)); break; case B_SETALL: diff --git a/src/background.c b/src/background.c index 6c8b12408..5588e4972 100644 --- a/src/background.c +++ b/src/background.c @@ -279,14 +279,14 @@ background_attention (int fd, void *closure) bytes = read (fd, &routine.pointer, sizeof (routine)); if (bytes == -1 || (size_t) bytes < (sizeof (routine))) { - const char *background_process_error = _(" Background process error "); + const char *background_process_error = _("Background process error"); unregister_task_running (ctx->pid, fd); if (!waitpid (ctx->pid, &status, WNOHANG)) { /* the process is still running, but it misbehaves - kill it */ kill (ctx->pid, SIGTERM); - message (D_ERROR, background_process_error, _(" Unknown error in child ")); + message (D_ERROR, background_process_error, _("Unknown error in child")); return 0; } @@ -294,7 +294,7 @@ background_attention (int fd, void *closure) if (WIFEXITED (status) && (WEXITSTATUS (status) == 0)) return 0; - message (D_ERROR, background_process_error, _(" Child died unexpectedly ")); + message (D_ERROR, background_process_error, _("Child died unexpectedly")); return 0; } @@ -303,22 +303,22 @@ background_attention (int fd, void *closure) (read (fd, &type, sizeof (type)) != sizeof (type)) || (read (fd, &have_ctx, sizeof (have_ctx)) != sizeof (have_ctx))) { - message (D_ERROR, _(" Background protocol error "), _("Reading failed")); + message (D_ERROR, _("Background protocol error"), _("Reading failed")); return 0; } if (argc > MAXCALLARGS) { - message (D_ERROR, _(" Background protocol error "), - _(" Background process sent us a request for more arguments \n" - " than we can handle. \n")); + message (D_ERROR, _("Background protocol error"), + _("Background process sent us a request for more arguments\n" + "than we can handle.")); } if (have_ctx) { if (read (fd, ctx, sizeof (FileOpContext)) != sizeof (FileOpContext)) { - message (D_ERROR, _(" Background protocol error "), _("Reading failed")); + message (D_ERROR, _("Background protocol error"), _("Reading failed")); return 0; } } @@ -329,13 +329,13 @@ background_attention (int fd, void *closure) if (read (fd, &size, sizeof (size)) != sizeof (size)) { - message (D_ERROR, _(" Background protocol error "), _("Reading failed")); + message (D_ERROR, _("Background protocol error"), _("Reading failed")); return 0; } data[i] = g_malloc (size + 1); if (read (fd, data[i], size) != size) { - message (D_ERROR, _(" Background protocol error "), _("Reading failed")); + message (D_ERROR, _("Background protocol error"), _("Reading failed")); return 0; } data[i][size] = 0; /* NULL terminate the blocks (they could be strings) */ @@ -353,7 +353,7 @@ background_attention (int fd, void *closure) to_child_fd = p->to_child_fd; if (to_child_fd == -1) - message (D_ERROR, _(" Background process error "), _(" Unknown error in child ")); + message (D_ERROR, _("Background process error"), _("Unknown error in child")); /* Handle the call */ if (type == Return_Integer) diff --git a/src/boxes.c b/src/boxes.c index 138add7e3..12f41836e 100644 --- a/src/boxes.c +++ b/src/boxes.c @@ -484,7 +484,7 @@ display_bits_box (void) /* AB:FIXME: test dialog */ }; QuickDialog display_bits = { - DISPX, DISPY, -1, -1, _(" Display bits "), + DISPX, DISPY, -1, -1, _("Display bits"), "[Display bits]", display_widgets, TRUE }; @@ -598,7 +598,7 @@ init_disp_bits_box (void) dbits_dlg = create_dlg (0, 0, DISPY, DISPX, dialog_colors, NULL, - "[Display bits]", _(" Display bits "), DLG_CENTER | DLG_REVERSE); + "[Display bits]", _("Display bits"), DLG_CENTER | DLG_REVERSE); add_widget (dbits_dlg, label_new (3, 4, _("Input / display codepage:"))); @@ -765,7 +765,7 @@ configure_vfs (void) }; QuickDialog confvfs_dlg = { - VFSX, VFSY, -1, -1, N_(" Virtual File System Setting "), + VFSX, VFSY, -1, -1, N_("Virtual File System Setting"), "[Virtual FS]", confvfs_widgets, FALSE }; @@ -874,7 +874,7 @@ jobs_fill_listbox (void) if (!state_str[0]) { - state_str[0] = _("Running "); + state_str[0] = _("Running"); state_str[1] = _("Stopped"); } diff --git a/src/chmod.c b/src/chmod.c index 6ee8c88d0..baf1b9c54 100644 --- a/src/chmod.c +++ b/src/chmod.c @@ -139,9 +139,6 @@ chmod_refresh (Dlg_head * h) tty_setcolor (COLOR_NORMAL); - draw_box (h, PY, PX, PERMISSIONS + 2, 33, TRUE); - draw_box (h, FY, FX, 10, 25, TRUE); - dlg_move (h, FY + 1, FX + 2); tty_print_string (_("Name")); dlg_move (h, FY + 3, FX + 2); @@ -159,20 +156,13 @@ chmod_refresh (Dlg_head * h) tty_print_string (_("to move between options")); dlg_move (h, TY + 3, TX); tty_print_string (_("and T or INS to mark")); - - tty_setcolor (COLOR_HOT_NORMAL); - - dlg_move (h, PY, PX + 1); - tty_print_string (_(" Permission ")); - dlg_move (h, FY, FX + 1); - tty_print_string (_(" File ")); } static cb_ret_t chmod_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *data) { char buffer[BUF_TINY]; - int id = h->current->dlg_id - BUTTONS + single_set * 2; + int id = h->current->dlg_id - BUTTONS + single_set * 2 - 1; switch (msg) { @@ -232,12 +222,16 @@ init_chmod (void) chmod_but[i].flags, _(chmod_but[i].text), 0)); } + add_widget (ch_dlg, groupbox_new (FY, FX, 10, 25, _("File"))); + for (i = 0; i < PERMISSIONS; i++) { check_perm[i].check = check_new (PY + (PERMISSIONS - i), PX + 2, 0, _(check_perm[i].text)); add_widget (ch_dlg, check_perm[i].check); } + add_widget (ch_dlg, groupbox_new ( PY, PX, PERMISSIONS + 2, 33, _("Permission"))); + return ch_dlg; } @@ -264,7 +258,7 @@ do_chmod (struct stat *sf) sf->st_mode &= and_mask; sf->st_mode |= or_mask; if (mc_chmod (current_panel->dir.list[c_file].fname, sf->st_mode) == -1) - message (D_ERROR, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "), + message (D_ERROR, MSG_ERROR, _("Cannot chmod \"%s\"\n%s"), current_panel->dir.list[c_file].fname, unix_error_string (errno)); do_file_mark (current_panel, c_file, 0); @@ -342,7 +336,7 @@ chmod_cmd (void) case B_ENTER: if (mode_change) if (mc_chmod (fname, c_stat) == -1) - message (D_ERROR, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "), + message (D_ERROR, MSG_ERROR, _("Cannot chmod \"%s\"\n%s"), fname, unix_error_string (errno)); need_update = 1; break; @@ -382,6 +376,7 @@ chmod_cmd (void) apply_mask (&sf_stat); break; + case B_CLRMRK: and_mask = or_mask = 0; and_mask = ~and_mask; @@ -401,8 +396,10 @@ chmod_cmd (void) do_file_mark (current_panel, c_file, 0); need_update = 1; } + destroy_dlg (ch_dlg); } while (current_panel->marked && !end_chmod); + chmod_done (); } diff --git a/src/chown.c b/src/chown.c index d11a0c944..d70193121 100644 --- a/src/chown.c +++ b/src/chown.c @@ -106,28 +106,16 @@ chown_refresh (Dlg_head * h) tty_setcolor (COLOR_NORMAL); - draw_box (h, UY, UX, 12, 21, TRUE); - draw_box (h, GY, GX, 12, 21, TRUE); - draw_box (h, TY, TX, 12, 19, TRUE); - - dlg_move (h, TY + 1, TX + 1); - tty_print_string (_(" Name ")); - dlg_move (h, TY + 3, TX + 1); - tty_print_string (_(" Owner name ")); - dlg_move (h, TY + 5, TX + 1); - tty_print_string (_(" Group name ")); - dlg_move (h, TY + 7, TX + 1); - tty_print_string (_(" Size ")); - dlg_move (h, TY + 9, TX + 1); - tty_print_string (_(" Permission ")); - - tty_setcolor (COLOR_HOT_NORMAL); - dlg_move (h, UY, UX + 1); - tty_print_string (_(" User name ")); - dlg_move (h, GY, GX + 1); - tty_print_string (_(" Group name ")); - dlg_move (h, TY, TX + 1); - tty_print_string (_(" File ")); + dlg_move (h, TY + 1, TX + 2); + tty_print_string (_("Name")); + dlg_move (h, TY + 3, TX + 2); + tty_print_string (_("Owner name")); + dlg_move (h, TY + 5, TX + 2); + tty_print_string (_("Group name")); + dlg_move (h, TY + 7, TX + 2); + tty_print_string (_("Size")); + dlg_move (h, TY + 9, TX + 2); + tty_print_string (_("Permission")); } static char * @@ -167,7 +155,7 @@ init_chown (void) ch_dlg = create_dlg (0, 0, 18, 74, dialog_colors, chown_callback, "[Chown]", - _(" Chown command "), DLG_CENTER | DLG_REVERSE); + _("Chown command"), DLG_CENTER | DLG_REVERSE); for (i = 0; i < BUTTONS - single_set; i++) add_widget (ch_dlg, @@ -191,7 +179,7 @@ init_chown (void) /* get and put user names in the listbox */ setpwent (); - while ((l_pass = getpwent ())) + while ((l_pass = getpwent ()) != NULL) { listbox_add_item (l_user, LISTBOX_APPEND_SORTED, 0, l_pass->pw_name, NULL); } @@ -199,15 +187,19 @@ init_chown (void) /* get and put group names in the listbox */ setgrent (); - while ((l_grp = getgrent ())) + while ((l_grp = getgrent ()) != NULL) { listbox_add_item (l_group, LISTBOX_APPEND_SORTED, 0, l_grp->gr_name, NULL); } endgrent (); + add_widget (ch_dlg, groupbox_new (TY, TX, 12, 19, _("File"))); + /* add listboxes to the dialogs */ add_widget (ch_dlg, l_group); + add_widget (ch_dlg, groupbox_new (GY, GX, 12, 21, _("Group name"))); add_widget (ch_dlg, l_user); + add_widget (ch_dlg, groupbox_new (UY, UX, 12, 21, _("User name"))); return ch_dlg; } @@ -224,7 +216,7 @@ static void do_chown (uid_t u, gid_t g) { if (mc_chown (current_panel->dir.list[current_file].fname, u, g) == -1) - message (D_ERROR, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "), + message (D_ERROR, MSG_ERROR, _("Cannot chown \"%s\"\n%s"), current_panel->dir.list[current_file].fname, unix_error_string (errno)); do_file_mark (current_panel, current_file, 0); @@ -306,6 +298,7 @@ chown_cmd (void) } break; } + case B_SETGRP: { struct group *grp; @@ -320,6 +313,7 @@ chown_cmd (void) } break; } + case B_SETALL: case B_ENTER: { @@ -339,7 +333,7 @@ chown_cmd (void) { need_update = 1; if (mc_chown (fname, new_user, new_group) == -1) - message (D_ERROR, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "), + message (D_ERROR, MSG_ERROR, _("Cannot chown \"%s\"\n%s"), fname, unix_error_string (errno)); } else @@ -353,6 +347,7 @@ chown_cmd (void) do_file_mark (current_panel, current_file, 0); need_update = 1; } + destroy_dlg (ch_dlg); } while (current_panel->marked && !end_chown); diff --git a/src/cmd.c b/src/cmd.c index 859dbc8ed..17548303d 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -232,7 +232,7 @@ do_view_cmd (int normal) if (confirm_view_dir && (current_panel->marked || current_panel->dirs_marked)) { if (query_dialog - (_(" Confirmation "), _("Files tagged, want to cd?"), D_NORMAL, 2, + (_("Confirmation"), _("Files tagged, want to cd?"), D_NORMAL, 2, _("&Yes"), _("&No")) != 0) { return; @@ -275,7 +275,7 @@ view_file_cmd (void) char *filename; filename = - input_expand_dialog (_(" View file "), _(" Filename:"), + input_expand_dialog (_("View file"), _("Filename:"), MC_HISTORY_FM_VIEW_FILE, selection (current_panel)->fname); if (!filename) return; @@ -297,8 +297,8 @@ filtered_view_cmd (void) char *command; command = - input_dialog (_(" Filtered view "), - _(" Filter command and arguments:"), + input_dialog (_("Filtered view"), + _("Filter command and arguments:"), MC_HISTORY_FM_FILTERED_VIEW, selection (current_panel)->fname); if (!command) return; @@ -418,7 +418,7 @@ mkdir_cmd (void) dir = input_expand_dialog (_("Create a new Directory"), - _(" Enter directory name:"), MC_HISTORY_FM_MKDIR, name); + _("Enter directory name:"), MC_HISTORY_FM_MKDIR, name); if (!dir) return; @@ -439,7 +439,7 @@ mkdir_cmd (void) } else { - message (D_ERROR, MSG_ERROR, " %s ", unix_error_string (errno)); + message (D_ERROR, MSG_ERROR, "%s", unix_error_string (errno)); } g_free (absdir); } @@ -499,8 +499,8 @@ set_panel_filter (WPanel * p) x = p->filter ? p->filter : easy_patterns ? "*" : "."; - reg_exp = input_dialog_help (_(" Filter "), - _(" Set expression for filtering filenames"), + reg_exp = input_dialog_help (_("Filter"), + _("Set expression for filtering filenames"), "[Filter...]", MC_HISTORY_FM_PANEL_FILTER, x); if (!reg_exp) return; @@ -619,13 +619,13 @@ select_unselect_cmd (const char *title, const char *history_name, gboolean do_se void select_cmd (void) { - select_unselect_cmd (_(" Select "), ":select_cmd: Select ", TRUE); + select_unselect_cmd (_("Select"), ":select_cmd: Select ", TRUE); } void unselect_cmd (void) { - select_unselect_cmd (_(" Unselect "), ":unselect_cmd: Unselect ", FALSE); + select_unselect_cmd (_("Unselect"), ":unselect_cmd: Unselect ", FALSE); } void @@ -639,7 +639,7 @@ ext_cmd (void) if (geteuid () == 0) { dir = query_dialog (_("Extension file edit"), - _(" Which extension file you want to edit? "), D_NORMAL, 2, + _("Which extension file you want to edit?"), D_NORMAL, 2, _("&User"), _("&System Wide")); } extdir = concat_dir_and_file (mc_home, MC_LIB_EXT); @@ -672,8 +672,8 @@ edit_mc_menu_cmd (void) char *menufile; int dir = 0; - dir = query_dialog (_(" Menu edit "), - _(" Which menu file do you want to edit? "), + dir = query_dialog (_("Menu edit"), + _("Which menu file do you want to edit?"), D_NORMAL, geteuid ()? 2 : 3, _("&Local"), _("&User"), _("&System Wide")); menufile = concat_dir_and_file (mc_home, MC_GLOBAL_MENU); @@ -729,7 +729,7 @@ edit_fhl_cmd (void) if (geteuid () == 0) { dir = query_dialog (_("Highlighting groups file edit"), - _(" Which highlighting file you want to edit? "), D_NORMAL, 2, + _("Which highlighting file you want to edit?"), D_NORMAL, 2, _("&User"), _("&System Wide")); } fhlfile = concat_dir_and_file (mc_home, MC_FHL_INI_FILE); @@ -931,8 +931,8 @@ compare_dirs_cmd (void) enum CompareMode thorough_flag; choice = - query_dialog (_(" Compare directories "), - _(" Select compare method: "), D_NORMAL, 4, + query_dialog (_("Compare directories"), + _("Select compare method:"), D_NORMAL, 4, _("&Quick"), _("&Size only"), _("&Thorough"), _("&Cancel")); if (choice < 0 || choice > 2) @@ -948,7 +948,7 @@ compare_dirs_cmd (void) else { message (D_ERROR, MSG_ERROR, - _(" Both panels should be in the " "listing mode to use this command ")); + _("Both panels should be in the listing mode\nto use this command")); } } @@ -990,7 +990,7 @@ view_other_cmd (void) { if (message_flag) message (D_ERROR, MSG_ERROR, - _(" Not an xterm or Linux console; \n" " the panels cannot be toggled. ")); + _("Not an xterm or Linux console;\nthe panels cannot be toggled.")); message_flag = FALSE; } else @@ -1007,12 +1007,12 @@ do_link (link_type_t link_type, const char *fname) if (link_type == LINK_HARDLINK) { src = g_strdup_printf (_("Link %s to:"), str_trunc (fname, 46)); - dest = input_expand_dialog (_(" Link "), src, MC_HISTORY_FM_LINK, ""); + dest = input_expand_dialog (_("Link"), src, MC_HISTORY_FM_LINK, ""); if (!dest || !*dest) goto cleanup; save_cwds_stat (); if (-1 == mc_link (fname, dest)) - message (D_ERROR, MSG_ERROR, _(" link: %s "), unix_error_string (errno)); + message (D_ERROR, MSG_ERROR, _("link: %s"), unix_error_string (errno)); } else { @@ -1039,7 +1039,7 @@ do_link (link_type_t link_type, const char *fname) goto cleanup; save_cwds_stat (); if (-1 == mc_symlink (dest, src)) - message (D_ERROR, MSG_ERROR, _(" symlink: %s "), unix_error_string (errno)); + message (D_ERROR, MSG_ERROR, _("symlink: %s"), unix_error_string (errno)); } update_panels (UP_OPTIMIZE, UP_KEEPSEL); @@ -1071,13 +1071,13 @@ edit_symlink_cmd (void) p = selection (current_panel)->fname; - q = g_strdup_printf (_(" Symlink `%s\' points to: "), str_trunc (p, 32)); + q = g_strdup_printf (_("Symlink `%s\' points to:"), str_trunc (p, 32)); i = readlink (p, buffer, MC_MAXPATHLEN - 1); if (i > 0) { buffer[i] = 0; - dest = input_expand_dialog (_(" Edit symlink "), q, MC_HISTORY_FM_EDIT_LINK, buffer); + dest = input_expand_dialog (_("Edit symlink"), q, MC_HISTORY_FM_EDIT_LINK, buffer); if (dest) { if (*dest && strcmp (buffer, dest)) @@ -1085,13 +1085,13 @@ edit_symlink_cmd (void) save_cwds_stat (); if (-1 == mc_unlink (p)) { - message (D_ERROR, MSG_ERROR, _(" edit symlink, unable to remove %s: %s "), + message (D_ERROR, MSG_ERROR, _("edit symlink, unable to remove %s: %s"), p, unix_error_string (errno)); } else { if (-1 == mc_symlink (dest, p)) - message (D_ERROR, MSG_ERROR, _(" edit symlink: %s "), + message (D_ERROR, MSG_ERROR, _("edit symlink: %s"), unix_error_string (errno)); } update_panels (UP_OPTIMIZE, UP_KEEPSEL); @@ -1209,7 +1209,7 @@ nice_cd (const char *text, const char *xtext, const char *help, if (do_panel_cd (MENU_PANEL, cd_path, 0)) directory_history_add (MENU_PANEL, (MENU_PANEL)->cwd); else - message (D_ERROR, MSG_ERROR, _(" Cannot chdir to %s "), cd_path); + message (D_ERROR, MSG_ERROR, _("Cannot chdir to %s"), cd_path); g_free (cd_path); g_free (machine); } @@ -1218,13 +1218,13 @@ nice_cd (const char *text, const char *xtext, const char *help, #ifdef USE_NETCODE -static const char *machine_str = N_(" Enter machine name (F1 for details): "); +static const char *machine_str = N_("Enter machine name (F1 for details):"); #ifdef ENABLE_VFS_MCFS void netlink_cmd (void) { - nice_cd (_(" Link to a remote machine "), _(machine_str), + nice_cd (_("Link to a remote machine"), _(machine_str), "[Network File System]", ":netlink_cmd: Link to a remote ", "/#mc:", 1); } #endif /* ENABLE_VFS_MCFS */ @@ -1232,14 +1232,14 @@ netlink_cmd (void) void ftplink_cmd (void) { - nice_cd (_(" FTP to machine "), _(machine_str), + nice_cd (_("FTP to machine"), _(machine_str), "[FTP File System]", ":ftplink_cmd: FTP to machine ", "/#ftp:", 1); } void fishlink_cmd (void) { - nice_cd (_(" Shell link to machine "), _(machine_str), + nice_cd (_("Shell link to machine"), _(machine_str), "[FIle transfer over SHell filesystem]", ":fishlink_cmd: Shell link to machine ", "/#sh:", 1); } @@ -1248,7 +1248,7 @@ fishlink_cmd (void) void smblink_cmd (void) { - nice_cd (_(" SMB link to machine "), _(machine_str), + nice_cd (_("SMB link to machine"), _(machine_str), "[SMB File System]", ":smblink_cmd: SMB link to machine ", "/#smb:", 0); } #endif /* ENABLE_VFS_SMB */ @@ -1258,9 +1258,8 @@ smblink_cmd (void) void undelete_cmd (void) { - nice_cd (_(" Undelete files on an ext2 file system "), - _(" Enter device (without /dev/) to undelete\n " - " files on: (F1 for details)"), + nice_cd (_("Undelete files on an ext2 file system"), + _("Enter device (without /dev/) to undelete\nfiles on: (F1 for details)"), "[Undelete File System]", ":undelete_cmd: Undel on ext2 fs ", "/#undel:", 0); } #endif /* USE_EXT2FSLIB */ @@ -1381,7 +1380,7 @@ save_setup_cmd (void) { if (!save_setup ()) return; - message (D_NORMAL, _(" Setup "), _(" Setup saved to ~/%s"), + message (D_NORMAL, _("Setup"), _("Setup saved to ~/%s"), MC_USERCONF_DIR PATH_SEP_STR MC_CONFIG_FILE); } diff --git a/src/command.c b/src/command.c index e9ee41d27..6112ad11c 100644 --- a/src/command.c +++ b/src/command.c @@ -194,7 +194,7 @@ void do_cd_command (char * orig_cmd) } else if (!examine_cd (&cmd [3])) { char *d = strip_password (g_strdup (&cmd [3]), 1); - message (D_ERROR, MSG_ERROR, _(" Cannot chdir to \"%s\" \n %s "), + message (D_ERROR, MSG_ERROR, _("Cannot chdir to \"%s\"\n%s"), d, unix_error_string (errno)); g_free (d); return; @@ -232,8 +232,7 @@ enter (WInput *lc_cmdline) } message (D_ERROR, MSG_ERROR, - _ - (" Cannot execute commands on non-local filesystems")); + _("Cannot execute commands on non-local filesystems")); return MSG_NOT_HANDLED; } @@ -242,7 +241,7 @@ enter (WInput *lc_cmdline) * (will be checked again by shell_execute) */ if (use_subshell && subshell_state != INACTIVE) { message (D_ERROR, MSG_ERROR, - _(" The shell is already running a command ")); + _("The shell is already running a command")); return MSG_NOT_HANDLED; } #endif diff --git a/src/diffviewer/search.c b/src/diffviewer/search.c index cffbd29e4..d5c9429cd 100644 --- a/src/diffviewer/search.c +++ b/src/diffviewer/search.c @@ -130,7 +130,7 @@ mcdiffview_dialog_search (WDiff * dview) MC_HISTORY_SHARED_SEARCH, &exp), /* 7 */ - QUICK_LABEL (2, SEARCH_DLG_WIDTH, 2, SEARCH_DLG_HEIGHT, N_(" Enter search string:")), + QUICK_LABEL (3, SEARCH_DLG_WIDTH, 2, SEARCH_DLG_HEIGHT, N_("Enter search string:")), QUICK_END }; @@ -252,7 +252,7 @@ mcdiffview_do_search (WDiff * dview) if (!present_result) { dview->search.last_found_line = -1; - error_dialog (_("Search"), _(" Search string not found ")); + error_dialog (_("Search"), _("Search string not found")); } } @@ -265,7 +265,7 @@ dview_search_cmd (WDiff * dview) { if (dview->dsrc != DATA_SRC_MEM) { - error_dialog (_("Search"), _(" Search is disabled ")); + error_dialog (_("Search"), _("Search is disabled")); return; } @@ -292,7 +292,7 @@ void dview_continue_search_cmd (WDiff * dview) { if (dview->dsrc != DATA_SRC_MEM) - error_dialog (_("Search"), _(" Search is disabled ")); + error_dialog (_("Search"), _("Search is disabled")); else if (dview->search.handle == NULL) dview_search_cmd (dview); else diff --git a/src/diffviewer/ydiff.c b/src/diffviewer/ydiff.c index b44eee0bd..f27b4aabb 100644 --- a/src/diffviewer/ydiff.c +++ b/src/diffviewer/ydiff.c @@ -198,7 +198,7 @@ open_temp (void **name) if (fd == -1) { message (D_ERROR, MSG_ERROR, - _(" Cannot create temporary diff file \n %s "), unix_error_string (errno)); + _("Cannot create temporary diff file\n%s"), unix_error_string (errno)); return -1; } *name = diff_file_name; @@ -2204,7 +2204,7 @@ do_merge_hunk (WDiff * dview) if (!dview->merged) { message (D_ERROR, MSG_ERROR, - _(" Cannot create backup file \n %s%s \n %s "), + _("Cannot create backup file\n%s%s\n%s"), dview->file[0], "~~~", unix_error_string (errno)); return; } @@ -2214,7 +2214,7 @@ do_merge_hunk (WDiff * dview) merge_file_fd = mc_mkstemps (&merge_file_name, "mcmerge", NULL); if (merge_file_fd == -1) { - message (D_ERROR, MSG_ERROR, _(" Cannot create temporary merge file \n %s "), + message (D_ERROR, MSG_ERROR, _("Cannot create temporary merge file\n%s"), unix_error_string (errno)); return; } @@ -2752,7 +2752,7 @@ dview_edit (WDiff * dview, int ord) if (dview->dsrc == DATA_SRC_TMP) { - error_dialog (_("Edit"), _(" Edit is disabled ")); + error_dialog (_("Edit"), _("Edit is disabled")); return; } @@ -2767,14 +2767,14 @@ dview_edit (WDiff * dview, int ord) static void dview_goto_cmd (WDiff * dview, int ord) { - static const char *title[2] = { " Goto line (left) ", " Goto line (right) " }; + static const char *title[2] = { N_("Goto line (left)"), N_("Goto line (right)") }; static char prev[256]; /* XXX some statics here, to be remembered between runs */ int newline; char *input; - input = input_dialog (_(title[ord]), _(" Enter line: "), MC_HISTORY_YDIFF_GOTO_LINE, prev); + input = input_dialog (_(title[ord]), _("Enter line:"), MC_HISTORY_YDIFF_GOTO_LINE, prev); if (input != NULL) { const char *s = input; @@ -2933,7 +2933,7 @@ dview_ok_to_exit (WDiff * dview) if (!dview->merged) return res; switch (query_dialog - (_("Quit"), _(" File was modified, Save with exit? "), D_NORMAL, 2, _("&Yes"), + (_("Quit"), _("File was modified, Save with exit?"), D_NORMAL, 2, _("&Yes"), _("&No"))) { case -1: diff --git a/src/editor/choosesyntax.c b/src/editor/choosesyntax.c index 3da1f2dbb..5dedf7892 100644 --- a/src/editor/choosesyntax.c +++ b/src/editor/choosesyntax.c @@ -49,7 +49,7 @@ exec_edit_syntax_dialog (const char **names, const char *current_syntax) size_t i; Listbox *syntaxlist = create_listbox_window (LIST_LINES, MAX_ENTRY_LEN, - _(" Choose syntax highlighting "), NULL); + _("Choose syntax highlighting"), NULL); LISTBOX_APPEND_TEXT (syntaxlist, 'A', _("< Auto >"), NULL); LISTBOX_APPEND_TEXT (syntaxlist, 'R', _("< Reload Current Syntax >"), NULL); diff --git a/src/editor/edit.c b/src/editor/edit.c index 6f8ca07dd..faa9dc98d 100644 --- a/src/editor/edit.c +++ b/src/editor/edit.c @@ -335,7 +335,7 @@ edit_load_file_fast (WEdit * edit, const char *filename) if (file == -1) { GString *errmsg = g_string_new (NULL); - g_string_sprintf (errmsg, _(" Cannot open %s for reading "), filename); + g_string_sprintf (errmsg, _("Cannot open %s for reading"), filename); edit_error_dialog (_("Error"), get_sys_error (errmsg->str)); g_string_free (errmsg, TRUE); return 1; @@ -364,7 +364,7 @@ edit_load_file_fast (WEdit * edit, const char *filename) while (0); if (ret) { - char *err_str = g_strdup_printf (_(" Error reading %s "), filename); + char *err_str = g_strdup_printf (_("Error reading %s"), filename); edit_error_dialog (_("Error"), err_str); g_free (err_str); } @@ -570,7 +570,7 @@ edit_insert_file (WEdit * edit, const char *filename) if (pclose (f) > 0) { char *errmsg; - errmsg = g_strdup_printf (_(" Error reading from pipe: %s "), p); + errmsg = g_strdup_printf (_("Error reading from pipe: %s"), p); edit_error_dialog (_("Error"), errmsg); g_free (errmsg); g_free (p); @@ -580,7 +580,7 @@ edit_insert_file (WEdit * edit, const char *filename) else { char *errmsg; - errmsg = g_strdup_printf (_(" Cannot open pipe for reading: %s "), p); + errmsg = g_strdup_printf (_("Cannot open pipe for reading: %s"), p); edit_error_dialog (_("Error"), errmsg); g_free (errmsg); g_free (p); @@ -642,7 +642,7 @@ check_file_access (WEdit * edit, const char *filename, struct stat *st) if (file < 0) { g_string_sprintf (errmsg = g_string_new (NULL), - _(" Cannot open %s for reading "), filename); + _("Cannot open %s for reading"), filename); goto cleanup; } else @@ -656,14 +656,14 @@ check_file_access (WEdit * edit, const char *filename, struct stat *st) if (mc_fstat (file, st) < 0) { g_string_sprintf (errmsg = g_string_new (NULL), - _(" Cannot get size/permissions for %s "), filename); + _("Cannot get size/permissions for %s"), filename); goto cleanup; } /* We want to open regular files only */ if (!S_ISREG (st->st_mode)) { - g_string_sprintf (errmsg = g_string_new (NULL), _(" %s is not a regular file "), filename); + g_string_sprintf (errmsg = g_string_new (NULL), _("\"%s\" is not a regular file"), filename); goto cleanup; } @@ -678,7 +678,7 @@ check_file_access (WEdit * edit, const char *filename, struct stat *st) if (st->st_size >= SIZE_LIMIT) { - g_string_sprintf (errmsg = g_string_new (NULL), _(" File %s is too large "), filename); + g_string_sprintf (errmsg = g_string_new (NULL), _("File \"%s\" is too large"), filename); } cleanup: @@ -3527,7 +3527,7 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion) save_setup_cmd (); break; case CK_About: - query_dialog (_(" About "), + query_dialog (_("About"), _("\n Cooledit v3.11.5\n\n" " Copyright (C) 1996 the Free Software Foundation\n\n" " A user friendly text editor written\n" diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c index aa741c43b..10ba87f26 100644 --- a/src/editor/editcmd.c +++ b/src/editor/editcmd.c @@ -111,7 +111,7 @@ edit_search_cmd_search_create_bookmark (WEdit * edit) if (found == 0) { - edit_error_dialog (_("Search"), _(" Search string not found ")); + edit_error_dialog (_("Search"), _("Search string not found")); } else { @@ -209,7 +209,7 @@ edit_save_file (WEdit * edit, const char *filename) if (rv == 0 && sb.st_nlink > 1) { rv = edit_query_dialog3 (_("Warning"), - _(" File has hard-links. Detach before saving? "), + _("File has hard-links. Detach before saving?"), _("&Yes"), _("&No"), _("&Cancel")); switch (rv) { @@ -300,7 +300,7 @@ edit_save_file (WEdit * edit, const char *filename) #else if (pclose (file) != 0) { - tmp = g_strconcat (_(" Error writing to pipe: "), p, " ", (char *) NULL); + tmp = g_strdup_printf (_("Error writing to pipe: %s"), p); edit_error_dialog (_("Error"), tmp); g_free (tmp); g_free (p); @@ -310,8 +310,7 @@ edit_save_file (WEdit * edit, const char *filename) } else { - tmp = g_strconcat (_(" Cannot open pipe for writing: "), p, " ", (char *) NULL); - + tmp = g_strdup_printf (_("Cannot open pipe for writing: %s"), p); edit_error_dialog (_("Error"), get_sys_error (tmp)); g_free (p); g_free (tmp); @@ -388,7 +387,7 @@ edit_save_file (WEdit * edit, const char *filename) { char *msg; - msg = g_strdup_printf (_(" Cannot open file for writing: %s "), savename); + msg = g_strdup_printf (_("Cannot open file for writing: %s"), savename); edit_error_dialog (_("Error"), msg); g_free (msg); goto error_save; @@ -455,7 +454,7 @@ menu_save_mode_cmd (void) }; QuickDialog dialog = { - DLG_X, DLG_Y, -1, -1, N_(" Edit Save Mode "), + DLG_X, DLG_Y, -1, -1, N_("Edit Save Mode"), "[Edit Save Mode]", widgets, FALSE }; @@ -548,13 +547,13 @@ edit_get_save_file_as (WEdit * edit) QUICK_LABEL (3, DLG_WIDTH, DLG_HEIGHT - 9, DLG_HEIGHT, N_("Change line breaks to:")), QUICK_INPUT (3, DLG_WIDTH, DLG_HEIGHT - 11, DLG_HEIGHT, filename, DLG_WIDTH - 6, 0, "save-as", &filename), - QUICK_LABEL (2, DLG_WIDTH, DLG_HEIGHT - 12, DLG_HEIGHT, N_(" Enter file name: ")), + QUICK_LABEL (3, DLG_WIDTH, DLG_HEIGHT - 12, DLG_HEIGHT, N_("Enter file name:")), QUICK_END }; QuickDialog Quick_options = { DLG_WIDTH, DLG_HEIGHT, -1, -1, - N_(" Save As "), "[Save File As]", + N_("Save As"), "[Save File As]", quick_widgets, FALSE }; @@ -610,7 +609,7 @@ edit_save_as_cmd (WEdit * edit) /* Overwrite the current file or cancel the operation */ if (edit_query_dialog2 (_("Warning"), - _(" A file already exists with this name. "), + _("A file already exists with this name"), _("&Overwrite"), _("&Cancel"))) { edit->force |= REDRAW_COMPLETELY; @@ -669,7 +668,7 @@ edit_save_as_cmd (WEdit * edit) edit->force |= REDRAW_COMPLETELY; return 1; default: - edit_error_dialog (_(" Save As "), get_sys_error (_(" Cannot save file. "))); + edit_error_dialog (_("Save as"), get_sys_error (_("Cannot save file"))); /* fallthrough */ case -1: /* Failed, so maintain modify (not save) lock */ @@ -747,13 +746,13 @@ edit_delete_macro (WEdit * edit, int k) g_free (tmp); if (!g) { - edit_error_dialog (_(" Delete macro "), get_sys_error (_(" Cannot open temp file "))); + edit_error_dialog (_("Delete macro"), get_sys_error (_("Cannot open temp file"))); return 1; } f = edit_open_macro_file ("r"); if (!f) { - edit_error_dialog (_(" Delete macro "), get_sys_error (_(" Cannot open macro file "))); + edit_error_dialog (_("Delete macro"), get_sys_error (_("Cannot open macro file"))); fclose (g); return 1; } @@ -783,7 +782,7 @@ edit_delete_macro (WEdit * edit, int k) tmp2 = concat_dir_and_file (home_dir, EDIT_MACRO_FILE); if (rename (tmp, tmp2) == -1) { - edit_error_dialog (_(" Delete macro "), get_sys_error (_(" Cannot overwrite macro file "))); + edit_error_dialog (_("Delete macro"), get_sys_error (_("Cannot overwrite macro file"))); g_free (tmp); g_free (tmp2); return 1; @@ -804,7 +803,7 @@ edit_save_macro_cmd (WEdit * edit, struct macro macro[], int n) int s, i; edit_push_action (edit, KEY_PRESS + edit->start_display); - s = editcmd_dialog_raw_key_query (_(" Save macro "), _(" Press the macro's new hotkey: "), 1); + s = editcmd_dialog_raw_key_query (_("Save macro"), _("Press the macro's new hotkey:"), 1); edit->force |= REDRAW_COMPLETELY; if (s) { @@ -826,7 +825,7 @@ edit_save_macro_cmd (WEdit * edit, struct macro macro[], int n) return 1; } else - edit_error_dialog (_(" Save macro "), get_sys_error (_(" Cannot open macro file "))); + edit_error_dialog (_("Save macro"), get_sys_error (_("Cannot open macro file"))); } return 0; } @@ -836,7 +835,7 @@ edit_delete_macro_cmd (WEdit * edit) { int command; - command = editcmd_dialog_raw_key_query (_(" Delete macro "), _(" Press macro hotkey: "), 1); + command = editcmd_dialog_raw_key_query (_("Delete macro"), _("Press macro hotkey:"), 1); if (command != 0) edit_delete_macro (edit, command); @@ -895,7 +894,7 @@ edit_load_macro_cmd (WEdit * edit, struct macro macro[], int *n, int k) return found; } else - edit_error_dialog (_(" Load macro "), get_sys_error (_(" Cannot open macro file "))); + edit_error_dialog (_("Load macro"), get_sys_error (_("Cannot open macro file"))); return 0; } @@ -912,8 +911,8 @@ edit_save_confirm_cmd (WEdit * edit) if (edit_confirm_save) { - f = g_strconcat (_(" Confirm save file? : "), edit->filename, " ", (char *) NULL); - if (edit_query_dialog2 (_(" Save file "), f, _("&Save"), _("&Cancel"))) + f = g_strdup_printf (_("Confirm save file: \"%s\""), edit->filename); + if (edit_query_dialog2 (_("Save file"), f, _("&Save"), _("&Cancel"))) { g_free (f); return 0; @@ -961,7 +960,7 @@ edit_new_cmd (WEdit * edit) if (edit_query_dialog2 (_("Warning"), _ - (" Current text was modified without a file save. \n Continue discards these changes. "), + ("Current text was modified without a file save.\nContinue discards these changes"), _("C&ontinue"), _("&Cancel"))) { edit->force |= REDRAW_COMPLETELY; @@ -1001,7 +1000,7 @@ edit_load_syntax_file (WEdit * edit) if (geteuid () == 0) { dir = query_dialog (_("Syntax file edit"), - _(" Which syntax file you want to edit? "), D_NORMAL, 2, + _("Which syntax file you want to edit?"), D_NORMAL, 2, _("&User"), _("&System Wide")); } @@ -1034,9 +1033,9 @@ edit_load_menu_file (WEdit * edit) char *menufile; int dir = 0; - dir = query_dialog (_(" Menu edit "), - _(" Which menu file do you want to edit? "), D_NORMAL, - geteuid ()? 2 : 3, _("&Local"), _("&User"), _("&System Wide")); + dir = query_dialog (_("Menu edit"), + _("Which menu file do you want to edit?"), D_NORMAL, + geteuid () != 0 ? 2 : 3, _("&Local"), _("&User"), _("&System Wide")); menufile = concat_dir_and_file (mc_home, EDIT_GLOBAL_MENU); @@ -1087,8 +1086,8 @@ edit_load_cmd (WEdit * edit, edit_current_file_t what) if (edit->modified && (edit_query_dialog2 (_("Warning"), - _(" Current text was modified without a file save. \n" - " Continue discards these changes. "), _("C&ontinue"), _("&Cancel")) == 1)) + _("Current text was modified without a file save.\n" + "Continue discards these changes"), _("C&ontinue"), _("&Cancel")) == 1)) { edit->force |= REDRAW_COMPLETELY; return 0; @@ -1097,7 +1096,7 @@ edit_load_cmd (WEdit * edit, edit_current_file_t what) switch (what) { case EDIT_FILE_COMMON: - exp = input_expand_dialog (_(" Load "), _(" Enter file name: "), + exp = input_expand_dialog (_("Load"), _("Enter file name:"), MC_HISTORY_EDIT_LOAD, edit->filename); if (exp) @@ -1374,7 +1373,7 @@ edit_block_move_cmd (WEdit * edit) if (edit_query_dialog2 (_("Warning"), _ - (" Block is large, you may not be able to undo this action. "), + ("Block is large, you may not be able to undo this action"), _("C&ontinue"), _("&Cancel"))) return; @@ -1496,7 +1495,7 @@ edit_block_delete (WEdit * edit) if (edit_query_dialog2 (_("Warning"), _ - (" Block is large, you may not be able to undo this action. "), + ("Block is large, you may not be able to undo this action"), _("C&ontinue"), _("&Cancel"))) { return 1; @@ -1579,7 +1578,7 @@ editcmd_find (WEdit * edit, gsize * len) if (mark_res != 0) { edit->search->error = MC_SEARCH_E_NOTFOUND; - edit->search->error_str = g_strdup (_(" Search string not found ")); + edit->search->error_str = g_strdup (_("Search string not found")); return FALSE; } if (edit_search_options.backwards) @@ -1619,7 +1618,7 @@ editcmd_find (WEdit * edit, gsize * len) } search_start--; } - edit->search->error_str = g_strdup (_(" Search string not found ")); + edit->search->error_str = g_strdup (_("Search string not found")); } else { @@ -1866,7 +1865,7 @@ edit_replace_cmd (WEdit * edit, int again) } else { - const char *msg = _(" Replace "); + const char *msg = _("Replace"); /* try and find from right here for next search */ edit->search_start = edit->curs1; edit_update_curs_col (edit); @@ -1875,10 +1874,10 @@ edit_replace_cmd (WEdit * edit, int again) edit_render_keypress (edit); if (times_replaced) { - message (D_NORMAL, msg, _(" %ld replacements made. "), times_replaced); + message (D_NORMAL, msg, _("%ld replacements made"), times_replaced); } else - query_dialog (msg, _(" Search string not found "), D_NORMAL, 1, _("&OK")); + query_dialog (msg, _("Search string not found"), D_NORMAL, 1, _("&OK")); edit->replace_mode = -1; } } @@ -2048,7 +2047,7 @@ edit_ok_to_exit (WEdit * edit) return 0; switch (edit_query_dialog3 - (_("Quit"), _(" File was modified, Save with exit? "), + (_("Quit"), _("File was modified, save with exit?"), _("&Cancel quit"), _("&Yes"), _("&No"))) { case 1: @@ -2171,7 +2170,7 @@ void edit_paste_from_history (WEdit * edit) { (void) edit; - edit_error_dialog (_(" Error "), _(" This function is not implemented. ")); + edit_error_dialog (_("Error"), _("This function is not implemented")); } int @@ -2182,8 +2181,8 @@ edit_copy_to_X_buf_cmd (WEdit * edit) return 0; if (!edit_save_block_to_clip_file (edit, start_mark, end_mark)) { - edit_error_dialog (_(" Copy to clipboard "), - get_sys_error (_(" Unable to save to file. "))); + edit_error_dialog (_("Copy to clipboard"), + get_sys_error (_("Unable to save to file"))); return 1; } edit_mark_cmd (edit, 1); @@ -2198,7 +2197,7 @@ edit_cut_to_X_buf_cmd (WEdit * edit) return 0; if (!edit_save_block_to_clip_file (edit, start_mark, end_mark)) { - edit_error_dialog (_(" Cut to clipboard "), _(" Unable to save to file. ")); + edit_error_dialog (_("Cut to clipboard"), _("Unable to save to file")); return 1; } edit_block_delete_cmd (edit); @@ -2230,7 +2229,7 @@ edit_goto_cmd (WEdit * edit) char s[32]; g_snprintf (s, sizeof (s), "%ld", line); - f = input_dialog (_(" Goto line "), _(" Enter line: "), MC_HISTORY_EDIT_GOTO_LINE, + f = input_dialog (_("Goto line"), _("Enter line:"), MC_HISTORY_EDIT_GOTO_LINE, line ? s : ""); if (!f) return; @@ -2270,7 +2269,7 @@ edit_save_block_cmd (WEdit * edit) tmp = concat_dir_and_file (home_dir, EDIT_CLIP_FILE); exp = - input_expand_dialog (_(" Save Block "), _(" Enter file name: "), + input_expand_dialog (_("Save block"), _("Enter file name:"), MC_HISTORY_EDIT_SAVE_BLOCK, tmp); g_free (tmp); edit_push_action (edit, KEY_PRESS + edit->start_display); @@ -2292,7 +2291,7 @@ edit_save_block_cmd (WEdit * edit) else { g_free (exp); - edit_error_dialog (_(" Save Block "), get_sys_error (_(" Cannot save file. "))); + edit_error_dialog (_("Save block"), get_sys_error (_("Cannot save file"))); } } } @@ -2309,7 +2308,7 @@ edit_insert_file_cmd (WEdit * edit) char *exp; tmp = concat_dir_and_file (home_dir, EDIT_CLIP_FILE); - exp = input_expand_dialog (_(" Insert File "), _(" Enter file name: "), + exp = input_expand_dialog (_("Insert file"), _("Enter file name:"), MC_HISTORY_EDIT_INSERT_FILE, tmp); g_free (tmp); edit_push_action (edit, KEY_PRESS + edit->start_display); @@ -2331,7 +2330,7 @@ edit_insert_file_cmd (WEdit * edit) else { g_free (exp); - edit_error_dialog (_(" Insert File "), get_sys_error (_(" Cannot insert file. "))); + edit_error_dialog (_("Insert file"), get_sys_error (_("Cannot insert file"))); } } } @@ -2350,7 +2349,7 @@ edit_sort_cmd (WEdit * edit) if (eval_marks (edit, &start_mark, &end_mark)) { - edit_error_dialog (_(" Sort block "), _(" You must first highlight a block of text. ")); + edit_error_dialog (_("Sort block"), _("You must first highlight a block of text")); return 0; } @@ -2358,8 +2357,8 @@ edit_sort_cmd (WEdit * edit) edit_save_block (edit, tmp, start_mark, end_mark); g_free (tmp); - exp = input_dialog (_(" Run Sort "), - _(" Enter sort options (see manpage) separated by whitespace: "), + exp = input_dialog (_("Run sort"), + _("Enter sort options (see manpage) separated by whitespace:"), MC_HISTORY_EDIT_SORT, (old != NULL) ? old : ""); if (!exp) @@ -2374,14 +2373,14 @@ edit_sort_cmd (WEdit * edit) { if (e == -1 || e == 127) { - edit_error_dialog (_(" Sort "), get_sys_error (_(" Cannot execute sort command "))); + edit_error_dialog (_("Sort"), get_sys_error (_("Cannot execute sort command"))); } else { char q[8]; sprintf (q, "%d ", e); - tmp = g_strconcat (_(" Sort returned non-zero: "), q, (char *) NULL); - edit_error_dialog (_(" Sort "), tmp); + tmp = g_strdup_printf (_("Sort returned non-zero: %s"), q); + edit_error_dialog (_("Sort"), tmp); g_free (tmp); } return -1; @@ -2502,7 +2501,7 @@ edit_block_process_cmd (WEdit * edit, const char *shell_cmd, int block) if (eval_marks (edit, &start_mark, &end_mark)) { edit_error_dialog (_("Process block"), - _(" You must first highlight a block of text. ")); + _("You must first highlight a block of text")); goto edit_block_process_cmd__EXIT; } edit_save_block (edit, b, start_mark, end_mark); @@ -2620,18 +2619,18 @@ edit_mail_dialog (WEdit * edit) /* 0 */ QUICK_BUTTON (6, 10, 9, MAIL_DLG_HEIGHT, N_("&Cancel"), B_CANCEL, NULL), /* 1 */ QUICK_BUTTON (2, 10, 9, MAIL_DLG_HEIGHT, N_("&OK"), B_ENTER, NULL), /* 2 */ QUICK_INPUT (3, 50, 8, MAIL_DLG_HEIGHT, "", 44, 0, "mail-dlg-input", &tmail_cc), - /* 3 */ QUICK_LABEL (2, 50, 7, MAIL_DLG_HEIGHT, N_(" Copies to")), + /* 3 */ QUICK_LABEL (3, 50, 7, MAIL_DLG_HEIGHT, N_("Copies to")), /* 4 */ QUICK_INPUT (3, 50, 6, MAIL_DLG_HEIGHT, "", 44, 0, "mail-dlg-input-2", &tmail_subject), - /* 5 */ QUICK_LABEL (2, 50, 5, MAIL_DLG_HEIGHT, N_(" Subject")), + /* 5 */ QUICK_LABEL (3, 50, 5, MAIL_DLG_HEIGHT, N_("Subject")), /* 6 */ QUICK_INPUT (3, 50, 4, MAIL_DLG_HEIGHT, "", 44, 0, "mail-dlg-input-3", &tmail_to), - /* 7 */ QUICK_LABEL (2, 50, 3, MAIL_DLG_HEIGHT, N_(" To")), - /* 8 */ QUICK_LABEL (2, 50, 2, MAIL_DLG_HEIGHT, N_(" mail -s -c ")), + /* 7 */ QUICK_LABEL (3, 50, 3, MAIL_DLG_HEIGHT, N_("To")), + /* 8 */ QUICK_LABEL (3, 50, 2, MAIL_DLG_HEIGHT, N_("mail -s -c ")), QUICK_END }; QuickDialog Quick_input = { - 50, MAIL_DLG_HEIGHT, -1, -1, N_(" Mail "), + 50, MAIL_DLG_HEIGHT, -1, -1, N_("Mail"), "[Input Line Keys]", quick_widgets, FALSE }; @@ -2893,8 +2892,8 @@ edit_select_codepage_cmd (WEdit * edit) void edit_insert_literal_cmd (WEdit * edit) { - int char_for_insertion = editcmd_dialog_raw_key_query (_(" Insert Literal "), - _(" Press any key: "), 0); + int char_for_insertion = editcmd_dialog_raw_key_query (_("Insert literal"), + _("Press any key:"), 0); edit_execute_key_command (edit, -1, ascii_alpha_to_cntrl (char_for_insertion)); } @@ -2902,7 +2901,7 @@ void edit_execute_macro_cmd (WEdit * edit) { int command = - CK_Macro (editcmd_dialog_raw_key_query (_(" Execute Macro "), _(" Press macro hotkey: "), + CK_Macro (editcmd_dialog_raw_key_query (_("Execute macro"), _("Press macro hotkey:"), 1)); if (command == CK_Macro (0)) command = CK_Insert_Char; @@ -2928,8 +2927,8 @@ edit_load_forward_cmd (WEdit * edit) { if (edit_query_dialog2 (_("Warning"), - _(" Current text was modified without a file save. \n" - " Continue discards these changes. "), _("C&ontinue"), _("&Cancel"))) + _("Current text was modified without a file save\n" + "Continue discards these changes"), _("C&ontinue"), _("&Cancel"))) { edit->force |= REDRAW_COMPLETELY; return 0; @@ -2966,8 +2965,8 @@ edit_load_back_cmd (WEdit * edit) { if (edit_query_dialog2 (_("Warning"), - _(" Current text was modified without a file save. \n" - " Continue discards these changes. "), _("C&ontinue"), _("&Cancel"))) + _("Current text was modified without a file save\n" + "Continue discards these changes"), _("C&ontinue"), _("&Cancel"))) { edit->force |= REDRAW_COMPLETELY; return 0; diff --git a/src/editor/editcmd_dialogs.c b/src/editor/editcmd_dialogs.c index 7d8843d21..0530f5626 100644 --- a/src/editor/editcmd_dialogs.c +++ b/src/editor/editcmd_dialogs.c @@ -123,13 +123,13 @@ editcmd_dialog_replace_show (WEdit * edit, const char *search_default, const cha /* 7 */ QUICK_RADIO (3, REPLACE_DLG_WIDTH, 7, REPLACE_DLG_HEIGHT, num_of_types, (const char **) list_of_types, (int *) &edit_search_options.type), - /* 8 */ QUICK_LABEL (2, REPLACE_DLG_WIDTH, 4, REPLACE_DLG_HEIGHT, - N_(" Enter replacement string:")), + /* 8 */ QUICK_LABEL (3, REPLACE_DLG_WIDTH, 4, REPLACE_DLG_HEIGHT, + N_("Enter replacement string:")), /* 9 */ QUICK_INPUT (3, REPLACE_DLG_WIDTH, 5, REPLACE_DLG_HEIGHT, replace_default, REPLACE_DLG_WIDTH - 6, 0, "replace", replace_text), - /* 10 */ QUICK_LABEL (2, REPLACE_DLG_WIDTH, 2, REPLACE_DLG_HEIGHT, - N_(" Enter search string:")), + /* 10 */ QUICK_LABEL (3, REPLACE_DLG_WIDTH, 2, REPLACE_DLG_HEIGHT, + N_("Enter search string:")), /* 11 */ QUICK_INPUT (3, REPLACE_DLG_WIDTH, 3, REPLACE_DLG_HEIGHT, search_default, REPLACE_DLG_WIDTH - 6, 0, MC_HISTORY_SHARED_SEARCH, search_text), @@ -137,7 +137,7 @@ editcmd_dialog_replace_show (WEdit * edit, const char *search_default, const cha }; QuickDialog Quick_input = { - REPLACE_DLG_WIDTH, REPLACE_DLG_HEIGHT, -1, -1, N_(" Replace "), + REPLACE_DLG_WIDTH, REPLACE_DLG_HEIGHT, -1, -1, N_("Replace"), "[Input Line Keys]", quick_widgets, FALSE }; @@ -206,7 +206,7 @@ editcmd_dialog_search_show (WEdit * edit, char **search_text) *search_text, SEARCH_DLG_WIDTH - 6, 0, MC_HISTORY_SHARED_SEARCH, search_text), /* 10 */ - QUICK_LABEL (2, SEARCH_DLG_WIDTH, 2, SEARCH_DLG_HEIGHT, N_(" Enter search string:")), + QUICK_LABEL (3, SEARCH_DLG_WIDTH, 2, SEARCH_DLG_HEIGHT, N_("Enter search string:")), QUICK_END }; @@ -495,8 +495,8 @@ editcmd_dialog_select_definition_show (WEdit * edit, char *match_expr, int max_l { if (!edit_query_dialog2 (_("Warning"), - _(" Current text was modified without a file save. \n" - " Continue discards these changes. "), _("C&ontinue"), _("&Cancel"))) + _("Current text was modified without a file save.\n" + "Continue discards these changes."), _("C&ontinue"), _("&Cancel"))) { edit->force |= REDRAW_COMPLETELY; do_moveto = 1; @@ -567,7 +567,7 @@ editcmd_dialog_replace_prompt_show (WEdit * edit, char *from_text, char *to_text /* 2 */ QUICK_BUTTON (21, dlg_width, 6, dlg_height, N_("A&ll"), B_REPLACE_ALL, NULL), /* 3 */ QUICK_BUTTON (4, dlg_width, 6, dlg_height, N_("&Replace"), B_ENTER, NULL), /* 4 */ QUICK_LABEL (3, dlg_width, 2, dlg_height, NULL), - /* 5 */ QUICK_LABEL (2, dlg_width, 3, dlg_height, N_(" Replace with: ")), + /* 5 */ QUICK_LABEL (3, dlg_width, 3, dlg_height, N_("Replace with:")), /* 6 */ QUICK_LABEL (3, dlg_width, 4, dlg_height, NULL), QUICK_END }; @@ -594,10 +594,10 @@ editcmd_dialog_replace_prompt_show (WEdit * edit, char *from_text, char *to_text for (i = 0; i < 7; i++) quick_widgets[i].x_divisions = dlg_width; - g_snprintf (tmp, sizeof (tmp), " '%s'", from_text); + g_snprintf (tmp, sizeof (tmp), "\"%s\"", from_text); repl_from = g_strdup (str_fit_to_term (tmp, dlg_width - 7, J_LEFT)); - g_snprintf (tmp, sizeof (tmp), " '%s'", to_text); + g_snprintf (tmp, sizeof (tmp), "\"%s\"", to_text); repl_to = g_strdup (str_fit_to_term (tmp, dlg_width - 7, J_LEFT)); quick_widgets[4].u.label.text = repl_from; @@ -611,7 +611,7 @@ editcmd_dialog_replace_prompt_show (WEdit * edit, char *from_text, char *to_text { QuickDialog Quick_input = { - dlg_width, dlg_height, 0, 0, N_(" Confirm replace "), + dlg_width, dlg_height, 0, 0, N_("Confirm replace"), "[Input Line Keys]", quick_widgets, FALSE }; diff --git a/src/editor/editlock.c b/src/editor/editlock.c index 27d4b9951..7447290ec 100644 --- a/src/editor/editlock.c +++ b/src/editor/editlock.c @@ -195,7 +195,7 @@ edit_lock_file (const char *fname) || !(kill (lockinfo->pid, 0) == -1 && errno == ESRCH)) { msg = g_strdup_printf (_ - ("File \"%s\" is already being edited\n" + ("File \"%s\" is already being edited.\n" "User: %s\nProcess ID: %d"), x_basename (lockfname) + 2, lockinfo->who, (int) lockinfo->pid); /* TODO: Implement "Abort" - needs to rewind undo stack */ diff --git a/src/editor/editmenu.c b/src/editor/editmenu.c index a55f4d48a..57dc1ee58 100644 --- a/src/editor/editmenu.c +++ b/src/editor/editmenu.c @@ -186,7 +186,7 @@ create_options_menu (void) { GList *entries = NULL; - entries = g_list_append (entries, menu_entry_create (_("&General... "), CK_Edit_Options)); + entries = g_list_append (entries, menu_entry_create (_("&General..."), CK_Edit_Options)); entries = g_list_append (entries, menu_entry_create (_("Save &mode..."), CK_Edit_Save_Mode)); entries = g_list_append (entries, menu_entry_create (_("Learn &keys..."), CK_LearnKeys)); entries = diff --git a/src/editor/editoptions.c b/src/editor/editoptions.c index 1cb80e59d..ca550ca7d 100644 --- a/src/editor/editoptions.c +++ b/src/editor/editoptions.c @@ -73,7 +73,7 @@ edit_options_dialog (WEdit *edit) /* 0 */ QUICK_BUTTON (6, 10, OPT_DLG_H - 3, OPT_DLG_H, N_("&Cancel"), B_CANCEL, NULL), /* 1 */ QUICK_BUTTON (2, 10, OPT_DLG_H - 3, OPT_DLG_H, N_("&OK"), B_ENTER, NULL), /* 2 */ QUICK_LABEL (OPT_DLG_W / 2 + 1, OPT_DLG_W, 11, OPT_DLG_H, - N_("Word wrap line length: ")), + N_("Word wrap line length:")), /* 3 */ QUICK_INPUT (OPT_DLG_W / 2 + 25, OPT_DLG_W, 11, OPT_DLG_H, wrap_length, OPT_DLG_W / 2 - 4 - 24, 0, "edit-word-wrap", &p), /* 4 */ QUICK_CHECKBOX (OPT_DLG_W / 2 + 1, OPT_DLG_W, 10, OPT_DLG_H, @@ -92,7 +92,7 @@ edit_options_dialog (WEdit *edit) N_("Confir&m before saving"), &edit_confirm_save), /* 11 */ QUICK_CHECKBOX (OPT_DLG_W / 2 + 1, OPT_DLG_W, 3, OPT_DLG_H, N_("&Return does autoindent"), &option_return_does_auto_indent), - /* 12 */ QUICK_LABEL (3, OPT_DLG_W, 11, OPT_DLG_H, N_("Tab spacing: ")), + /* 12 */ QUICK_LABEL (3, OPT_DLG_W, 11, OPT_DLG_H, N_("Tab spacing:")), /* 13 */ QUICK_INPUT (3 + 24, OPT_DLG_W, 11, OPT_DLG_H, tab_spacing, OPT_DLG_W / 2 - 4 - 24, 0, "edit-tab-spacing", &q), /* 14 */ QUICK_CHECKBOX (3, OPT_DLG_W, 10, OPT_DLG_H, @@ -108,7 +108,7 @@ edit_options_dialog (WEdit *edit) QuickDialog Quick_options = { - OPT_DLG_W, OPT_DLG_H, -1, -1, N_(" Editor options "), + OPT_DLG_W, OPT_DLG_H, -1, -1, N_("Editor options"), "[Editor options]", quick_widgets, FALSE }; diff --git a/src/editor/syntax.c b/src/editor/syntax.c index 618bc5c41..a3f24b534 100644 --- a/src/editor/syntax.c +++ b/src/editor/syntax.c @@ -1400,14 +1400,14 @@ edit_load_syntax (WEdit * edit, char ***pnames, const char *type) if (r == -1) { edit_free_syntax_rules (edit); - message (D_ERROR, _(" Load syntax file "), - _(" Cannot open file %s \n %s "), f, unix_error_string (errno)); + message (D_ERROR, _("Load syntax file"), + _("Cannot open file %s\n%s"), f, unix_error_string (errno)); } else if (r != 0) { edit_free_syntax_rules (edit); - message (D_ERROR, _(" Load syntax file "), - _(" Error in file %s on line %d "), error_file_name ? error_file_name : f, r); + message (D_ERROR, _("Load syntax file"), + _("Error in file %s on line %d"), error_file_name ? error_file_name : f, r); MC_PTR_FREE (error_file_name); } diff --git a/src/execute.c b/src/execute.c index 507109db2..9fcbadb27 100644 --- a/src/execute.c +++ b/src/execute.c @@ -105,10 +105,10 @@ do_possible_cd (const char *new_dir) { if (!do_cd (new_dir, cd_exact)) message (D_ERROR, _("Warning"), - _(" The Commander can't change to the directory that \n" - " the subshell claims you are in. Perhaps you have \n" - " deleted your working directory, or given yourself \n" - " extra access permissions with the \"su\" command? ")); + _("The Commander can't change to the directory that\n" + "the subshell claims you are in. Perhaps you have\n" + "deleted your working directory, or given yourself\n" + "extra access permissions with the \"su\" command?")); } #endif /* HAVE_SUBSHELL_SUPPORT */ @@ -226,7 +226,7 @@ shell_execute (const char *command, int flags) if (subshell_state == INACTIVE) do_execute (shell, cmd ? cmd : command, flags | EXECUTE_AS_SHELL); else - message (D_ERROR, MSG_ERROR, _(" The shell is already running a command ")); + message (D_ERROR, MSG_ERROR, _("The shell is already running a command")); else #endif /* HAVE_SUBSHELL_SUPPORT */ do_execute (shell, cmd ? cmd : command, flags | EXECUTE_AS_SHELL); @@ -401,7 +401,7 @@ execute_with_vfs_arg (const char *command, const char *filename) localcopy = mc_getlocalcopy (filename); if (localcopy == NULL) { - message (D_ERROR, MSG_ERROR, _(" Cannot fetch a local copy of %s "), filename); + message (D_ERROR, MSG_ERROR, _("Cannot fetch a local copy of %s"), filename); return; } diff --git a/src/ext.c b/src/ext.c index 00fba855b..16183d6da 100644 --- a/src/ext.c +++ b/src/ext.c @@ -116,7 +116,7 @@ exec_extension (const char *filename, const char *lc_data, int *move_dir, int st if (cmd_file_fd == -1) { message (D_ERROR, MSG_ERROR, - _(" Cannot create temporary command file \n %s "), unix_error_string (errno)); + _("Cannot create temporary command file\n%s"), unix_error_string (errno)); return; } @@ -134,7 +134,7 @@ exec_extension (const char *filename, const char *lc_data, int *move_dir, int st parameter_found = 0; parameter = - input_dialog (_(" Parameter "), lc_prompt, MC_HISTORY_EXT_PARAMETER, ""); + input_dialog (_("Parameter"), lc_prompt, MC_HISTORY_EXT_PARAMETER, ""); if (parameter == NULL) { /* User canceled */ @@ -626,8 +626,8 @@ regex_command (const char *filename, const char *action, int *move_dir) char *title = g_strdup_printf (_(" %s%s file error"), mc_home, MC_LIB_EXT); message (D_ERROR, title, _("The format of the %smc.ext " - "file has changed with version 3.0. It seems that " - "the installation failed. Please fetch a fresh " + "file has changed with version 3.0. It seems that " + "the installation failed. Please fetch a fresh " "copy from the Midnight Commander package."), mc_home); g_free (title); @@ -638,12 +638,12 @@ regex_command (const char *filename, const char *action, int *move_dir) if (home_error) { char *title = - g_strdup_printf (_(" ~/%s file error "), + g_strdup_printf (_("~/%s file error"), MC_USERCONF_DIR PATH_SEP_STR MC_FILEBIND_FILE); message (D_ERROR, title, _("The format of the ~/%s file has " - "changed with version 3.0. You may either want to copy " - "it from %smc.ext or use that file as an example of how " "to write it."), + "changed with version 3.0. You may either want to copy " + "it from %smc.ext or use that file as an example of how to write it."), MC_USERCONF_DIR PATH_SEP_STR MC_FILEBIND_FILE, mc_home); g_free (title); } diff --git a/src/file.c b/src/file.c index 80fb58b1a..dcd85aef4 100644 --- a/src/file.c +++ b/src/file.c @@ -245,7 +245,7 @@ check_hardlinks (const char *src_name, const char *dst_name, struct stat *pstat) } } } - message (D_ERROR, MSG_ERROR, _(" Cannot make the hardlink ")); + message (D_ERROR, MSG_ERROR, _("Cannot make the hardlink")); return 0; } lp = (struct link *) g_try_malloc (sizeof (struct link) + strlen (src_name) @@ -287,7 +287,7 @@ make_symlink (FileOpContext * ctx, const char *src_path, const char *dst_path) len = mc_readlink (src_path, link_target, MC_MAXPATHLEN - 1); if (len < 0) { - return_status = file_error (_(" Cannot read source link \"%s\" \n %s "), src_path); + return_status = file_error (_("Cannot read source link \"%s\"\n%s"), src_path); if (return_status == FILE_RETRY) goto retry_src_readlink; return return_status; @@ -298,8 +298,8 @@ make_symlink (FileOpContext * ctx, const char *src_path, const char *dst_path) if (!vfs_file_is_local (src_path) || !vfs_file_is_local (dst_path)) { message (D_ERROR, MSG_ERROR, - _(" Cannot make stable symlinks across " - "non-local filesystems: \n\n" " Option Stable Symlinks will be disabled ")); + _("Cannot make stable symlinks across" + "non-local filesystems:\n\nOption Stable Symlinks will be disabled")); ctx->stable_symlinks = FALSE; } @@ -351,7 +351,7 @@ make_symlink (FileOpContext * ctx, const char *src_path, const char *dst_path) /* Success */ return FILE_CONT; } - return_status = file_error (_(" Cannot create target symlink \"%s\" \n %s "), dst_path); + return_status = file_error (_("Cannot create target symlink \"%s\"\n%s"), dst_path); if (return_status == FILE_RETRY) goto retry_dst_symlink; return return_status; @@ -399,7 +399,7 @@ real_warn_same_file (enum OperationMode mode, const char *fmt, const char *a, co int result = 0; const char *head_msg; - head_msg = mode == Foreground ? MSG_ERROR : _(" Background process error "); + head_msg = mode == Foreground ? MSG_ERROR : _("Background process error"); msg = g_strdup_printf (fmt, a, b); result = query_dialog (head_msg, msg, D_ERROR, 2, _("&Skip"), _("&Abort")); @@ -520,7 +520,7 @@ copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, { if (S_ISDIR (sb2.st_mode)) { - return_status = file_error (_(" Cannot overwrite directory \"%s\" \n %s "), dst_path); + return_status = file_error (_("Cannot overwrite directory\"%s\"\n%s"), dst_path); if (return_status == FILE_RETRY) continue; return return_status; @@ -531,7 +531,7 @@ copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, while ((*ctx->stat_func) (src_path, &sb)) { - return_status = file_error (_(" Cannot stat source file \"%s\" \n %s "), src_path); + return_status = file_error (_("Cannot stat source file \"%s\"\n%s"), src_path); if (return_status != FILE_RETRY) return return_status; } @@ -540,7 +540,7 @@ copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, { /* Destination already exists */ if (sb.st_dev == sb2.st_dev && sb.st_ino == sb2.st_ino) - return warn_same_file (_(" `%s' \n and \n `%s' \n are the same file "), + return warn_same_file (_("\"%s\"\nand\n\"%s\"\nare the same file"), src_path, dst_path); /* Should we replace destination? */ if (tctx->ask_overwrite) @@ -570,7 +570,7 @@ copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, while (mc_mknod (dst_path, sb.st_mode & ctx->umask_kill, sb.st_rdev) < 0) { return_status = - file_error (_(" Cannot create special file \"%s\" \n %s "), dst_path); + file_error (_("Cannot create special file \"%s\"\n%s"), dst_path); if (return_status == FILE_RETRY) continue; return return_status; @@ -579,14 +579,14 @@ copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, while (ctx->preserve_uidgid && mc_chown (dst_path, sb.st_uid, sb.st_gid)) { - temp_status = file_error (_(" Cannot chown target file \"%s\" \n %s "), dst_path); + temp_status = file_error (_("Cannot chown target file \"%s\"\n%s"), dst_path); if (temp_status == FILE_RETRY) continue; return temp_status; } while (ctx->preserve && mc_chmod (dst_path, sb.st_mode & ctx->umask_kill)) { - temp_status = file_error (_(" Cannot chmod target file \"%s\" \n %s "), dst_path); + temp_status = file_error (_("Cannot chmod target file \"%s\"\n%s"), dst_path); if (temp_status == FILE_RETRY) continue; return temp_status; @@ -599,7 +599,7 @@ copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, while ((src_desc = mc_open (src_path, O_RDONLY | O_LINEAR)) < 0) { - return_status = file_error (_(" Cannot open source file \"%s\" \n %s "), src_path); + return_status = file_error (_("Cannot open source file \"%s\"\n%s"), src_path); if (return_status == FILE_RETRY) continue; ctx->do_append = 0; @@ -610,7 +610,7 @@ copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, { if (mc_lseek (src_desc, ctx->do_reget, SEEK_SET) != ctx->do_reget) { - message (D_ERROR, _("Warning"), _(" Reget failed, about to overwrite file ")); + message (D_ERROR, _("Warning"), _("Reget failed, about to overwrite file")); ctx->do_reget = 0; ctx->do_append = FALSE; } @@ -618,7 +618,7 @@ copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, while (mc_fstat (src_desc, &sb)) { - return_status = file_error (_(" Cannot fstat source file \"%s\" \n %s "), src_path); + return_status = file_error (_("Cannot fstat source file \"%s\"\n%s"), src_path); if (return_status == FILE_RETRY) continue; ctx->do_append = FALSE; @@ -649,7 +649,7 @@ copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, if (errno == EEXIST) goto ret; - return_status = file_error (_(" Cannot create target file \"%s\" \n %s "), dst_path); + return_status = file_error (_("Cannot create target file \"%s\"\n%s"), dst_path); if (return_status == FILE_RETRY) continue; ctx->do_append = FALSE; @@ -663,7 +663,7 @@ copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, /* Find out the optimal buffer size. */ while (mc_fstat (dest_desc, &sb)) { - return_status = file_error (_(" Cannot fstat target file \"%s\" \n %s "), dst_path); + return_status = file_error (_("Cannot fstat target file \"%s\"\n%s"), dst_path); if (return_status == FILE_RETRY) continue; goto ret; @@ -700,7 +700,7 @@ copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, while ((n_read = mc_read (src_desc, buf, sizeof (buf))) < 0) { return_status = - file_error (_(" Cannot read source file \"%s\" \n %s "), src_path); + file_error (_("Cannot read source file\"%s\"\n%s"), src_path); if (return_status == FILE_RETRY) continue; goto ret; @@ -733,7 +733,7 @@ copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, continue; } return_status = - file_error (_(" Cannot write target file \"%s\" \n %s "), dst_path); + file_error (_("Cannot write target file \"%s\"\n%s"), dst_path); if (return_status != FILE_RETRY) goto ret; } @@ -784,7 +784,7 @@ copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, ret: while (src_desc != -1 && mc_close (src_desc) < 0) { - temp_status = file_error (_(" Cannot close source file \"%s\" \n %s "), src_path); + temp_status = file_error (_("Cannot close source file \"%s\"\n%s"), src_path); if (temp_status == FILE_RETRY) continue; if (temp_status == FILE_ABORT) @@ -794,7 +794,7 @@ copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, while (dest_desc != -1 && mc_close (dest_desc) < 0) { - temp_status = file_error (_(" Cannot close target file \"%s\" \n %s "), dst_path); + temp_status = file_error (_("Cannot close target file \"%s\"\n%s"), dst_path); if (temp_status == FILE_RETRY) continue; return_status = temp_status; @@ -818,7 +818,7 @@ copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, { while (mc_chown (dst_path, src_uid, src_gid)) { - temp_status = file_error (_(" Cannot chown target file \"%s\" \n %s "), dst_path); + temp_status = file_error (_("Cannot chown target file \"%s\"\n%s"), dst_path); if (temp_status == FILE_RETRY) continue; return_status = temp_status; @@ -833,7 +833,7 @@ copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, while (mc_chmod (dst_path, (src_mode & ctx->umask_kill))) { temp_status = - file_error (_(" Cannot chmod target file \"%s\" \n %s "), dst_path); + file_error (_("Cannot chmod target file \"%s\"\n%s"), dst_path); if (temp_status != FILE_RETRY) { return_status = temp_status; @@ -883,7 +883,7 @@ copy_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, con retry_src_stat: if ((*ctx->stat_func) (s, &cbuf)) { - return_status = file_error (_(" Cannot stat source directory \"%s\" \n %s "), s); + return_status = file_error (_("Cannot stat source directory \"%s\"\n%s"), s); if (return_status == FILE_RETRY) goto retry_src_stat; goto ret_fast; @@ -910,7 +910,7 @@ copy_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, con if (!S_ISDIR (cbuf.st_mode)) { - return_status = file_error (_(" Source \"%s\" is not a directory \n %s "), s); + return_status = file_error (_("Source \"%s\" is not a directory\n%s"), s); if (return_status == FILE_RETRY) goto retry_src_stat; goto ret_fast; @@ -919,7 +919,7 @@ copy_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, con if (is_in_linklist (parent_dirs, s, &cbuf)) { /* we found a cyclic symbolic link */ - message (D_ERROR, MSG_ERROR, _(" Cannot copy cyclic symbolic link \n `%s' "), s); + message (D_ERROR, MSG_ERROR, _("Cannot copy cyclic symbolic link\n\"%s\""), s); return_status = FILE_SKIP; goto ret_fast; } @@ -959,7 +959,7 @@ copy_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, con */ if (!S_ISDIR (buf.st_mode)) { - return_status = file_error (_(" Destination \"%s\" must be a directory \n %s "), d); + return_status = file_error (_("Destination \"%s\" must be a directory\n%s"), d); if (return_status == FILE_RETRY) goto retry_dst_stat; goto ret; @@ -978,7 +978,7 @@ copy_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, con } while (my_mkdir (dest_dir, (cbuf.st_mode & ctx->umask_kill) | S_IRWXU)) { - return_status = file_error (_(" Cannot create target directory \"%s\" \n %s "), dest_dir); + return_status = file_error (_("Cannot create target directory \"%s\"\n%s"), dest_dir); if (return_status != FILE_RETRY) goto ret; } @@ -996,7 +996,7 @@ copy_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, con while (mc_chown (dest_dir, cbuf.st_uid, cbuf.st_gid)) { return_status = - file_error (_(" Cannot chown target directory \"%s\" \n %s "), dest_dir); + file_error (_("Cannot chown target directory \"%s\"\n%s"), dest_dir); if (return_status != FILE_RETRY) goto ret; } @@ -1123,7 +1123,7 @@ move_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, c while (mc_lstat (s, &src_stats) != 0) { /* Source doesn't exist */ - return_status = file_error (_(" Cannot stat file \"%s\" \n %s "), s); + return_status = file_error (_("Cannot stat file \"%s\"\n%s"), s); if (return_status != FILE_RETRY) return return_status; } @@ -1131,11 +1131,11 @@ move_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, c if (mc_lstat (d, &dst_stats) == 0) { if (src_stats.st_dev == dst_stats.st_dev && src_stats.st_ino == dst_stats.st_ino) - return warn_same_file (_(" `%s' \n and \n `%s' \n are the same file "), s, d); + return warn_same_file (_("\"%s\"\nand\n\"%s\"\nare the same file"), s, d); if (S_ISDIR (dst_stats.st_mode)) { - message (D_ERROR, MSG_ERROR, _(" Cannot overwrite directory `%s' "), d); + message (D_ERROR, MSG_ERROR, _("Cannot overwrite directory \"%s\""), d); do_refresh (); return FILE_SKIP; } @@ -1173,7 +1173,7 @@ move_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, c if (errno != EXDEV) { - return_status = files_error (_(" Cannot move file \"%s\" to \"%s\" \n %s "), s, d); + return_status = files_error (_("Cannot move file \"%s\" to \"%s\"\n%s"), s, d); if (return_status == FILE_RETRY) goto retry_rename; return return_status; @@ -1202,7 +1202,7 @@ move_file_file (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, c retry_src_remove: if (mc_unlink (s)) { - return_status = file_error (_(" Cannot remove file \"%s\" \n %s "), s); + return_status = file_error (_("Cannot remove file \"%s\"\n%s"), s); if (return_status == FILE_RETRY) goto retry_src_remove; return return_status; @@ -1235,7 +1235,7 @@ move_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, con dstat_ok = (mc_stat (d, &dbuf) == 0); if (dstat_ok && sbuf.st_dev == dbuf.st_dev && sbuf.st_ino == dbuf.st_ino) - return warn_same_file (_(" `%s' \n and \n `%s' \n are the same directory "), s, d); + return warn_same_file (_("\"%s\"\nand\n\"%s\"\nare the same directory"), s, d); if (!dstat_ok) destdir = g_strdup (d); /* destination doesn't exist */ @@ -1262,9 +1262,9 @@ move_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, con else { if (S_ISDIR (destbuf.st_mode)) - return_status = file_error (_(" Cannot overwrite directory \"%s\" %s "), destdir); + return_status = file_error (_("Cannot overwrite directory \"%s\"\n%s"), destdir); else - return_status = file_error (_(" Cannot overwrite file \"%s\" %s "), destdir); + return_status = file_error (_("Cannot overwrite file \"%s\"\n%s"), destdir); if (return_status == FILE_RETRY) goto retry_dst_stat; } @@ -1281,7 +1281,7 @@ move_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, con if (errno != EXDEV) { - return_status = files_error (_(" Cannot move directory \"%s\" to \"%s\" \n %s "), s, d); + return_status = files_error (_("Cannot move directory \"%s\" to \"%s\"\n%s"), s, d); if (return_status == FILE_RETRY) goto retry_rename; goto ret; @@ -1352,7 +1352,7 @@ erase_file (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, while (mc_unlink (s)) { - return_status = file_error (_(" Cannot delete file \"%s\" \n %s "), s); + return_status = file_error (_("Cannot delete file \"%s\"\n%s"), s); if (return_status != FILE_RETRY) return return_status; } @@ -1410,7 +1410,7 @@ recursive_erase (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s) while (my_rmdir (s)) { - return_status = file_error (_(" Cannot remove directory \"%s\" \n %s "), s); + return_status = file_error (_("Cannot remove directory \"%s\"\n%s"), s); if (return_status != FILE_RETRY) return return_status; } @@ -1479,7 +1479,7 @@ erase_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s) while (my_rmdir (s) == -1) { - error = file_error (_(" Cannot remove directory \"%s\" \n %s "), s); + error = file_error (_("Cannot remove directory \"%s\"\n%s"), s); if (error != FILE_RETRY) return error; } @@ -1508,7 +1508,7 @@ erase_dir_iff_empty (FileOpContext * ctx, const char *s) while (my_rmdir (s)) { - error = file_error (_(" Cannot remove directory \"%s\" \n %s "), s); + error = file_error (_("Cannot remove directory \"%s\"\n%s"), s); if (error != FILE_RETRY) return error; } @@ -1853,8 +1853,9 @@ static const char *prompt_parts[] = { N_("directory"), N_("directories"), N_("files/directories"), +/* TRANSLATORS: keep leading space here to split words in Copy/Move dialog */ N_(" with source mask:"), - N_(" to:") + N_("to:") }; static const char *question_format = N_("%s?"); @@ -2044,7 +2045,7 @@ panel_operate (void *source_panel, FileOperation operation, gboolean force_singl if (!strcmp (source, "..")) { - message (D_ERROR, MSG_ERROR, _(" Cannot operate on \"..\"! ")); + message (D_ERROR, MSG_ERROR, _("Cannot operate on \"..\"!")); return FALSE; } } @@ -2168,7 +2169,7 @@ panel_operate (void *source_panel, FileOperation operation, gboolean force_singl v = do_background (ctx, g_strconcat (op_names[operation], ": ", panel->cwd, (char *) NULL)); if (v == -1) - message (D_ERROR, MSG_ERROR, _(" Sorry, I could not put the job in background ")); + message (D_ERROR, MSG_ERROR, _("Sorry, I could not put the job in background")); /* If we are the parent */ if (v == 1) @@ -2282,7 +2283,7 @@ panel_operate (void *source_panel, FileOperation operation, gboolean force_singl if ((dst_result != 0) || S_ISDIR (dst_stat.st_mode)) break; - if (file_error (_(" Destination \"%s\" must be a directory \n %s "), + if (file_error (_("Destination \"%s\" must be a directory\n%s"), dest) != FILE_RETRY) goto clean_up; } @@ -2438,7 +2439,7 @@ real_do_file_error (enum OperationMode mode, const char *error) int result; const char *msg; - msg = mode == Foreground ? MSG_ERROR : _(" Background process error "); + msg = mode == Foreground ? MSG_ERROR : _("Background process error"); result = query_dialog (msg, error, D_ERROR, 3, _("&Skip"), _("&Retry"), _("&Abort")); switch (result) @@ -2492,10 +2493,9 @@ real_query_recursive (FileOpContext * ctx, enum OperationMode mode, const char * if (ctx->recursive_result < RECURSIVE_ALWAYS) { const char *msg = mode == Foreground - ? _("\n Directory not empty. \n" - " Delete it recursively? ") - : _("\n Background process: Directory not empty \n" " Delete it recursively? "); - text = g_strconcat (_(" Delete: "), path_trunc (s, 30), " ", (char *) NULL); + ? _("\nDirectory not empty.\nDelete it recursively?") + : _("\nBackground process: Directory not empty.\nDelete it recursively?"); + text = g_strconcat (_("Delete:"), " ", path_trunc (s, 30), (char *) NULL); if (safe_delete) query_set_sel (1); diff --git a/src/filegui.c b/src/filegui.c index eebb4138f..f8682f592 100644 --- a/src/filegui.c +++ b/src/filegui.c @@ -538,15 +538,13 @@ file_progress_show_total (FileOpTotalContext * tctx, FileOpContext * ctx, double file_eta_prepare_for_show (buffer3, tctx->eta_secs, TRUE); file_bps_prepare_for_show (buffer4, (long) tctx->bps); - - g_snprintf (buffer, BUF_TINY, _("Time: %s %s (%s)"), buffer2, buffer3, buffer4); label_set_text (ui->time_label, buffer); size_trunc_len (buffer2, 5, tctx->copyed_bytes, 0, panels_options.kilobyte_si); size_trunc_len (buffer3, 5, ctx->progress_bytes, 0, panels_options.kilobyte_si); - g_snprintf (buffer, BUF_TINY, _(" Total: %s of %s "), buffer2, buffer3); + g_snprintf (buffer, BUF_TINY, _("Total: %s of %s"), buffer2, buffer3); label_set_text (ui->total_bytes_label, buffer); @@ -716,9 +714,9 @@ overwrite_query_dialog (FileOpContext * ctx, enum OperationMode mode) widgets_len = g_new0 (int, num); if (mode == Foreground) - title = _(" File exists "); + title = _("File exists"); else - title = _(" Background process: File exists "); + title = _("Background process: File exists"); stripped_name_len = str_term_width1 (stripped_name); diff --git a/src/find.c b/src/find.c index 1eb65bb60..92dea5004 100644 --- a/src/find.c +++ b/src/find.c @@ -323,7 +323,7 @@ find_parm_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void if (!(file_pattern_cbox->state & C_BOOL) && (in_name->buffer[0] != '\0') && !find_check_regexp (in_name->buffer)) { - message (D_ERROR, MSG_ERROR, _(" Malformed regular expression ")); + message (D_ERROR, MSG_ERROR, _("Malformed regular expression")); dlg_select_widget (in_name); h->running = 1; /* Don't stop the dialog */ return MSG_HANDLED; @@ -333,7 +333,7 @@ find_parm_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void if ((content_regexp_cbox->state & C_BOOL) && (in_with->buffer[0] != '\0') && !find_check_regexp (in_with->buffer)) { - message (D_ERROR, MSG_ERROR, _(" Malformed regular expression ")); + message (D_ERROR, MSG_ERROR, _("Malformed regular expression")); dlg_select_widget (in_with); h->running = 1; /* Don't stop the dialog */ return MSG_HANDLED; diff --git a/src/help.c b/src/help.c index 9cf025cc1..c5c4a51d2 100644 --- a/src/help.c +++ b/src/help.c @@ -287,7 +287,7 @@ help_follow_link (const char *start, const char *lc_selected_item) } /* Create a replacement page with the error message */ - return _(" Help file format error\n"); + return _("Help file format error\n"); } static const char * @@ -319,7 +319,7 @@ start_link_area (int x, int y, const char *link_name) Link_Area *la; if (inside_link_area) - message (D_NORMAL, _("Warning"), _(" Internal bug: Double start of link area ")); + message (D_NORMAL, _("Warning"), _("Internal bug: Double start of link area")); /* Allocate memory for a new link area */ la = g_new (Link_Area, 1); @@ -648,7 +648,7 @@ help_index (Dlg_head * h) new_item = search_string (fdata, "[Contents]"); if (new_item == NULL) - message (D_ERROR, MSG_ERROR, _(" Cannot find node %s in help file "), "[Contents]"); + message (D_ERROR, MSG_ERROR, _("Cannot find node %s in help file"), "[Contents]"); else { history_ptr = (history_ptr + 1) % HISTORY_SIZE; @@ -991,7 +991,7 @@ interactive_display (const char *filename, const char *node) filedata = load_mc_home_file (mc_home, mc_home_alt, "mc.hlp", &hlpfile); if (filedata == NULL) - message (D_ERROR, MSG_ERROR, _(" Cannot open file %s \n %s "), + message (D_ERROR, MSG_ERROR, _("Cannot open file %s\n%s"), filename ? filename : hlpfile, unix_error_string (errno)); g_free (hlpfile); @@ -1013,7 +1013,7 @@ interactive_display (const char *filename, const char *node) if (main_node == NULL) { - message (D_ERROR, MSG_ERROR, _(" Cannot find node %s in help file "), node); + message (D_ERROR, MSG_ERROR, _("Cannot find node %s in help file"), node); /* Fallback to [main], return if it also cannot be found */ main_node = search_string (fdata, "[main]"); diff --git a/src/hotlist.c b/src/hotlist.c index f495e449d..7840b1253 100644 --- a/src/hotlist.c +++ b/src/hotlist.c @@ -184,6 +184,7 @@ static void add_dotdot_to_list (void); static void hotlist_refresh (Dlg_head * dlg) { + /* TODO: use groupboxes here */ common_dialog_repaint (dlg); tty_setcolor (COLOR_NORMAL); draw_box (dlg, 2, 5, dlg->lines - (hotlist_state.moving ? 6 : 10), dlg->cols - (UX * 2), TRUE); @@ -721,12 +722,15 @@ init_hotlist (int list_type) add_widget_autopos (hotlist_dlg, pname, WPOS_KEEP_BOTTOM | WPOS_KEEP_LEFT); if (!hotlist_state.moving) { + char label_text[BUF_TINY]; + + g_snprintf (label_text, sizeof (label_text), " %s ", _("Directory path")); add_widget_autopos (hotlist_dlg, - label_new (UY - 12 + LINES, UX + 1, - _(" Directory path ")), WPOS_KEEP_BOTTOM | WPOS_KEEP_LEFT); + label_new (UY - 12 + LINES, UX + 2, + label_text), WPOS_KEEP_BOTTOM | WPOS_KEEP_LEFT); /* This one holds the displayed pathname */ - pname_group = label_new (UY, UX + 1, _(" Directory label ")); + pname_group = label_new (UY, UX + 2, _("Directory label")); add_widget (hotlist_dlg, pname_group); } /* get new listbox */ @@ -775,7 +779,7 @@ init_movelist (int list_type, struct hotlist *item) /* We add the labels. We are interested in the last one, * that one will hold the path name label */ - movelist_group = label_new (UY, UX + 1, _(" Directory label ")); + movelist_group = label_new (UY, UX + 2, _("Directory label")); add_widget (movelist_dlg, movelist_group); /* get new listbox */ l_movelist = @@ -936,9 +940,9 @@ add_new_entry_input (const char *header, const char *text1, const char *text2, /* 1 */ QUICK_BUTTON (30, 80, RELATIVE_Y_BUTTONS, 0, N_("&Insert"), B_INSERT, NULL), /* 2 */ QUICK_BUTTON (10, 80, RELATIVE_Y_BUTTONS, 0, N_("&Append"), B_APPEND, NULL), /* 3 */ QUICK_INPUT (4, 80, RELATIVE_Y_INPUT_PTH, 0, *r2, 58, 2, "input-pth", r2), - /* 4 */ QUICK_LABEL (RELATIVE_Y_LABEL_PTH, 80, 3, 0, text2), + /* 4 */ QUICK_LABEL (4, 80, 3, 0, text2), /* 5 */ QUICK_INPUT (4, 80, 3, 0, *r1, 58, 0, "input-lbl", r1), - /* 6 */ QUICK_LABEL (3, 80, 2, 0, text1), + /* 6 */ QUICK_LABEL (4, 80, 2, 0, text1), QUICK_END }; @@ -998,8 +1002,8 @@ add_new_entry_cmd (void) /* Take current directory as default value for input fields */ to_free = title = url = strip_password (g_strdup (current_panel->cwd), 1); - ret = add_new_entry_input (_("New hotlist entry"), _("Directory label"), - _("Directory path"), "[Hotlist]", &title, &url); + ret = add_new_entry_input (_("New hotlist entry"), _("Directory label:"), + _("Directory path:"), "[Hotlist]", &title, &url); g_free (to_free); if (!ret) @@ -1027,7 +1031,7 @@ add_new_group_input (const char *header, const char *label, char **result) /* 1 */ QUICK_BUTTON (30, 80, 1, 0, N_("&Insert"), B_INSERT, NULL), /* 2 */ QUICK_BUTTON (10, 80, 1, 0, N_("&Append"), B_APPEND, NULL), /* 3 */ QUICK_INPUT (4, 80, 0, 0, "", 58, 0, "input", result), - /* 4 */ QUICK_LABEL (3, 80, 2, 0, label), + /* 4 */ QUICK_LABEL (4, 80, 2, 0, label), QUICK_END }; @@ -1078,7 +1082,7 @@ add_new_group_cmd (void) char *label; int ret; - ret = add_new_group_input (_(" New hotlist group "), _("Name of new group"), &label); + ret = add_new_group_input (_("New hotlist group"), _("Name of new group:"), &label); if (!ret || !label || !*label) return; @@ -1101,7 +1105,7 @@ add2hotlist_cmd (void) strip_password (label_string, 1); lc_prompt = g_strdup_printf (cp, path_trunc (current_panel->cwd, COLS - 2 * UX - (l + 8))); - label = input_dialog (_(" Add to hotlist "), lc_prompt, MC_HISTORY_HOTLIST_ADD, label_string); + label = input_dialog (_("Add to hotlist"), lc_prompt, MC_HISTORY_HOTLIST_ADD, label_string); g_free (lc_prompt); if (!label || !*label) @@ -1149,12 +1153,12 @@ remove_from_hotlist (struct hotlist *entry) char *title; int result; - title = g_strconcat (_(" Remove: "), str_trunc (entry->label, 30), " ", (char *) NULL); + title = g_strconcat (_("Remove:"), " ", str_trunc (entry->label, 30), (char *) NULL); if (safe_delete) query_set_sel (1); result = query_dialog (title, - _("\n Are you sure you want to remove this entry?"), + _("Are you sure you want to remove this entry?"), D_ERROR, 2, _("&Yes"), _("&No")); g_free (title); @@ -1170,8 +1174,8 @@ remove_from_hotlist (struct hotlist *entry) char *header; int result; - header = g_strconcat (_(" Remove: "), str_trunc (entry->label, 30), " ", (char *) NULL); - result = query_dialog (header, _("\n Group not empty.\n Remove it?"), + header = g_strconcat (_("Remove:"), " ", str_trunc (entry->label, 30), (char *) NULL); + result = query_dialog (header, _("Group not empty.\nRemove it?"), D_ERROR, 2, _("&Yes"), _("&No")); g_free (header); @@ -1535,7 +1539,7 @@ load_hotlist (void) hotlist = new_hotlist (); hotlist->type = HL_TYPE_GROUP; - hotlist->label = g_strdup (_(" Top level group ")); + hotlist->label = g_strdup (_("Top level group")); hotlist->up = hotlist; /* * compatibility :-( @@ -1558,9 +1562,8 @@ load_hotlist (void) if (result) remove_old_list = 1; else - message (D_ERROR, _(" Hotlist Load "), - _ - ("MC was unable to write ~/%s file, your old hotlist entries were not deleted"), + message (D_ERROR, _("Hotlist Load"), + _("MC was unable to write ~/%s file,\nyour old hotlist entries were not deleted"), MC_USERCONF_DIR PATH_SEP_STR MC_HOTLIST_FILE); } else diff --git a/src/info.c b/src/info.c index f6e875c26..e8a2345ee 100644 --- a/src/info.c +++ b/src/info.c @@ -108,7 +108,7 @@ info_show_info (struct WInfo *info) if (i18n_adjust == 0) { /* This printf pattern string is used as a reference for size */ - file_label = _("File: %s"); + file_label = _("File: %s"); i18n_adjust = str_term_width1 (file_label) + 2; } @@ -148,7 +148,7 @@ info_show_info (struct WInfo *info) case 14: widget_move (&info->widget, 14, 3); - tty_printf (_("Type: %s "), + tty_printf (_("Type: %s"), myfs_stats.typename ? myfs_stats.typename : _("non-local vfs")); if (myfs_stats.type != 0xffff && myfs_stats.type != -1) tty_printf (" (%Xh)", myfs_stats.type); diff --git a/src/layout.c b/src/layout.c index b6e19cd23..c370f5520 100644 --- a/src/layout.c +++ b/src/layout.c @@ -397,10 +397,10 @@ init_layout (void) first_width = 0; - title1 = _(" Panel split "); - title2 = _(" Console output "); - title3 = _(" Other options "); - output_lines_label = _("Output lines: "); + title1 = _("Panel split"); + title2 = _("Console output"); + title3 = _("Other options"); + output_lines_label = _("Output lines:"); while (i--) { diff --git a/src/learn.c b/src/learn.c index 86adfb8b1..49c5892c2 100644 --- a/src/learn.c +++ b/src/learn.c @@ -84,7 +84,7 @@ static const char* learn_title = N_("Learn keys"); static int learn_button (int action) { char *seq; - Dlg_head *d = create_message (D_ERROR, _(" Teach me a key "), + Dlg_head *d = create_message (D_ERROR, _("Teach me a key"), _("Please press the %s\n" "and then wait until this message disappears.\n\n" "Then, press it again to see if OK appears\n" @@ -117,8 +117,8 @@ _("Please press the %s\n" } if (!seq_ok) - message (D_NORMAL, _(" Cannot accept this key "), - _(" You have entered \"%s\""), seq); + message (D_NORMAL, _("Cannot accept this key"), + _("You have entered \"%s\""), seq); g_free (seq); } diff --git a/src/listmode.c b/src/listmode.c index b2693b5eb..901cd1a69 100644 --- a/src/listmode.c +++ b/src/listmode.c @@ -102,7 +102,7 @@ select_new_item (void) possible_items = panel_get_user_possible_fields(NULL); mylistbox = - create_listbox_window (20, 12, " Add listing format item ", + create_listbox_window (20, 12, "Add listing format item", listmode_section); for (i = 0; possible_items[i]; i++) { listbox_add_item (mylistbox->list, LISTBOX_APPEND_AT_END, 0, possible_items[i], NULL); diff --git a/src/main.c b/src/main.c index 7ba1a6bf4..00cc0a51c 100644 --- a/src/main.c +++ b/src/main.c @@ -342,8 +342,8 @@ quit_cmd_internal (int quiet) else { if (query_dialog - (_(" The Midnight Commander "), - _(" Do you really want to quit the Midnight Commander? "), D_NORMAL, + (_("The Midnight Commander"), + _("Do you really want to quit the Midnight Commander?"), D_NORMAL, 2, _("&Yes"), _("&No")) == 0) q = 1; } @@ -661,7 +661,7 @@ create_panel_menu (void) entries = g_list_append (entries, menu_entry_create (_("File listin&g"), CK_ListingCmd)); entries = g_list_append (entries, menu_entry_create (_("&Quick view"), CK_QuickViewCmd)); - entries = g_list_append (entries, menu_entry_create (_("&Info" ), CK_InfoCmd)); + entries = g_list_append (entries, menu_entry_create (_("&Info"), CK_InfoCmd)); entries = g_list_append (entries, menu_entry_create (_("&Tree"), CK_TreeCmd)); entries = g_list_append (entries, menu_separator_create ()); entries = g_list_append (entries, menu_entry_create (_("&Listing mode..."), CK_ChangeListingCmd)); diff --git a/src/option.c b/src/option.c index 95d991518..ca72dcdf5 100644 --- a/src/option.c +++ b/src/option.c @@ -383,10 +383,10 @@ panel_options_box (void) if (!panels_options.fast_reload_msg_shown && panels_options.fast_reload) { message (D_NORMAL, _("Information"), - _(" Using the fast reload option may not reflect the exact \n" - " directory contents. In this case you'll need to do a \n" - " manual reload of the directory. See the man page for \n" - " the details. ")); + _("Using the fast reload option may not reflect the exact\n" + "directory contents. In this case you'll need to do a\n" + "manual reload of the directory. See the man page for\n" + "the details.")); panels_options.fast_reload_msg_shown = TRUE; } update_panels (UP_RELOAD, UP_KEEPSEL); diff --git a/src/panelize.c b/src/panelize.c index 311172b5a..1f527f550 100644 --- a/src/panelize.c +++ b/src/panelize.c @@ -249,8 +249,8 @@ add2panelize_cmd (void) if (pname->buffer && (*pname->buffer)) { - label = input_dialog (_(" Add to external panelize "), - _(" Enter command label: "), MC_HISTORY_FM_PANELIZE_ADD, ""); + label = input_dialog (_("Add to external panelize"), + _("Enter command label:"), MC_HISTORY_FM_PANELIZE_ADD, ""); if (!label) return; if (!*label) @@ -296,7 +296,7 @@ external_panelize (void) if (!vfs_current_is_local ()) { - message (D_ERROR, MSG_ERROR, _(" Cannot run external panelize in a non-local directory ")); + message (D_ERROR, MSG_ERROR, _("Cannot run external panelize in a non-local directory")); return; } diff --git a/src/screen.c b/src/screen.c index 5759b55c9..390a6a833 100644 --- a/src/screen.c +++ b/src/screen.c @@ -1738,7 +1738,7 @@ parse_display_format (WPanel * panel, const char *format, char **error, int isst int pos = min (8, strlen (format)); delete_format (home); tmp_format[pos] = 0; - *error = g_strconcat (_("Unknown tag on display format: "), tmp_format, (char *) NULL); + *error = g_strconcat (_("Unknown tag on display format:"), " ", tmp_format, (char *) NULL); g_free (tmp_format); return 0; } @@ -2517,8 +2517,8 @@ do_enter_on_file_entry (file_entry * fe) if (confirm_execute) { if (query_dialog - (_(" The Midnight Commander "), - _(" Do you really want to execute? "), D_NORMAL, 2, _("&Yes"), _("&No")) != 0) + (_("The Midnight Commander"), + _("Do you really want to execute?"), D_NORMAL, 2, _("&Yes"), _("&No")) != 0) return 1; } #ifdef ENABLE_VFS @@ -3075,7 +3075,7 @@ panel_callback (Widget * w, widget_msg_t msg, int parm) if (mc_chdir (panel->cwd) != 0) { char *cwd = strip_password (g_strdup (panel->cwd), 1); - message (D_ERROR, MSG_ERROR, _(" Cannot chdir to \"%s\" \n %s "), + message (D_ERROR, MSG_ERROR, _("Cannot chdir to \"%s\"\n%s"), cwd, unix_error_string (errno)); g_free (cwd); } @@ -3454,7 +3454,7 @@ set_panel_encoding (WPanel * panel) { cd_path = add_encoding_to_path (panel->cwd, encoding); if (!do_panel_cd (panel, cd_path, 0)) - message (D_ERROR, MSG_ERROR, _(" Cannot chdir to %s "), cd_path); + message (D_ERROR, MSG_ERROR, _("Cannot chdir to \"%s\""), cd_path); g_free (cd_path); } } diff --git a/src/subshell.c b/src/subshell.c index 40eee14a8..280cdae58 100644 --- a/src/subshell.c +++ b/src/subshell.c @@ -716,7 +716,7 @@ exit_subshell (void) if (subshell_state != INACTIVE && subshell_alive) subshell_quit = !query_dialog (_("Warning"), - _(" The shell is still active. Quit anyway? "), + _("The shell is still active. Quit anyway?"), D_NORMAL, 2, _("&Yes"), _("&No")); if (subshell_quit) diff --git a/src/tree.c b/src/tree.c index bcc1894f7..648b01e4e 100644 --- a/src/tree.c +++ b/src/tree.c @@ -528,7 +528,7 @@ tree_chdir_sel (WTree * tree) if (do_cd (tree->selected_ptr->name, cd_exact)) select_item (current_panel); else - message (D_ERROR, MSG_ERROR, _(" Cannot chdir to \"%s\" \n %s "), + message (D_ERROR, MSG_ERROR, _("Cannot chdir to \"%s\"\n%s"), tree->selected_ptr->name, unix_error_string (errno)); change_panel (); @@ -720,7 +720,7 @@ tree_move (WTree * tree, const char *default_dest) if (stat (dest, &buf)) { - message (D_ERROR, MSG_ERROR, _(" Cannot stat the destination \n %s "), + message (D_ERROR, MSG_ERROR, _("Cannot stat the destination\n%s"), unix_error_string (errno)); g_free (dest); return; @@ -728,7 +728,7 @@ tree_move (WTree * tree, const char *default_dest) if (!S_ISDIR (buf.st_mode)) { - file_error (_(" Destination \"%s\" must be a directory \n %s "), dest); + file_error (_("Destination \"%s\" must be a directory\n%s"), dest); g_free (dest); return; } @@ -778,7 +778,7 @@ tree_rmdir (void *data) char *buf; int result; - buf = g_strdup_printf (_(" Delete %s? "), tree->selected_ptr->name); + buf = g_strdup_printf (_("Delete %s?"), tree->selected_ptr->name); result = query_dialog (Q_ ("DialogTitle|Delete"), buf, D_ERROR, 2, _("&Yes"), _("&No")); g_free (buf); if (result != 0) diff --git a/src/user.c b/src/user.c index 0afbecef2..b6d4f4787 100644 --- a/src/user.c +++ b/src/user.c @@ -140,9 +140,9 @@ int check_format_var (const char *p, char **v) if (!dots || dots == q+5){ message (D_ERROR, - _(" Format error on file Extensions File "), - !dots ? _(" The %%var macro has no default ") - : _(" The %%var macro has no variable ")); + _("Format error on file Extensions File"), + !dots ? _("The %%var macro has no default") + : _("The %%var macro has no variable")); return 0; } @@ -507,7 +507,7 @@ debug_out (char *start, char *end, int cond) len = strlen (msg); if (len) msg [len - 1] = 0; - message (D_NORMAL, _(" Debug "), "%s", msg); + message (D_NORMAL, _("Debug"), "%s", msg); } debug_flag = 0; @@ -522,18 +522,18 @@ debug_out (char *start, char *end, int cond) return; /* Save the result of the condition */ if (debug_error){ - type = _(" ERROR: "); + type = _("ERROR:"); debug_error = 0; } else if (cond) - type = _(" True: "); + type = _("True:"); else - type = _(" False: "); + type = _("False:"); /* This is for debugging, don't need to be super efficient. */ if (end == NULL) - p = g_strdup_printf ("%s%s%c \n", msg ? msg : "", type, *start); + p = g_strdup_printf ("%s %s %c \n", msg ? msg : "", type, *start); else - p = g_strdup_printf ("%s%s%.*s \n", msg ? msg : "", type, + p = g_strdup_printf ("%s %s %.*s \n", msg ? msg : "", type, (int) (end - start), start); g_free (msg); msg = p; @@ -625,7 +625,7 @@ execute_menu_command (WEdit *edit_widget, const char *commands) cmd_file_fd = mc_mkstemps (&file_name, "mcusr", SCRIPT_SUFFIX); if (cmd_file_fd == -1){ - message (D_ERROR, MSG_ERROR, _(" Cannot create temporary command file \n %s "), + message (D_ERROR, MSG_ERROR, _("Cannot create temporary command file\n%s"), unix_error_string (errno)); return; } @@ -649,7 +649,7 @@ execute_menu_command (WEdit *edit_widget, const char *commands) if (*commands == '}'){ char *tmp; *parameter = 0; - parameter = input_dialog (_(" Parameter "), lc_prompt, MC_HISTORY_FM_MENU_EXEC_PARAM, ""); + parameter = input_dialog (_("Parameter"), lc_prompt, MC_HISTORY_FM_MENU_EXEC_PARAM, ""); if (!parameter || !*parameter){ /* User canceled */ fclose (cmd_file); @@ -734,7 +734,7 @@ menu_file_own(char* path) } if (verbose) { - message (D_NORMAL, _(" Warning -- ignoring file "), + message (D_NORMAL, _("Warning -- ignoring file"), _("File %s is not owned by root or you or is world writable.\n" "Using it may compromise your security"), path @@ -759,7 +759,7 @@ user_menu_cmd (struct WEdit *edit_widget) if (!vfs_current_is_local ()){ message (D_ERROR, MSG_ERROR, - _(" Cannot execute commands on non-local filesystems")); + "%s", _("Cannot execute commands on non-local filesystems")); return; } @@ -786,7 +786,7 @@ user_menu_cmd (struct WEdit *edit_widget) data = load_file (menu); if (data == NULL) { - message (D_ERROR, MSG_ERROR, _(" Cannot open file %s \n %s "), + message (D_ERROR, MSG_ERROR, _("Cannot open file%s\n%s"), menu, unix_error_string (errno)); g_free (menu); menu = NULL; @@ -867,12 +867,12 @@ user_menu_cmd (struct WEdit *edit_widget) } if (menu_lines == 0) - message (D_ERROR, MSG_ERROR, _(" No suitable entries found in %s "), menu); + message (D_ERROR, MSG_ERROR, _("No suitable entries found in %s"), menu); else { max_cols = min (max (max_cols, col), MAX_ENTRY_LEN); /* Create listbox */ - listbox = create_listbox_window (menu_lines, max_cols + 2,_(" User menu "), + listbox = create_listbox_window (menu_lines, max_cols + 2, _("User menu"), "[Menu File Edit]"); /* insert all the items found */ for (i = 0; i < menu_lines; i++) { diff --git a/src/viewer/datasource.c b/src/viewer/datasource.c index f3b4f38ec..fd2360f79 100644 --- a/src/viewer/datasource.c +++ b/src/viewer/datasource.c @@ -379,7 +379,7 @@ mcview_load_command_output (mcview_t * view, const char *command) /* Avoid two messages. Message from stderr has priority. */ mcview_display (view); if (!close_error_pipe (mcview_is_in_panel (view) ? -1 : D_ERROR, NULL)) - mcview_show_error (view, _(" Cannot spawn child process ")); + mcview_show_error (view, _("Cannot spawn child process")); return FALSE; } diff --git a/src/viewer/dialogs.c b/src/viewer/dialogs.c index 389074a1c..91cb201a5 100644 --- a/src/viewer/dialogs.c +++ b/src/viewer/dialogs.c @@ -105,7 +105,7 @@ mcview_dialog_search (mcview_t * view) (int *) &mcview_search_options.type), QUICK_INPUT (3, SEARCH_DLG_WIDTH, 3, SEARCH_DLG_HEIGHT, INPUT_LAST_TEXT, SEARCH_DLG_WIDTH - 6, 0, MC_HISTORY_SHARED_SEARCH, &exp), - QUICK_LABEL (2, SEARCH_DLG_WIDTH, 2, SEARCH_DLG_HEIGHT, N_(" Enter search string:")), + QUICK_LABEL (3, SEARCH_DLG_WIDTH, 2, SEARCH_DLG_HEIGHT, N_("Enter search string:")), QUICK_END }; diff --git a/src/viewer/hex.c b/src/viewer/hex.c index 8964b66fc..d029a7418 100644 --- a/src/viewer/hex.c +++ b/src/viewer/hex.c @@ -376,19 +376,19 @@ mcview_hexedit_save_changes (mcview_t * view) } if (mc_close (fp) == -1) - message (D_ERROR, _(" Save file "), - _(" Error while closing the file: \n %s \n" - " Data may have been written or not. "), unix_error_string (errno)); + message (D_ERROR, _("Save file"), + _("Error while closing the file:\n%s\n" + "Data may have been written or not"), unix_error_string (errno)); view->dirty++; return TRUE; } save_error: - text = g_strdup_printf (_(" Cannot save file: \n %s "), unix_error_string (errno)); + text = g_strdup_printf (_("Cannot save file:\n%s"), unix_error_string (errno)); (void) mc_close (fp); - answer = query_dialog (_(" Save file "), text, D_ERROR, 2, _("&Retry"), _("&Cancel")); + answer = query_dialog (_("Save file"), text, D_ERROR, 2, _("&Retry"), _("&Cancel")); g_free (text); } diff --git a/src/viewer/lib.c b/src/viewer/lib.c index cc927dd50..b80d96472 100644 --- a/src/viewer/lib.c +++ b/src/viewer/lib.c @@ -147,7 +147,7 @@ mcview_ok_to_quit (mcview_t * view) return TRUE; r = query_dialog (_("Quit"), - _(" File was modified, Save with exit? "), D_NORMAL, 3, + _("File was modified, Save with exit?"), D_NORMAL, 3, _("&Cancel quit"), _("&Yes"), _("&No")); switch (r) diff --git a/src/viewer/mcviewer.c b/src/viewer/mcviewer.c index abbaaa4d7..e6c271b02 100644 --- a/src/viewer/mcviewer.c +++ b/src/viewer/mcviewer.c @@ -300,7 +300,7 @@ mcview_load (mcview_t * view, const char *command, const char *file, int start_l fd = mc_open (file, O_RDONLY | O_NONBLOCK); if (fd == -1) { - g_snprintf (tmp, sizeof (tmp), _(" Cannot open \"%s\"\n %s "), + g_snprintf (tmp, sizeof (tmp), _("Cannot open \"%s\"\n%s"), file, unix_error_string (errno)); mcview_show_error (view, tmp); g_free (view->filename); @@ -312,7 +312,7 @@ mcview_load (mcview_t * view, const char *command, const char *file, int start_l if (mc_fstat (fd, &st) == -1) { mc_close (fd); - g_snprintf (tmp, sizeof (tmp), _(" Cannot stat \"%s\"\n %s "), + g_snprintf (tmp, sizeof (tmp), _("Cannot stat \"%s\"\n%s"), file, unix_error_string (errno)); mcview_show_error (view, tmp); g_free (view->filename); @@ -323,7 +323,7 @@ mcview_load (mcview_t * view, const char *command, const char *file, int start_l if (!S_ISREG (st.st_mode)) { mc_close (fd); - mcview_show_error (view, _(" Cannot view: not a regular file ")); + mcview_show_error (view, _("Cannot view: not a regular file")); g_free (view->filename); view->filename = NULL; goto finish; diff --git a/src/viewer/search.c b/src/viewer/search.c index fd1fd642b..5e76f7339 100644 --- a/src/viewer/search.c +++ b/src/viewer/search.c @@ -96,7 +96,7 @@ mcview_find (mcview_t * view, gsize search_start, gsize * len) search_start--; } - view->search->error_str = g_strdup (_(" Search string not found ")); + view->search->error_str = g_strdup (_("Search string not found")); return FALSE; } view->search_nroff_seq->index = search_start; diff --git a/src/widget.c b/src/widget.c index 23de4f25c..76490a7c5 100644 --- a/src/widget.c +++ b/src/widget.c @@ -1319,7 +1319,7 @@ history_put (const char *input_name, GList * h) static const char * i18n_htitle (void) { - return _(" History "); + return _("History"); } typedef struct @@ -1548,9 +1548,9 @@ push_history (WInput * in, const char *text) /* input widget where urls with passwords are entered without any vfs prefix */ const char *password_input_fields[] = { - N_(" Link to a remote machine "), - N_(" FTP to machine "), - N_(" SMB link to machine ") + " Link to a remote machine ", + " FTP to machine ", + " SMB link to machine " }; const size_t ELEMENTS = (sizeof (password_input_fields) / sizeof (password_input_fields[0])); @@ -1573,6 +1573,8 @@ push_history (WInput * in, const char *text) if (in->history_name != NULL) { + /* FIXME: It is the strange code. Rewrite is needed. */ + const char *p = in->history_name + 3; for (i = 0; i < ELEMENTS; i++)