diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/channels/README.channels | 5 | ||||
| -rw-r--r-- | data/channels/Ubuntu.info | 56 | ||||
| -rw-r--r-- | data/channels/Ubuntu.info.in | 84 | ||||
| -rw-r--r-- | data/glade/SoftwarePropertiesDialogs.glade | 8 | ||||
| -rw-r--r-- | data/glade/UpdateManager.glade | 284 | ||||
| -rw-r--r-- | data/update-manager.schemas.in | 4 |
6 files changed, 209 insertions, 232 deletions
diff --git a/data/channels/README.channels b/data/channels/README.channels index 6bc76872..414148ed 100644 --- a/data/channels/README.channels +++ b/data/channels/README.channels @@ -37,11 +37,10 @@ Description: description of the suite. the translation is done through Component: a component/section of the suite (ignored if ParentSuite is set) -Enabled: activate the component by default (ignored if ParentSuite is - set) - CompDescription: humand readable description of the component/section (ignored if ParentSuite is set). the translation is done through gettext at runtime +ValidMirros: A file that contains a list of mirrors + diff --git a/data/channels/Ubuntu.info b/data/channels/Ubuntu.info index 93ec83d2..4588a9b1 100644 --- a/data/channels/Ubuntu.info +++ b/data/channels/Ubuntu.info @@ -7,19 +7,15 @@ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/update-manager/mirrors.cfg Description: Ubuntu 6.10 'Edgy Eft' Component: main -Enabled: 1 CompDescription: Officially supported CompDescriptionLong: By Canonical supported Open Source software Component: universe -Enabled: 0 CompDescription: Community maintained CompDescriptionLong: Community maintained Open Source software Component: restricted -Enabled: 1 CompDescription: Non-free drivers CompDescriptionLong: Proprietary drivers for devices Component: multiverse -Enabled: 0 CompDescription: Restricted software CompDescriptionLong: By copyright or legal issues restricted software @@ -29,10 +25,8 @@ BaseURI: cdrom:\[Ubuntu.*6.10 Description: Cdrom with Ubuntu 6.10 'Edgy Eft' Available: False Component: main -Enabled: 1 CompDescription: Oficially supported Component: restricted -Enabled: 1 CompDescription: Restricted copyright Suite: edgy-security @@ -45,22 +39,16 @@ Description: Important security updates Suite: edgy-updates ParentSuite: edgy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Recommended updates Suite: edgy-proposed ParentSuite: edgy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Proposed updates Suite: edgy-backports ParentSuite: edgy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Backported updates Suite: dapper @@ -70,19 +58,15 @@ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/update-manager/mirrors.cfg Description: Ubuntu 6.06 LTS 'Dapper Drake' Component: main -Enabled: 1 CompDescription: Officially supported CompDescriptionLong: By Canonical supported Open Source software Component: universe -Enabled: 0 CompDescription: Community maintained (universe) CompDescriptionLong: Community maintained Open Source software Component: restricted -Enabled: 1 CompDescription: Non-free drivers CompDescriptionLong: Proprietary drivers for devices Component: multiverse -Enabled: 0 CompDescription: Restricted software (Multiverse) CompDescriptionLong: By copyright or legal issues restricted software @@ -92,10 +76,8 @@ BaseURI: cdrom:\[Ubuntu.*6.06 Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake' Available: False Component: main -Enabled: 1 CompDescription: Oficially supported Component: restricted -Enabled: 1 CompDescription: Restricted copyright Suite: dapper-security @@ -108,22 +90,16 @@ Description: Important security updates Suite: dapper-updates ParentSuite: dapper RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Recommended updates Suite: dapper-proposed ParentSuite: dapper RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Proposed updates Suite: dapper-backports ParentSuite: dapper RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Backported updates Suite: breezy @@ -133,16 +109,12 @@ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/update-manager/mirrors.cfg Description: Ubuntu 5.10 'Breezy Badger' Component: main -Enabled: 1 CompDescription: Officially supported Component: restricted -Enabled: 1 CompDescription: Restricted copyright Component: universe -Enabled: 0 CompDescription: Community maintained (Universe) Component: multiverse -Enabled: 0 CompDescription: Non-free (Multiverse) Suite: breezy @@ -151,10 +123,8 @@ BaseURI: cdrom:\[Ubuntu.*5.10 Description: Cdrom with Ubuntu 5.10 'Breezy Badger' Available: False Component: main -Enabled: 1 CompDescription: Oficially supported Component: restricted -Enabled: 1 CompDescription: Restricted copyright Suite: breezy-security @@ -167,15 +137,11 @@ Description: Ubuntu 5.10 Security Updates Suite: breezy-updates ParentSuite: breezy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 5.10 Updates Suite: breezy-backports ParentSuite: breezy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 5.10 Backports Suite: hoary @@ -185,16 +151,12 @@ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/update-manager/mirrors.cfg Description: Ubuntu 5.04 'Hoary Hedgehog' Component: main -Enabled: 1 CompDescription: Oficially supported Component: restricted -Enabled: 1 CompDescription: Restricted copyright Component: universe -Enabled: 0 CompDescription: Community maintained (Universe) Component: multiverse -Enabled: 0 CompDescription: Non-free (Multiverse) Suite: hoary @@ -203,10 +165,8 @@ BaseURI: cdrom:\[Ubuntu.*5.04 Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog' Available: False Component: main -Enabled: 1 CompDescription: Oficially supported Component: restricted -Enabled: 1 CompDescription: Restricted copyright Suite: hoary-security @@ -219,15 +179,11 @@ Description: Ubuntu 5.04 Security Updates Suite: hoary-updates ParentSuite: hoary RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 5.04 Updates Suite: hoary-backports ParentSuite: hoary RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 5.04 Backports Suite: warty @@ -236,16 +192,12 @@ BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 4.10 'Warty Warthog' Component: main -Enabled: 1 CompDescription: No longer oficially supported Component: restricted -Enabled: 1 CompDescription: Restricted copyright Component: universe -Enabled: 0 CompDescription: Community maintained (Universe) Component: multiverse -Enabled: 0 CompDescription: Non-free (Multiverse) Suite: warty @@ -254,29 +206,23 @@ BaseURI: cdrom:\[Ubuntu.*4.10 Description: Cdrom with Ubuntu 4.10 'Warty Warthog' Available: False Component: main -Enabled: 1 CompDescription: No longer oficially supported Component: restricted -Enabled: 1 CompDescription: Restricted copyright Suite: warty-security ParentSuite: warty RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.comubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com Description: Ubuntu 4.10 Security Updates Suite: warty-updates ParentSuite: warty RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 4.10 Updates Suite: warty-backports ParentSuite: warty RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 4.10 Backports diff --git a/data/channels/Ubuntu.info.in b/data/channels/Ubuntu.info.in index 2b20cf8f..1afc66c9 100644 --- a/data/channels/Ubuntu.info.in +++ b/data/channels/Ubuntu.info.in @@ -7,19 +7,15 @@ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 6.10 'Edgy Eft' Component: main -Enabled: 1 _CompDescription: Officially supported _CompDescriptionLong: By Canonical supported Open Source software Component: universe -Enabled: 0 _CompDescription: Community maintained _CompDescriptionLong: Community maintained Open Source software Component: restricted -Enabled: 1 _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices Component: multiverse -Enabled: 0 _CompDescription: Restricted software _CompDescriptionLong: By copyright or legal issues restricted software @@ -29,10 +25,8 @@ BaseURI: cdrom:\[Ubuntu.*6.10 _Description: Cdrom with Ubuntu 6.10 'Edgy Eft' Available: False Component: main -Enabled: 1 -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted -Enabled: 1 _CompDescription: Restricted copyright Suite: edgy-security @@ -40,31 +34,21 @@ ParentSuite: edgy RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Important security updates Suite: edgy-updates ParentSuite: edgy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Recommended updates Suite: edgy-proposed ParentSuite: edgy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Proposed updates Suite: edgy-backports ParentSuite: edgy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Backported updates Suite: dapper @@ -74,19 +58,15 @@ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 6.06 LTS 'Dapper Drake' Component: main -Enabled: 1 _CompDescription: Officially supported _CompDescriptionLong: By Canonical supported Open Source software Component: universe -Enabled: 0 _CompDescription: Community maintained (universe) _CompDescriptionLong: Community maintained Open Source software Component: restricted -Enabled: 1 _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices Component: multiverse -Enabled: 0 _CompDescription: Restricted software (Multiverse) _CompDescriptionLong: By copyright or legal issues restricted software @@ -96,10 +76,8 @@ BaseURI: cdrom:\[Ubuntu.*6.06 _Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake' Available: False Component: main -Enabled: 1 -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted -Enabled: 1 _CompDescription: Restricted copyright Suite: dapper-security @@ -107,31 +85,21 @@ ParentSuite: dapper RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Important security updates Suite: dapper-updates ParentSuite: dapper RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Recommended updates Suite: dapper-proposed ParentSuite: dapper RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Proposed updates Suite: dapper-backports ParentSuite: dapper RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Backported updates Suite: breezy @@ -141,16 +109,12 @@ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.10 'Breezy Badger' Component: main -Enabled: 1 _CompDescription: Officially supported Component: restricted -Enabled: 1 _CompDescription: Restricted copyright Component: universe -Enabled: 0 _CompDescription: Community maintained (Universe) Component: multiverse -Enabled: 0 _CompDescription: Non-free (Multiverse) Suite: breezy @@ -159,10 +123,8 @@ BaseURI: cdrom:\[Ubuntu.*5.10 _Description: Cdrom with Ubuntu 5.10 'Breezy Badger' Available: False Component: main -Enabled: 1 -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted -Enabled: 1 _CompDescription: Restricted copyright Suite: breezy-security @@ -170,23 +132,16 @@ ParentSuite: breezy RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.10 Security Updates Suite: breezy-updates ParentSuite: breezy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.10 Updates Suite: breezy-backports ParentSuite: breezy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.10 Backports Suite: hoary @@ -196,16 +151,12 @@ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.04 'Hoary Hedgehog' Component: main -Enabled: 1 -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted -Enabled: 1 _CompDescription: Restricted copyright Component: universe -Enabled: 0 _CompDescription: Community maintained (Universe) Component: multiverse -Enabled: 0 _CompDescription: Non-free (Multiverse) Suite: hoary @@ -214,10 +165,8 @@ BaseURI: cdrom:\[Ubuntu.*5.04 _Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog' Available: False Component: main -Enabled: 1 -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted -Enabled: 1 _CompDescription: Restricted copyright Suite: hoary-security @@ -225,23 +174,16 @@ ParentSuite: hoary RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.04 Security Updates Suite: hoary-updates ParentSuite: hoary RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.04 Updates Suite: hoary-backports ParentSuite: hoary RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.04 Backports Suite: warty @@ -250,16 +192,12 @@ BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu _Description: Ubuntu 4.10 'Warty Warthog' Component: main -Enabled: 1 -_CompDescription: No longer oficially supported +_CompDescription: No longer officially supported Component: restricted -Enabled: 1 _CompDescription: Restricted copyright Component: universe -Enabled: 0 _CompDescription: Community maintained (Universe) Component: multiverse -Enabled: 0 _CompDescription: Non-free (Multiverse) Suite: warty @@ -268,29 +206,23 @@ BaseURI: cdrom:\[Ubuntu.*4.10 _Description: Cdrom with Ubuntu 4.10 'Warty Warthog' Available: False Component: main -Enabled: 1 -_CompDescription: No longer oficially supported +_CompDescription: No longer officially supported Component: restricted -Enabled: 1 _CompDescription: Restricted copyright Suite: warty-security ParentSuite: warty RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.comubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com _Description: Ubuntu 4.10 Security Updates Suite: warty-updates ParentSuite: warty RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu _Description: Ubuntu 4.10 Updates Suite: warty-backports ParentSuite: warty RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu _Description: Ubuntu 4.10 Backports diff --git a/data/glade/SoftwarePropertiesDialogs.glade b/data/glade/SoftwarePropertiesDialogs.glade index b4bf6180..7334d67a 100644 --- a/data/glade/SoftwarePropertiesDialogs.glade +++ b/data/glade/SoftwarePropertiesDialogs.glade @@ -164,9 +164,9 @@ <widget class="GtkLabel" id="label33"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes"><big><b>Enter the complete APT line of the source that you want to add</b></big> + <property name="label" translatable="yes"><big><b>Enter the complete APT line of the repository that you want to add as source</b></big> -The APT line includes the type, location and components of a source, for example <i>"deb http://ftp.debian.org sarge main"</i>.</property> +The APT line includes the type, location and components of a repository, for example <i>"deb http://ftp.debian.org sarge main"</i>.</property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -859,9 +859,9 @@ Source</property> <widget class="GtkLabel" id="label70"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes"><b><big>The channel information is out-of-date</big></b> + <property name="label" translatable="yes"><b><big>The information about available software is out-of-date</big></b> -You have to reload the channel information to install software and updates from newly added or changed channels. +To install software and updates from newly added or changed sources, you have to reload the information about available software. You need a working internet connection to continue.</property> <property name="use_underline">False</property> diff --git a/data/glade/UpdateManager.glade b/data/glade/UpdateManager.glade index 372be566..a11a5a43 100644 --- a/data/glade/UpdateManager.glade +++ b/data/glade/UpdateManager.glade @@ -468,7 +468,7 @@ <widget class="GtkExpander" id="expander_details"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="expanded">False</property> + <property name="expanded">True</property> <property name="spacing">6</property> <signal name="activate" handler="on_expander_details_activate" last_modification_time="Mon, 31 Jan 2005 17:55:19 GMT"/> @@ -533,92 +533,6 @@ <property name="fill">True</property> </packing> </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox3"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkButton" id="button_cancel_dl_changelog"> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - - <child> - <widget class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox8"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image7"> - <property name="visible">True</property> - <property name="stock">gtk-cancel</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label13"> - <property name="visible">True</property> - <property name="label" translatable="yes">Cancel _Download</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> </widget> <packing> <property name="tab_expand">False</property> @@ -1288,7 +1202,7 @@ <property name="can_focus">True</property> <property name="label" translatable="yes"><b><big>You must check for updates manually</big></b> -Your system does not check for updates automatically. You can configure this behavior in "System" -> "Administration" -> "Software Properties".</property> +Your system does not check for updates automatically. You can configure this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab.</property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -1371,11 +1285,34 @@ Your system does not check for updates automatically. You can configure this beh <property name="spacing">12</property> <child> - <widget class="GtkLabel" id="label22"> + <widget class="GtkLabel" id="label_cache_progress_title"> <property name="visible">True</property> - <property name="label" translatable="yes"><big><b>Examining your system</b></big> + <property name="label" translatable="yes"><big><b>Starting update manager</b></big></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> -Software updates correct errors, eliminate security vulnerabilities and provide new features.</property> + <child> + <widget class="GtkLabel" id="label22"> + <property name="visible">True</property> + <property name="label" translatable="yes">Software updates correct errors, eliminate security vulnerabilities and provide new features.</property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -1431,7 +1368,7 @@ Software updates correct errors, eliminate security vulnerabilities and provide <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> <property name="width_chars">-1</property> <property name="single_line_mode">False</property> <property name="angle">0</property> @@ -1453,4 +1390,167 @@ Software updates correct errors, eliminate security vulnerabilities and provide </child> </widget> +<widget class="GtkDialog" id="dialog_dist_upgrade"> + <property name="border_width">6</property> + <property name="title" translatable="yes"></property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> + <property name="modal">True</property> + <property name="resizable">False</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">True</property> + <property name="skip_pager_hint">True</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">True</property> + <property name="has_separator">False</property> + + <child internal-child="vbox"> + <widget class="GtkVBox" id="dialog-vbox5"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="dialog-action_area5"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + + <child> + <widget class="GtkButton" id="cancelbutton2"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Distribution Upgrade</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-8</property> + </widget> + </child> + + <child> + <widget class="GtkButton" id="okbutton3"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-close</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-7</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox20"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkImage" id="image15"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-warning</property> + <property name="icon_size">6</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox18"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="label30"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes"><big><b>Not all updates can be installed</b></big></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">True</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label31"> + <property name="visible">True</property> + <property name="label" translatable="yes">Run a distribution upgrade, to install as many updates as possible. + +This can be caused by an uncompleted upgrade, unofficial software packages or by running a development version.</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + </glade-interface> diff --git a/data/update-manager.schemas.in b/data/update-manager.schemas.in index ad72c893..3740318c 100644 --- a/data/update-manager.schemas.in +++ b/data/update-manager.schemas.in @@ -11,7 +11,7 @@ <locale name="C"> <short>Remind to reload the channel list</short> <long> - If automatic checking for updates is disabeld, you have + If automatic checking for updates is disabled, you have to reload the channel list manually. This option allows to hide the reminder shown in this case. </long> @@ -28,7 +28,7 @@ <short>Show details of an update</short> <long> Stores the state of the expander that contains the - list of changs and the description + list of changes and the description </long> </locale> </schema> |