summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DistUpgrade/DistUpgradeViewGtk.py3
-rw-r--r--UpdateManager/UpdateManager.py9
-rw-r--r--data/SoftwareProperties.glade2
-rw-r--r--data/SoftwarePropertiesDialogs.glade2
4 files changed, 10 insertions, 6 deletions
diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index 3236ba14..dba8014f 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -299,7 +299,8 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp):
logging.error("not handled expection:\n%s" % "\n".join(lines))
self.error(_("A fatal error occured"),
_("Please report this as a bug and include the "
- "files ~/dist-upgrade.log and ~/dist-upgrade-apt.log "
+ "files '/var/log/dist-upgrade.log' and "
+ "'/var/log/dist-upgrade-apt.log' "
"in your report. The upgrade aborts now. "),
"\n".join(lines))
sys.exit(1)
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 59a19612..b4090589 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -437,9 +437,12 @@ class UpdateManager(SimpleGladeApp):
self.textview_changes.get_buffer().set_text("")
self.textview_descr.get_buffer().set_text("")
else:
- text_header = "<big><b>"+gettext.ngettext("You can install one update", "You can install %s updates" % len(self.store), len(self.store))+"</b></big>"
-
- text_download = _("Download size: %s" % apt_pkg.SizeToStr(self.dl_size))
+ text_header = "<big><b>" + \
+ gettext.ngettext("You can install %s update",
+ "You can install %s updates",
+ len(self.store)) % \
+ len(self.store) + "</b></big>"
+ text_download = _("Download size: %s") % apt_pkg.SizeToStr(self.dl_size)
self.notebook_details.set_sensitive(True)
self.treeview_update.set_sensitive(True)
self.button_install.grab_default()
diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade
index 58584826..a1f7f8f9 100644
--- a/data/SoftwareProperties.glade
+++ b/data/SoftwareProperties.glade
@@ -390,7 +390,7 @@
<child>
<widget class="GtkCheckButton" id="checkbutton_unattended">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Only security updates from the official Ubuntu servers will be installed automatically. The software package &quot;unattended-upgrades&quot; needs to be installed therefor</property>
+ <property name="tooltip" translatable="yes">Only security updates from the official Ubuntu servers will be installed automatically</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Install security updates without confirmation</property>
<property name="use_underline">True</property>
diff --git a/data/SoftwarePropertiesDialogs.glade b/data/SoftwarePropertiesDialogs.glade
index 549a9c7c..8c5b00c6 100644
--- a/data/SoftwarePropertiesDialogs.glade
+++ b/data/SoftwarePropertiesDialogs.glade
@@ -451,7 +451,7 @@
<property name="can_focus">True</property>
<property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Enter the complete APT line of the channel that you want to add&lt;/b&gt;&lt;/big&gt;
-The APT line contains the type, location and sections of a channel, for example &lt;i&gt;&quot;deb http://ftp.debian.org sarge main&quot;&lt;/i&gt;.</property>
+The APT line includes the type, location and components of a channel, for example &lt;i&gt;&quot;deb http://ftp.debian.org sarge main&quot;&lt;/i&gt;.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>