From ecf47b2870eb77302aceb82644109bd183587dc0 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Fri, 10 Mar 2006 17:35:12 +0100 Subject: * Clean up the glade files: remove deprecated dialogs * Actually translate the software properties dialogs * Use spacings and alignemnts as suggested by the HIG in the dialogs * Make labels consistent with g-a-i --- data/SoftwarePropertiesDialogs.glade | 1305 +++++----------------------------- data/UpdateManager.glade | 138 ---- po/POTFILES.in | 3 +- 3 files changed, 191 insertions(+), 1255 deletions(-) diff --git a/data/SoftwarePropertiesDialogs.glade b/data/SoftwarePropertiesDialogs.glade index a9e13d5e..da1df02b 100644 --- a/data/SoftwarePropertiesDialogs.glade +++ b/data/SoftwarePropertiesDialogs.glade @@ -5,7 +5,7 @@ 6 - Add repository... + Add Channel GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True @@ -18,13 +18,13 @@ GDK_GRAVITY_NORTH_WEST True False - True + False True False - 6 + 12 @@ -65,7 +65,7 @@ True True True - gtk-ok + gtk-add True GTK_RELIEF_NORMAL True @@ -82,42 +82,94 @@ - + + 6 True False 12 - + True - <b>Repository</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + False + 6 - - - True - False - True - + + + True + <b>Channel</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + False + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + False + True + + + + 0 + True + True + + + + + 0 + True + True + + 0 @@ -127,46 +179,97 @@ - - True - <b>Components</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - + True False 6 - + + True + <b>Sections</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + - - + + True + False + 0 - - + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + False + 6 + + + + + + + + + + + + + + + 0 + True + True + + + + + 0 + True + True + @@ -182,15 +285,12 @@ True - - - - + 6 GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE @@ -204,13 +304,13 @@ GDK_GRAVITY_NORTH_WEST True False - True + False True False - 0 + 12 @@ -279,7 +379,7 @@ True - _Add Repository + _Add Channel True False GTK_JUSTIFY_LEFT @@ -323,7 +423,7 @@ 12 - + True gtk-dialog-question 6 @@ -349,9 +449,9 @@ True True - <big><b>Enter the complete APT line of the repository that you want to add</b></big> + <big><b>Enter the complete APT line of the channel that you want to add</b></big> -The APT line contains the type, location and content of a repository, for example <i>"deb http://ftp.debian.org sarge main"</i>. You can find a detailed description of the syntax in the documentation. +The APT line contains the type, location and sections of a channel, for example <i>"deb http://ftp.debian.org sarge main"</i>. False True GTK_JUSTIFY_LEFT @@ -449,7 +549,7 @@ The APT line contains the type, location and content of a repository, for exampl 6 - Edit Repository... + Edit Channel GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True @@ -463,13 +563,13 @@ The APT line contains the type, location and content of a repository, for exampl GDK_GRAVITY_NORTH_WEST True False - True + False True False - 6 + 12 @@ -774,36 +874,36 @@ Source - + 6 - Authentication + Scanning CD-ROM GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE - False - True + True + False False True - True + False False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST True False - True + False - + True False - 0 + 12 - + True GTK_BUTTONBOX_END - + True True True @@ -812,6 +912,7 @@ Source GTK_RELIEF_NORMAL True -7 + @@ -824,1036 +925,8 @@ Source - + 6 - True - False - 6 - - - - True - <big><b>Authentication keys</b></big> - -You can add and remove authentication keys in this dialog. A key makes it possible to verify the integrity of the software you download. - True - True - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_ETCHED_IN - GTK_CORNER_TOP_LEFT - - - - 300 - True - True - False - True - False - True - False - False - False - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_END - 6 - - - - True - Restore the default keys shipped with the distribution. This will not change user installed keys. - True - True - Restore default keys - True - GTK_RELIEF_NORMAL - True - - - - - - - True - Remove the selected key from the trusted keyring. - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - True - - - - - - - True - Add a new key file to the trusted keyring. Make sure that you received the key over a secure channel and that you trust the owner. - True - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - - - - 0 - False - True - - - - - 0 - True - True - - - - - - - - Settings - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - True - True - False - True - True - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - -7 - - - - - - 0 - False - True - GTK_PACK_END - - - - - - 12 - True - False - 18 - - - - True - False - 6 - - - - True - <b>User Interface</b> - True - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - True - Show disabled software sources - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - True - Show detailed package versions - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - <b>Internet Updates</b> - True - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - True - Automatically check for software _updates. - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - False - False - 6 - - - - True - False - 0 - - - - True - Update interval in days: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 1 100 1 10 10 - - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - True - _Download upgradable packages - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - <b>Temporary files</b> - True - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - True - Automatically clean _temporary packages files - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - False - False - 6 - - - - True - False - 6 - - - - True - Clean interval in days: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 1 365 1 10 10 - - - - 0 - False - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - True - Set _maximum size for the package cache - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - False - 0 - - - - True - False - 6 - - - - True - Maximum size in MB: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 500 1 9999 1 10 10 - - - - 0 - False - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - True - Delete _old packages in the package cache - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - 6 - - - - True - Maximum age in days: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 30 2 365 1 10 10 - - - - 0 - False - True - - - - - 0 - True - True - - - - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - 0 - True - True - - - - - - - - 12 - Scanning CD-ROM - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - True - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 12 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - -7 - - - - - - 0 - False - True - GTK_PACK_END - - - - - True False 12 diff --git a/data/UpdateManager.glade b/data/UpdateManager.glade index c94edff6..3d2b9ba4 100644 --- a/data/UpdateManager.glade +++ b/data/UpdateManager.glade @@ -795,144 +795,6 @@ - - - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-stop - True - GTK_RELIEF_NORMAL - True - 0 - - - - - - 0 - False - True - GTK_PACK_END - - - - - - 6 - True - False - 12 - - - - True - gtk-connect - 6 - 0 - 0 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - <span weight="bold" size="larger">Downloading changes</span> - -Need to get the changes from the central server - False - True - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - GTK_PROGRESS_LEFT_TO_RIGHT - 0 - 0.10000000149 - PANGO_ELLIPSIZE_NONE - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - 6 Release Notes diff --git a/po/POTFILES.in b/po/POTFILES.in index fc588621..01973130 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,4 @@ [encoding: UTF-8] -data/SoftwareProperties.glade SoftwareProperties/SoftwareProperties.py SoftwareProperties/dialog_sources_list.py DistUpgrade/DistUpgradeCache.py @@ -9,6 +8,8 @@ DistUpgrade/DistUpgradeView.py DistUpgrade/dist-upgrade.py DistUpgrade/DistUpgrade.glade data/UpdateManager.glade +data/SoftwareProperties.glade +data/SoftwarePropertiesDialogs.glade data/update-manager.desktop.in data/update-manager.schemas.in [type: gettext/rfc822deb] channels/Ubuntu.info.in -- cgit v1.2.3