summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarel Klic <kklic@redhat.com>2010-07-12 13:43:30 +0200
committerKarel Klic <kklic@redhat.com>2010-07-12 13:43:30 +0200
commit39d1eb82b56410e41ee8dccf5b2d6f3cad217996 (patch)
treeb9ebc7eb53eae6ace922406db1d5a1de0b08b106 /src
parent2ff305d1e59f9683642a58ec29df55fdb8dd2297 (diff)
downloadabrt-39d1eb82b56410e41ee8dccf5b2d6f3cad217996.tar.gz
abrt-39d1eb82b56410e41ee8dccf5b2d6f3cad217996.tar.xz
abrt-39d1eb82b56410e41ee8dccf5b2d6f3cad217996.zip
String updates
Diffstat (limited to 'src')
-rw-r--r--src/Applet/CCApplet.cpp2
-rw-r--r--src/CLI/CLI.cpp6
-rw-r--r--src/CLI/report.cpp14
-rw-r--r--src/Daemon/Daemon.cpp2
-rw-r--r--src/Gui/ABRTExceptions.py4
-rw-r--r--src/Gui/CCDBusBackend.py10
-rw-r--r--src/Gui/CCMainWindow.py6
-rw-r--r--src/Gui/CCReporterDialog.py22
-rw-r--r--src/Gui/CReporterAssistant.py56
-rw-r--r--src/Gui/ConfBackend.py12
-rw-r--r--src/Gui/PluginSettingsUI.py6
-rw-r--r--src/Gui/PluginsSettingsDialog.py6
-rw-r--r--src/Gui/progress_window.glade2
-rw-r--r--src/Gui/report.glade8
-rw-r--r--src/Gui/settings.glade2
-rw-r--r--src/Gui/settings_wizard.glade2
16 files changed, 80 insertions, 80 deletions
diff --git a/src/Applet/CCApplet.cpp b/src/Applet/CCApplet.cpp
index c5046416..063df233 100644
--- a/src/Applet/CCApplet.cpp
+++ b/src/Applet/CCApplet.cpp
@@ -86,7 +86,7 @@ static GtkWidget *create_about_dialog()
"Lapo Calamandrei",
NULL};
- const char *comments = _("Notification area applet to notify user about "
+ const char *comments = _("Notification area applet that notifies users about "
"issues detected by ABRT");
GtkWidget *about_d = gtk_about_dialog_new();
if (about_d)
diff --git a/src/CLI/CLI.cpp b/src/CLI/CLI.cpp
index 0852ed46..6055cec0 100644
--- a/src/CLI/CLI.cpp
+++ b/src/CLI/CLI.cpp
@@ -179,11 +179,11 @@ static void usage(char *argv0)
" -V, --version display the version of %s and exit\n"
" -?, --help print this help\n\n"
"Actions:\n"
- " -l, --list print list of crashes which are not reported yet\n"
- " -f, --full list all crashes, including already reported ones\n"
+ " -l, --list print a list of all crashes which are not yet reported\n"
+ " -f, --full print a list of all crashes, including the already reported ones\n"
" -r, --report CRASH_ID create and send a report\n"
" -y, --always create and send a report without asking\n"
- " -d, --delete CRASH_ID remove crash\n"
+ " -d, --delete CRASH_ID remove a crash\n"
"CRASH_ID can be:\n"
" UID:UUID pair,\n"
" unique UUID prefix - the crash with matching UUID will be acted upon\n"
diff --git a/src/CLI/report.cpp b/src/CLI/report.cpp
index 6bbeb95b..8f0e98e1 100644
--- a/src/CLI/report.cpp
+++ b/src/CLI/report.cpp
@@ -176,7 +176,7 @@ static void write_crash_report_field(FILE *fp, const map_crash_data_t &report,
fprintf(fp, "%s\n", description);
if (it->second[CD_EDITABLE] != CD_ISEDITABLE)
- fprintf(fp, _("# This field is read only.\n"));
+ fprintf(fp, _("# This field is read only\n"));
char *escaped_content = escape(it->second[CD_CONTENT].c_str());
fprintf(fp, "%s\n", escaped_content);
@@ -196,11 +196,11 @@ static void write_crash_report(const map_crash_data_t &report, FILE *fp)
"# Lines starting with '%%----' separate fields, please do not delete them.\n\n");
write_crash_report_field(fp, report, FILENAME_COMMENT,
- _("# Describe the circumstances of this crash below."));
+ _("# Describe the circumstances of this crash below"));
write_crash_report_field(fp, report, FILENAME_REPRODUCE,
_("# How to reproduce the crash?"));
write_crash_report_field(fp, report, FILENAME_BACKTRACE,
- _("# Backtrace\n# Check that it does not contain any sensitive data such as passwords."));
+ _("# Backtrace\n# Check that it does not contain any sensitive data (passwords, etc.)"));
write_crash_report_field(fp, report, CD_DUPHASH, "# DUPHASH");
write_crash_report_field(fp, report, FILENAME_ARCHITECTURE, _("# Architecture"));
write_crash_report_field(fp, report, FILENAME_CMDLINE, _("# Command line"));
@@ -333,7 +333,7 @@ static int launch_editor(const char *path)
terminal = getenv("TERM");
if (!editor && (!terminal || strcmp(terminal, "dumb") == 0))
{
- error_msg(_("Can't run vi: $TERM, $VISUAL and $EDITOR are not set"));
+ error_msg(_("Cannot run vi: $TERM, $VISUAL and $EDITOR are not set"));
return 1;
}
@@ -421,9 +421,9 @@ static int run_report_editor(map_crash_data_t &cr)
int report_changed = read_crash_report(cr, text);
free(text);
if (report_changed)
- puts(_("\nThe report has been updated."));
+ puts(_("\nThe report has been updated"));
else
- puts(_("\nNo changes were detected in the report."));
+ puts(_("\nNo changes were detected in the report"));
return 0;
}
@@ -643,7 +643,7 @@ static void get_reporter_plugin_settings(const vector_string_t& reporters,
continue;
// Read the missing information and push it to plugin settings.
- printf(_("Wrong settings were detected for plugin %s.\n"), it->first.c_str());
+ printf(_("Wrong settings were detected for plugin %s\n"), it->first.c_str());
char result[64];
if (loginMissing)
{
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index d15ac5b0..ccaf3ff1 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -514,7 +514,7 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin
&& worst_dir != ""
) {
log("Size of '%s' >= %u MB, deleting '%s'", DEBUG_DUMPS_DIR, g_settings_nMaxCrashReportsSize, worst_dir.c_str());
- g_pCommLayer->QuotaExceed(_("Report size exceeded the quota. Please check system's MaxCrashReportsSize value in abrt.conf."));
+ g_pCommLayer->QuotaExceed(_("The size of the report exceeded the quota. Please check system's MaxCrashReportsSize value in abrt.conf."));
/* deletes both directory and DB record */
DeleteDebugDump_by_dir(concat_path_file(DEBUG_DUMPS_DIR, worst_dir.c_str()).c_str());
worst_dir = "";
diff --git a/src/Gui/ABRTExceptions.py b/src/Gui/ABRTExceptions.py
index c857f710..0016632c 100644
--- a/src/Gui/ABRTExceptions.py
+++ b/src/Gui/ABRTExceptions.py
@@ -3,14 +3,14 @@ from abrt_utils import _, log, log1, log2
class IsRunning(Exception):
def __init__(self):
Exception.__init__(self)
- self.what = _("Another client is already running, trying to wake it.")
+ self.what = _("Another client is already running, trying to wake it...")
def __str__(self):
return self.what
class WrongData(Exception):
def __init__(self):
Exception.__init__(self)
- self.what = _("Got unexpected data from daemon (is the database properly updated?).")
+ self.what = _("Got unexpected data from the daemon (is the database properly updated?).")
def __str__(self):
return self.what
diff --git a/src/Gui/CCDBusBackend.py b/src/Gui/CCDBusBackend.py
index 75ebdd54..5ddb9cdf 100644
--- a/src/Gui/CCDBusBackend.py
+++ b/src/Gui/CCDBusBackend.py
@@ -71,7 +71,7 @@ class DBusManager(gobject.GObject):
self.bus = dbus.SystemBus()
if not self.bus:
- raise Exception(_("Can't connect to system dbus"))
+ raise Exception(_("Cannot connect to system dbus."))
self.bus.add_signal_receiver(self.owner_changed_cb, "NameOwnerChanged", dbus_interface="org.freedesktop.DBus")
# new crash notification
self.bus.add_signal_receiver(self.crash_cb, "Crash", dbus_interface=ABRTD_DBUS_IFACE)
@@ -94,7 +94,7 @@ class DBusManager(gobject.GObject):
if not self.bus:
self.bus = dbus.SystemBus()
if not self.bus:
- raise Exception(_("Can't connect to system dbus"))
+ raise Exception(_("Cannot connect to system dbus."))
# Autostart hack
# Theoretically, this is not needed, the first dbus call
# should autostart daemon if needed. In practice,
@@ -117,10 +117,10 @@ class DBusManager(gobject.GObject):
except DBusException:
raise Exception("Can't connect to abrt daemon")
if not proxy:
- raise Exception(_("Please check if abrt daemon is running"))
+ raise Exception(_("Please check if the abrt daemon is running."))
daemon = dbus.Interface(proxy, dbus_interface=ABRTD_DBUS_IFACE)
if not daemon:
- raise Exception(_("Please check if abrt daemon is running"))
+ raise Exception(_("Please check if the abrt daemon is running."))
return daemon
# # disconnect callback
@@ -171,7 +171,7 @@ class DBusManager(gobject.GObject):
self.emit("analyze-complete", report)
else:
# FIXME: BUG: BarWindow remains. (how2reproduce: delete "component" in a dump dir and try to report it)
- self.emit("abrt-error", _("Daemon didn't return valid report info\nDebuginfo is missing?"))
+ self.emit("abrt-error", _("Daemon did not return a valid report info.\nIs debuginfo missing?"))
def report_done(self, result):
self.emit("report-done", result)
diff --git a/src/Gui/CCMainWindow.py b/src/Gui/CCMainWindow.py
index 44227149..4ee14768 100644
--- a/src/Gui/CCMainWindow.py
+++ b/src/Gui/CCMainWindow.py
@@ -140,12 +140,12 @@ class MainWindow():
try:
dialog.hydrate()
except Exception, ex:
- gui_error_message(_("Can't show the settings dialog\n%s" % ex))
+ gui_error_message(_("Cannot show the settings dialog.\n%s" % ex))
return
dialog.show()
def error_cb(self, daemon, message=None):
- gui_error_message(_("Unable to finish current task!\n%s" % message), parent_dialog=self.window)
+ gui_error_message(_("Unable to finish the current task!\n%s" % message), parent_dialog=self.window)
def update_cb(self, daemon, message):
self.updates += message
@@ -442,7 +442,7 @@ if __name__ == "__main__":
dumplist = getDumpList(daemon)
crashdump = dumplist.getDumpByCrashID(crashid)
if not crashdump:
- gui_error_message(_("No such crash in database, probably wrong crashid."
+ gui_error_message(_("No such crash in the database, probably wrong crashid."
"\ncrashid=%s" % crashid))
sys.exit()
assistant = ReporterAssistant(crashdump, daemon, parent=None)
diff --git a/src/Gui/CCReporterDialog.py b/src/Gui/CCReporterDialog.py
index 0a0f1098..947a2582 100644
--- a/src/Gui/CCReporterDialog.py
+++ b/src/Gui/CCReporterDialog.py
@@ -19,7 +19,7 @@ REFRESH = -50
SHOW_LOG = -60
# default texts
-COMMENT_HINT_TEXT = _("Brief description how to reproduce this or what you did...")
+COMMENT_HINT_TEXT = _("Brief description of how to reproduce this or what you did...")
HOW_TO_HINT_TEXT = "1.\n2.\n3.\n"
class ReporterDialog():
@@ -104,7 +104,7 @@ class ReporterDialog():
# if an backtrace has rating use it
if not SendBacktrace:
send = False
- error_msgs.append(_("You must check backtrace for sensitive data"))
+ error_msgs.append(_("You must check the backtrace for sensitive data."))
# we have both SendBacktrace and rating
if rating != None:
try:
@@ -115,13 +115,13 @@ class ReporterDialog():
# not usable report
if int(self.report[FILENAME_RATING][CD_CONTENT]) < 3:
if package:
- error_msgs.append(_("Reporting disabled because the backtrace is unusable.\nPlease try to install debuginfo manually using command: <b>debuginfo-install %s</b> \nthen use Refresh button to regenerate the backtrace." % package[0:package.rfind('-',0,package.rfind('-'))]))
+ error_msgs.append(_("Reporting disabled because the backtrace is unusable.\nPlease try to install debuginfo manually using the command: <b>debuginfo-install %s</b> \nthen use the Refresh button to regenerate the backtrace." % package[0:package.rfind('-',0,package.rfind('-'))]))
else:
- error_msgs.append(_("The backtrace is unusable, you can't report this!"))
+ error_msgs.append(_("The backtrace is unusable, you cannot report this!"))
send = False
# probably usable 3
elif int(self.report[FILENAME_RATING][CD_CONTENT]) < 4:
- error_msgs.append(_("The backtrace is incomplete, please make sure you provide good steps to reproduce."))
+ error_msgs.append(_("The backtrace is incomplete, please make sure you provide the steps to reproduce."))
if error_msgs:
self.warn_user(error_msgs)
@@ -129,7 +129,7 @@ class ReporterDialog():
if not send:
bSend.set_tooltip_text(_("Reporting disabled, please fix the problems shown above."))
else:
- bSend.set_tooltip_text(_("Sends the report using selected plugin."))
+ bSend.set_tooltip_text(_("Sends the report using the selected plugin."))
def on_send_backtrace_toggled(self, toggle_button):
self.allow_send()
@@ -395,7 +395,7 @@ class ReporterSelector():
def show(self):
if not self.reporters:
- gui_error_message(_("No reporter plugin available for this type of crash\n"
+ gui_error_message(_("No reporter plugin available for this type of crash.\n"
"Please check abrt.conf."))
elif len(self.reporters) > 1:
self.builder.get_object("vb_reporters").show_all()
@@ -415,7 +415,7 @@ class ReporterSelector():
try:
plugin.save_settings_on_client_side()
except Exception, e:
- gui_error_message(_("Can't save plugin settings:\n %s" % e))
+ gui_error_message(_("Cannot save plugin settings:\n %s" % e))
box = image.get_parent()
im = gtk.Image()
im.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_MENU)
@@ -495,7 +495,7 @@ class ReporterSelector():
# except Exception, e:
# print e
if not report:
- gui_error_message(_("Unable to get report!\nDebuginfo is missing?"))
+ gui_error_message(_("Unable to get report!\nIs debuginfo missing?"))
return
# if we have only one reporter enabled, the window with
@@ -550,7 +550,7 @@ class ReporterSelector():
if self.timer:
gobject.source_remove(self.timer)
self.pBarWindow.hide()
- gui_error_message(_("Error getting the report: %s" % ex))
+ gui_error_message(_("Error acquiring the report: %s" % ex))
return
def show_report(self):
@@ -571,7 +571,7 @@ class ReporterSelector():
if self.timer:
gobject.source_remove(self.timer)
self.pBarWindow.hide()
- gui_error_message(_("Error getting the report: %s" % ex))
+ gui_error_message(_("Error acquiring the report: %s" % ex))
return
def __del__(self):
diff --git a/src/Gui/CReporterAssistant.py b/src/Gui/CReporterAssistant.py
index f6fac260..5c4cc98e 100644
--- a/src/Gui/CReporterAssistant.py
+++ b/src/Gui/CReporterAssistant.py
@@ -16,7 +16,7 @@ PAGE_CONFIRM = 3
PAGE_REPORT_DONE = 4
NO_PROBLEMS_DETECTED = -50
HOW_TO_HINT_TEXT = "1.\n2.\n3.\n"
-COMMENT_HINT_TEXT = _("Brief description how to reproduce this or what you did...")
+COMMENT_HINT_TEXT = _("Brief description of how to reproduce this or what you did...")
MISSING_BACKTRACE_TEXT = _("Crash info doesn't contain a backtrace")
DEFAULT_WIDTH = 800
@@ -198,7 +198,7 @@ class ReporterAssistant():
try:
plugin.save_settings_on_client_side()
except Exception, e:
- gui_error_message(_("Can't save plugin settings:\n %s" % e))
+ gui_error_message(_("Cannot save plugin settings:\n %s" % e))
box = image.get_parent()
im = gtk.Image()
im.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_MENU)
@@ -277,9 +277,9 @@ class ReporterAssistant():
if "RatingRequired" in reporter.Settings.keys():
if reporter.Settings["RatingRequired"] == "yes":
rating_required = True
- log1(_("Rating is required by %s plugin") % reporter)
+ log1(_("Rating is required by the %s plugin") % reporter)
if self.selected_reporters and not rating_required:
- log1(_("Rating is not required by any plugin, skipping the check.."))
+ log1(_("Rating is not required by any plugin, skipping the check..."))
try:
rating = int(self.report.get_rating())
@@ -290,8 +290,8 @@ class ReporterAssistant():
# if an backtrace has rating use it
if not SendBacktrace:
send = False
- error_msgs.append(_("You should check backtrace for sensitive data"))
- error_msgs.append(_("You must agree with sending the backtrace"))
+ error_msgs.append(_("You should check the backtrace for sensitive data."))
+ error_msgs.append(_("You must agree with sending the backtrace."))
# we have both SendBacktrace and rating
if rating_required:
try:
@@ -302,13 +302,13 @@ class ReporterAssistant():
# not usable report
if rating < 3:
if package:
- error_msgs.append(_("Reporting disabled because the backtrace is unusable.\nPlease try to install debuginfo manually using command: <b>debuginfo-install %s</b> \nthen use Refresh button to regenerate the backtrace." % package[0:package.rfind('-',0,package.rfind('-'))]))
+ error_msgs.append(_("Reporting disabled because the backtrace is unusable.\nPlease try to install debuginfo manually using the command: <b>debuginfo-install %s</b> \nthen use the Refresh button to regenerate the backtrace." % package[0:package.rfind('-',0,package.rfind('-'))]))
else:
- error_msgs.append(_("The backtrace is unusable, you can't report this!"))
+ error_msgs.append(_("The backtrace is unusable, you cannot report this!"))
send = False
# probably usable 3
elif rating < 4:
- error_msgs.append(_("The backtrace is incomplete, please make sure you provide good steps to reproduce."))
+ error_msgs.append(_("The backtrace is incomplete, please make sure you provide the steps to reproduce."))
if error_msgs:
self.warn_user(error_msgs)
@@ -349,7 +349,7 @@ class ReporterAssistant():
self.steps.set_text(howto_text)
self.result[FILENAME_REPRODUCE] = [CD_TXT, 'y', howto_text]
else:
- self.steps.set_text(_("You didn't provide any steps to reproduce."))
+ self.steps.set_text(_("You did not provide any steps to reproduce."))
try:
del self.result[FILENAME_REPRODUCE]
except KeyError:
@@ -363,7 +363,7 @@ class ReporterAssistant():
self.comments.set_text(comment_text)
self.result[FILENAME_COMMENT] = [CD_TXT, 'y', comment_text]
else:
- self.comments.set_text(_("You didn't provide any comments."))
+ self.comments.set_text(_("You did not provide any comments."))
try:
del self.result[FILENAME_COMMENT]
except KeyError:
@@ -445,15 +445,15 @@ class ReporterAssistant():
lbl_default_info.set_size_request(DEFAULT_WIDTH-50, -1)
lbl_default_info.set_markup(_("It looks like an application from the "
"package <b>%s</b> has crashed "
- "on your system. It's a good idea to send "
+ "on your system. It is a good idea to send "
"a bug report about this issue. The report "
"will provide software maintainers with "
"information essential in figuring out how "
- "to provide a bug fix for you\n\n"
+ "to provide a bug fix for you.\n\n"
"Please review the information that follows "
"and modify it as needed to ensure your bug "
- "report does not contain any sensitive date "
- "you'd rather not share\n\n"
+ "report does not contain any sensitive data "
+ "you would rather not share.\n\n"
"Select where you would like to report the "
"bug, and press 'Forward' to continue.")
% self.report.getPackageName())
@@ -503,7 +503,7 @@ class ReporterAssistant():
if self.reporters[0].Settings.check():
self.selected_reporters.append(self.reporters[0])
self.assistant.set_page_complete(page, True)
- log1(_("Only one reporter plugin is configured"))
+ log1(_("Only one reporter plugin is configured."))
# this is safe, because in python the variable is visible even
# outside the for loop
cb.set_active(True)
@@ -550,10 +550,10 @@ class ReporterAssistant():
lbl_default_info.set_size_request(DEFAULT_WIDTH-50, -1)
lbl_default_info.set_text(_("Below is the backtrace associated with your "
"crash. A crash backtrace provides developers with details about "
- "how a crash happen, helping them track down the source of the "
- "problem\n\n"
+ "how the crash happened, helping them track down the source of the "
+ "problem.\n\n"
"Please review the backtrace below and modify it as needed to "
- "ensure your bug report does not contain any sensitive date you'd "
+ "ensure your bug report does not contain any sensitive data you would "
"rather not share:")
)
page.pack_start(lbl_default_info, expand=False, fill=True)
@@ -602,7 +602,7 @@ class ReporterAssistant():
self.assistant.insert_page(page, PAGE_BACKTRACE_APPROVAL)
self.pdict_add_page(page, PAGE_BACKTRACE_APPROVAL)
self.assistant.set_page_type(page, gtk.ASSISTANT_PAGE_CONTENT)
- self.assistant.set_page_title(page, _("Approve backtrace"))
+ self.assistant.set_page_title(page, _("Approve the backtrace"))
page.pack_start(hbox_bt)
page.pack_start(self.backtrace_cb, expand=False, fill=False)
page.show_all()
@@ -625,7 +625,7 @@ class ReporterAssistant():
# how to reproduce
howto_vbox = gtk.VBox(spacing=5)
- howto_lbl = gtk.Label(_("How this crash happen, step-by-step? "
+ howto_lbl = gtk.Label(_("How did this crash happen (step-by-step)? "
"How would you reproduce it?"))
howto_lbl.set_alignment(0.0, 0.0)
howto_lbl.set_justify(gtk.JUSTIFY_FILL)
@@ -643,7 +643,7 @@ class ReporterAssistant():
# comment
comment_vbox = gtk.VBox(spacing=5)
- comment_lbl = gtk.Label(_("Are there any comments you'd like to share "
+ comment_lbl = gtk.Label(_("Are there any comments you would like to share "
"with the software maintainers?"))
comment_lbl.set_alignment(0.0, 0.0)
comment_lbl.set_justify(gtk.JUSTIFY_FILL)
@@ -669,8 +669,8 @@ class ReporterAssistant():
tip_lbl = gtk.Label("")
tip_lbl.set_alignment(0.0, 0.0)
tip_lbl.set_justify(gtk.JUSTIFY_FILL)
- tip_lbl.set_markup(_("<b>Tip:</b> Your comments are not private. "
- "Please monitor what you say accordingly."))
+ tip_lbl.set_markup(_("<b>Tip:</b> Your comments are not private. "
+ "Please watch what you say accordingly."))
#tip_hbox.pack_start(tip_image)
tip_hbox.pack_start(tip_lbl, expand=False)
page.pack_start(details_hbox)
@@ -710,7 +710,7 @@ class ReporterAssistant():
self.assistant.insert_page(page, PAGE_CONFIRM)
self.pdict_add_page(page, PAGE_CONFIRM)
self.assistant.set_page_type(page, gtk.ASSISTANT_PAGE_CONFIRM)
- self.assistant.set_page_title(page, _("Confirm and send report"))
+ self.assistant.set_page_title(page, _("Confirm and send the report"))
self.assistant.set_page_complete(page, True)
summary_lbl = gtk.Label(_("Below is a summary of your bug report. "
"Please click 'Apply' to submit it."))
@@ -746,7 +746,7 @@ class ReporterAssistant():
backtrace_lbl.set_markup(_("<b>Backtrace</b>"))
backtrace_lbl.set_alignment(0.0, 0.5)
backtrace_lbl.set_justify(gtk.JUSTIFY_LEFT)
- backtrace_show_btn = gtk.Button(_("Click to view ..."))
+ backtrace_show_btn = gtk.Button(_("Click to view..."))
backtrace_show_btn.connect("clicked", self.on_show_bt_clicked)
backtrace_hbox = gtk.HBox(homogeneous=True)
hb = gtk.HBox()
@@ -839,7 +839,7 @@ class ReporterAssistant():
pass
self.pBarWindow.hide()
if not result:
- gui_error_message(_("Unable to get report!\nDebuginfo is missing?"))
+ gui_error_message(_("Unable to get report!\nIs debuginfo missing?"))
return
self.result = result
# set the backtrace text
@@ -878,7 +878,7 @@ class ReporterAssistant():
if self.timer:
gobject.source_remove(self.timer)
self.pBarWindow.hide()
- gui_error_message(_("Error getting the report: %s" % ex))
+ gui_error_message(_("Error acquiring the report: %s" % ex))
return
def show(self):
diff --git a/src/Gui/ConfBackend.py b/src/Gui/ConfBackend.py
index bb62da43..d3def183 100644
--- a/src/Gui/ConfBackend.py
+++ b/src/Gui/ConfBackend.py
@@ -74,13 +74,13 @@ class ConfBackendGnomeKeyring(ConfBackend):
if g_default_key_ring:
return
if not gkey or not gkey.is_available():
- raise ConfBackendInitError(_("Can't connect to Gnome Keyring daemon"))
+ raise ConfBackendInitError(_("Cannot connect to the Gnome Keyring daemon."))
try:
g_default_key_ring = gkey.get_default_keyring_sync()
except:
# could happen if keyring daemon is running, but we run gui under
# user who is not the owner of the running session - using su
- raise ConfBackendInitError(_("Can't get default keyring"))
+ raise ConfBackendInitError(_("Cannot get the default keyring."))
def save(self, name, settings):
settings_tmp = settings.copy()
@@ -99,7 +99,7 @@ class ConfBackendGnomeKeyring(ConfBackend):
# nothing found
pass
except gkey.DeniedError:
- raise ConfBackendSaveError(_("Access to gnome-keyring has been denied, plugins settings won't be saved."))
+ raise ConfBackendSaveError(_("Access to gnome-keyring has been denied, plugins settings will not be saved."))
# if plugin has a "Password" setting, we handle it specially: in keyring,
# it is stored as item.secret, not as one of attributes
password = ""
@@ -115,7 +115,7 @@ class ConfBackendGnomeKeyring(ConfBackend):
password, # secret
True)
except gkey.DeniedError:
- raise ConfBackendSaveError(_("Access to gnome-keyring has been denied, plugins settings won't be saved."))
+ raise ConfBackendSaveError(_("Access to gnome-keyring has been denied, plugins settings will not be saved."))
def load(self, name):
item_list = None
@@ -149,7 +149,7 @@ class ConfBackendGnomeKeyring(ConfBackend):
log2("gk-authorization has failed %i time(s)", 2-attempts)
if attempts == 0:
# we tried 2 times, so giving up the authorization
- raise ConfBackendLoadError(_("Access to gnome-keyring has been denied, can't load the settings for %s!" % name))
+ raise ConfBackendLoadError(_("Access to gnome-keyring has been denied, cannot load the settings for %s!" % name))
continue
break
@@ -202,7 +202,7 @@ class ConfBackendGnomeKeyring(ConfBackend):
# nothing found
pass
except gkey.DeniedError:
- raise ConfBackendLoadError(_("Access to gnome-keyring has been denied, can't load settings"))
+ raise ConfBackendLoadError(_("Access to gnome-keyring has been denied, cannot load settings."))
for item in item_list:
# gnome keyring is weeeeird. why display_name, type, mtime, ctime
diff --git a/src/Gui/PluginSettingsUI.py b/src/Gui/PluginSettingsUI.py
index aa8f5310..db4c92de 100644
--- a/src/Gui/PluginSettingsUI.py
+++ b/src/Gui/PluginSettingsUI.py
@@ -14,7 +14,7 @@ class PluginSettingsUI():
self.plugin_gui.add_from_file(pluginfo.getGUI())
self.dialog = self.plugin_gui.get_object("PluginDialog")
if not self.dialog:
- raise Exception(_("Can't find PluginDialog widget in UI description!"))
+ raise Exception(_("Cannot find PluginDialog widget in the UI description!"))
self.dialog.set_title("%s" % pluginfo.getName())
if parent:
self.dialog.set_transient_for(parent)
@@ -56,7 +56,7 @@ class PluginSettingsUI():
elif type(widget) == gtk.CheckButton:
widget.set_active(value == "yes")
elif type(widget) == gtk.ComboBox:
- print _("combo box is not implemented")
+ print _("Combo box is not implemented")
else:
#print "Plugin %s has no configuration." % self.plugin_name
pass
@@ -82,7 +82,7 @@ class PluginSettingsUI():
else:
self.Settings[key] = "no"
elif type(widget) == gtk.ComboBox:
- print _("combo box is not implemented")
+ print _("Combo box is not implemented")
def destroy(self):
self.dialog.destroy()
diff --git a/src/Gui/PluginsSettingsDialog.py b/src/Gui/PluginsSettingsDialog.py
index 05904300..2951320e 100644
--- a/src/Gui/PluginsSettingsDialog.py
+++ b/src/Gui/PluginsSettingsDialog.py
@@ -21,7 +21,7 @@ class PluginsSettingsDialog:
print e
self.window = self.builder.get_object("wPluginsSettings")
if not self.window:
- raise Exception(_("Can't load gui description for SettingsDialog!"))
+ raise Exception(_("Cannot load the GUI description for SettingsDialog!"))
if parent:
self.window.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
@@ -153,7 +153,7 @@ class PluginsSettingsDialog:
try:
ui = PluginSettingsUI(pluginfo, parent=self.window)
except Exception, e:
- gui_error_message(_("Error while opening plugin settings UI: \n\n%s" % e))
+ gui_error_message(_("Error while opening the plugin settings UI: \n\n%s" % e))
return
ui.hydrate()
response = ui.run()
@@ -166,7 +166,7 @@ class PluginsSettingsDialog:
# when Report() is called
self.ccdaemon.setPluginSettings(pluginfo.getName(), pluginfo.Settings)
except Exception, e:
- gui_error_message(_("Can't save plugin settings:\n %s" % e))
+ gui_error_message(_("Cannot save plugin settings:\n %s" % e))
#for key, val in pluginfo.Settings.iteritems():
# print "%s:%s" % (key, val)
elif response == gtk.RESPONSE_CANCEL:
diff --git a/src/Gui/progress_window.glade b/src/Gui/progress_window.glade
index b23821a9..af48ee55 100644
--- a/src/Gui/progress_window.glade
+++ b/src/Gui/progress_window.glade
@@ -5,7 +5,7 @@
<object class="GtkWindow" id="pBarWindow">
<property name="width_request">500</property>
<property name="border_width">12</property>
- <property name="title" translatable="yes">Please wait..</property>
+ <property name="title" translatable="yes">Please wait...</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="icon_name">abrt</property>
diff --git a/src/Gui/report.glade b/src/Gui/report.glade
index 973b105a..2f79b39f 100644
--- a/src/Gui/report.glade
+++ b/src/Gui/report.glade
@@ -328,7 +328,7 @@
<property name="visible">True</property>
<child>
<object class="GtkCheckButton" id="cbSendBacktrace">
- <property name="label" translatable="yes">I checked backtrace and removed sensitive data (passwords, etc)</property>
+ <property name="label" translatable="yes">I checked the backtrace and removed sensitive data (passwords, etc)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -558,7 +558,7 @@
<child>
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Please fix the following problems&lt;/b&gt;</property>
+ <property name="label" translatable="yes">&lt;b&gt;Please fix the following problems:&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
<packing>
@@ -651,7 +651,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Forces ABRT to regenerate the backtrace</property>
+ <property name="tooltip_text" translatable="yes">Forces ABRT to regenerate the backtrace.</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -761,7 +761,7 @@
<object class="GtkWindow" id="pBarWindow">
<property name="width_request">500</property>
<property name="border_width">12</property>
- <property name="title" translatable="yes">Please wait..</property>
+ <property name="title" translatable="yes">Please wait...</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="icon_name">abrt</property>
diff --git a/src/Gui/settings.glade b/src/Gui/settings.glade
index 637f5cc5..b83e6617 100644
--- a/src/Gui/settings.glade
+++ b/src/Gui/settings.glade
@@ -338,7 +338,7 @@
<property name="visible">True</property>
<property name="xalign">2.2351741291171123e-10</property>
<property name="xpad">5</property>
- <property name="label" translatable="yes">Max coredump storage size(MB):</property>
+ <property name="label" translatable="yes">Max coredump storage size (MB):</property>
</object>
<packing>
<property name="top_attach">3</property>
diff --git a/src/Gui/settings_wizard.glade b/src/Gui/settings_wizard.glade
index 3f3072be..24cb200a 100644
--- a/src/Gui/settings_wizard.glade
+++ b/src/Gui/settings_wizard.glade
@@ -37,7 +37,7 @@
<child>
<object class="GtkLabel" id="lWrongSettingsWarning">
<property name="visible">True</property>
- <property name="label" translatable="yes">Wrong settings detected for some of the enabled reporter plugins, please use the buttons below to open respective configuration and fix it before you proceed, otherwise the reporting process can fail.
+ <property name="label" translatable="yes">Wrong settings were detected for some of the enabled reporter plugins. Please use the buttons below to open the respective configuration and fix it before you proceed, otherwise, the reporting process may fail.
</property>
<property name="use_markup">True</property>
<property name="justify">fill</property>