Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt

5 files changed, 10 insertions, 10 deletions

diff --git a/src/Gui/ABRTPlugin.py b/src/Gui/ABRTPlugin.py
index 8483be44..ea90b87c 100644
--- a/src/Gui/ABRTPlugin.py
+++ b/src/Gui/ABRTPlugin.py
@@ -94,7 +94,7 @@ class PluginInfo():
         if self.Name:
             self.Settings.load(self.Name, default_settings)
         else:
-            print _("Plugin name is not set, can't load it's settings")
+            print _("Plugin name is not set, can't load its settings")
 
     def save_settings(self):
         self.Settings.save(str(self.Name))
diff --git a/src/Gui/CCDBusBackend.py b/src/Gui/CCDBusBackend.py
index 30c51038..c8b8ca8f 100644
--- a/src/Gui/CCDBusBackend.py
+++ b/src/Gui/CCDBusBackend.py
@@ -152,7 +152,7 @@ class DBusManager(gobject.GObject):
         if dump:
             self.emit("analyze-complete", dump)
         else:
-            self.emit("abrt-error",_("Daemon did't return valid report info\nDebuginfo is missing?"))
+            self.emit("abrt-error",_("Daemon didn't return valid report info\nDebuginfo is missing?"))
 
     def report_done(self, result):
         self.emit("report-done", result)
diff --git a/src/Gui/CCReporterDialog.py b/src/Gui/CCReporterDialog.py
index 16f5843f..84254846 100644
--- a/src/Gui/CCReporterDialog.py
+++ b/src/Gui/CCReporterDialog.py
@@ -223,13 +223,13 @@ class ReporterDialog():
                         lErrors.set_markup(
                             "<span color=\"white\">%s</span>" % _("Reporting disabled because the backtrace is unusable.\nPlease try to install debuginfo manually using command:<span color=\"blue\"> debuginfo-install %s </span>\nthen use Refresh button to regenerate the backtrace." % package[0:package.rfind('-',0,package.rfind('-'))]))
                     else:
-                        lErrors.set_markup("<span color=\"white\">%s</span>" % _("The bactrace is unusable, you can't report this!"))
+                        lErrors.set_markup("<span color=\"white\">%s</span>" % _("The backtrace is unusable, you can't report this!"))
                     bSend.set_sensitive(False)
                 # probably usable 3
                 elif int(self.report[item][CD_CONTENT]) < 4:
                     ebErrors.show()
                     ebErrors.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("yellow"))
-                    lErrors.set_markup("<span color=\"black\">%s</span>" % _("The bactrace is incomplete, please make sure you provide good steps to reproduce."))
+                    lErrors.set_markup("<span color=\"black\">%s</span>" % _("The backtrace is incomplete, please make sure you provide good steps to reproduce."))
                     bSend.set_sensitive(True)
                 else:
                     ebErrors.hide()
diff --git a/src/Gui/dialogs.glade b/src/Gui/dialogs.glade
index e6910891..9d24864f 100644
--- a/src/Gui/dialogs.glade
+++ b/src/Gui/dialogs.glade
@@ -44,7 +44,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button1">
-                <property name="label" translatable="yes">gtk-ok</property>
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/src/Gui/settings.glade b/src/Gui/settings.glade
index 2d50ab1f..8eaa7760 100644
--- a/src/Gui/settings.glade
+++ b/src/Gui/settings.glade
@@ -188,7 +188,7 @@
             </child>
             <child>
               <object class="GtkButton" id="bClose">
-                <property name="label" translatable="yes">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -692,7 +692,7 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="bSaveSettings">
-                    <property name="label" translatable="yes">gtk-ok</property>
+                    <property name="label">gtk-ok</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
@@ -758,7 +758,7 @@
             <property name="homogeneous">True</property>
             <child>
               <object class="GtkButton" id="bAddGPGKey">
-                <property name="label" translatable="yes">gtk-add</property>
+                <property name="label">gtk-add</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -770,7 +770,7 @@
             </child>
             <child>
               <object class="GtkButton" id="bRemoveGPGKey">
-                <property name="label" translatable="yes">gtk-remove</property>
+                <property name="label">gtk-remove</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -794,7 +794,7 @@
             </child>
             <child>
               <object class="GtkButton" id="bCancelGPGKeys">
-                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>