From 09df85b9b773860ff16acdfa941dcb36dba9bae0 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Tue, 3 Sep 2002 16:55:05 +0000
Subject: [PATCH] Reuse other translated strings.

---
 edit/editcmd.c |  8 ++++----
 src/ext.c      | 25 +++++++++++++++----------
 src/hotlist.c  |  2 +-
 vfs/undelfs.c  |  2 +-
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/edit/editcmd.c b/edit/editcmd.c
index 78d1dba18..52668b003 100644
--- a/edit/editcmd.c
+++ b/edit/editcmd.c
@@ -451,7 +451,7 @@ int edit_save_as_cmd (WEdit * edit)
 		return 1;
 	    } else {
 		g_free (exp);
-		edit_error_dialog (_(" Save as "), get_sys_error (_(" Error trying to save file. ")));
+		edit_error_dialog (_(" Save As "), get_sys_error (_(" Error trying to save file. ")));
 		edit->force |= REDRAW_COMPLETELY;
 		return 0;
 	    }
@@ -1802,7 +1802,7 @@ void edit_replace_cmd (WEdit * edit, int again)
 	    if (times_replaced) {
 		message (0, _(" Replace "), _(" %ld replacements made. "), times_replaced);
 	    } else
-		edit_message_dialog (_ (" Replace "), _ (" Search string not found. "));
+		edit_message_dialog (_ (" Replace "), _ (" Search string not found "));
 	    replace_continue = 0;
 	}
     } while (replace_continue);
@@ -1880,7 +1880,7 @@ void edit_search_cmd (WEdit * edit, int again)
 /* in response to number of bookmarks added because of string being found %d times */
 		    message (0, _(" Search "), _(" %d finds made, %d bookmarks added "), found, books);
 		} else {
-		    edit_error_dialog (_ (" Search "), _ (" Search string not found. "));
+		    edit_error_dialog (_ (" Search "), _ (" Search string not found "));
 		}
 	    } else {
 
@@ -1908,7 +1908,7 @@ void edit_search_cmd (WEdit * edit, int again)
 		    regexp_error (edit);
 		} else {
 		    edit->search_start = edit->curs1;
-		    edit_error_dialog (_ (" Search "), _ (" Search string not found. "));
+		    edit_error_dialog (_ (" Search "), _ (" Search string not found "));
 		}
 	    }
 	}
diff --git a/src/ext.c b/src/ext.c
index d2ddf60dd..024f4c9f8 100644
--- a/src/ext.c
+++ b/src/ext.c
@@ -488,12 +488,14 @@ regex_command (char *filename, char *action, int *move_dir)
 		    char *msg2;
 		    msg =
 			g_strconcat (" ", mc_home, MC_LIB_EXT,
-				     _(" file error"), NULL);
+				     _(" file error "), NULL);
 		    msg2 =
-			g_strconcat (_("Format of the "), mc_home, _("mc.ext file has changed\n\
-with version 3.0. It seems that installation\n\
-failed. Please fetch a fresh new copy from the\n\
-Midnight Commander package."), NULL);
+			g_strconcat (_("Format of the "), mc_home,
+				     _("mc.ext file has changed\n"
+				       "with version 3.0. It seems that installation\n"
+				       "failed. Please fetch a fresh new copy from the\n"
+				       "Midnight Commander package."),
+				     NULL);
 		    message (1, msg, "%s", msg2);
 		    g_free (msg);
 		    g_free (msg2);
@@ -507,11 +509,14 @@ Midnight Commander package."), NULL);
 	    msg =
 		g_strconcat (" ~/", MC_USER_EXT, _(" file error "), NULL);
 	    msg2 =
-		g_strconcat (_("Format of the ~/"), MC_USER_EXT, _(" file has changed\n\
-with version 3.0. You may want either to\n\
-copy it from "), mc_home, _("mc.ext or use that\n\
-file as an example of how to write it.\n\
-"), mc_home, _("mc.ext will be used for this moment."),
+		g_strconcat (_("Format of the "), "~/", MC_USER_EXT,
+			     _(" file has changed\n"
+			       "with version 3.0. You may want either to\n"
+			       "copy it from "), mc_home,
+			     _("mc.ext or use that\n"
+			       "file as an example of how to write it.\n"),
+			     mc_home,
+			     _("mc.ext will be used for this moment."),
 			     NULL);
 	    message (1, msg, "%s", msg2);
 	    g_free (msg);
diff --git a/src/hotlist.c b/src/hotlist.c
index 354b336f7..8e58dbea5 100644
--- a/src/hotlist.c
+++ b/src/hotlist.c
@@ -1447,7 +1447,7 @@ void load_hotlist (void)
 		    char *str;
 
 		    str = g_strconcat (_("MC was unable to write ~/"), HOTLIST_FILENAME,
-					_(" file your old hotlist entries were not deleted"), NULL);
+					_(" file, your old hotlist entries were not deleted"), NULL);
 
 		    message (D_ERROR, _(" Hotlist Load "), str);
 		    g_free (str);
diff --git a/vfs/undelfs.c b/vfs/undelfs.c
index 5b424ba19..7376eb523 100644
--- a/vfs/undelfs.c
+++ b/vfs/undelfs.c
@@ -611,7 +611,7 @@ undelfs_chdir(vfs *me, char *path)
     /* this could be fixed by making an ext2fs io manager to use */
     /* our vfs, but that is left as an excercise for the reader */
     if ((fd = open (file, O_RDONLY)) == -1){
-	message_2s (1, undelfserr, _(" Could not open file: %s "), file);
+	message_2s (1, undelfserr, _(" Could not open file %s "), file);
 	g_free (f);
 	g_free (file);
 	return -1;