English and message format fixes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

4 files changed, 13 insertions, 13 deletions

diff --git a/src/CLI/CLI.cpp b/src/CLI/CLI.cpp
index d882161a..c751bd37 100644
--- a/src/CLI/CLI.cpp
+++ b/src/CLI/CLI.cpp
@@ -44,7 +44,7 @@ static void print_crash(const map_crash_data_t &crash)
     char timeloc[256];
     int success = strftime(timeloc, 128, "%c", localtime(&time));
     if (!success)
-        error_msg_and_die("Error while converting time to string.");
+        error_msg_and_die("Error while converting time to string");
 
     printf(_("\tUID        : %s\n"
              "\tUUID       : %s\n"
@@ -212,7 +212,7 @@ int main(int argc, char** argv)
 #define SET_OP(newop)                                                \
         if (op != -1 && op != newop)                                 \
         {                                                            \
-            error_msg(_("You must specify exactly one operation.")); \
+            error_msg(_("You must specify exactly one operation"));  \
             return 1;                                                \
         }                                                            \
         op = newop;
diff --git a/src/CLI/dbus.cpp b/src/CLI/dbus.cpp
index 2eddb5d9..55ebf9db 100644
--- a/src/CLI/dbus.cpp
+++ b/src/CLI/dbus.cpp
@@ -46,7 +46,7 @@ static DBusMessage* send_get_reply_and_unref(DBusMessage* msg)
         if (!received)
         {
             if (FALSE == dbus_connection_read_write(s_dbus_conn, -1))
-                error_msg_and_die("DBus connection closed");
+                error_msg_and_die("dbus connection closed");
             continue;
         }
 
@@ -100,7 +100,7 @@ static DBusMessage* send_get_reply_and_unref(DBusMessage* msg)
                                    DBUS_TYPE_STRING, &warning_msg,
                                    DBUS_TYPE_INVALID))
             {
-                error_msg_and_die("dbus Update message: arguments mismatch");
+                error_msg_and_die("dbus Warning message: arguments mismatch");
             }
             log(">! %s\n", warning_msg);
         }
@@ -114,7 +114,7 @@ static DBusMessage* send_get_reply_and_unref(DBusMessage* msg)
         if (tp == DBUS_MESSAGE_TYPE_ERROR
          && dbus_message_get_reply_serial(received) == serial
         ) {
-            error_msg_and_die("Dbus call returned error: '%s'", error_str);
+            error_msg_and_die("dbus call returned error: '%s'", error_str);
         }
 
         dbus_message_unref(received);
diff --git a/src/CLI/report.cpp b/src/CLI/report.cpp
index ebaeafa1..8316418c 100644
--- a/src/CLI/report.cpp
+++ b/src/CLI/report.cpp
@@ -162,13 +162,13 @@ static void write_crash_report_field(FILE *fp, const map_crash_data_t &report,
   if (it == report.end())
   {
     // exit silently, all fields are optional for now
-    //error_msg("Field %s not found.\n", field);
+    //error_msg("Field %s not found", field);
     return;
   }
 
   if (it->second[CD_TYPE] == CD_SYS)
   {
-    error_msg("Cannot write field %s because it is a system value\n", field);
+    error_msg("Cannot update field %s because it is a system value", field);
     return;
   }
 
@@ -241,13 +241,13 @@ static int read_crash_report_field(const char *text, map_crash_data_t &report,
   const map_crash_data_t::iterator it = report.find(field);
   if (it == report.end())
   {
-    error_msg("Field %s not found.\n", field);
+    error_msg("Field %s not found", field);
     return 0;
   }
 
   if (it->second[CD_TYPE] == CD_SYS)
   {
-    error_msg("Cannot update field %s because it is a system value.\n", field);
+    error_msg("Cannot update field %s because it is a system value", field);
     return 0;
   }
 
@@ -331,9 +331,9 @@ static int launch_editor(const char *path)
     editor = getenv("EDITOR");
 
   terminal = getenv("TERM");
-  if (!editor && (!terminal || !strcmp(terminal, "dumb")))
+  if (!editor && (!terminal || strcmp(terminal, "dumb") == 0))
   {
-    error_msg(_("Terminal is dumb but no VISUAL nor EDITOR defined."));
+    error_msg(_("Can't run vi: $TERM, $VISUAL and $EDITOR are not set"));
     return 1;
   }
 
@@ -567,7 +567,7 @@ static bool set_echo(bool enabled)
         t.c_lflag &= ~ECHO;
 
     if (tcsetattr(STDIN_FILENO, TCSANOW, &t) < 0)
-        perror_msg_and_die("tcsetattr failed");
+        perror_msg_and_die("tcsetattr");
 
     return true;
 }
diff --git a/src/CLI/run-command.cpp b/src/CLI/run-command.cpp
index 8f9d63ec..1f6836d6 100644
--- a/src/CLI/run-command.cpp
+++ b/src/CLI/run-command.cpp
@@ -28,7 +28,7 @@ static pid_t start_command(char **argv)
   pid_t pid = vfork();
   if (pid < 0)
   {
-    perror_msg_and_die("Can't fork");
+    perror_msg_and_die("vfork");
   }
   if (pid == 0)
   { // new process