diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-06-30 13:18:42 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-06-30 13:18:42 +0200 |
commit | 749ae5083c2c663eb10a985bf5c27b99c5247542 (patch) | |
tree | 3b5ea061332737d15e4d9f8ca8f265377886a1a5 /lib | |
parent | 842d1a6d7ab1fe62c6e9bce6d776b0d73dab0e23 (diff) | |
download | abrt-749ae5083c2c663eb10a985bf5c27b99c5247542.tar.gz abrt-749ae5083c2c663eb10a985bf5c27b99c5247542.tar.xz abrt-749ae5083c2c663eb10a985bf5c27b99c5247542.zip |
English and message format fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Plugins/Bugzilla.cpp | 15 | ||||
-rw-r--r-- | lib/Plugins/CCpp.cpp | 2 | ||||
-rw-r--r-- | lib/Plugins/FileTransfer.cpp | 4 | ||||
-rw-r--r-- | lib/Plugins/Kerneloops.cpp | 2 | ||||
-rw-r--r-- | lib/Utils/hooklib.cpp | 2 |
5 files changed, 12 insertions, 13 deletions
diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp index aca2665b..cde1712e 100644 --- a/lib/Plugins/Bugzilla.cpp +++ b/lib/Plugins/Bugzilla.cpp @@ -780,7 +780,7 @@ std::string CReporterBugzilla::Report(const map_crash_data_t& pCrashData, throw CABRTException(EXCEP_PLUGIN, _("Bugzilla entry creation failed")); } - log("adding attachments to bug(%d)...", bug_id); + log("Adding attachments to bug %d...", bug_id); int ret = bz_server.add_attachments(to_string(bug_id).c_str(), pCrashData); if (ret == -1) { @@ -815,14 +815,13 @@ std::string CReporterBugzilla::Report(const map_crash_data_t& pCrashData, { if (ii == MAX_HOPS) { - VERB3 log("Bugzilla couldn't find parent of bug(%d)", (int)original_bug_id); + VERB3 log("Bugzilla couldn't find parent of bug %d", (int)original_bug_id); bug_info_destroy(&bz); - throw CABRTException(EXCEP_PLUGIN, _("Bugzilla couldn't find parent of bug(%d)"), (int)original_bug_id); + throw CABRTException(EXCEP_PLUGIN, _("Bugzilla couldn't find parent of bug %d"), (int)original_bug_id); } - VERB3 log("Bugzilla(%d): Jump to bug %d", bug_id, (int)bz.bug_dup_id); + log("Bug %d is a duplicate, using parent bug %d", bug_id, (int)bz.bug_dup_id); bug_id = bz.bug_dup_id; - update_client(_("Jump to bug %d"), (int)bug_id); bug_info_destroy(&bz); bug_info_init(&bz); @@ -847,8 +846,8 @@ std::string CReporterBugzilla::Report(const map_crash_data_t& pCrashData, int status = 0; if ((strcmp(bz.bug_reporter, Login.c_str()) != 0) && (am_i_in_cc(&bz, Login.c_str()))) { - VERB2 log(_("Add %s to CC list"), Login.c_str()); - update_client(_("Add %s to CC list"), Login.c_str()); + VERB2 log(_("Adding %s to CC list"), Login.c_str()); + update_client(_("Adding %s to CC list"), Login.c_str()); status = bz_server.add_plus_one_cc(bug_id, Login.c_str()); } @@ -872,7 +871,7 @@ std::string CReporterBugzilla::Report(const map_crash_data_t& pCrashData, "%s", package, arch, release, description.c_str() ); - update_client(_("Add new comment into bug(%d)"), (int)bug_id); + update_client(_("Adding new comment to bug %d"), (int)bug_id); bool is_priv = is_private && (is_private[0] == '1'); if (bz_server.add_comment(bug_id, description.c_str(), is_priv) == -1) diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp index d0455b9e..0fc229d3 100644 --- a/lib/Plugins/CCpp.cpp +++ b/lib/Plugins/CCpp.cpp @@ -748,7 +748,7 @@ void CAnalyzerCCpp::CreateReport(const char *pDebugDumpDir, int force) if (crash_thread) backtrace_remove_threads_except_one(backtrace, crash_thread); else - log_msg("Detection of crash thread failed.\n"); + log_msg("Detection of crash thread failed"); /* Get the quality of the crash thread. */ float q2 = backtrace_quality(backtrace); diff --git a/lib/Plugins/FileTransfer.cpp b/lib/Plugins/FileTransfer.cpp index f0bb047b..fd073881 100644 --- a/lib/Plugins/FileTransfer.cpp +++ b/lib/Plugins/FileTransfer.cpp @@ -285,8 +285,6 @@ static string DirBase(const char *pStr) void CFileTransfer::Run(const char *pActionDir, const char *pArgs, int force) { - update_client(_("File Transfer: Creating a report...")); - if (strcmp(pArgs, "store") == 0) { /* Remember pActiveDir for later sending */ @@ -297,6 +295,8 @@ void CFileTransfer::Run(const char *pActionDir, const char *pArgs, int force) return; } + update_client(_("FileTransfer: Creating a report...")); + char hostname[HBLEN]; gethostname(hostname, HBLEN-1); hostname[HBLEN-1] = '\0'; diff --git a/lib/Plugins/Kerneloops.cpp b/lib/Plugins/Kerneloops.cpp index 69f6a9a5..6fb9cb55 100644 --- a/lib/Plugins/Kerneloops.cpp +++ b/lib/Plugins/Kerneloops.cpp @@ -115,7 +115,7 @@ static unsigned hash_oops_str(const char *oops_ptr) std::string CAnalyzerKerneloops::GetLocalUUID(const char *pDebugDumpDir) { - log(_("Getting local universal unique identification")); + VERB3 log("Getting local universal unique identification"); std::string oops; { diff --git a/lib/Utils/hooklib.cpp b/lib/Utils/hooklib.cpp index 0c00e75f..10b575a4 100644 --- a/lib/Utils/hooklib.cpp +++ b/lib/Utils/hooklib.cpp @@ -107,7 +107,7 @@ void check_free_space(unsigned setting_MaxCrashReportsSize) unsigned long fs_free_mb_x4 = ((unsigned long long)vfs.f_bfree / (1024/4)) * vfs.f_bsize / 1024; if (fs_free_mb_x4 < setting_MaxCrashReportsSize) { - error_msg_and_die("aborting dump: only %luMiB is available on %s\n", fs_free_mb_x4 / 4, DEBUG_DUMPS_DIR); + error_msg_and_die("aborting dump: only %luMiB is available on %s", fs_free_mb_x4 / 4, DEBUG_DUMPS_DIR); } } |