From e985c66469c553829500be34ca5d0d936279668a Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Tue, 21 Feb 2006 00:51:56 +0100 Subject: * Set a hardcoded path to the manual in the omf file * Add the pot file under version control. it is required by the translators --- help/C/update-manager-C.omf | 3 +- po/update-manager.pot | 687 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 689 insertions(+), 1 deletion(-) create mode 100644 po/update-manager.pot diff --git a/help/C/update-manager-C.omf b/help/C/update-manager-C.omf index 072fe3b1..3d0f8909 100644 --- a/help/C/update-manager-C.omf +++ b/help/C/update-manager-C.omf @@ -9,7 +9,8 @@ Keep the software on your system up-to-date. manual - + , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-21 00:30+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" + +#: ../data/SoftwareProperties.glade.h:1 +msgid "Channels" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:2 +msgid "Internet updates" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:3 +msgid "Keys" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:4 +msgid "Add _Cdrom" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:5 +msgid "Authentication" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:6 +msgid "D_elete downloaded software files:" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:7 +msgid "Import the public key from a trusted software provider" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:8 +msgid "Installation Media" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:9 +msgid "Internet Updates" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 +msgid "Restore _Defaults" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:12 +msgid "Restore the default keys of your distribution" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:13 +msgid "Software Preferences" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:14 +msgid "_Check for updates automatically:" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:15 +msgid "_Download updates in the backgound, but do not install them" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:101 +#, python-format +msgid "Every %s days" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:131 +#, python-format +msgid "After %s days" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:354 +msgid "Import key" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:364 +msgid "Error importing selected file" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:365 +msgid "The selected file may not be a GPG key file or it might be corrupt." +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:377 +msgid "Error removing the key" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:378 +msgid "The key you selected could not be removed. Please report this as a bug." +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:421 +#, python-format +msgid "" +"Error scaning the CD\n" +"\n" +"%s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:471 +msgid "Please enter a name for the disc" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:487 +msgid "Please insert a disc in the drive:" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:92 +msgid "Broken packages" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:93 +msgid "" +"Your system contains broken packages that couldn't be fixed with this " +"software. Please fix them first using synaptic or apt-get before proceeding." +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:135 +msgid "Can't upgrade required meta-packages" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:142 +msgid "A essential package would have to be removed" +msgstr "" + +#. FIXME: change the text to something more useful +#: ../DistUpgrade/DistUpgradeCache.py:145 +msgid "Could not calculate the upgrade" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:146 +msgid "" +"A unresolvable problem occured while calculating the upgrade. Please report " +"this as a bug. " +msgstr "" + +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:168 +msgid "Error authenticating some packages" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:169 +msgid "" +"It was not possible to authenticate some packages. This may be a transient " +"network problem. You may want to try again later. See below for a list of " +"unauthenticated packages." +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:232 +#, python-format +msgid "Can't install '%s'" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:233 +msgid "" +"It was impossible to install a required package. Please report this as a " +"bug. " +msgstr "" + +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:240 +msgid "Can't guess meta-package" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:241 +msgid "" +"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" +"desktop package and it was not possible to detect which version of ubuntu " +"you are runing.\n" +" Please install one of the packages above first using synaptic or apt-get " +"before proceeding." +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:42 +msgid "Reading cache" +msgstr "" + +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:107 +msgid "No valid entry found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:108 +msgid "" +"While scaning your repository information no valid entry for the upgrade was " +"found.\n" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:125 +msgid "Repository information invalid" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:126 +msgid "" +"Upgrading the repository information resulted in a invalid file. Please " +"report this as a bug." +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:171 +msgid "Error during update" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:172 +msgid "" +"A problem occured during the update. This is usually some sort of network " +"problem, please check your network connection and retry." +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "Not enough free disk space" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:192 +#, python-format +msgid "" +"The upgrade aborts now. Please free at least %s of disk space. Empty your " +"trash and remove temporary packages of former installations using 'sudo apt-" +"get clean'." +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:198 +msgid "Do you want to start the upgrade?" +msgstr "" + +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:214 +msgid "Could not install the upgrades" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:215 +msgid "" +"The upgrade aborts now. Your system can be in an unusable state. Please try " +"'sudo apt-get install -f' or Synaptic to fix your system." +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:230 +msgid "Could not download the upgrades" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:231 +msgid "" +"The upgrade aborts now. Please check your internet connection or " +"installation media and try again. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "Remove obsolete Packages?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:282 +msgid "" +"Some problem occured during the clean-up. Please see the below message for " +"more information. " +msgstr "" + +#. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:319 +msgid "Checking package manager" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:311 +msgid "Updating repository information" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:325 +msgid "Asking for confirmation" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:329 +msgid "Upgrading" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:336 +msgid "Searching for obsolete software" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:341 +msgid "System upgrade is complete." +msgstr "" + +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#, python-format +msgid "Please insert '%s' into the drive '%s'" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +msgid "Download is complete" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#, python-format +msgid "Downloading file %li of %li at %s/s" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#, python-format +msgid "%s remaining" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#, python-format +msgid "Downloading file %li of %li at unknown speed" +msgstr "" + +#. FIXME: add support for the timeout +#. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:134 +msgid "Installing updates" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:147 +#, python-format +msgid "Could not install '%s'" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +msgid "The upgrade aborts now. Please report this bug." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:226 +msgid "A fatal error occured" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:227 +msgid "" +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#, python-format +msgid "%s package is going to be removed." +msgid_plural "%s packages are going to be removed." +msgstr[0] "" +msgstr[1] "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:314 +#, python-format +msgid "%s new package is going to be installed." +msgid_plural "%s new packages are going to be installed." +msgstr[0] "" +msgstr[1] "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:320 +#, python-format +msgid "%s package is going to be upgraded." +msgid_plural "%s packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:327 +msgid "Could not find any upgrades" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:328 +msgid "Your system has already been upgraded." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:332 +#, python-format +msgid "You have to download a total of %s." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +#, python-format +msgid "Remove %s" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:341 +#, python-format +msgid "Install %s" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#, python-format +msgid "Upgrade %s" +msgstr "" + +#: ../DistUpgrade/DistUpgradeView.py:67 +msgid "Reboot required" +msgstr "" + +#: ../DistUpgrade/DistUpgradeView.py:68 +msgid "" +"The upgrade is finished now. A reboot is required to now, do you want to do " +"this now?" +msgstr "" + +#. testcode to see if the bullets look nice in the dialog +#. for i in range(4): +#. view.setStep(i+1) +#. app.openCache() +#: ../DistUpgrade/DistUpgrade.glade.h:1 +msgid " " +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:2 +msgid "" +"Cancel the running upgrade?\n" +"\n" +"The system could be in an unusable state if you cancel the upgrade. You are " +"strongly adviced to resume the upgrade." +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:5 +msgid "Restart the system to complete the upgrade" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:6 +msgid "Start the upgrade?" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:7 +msgid "" +"Upgrading to Ubuntu \"Dapper\" 6.04" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:8 +msgid "Cleaning up" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:9 +msgid "Details" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Downloading and installing the upgrades" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:11 +msgid "Modifying the software channels" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:12 +msgid "Preparing the upgrade" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "Restarting the system" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:14 +msgid "Terminal" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:15 +msgid "Upgrading Ubuntu" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:16 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Resume Upgrade" +msgstr "" + +#: ../data/UpdateManager.glade.h:1 +msgid "" +"You need to manually reload the latest information about updates\n" +"\n" +"Your system does not check for updates automatically. You can configure this " +"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +msgstr "" + +#: ../data/UpdateManager.glade.h:4 +msgid "" +"Checking for available updates\n" +"\n" +"Software updates can correct errors, eliminate security vulnerabilities, and " +"provide new features to you." +msgstr "" + +#: ../data/UpdateManager.glade.h:7 +msgid "Keep your system up-to-date" +msgstr "" + +#: ../data/UpdateManager.glade.h:8 +msgid "" +"Downloading changes\n" +"\n" +"Need to get the changes from the central server" +msgstr "" + +#: ../data/UpdateManager.glade.h:11 +msgid "Cancel _Download" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 +msgid "Changes" +msgstr "" + +#: ../data/UpdateManager.glade.h:13 +msgid "Description" +msgstr "" + +#: ../data/UpdateManager.glade.h:14 +msgid "Release Notes" +msgstr "" + +#: ../data/UpdateManager.glade.h:15 +msgid "Reload the latest information about updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:16 +msgid "Show details" +msgstr "" + +#: ../data/UpdateManager.glade.h:17 +msgid "Show progress of single files" +msgstr "" + +#: ../data/UpdateManager.glade.h:18 +msgid "Software Updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:19 +msgid "" +"Software updates can correct errors, eliminate security vulnerabilities, and " +"provide new features to you." +msgstr "" + +#: ../data/UpdateManager.glade.h:20 +msgid "U_pgrade" +msgstr "" + +#: ../data/UpdateManager.glade.h:21 +msgid "Upgrade to the latest version of Ubuntu" +msgstr "" + +#: ../data/UpdateManager.glade.h:22 +msgid "_Install Updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 +msgid "_Reload" +msgstr "" + +#: ../data/update-manager.desktop.in.h:1 +msgid "Show available updates and choose which to install" +msgstr "" + +#: ../data/update-manager.desktop.in.h:2 +msgid "Update Manager" +msgstr "" + +#. ChangelogURI +#: ../channels/Ubuntu.info.in.h:4 +#, no-c-format +msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "" + +#. Description +#: ../channels/Ubuntu.info.in:6 +msgid "Ubuntu 6.04 \"Dapper Drake\"" +msgstr "" + +#. Description +#: ../channels/Ubuntu.info.in:23 +msgid "Ubuntu 5.10 \"Breezy Badger\"" +msgstr "" + +#. Description +#: ../channels/Ubuntu.info.in:40 +msgid "Ubuntu 5.10 Security Updates" +msgstr "" + +#. Description +#: ../channels/Ubuntu.info.in:57 +msgid "Ubuntu 5.10 Updates" +msgstr "" + +#. Description +#: ../channels/Ubuntu.info.in:74 +msgid "Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "" + +#. Description +#: ../channels/Ubuntu.info.in:91 +msgid "Ubuntu 5.04 Security Updates" +msgstr "" + +#. CompDescription +#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51 +msgid "Oficially supported" +msgstr "" + +#. CompDescription +#: ../channels/Ubuntu.info.in:97 +msgid "Restricted copyright" +msgstr "" + +#. CompDescription +#: ../channels/Ubuntu.info.in:100 +msgid "Community maintained (Universe)" +msgstr "" + +#. CompDescription +#: ../channels/Ubuntu.info.in:103 +msgid "Non-free (Multiverse)" +msgstr "" + +#. ChangelogURI +#: ../channels/Debian.info.in.h:4 +#, no-c-format +msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "" + +#. Description +#: ../channels/Debian.info.in:6 +msgid "Debian 3.1 \"Sarge\"" +msgstr "" + +#. BaseURI +#: ../channels/Debian.info.in:19 +msgid "http://security.debian.org/" +msgstr "" + +#. Description +#: ../channels/Debian.info.in:20 +msgid "Debian 3.1 \"Sarge\" Security Updates" +msgstr "" + +#. Description +#: ../channels/Debian.info.in:34 +msgid "Debian \"Etch\" (testing)" +msgstr "" + +#. BaseURI +#: ../channels/Debian.info.in:47 +msgid "http://http.us.debian.org/debian/" +msgstr "" + +#. Description +#: ../channels/Debian.info.in:48 +msgid "Debian \"Sid\" (unstable)" +msgstr "" + +#. CompDescription +#: ../channels/Debian.info.in:54 +msgid "DFSG-compatible Software with Non-Free Dependencies" +msgstr "" + +#. CompDescription +#: ../channels/Debian.info.in:57 +msgid "Non-DFSG-compatible Software" +msgstr "" -- cgit v1.2.3 From 092b9a2b55563b42ade173b0781c45c012dce7b6 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Tue, 21 Feb 2006 15:17:30 +0100 Subject: * Merged help from svn --- help/C/figures/authentication-add.png | Bin 42381 -> 303198 bytes help/C/figures/authentication.png | Bin 24064 -> 274684 bytes help/C/figures/download-progressbar.png | Bin 27554 -> 208318 bytes help/C/figures/failed-repos.png | Bin 28557 -> 243774 bytes help/C/figures/install-progress-terminal.png | Bin 41538 -> 451335 bytes help/C/figures/install-progress.png | Bin 14638 -> 133917 bytes help/C/figures/main-system-updates-available.png | Bin 48292 -> 277960 bytes .../main-system-updates-summary-details.png | Bin 52051 -> 368111 bytes help/C/figures/main-system-updates-summary.png | Bin 48278 -> 308065 bytes help/C/figures/main-system-uptodate.png | Bin 31064 -> 229559 bytes help/C/figures/main-view-monitor-update.png | Bin 53447 -> 471026 bytes help/C/figures/main-view-update-detail.png | Bin 48478 -> 356191 bytes help/C/figures/not-possible.png | Bin 0 -> 237318 bytes help/C/figures/preferences-add-custom.png | Bin 20849 -> 150488 bytes help/C/figures/preferences-add.png | Bin 16862 -> 114050 bytes help/C/figures/preferences-edit.png | Bin 14607 -> 116045 bytes help/C/figures/preferences-repos-changeinfo.png | Bin 22734 -> 138955 bytes help/C/figures/preferences.png | Bin 49753 -> 341184 bytes help/C/figures/reload-package-info.png | Bin 31937 -> 250061 bytes help/C/figures/settings.png | Bin 32236 -> 206450 bytes help/C/figures/synaptic-toggle-install-view.png | Bin 31810 -> 319986 bytes help/C/update-manager-C.omf.out | 17 -- help/C/update-manager.xml | 230 ++++++++------------- 23 files changed, 89 insertions(+), 158 deletions(-) create mode 100644 help/C/figures/not-possible.png delete mode 100644 help/C/update-manager-C.omf.out diff --git a/help/C/figures/authentication-add.png b/help/C/figures/authentication-add.png index cd3d189f..004b3fa1 100644 Binary files a/help/C/figures/authentication-add.png and b/help/C/figures/authentication-add.png differ diff --git a/help/C/figures/authentication.png b/help/C/figures/authentication.png index 8601ccd9..07227a2e 100644 Binary files a/help/C/figures/authentication.png and b/help/C/figures/authentication.png differ diff --git a/help/C/figures/download-progressbar.png b/help/C/figures/download-progressbar.png index 0cef6d51..9f096460 100644 Binary files a/help/C/figures/download-progressbar.png and b/help/C/figures/download-progressbar.png differ diff --git a/help/C/figures/failed-repos.png b/help/C/figures/failed-repos.png index 68e688cc..01b0d0e9 100644 Binary files a/help/C/figures/failed-repos.png and b/help/C/figures/failed-repos.png differ diff --git a/help/C/figures/install-progress-terminal.png b/help/C/figures/install-progress-terminal.png index 6f21faf8..06111c61 100644 Binary files a/help/C/figures/install-progress-terminal.png and b/help/C/figures/install-progress-terminal.png differ diff --git a/help/C/figures/install-progress.png b/help/C/figures/install-progress.png index 2ab7fa51..699f6219 100644 Binary files a/help/C/figures/install-progress.png and b/help/C/figures/install-progress.png differ diff --git a/help/C/figures/main-system-updates-available.png b/help/C/figures/main-system-updates-available.png index f4d9f1e6..24dc5481 100644 Binary files a/help/C/figures/main-system-updates-available.png and b/help/C/figures/main-system-updates-available.png differ diff --git a/help/C/figures/main-system-updates-summary-details.png b/help/C/figures/main-system-updates-summary-details.png index 2b635ce1..08860ec1 100644 Binary files a/help/C/figures/main-system-updates-summary-details.png and b/help/C/figures/main-system-updates-summary-details.png differ diff --git a/help/C/figures/main-system-updates-summary.png b/help/C/figures/main-system-updates-summary.png index 8d9b0103..fefea5dd 100644 Binary files a/help/C/figures/main-system-updates-summary.png and b/help/C/figures/main-system-updates-summary.png differ diff --git a/help/C/figures/main-system-uptodate.png b/help/C/figures/main-system-uptodate.png index 60394d06..d8c10d5f 100644 Binary files a/help/C/figures/main-system-uptodate.png and b/help/C/figures/main-system-uptodate.png differ diff --git a/help/C/figures/main-view-monitor-update.png b/help/C/figures/main-view-monitor-update.png index 308a81ca..b8b2a80b 100644 Binary files a/help/C/figures/main-view-monitor-update.png and b/help/C/figures/main-view-monitor-update.png differ diff --git a/help/C/figures/main-view-update-detail.png b/help/C/figures/main-view-update-detail.png index 4e05e272..d3f8f12c 100644 Binary files a/help/C/figures/main-view-update-detail.png and b/help/C/figures/main-view-update-detail.png differ diff --git a/help/C/figures/not-possible.png b/help/C/figures/not-possible.png new file mode 100644 index 00000000..20678a9b Binary files /dev/null and b/help/C/figures/not-possible.png differ diff --git a/help/C/figures/preferences-add-custom.png b/help/C/figures/preferences-add-custom.png index 1c7b5a89..97e709f6 100644 Binary files a/help/C/figures/preferences-add-custom.png and b/help/C/figures/preferences-add-custom.png differ diff --git a/help/C/figures/preferences-add.png b/help/C/figures/preferences-add.png index 1f2cad19..e77f7523 100644 Binary files a/help/C/figures/preferences-add.png and b/help/C/figures/preferences-add.png differ diff --git a/help/C/figures/preferences-edit.png b/help/C/figures/preferences-edit.png index e3bc0d2b..5d713264 100644 Binary files a/help/C/figures/preferences-edit.png and b/help/C/figures/preferences-edit.png differ diff --git a/help/C/figures/preferences-repos-changeinfo.png b/help/C/figures/preferences-repos-changeinfo.png index b012afe0..e1fbbd9e 100644 Binary files a/help/C/figures/preferences-repos-changeinfo.png and b/help/C/figures/preferences-repos-changeinfo.png differ diff --git a/help/C/figures/preferences.png b/help/C/figures/preferences.png index eac98df9..e59f2c29 100644 Binary files a/help/C/figures/preferences.png and b/help/C/figures/preferences.png differ diff --git a/help/C/figures/reload-package-info.png b/help/C/figures/reload-package-info.png index f7ca3d93..76156b2e 100644 Binary files a/help/C/figures/reload-package-info.png and b/help/C/figures/reload-package-info.png differ diff --git a/help/C/figures/settings.png b/help/C/figures/settings.png index 33bb325a..2084c2ef 100644 Binary files a/help/C/figures/settings.png and b/help/C/figures/settings.png differ diff --git a/help/C/figures/synaptic-toggle-install-view.png b/help/C/figures/synaptic-toggle-install-view.png index c9de71be..be04d24e 100644 Binary files a/help/C/figures/synaptic-toggle-install-view.png and b/help/C/figures/synaptic-toggle-install-view.png differ diff --git a/help/C/update-manager-C.omf.out b/help/C/update-manager-C.omf.out deleted file mode 100644 index af5d465e..00000000 --- a/help/C/update-manager-C.omf.out +++ /dev/null @@ -1,17 +0,0 @@ - - - - sean@inwords.co.za (Sean Wheller) - Update Manager Manual - 2005-03-04 - - - This document explains how to use the Update Manager. - manual - - - - - - - diff --git a/help/C/update-manager.xml b/help/C/update-manager.xml index 5d0875f3..ef1d7f02 100644 --- a/help/C/update-manager.xml +++ b/help/C/update-manager.xml @@ -1,10 +1,10 @@ - - + + ]> - + + + + + + + 6 + Add Software Channel + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + False + + + + True + False + 12 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + -6 + + + + + + True + True + True + GTK_RELIEF_NORMAL + True + -5 + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + + + + + + 0 + False + True + GTK_PACK_END + + + + + + 6 + True + False + 12 + + + + True + gtk-dialog-question + 6 + 0 + 0 + 0 + 0 + + + 0 + False + True + + + + + + True + False + 12 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + True + False + True + False + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + diff --git a/data/mime/add-software-channel.applications b/data/mime/add-software-channel.applications new file mode 100644 index 00000000..2b38d9b7 --- /dev/null +++ b/data/mime/add-software-channel.applications @@ -0,0 +1,9 @@ + +add-software-channel + command=add-software-channel + name=Add Software Channel + can_open_multiple_files=false + expects_uris=false + requires_terminal=false + mime_types=text/x-apt-sources + diff --git a/data/mime/add-software-channel.desktop b/data/mime/add-software-channel.desktop new file mode 100644 index 00000000..fa61fe81 --- /dev/null +++ b/data/mime/add-software-channel.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Add Software Channel +GenericName=Add Software Channel +Exec=/usr/bin/add-software-channel +Icon=update-manager.png +Terminal=false +Hide=true +Type=Application +Encoding=UTF-8 +Categories=Application;System; +MimeType=text/x-apt-sources; diff --git a/data/mime/add-software-channel.desktop.in b/data/mime/add-software-channel.desktop.in new file mode 100644 index 00000000..bc8b1f7a --- /dev/null +++ b/data/mime/add-software-channel.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +_Name=Add Software Channel +_GenericName=Add Software Channel +Exec=/usr/bin/add-software-channel +Icon=update-manager.png +Terminal=false +Visible=false +Type=Application +Encoding=UTF-8 +Categories=Application;System;Settings; +MimeType=text/x-apt-sources diff --git a/data/mime/apt.xml b/data/mime/apt.xml new file mode 100644 index 00000000..33592bdd --- /dev/null +++ b/data/mime/apt.xml @@ -0,0 +1,7 @@ + + + + Software Channel List + + + diff --git a/debian/rules b/debian/rules index dbeb3dc4..a8da2355 100755 --- a/debian/rules +++ b/debian/rules @@ -62,6 +62,8 @@ binary-arch: build install dh_installchangelogs ChangeLog dh_installdocs dh_scrollkeeper + dh_installmime + dh_desktop dh_installexamples # dh_install # dh_installmenu diff --git a/setup.py b/setup.py index 6395dd28..ded9c30e 100755 --- a/setup.py +++ b/setup.py @@ -39,7 +39,8 @@ setup(name='update-manager', ], scripts=[ 'gnome-software-properties', - 'update-manager' + 'update-manager', + 'add-software-channel' ], data_files=[ ('share/update-manager/glade', @@ -56,6 +57,12 @@ setup(name='update-manager', ), ('share/pixmaps', ["data/update-manager.png"] + ), + ('share/applications', + ["data/mime/add-software-channel.desktop"] + ), + ('share/mime/packages', + ["data/mime/apt.xml"] ) ] + I18NFILES + HELPFILES, ) -- cgit v1.2.3 From 28d131b543b638589c243abb6b1c247c8c653321 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Thu, 23 Feb 2006 13:24:40 +0100 Subject: * Move the mime type handling of sources.lists to gnome-software-properties * Renamed mime type to text/x-apt-sources-list * Remove all depricated add-software-channel code * Add a schemas file for update-manager * Use dh_gconf * Software Properties: - Move the channel buttons to the bottom of the notebook to get more vertical space for the channels - Set a global window icon for SoftwareProperties and its children - Add drag and drop support for sources.list on the treeview_sources - Allow to enable and disable channels - Do not use so much space for rendering the sources lista - Use the comment instead of the URI in the channel list if we don't find a nice name - Show the type only on source channels - "binary" is too technial - Add some small sanity checks to aptsources - Use single quotes in the predefind distru names * Dialog add: - merge the custom and the default add dialog - sanity checks for the custom apt line, that do not allow to add a wrong one * Update Manager: - add an option to hide the reload reminder --- SoftwareProperties/SoftwareProperties.py | 107 +++-- SoftwareProperties/aptsources.py | 32 +- SoftwareProperties/dialog_add.py | 89 ++-- UpdateManager/UpdateManager.py | 10 +- add-software-channel | 90 ----- data/SoftwareProperties.glade | 26 +- data/SoftwareProperties.gladep | 8 - data/SoftwarePropertiesDialogs.glade | 606 +++++++++++++++++++++------- data/UpdateManager.glade | 65 ++- data/gnome-software-properties.desktop.in | 3 +- data/gnome-software-properties.gladep | 8 - data/mime/add-software-channel.applications | 9 - data/mime/add-software-channel.desktop | 11 - data/mime/add-software-channel.desktop.in | 11 - data/mime/apt.xml | 2 +- data/update-manager.gladep | 8 - data/update-manager.schemas.in | 52 +++ debian/rules | 1 + gnome-software-properties | 7 +- po/POTFILES.in | 2 + po/bg.po | 120 ++++-- po/da.po | 98 ++++- po/de.po | 122 ++++-- po/el.po | 98 ++++- po/en_CA.po | 116 +++++- po/en_GB.po | 116 +++++- po/es.po | 122 ++++-- po/fi.po | 120 ++++-- po/fr.po | 120 ++++-- po/gl.po | 122 ++++-- po/he.po | 104 ++++- po/hu.po | 114 +++++- po/it.po | 122 ++++-- po/ja.po | 116 +++++- po/lt.po | 120 +++++- po/mk.po | 118 +++++- po/nb.po | 116 +++++- po/ne.po | 116 +++++- po/nl.po | 96 ++++- po/no.po | 116 +++++- po/pa.po | 99 ++++- po/pl.po | 116 +++++- po/pt_BR.po | 119 +++++- po/ro.po | 98 ++++- po/rw.po | 124 ++++-- po/sv.po | 119 ++++-- po/uk.po | 118 +++++- po/update-manager.pot | 96 ++++- po/vi.po | 114 +++++- po/xh.po | 98 ++++- po/zh_CN.po | 98 ++++- po/zh_HK.po | 116 +++++- po/zh_TW.po | 116 +++++- setup.py | 15 +- 54 files changed, 3869 insertions(+), 1016 deletions(-) delete mode 100755 add-software-channel delete mode 100644 data/SoftwareProperties.gladep delete mode 100644 data/gnome-software-properties.gladep delete mode 100644 data/mime/add-software-channel.applications delete mode 100644 data/mime/add-software-channel.desktop delete mode 100644 data/mime/add-software-channel.desktop.in delete mode 100644 data/update-manager.gladep create mode 100644 data/update-manager.schemas.in diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index 690b30dd..0e9a0f0d 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -37,6 +37,7 @@ from UpdateManager.Common.SimpleGladeApp import SimpleGladeApp import aptsources import dialog_add import dialog_edit +import dialog_sources_list from dialog_apt_key import apt_key from utils import * @@ -50,11 +51,22 @@ CONF_MAP = { "max_size" : "APT::Archives::MaxSize", "max_age" : "APT::Archives::MaxAge" } - +( + COLUMN_ACTIVE, + COLUMN_DESC +) = range(2) class SoftwareProperties(SimpleGladeApp): - def __init__(self, datadir=None, options=None, parent=None): + def __init__(self, datadir=None, options=None, file=None, parent=None): + + # set a default window icon + icons = gtk.icon_theme_get_default() + try: + logo=icons.load_icon("update-manager", 48, 0) + gtk.window_set_default_icon_list(logo) + except: + pass # FIXME: some saner way is needed here if datadir == None: @@ -64,6 +76,8 @@ class SoftwareProperties(SimpleGladeApp): None, domain="update-manager") self.modified = False + self.file = file + #self.gnome_program = gnome.init("Software Properties", "0.41") #self.gconfclient = gconf.client_get_default() @@ -170,25 +184,72 @@ class SoftwareProperties(SimpleGladeApp): self.init_keyslist() self.reload_keyslist() + # drag and drop support for sources.list + self.treeview_sources.drag_dest_set(gtk.DEST_DEFAULT_ALL, \ + [('text/uri-list',0, 0)], \ + gtk.gdk.ACTION_COPY) + self.treeview_sources.connect("drag_data_received",\ + self.on_sources_drag_data_received) + + + # call the add sources.list dialog if we got a file from the cli + if self.file != None: + self.open_file(file) + + def open_file(self, file): + """Show an confirmation for adding the channels of the specified file""" + dialog = dialog_sources_list.AddSourcesList(self.window_main, + self.sourceslist, + self.datadir, + file) + res = dialog.run() + if res == gtk.RESPONSE_OK: + self.reload_sourceslist() + self.modified = True + + def on_sources_drag_data_received(self, widget, context, x, y, + selection, target_type, timestamp): + """Extract the dropped file pathes and open the first file, only""" + uri = selection.data.strip() + uri_splitted = uri.split() + if len(uri_splitted)>0: + self.open_file(uri_splitted[0]) + def hide(self): self.window_main.hide() def init_sourceslist(self): - self.source_store = gtk.ListStore(str, bool, gobject.TYPE_PYOBJECT) + self.source_store = gtk.ListStore(gobject.TYPE_BOOLEAN, + gobject.TYPE_STRING, + gobject.TYPE_PYOBJECT) self.treeview_sources.set_model(self.source_store) - tr = gtk.CellRendererText() - tr.set_property("xpad", 10) - tr.set_property("ypad", 10) - - source_col = gtk.TreeViewColumn("Description", tr, markup=LIST_MARKUP) - source_col.set_max_width(500) - - self.treeview_sources.append_column(source_col) + cell_desc = gtk.CellRendererText() + #cell_desc.set_property("xpad", 10) + #cell_desc.set_property("ypad", 10) + col_desc = gtk.TreeViewColumn(_("Software Channel"), cell_desc, + markup=COLUMN_DESC) + col_desc.set_max_width(500) + + cell_toggle = gtk.CellRendererToggle() + cell_toggle.connect('toggled', self.on_channel_toggled) + col_active = gtk.TreeViewColumn(_("Active"), cell_toggle, + active=COLUMN_ACTIVE) + + self.treeview_sources.append_column(col_active) + self.treeview_sources.append_column(col_desc) self.sourceslist = aptsources.SourcesList() self.matcher = aptsources.SourceEntryMatcher() + def on_channel_toggled(self, cell_toggle, path): + """Enable or disable the selected channel""" + iter = self.source_store.get_iter((int(path),)) + source_entry = self.source_store.get_value(iter, LIST_ENTRY_OBJ) + source_entry.disabled = not source_entry.disabled + self.reload_sourceslist() + self.modified = True + def init_keyslist(self): self.keys_store = gtk.ListStore(str) self.treeview2.set_model(self.keys_store) @@ -201,16 +262,14 @@ class SoftwareProperties(SimpleGladeApp): def reload_sourceslist(self): self.source_store.clear() for source in self.sourceslist.list: - if source.invalid or source.disabled: + if source.invalid: continue - (a_type, dist, comps) = self.matcher.match(source) - - contents = "" - if source.comment != "": - contents += "%s\n\n" % (source.comment) - contents +="%s (%s) \n%s" % (dist,a_type, comps) + (nice_type, nice_dist, nice_comps) = self.matcher.match(source) - self.source_store.append([contents, not source.disabled, source]) + contents = "%s%s" % (nice_dist, nice_comps) + if source.type == "deb-src": + contents = "%s - %s %s" % (nice_dist, nice_type, nice_comps) + self.source_store.append([not source.disabled, contents, source]) def reload_keyslist(self): self.keys_store.clear() @@ -220,11 +279,11 @@ class SoftwareProperties(SimpleGladeApp): def on_combobox_update_interval_changed(self, widget): i = self.combobox_update_interval.get_active() if i != -1: - value = self.combobox_interval_mapping[i] - # Only write the key if it has changed - if not value == apt_pkg.Config.FindI(CONF_MAP["autoupdate"]): - apt_pkg.Config.Set(CONF_MAP["autoupdate"], str(value)) - self.write_config() + value = self.combobox_interval_mapping[i] + # Only write the key if it has changed + if not value == apt_pkg.Config.FindI(CONF_MAP["autoupdate"]): + apt_pkg.Config.Set(CONF_MAP["autoupdate"], str(value)) + self.write_config() def on_opt_autoupdate_toggled(self, widget): if self.checkbutton_auto_update.get_active(): diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py index 03459adf..f751cf7c 100644 --- a/SoftwareProperties/aptsources.py +++ b/SoftwareProperties/aptsources.py @@ -102,8 +102,16 @@ class SourceEntry: line = line[:i] # source is ok, split it and see what we have pieces = self.mysplit(line) + # Sanity check + if len(pieces) < 3: + self.invalid = True + return # Type, deb or deb-src self.type = string.strip(pieces[0]) + # Sanity check + if self.type not in ("deb", "deb-src"): + self.invalid = True + return # URI self.uri = string.strip(pieces[1]) # distro and components (optional) @@ -326,7 +334,7 @@ class SourceEntryMatcher: _ = gettext.gettext self.type_list = [] self.type_list.append(self.MatchType("^deb$",_("Binary"))) - self.type_list.append(self.MatchType("^deb-src$",_("Source"))) + self.type_list.append(self.MatchType("^deb-src$",_("Source Code"))) self.dist_list = [] @@ -338,7 +346,7 @@ class SourceEntryMatcher: # CDs self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.10", ".*", - _("CD disk with Ubuntu 5.10 \"Breezy Badger\""), + _("CD disk with Ubuntu 5.10 'Breezy Badger'"), ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.04", ".*", @@ -352,7 +360,7 @@ class SourceEntryMatcher: # Warty self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^warty$", - "Ubuntu 4.10 \"Warty Warthog\"", + "Ubuntu 4.10 'Warty Warthog'", ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu", "^warty-security$", @@ -377,7 +385,7 @@ class SourceEntryMatcher: ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^hoary$", - "Ubuntu 5.04 \"Hoary Hedgehog\"", + "Ubuntu 5.04 'Hoary Hedgehog'", ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^hoary-updates$", @@ -394,7 +402,7 @@ class SourceEntryMatcher: ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^breezy$", - "Ubuntu 5.10 \"Breezy Badger\"", + "Ubuntu 5.10 'Breezy Badger'", ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^breezy-updates$", @@ -411,7 +419,7 @@ class SourceEntryMatcher: ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^dapper$", - "Ubuntu 6.04 \"Dapper Drake\"", + "Ubuntu 6.04 'Dapper Drake'", ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^dapper-updates$", @@ -430,11 +438,11 @@ class SourceEntryMatcher: # dists by name self.dist_list.append(self.MatchDist(".*debian.org/debian", "^sarge$", - _("Debian 3.1 \"Sarge\""), + _("Debian 3.1 'Sarge'"), debian_comps, debian_comps_descr)) self.dist_list.append(self.MatchDist(".*debian.org/debian", "^woody$", - _("Debian 3.0 \"Woody\""), + _("Debian 3.0 'Woody'"), debian_comps, debian_comps_descr)) # securtiy self.dist_list.append(self.MatchDist(".*security.debian.org", @@ -452,7 +460,7 @@ class SourceEntryMatcher: debian_comps, debian_comps_descr)) self.dist_list.append(self.MatchDist(".*debian.org/debian", "^unstable$", - _("Debian Unstable \"Sid\""), + _("Debian Unstable 'Sid'"), debian_comps, debian_comps_descr)) # non-us @@ -477,6 +485,10 @@ class SourceEntryMatcher: # some sane defaults first type_description = source.type dist_description = source.uri + " " + source.dist + # if there is a comment use it instead of the url + if source.comment: + dist_description = source.comment + comp_description = "" for c in source.comps: comp_description = comp_description + " " + c @@ -488,7 +500,7 @@ class SourceEntryMatcher: for d in self.dist_list: #print "'%s'" %source.uri - if re.match(d.uri, source.uri) and re.match(d.dist,source.dist): + if re.match(d.uri, source.uri) and re.match(d.dist, source.dist): dist_description = d.description comp_description = "" for c in source.comps: diff --git a/SoftwareProperties/dialog_add.py b/SoftwareProperties/dialog_add.py index 9b384623..effd9f24 100644 --- a/SoftwareProperties/dialog_add.py +++ b/SoftwareProperties/dialog_add.py @@ -45,16 +45,58 @@ class dialog_add: self.main = widget = self.gladexml.get_widget("dialog_add") self.main.set_transient_for(self.parent) - combo = self.gladexml.get_widget("combobox_what") + # Setup the official channel widgets + self.combo = self.gladexml.get_widget("combobox_what") self.gladexml.signal_connect("on_combobox_what_changed", self.on_combobox_what_changed, None) - # combox box needs cell = gtk.CellRendererText() - combo.pack_start(cell, True) - combo.add_attribute(cell, 'text', 0) - self.fill_combo(combo) - self.gladexml.signal_connect("on_button_custom_clicked", - self.on_button_custom_clicked, None) + self.combo.pack_start(cell, True) + self.combo.add_attribute(cell, 'text', 0) + self.fill_combo(self.combo) + # Setup the custom channel widgets + self.entry = self.gladexml.get_widget("entry_source_line") + self.gladexml.signal_connect("on_entry_source_line_changed", + self.check_line) + + # Setup the toggle action + self.radio_official = self.gladexml.get_widget("radiobutton_official") + self.radio_custom = self.gladexml.get_widget("radiobutton_custom") + self.button_add = self.gladexml.get_widget("button_add_channel") + self.gladexml.signal_connect("on_radiobutton_custom_toggled", + self.on_radio_custom_toggled) + self.gladexml.signal_connect("on_radiobutton_official_toggled", + self.on_radio_official_toggled) + + # We start with the official channels: + self.official = True + self.radio_custom.toggled() + + def check_line(self, *args): + """Check for a valid apt line""" + if self.official == True: + self.button_add.set_sensitive(True) + return + + line = self.entry.get_text() + "\n" + source_entry = aptsources.SourceEntry(line) + if source_entry.invalid == True or source_entry.disabled == True: + self.button_add.set_sensitive(False) + else: + self.button_add.set_sensitive(True) + + + def on_radio_custom_toggled(self, radio): + state = radio.get_active() + self.entry.set_sensitive(state) + self.check_line() + + def on_radio_official_toggled(self, radio): + state = radio.get_active() + self.combo.set_sensitive(state) + for check in self.comps: + check.set_sensitive(state) + self.official = state + self.button_add.set_sensitive(state) def fill_combo(self,combo): liststore = gtk.ListStore(gobject.TYPE_STRING,gobject.TYPE_PYOBJECT) @@ -72,25 +114,14 @@ class dialog_add: (name, template) = liststore.get(a_iter, 0,1) self.selected = template comps = template.comps + self.comps=[] for c in comps: checkbox = gtk.CheckButton(c.description) checkbox.set_active(c.on_by_default) checkbox.set_data("name",c.name) vbox.pack_start(checkbox) checkbox.show() - - def on_button_custom_clicked(self, widget, data): - #print "on_button_custom_clicked()" - # this hide here is ugly :/ - self.main.hide() - dialog = self.gladexml.get_widget("dialog_add_custom") - dialog.set_transient_for(self.parent) - res = dialog.run() - dialog.hide() - entry = self.gladexml.get_widget("entry_source_line") - line = entry.get_text() + "\n" - self.sourceslist.list.append(aptsources.SourceEntry(line)) - self.main.response(res) + self.comps.append(checkbox) def get_enabled_comps(self, checkbutton): if checkbutton.get_active(): @@ -100,12 +131,16 @@ class dialog_add: res = self.main.run() if res == gtk.RESPONSE_OK: # add repository - self.selected_comps = [] - vbox = self.gladexml.get_widget("vbox_comps") - vbox.foreach(self.get_enabled_comps) - self.sourceslist.add(self.selected.type, - self.selected.uri, - self.selected.dist, - self.selected_comps) + if self.official == True: + self.selected_comps = [] + vbox = self.gladexml.get_widget("vbox_comps") + vbox.foreach(self.get_enabled_comps) + self.sourceslist.add(self.selected.type, + self.selected.uri, + self.selected.dist, + self.selected_comps) + else: + line = self.entry.get_text() + "\n" + self.sourceslist.list.append(aptsources.SourceEntry(line)) self.main.hide() return res diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 8b757bd1..e6394223 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -28,6 +28,7 @@ pygtk.require('2.0') import gtk import gtk.gdk import gtk.glade +import gconf import gobject import apt import apt_pkg @@ -40,7 +41,6 @@ import os.path import urllib2 import re import tempfile -import gconf import pango import subprocess import pwd @@ -290,6 +290,10 @@ class UpdateManager(SimpleGladeApp): self.restore_state() + def on_checkbutton_reminder_toggled(self, checkbutton): + self.gconfclient.set_bool("/apps/update-manager/remind_reload", + not checkbutton.get_active()) + def close(self, widget, data=None): if self.window_main.get_property("sensitive") is False: return True @@ -812,6 +816,10 @@ class UpdateManager(SimpleGladeApp): def check_auto_update(self): # Check if automatic update is enabled. If not show a dialog to inform # the user about the need of manual "reloads" + remind = self.gconfclient.get_bool("/apps/update-manager/remind_reload") + if remind == False: + return + update_days = apt_pkg.Config.FindI("APT::Periodic::Update-Package-Lists") if update_days < 1: self.dialog_manual_update.set_transient_for(self.window_main) diff --git a/add-software-channel b/add-software-channel deleted file mode 100755 index 348e0f24..00000000 --- a/add-software-channel +++ /dev/null @@ -1,90 +0,0 @@ -#!/usr/bin/env python -import pygtk -import gtk -import gtk.glade -import gobject -import os -from optparse import OptionParser -from SoftwareProperties.aptsources import SourcesList, SourceEntryMatcher -from gettext import gettext as _ -import gettext -import urllib - -class AddSoftwareChannel: - def __init__(self, data, file): - icons = gtk.icon_theme_get_default() - logo_pixbuf=icons.load_icon("gnome-settings-default-applications", - 32, 0) - gtk.window_set_default_icon_list(logo_pixbuf) - - self.glade = gtk.glade.XML(os.path.join(data, - "dialog_add_channels.glade")) - self.glade.signal_autoconnect(self) - self.dialog = self.glade.get_widget("dialog_add_channel") - self.label = self.glade.get_widget("label_sources") - self.button_add = self.glade.get_widget("button_add") - self.button_cancel = self.glade.get_widget("button_cancel") - self.treeview = self.glade.get_widget("treeview_sources") - - self.dialog.realize() - self.dialog.window.set_functions(gtk.gdk.FUNC_MOVE) - - # Setup the treeview - self.store = gtk.ListStore(gobject.TYPE_STRING) - self.treeview.set_model(self.store) - cell = gtk.CellRendererText() - column = gtk.TreeViewColumn("Software Channel", cell, markup=0) - column.set_max_width(500) - self.treeview.append_column(column) - - # Parse the source.list file - self.sources = SingleSourcesList(self.format_uri(file)) - self.matcher = SourceEntryMatcher() - for source in self.sources.list: - if source.invalid or source.disabled: - continue - (a_type, dist, comps) = self.matcher.match(source) - line = "%s (%s) \n%s" %\ - self.matcher.match(source) - self.store.append([line]) - - header = gettext.ngettext("Add the following software channel?", - "Add the following software channels?", - len(self.sources.list)) - body = _("You can install software from a channel. Nice, or?") - self.label.set_markup("%s\n\n%s" % (header, body)) - self.button_add.set_use_underline(True) - self.button_add.set_label(gettext.ngettext("_Add Channel", - "_Add Channels", - len(self.sources.list))) - - self.dialog.run() - self.dialog.destroy() - - def format_uri(self, uri): - path = urllib.url2pathname(uri) # escape special chars - path = path.strip('\r\n\x00') # remove \r\n and NULL - if path.startswith('file:\\\\\\'): # windows - path = path[8:] # 8 is len('file:///') - elif path.startswith('file://'): #nautilus, rox - path = path[7:] # 7 is len('file://') - elif path.startswith('file:'): # xffm - path = path[5:] # 5 is len('file:') - return path - -class SingleSourcesList(SourcesList): - def __init__(self, file): - self.list = [] - self.load(file) - -def main(file): -# file="sources.list" - print file - data = "/usr/share/update-manager/glade" - dialog = AddSoftwareChannel(data, file) - -if __name__ == '__main__': - parser = OptionParser() - (options, args) = parser.parse_args() - main(args[0]) - diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade index 89a56f11..27f53404 100644 --- a/data/SoftwareProperties.glade +++ b/data/SoftwareProperties.glade @@ -68,7 +68,7 @@ 0 - + True False 6 @@ -104,9 +104,9 @@ - + True - GTK_BUTTONBOX_START + False 6 @@ -120,6 +120,11 @@ True + + 0 + False + False + @@ -133,6 +138,11 @@ True + + 0 + False + False + @@ -146,6 +156,11 @@ True + + 0 + False + False + @@ -221,6 +236,11 @@ + + 0 + False + False + diff --git a/data/SoftwareProperties.gladep b/data/SoftwareProperties.gladep deleted file mode 100644 index 183077ba..00000000 --- a/data/SoftwareProperties.gladep +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - FALSE - diff --git a/data/SoftwarePropertiesDialogs.glade b/data/SoftwarePropertiesDialogs.glade index a9e13d5e..c98cc636 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,33 +18,19 @@ GDK_GRAVITY_NORTH_WEST True False - True + False True False - 6 + 12 True GTK_BUTTONBOX_END - - - True - True - True - _Custom - True - GTK_RELIEF_NORMAL - True - -6 - - - - True @@ -59,13 +45,13 @@ - + True True True True True - gtk-ok + gtk-add True GTK_RELIEF_NORMAL True @@ -82,42 +68,156 @@ - + + 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 + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + True + <b>Official Ubuntu Channel</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 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 + False + True + + + + 0 + True + True + + + + + + True + + + 0 + False + False + + + + + + True + False + 6 + + + + + + + + + + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + 0 @@ -127,46 +227,145 @@ - - 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 + True + GTK_RELIEF_NORMAL + True + False + False + True + radiobutton_official + - - + + + True + <b>Custom Channel</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 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 + 10 + + + + True + APT line: + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + The APT line contains the type, location and components of a channel, for example 'deb http://ftp.debian.org sarge main' + True + True + True + 0 + + True + * + True + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + @@ -182,10 +381,6 @@ True - - - - @@ -374,60 +569,7 @@ The APT line contains the type, location and content of a repository, for exampl - - True - False - 10 - - - - True - APT line: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - True - - - 0 - True - True - - - - - 0 - False - True - + @@ -463,7 +605,7 @@ The APT line contains the type, location and content of a repository, for exampl GDK_GRAVITY_NORTH_WEST True False - True + False @@ -1913,4 +2055,192 @@ You can add and remove authentication keys in this dialog. A key makes it possib + + 6 + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + False + + + + True + False + 12 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + -6 + + + + + + True + True + True + GTK_RELIEF_NORMAL + True + -5 + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + -7 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 6 + True + False + 12 + + + + True + gtk-dialog-question + 6 + 0 + 0 + 0 + 0 + + + 0 + False + True + + + + + + True + False + 12 + + + + True + + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + 200 + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + True + False + True + False + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + diff --git a/data/UpdateManager.glade b/data/UpdateManager.glade index 400a4f75..c94edff6 100644 --- a/data/UpdateManager.glade +++ b/data/UpdateManager.glade @@ -1388,25 +1388,58 @@ Need to get the changes from the central server - + True - True - <b><big>You need to manually reload the latest information about updates</big></b> + False + 12 + + + + True + True + <b><big>You need to manually reload the latest information about updates</big></b> Your system does not check for updates automatically. You can configure this behavior in "System" -> "Administration" -> "Software Properties". - False - True - GTK_JUSTIFY_LEFT - True - True - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + False + True + GTK_JUSTIFY_LEFT + True + True + 0 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + _Hide this information in the future + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + 0 diff --git a/data/gnome-software-properties.desktop.in b/data/gnome-software-properties.desktop.in index c626869a..bf570533 100644 --- a/data/gnome-software-properties.desktop.in +++ b/data/gnome-software-properties.desktop.in @@ -1,12 +1,13 @@ [Desktop Entry] _Name=Software Properties _GenericName=Software Properties -_Comment=Edit software sources and settings +_Comment=Configure software channels and internet updates Exec=gksu /usr/bin/gnome-software-properties Icon=update-manager.png Terminal=false MultipleArgs=false Type=Application Encoding=UTF-8 +MimeType=text/x-apt-sources-list Categories=Application;System;Settings; X-KDE-SubstituteUID=true diff --git a/data/gnome-software-properties.gladep b/data/gnome-software-properties.gladep deleted file mode 100644 index 183077ba..00000000 --- a/data/gnome-software-properties.gladep +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - FALSE - diff --git a/data/mime/add-software-channel.applications b/data/mime/add-software-channel.applications deleted file mode 100644 index 2b38d9b7..00000000 --- a/data/mime/add-software-channel.applications +++ /dev/null @@ -1,9 +0,0 @@ - -add-software-channel - command=add-software-channel - name=Add Software Channel - can_open_multiple_files=false - expects_uris=false - requires_terminal=false - mime_types=text/x-apt-sources - diff --git a/data/mime/add-software-channel.desktop b/data/mime/add-software-channel.desktop deleted file mode 100644 index fa61fe81..00000000 --- a/data/mime/add-software-channel.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Add Software Channel -GenericName=Add Software Channel -Exec=/usr/bin/add-software-channel -Icon=update-manager.png -Terminal=false -Hide=true -Type=Application -Encoding=UTF-8 -Categories=Application;System; -MimeType=text/x-apt-sources; diff --git a/data/mime/add-software-channel.desktop.in b/data/mime/add-software-channel.desktop.in deleted file mode 100644 index bc8b1f7a..00000000 --- a/data/mime/add-software-channel.desktop.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Add Software Channel -_GenericName=Add Software Channel -Exec=/usr/bin/add-software-channel -Icon=update-manager.png -Terminal=false -Visible=false -Type=Application -Encoding=UTF-8 -Categories=Application;System;Settings; -MimeType=text/x-apt-sources diff --git a/data/mime/apt.xml b/data/mime/apt.xml index 33592bdd..d7332632 100644 --- a/data/mime/apt.xml +++ b/data/mime/apt.xml @@ -1,6 +1,6 @@ - + Software Channel List diff --git a/data/update-manager.gladep b/data/update-manager.gladep deleted file mode 100644 index 183077ba..00000000 --- a/data/update-manager.gladep +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - FALSE - diff --git a/data/update-manager.schemas.in b/data/update-manager.schemas.in new file mode 100644 index 00000000..06308871 --- /dev/null +++ b/data/update-manager.schemas.in @@ -0,0 +1,52 @@ + + + + + /schemas/apps/update-manager/remind_reload + /apps/update-manager/remind_reload + update-manager + bool + True + + + Remind to reload the channel list + + If automatic checking for updates is disabeld, you have + to reload the channel list manually. This option allows + to hide the reminder shown in this case. + + + + + /schemas/apps/update-manager/show_details + /apps/update-manager/show_details + update-manager + bool + False + + + Show details of an update + + Stores the state of the expander that contains the + list of changs and the description + + + + + /schemas/apps/update-manager/window_size + /apps/update-manager/window_size + update-manager + pair + int + int + + + The window size + + Stores the size of the update-manager dialog + + + + + + diff --git a/debian/rules b/debian/rules index a8da2355..3753e9f7 100755 --- a/debian/rules +++ b/debian/rules @@ -64,6 +64,7 @@ binary-arch: build install dh_scrollkeeper dh_installmime dh_desktop + dh_gconf dh_installexamples # dh_install # dh_installmenu diff --git a/gnome-software-properties b/gnome-software-properties index a8074f7e..2e1d5da6 100644 --- a/gnome-software-properties +++ b/gnome-software-properties @@ -73,6 +73,9 @@ if __name__ == "__main__": data_dir="/usr/share/update-manager/" #data_dir="/tmp/xxx/share/update-manager/" - app = SoftwareProperties.SoftwareProperties(data_dir, options) + file = None + if len(args) > 0: + file = args[0] + app = SoftwareProperties.SoftwareProperties(data_dir, options, file) app.run() - sys.exit(app.modified) \ No newline at end of file + sys.exit(app.modified) diff --git a/po/POTFILES.in b/po/POTFILES.in index 12a33a6d..fc588621 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,7 @@ [encoding: UTF-8] data/SoftwareProperties.glade SoftwareProperties/SoftwareProperties.py +SoftwareProperties/dialog_sources_list.py DistUpgrade/DistUpgradeCache.py DistUpgrade/DistUpgradeControler.py DistUpgrade/DistUpgradeViewGtk.py @@ -9,6 +10,7 @@ DistUpgrade/dist-upgrade.py DistUpgrade/DistUpgrade.glade data/UpdateManager.glade data/update-manager.desktop.in +data/update-manager.schemas.in [type: gettext/rfc822deb] channels/Ubuntu.info.in [type: gettext/rfc822deb] channels/Debian.info.in [type: python] src/update-manager diff --git a/po/bg.po b/po/bg.po index d9614dc1..ac016704 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update manager\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-07-22 19:24+0300\n" "Last-Translator: Rostislav \"zbrox\" Raykov \n" "Language-Team: Bulgarian \n" @@ -91,39 +91,50 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Обновления на софтуера" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Грешка при внасяне на избрания файл" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Избраният файл или не е GPG файл или е повреден." -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Грешка при премахване на ключа" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като " "грешка." -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -131,14 +142,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Обновления на софтуера" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -596,11 +637,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "Инсталиране на обновленията..." -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Презареждане" @@ -613,6 +658,35 @@ msgstr "Показване на наличните обновления и из msgid "Update Manager" msgstr "Управление на обновленията" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -722,6 +796,17 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "" +#~ "Автоматичен подписващ ключ за архива на Ubuntu " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "" +#~ "Автоматичен подписващ ключ за дисковете на Ubuntu " + +#~ msgid "Choose a key-file" +#~ msgstr "Избор на ключов файл" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Грешка при премахване на ключа" @@ -940,17 +1025,6 @@ msgstr "" #~ msgid "Debian Non-US (Testing)" #~ msgstr "Debian Non-US (Testing)" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "" -#~ "Автоматичен подписващ ключ за архива на Ubuntu " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "" -#~ "Автоматичен подписващ ключ за дисковете на Ubuntu " - -#~ msgid "Choose a key-file" -#~ msgstr "Избор на ключов файл" - #~ msgid "Your system is up-to-date!" #~ msgstr "Програмите са обновени до последните версии!" diff --git a/po/da.po b/po/da.po index 2ee78b0e..6dae46de 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-03-28 11:31+0200\n" "Last-Translator: Martin Willemoes Hansen \n" "Language-Team: Danish \n" @@ -91,37 +91,48 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Opdateringer" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -129,14 +140,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Opdateringer" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -587,11 +628,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "_Installér" -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Genindlæs" @@ -604,6 +649,35 @@ msgstr "Vis tilgængelige opgraderinger og vælg hvilke der skal installeres" msgid "Update Manager" msgstr "Opdateringshåndtering" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format diff --git a/po/de.po b/po/de.po index 4a29228a..d91330f1 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-04-02 08:46+0200\n" "Last-Translator: Frank Arnold \n" "Language-Team: German GNOME Translations \n" @@ -94,41 +94,52 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Software-Aktualisierungen" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Fehler beim Importieren der gewählten Datei" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Die gewählte Datei ist möglicherweise keine GPG-Schlüsseldatei oder ist " "beschädigt." -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Fehler beim Entfernen des Schlüssels" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Der gewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie " "hierfür einen Fehlerbericht." -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -136,14 +147,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Software-Aktualisierungen" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -606,12 +647,16 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "_Installieren" # »Aktualisieren« könnte hier verwirrend sein -fa- -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Neu laden" @@ -624,6 +669,35 @@ msgstr "Verfügbare Aktualisierungen anzeigen und zu installierende auswählen" msgid "Update Manager" msgstr "Aktualisierungsverwaltung" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -733,6 +807,18 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "" +#~ "Automatischer Signaturschlüssel des Ubuntu-Archivs " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "" +#~ "Automatischer Signaturschlüssel für das Ubuntu-CD-Image " + +#~ msgid "Choose a key-file" +#~ msgstr "Eine Schlüsseldatei wählen" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Fehler beim Entfernen des Schlüssels" @@ -749,9 +835,6 @@ msgstr "" #~ msgid "Cancel downloading of the changelog" #~ msgstr "Herunterladen des Änderungsprotokolls abbrechen" -#~ msgid "Choose a key-file" -#~ msgstr "Eine Schlüsseldatei wählen" - #~ msgid "Packages to install:" #~ msgstr "Zu installierende Pakete:" @@ -1025,15 +1108,6 @@ msgstr "" #~ msgid "US export restricted software" #~ msgstr "Software mit US-Exportbeschränkungen" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "" -#~ "Automatischer Signaturschlüssel des Ubuntu-Archivs " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "" -#~ "Automatischer Signaturschlüssel für das Ubuntu-CD-Image " - #~ msgid "Repositories changed" #~ msgstr "Geänderte Repositories" diff --git a/po/el.po b/po/el.po index b9b3a304..dbe06fbe 100644 --- a/po/el.po +++ b/po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-03-05 14:33+0200\n" "Last-Translator: Kostas Papadimas \n" "Language-Team: Greek \n" @@ -89,37 +89,48 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Πηγές λογισμικού" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -127,14 +138,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Πηγές λογισμικού" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -575,10 +616,14 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 -msgid "_Install Updates" +msgid "_Hide this information in the future" msgstr "" #: ../data/UpdateManager.glade.h:23 +msgid "_Install Updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:24 msgid "_Reload" msgstr "" @@ -590,6 +635,35 @@ msgstr "" msgid "Update Manager" msgstr "" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format diff --git a/po/en_CA.po b/po/en_CA.po index 22ca9fae..c438cbbb 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-04-03 01:26-0500\n" "Last-Translator: Adam Weinberger \n" "Language-Team: Canadian English \n" @@ -92,38 +92,49 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Software Updates" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "The selected file may not be a GPG key file or it might be corrupt." -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "The key you selected could not be removed. Please report this as a bug." -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -131,14 +142,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Software Updates" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -596,11 +637,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "_Install" -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Reload" @@ -613,6 +658,35 @@ msgstr "Show available updates and choose which to install" msgid "Update Manager" msgstr "Update Manager" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -722,6 +796,15 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "Ubuntu Archive Automatic Signing Key " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "Ubuntu CD Image Automatic Signing Key " + +#~ msgid "Choose a key-file" +#~ msgstr "Choose a key-file" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Error removing the key" @@ -738,9 +821,6 @@ msgstr "" #~ msgid "Cancel downloading of the changelog" #~ msgstr "Cancel downloading the ChangeLog" -#~ msgid "Choose a key-file" -#~ msgstr "Choose a key-file" - #~ msgid "Packages to install:" #~ msgstr "Packages to install:" @@ -1005,12 +1085,6 @@ msgstr "" #~ msgid "US export restricted software" #~ msgstr "US export restricted software" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "Ubuntu Archive Automatic Signing Key " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "Ubuntu CD Image Automatic Signing Key " - #~ msgid "Repositories changed" #~ msgstr "Repositories changed" diff --git a/po/en_GB.po b/po/en_GB.po index 66406d9c..f25a9fae 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-04-19 22:51-0400\n" "Last-Translator: Abigail Brady \n" "Language-Team: \n" @@ -94,38 +94,49 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Software Updates" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "The selected file may not be a GPG key file or it might be corrupt." -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "The key you selected could not be removed. Please report this as a bug." -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -133,14 +144,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Software Updates" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -597,11 +638,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "Installing updates..." -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Reload" @@ -614,6 +659,35 @@ msgstr "Show available updates and choose which to install" msgid "Update Manager" msgstr "Update Manager" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -723,6 +797,15 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "Ubuntu Archive Automatic Signing Key " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "Ubuntu CD Image Automatic Signing Key " + +#~ msgid "Choose a key-file" +#~ msgstr "Choose a key-file" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Error removing the key" @@ -942,15 +1025,6 @@ msgstr "" #~ msgid "Debian Non-US (Testing)" #~ msgstr "Debian Non-US (Testing)" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "Ubuntu Archive Automatic Signing Key " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "Ubuntu CD Image Automatic Signing Key " - -#~ msgid "Choose a key-file" -#~ msgstr "Choose a key-file" - #~ msgid "Your system is up-to-date!" #~ msgstr "Your system is up-to-date!" diff --git a/po/es.po b/po/es.po index c1004ea2..aa3431c4 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-04-04 15:00+0200\n" "Last-Translator: Jorge Bernal \n" "Language-Team: Spanish \n" @@ -95,41 +95,52 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Actualizaciones de software" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Hubo un error al importar el fichero seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Puede que el fichero seleccionado no sea un fichero de clave GPG o que esté " "corrupto." -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Hubo un error al quitar la clave" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "No se puede quitar la clave que ha seleccionado. Por favor, avise de esto " "como un fallo." -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -137,14 +148,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Actualizaciones de software" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -605,11 +646,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "_Instalar" -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Recargar" @@ -622,6 +667,35 @@ msgstr "Mostrar actualizaciones disponibles y elegir cuáles instalar" msgid "Update Manager" msgstr "Gestor de actualizaciones" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -731,6 +805,18 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "" +#~ "Clave de firmado automático del archivo de Ubuntu " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "" +#~ "Clave de firmado automático de las imágenes de CD de Ubuntu " +#~ "" + +#~ msgid "Choose a key-file" +#~ msgstr "Elija un fichero de clave" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Hubo un error al quitar la clave" @@ -747,9 +833,6 @@ msgstr "" #~ msgid "Cancel downloading of the changelog" #~ msgstr "Cancelar la descarga del informe de cambios" -#~ msgid "Choose a key-file" -#~ msgstr "Elija un fichero de clave" - #~ msgid "Packages to install:" #~ msgstr "Paquetes a instalar:" @@ -1020,15 +1103,6 @@ msgstr "" #~ msgid "US export restricted software" #~ msgstr "Software con restricciones de exportación estadounidenses" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "" -#~ "Clave de firmado automático del archivo de Ubuntu " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "" -#~ "Clave de firmado automático de las imágenes de CD de Ubuntu " -#~ "" - #~ msgid "Repositories changed" #~ msgstr "Hay cambios en los repositorios" diff --git a/po/fi.po b/po/fi.po index ea28febd..d18cc875 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-03-30 08:30+0200\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" @@ -91,38 +91,49 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Ohjelmapäivitykset" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Virhe tuotaessa valittua avainta" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Valittua tedosto ei ole kelvollinen GPG:n avaintiedosto" -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Virhe poistettaessa avainta" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus." -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -130,14 +141,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Ohjelmapäivitykset" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -594,11 +635,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "_Asenna" -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Päivitä" @@ -611,6 +656,35 @@ msgstr "Näytä saatavilla olevat päivitykset ja valitse asennettavat" msgid "Update Manager" msgstr "Päivitysten hallinta" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -720,6 +794,17 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "" +#~ "Ubuntu-arkiston automaattinen allekirjoitusavain " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "" +#~ "Ubuntun CD-vedosten automaattinen allekirjoitusavain " + +#~ msgid "Choose a key-file" +#~ msgstr "Valitse avaintiedosto" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Virhe poistettaessa avainta" @@ -736,9 +821,6 @@ msgstr "" #~ msgid "Cancel downloading of the changelog" #~ msgstr "Keskeytä muutosluettelon lataus" -#~ msgid "Choose a key-file" -#~ msgstr "Valitse avaintiedosto" - #~ msgid "Packages to install:" #~ msgstr "Asennettavat paketit:" @@ -997,14 +1079,6 @@ msgstr "" #~ msgid "US export restricted software" #~ msgstr "USA:sta vientirajoitetut ohjelmat" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "" -#~ "Ubuntu-arkiston automaattinen allekirjoitusavain " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "" -#~ "Ubuntun CD-vedosten automaattinen allekirjoitusavain " - #~ msgid "Repositories changed" #~ msgstr "Varastot muuttuneet" diff --git a/po/fr.po b/po/fr.po index fac40006..86fe3bbf 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.37.2\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-04-04 19:43+0200\n" "Last-Translator: \n" "Language-Team: French \n" @@ -92,41 +92,52 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Mises à jour des logiciels" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Erreur lors du chargement du fichier sélectionné" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Le fichier sélectionné n'est peut-être pas un clé GPG ou alors il est " "corrompu." -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Erreur lors de la suppression de la clé" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "La clé que vous avez sélectionné ne peut être supprimé. Veuillez envoyer " "ceci comme étant un bug." -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -134,14 +145,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Mises à jour des logiciels" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -602,11 +643,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "_Installer" -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Recharger" @@ -619,6 +664,35 @@ msgstr "Montre les mises à jours disponibles et choisir celles à installer" msgid "Update Manager" msgstr "Gestionnaire de mises à jour" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -728,6 +802,17 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "" +#~ "Clé de signature automatique de l'archive Ubuntu " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "" +#~ "Clé de signature automatique des cédéroms Ubuntu " + +#~ msgid "Choose a key-file" +#~ msgstr "Choisir un fichier de clé" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Erreur lors de la suppression de la clé" @@ -744,9 +829,6 @@ msgstr "" #~ msgid "Cancel downloading of the changelog" #~ msgstr "Annuler le téléchargement du changelog" -#~ msgid "Choose a key-file" -#~ msgstr "Choisir un fichier de clé" - #~ msgid "Packages to install:" #~ msgstr "Paquets à installer :" @@ -1017,14 +1099,6 @@ msgstr "" #~ msgid "US export restricted software" #~ msgstr "Logiciel restreint à l'export (USA)" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "" -#~ "Clé de signature automatique de l'archive Ubuntu " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "" -#~ "Clé de signature automatique des cédéroms Ubuntu " - #~ msgid "Repositories changed" #~ msgstr "Les dépôts ont été modifiés" diff --git a/po/gl.po b/po/gl.po index 98ec55bd..299dff93 100644 --- a/po/gl.po +++ b/po/gl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gl\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-12-02 15:59+0100\n" "Last-Translator: Ignacio Casal Quinteiro \n" "Language-Team: Galego\n" @@ -91,41 +91,52 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Actualizacións de software" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Erro importando o ficheiro seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "O ficheiro seleccionado pode que non sexa un ficheiro de clave GPG ou que " "esté corrupto." -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Erro ao quitar a clave" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un " "erro." -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -133,14 +144,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Actualizacións de software" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -598,11 +639,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "Instalando actualizacións..." -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Recargar" @@ -615,6 +660,35 @@ msgstr "Amosar actualización dispoñibles e escoller cales instalar" msgid "Update Manager" msgstr "Xestor de actualizacións" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -724,6 +798,18 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "" +#~ "Clave de asinado automático do ficheiro de Ubuntu " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "" +#~ "Clave de asinado automático das imaxes de CD de Ubuntu " + +#~ msgid "Choose a key-file" +#~ msgstr "Escolla un ficheiro de clave" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Erro ao quitar a clave" @@ -924,18 +1010,6 @@ msgstr "" #~ msgid "Debian Non-US (Testing)" #~ msgstr "Debian Non-US (Probas)" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "" -#~ "Clave de asinado automático do ficheiro de Ubuntu " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "" -#~ "Clave de asinado automático das imaxes de CD de Ubuntu " - -#~ msgid "Choose a key-file" -#~ msgstr "Escolla un ficheiro de clave" - #~ msgid "Your system is up-to-date!" #~ msgstr "O seu sistema está actualizado!" diff --git a/po/he.po b/po/he.po index 6dcbb338..ac2b4658 100644 --- a/po/he.po +++ b/po/he.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-08-07 14:49+0300\n" "Last-Translator: Yuval Tanny\n" "Language-Team: Hebrew \n" @@ -94,37 +94,48 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "עדכוני תוכנה" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "שגיאה בייבוא קובץ נבחר" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "הקובץ הנבחר הוא לא מפתח GPG או שהוא לא תקין." -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "שגיאה בהסרת המפתח" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג." -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -132,14 +143,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "עדכוני תוכנה" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -591,11 +632,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "מתקין עדכונים..." -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "טען מחדש" @@ -608,6 +653,35 @@ msgstr "הראה עדכונים זמינים ובחר את מה להתקין" msgid "Update Manager" msgstr "מנהל עדכונים" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -717,6 +791,9 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Choose a key-file" +#~ msgstr "בחר בקובץ מפתח" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "שגיאה בהסרת המפתח" @@ -930,9 +1007,6 @@ msgstr "" #~ msgid "Debian Non-US (Testing)" #~ msgstr "דביאן לא ארה\"ב (בדיקה)" -#~ msgid "Choose a key-file" -#~ msgstr "בחר בקובץ מפתח" - #~ msgid "Your system is up-to-date!" #~ msgstr "המערכת שלך מעודכנת!" diff --git a/po/hu.po b/po/hu.po index 21d56f42..1858468e 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-04-03 12:32+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -93,38 +93,49 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Szoftverfrissítések" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Hiba a kiválasztott fájl importálása közben" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "A kiválasztott fájl vagy nem GPG kulcsfájl, vagy sérült." -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Hiba a kulcs eltávolítása közben" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Az Ön által kijelölt kulcs nem távolítható el. Kérem jelentse ezt hibaként." -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -132,14 +143,42 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Szoftverfrissítések" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -594,11 +633,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "_Telepítés" -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Újratöltés" @@ -611,6 +654,35 @@ msgstr "Rendelkezésre álló frissítések mutatása és telepítése" msgid "Update Manager" msgstr "Frissítéskezelő" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -720,6 +792,15 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "Ubuntu archívum automatikus aláírókulcs " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "Ubuntu CD-kép automatikus aláírókulcs " + +#~ msgid "Choose a key-file" +#~ msgstr "Válasszon egy kulcsfájlt" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Hiba a kulcs eltávolítása közben" @@ -736,9 +817,6 @@ msgstr "" #~ msgid "Cancel downloading of the changelog" #~ msgstr "A módosítások listájának letöltésének megszakítása" -#~ msgid "Choose a key-file" -#~ msgstr "Válasszon egy kulcsfájlt" - #~ msgid "Packages to install:" #~ msgstr "Telepítendő csomagok:" @@ -1007,12 +1085,6 @@ msgstr "" #~ msgid "US export restricted software" #~ msgstr "Egyesült Államok exportkorlátozása alá eső szoftver" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "Ubuntu archívum automatikus aláírókulcs " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "Ubuntu CD-kép automatikus aláírókulcs " - #~ msgid "Repositories changed" #~ msgstr "Megváltoztak a tárolók" diff --git a/po/it.po b/po/it.po index ad39d11e..2e141e84 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-10-26 12:25+0200\n" "Last-Translator: Fabio Marzocca \n" "Language-Team: Italian \n" @@ -91,41 +91,52 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Aggiornamenti Software" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Errore nell'importazione del file selezionato" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Il file selezionato potrebbe non essere un file di chiave GPG o potrebbe " "essere corrotto." -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Errore rimuovendo la chiave" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "La chiave selezionata non può essere rimossa. Per favore riporta questo come " "bug." -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -133,14 +144,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Aggiornamenti Software" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -599,11 +640,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "Installazione degli aggiornamenti..." -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Ricarica" @@ -617,6 +662,35 @@ msgstr "" msgid "Update Manager" msgstr "Gestore degli Aggiornamenti" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -726,6 +800,18 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "" +#~ "Chiave di Firma Automatica per l'Archivio Ubuntu " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "" +#~ "Chiave di Firma Automatica per l'immagine CD di Ubuntu " + +#~ msgid "Choose a key-file" +#~ msgstr "Scegli un file di chiave" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Errore rimuovendo la chiave" @@ -928,18 +1014,6 @@ msgstr "" #~ msgid "Debian Non-US (Testing)" #~ msgstr "Debian·Non-US·(Testing)" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "" -#~ "Chiave di Firma Automatica per l'Archivio Ubuntu " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "" -#~ "Chiave di Firma Automatica per l'immagine CD di Ubuntu " - -#~ msgid "Choose a key-file" -#~ msgstr "Scegli un file di chiave" - #~ msgid "Your system is up-to-date!" #~ msgstr "Il tuo sistema è aggiornato!" diff --git a/po/ja.po b/po/ja.po index c9ceaf2d..4904c189 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-10-12 17:28+0900\n" "Last-Translator: Ikuya Awashiro \n" "Language-Team: Ubuntu-ja \n" @@ -93,38 +93,49 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "ソフトウェアのアップデート" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "選択したファイルのインポートエラー" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "選択したファイルはGPGキーファイルではないか、壊れている可能性があります。" -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "キー削除のエラー" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "選択したキーを削除できませんでした。バグとして報告してください。" -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -132,14 +143,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "ソフトウェアのアップデート" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -592,11 +633,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "アップデートをインストール中..." -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "再読込" @@ -609,6 +654,35 @@ msgstr "アップデート可能なファイルの表示とインストール" msgid "Update Manager" msgstr "アップデートマネージャ" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -716,6 +790,15 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "Ubuntu Archive Automatic Signing Key " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "Ubuntu CD Image Automatic Signing Key " + +#~ msgid "Choose a key-file" +#~ msgstr "キーファイルを選択" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "キー削除のエラー" @@ -732,9 +815,6 @@ msgstr "" #~ msgid "Cancel downloading of the changelog" #~ msgstr "変更点の取得を中止" -#~ msgid "Choose a key-file" -#~ msgstr "キーファイルを選択" - #~ msgid "Comment:" #~ msgstr "コメント:" @@ -902,12 +982,6 @@ msgstr "" #~ msgid "US export restricted software" #~ msgstr "アメリカ合衆国外への輸出が禁止されているソフトウェア" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "Ubuntu Archive Automatic Signing Key " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "Ubuntu CD Image Automatic Signing Key " - #~ msgid "Repositories changed" #~ msgstr "リポジトリが変更されました" diff --git a/po/lt.po b/po/lt.po index 70d4cbde..d4b8cf25 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-09-15 15:06+0300\n" "Last-Translator: Žygimantas Beručka \n" "Language-Team: Lithuanian \n" @@ -91,38 +91,49 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Programinės įrangos atnaujinimai" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Importuojant pasirinktą bylą įvyko klaida" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Pasirinkta byla gali būti ne GPG rakto byla arba sugadinta byla." -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Šalinant raktą įvyko klaida" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą." -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -130,14 +141,46 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Programinės įrangos atnaujinimai" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -595,11 +638,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "Diegiami atnaujinimai..." -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Atnaujinti" @@ -612,6 +659,35 @@ msgstr "Rodyti galimus atnaujimus ir pasirinkti įdiegtinus" msgid "Update Manager" msgstr "Atnaujinimų tvarkyklė" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -721,6 +797,16 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "Ubuntu archyvo automatinio pasirašymo raktas " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "" +#~ "Ubuntu CD atvaizdžių automatinio pasirašymo raktas " + +#~ msgid "Choose a key-file" +#~ msgstr "Pasirinkite rakto bylą" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Šalinant raktą įvyko klaida" @@ -938,16 +1024,6 @@ msgstr "" #~ msgid "Debian Non-US (Testing)" #~ msgstr "Debian Non-US (Testing)" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "Ubuntu archyvo automatinio pasirašymo raktas " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "" -#~ "Ubuntu CD atvaizdžių automatinio pasirašymo raktas " - -#~ msgid "Choose a key-file" -#~ msgstr "Pasirinkite rakto bylą" - #~ msgid "Your system is up-to-date!" #~ msgstr "Jūsų sistema yra atnaujinta!" diff --git a/po/mk.po b/po/mk.po index 76def952..46cfb031 100644 --- a/po/mk.po +++ b/po/mk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: mk\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-07-20 01:21+0200\n" "Last-Translator: Арангел Ангов \n" "Language-Team: Macedonian \n" @@ -91,40 +91,51 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Надградба на софтвер" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Грешка при увоз на избраната датотека" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Избраната датотека може да не е GPG датотека или пак може да е расипана." -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Грешка при отстранување на клучот" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова " "како бубачка." -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -132,14 +143,46 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Надградба на софтвер" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -600,11 +643,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "Инсталирам надградби..." -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Освежи" @@ -617,6 +664,35 @@ msgstr "Покажи достапни надградби и избери кои msgid "Update Manager" msgstr "Менаџер за надградба" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -726,6 +802,15 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "Ubuntu Archive Automatic Signing Key " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "Ubuntu CD Image Automatic Signing Key " + +#~ msgid "Choose a key-file" +#~ msgstr "Одберете датотека за клуч" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Грешка при отстранување на клучот" @@ -928,15 +1013,6 @@ msgstr "" #~ msgid "Debian Non-US (Testing)" #~ msgstr "Debian Non-US (Testing)" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "Ubuntu Archive Automatic Signing Key " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "Ubuntu CD Image Automatic Signing Key " - -#~ msgid "Choose a key-file" -#~ msgstr "Одберете датотека за клуч" - #~ msgid "Your system is up-to-date!" #~ msgstr "Вашиот систем е надграден!" diff --git a/po/nb.po b/po/nb.po index 4bc3867c..57cb0e2d 100644 --- a/po/nb.po +++ b/po/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola \n" "Language-Team: Norwegian Bokmal \n" @@ -94,38 +94,49 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Programvareoppdateringer" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Feil under importering av fil" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Den valgte filen er ikke en GPG-fil eller så er den skadet." -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Feil under fjerning av nøkkel" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -133,14 +144,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Programvareoppdateringer" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -597,11 +638,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "Installerer oppdateringer..." -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Oppdater" @@ -614,6 +659,35 @@ msgstr "Vis tilgjengelige oppdateringer og velg hvilke som skal installeres" msgid "Update Manager" msgstr "Oppdateringshåndterer" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -723,6 +797,15 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "Ubuntu Archive Automatic Signing Key " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "Ubuntu CD Image Automatic Signing Key " + +#~ msgid "Choose a key-file" +#~ msgstr "Velg en nøkkelfil" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Feil under fjerning av nøkkel" @@ -937,15 +1020,6 @@ msgstr "" #~ msgid "Debian Non-US (Testing)" #~ msgstr "Debian Non-US (Testing)" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "Ubuntu Archive Automatic Signing Key " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "Ubuntu CD Image Automatic Signing Key " - -#~ msgid "Choose a key-file" -#~ msgstr "Velg en nøkkelfil" - #~ msgid "Your system is up-to-date!" #~ msgstr "Systemet er helt oppdatert!" diff --git a/po/ne.po b/po/ne.po index dbdaeec8..afa26ff9 100755 --- a/po/ne.po +++ b/po/ne.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-07-03 16:06+0545\n" "Last-Translator: Jaydeep Bhusal \n" "Language-Team: Nepali \n" @@ -96,37 +96,48 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "सफ्टवेयर अद्यावधिकहरु" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "चयन गरिएको फाइल आयात गर्दा त्रुटि" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "चयन गरिएको फाइल जिपिजि कुञ्जि फइल नहुन सक्छ अथवा यो दुषित हुन सक्दछ" -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "कुञ्जि हटाउँदा त्रुटि" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस" -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -134,14 +145,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "सफ्टवेयर अद्यावधिकहरु" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -594,11 +635,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "फेरि लोड गर्नुहोस" @@ -611,6 +656,35 @@ msgstr "उपलब्ध अद्यावधिकहरु देखाउ msgid "Update Manager" msgstr "अद्यावधिक व्यवस्थापक" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -721,6 +795,15 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "युबन्टु संग्रह स्वचालित हस्ताक्षर कुञ्जि " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "युबन्टु सिडि छवि स्वचालित हस्ताक्षर कुञ्जि " + +#~ msgid "Choose a key-file" +#~ msgstr "एउटा कुञ्जि-फाइल रोज्नुहोस" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "कुञ्जि हटाउँदा त्रुटि" @@ -912,15 +995,6 @@ msgstr "" #~ msgid "Debian Unstable \"Sid\"" #~ msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "युबन्टु संग्रह स्वचालित हस्ताक्षर कुञ्जि " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "युबन्टु सिडि छवि स्वचालित हस्ताक्षर कुञ्जि " - -#~ msgid "Choose a key-file" -#~ msgstr "एउटा कुञ्जि-फाइल रोज्नुहोस" - #~ msgid "Your system is up-to-date!" #~ msgstr "तपाइं को प्रणालि अप-टु-डेट छ!" diff --git a/po/nl.po b/po/nl.po index ccef272c..743145c4 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-07-13 06:24+0100\n" "Last-Translator: Michiel Sikkes \n" "Language-Team: Nederlands \n" @@ -83,37 +83,47 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +msgid "Software Channel" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -121,14 +131,43 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +msgid "Add Software Channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -568,10 +607,14 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 -msgid "_Install Updates" +msgid "_Hide this information in the future" msgstr "" #: ../data/UpdateManager.glade.h:23 +msgid "_Install Updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:24 msgid "_Reload" msgstr "" @@ -583,6 +626,35 @@ msgstr "" msgid "Update Manager" msgstr "" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format diff --git a/po/no.po b/po/no.po index 4bc3867c..57cb0e2d 100644 --- a/po/no.po +++ b/po/no.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola \n" "Language-Team: Norwegian Bokmal \n" @@ -94,38 +94,49 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Programvareoppdateringer" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Feil under importering av fil" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Den valgte filen er ikke en GPG-fil eller så er den skadet." -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Feil under fjerning av nøkkel" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -133,14 +144,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Programvareoppdateringer" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -597,11 +638,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "Installerer oppdateringer..." -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Oppdater" @@ -614,6 +659,35 @@ msgstr "Vis tilgjengelige oppdateringer og velg hvilke som skal installeres" msgid "Update Manager" msgstr "Oppdateringshåndterer" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -723,6 +797,15 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "Ubuntu Archive Automatic Signing Key " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "Ubuntu CD Image Automatic Signing Key " + +#~ msgid "Choose a key-file" +#~ msgstr "Velg en nøkkelfil" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Feil under fjerning av nøkkel" @@ -937,15 +1020,6 @@ msgstr "" #~ msgid "Debian Non-US (Testing)" #~ msgstr "Debian Non-US (Testing)" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "Ubuntu Archive Automatic Signing Key " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "Ubuntu CD Image Automatic Signing Key " - -#~ msgid "Choose a key-file" -#~ msgstr "Velg en nøkkelfil" - #~ msgid "Your system is up-to-date!" #~ msgstr "Systemet er helt oppdatert!" diff --git a/po/pa.po b/po/pa.po index 5333de25..8a7424d0 100644 --- a/po/pa.po +++ b/po/pa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pa\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-10-23 10:48-0200\n" "Last-Translator: Amanpreet Singh Alam \n" "Language-Team: Punjabi \n" @@ -91,37 +91,48 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -129,14 +140,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -583,11 +624,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 msgid "_Reload" msgstr "" @@ -599,6 +644,36 @@ msgstr "" msgid "Update Manager" msgstr "" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +#, fuzzy +msgid "Show details of an update" +msgstr "ਵੇਰਵਾ" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format diff --git a/po/pl.po b/po/pl.po index d9f90318..317c7e10 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager cvs\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-03-25 17:23+0100\n" "Last-Translator: Zygmunt Krynicki \n" "Language-Team: Polish \n" @@ -91,37 +91,48 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Aktualizacje oprogramowania" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Błąd podczas importu wybranego pliku" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Wybrany plik może nie być kluczem GPG lub może być uszkodzony." -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Błąd podczas usuwania klucza" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd." -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -129,14 +140,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Aktualizacje oprogramowania" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -591,11 +632,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "_Instaluj" -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Wczytaj ponownie" @@ -610,6 +655,35 @@ msgstr "" msgid "Update Manager" msgstr "Menadżer aktualizacji" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -719,6 +793,15 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "Klucz automatycznego podpisu archiwum Ubuntu " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "Klucz automatycznego podpisu płyty CD Ubuntu " + +#~ msgid "Choose a key-file" +#~ msgstr "Wybierz plik z kluczem" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Błąd podczas usuwania klucza" @@ -735,9 +818,6 @@ msgstr "" #~ msgid "Cancel downloading of the changelog" #~ msgstr "Anuluj pobieranie pliku zmian (Changelog)" -#~ msgid "Choose a key-file" -#~ msgstr "Wybierz plik z kluczem" - #~ msgid "Packages to install:" #~ msgstr "Pakiety do zainstalowania:" @@ -1003,12 +1083,6 @@ msgstr "" #~ msgid "US export restricted software" #~ msgstr "Oprogramowanie objęte restrykcjami eksportowymi USA" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "Klucz automatycznego podpisu archiwum Ubuntu " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "Klucz automatycznego podpisu płyty CD Ubuntu " - #~ msgid "Repositories changed" #~ msgstr "Repozytoria zmienione" diff --git a/po/pt_BR.po b/po/pt_BR.po index f4d7e89d..7f07a8ba 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2006-02-19 17:39-0300\n" "Last-Translator: Carlos Eduardo Pedroza Santiviago \n" "Language-Team: Ubuntu-BR \n" @@ -83,41 +83,52 @@ msgstr "_Obter atualizações em segundo plano, mas não instalá-las" msgid "_Install security updates without confirmation" msgstr "_Instalar novas atualizações sem confirmação" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "A cada %s dias" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "Após %s dias" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Atualizações de Programas" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "Importar Chave" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Erro importando o arquivo selecionado" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "O arquivo selecionado pode não ser um arquivo de chave GPG ou pode estar " "corrompido." -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Erro removendo a chave" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "A chave que você selecionou não pôde se removida. Por favor reporte isto " "como um erro." -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -128,14 +139,46 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "Por favor digite um nome para o disco" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "Por favor insira um disco no drive:" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Atualizações de Programas" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +#, fuzzy +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "Modificando os canais de programas" +msgstr[1] "Modificando os canais de programas" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +#, fuzzy +msgid "Could not add any software channels" +msgstr "Modificando os canais de programas" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Pacotes quebrados" @@ -635,10 +678,14 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "Atualizar para a última versão do Ubuntu" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 msgid "_Install Updates" msgstr "_Instalar Atualizações" -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 msgid "_Reload" msgstr "_Recarregar" @@ -650,6 +697,36 @@ msgstr "Exibir atualizações disponíveis e escolher quais instalar" msgid "Update Manager" msgstr "Gerenciador de Atualizações" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +#, fuzzy +msgid "Show details of an update" +msgstr "Exibir Detalhes" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -752,6 +829,15 @@ msgstr "Programa compatível com a DFSG mas com dependências não-livres" msgid "Non-DFSG-compatible Software" msgstr "Programas não compatíveis com a DFSG" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "Ubuntu Archive Automatic Signing Key " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "Ubuntu CD Image Automatic Signing Key " + +#~ msgid "Choose a key-file" +#~ msgstr "Choose a key-file" + #~ msgid "" #~ "There is not enough free space on your system to download the required " #~ "pacakges. Please free some space before trying again with e.g. 'sudo apt-" @@ -813,9 +899,6 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "Cancel downloading of the changelog" #~ msgstr "Cancel downloading the ChangeLog" -#~ msgid "Choose a key-file" -#~ msgstr "Choose a key-file" - #~ msgid "Packages to install:" #~ msgstr "Packages to install:" @@ -1083,12 +1166,6 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "US export restricted software" #~ msgstr "US export restricted software" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "Ubuntu Archive Automatic Signing Key " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "Ubuntu CD Image Automatic Signing Key " - #~ msgid "Repositories changed" #~ msgstr "Repositories changed" diff --git a/po/ro.po b/po/ro.po index e0bd7a4a..18f8e254 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-03-03 19:28+0200\n" "Last-Translator: Dan Damian \n" "Language-Team: Romanian \n" @@ -90,37 +90,48 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Actualizări software" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -128,14 +139,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Actualizări software" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -585,11 +626,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "_Instalează" -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 msgid "_Reload" msgstr "" @@ -602,6 +647,35 @@ msgstr "" msgid "Update Manager" msgstr "Actualizări Ubuntu 4.10" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format diff --git a/po/rw.po b/po/rw.po index b9163cba..68b82d0e 100644 --- a/po/rw.po +++ b/po/rw.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-03-31 20:55-0700\n" "Last-Translator: Steve Murphy \n" "Language-Team: Kinyarwanda \n" @@ -97,41 +97,52 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Ibihuzagihe bya porogaramumudasobwa " + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 #, fuzzy msgid "Error importing selected file" msgstr "Kuzaza Byahiswemo IDOSIYE" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 #, fuzzy msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Byahiswemo IDOSIYE Gicurasi OYA a Urufunguzo IDOSIYE Cyangwa" -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 #, fuzzy msgid "Error removing the key" msgstr "i Urufunguzo" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 #, fuzzy msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a" -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -139,14 +150,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Ibihuzagihe bya porogaramumudasobwa " + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -608,17 +649,21 @@ msgstr "Byarangiye" msgid "Upgrade to the latest version of Ubuntu" msgstr "" +#: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + # #-#-#-#-# setup2.pot (PACKAGE VERSION) #-#-#-#-# # setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_PROG.text # #-#-#-#-# setup2.pot (PACKAGE VERSION) #-#-#-#-# # setup2/source\uibase\agentdlg.src:RC_AGENTDLG.RESID_DLG_AGENT_STR_INSTALL.text -#: ../data/UpdateManager.glade.h:22 +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "Kwinjiza porogaramu" # sfx2/sdi\sfxslots.src:SID_RELOAD.text -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Kongera Gutangiza" @@ -632,6 +677,35 @@ msgstr "Bihari Na Guhitamo Kuri Kwinjiza porogaramu" msgid "Update Manager" msgstr "" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -743,6 +817,18 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "com" + +#, fuzzy +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "com" + +#, fuzzy +#~ msgid "Choose a key-file" +#~ msgstr "a Urufunguzo IDOSIYE" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "i Urufunguzo" @@ -759,10 +845,6 @@ msgstr "" #~ msgid "Cancel downloading of the changelog" #~ msgstr "Iyimura... i" -#, fuzzy -#~ msgid "Choose a key-file" -#~ msgstr "a Urufunguzo IDOSIYE" - #, fuzzy #~ msgid "Packages to install:" #~ msgstr "" -#~ msgstr "com" - -#, fuzzy -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "com" - #, fuzzy #~ msgid "Repositories changed" #~ msgstr "Byahinduwe" diff --git a/po/sv.po b/po/sv.po index c3999c21..f9a14316 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-03-26 15:14+0100\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" @@ -89,38 +89,50 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Ingen kanal" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +#, fuzzy +msgid "Active" +msgstr "Aktivera" + +#: ../SoftwareProperties/SoftwareProperties.py:413 #, fuzzy msgid "Import key" msgstr "Viktighet" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -128,14 +140,46 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Ingen kanal" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +#, fuzzy +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "Alla kanaler" +msgstr[1] "Alla kanaler" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +#, fuzzy +msgid "Could not add any software channels" +msgstr "inte installerad" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 #, fuzzy msgid "Broken packages" @@ -597,11 +641,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "Letar efter uppdateringar..." -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Läs om" @@ -614,6 +662,36 @@ msgstr "Visa tillgängliga uppdateringar och välj vilka som ska installeras" msgid "Update Manager" msgstr "Uppdateringshanterare" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +#, fuzzy +msgid "Show details of an update" +msgstr "Detaljer" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -722,6 +800,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "Tillgängliga program" +#, fuzzy +#~ msgid "Choose a key-file" +#~ msgstr "Välj en spegel" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Inga matchande paket hittades" @@ -745,10 +827,6 @@ msgstr "Tillgängliga program" #~ msgid "_Install" #~ msgstr "_Installera" -#, fuzzy -#~ msgid "Choose a key-file" -#~ msgstr "Välj en spegel" - #~ msgid "Details" #~ msgstr "Detaljer" @@ -1043,9 +1121,6 @@ msgstr "Tillgängliga program" #~ msgid "Activation Code:" #~ msgstr "Aktiveringskod:" -#~ msgid "Activate" -#~ msgstr "Aktivera" - #~ msgid "Please fill in both email and activation code." #~ msgstr "Fyll i både e-postadress och aktiveringskod." @@ -1263,9 +1338,6 @@ msgstr "Tillgängliga program" #~ msgid "Go to the '%s' page" #~ msgstr "Gå till sidan \"%s\"" -#~ msgid "All Channels" -#~ msgstr "Alla kanaler" - #~ msgid "All Subscribed Channels" #~ msgstr "Alla prenumererade kanaler" @@ -2041,9 +2113,6 @@ msgstr "Tillgängliga program" #~ msgid "Package Information..." #~ msgstr "Paketinformation..." -#~ msgid "No Channel" -#~ msgstr "Ingen kanal" - #~ msgid "Unknown Channel" #~ msgstr "Okänd kanal" diff --git a/po/uk.po b/po/uk.po index ef011ff3..0bcd10e4 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-08-08 11:46+0300\n" "Last-Translator: Maxim Dziumanenko \n" "Language-Team: Ukrainian \n" @@ -89,37 +89,48 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Оновлення програм" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Помилка імпорту вибраного файлу" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Вибраний файл, можливо, не є файлом GPG ключа або він пошкоджений." -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Помилка видалення ключа" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку." -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -127,14 +138,46 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Оновлення програм" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -589,11 +632,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "Встановлення оновлень..." -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Перезавантажити" @@ -606,6 +653,35 @@ msgstr "Показати доступні оновлення та зміни д msgid "Update Manager" msgstr "Менеджер оновлення" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -715,6 +791,15 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "Автоматичний ключ підпису архіву Ubuntu " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "Автоматичний ключ підпису компакт-диску Ubuntu " + +#~ msgid "Choose a key-file" +#~ msgstr "Виберіть ключовий файл" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Помилка видалення ключа" @@ -931,15 +1016,6 @@ msgstr "" #~ msgid "Debian Non-US (Testing)" #~ msgstr "Debian поза США (Тестовий)" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "Автоматичний ключ підпису архіву Ubuntu " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "Автоматичний ключ підпису компакт-диску Ubuntu " - -#~ msgid "Choose a key-file" -#~ msgstr "Виберіть ключовий файл" - #~ msgid "Your system is up-to-date!" #~ msgstr "Ваша система оновлена!" diff --git a/po/update-manager.pot b/po/update-manager.pot index 36cafd33..66b7fa1e 100644 --- a/po/update-manager.pot +++ b/po/update-manager.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:30+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -84,37 +84,47 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +msgid "Software Channel" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -122,14 +132,43 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +msgid "Add Software Channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -569,10 +608,14 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 -msgid "_Install Updates" +msgid "_Hide this information in the future" msgstr "" #: ../data/UpdateManager.glade.h:23 +msgid "_Install Updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:24 msgid "_Reload" msgstr "" @@ -584,6 +627,35 @@ msgstr "" msgid "Update Manager" msgstr "" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format diff --git a/po/vi.po b/po/vi.po index 307f8d26..d0c1c37e 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager Gnome HEAD\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-08-26 18:15+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -90,37 +90,48 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Bản cập nhật phần mềm" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Gặp lỗi khi nhập tâp tin đã chọn" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Có lẽ tập tin đã chọn không phai là tập tin khóa GPG, hoặc nó bị hỏng." -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Gặp lỗi khi gỡ bỏ khóa" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này." -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -128,14 +139,42 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Bản cập nhật phần mềm" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -584,11 +623,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "Đang cài đặt bản cập nhật..." -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "Tải lại" @@ -601,6 +644,35 @@ msgstr "Hiện các bản cập nhật công bố và chọn bản nào cần c msgid "Update Manager" msgstr "Bộ Quản lý Cập nhật" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -710,6 +782,15 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "Khóa ký tự động kho Ubuntu " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "Khóa ký tự động ảnh đĩa CD Ubuntu " + +#~ msgid "Choose a key-file" +#~ msgstr "Chọn tập tin khóa" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Gặp lỗi khi gỡ bỏ khóa" @@ -913,15 +994,6 @@ msgstr "" #~ msgid "Debian Non-US (Testing)" #~ msgstr "Không Mỹ Debian (Thử ra)" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "Khóa ký tự động kho Ubuntu " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "Khóa ký tự động ảnh đĩa CD Ubuntu " - -#~ msgid "Choose a key-file" -#~ msgstr "Chọn tập tin khóa" - #~ msgid "Your system is up-to-date!" #~ msgstr "Hệ thống bạn toàn mới nhất." diff --git a/po/xh.po b/po/xh.po index cca3529e..7ce93311 100644 --- a/po/xh.po +++ b/po/xh.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-notifier\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-03-30 13:25+0200\n" "Last-Translator: Canonical Ltd \n" "Language-Team: Xhosa \n" @@ -88,37 +88,48 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "Bonisa izihlaziyo" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -126,14 +137,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "Bonisa izihlaziyo" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -575,11 +616,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "Bonisa izihlaziyo" -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 msgid "_Reload" msgstr "" @@ -592,6 +637,35 @@ msgstr "" msgid "Update Manager" msgstr "UMlawuli woMqulu weNkqubo" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format diff --git a/po/zh_CN.po b/po/zh_CN.po index 27a5f47d..a1671da6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-03-21 22:00+0800\n" "Last-Translator: Funda Wang \n" "Language-Team: zh_CN \n" @@ -90,37 +90,48 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "软件更新" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -128,14 +139,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "软件更新" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -582,11 +623,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "安装(_I)" -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "重新装入" @@ -599,6 +644,35 @@ msgstr "显示可用的更新并选择要安装的更新" msgid "Update Manager" msgstr "更新管理器" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format diff --git a/po/zh_HK.po b/po/zh_HK.po index ccce528f..1017fd4d 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-12-14 01:58+0800\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (traditional) \n" @@ -89,37 +89,48 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "軟件更新" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "匯入指定檔案時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "選定的檔案可能不是 GPG 密碼匙，或者內容已損壞。" -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "移除密碼匙時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "你選定的密碼匙無法移除，請匯報問題。" -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -127,14 +138,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "軟件更新" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -586,11 +627,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "正在安裝軟件更新..." -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "重新載入" @@ -603,6 +648,35 @@ msgstr "顯示所有可更新的套件，並選擇要安裝的套件" msgid "Update Manager" msgstr "更新管理員" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -712,6 +786,15 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "Ubuntu 套件自動簽署用密碼匙 " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "Ubuntu 光碟自動簽署用密碼匙 " + +#~ msgid "Choose a key-file" +#~ msgstr "選擇密碼匙檔" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "移除密碼匙時發生錯誤" @@ -909,15 +992,6 @@ msgstr "" #~ msgid "Debian Non-US (Testing)" #~ msgstr "Debian Non-US (測試版)" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "Ubuntu 套件自動簽署用密碼匙 " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "Ubuntu 光碟自動簽署用密碼匙 " - -#~ msgid "Choose a key-file" -#~ msgstr "選擇密碼匙檔" - #~ msgid "Your system is up-to-date!" #~ msgstr "系統已經在最新狀態！" diff --git a/po/zh_TW.po b/po/zh_TW.po index 747eb8ae..f0941856 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\n" "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-02-21 00:11+0100\n" +"POT-Creation-Date: 2006-02-23 12:55+0100\n" "PO-Revision-Date: 2005-12-14 01:58+0800\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (traditional) \n" @@ -89,37 +89,48 @@ msgstr "" msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:101 +#: ../SoftwareProperties/SoftwareProperties.py:115 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:131 +#: ../SoftwareProperties/SoftwareProperties.py:145 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#. cell_desc.set_property("xpad", 10) +#. cell_desc.set_property("ypad", 10) +#: ../SoftwareProperties/SoftwareProperties.py:230 +#, fuzzy +msgid "Software Channel" +msgstr "軟體更新" + +#: ../SoftwareProperties/SoftwareProperties.py:236 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:364 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "匯入指定檔案時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:365 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "選定的檔案可能不是 GPG 金鑰，或者內容已損壞。" -#: ../SoftwareProperties/SoftwareProperties.py:377 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "移除金鑰時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:378 +#: ../SoftwareProperties/SoftwareProperties.py:437 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "您選定的金鑰無法移除，請匯報問題。" -#: ../SoftwareProperties/SoftwareProperties.py:421 +#: ../SoftwareProperties/SoftwareProperties.py:480 #, python-format msgid "" "Error scaning the CD\n" @@ -127,14 +138,44 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:471 +#: ../SoftwareProperties/SoftwareProperties.py:530 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:487 +#: ../SoftwareProperties/SoftwareProperties.py:546 msgid "Please insert a disc in the drive:" msgstr "" +#: ../SoftwareProperties/dialog_sources_list.py:35 +#, fuzzy +msgid "Add Software Channels" +msgstr "軟體更新" + +#: ../SoftwareProperties/dialog_sources_list.py:71 +msgid "Add the following software channel?" +msgid_plural "Add the following software channels?" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:74 +msgid "You can install software from a channel. Use trusted channels, only." +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:78 +msgid "_Add Channel" +msgid_plural "_Add Channels" +msgstr[0] "" +msgstr[1] "" + +#: ../SoftwareProperties/dialog_sources_list.py:91 +msgid "Could not add any software channels" +msgstr "" + +#: ../SoftwareProperties/dialog_sources_list.py:92 +#, python-format +msgid "The file '%s' does not contain any valid software channels." +msgstr "" + #: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" @@ -586,11 +627,15 @@ msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:22 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:23 #, fuzzy msgid "_Install Updates" msgstr "正在安裝軟體更新..." -#: ../data/UpdateManager.glade.h:23 +#: ../data/UpdateManager.glade.h:24 #, fuzzy msgid "_Reload" msgstr "重新載入" @@ -603,6 +648,35 @@ msgstr "顯示所有可更新的套件，並選擇要安裝的套件" msgid "Update Manager" msgstr "更新管理員" +#: ../data/update-manager.schemas.in.h:1 +msgid "" +"If automatic checking for updates is disabeld, you have to reload the " +"channel list manually. This option allows to hide the reminder shown in this " +"case." +msgstr "" + +#: ../data/update-manager.schemas.in.h:2 +msgid "Remind to reload the channel list" +msgstr "" + +#: ../data/update-manager.schemas.in.h:3 +msgid "Show details of an update" +msgstr "" + +#: ../data/update-manager.schemas.in.h:4 +msgid "Stores the size of the update-manager dialog" +msgstr "" + +#: ../data/update-manager.schemas.in.h:5 +msgid "" +"Stores the state of the expander that contains the list of changs and the " +"description" +msgstr "" + +#: ../data/update-manager.schemas.in.h:6 +msgid "The window size" +msgstr "" + #. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format @@ -712,6 +786,15 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Ubuntu Archive Automatic Signing Key " +#~ msgstr "Ubuntu 套件自動簽署用金鑰 " + +#~ msgid "Ubuntu CD Image Automatic Signing Key " +#~ msgstr "Ubuntu 光碟自動簽署用金鑰 " + +#~ msgid "Choose a key-file" +#~ msgstr "選擇金鑰檔" + #, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "移除金鑰時發生錯誤" @@ -908,15 +991,6 @@ msgstr "" #~ msgid "Debian Non-US (Testing)" #~ msgstr "Debian Non-US (測試版)" -#~ msgid "Ubuntu Archive Automatic Signing Key " -#~ msgstr "Ubuntu 套件自動簽署用金鑰 " - -#~ msgid "Ubuntu CD Image Automatic Signing Key " -#~ msgstr "Ubuntu 光碟自動簽署用金鑰 " - -#~ msgid "Choose a key-file" -#~ msgstr "選擇金鑰檔" - #~ msgid "Your system is up-to-date!" #~ msgstr "系統已經在最新狀態！" diff --git a/setup.py b/setup.py index ded9c30e..873f5de4 100755 --- a/setup.py +++ b/setup.py @@ -23,6 +23,10 @@ for filepath in glob.glob("po/mo/*/LC_MESSAGES/*.mo"): targetpath = os.path.dirname(os.path.join("share/locale",lang)) I18NFILES.append((targetpath, [filepath])) +os.system("intltool-merge -d po data/update-manager.schemas.in"\ + " build/update-manager.schemas") + + # HACK: make sure that the mo files are generated and up-to-date os.system("cd po; make update-po") # do the same for the desktop files @@ -31,7 +35,7 @@ os.system("cd data; make") os.system("cd channels; make") setup(name='update-manager', - version='0.1', + version='0.42.2', packages=[ 'SoftwareProperties', 'UpdateManager', @@ -39,8 +43,7 @@ setup(name='update-manager', ], scripts=[ 'gnome-software-properties', - 'update-manager', - 'add-software-channel' + 'update-manager' ], data_files=[ ('share/update-manager/glade', @@ -55,12 +58,12 @@ setup(name='update-manager', ["data/update-manager.desktop", "data/gnome-software-properties.desktop"] ), + ('share/gconf/schemas', + glob.glob("build/*.schemas") + ), ('share/pixmaps', ["data/update-manager.png"] ), - ('share/applications', - ["data/mime/add-software-channel.desktop"] - ), ('share/mime/packages', ["data/mime/apt.xml"] ) -- cgit v1.2.3 From fcea944da8f0ce5e178f79ec670658e279c07467 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Thu, 23 Feb 2006 15:14:57 +0100 Subject: * Use a smaller border in the add cdrom dialog * add sources list was missing --- SoftwareProperties/dialog_sources_list.py | 122 ++++++++++++++++++++++++++++++ data/SoftwarePropertiesDialogs.glade | 2 +- 2 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 SoftwareProperties/dialog_sources_list.py diff --git a/SoftwareProperties/dialog_sources_list.py b/SoftwareProperties/dialog_sources_list.py new file mode 100644 index 00000000..9159d01f --- /dev/null +++ b/SoftwareProperties/dialog_sources_list.py @@ -0,0 +1,122 @@ +#!/usr/bin/env python +import pygtk +import gtk +import gtk.glade +import gobject +import os +from optparse import OptionParser +from aptsources import SourcesList, SourceEntryMatcher +from gettext import gettext as _ +import gettext +import urllib + +class AddSourcesList: + def __init__(self, parent, sourceslist, datadir, file): + print file + self.parent = parent + self.sources_old = sourceslist + self.file = self.format_uri(file) + self.glade = gtk.glade.XML(os.path.join(datadir, + "glade/SoftwarePropertiesDialogs.glade")) + self.glade.signal_autoconnect(self) + self.dialog = self.glade.get_widget("dialog_sources_list") + self.label = self.glade.get_widget("label_sources") + self.button_add = self.glade.get_widget("button_add") + self.button_cancel = self.glade.get_widget("button_cancel") + self.treeview = self.glade.get_widget("treeview_sources") + self.button_close = self.glade.get_widget("button_close") + self.scrolled = self.glade.get_widget("scrolled_window") + self.image = self.glade.get_widget("image_sources_list") + + self.dialog.realize() + if self.parent != None: + self.dialog.set_transient_for(parent) + else: + self.dialog.set_title(_("Add Software Channels")) + self.dialog.window.set_functions(gtk.gdk.FUNC_MOVE) + + # Setup the treeview + self.store = gtk.ListStore(gobject.TYPE_STRING) + self.treeview.set_model(self.store) + cell = gtk.CellRendererText() + column = gtk.TreeViewColumn("Software Channel", cell, markup=0) + column.set_max_width(500) + self.treeview.append_column(column) + + # Parse the source.list file + try: + self.sources = SingleSourcesList(self.file) + except: + self.error() + return + self.matcher = SourceEntryMatcher() + + # show the found channels or an error message + if len(self.sources.list) > 0: + self.button_close.hide() + found = False + for source in self.sources.list: + if source.invalid or source.disabled: + continue + found = True + (a_type, dist, comps) = self.matcher.match(source) + + line = "%s (%s)%s" %\ + (dist, a_type, comps) + self.store.append([line]) + if found == False: + self.error() + return + + header = gettext.ngettext("Add the following software channel?", + "Add the following software channels?", + len(self.sources.list)) + body = _("You can install software from a channel. Use "\ + "trusted channels, only.") + self.label.set_markup("%s\n\n%s" % (header, body)) + self.button_add.set_use_underline(True) + self.button_add.set_label(gettext.ngettext("_Add Channel", + "_Add Channels", + len(self.sources.list))) + else: + self.error() + return + + def error(self): + self.button_add.hide() + self.button_cancel.hide() + self.scrolled.hide() + self.button_close.show() + self.image.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG) + header = _("Could not add any software channels") + body = _("The file '%s' does not contain any valid " + "software channels." % self.file) + self.label.set_markup("%s\n\n%s" % (header, body)) + + def run(self): + res = self.dialog.run() + if res == gtk.RESPONSE_OK: + for source in self.sources: + self.sources_old.add(source.type, + source.uri, + source.dist, + source.comps, + source.comment) + self.dialog.destroy() + return res + + def format_uri(self, uri): + path = urllib.url2pathname(uri) # escape special chars + path = path.strip('\r\n\x00') # remove \r\n and NULL + if path.startswith('file:\\\\\\'): # windows + path = path[8:] # 8 is len('file:///') + elif path.startswith('file://'): #nautilus, rox + path = path[7:] # 7 is len('file://') + elif path.startswith('file:'): # xffm + path = path[5:] # 5 is len('file:') + return path + +class SingleSourcesList(SourcesList): + def __init__(self, file): + self.list = [] + self.load(file) diff --git a/data/SoftwarePropertiesDialogs.glade b/data/SoftwarePropertiesDialogs.glade index c98cc636..3e4be82f 100644 --- a/data/SoftwarePropertiesDialogs.glade +++ b/data/SoftwarePropertiesDialogs.glade @@ -1945,7 +1945,7 @@ You can add and remove authentication keys in this dialog. A key makes it possib - 12 + 6 Scanning CD-ROM GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE -- cgit v1.2.3 From f874524158145df20a540881f60621590cd1dca9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 23 Feb 2006 16:17:43 +0100 Subject: * debian/control: move to arch all * debian/changelog: updated --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1756819d..c5dd78ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +update-manager (0.42.2ubuntu6) dapper; urgency=low + + * SoftwareProperties/*: fix some UI problems (thanks to Sebastian Heinlein) + * debian/control: arch: all now + + -- Michael Vogt Thu, 23 Feb 2006 16:16:30 +0100 + update-manager (0.42.2ubuntu5) dapper; urgency=low * po/pt_BR.po: updated translation (thanks to diff --git a/debian/control b/debian/control index 314ec741..54dc884f 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 4.0.0), libxml-parser-perl, scrollkeeper, intltool, Standards-Version: 3.6.1.1 Package: update-manager -Architecture: any +Architecture: all Depends: ${python:Depends}, ${misc:Depends}, python, python-gnome2, python-glade2, python-apt (>= 0.6.15), synaptic (>= 0.57.8), lsb-release Description: GNOME application that manages apt updates This is the GNOME apt update manager. It checks for updates and lets the user -- cgit v1.2.3 From 2722df4ce2e4cd081e47d36a7c965829bad94f6b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 23 Feb 2006 19:51:34 +0100 Subject: * DistUpgrade/TODO: updated --- DistUpgrade/TODO | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/DistUpgrade/TODO b/DistUpgrade/TODO index 9d26eefc..df64b54b 100644 --- a/DistUpgrade/TODO +++ b/DistUpgrade/TODO @@ -5,6 +5,11 @@ hoary->breezy (it will crash otherwise) - send a "\n" on the libc6 question on hoary->breezy +breezy->dapper +-------------- +- gnome-icon-theme changes a lot, icons move from hicolor to gnome. + this might have caused a specatular crash during a upgrade + general ------- - CDROM upgrades !!! @@ -42,4 +47,4 @@ Robustness: as possible. The problem here is that e.g. if libnoitfy0 explodes and evolution, update-notifer depend on it, continuing means to evo and u-n can't be upgraded and dpkg explodes on them too. This is not more worse - than what we have right now I guess. \ No newline at end of file + than what we have right now I guess. -- cgit v1.2.3 From 5c5473d95a27f9cd2120e08c78618ab5e9ad4513 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 23 Feb 2006 20:52:01 +0100 Subject: * merged pittis changes --- data/gnome-software-properties.desktop.in | 1 + data/update-manager.desktop.in | 3 ++- debian/changelog | 15 ++++++++++----- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/data/gnome-software-properties.desktop.in b/data/gnome-software-properties.desktop.in index bf570533..6a193a40 100644 --- a/data/gnome-software-properties.desktop.in +++ b/data/gnome-software-properties.desktop.in @@ -11,3 +11,4 @@ Encoding=UTF-8 MimeType=text/x-apt-sources-list Categories=Application;System;Settings; X-KDE-SubstituteUID=true +X-Ubuntu-Gettext-Domain=update-manager \ No newline at end of file diff --git a/data/update-manager.desktop.in b/data/update-manager.desktop.in index 906a60e6..00287a2e 100644 --- a/data/update-manager.desktop.in +++ b/data/update-manager.desktop.in @@ -8,4 +8,5 @@ Terminal=false Type=Application Encoding=UTF-8 Categories=Application;System;Settings; -X-KDE-SubstituteUID=true \ No newline at end of file +X-KDE-SubstituteUID=true +X-Ubuntu-Gettext-Domain=update-manager \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index c5dd78ec..811bd52f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,16 +2,21 @@ update-manager (0.42.2ubuntu6) dapper; urgency=low * SoftwareProperties/*: fix some UI problems (thanks to Sebastian Heinlein) * debian/control: arch: all now - - -- Michael Vogt Thu, 23 Feb 2006 16:16:30 +0100 - -update-manager (0.42.2ubuntu5) dapper; urgency=low - * po/pt_BR.po: updated translation (thanks to Carlos Eduardo Pedroza Santiviago) + * data/gnome-software-properties.desktop.in, update-manager.desktop.in: + * debian/rules: undo the detection in favour of the simpler update of + the desktop files -- Michael Vogt Mon, 20 Feb 2006 15:58:09 +0100 +update-manager (0.42.2ubuntu5) dapper; urgency=low + + * debian/rules: Add gettext domain to .server and .desktop files to get + language pack support for them. (Similarly to cdbs' gnome.mk) + + -- Martin Pitt Thu, 23 Feb 2006 18:42:04 +0100 + update-manager (0.42.2ubuntu4) dapper; urgency=low * removed some of the gnome dependencies (gconf still in) -- cgit v1.2.3 From 51f21da0e24b8d3b1577a47d7a8342997e6cbc83 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Thu, 23 Feb 2006 22:46:50 +0100 Subject: * Automatic security updates --- SoftwareProperties/SoftwareProperties.py | 62 +++++++++++++++++++++++++++++++- SoftwareProperties/aptsources.py | 55 +++++++++++++++++++--------- 2 files changed, 99 insertions(+), 18 deletions(-) diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index 0e9a0f0d..fb9c8b05 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -260,16 +260,76 @@ class SoftwareProperties(SimpleGladeApp): self.treeview2.append_column(keys_col) def reload_sourceslist(self): + # To store the sources that provide updates + self.sources_updates = [] + # To store the sources that provide securtiy fixes + self.sources_security = [] + # To store the activated components of each dist + self.system_comps = {} + self.source_store.clear() for source in self.sourceslist.list: if source.invalid: continue - (nice_type, nice_dist, nice_comps) = self.matcher.match(source) + (nice_type, nice_dist, nice_comps, special) = self.matcher.match(source) + print "match: %s %s" % (source.dist, special) contents = "%s%s" % (nice_dist, nice_comps) if source.type == "deb-src": contents = "%s - %s %s" % (nice_dist, nice_type, nice_comps) self.source_store.append([not source.disabled, contents, source]) + + # Collect the components of an activated system dist + if special == aptsources.SOURCE_SYSTEM and source.disabled != True: + if self.system_comps.has_key(source.dist): + current = self.system_comps[source.dist] + self.system_comps[source.dist] = (current | set(source.comps)) + else: + self.system_comps[source.dist] = set(source.comps) + + # Collect sources that provide updates + elif special == aptsources.SOURCE_UPDATES: + self.sources_updates.append(source) + elif special == aptsources.SOURCE_SECURITY: + self.sources_security.append(source) + + + print "\n\nSecurity Updates: %s" % self.sources_security + print "\nSystem Sources: %s " % self.sources_system + print "\nUpdates: %s" % self.sources_updates + print "\nSystem Compos: %s " % self.system_comps + + modified = False + # Check if each security source contains all components of + # the same dist + for source in self.sources_security: + print "SecSource: %s" % source.dist + # Skip the "-security" from the dist + # FIXME: Does not work for debian + i = source.dist.find("-") + dist = source.dist[:i] + # Are there any active components for the dist? + if self.system_comps.has_key(dist): + comps_sys = self.system_comps[dist] + comps_sec = set(source.comps) + # Are there components without sec updates? + comps_endangered = comps_sys - comps_sec + print "In Danger: %s " % comps_endangered + if len(comps_endangered) > 0: + # convert the set into a list + comps_new=[] + for comp in comps_endangered: + comps_new.append(comp) + # add a security source with the additional components + print "Adding security updates for %s - %s" % (source.dist, comps_new) + self.sourceslist.add(source.type, source.uri, + source.dist, comps_new, + source.comment) + modified = True + # Reload the sourceslist if we added a new source + if modified == True: + print "modified" + self.reload_sourceslist() def reload_keyslist(self): self.keys_store.clear() diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py index f751cf7c..7cb58168 100644 --- a/SoftwareProperties/aptsources.py +++ b/SoftwareProperties/aptsources.py @@ -32,6 +32,8 @@ import os.path from UpdateManager.Common.DistInfo import DistInfo +(SOURCE_SECURITY, SOURCE_UPDATES, SOURCE_SYSTEM) = range(3) + # actual source.list entries class SourceEntry: @@ -323,12 +325,14 @@ class SourceEntryMatcher: self.description = a_descr class MatchDist: - def __init__(self,a_uri,a_dist, a_descr,l_comps, l_comps_descr): + def __init__(self, a_uri, a_dist, a_descr, l_comps, + l_comps_descr, special=None): self.uri = a_uri self.dist = a_dist self.description = a_descr self.comps = l_comps self.comps_descriptions = l_comps_descr + self.special = special def __init__(self): _ = gettext.gettext @@ -338,23 +342,32 @@ class SourceEntryMatcher: self.dist_list = [] + #UBUNTU ubuntu_comps = ["^main$","^restricted$","^universe$","^multiverse$"] ubuntu_comps_descr = [_("Officially supported"), _("Restricted copyright"), _("Community maintained (Universe)"), _("Non-free (Multiverse)")] # CDs + self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*6.04", + ".*", + _("Cdrom with Ubuntu 6.04 'Dapper "\ + "Drake'"), + ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.10", ".*", - _("CD disk with Ubuntu 5.10 'Breezy Badger'"), + _("Cdrom with Ubuntu 5.10 'Breezy "\ + "Badger'"), ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.04", ".*", - _("CD disk with Ubuntu 5.04 \"Hoary Hedgehog\""), + _("Cdrom with Ubuntu 5.04 'Hoary "\ + "Hedgehog'"), ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*4.10", ".*", - _("CD disk with Ubuntu 4.10 \"Warty Warthog\""), + _("Cdrom with Ubuntu 4.10 'Warty "\ + "Warthog'"), ubuntu_comps, ubuntu_comps_descr)) # URIs # Warty @@ -365,7 +378,8 @@ class SourceEntryMatcher: self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu", "^warty-security$", _("Ubuntu 4.10 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_SECURITY)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^warty-security$", _("Ubuntu 4.10 Security Updates"), @@ -395,36 +409,44 @@ class SourceEntryMatcher: self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^breezy-security$", _("Ubuntu 5.10 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_SECURITY)) self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu", "^breezy-security$", _("Ubuntu 5.10 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_SECURITY)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^breezy$", "Ubuntu 5.10 'Breezy Badger'", - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_SYSTEM)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^breezy-updates$", _("Ubuntu 5.10 Updates"), - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_UPDATES)) # dapper self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^dapper-security$", _("Ubuntu 6.04 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_SECURITY)) self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu", "^dapper-security$", _("Ubuntu 6.04 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_SECURITY)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^dapper$", "Ubuntu 6.04 'Dapper Drake'", - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_SYSTEM)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^dapper-updates$", _("Ubuntu 6.04 Updates"), - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_UPDATES)) # DEBIAN @@ -477,12 +499,10 @@ class SourceEntryMatcher: _("Debian Non-US (Unstable)"), debian_comps, debian_comps_descr)) - - - def match(self,source): _ = gettext.gettext # some sane defaults first + special = None type_description = source.type dist_description = source.uri + " " + source.dist # if there is a comment use it instead of the url @@ -503,6 +523,7 @@ class SourceEntryMatcher: if re.match(d.uri, source.uri) and re.match(d.dist, source.dist): dist_description = d.description comp_description = "" + special = d.special for c in source.comps: found = False for i in range(len(d.comps)): @@ -514,7 +535,7 @@ class SourceEntryMatcher: break - return (type_description,dist_description,comp_description) + return (type_description, dist_description, comp_description, special) # some simple tests -- cgit v1.2.3 From 4c058967a18024dc127179c98fb02bbc4eda2e7b Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Thu, 23 Feb 2006 23:26:04 +0100 Subject: * Move the check_endangered_comps to aptsources.py * Tag the older distrus, too * Add support for backports --- SoftwareProperties/SoftwareProperties.py | 60 +-------------- SoftwareProperties/aptsources.py | 125 ++++++++++++++++++++++++++++--- 2 files changed, 114 insertions(+), 71 deletions(-) diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index fb9c8b05..0209825d 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -260,14 +260,8 @@ class SoftwareProperties(SimpleGladeApp): self.treeview2.append_column(keys_col) def reload_sourceslist(self): - # To store the sources that provide updates - self.sources_updates = [] - # To store the sources that provide securtiy fixes - self.sources_security = [] - # To store the activated components of each dist - self.system_comps = {} - self.source_store.clear() + self.sourceslist.check_for_endangered_dists() for source in self.sourceslist.list: if source.invalid: continue @@ -279,58 +273,6 @@ class SoftwareProperties(SimpleGladeApp): contents = "%s - %s %s" % (nice_dist, nice_type, nice_comps) self.source_store.append([not source.disabled, contents, source]) - # Collect the components of an activated system dist - if special == aptsources.SOURCE_SYSTEM and source.disabled != True: - if self.system_comps.has_key(source.dist): - current = self.system_comps[source.dist] - self.system_comps[source.dist] = (current | set(source.comps)) - else: - self.system_comps[source.dist] = set(source.comps) - - # Collect sources that provide updates - elif special == aptsources.SOURCE_UPDATES: - self.sources_updates.append(source) - elif special == aptsources.SOURCE_SECURITY: - self.sources_security.append(source) - - - print "\n\nSecurity Updates: %s" % self.sources_security - print "\nSystem Sources: %s " % self.sources_system - print "\nUpdates: %s" % self.sources_updates - print "\nSystem Compos: %s " % self.system_comps - - modified = False - # Check if each security source contains all components of - # the same dist - for source in self.sources_security: - print "SecSource: %s" % source.dist - # Skip the "-security" from the dist - # FIXME: Does not work for debian - i = source.dist.find("-") - dist = source.dist[:i] - # Are there any active components for the dist? - if self.system_comps.has_key(dist): - comps_sys = self.system_comps[dist] - comps_sec = set(source.comps) - # Are there components without sec updates? - comps_endangered = comps_sys - comps_sec - print "In Danger: %s " % comps_endangered - if len(comps_endangered) > 0: - # convert the set into a list - comps_new=[] - for comp in comps_endangered: - comps_new.append(comp) - # add a security source with the additional components - print "Adding security updates for %s - %s" % (source.dist, comps_new) - self.sourceslist.add(source.type, source.uri, - source.dist, comps_new, - source.comment) - modified = True - # Reload the sourceslist if we added a new source - if modified == True: - print "modified" - self.reload_sourceslist() - def reload_keyslist(self): self.keys_store.clear() for key in self.apt_key.list(): diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py index 7cb58168..5f9c6d24 100644 --- a/SoftwareProperties/aptsources.py +++ b/SoftwareProperties/aptsources.py @@ -32,7 +32,7 @@ import os.path from UpdateManager.Common.DistInfo import DistInfo -(SOURCE_SECURITY, SOURCE_UPDATES, SOURCE_SYSTEM) = range(3) +(SOURCE_SECURITY, SOURCE_UPDATES, SOURCE_SYSTEM, SOURCE_BACKPORTS) = range(4) # actual source.list entries class SourceEntry: @@ -280,6 +280,76 @@ class SourcesList: files[source.file].write(source.str()) for f in files: files[f].close() + + def check_for_endangered_dists(self): + # To store the sources that provide updates + self.sources_updates = [] + # To store the sources that provide backports + self.sources_backports = [] + # To store the sources that provide securtiy fixes + self.sources_security = [] + # To store the activated components of each dist + self.system_comps = {} + + # The matcher searches sets the required special tags + self.matcher = SourceEntryMatcher() + + for source in self.list: + if source.invalid: + continue + (nice_type, nice_dist, nice_comps, special) = self.matcher.match(source) + print "match: %s %s" % (source.dist, special) + + # Collect the components of an activated system dist + if special == SOURCE_SYSTEM and source.disabled != True: + if self.system_comps.has_key(source.dist): + current = self.system_comps[source.dist] + self.system_comps[source.dist] = (current | set(source.comps)) + else: + self.system_comps[source.dist] = set(source.comps) + + # Collect sources that provide updates + elif special == SOURCE_UPDATES: + self.sources_updates.append(source) + elif special == SOURCE_SECURITY: + self.sources_security.append(source) + elif special == SOURCE_BACKPORTS: + self.sources_backports.append(source) + + + print "\nSystem Compos: %s " % self.system_comps + + # Check if each security source contains all components of + # the same dist + self.add_updates(self.sources_security) + self.add_updates(self.sources_updates) + self.add_updates(self.sources_backports) + + def add_updates(self, updates): + modified = False + for source in updates: + print "SecSource: %s" % source.dist + # Skip the "-security" and "-updates" from the dist + i = source.dist.find("-") + dist = source.dist[:i] + # Are there any active components for the dist? + if self.system_comps.has_key(dist): + comps_sys = self.system_comps[dist] + comps_sec = set(source.comps) + # Are there components without updates? + comps_endangered = comps_sys - comps_sec + print "In Danger: %s " % comps_endangered + if len(comps_endangered) > 0: + # convert the set into a list + comps_new=[] + for comp in comps_endangered: + comps_new.append(comp) + # add a security source with the additional components + print "Adding updates for %s - %s" % (source.dist, comps_new) + self.add(source.type, source.uri, source.dist, comps_new, + source.comment) + modified = True + return modified # templates for the add dialog class SourceEntryTemplate(SourceEntry): @@ -353,28 +423,33 @@ class SourceEntryMatcher: ".*", _("Cdrom with Ubuntu 6.04 'Dapper "\ "Drake'"), - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_SYSTEM)) self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.10", ".*", _("Cdrom with Ubuntu 5.10 'Breezy "\ "Badger'"), - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_SYSTEM)) self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.04", ".*", _("Cdrom with Ubuntu 5.04 'Hoary "\ "Hedgehog'"), - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_SYSTEM)) self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*4.10", ".*", _("Cdrom with Ubuntu 4.10 'Warty "\ "Warthog'"), - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_SYSTEM)) # URIs # Warty self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^warty$", "Ubuntu 4.10 'Warty Warthog'", - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_SYSTEM)) self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu", "^warty-security$", _("Ubuntu 4.10 Security Updates"), @@ -383,28 +458,44 @@ class SourceEntryMatcher: self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^warty-security$", _("Ubuntu 4.10 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_SECURITY)) + self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", + "^warty-backports$", + _("Ubuntu 4.10 Backports"), + ubuntu_comps, ubuntu_comps_descr, + SOURCE_BACKPORTS)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^warty-updates$", _("Ubuntu 4.10 Updates"), - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_UPDATES)) # Hoary self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^hoary-security$", _("Ubuntu 5.04 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_SECURITY)) self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu", "^hoary-security$", _("Ubuntu 5.04 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_SECURITY)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^hoary$", "Ubuntu 5.04 'Hoary Hedgehog'", - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_SYSTEM)) + self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", + "^hoary-backports$", + _("Ubuntu 5.04 Backports"), + ubuntu_comps, ubuntu_comps_descr, + SOURCE_BACKPORTS)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^hoary-updates$", _("Ubuntu 5.04 Updates"), - ubuntu_comps, ubuntu_comps_descr)) + ubuntu_comps, ubuntu_comps_descr, + SOURCE_UPDATES)) # Breezy self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^breezy-security$", @@ -421,6 +512,11 @@ class SourceEntryMatcher: "Ubuntu 5.10 'Breezy Badger'", ubuntu_comps, ubuntu_comps_descr, SOURCE_SYSTEM)) + self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", + "^breezy-backports$", + _("Ubuntu 5.10 Backports"), + ubuntu_comps, ubuntu_comps_descr, + SOURCE_BACKPORTS)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^breezy-updates$", _("Ubuntu 5.10 Updates"), @@ -442,6 +538,11 @@ class SourceEntryMatcher: "Ubuntu 6.04 'Dapper Drake'", ubuntu_comps, ubuntu_comps_descr, SOURCE_SYSTEM)) + self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", + "^dapper-backports$", + _("Ubuntu 6.04 Backports"), + ubuntu_comps, ubuntu_comps_descr, + SOURCE_BACKPORTS)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^dapper-updates$", _("Ubuntu 6.04 Updates"), -- cgit v1.2.3 From 629ab77bfdd4979cb6da87a0e20c5b131906c977 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Fri, 24 Feb 2006 02:18:49 +0100 Subject: * Rendering of channel sources: - add a small white space around each line - move the rendering to its own method and aptsources so that it can be reused in the dialog_sources_list - Tag debian sources - Do not show the components of updates, security-updates and backports * Channel handling - Bring not yet used methods for removing and disabling components in position - Add support for automatically updated updates and backports * General - comment out debug outputs - fix the plural gettext in the dialog_sources_list - fix d'n'd and mime type opening - was a bug in the renderer - add more TODO --- SoftwareProperties/SoftwareProperties.py | 15 ++- SoftwareProperties/aptsources.py | 156 ++++++++++++++++++++++++------ SoftwareProperties/dialog_sources_list.py | 19 ++-- TODO | 5 +- 4 files changed, 144 insertions(+), 51 deletions(-) diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index 0209825d..f6977275 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -225,13 +225,15 @@ class SoftwareProperties(SimpleGladeApp): self.treeview_sources.set_model(self.source_store) cell_desc = gtk.CellRendererText() - #cell_desc.set_property("xpad", 10) - #cell_desc.set_property("ypad", 10) + cell_desc.set_property("xpad", 2) + cell_desc.set_property("ypad", 2) col_desc = gtk.TreeViewColumn(_("Software Channel"), cell_desc, markup=COLUMN_DESC) - col_desc.set_max_width(500) + col_desc.set_max_width(1000) cell_toggle = gtk.CellRendererToggle() + cell_toggle.set_property("xpad", 2) + cell_toggle.set_property("ypad", 2) cell_toggle.connect('toggled', self.on_channel_toggled) col_active = gtk.TreeViewColumn(_("Active"), cell_toggle, active=COLUMN_ACTIVE) @@ -265,12 +267,7 @@ class SoftwareProperties(SimpleGladeApp): for source in self.sourceslist.list: if source.invalid: continue - (nice_type, nice_dist, nice_comps, special) = self.matcher.match(source) - print "match: %s %s" % (source.dist, special) - - contents = "%s%s" % (nice_dist, nice_comps) - if source.type == "deb-src": - contents = "%s - %s %s" % (nice_dist, nice_type, nice_comps) + contents = self.sourceslist.render_source(source) self.source_store.append([not source.disabled, contents, source]) def reload_keyslist(self): diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py index 5f9c6d24..604af097 100644 --- a/SoftwareProperties/aptsources.py +++ b/SoftwareProperties/aptsources.py @@ -236,6 +236,81 @@ class SourcesList: line = line + "\n" self.list.insert(pos, SourceEntry(line)) + def disable_components(self, comps, source_entry): + """Disable components of a source""" + comps_remove = set(comps) & set(source_entry.comps) + if len(comps_remove) >= len(source_entry.comps): + # disable the whole source + source_entry.disabled = True + elif len(comps_remove) > 0: + # Remove the sections from the original source + comps_new = set(source_entry.comps) - comps_remove + comps_write="" + for comp in comps_new: + comps_write += " %s" % comp + line = "%s %s %s %s" % (source.type, source.uri, source.dist, + comps_write) + if source.comment: + line += "# %s" % source.comment + line += "\n" + index = self.list.index(source_entry) + file = self.list[index].file + self.list[index] = SourceEntry(line, file) + + # Add a disabled line with the disabled comps after the + # original line + comps_write="" + for comp in comps_remove: + comps_write = " %s" % comp + line_disabled = "#%s %s %s %s" % (source.type, source.uri, source.dist, + comps_remove) + if source.comment: + line_disabled += "# %s" % source.comment + line_disabled += "\n" + self.list.insert[index+1](SourceEntry(line_disabled, file)) + + def remove_components(self, comps, source_entry): + """ Remove components of a source""" + # The components that need to be removed from the source + comps_remove = set(comps) & set(source_entry.comps) + if len(comps_remove) >= len(source_entry.comps): + # Delete the whole source if there are no comps left + self.list.remove(source_entry) + elif len(comps_remove) > 0: + # Remove the sections from the original source + comps_new = set(source_entry.comps) - comps_remove + comps_write = "" + for comp in comps_new: + comps_write += " %s" % comp + line = "%s %s %s %s" % (source.type, source.uri, source.dist, + comps_write) + if source.comment: + line += "# %s" % source.comment + line += "\n" + index = self.list.index(source_entry) + file = self.list[index].file + self.list[index] = SourceEntry(line, file) + + def render_source(self, source): + """Render a nice output to show the source in a treeview""" + (nice_type, nice_dist, nice_comps, special) = self.matcher.match(source) + + if special in (SOURCE_UPDATES, SOURCE_BACKPORTS, SOURCE_SECURITY): + contents = "%s" % nice_dist + elif special == SOURCE_SYSTEM: + contents = "%s" % nice_dist + if source.type in ("deb-src", "rpm-src"): + contents += " (%s)" % nice_type + for comp in nice_comps: + contents += "\n%s" % comp + else: + contents = "%s" % nice_dist + if source.type in ("deb-src", "rpm-src"): + contents += " (%s)" % nice_type + for comp in nice_comps: + contents += "%s" % comp + return contents + def remove(self, source_entry): self.list.remove(source_entry) @@ -298,7 +373,7 @@ class SourcesList: if source.invalid: continue (nice_type, nice_dist, nice_comps, special) = self.matcher.match(source) - print "match: %s %s" % (source.dist, special) + #print "match: %s %s" % (source.dist, special) # Collect the components of an activated system dist if special == SOURCE_SYSTEM and source.disabled != True: @@ -316,19 +391,18 @@ class SourcesList: elif special == SOURCE_BACKPORTS: self.sources_backports.append(source) - - print "\nSystem Compos: %s " % self.system_comps + #print "\nSystem Compos: %s " % self.system_comps # Check if each security source contains all components of # the same dist - self.add_updates(self.sources_security) - self.add_updates(self.sources_updates) - self.add_updates(self.sources_backports) + self.check_updates(self.sources_security) + self.check_updates(self.sources_updates) + self.check_updates(self.sources_backports) - def add_updates(self, updates): + def check_updates(self, updates): modified = False for source in updates: - print "SecSource: %s" % source.dist + #print "SecSource: %s" % source.dist # Skip the "-security" and "-updates" from the dist i = source.dist.find("-") dist = source.dist[:i] @@ -338,17 +412,28 @@ class SourcesList: comps_sec = set(source.comps) # Are there components without updates? comps_endangered = comps_sys - comps_sec - print "In Danger: %s " % comps_endangered + #print "In Danger: %s " % comps_endangered if len(comps_endangered) > 0: # convert the set into a list - comps_new=[] - for comp in comps_endangered: - comps_new.append(comp) - # add a security source with the additional components - print "Adding updates for %s - %s" % (source.dist, comps_new) - self.add(source.type, source.uri, source.dist, comps_new, - source.comment) + comps_write="" + for comp in comps_sys: + comps_write += " %s" % comp + # add all system components to the securtiy line + line = "%s %s %s %s" % (source.type, source.uri, source.dist, + comps_write) + if source.comment: + line += "# %s" % source.comment + line += "\n" + index = self.list.index(source) + file = self.list[index].file + self.list[index] = SourceEntry(line, file) modified = True + else: + # FIXME: What to do if there are no system sources? + # To disable the security updates would be the best + # option, but what about people with a local mirror + # that fetch sec updates from the ubuntu servers + pass return modified # templates for the add dialog @@ -562,43 +647,52 @@ class SourceEntryMatcher: self.dist_list.append(self.MatchDist(".*debian.org/debian", "^sarge$", _("Debian 3.1 'Sarge'"), - debian_comps, debian_comps_descr)) + debian_comps, debian_comps_descr, + SOURCE_SYSTEM)) self.dist_list.append(self.MatchDist(".*debian.org/debian", "^woody$", _("Debian 3.0 'Woody'"), - debian_comps, debian_comps_descr)) + debian_comps, debian_comps_descr, + SOURCE_SYSTEM)) # securtiy self.dist_list.append(self.MatchDist(".*security.debian.org", "^stable.*$", _("Debian Stable Security Updates"), - debian_comps, debian_comps_descr)) + debian_comps, debian_comps_descr, + SOURCE_SECURITY)) # dists by status self.dist_list.append(self.MatchDist(".*debian.org/debian", "^stable$", _("Debian Stable"), - debian_comps, debian_comps_descr)) + debian_comps, debian_comps_descr, + SOURCE_SYSTEM)) self.dist_list.append(self.MatchDist(".*debian.org/debian", "^testing$", _("Debian Testing"), - debian_comps, debian_comps_descr)) + debian_comps, debian_comps_descr, + SOURCE_SYSTEM)) self.dist_list.append(self.MatchDist(".*debian.org/debian", "^unstable$", _("Debian Unstable 'Sid'"), - debian_comps, debian_comps_descr)) + debian_comps, debian_comps_descr, + SOURCE_SYSTEM)) # non-us self.dist_list.append(self.MatchDist(".*debian.org/debian-non-US", "^stable.*$", _("Debian Non-US (Stable)"), - debian_comps, debian_comps_descr)) + debian_comps, debian_comps_descr, + SOURCE_SYSTEM)) self.dist_list.append(self.MatchDist(".*debian.org/debian-non-US", "^testing.*$", _("Debian Non-US (Testing)"), - debian_comps, debian_comps_descr)) + debian_comps, debian_comps_descr, + SOURCE_SYSTEM)) self.dist_list.append(self.MatchDist(".*debian.org/debian-non-US", "^unstable.*$", _("Debian Non-US (Unstable)"), - debian_comps, debian_comps_descr)) + debian_comps, debian_comps_descr, + SOURCE_SYSTEM)) def match(self,source): _ = gettext.gettext @@ -619,24 +713,24 @@ class SourceEntryMatcher: type_description = _(t.description) break + comp_descriptions = [] for d in self.dist_list: #print "'%s'" %source.uri if re.match(d.uri, source.uri) and re.match(d.dist, source.dist): dist_description = d.description - comp_description = "" + comp_descriptions = [] special = d.special for c in source.comps: found = False for i in range(len(d.comps)): if re.match(d.comps[i], c): - comp_description = comp_description+"\n"+d.comps_descriptions[i] + comp_descriptions.append(d.comps_descriptions[i]) found = True if found == False: - comp_description = comp_description+" "+c + comp_descriptions.append(c) break - - - return (type_description, dist_description, comp_description, special) + + return (type_description, dist_description, comp_descriptions, special) # some simple tests diff --git a/SoftwareProperties/dialog_sources_list.py b/SoftwareProperties/dialog_sources_list.py index 9159d01f..a09542c8 100644 --- a/SoftwareProperties/dialog_sources_list.py +++ b/SoftwareProperties/dialog_sources_list.py @@ -39,6 +39,8 @@ class AddSourcesList: self.store = gtk.ListStore(gobject.TYPE_STRING) self.treeview.set_model(self.store) cell = gtk.CellRendererText() + cell.set_property("xpad", 2) + cell.set_property("ypad", 2) column = gtk.TreeViewColumn("Software Channel", cell, markup=0) column.set_max_width(500) self.treeview.append_column(column) @@ -49,35 +51,31 @@ class AddSourcesList: except: self.error() return - self.matcher = SourceEntryMatcher() # show the found channels or an error message if len(self.sources.list) > 0: self.button_close.hide() - found = False + counter = 0 for source in self.sources.list: if source.invalid or source.disabled: continue - found = True - (a_type, dist, comps) = self.matcher.match(source) - - line = "%s (%s)%s" %\ - (dist, a_type, comps) + counter = counter +1 + line = self.sources.render_source(source) self.store.append([line]) - if found == False: + if counter == 0: self.error() return header = gettext.ngettext("Add the following software channel?", "Add the following software channels?", - len(self.sources.list)) + counter) body = _("You can install software from a channel. Use "\ "trusted channels, only.") self.label.set_markup("%s\n\n%s" % (header, body)) self.button_add.set_use_underline(True) self.button_add.set_label(gettext.ngettext("_Add Channel", "_Add Channels", - len(self.sources.list))) + counter)) else: self.error() return @@ -118,5 +116,6 @@ class AddSourcesList: class SingleSourcesList(SourcesList): def __init__(self, file): + self.matcher = SourceEntryMatcher() self.list = [] self.load(file) diff --git a/TODO b/TODO index 2a1d3928..4f225357 100644 --- a/TODO +++ b/TODO @@ -3,4 +3,7 @@ - add download size to treeview - add /etc/apt/software-properties.d dir where the user can install matchers and templates -- handle cases like "deb http://bla/ dist sec1 sec2 # comment" \ No newline at end of file +- handle cases like "deb http://bla/ dist sec1 sec2 # comment" +- rework the add channel/cdrom dialogs +- d'n'd for key files +- use one line per section and not one per channel in the treeview -- cgit v1.2.3 From 94d6f41fc71b1b416bc4a7812195d08fc5ad7c76 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Fri, 24 Feb 2006 02:30:59 +0100 Subject: * more TODO --- TODO | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TODO b/TODO index 4f225357..1507f002 100644 --- a/TODO +++ b/TODO @@ -6,4 +6,5 @@ - handle cases like "deb http://bla/ dist sec1 sec2 # comment" - rework the add channel/cdrom dialogs - d'n'd for key files -- use one line per section and not one per channel in the treeview +- use one row per section and not one per channel in the treeview +- sort the sources by dist -- cgit v1.2.3 From a06fbb1dcf05c9b21dc30a011048e556e037a33d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 24 Feb 2006 15:23:23 +0100 Subject: * formating --- UpdateManager/UpdateManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index e6394223..22c7a6a5 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -480,7 +480,7 @@ class UpdateManager(SimpleGladeApp): lock = thread.allocate_lock() lock.acquire() t = thread.start_new_thread(self.run_synaptic, - (self.window_main.window.xid ,action,lock)) + (self.window_main.window.xid,action,lock)) while lock.locked(): while gtk.events_pending(): gtk.main_iteration() -- cgit v1.2.3 From 52c686391e543bbc1084ec15f40abe8e58b1d514 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Fri, 24 Feb 2006 18:16:52 +0100 Subject: * Remove all obsolete backup files before backup --- SoftwareProperties/SoftwareProperties.py | 1 + SoftwareProperties/aptsources.py | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index f6977275..250e2c1d 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -377,6 +377,7 @@ class SoftwareProperties(SimpleGladeApp): def save_sourceslist(self): #location = "/etc/apt/sources.list" #shutil.copy(location, location + ".save") + self.sourceslist.clearBackup(".save") self.sourceslist.backup(".save") self.sourceslist.save() diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py index 604af097..397ebb38 100644 --- a/SoftwareProperties/aptsources.py +++ b/SoftwareProperties/aptsources.py @@ -314,6 +314,18 @@ class SourcesList: def remove(self, source_entry): self.list.remove(source_entry) + def clearBackup(self, backup_ext): + " remove backuped sources.list files based on the backup extension " + dir = apt_pkg.Config.FindDir("Dir::Etc") + file = apt_pkg.Config.Find("Dir::Etc::sourcelist") + if os.path.exists(dir+file+backup_ext): + os.remove(dir+file+backup_ext) + # now sources.list.d + partsdir = apt_pkg.Config.FindDir("Dir::Etc::sourceparts") + for file in glob.glob("%s/*.list" % partsdir): + if os.path.exists(file+backup_ext): + os.remove(file+backup_ext) + def restoreBackup(self, backup_ext): " restore sources.list files based on the backup extension " dir = apt_pkg.Config.FindDir("Dir::Etc") -- cgit v1.2.3 From 15c800a63e03039f55f06540f49975d1663be25a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 24 Feb 2006 20:43:26 +0100 Subject: * move the fetcher code out into UpdateManager/DistUpgradeFetcher.py * add authentication --- UpdateManager/DistUpgradeFetcher.py | 197 ++++++++++++++++++++++++++++++++++++ UpdateManager/MetaRelease.py | 4 +- UpdateManager/UpdateManager.py | 118 +-------------------- 3 files changed, 203 insertions(+), 116 deletions(-) create mode 100644 UpdateManager/DistUpgradeFetcher.py diff --git a/UpdateManager/DistUpgradeFetcher.py b/UpdateManager/DistUpgradeFetcher.py new file mode 100644 index 00000000..7af32865 --- /dev/null +++ b/UpdateManager/DistUpgradeFetcher.py @@ -0,0 +1,197 @@ +# DistUpgradeFetcher.py +# +# Copyright (c) 2006 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import pygtk +pygtk.require('2.0') +import gtk +import os +import apt_pkg +import tarfile +import urllib2 +import tempfile +import GnuPGInterface +from gettext import gettext as _ + +import GtkProgress +from ReleaseNotesViewer import ReleaseNotesViewer + + +class DistUpgradeFetcher(object): + + def __init__(self, parent, new_dist): + self.parent = parent + self.window_main = parent.window_main + self.new_dist = new_dist + + def showReleaseNotes(self): + # FIXME: care about i18n! (append -$lang or something) + if self.new_dist.releaseNotesURI != None: + uri = self.new_dist.releaseNotesURI + self.window_main.set_sensitive(False) + self.window_main.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH)) + while gtk.events_pending(): + gtk.main_iteration() + + # download/display the release notes + # FIXME: add some progress reporting here + res = gtk.RESPONSE_CANCEL + try: + release_notes = urllib2.urlopen(uri) + notes = release_notes.read() + textview_release_notes = ReleaseNotesViewer(notes) + textview_release_notes.show() + self.parent.scrolled_notes.add(textview_release_notes) + self.parent.dialog_release_notes.set_transient_for(self.window_main) + res = self.parent.dialog_release_notes.run() + self.parent.dialog_release_notes.hide() + except urllib2.HTTPError: + primary = "%s" % \ + _("Could not find the release notes") + secondary = _("The server may be overloaded. ") + dialog = gtk.MessageDialog(self.window_main,gtk.DIALOG_MODAL, + gtk.MESSAGE_ERROR,gtk.BUTTONS_CLOSE,"") + dialog.set_title("") + dialog.set_markup(primary); + dialog.format_secondary_text(secondary); + dialog.run() + dialog.destroy() + except IOError: + primary = "%s" % \ + _("Could not download the release notes") + secondary = _("Please check your internet connection.") + dialog = gtk.MessageDialog(self.window_main,gtk.DIALOG_MODAL, + gtk.MESSAGE_ERROR,gtk.BUTTONS_CLOSE,"") + dialog.set_title("") + dialog.set_markup(primary); + dialog.format_secondary_text(secondary); + dialog.run() + dialog.destroy() + self.window_main.set_sensitive(True) + self.window_main.window.set_cursor(None) + # user clicked cancel + if res == gtk.RESPONSE_CANCEL: + return False + return True + + def authenticate(self, file, signature, keyring='/etc/apt/trusted.gpg'): + """ authenticated a file against a given signature, if no keyring + is given use the apt default keyring + """ + gpg = GnuPGInterface.GnuPG() + gpg.options.extra_args = ['--no-default-keyring', + '--keyring', keyring] + proc = gpg.run(['--verify', signature, file], + create_fhs=['status','logger','stderr']) + gpgres = proc.handles['status'].read() + if "VALIDSIG" in gpgres: + return True + return False + + def extractDistUpgrader(self): + # extract the tarbal + print "extracting '%s'" % (self.tmpdir+"/"+os.path.basename(self.uri)) + tar = tarfile.open(self.tmpdir+"/"+os.path.basename(self.uri),"r") + for tarinfo in tar: + tar.extract(tarinfo) + tar.close() + return True + + def verifyDistUprader(self): + # FIXME: check a internal dependency file to make sure + # that the script will run correctly + + # see if we have a script file that we can run + self.script = script = "%s/%s" % (self.tmpdir, self.new_dist.name) + if not os.path.exists(script): + # no script file found in extracted tarbal + primary = "%s" % \ + _("Could not run the upgrade tool") + secondary = _("This is most likely a bug in the upgrade tool. " + "Please report it as a bug") + dialog = gtk.MessageDialog(self.window_main,gtk.DIALOG_MODAL, + gtk.MESSAGE_ERROR,gtk.BUTTONS_CLOSE,"") + dialog.set_title("") + dialog.set_markup(primary); + dialog.format_secondary_text(secondary); + dialog.run() + dialog.destroy() + return False + return True + + def fetchDistUpgrader(self): + # now download the tarball with the upgrade script + self.tmpdir = tmpdir = tempfile.mkdtemp() + os.chdir(tmpdir) + if self.new_dist.upgradeTool != None: + progress = GtkProgress.GtkFetchProgress(self.parent, + _("Downloading the upgrade " + "tool"), + _("The upgrade tool will " + "guide you through the " + "upgrade process.")) + fetcher = apt_pkg.GetAcquire(progress) + self.uri = self.new_dist.upgradeTool + af = apt_pkg.GetPkgAcqFile(fetcher,self.uri, descr=_("Upgrade tool")) + if fetcher.Run() != fetcher.ResultContinue: + return False + return True + + def runDistUpgrader(self): + #print "runing: %s" % script + os.execv(script,[]) + + def cleanup(self): + # cleanup + os.chdir("..") + # del tmpdir + for root, dirs, files in os.walk(self.tmpdir, topdown=False): + for name in files: + os.remove(os.path.join(root, name)) + #print "would remove file: %s" % os.path.join(root, name) + for name in dirs: + os.rmdir(os.path.join(root, name)) + #print "would remove dir: %s" % os.path.join(root, name) + os.rmdir(self.tmpdir) + + def run(self): + # see if we have release notes + if not self.showReleaseNotes(): + return + if not self.fetchDistUpgrader(): + print "Fetch failed" + return + if not self.extractDistUpgrader(): + print "extract failed" + return + if not self.verifyDistUprader(): + print "verify failed" + self.cleanup() + return + #if not self.authenticate(distUpgradeTar, distUpgradeSig): + # print "authenticate failed" + # self.cleanup() + # return + self.runDistUpgrader() + + +if __name__ == "__main__": + d = DistUpgradeFetcher(None) + print d.authenticate('/tmp/Release','/tmp/Release.gpg') diff --git a/UpdateManager/MetaRelease.py b/UpdateManager/MetaRelease.py index 0bc8dc05..cd56970f 100644 --- a/UpdateManager/MetaRelease.py +++ b/UpdateManager/MetaRelease.py @@ -42,8 +42,8 @@ class Dist(object): class MetaRelease(gobject.GObject): # some constants - METARELEASE_URI = "http://changelogs.ubuntu.com/meta-release" - #METARELEASE_URI = "http://people.ubuntu.com/~mvo/dist-upgrader/meta-release-test.save" + #METARELEASE_URI = "http://changelogs.ubuntu.com/meta-release" + METARELEASE_URI = "http://people.ubuntu.com/~mvo/dist-upgrader/meta-release-test.save" METARELEASE_FILE = "/var/lib/update-manager/meta-release" __gsignals__ = { diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 22c7a6a5..9aaad85d 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -1,6 +1,6 @@ # UpdateManager.py # -# Copyright (c) 2004,2005 Canonical +# Copyright (c) 2004-2006 Canonical # 2004 Michiel Sikkes # 2005 Martin Willemoes Hansen # @@ -48,14 +48,12 @@ import time import thread import xml.sax.saxutils -# dist-upgrade tool -import tarfile from gettext import gettext as _ from Common.utils import * from Common.SimpleGladeApp import SimpleGladeApp -from ReleaseNotesViewer import ReleaseNotesViewer +from DistUpgradeFetcher import DistUpgradeFetcher import GtkProgress from MetaRelease import Dist, MetaRelease @@ -629,116 +627,8 @@ class UpdateManager(SimpleGladeApp): def on_button_dist_upgrade_clicked(self, button): print "on_button_dist_upgrade_clicked" - - # see if we have release notes - - # FIXME: care about i18n! (append -$lang or something) - if self.new_dist.releaseNotesURI != None: - uri = self.new_dist.releaseNotesURI - print uri - self.window_main.set_sensitive(False) - self.window_main.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH)) - while gtk.events_pending(): - gtk.main_iteration() - - # download/display the release notes - # FIXME: add some progress reporting here - res = gtk.RESPONSE_CANCEL - try: - release_notes = urllib2.urlopen(uri) - notes = release_notes.read() - textview_release_notes = ReleaseNotesViewer(notes) - textview_release_notes.show() - self.scrolled_notes.add(textview_release_notes) - self.dialog_release_notes.set_transient_for(self.window_main) - res = self.dialog_release_notes.run() - self.dialog_release_notes.hide() - except urllib2.HTTPError: - primary = "%s" % \ - _("Could not find the release notes") - secondary = _("The server may be overloaded. ") - dialog = gtk.MessageDialog(self.window_main,gtk.DIALOG_MODAL, - gtk.MESSAGE_ERROR,gtk.BUTTONS_CLOSE,"") - dialog.set_title("") - dialog.set_markup(primary); - dialog.format_secondary_text(secondary); - dialog.run() - dialog.destroy() - except IOError: - primary = "%s" % \ - _("Could not download the release notes") - secondary = _("Please check your internet connection.") - dialog = gtk.MessageDialog(self.window_main,gtk.DIALOG_MODAL, - gtk.MESSAGE_ERROR,gtk.BUTTONS_CLOSE,"") - dialog.set_title("") - dialog.set_markup(primary); - dialog.format_secondary_text(secondary); - dialog.run() - dialog.destroy() - self.window_main.set_sensitive(True) - self.window_main.window.set_cursor(None) - # user clicked cancel - if res == gtk.RESPONSE_CANCEL: - return - - # now download the tarball with the upgrade script - tmpdir = tempfile.mkdtemp() - os.chdir(tmpdir) - if self.new_dist.upgradeTool != None: - progress = GtkProgress.GtkFetchProgress(self, - _("Downloading the upgrade " - "tool"), - _("The upgrade tool will " - "guide you through the " - "upgrade process.")) - fetcher = apt_pkg.GetAcquire(progress) - uri = self.new_dist.upgradeTool - #print "Downloading %s to %s" % (uri, tmpdir) - af = apt_pkg.GetPkgAcqFile(fetcher,uri, - descr=_("Upgrade tool")) - fetcher.Run() - #print "Done downloading" - - # extract the tarbal - print "extracting" - tar = tarfile.open(tmpdir+"/"+os.path.basename(uri),"r") - for tarinfo in tar: - tar.extract(tarinfo) - tar.close() - - # FIXME: check a internal dependency file to make sure - # that the script will run correctly - - # see if we have a script file that we can run - script = "%s/%s" % (tmpdir, self.new_dist.name) - if not os.path.exists(script): - # no script file found in extracted tarbal - primary = "%s" % \ - _("Could not run the upgrade tool") - secondary = _("This is most likely a bug in the upgrade tool. " - "Please report it as a bug") - dialog = gtk.MessageDialog(self.window_main,gtk.DIALOG_MODAL, - gtk.MESSAGE_ERROR,gtk.BUTTONS_CLOSE,"") - dialog.set_title("") - dialog.set_markup(primary); - dialog.format_secondary_text(secondary); - dialog.run() - dialog.destroy() - else: - #print "runing: %s" % script - os.execv(script,[]) - - # cleanup - os.chdir("..") - # del tmpdir - for root, dirs, files in os.walk(tmpdir, topdown=False): - for name in files: - os.remove(os.path.join(root, name)) - #print "would remove file: %s" % os.path.join(root, name) - for name in dirs: - os.rmdir(os.path.join(root, name)) - #print "would remove dir: %s" % os.path.join(root, name) - os.rmdir(tmpdir) + fetcher = DistUpgradeFetcher(self, self.new_dist) + fetcher.run() def new_dist_available(self, meta_release, upgradable_to): print "new_dist_available: %s" % upgradable_to.name -- cgit v1.2.3 From 8adf34a8f38e586c5a4639ab2ce558e1ab21d680 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 24 Feb 2006 23:14:09 +0100 Subject: * depend on python-gnupginterface --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 54dc884f..8870a031 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.1.1 Package: update-manager Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python, python-gnome2, python-glade2, python-apt (>= 0.6.15), synaptic (>= 0.57.8), lsb-release +Depends: ${python:Depends}, ${misc:Depends}, python, python-gnome2, python-glade2, python-apt (>= 0.6.15), synaptic (>= 0.57.8), lsb-release, python-gnupginterface Description: GNOME application that manages apt updates This is the GNOME apt update manager. It checks for updates and lets the user choose which to install. -- cgit v1.2.3 From 9f1f9070d249457871a92d52eb3817c73e6fe0ac Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Sat, 25 Feb 2006 20:10:28 +0100 Subject: * Use nice grammer #32864 * Show a warning about the time an upgrade can take * Show a warning that the upgrade cannot be canceled * Show a warning to close all apps and documents before upgrading * Only show the download size if there are upgrades --- DistUpgrade/DistUpgrade.glade | 3 ++- DistUpgrade/DistUpgradeViewGtk.py | 35 ++++++++++++++++++++++++----------- UpdateManager/UpdateManager.py | 2 +- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index c28b20ad..e50476e2 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -586,12 +586,13 @@ True + True False True GTK_JUSTIFY_LEFT True - False + True 0 0.5 0 diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 3697a49e..7298b31e 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -126,6 +126,7 @@ class GtkInstallProgressAdapter(InstallProgress): reaper.connect("child-exited", self.child_exited) # some options for dpkg to make it die less easily apt_pkg.Config.Set("DPkg::Options::","--force-overwrite") + def startUpdate(self): self.finished = False # FIXME: add support for the timeout @@ -161,15 +162,19 @@ class GtkInstallProgressAdapter(InstallProgress): def fork(self): pid = self.term.forkpty(envv=self.env) return pid + def child_exited(self, term, pid, status): self.apt_status = os.WEXITSTATUS(status) self.finished = True + def waitChild(self): while not self.finished: self.updateInterface() return self.apt_status + def finishUpdate(self): self.label_status.set_text("") + def updateInterface(self): InstallProgress.updateInterface(self) self.progress.set_fraction(self.percent/100.0) @@ -181,9 +186,6 @@ class GtkInstallProgressAdapter(InstallProgress): class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): " gtk frontend of the distUpgrade tool " - - - def __init__(self): # FIXME: i18n must be somewhere relative do this dir bindtextdomain("update-manager",os.path.join(os.getcwd(),"mo")) @@ -237,6 +239,7 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): self._terminal_lines = [] self._terminal_log = open("/var/log/dist-upgrade-term.log","w") return self._term + def _term_content_changed(self, term): " called when the *visible* part of the terminal changes " @@ -277,7 +280,6 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): attrlist.insert(attr) label.set_property("attributes",attrlist) - def error(self, summary, msg, extended_msg=None): self.dialog_error.set_transient_for(self.window_main) #self.expander_terminal.set_expanded(True) @@ -309,30 +311,41 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): pkgs_remove, "%s packages are going to be removed." %\ pkgs_remove, pkgs_remove) - msg +=" " + msg += " " if pkgs_inst > 0: msg += gettext.ngettext("%s new package is going to be "\ "installed." % pkgs_inst, "%s new packages are going to be "\ "installed." % pkgs_inst, pkgs_inst) - msg +=" " + msg += " " if pkgs_upgrade > 0: msg += gettext.ngettext("%s package is going to be upgraded." %\ pkgs_upgrade, "%s packages are going to be upgraded." %\ pkgs_upgrade, pkgs_upgrade) msg +=" " - if msg == "": + + if downloadSize > 0: + msg += _("You have to download a total of %s." %\ + apt_pkg.SizeToStr(downloadSize)) + + if (pkgs_upgrade + pkgs_inst + pkgs_remove) > 100: + msg += "\n\n%s" % _("The upgrade can take several hours and "\ + "cannot be canceled at any time later.") + + msg += "\n\n%s" % _("To prevent data loss close all open "\ + "applications and documents.") + + # Show an error if no actions are planned + if (pkgs_upgrade + pkgs_inst + pkgs_remove) < 1: # FIXME: this should go into DistUpgradeController summary = _("Could not find any upgrades") msg = _("Your system has already been upgraded.") self.error(summary, msg) return False - else: - msg += _("You have to download a total of %s." %\ - apt_pkg.SizeToStr(downloadSize)) + self.label_summary.set_markup("%s" % summary) - self.label_changes.set_text(msg) + self.label_changes.set_markup(msg) # fill in the details self.details_list.clear() for rm in self.toRemove: diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index e6394223..e6437d3b 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -179,7 +179,7 @@ class UpdateList: #print "WARNING, keeping packages" msg = ("%s\n\n%s" % \ (_("Cannot install all available updates"), - _("Some updates require to remove further software. " + _("Some updates require the removal of further software. " "Use the function \"Smart Upgrade\" of the package manager " "\"Synaptic\" or run \"sudo apt-get dist-upgrade\" in a " "terminal to update your system completely."))) -- cgit v1.2.3 From 9184e9d648fb8ff3f8a437817cb67d5cf17e2010 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Sun, 26 Feb 2006 09:26:33 +0100 Subject: * Use the dist name from lsbrelease in the add channel dialog --- SoftwareProperties/aptsources.py | 4 +++- SoftwareProperties/dialog_add.py | 6 ++++++ UpdateManager/Common/DistInfo.py | 5 ++++- data/SoftwarePropertiesDialogs.glade | 6 +++--- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py index 397ebb38..532600fd 100644 --- a/SoftwareProperties/aptsources.py +++ b/SoftwareProperties/aptsources.py @@ -450,7 +450,7 @@ class SourcesList: # templates for the add dialog class SourceEntryTemplate(SourceEntry): - def __init__(self,a_type,uri,dist,description,comps): + def __init__(self, a_type, uri, dist, description, comps): self.comps = [] self.comps_descriptions = [] self.type = a_type @@ -472,6 +472,8 @@ class SourceEntryTemplates: dinfo = DistInfo (base_dir=datadir+"channels/") + self.dist = dinfo.dist + for suite in dinfo.suites: comps = [] for comp in suite.components: diff --git a/SoftwareProperties/dialog_add.py b/SoftwareProperties/dialog_add.py index effd9f24..8ccd2080 100644 --- a/SoftwareProperties/dialog_add.py +++ b/SoftwareProperties/dialog_add.py @@ -26,6 +26,7 @@ import os import gobject import gtk import gtk.glade +from gettext import gettext as _ import aptsources @@ -52,6 +53,11 @@ class dialog_add: self.combo.pack_start(cell, True) self.combo.add_attribute(cell, 'text', 0) self.fill_combo(self.combo) + self.label_dist = self.gladexml.get_widget("label_dist") + if self.templatelist.dist != "": + # TRANSLATORS: %s is the distribution name, eg. Ubuntu or Debian + self.label_dist.set_markup("%s" % \ + _("%s channels" % self.templatelist.dist)) # Setup the custom channel widgets self.entry = self.gladexml.get_widget("entry_source_line") diff --git a/UpdateManager/Common/DistInfo.py b/UpdateManager/Common/DistInfo.py index df244a51..102b981c 100644 --- a/UpdateManager/Common/DistInfo.py +++ b/UpdateManager/Common/DistInfo.py @@ -22,6 +22,7 @@ import os import gettext +from os import getenv import ConfigParser _ = gettext.gettext @@ -51,6 +52,8 @@ class DistInfo: pipe.close() del pipe + self.dist = dist + dist_fname = "%s/%s.info" % (base_dir, dist) dist_file = open (dist_fname) if not dist_file: @@ -100,7 +103,7 @@ class DistInfo: if __name__ == "__main__": - d = DistInfo ("Debian", "../distribution-data") + d = DistInfo ("Debian", "../../channels") print d.changelogs_uri for suite in d.suites: print suite.name diff --git a/data/SoftwarePropertiesDialogs.glade b/data/SoftwarePropertiesDialogs.glade index 3e4be82f..175d152b 100644 --- a/data/SoftwarePropertiesDialogs.glade +++ b/data/SoftwarePropertiesDialogs.glade @@ -92,9 +92,9 @@ - + True - <b>Official Ubuntu Channel</b> + False True GTK_JUSTIFY_LEFT @@ -247,7 +247,7 @@ True - <b>Custom Channel</b> + <b>Custom channel</b> False True GTK_JUSTIFY_LEFT -- cgit v1.2.3 From 6f9aedc166888c49b2f857399a6f8f65e64857fd Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Sun, 26 Feb 2006 09:30:37 +0100 Subject: * Use single quotes in the channel descriptions --- channels/Ubuntu.info.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/channels/Ubuntu.info.in b/channels/Ubuntu.info.in index 6422cbdb..00ccbfe4 100644 --- a/channels/Ubuntu.info.in +++ b/channels/Ubuntu.info.in @@ -3,7 +3,7 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/chang Suite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 6.04 "Dapper Drake" +_Description: Ubuntu 6.04 'Dapper Drake' Component: main Enabled: 1 _CompDescription: Oficially supported @@ -20,7 +20,7 @@ _CompDescription: Non-free (Multiverse) Suite: breezy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 5.10 "Breezy Badger" +_Description: Ubuntu 5.10 'Breezy Badger' Component: main Enabled: 1 _CompDescription: Oficially supported @@ -71,7 +71,7 @@ _CompDescription: Non-free (Multiverse) Suite: hoary RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 5.04 "Hoary Hedgehog" +_Description: Ubuntu 5.04 'Hoary Hedgehog' Component: main Enabled: 1 _CompDescription: Oficially supported -- cgit v1.2.3 From 41b33ac46f0226b756c8547513404d62449715bf Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Sun, 26 Feb 2006 13:26:11 +0100 Subject: * Add a button revert and make the channel list instant apply * Reorder the buttons on the key view to correspond with the channel view --- SoftwareProperties/SoftwareProperties.py | 65 ++++++-- data/SoftwareProperties.glade | 274 +++++++++++++++++-------------- 2 files changed, 201 insertions(+), 138 deletions(-) diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index 250e2c1d..f7f7f6f2 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -91,6 +91,7 @@ class SoftwareProperties(SimpleGladeApp): self.init_sourceslist() self.reload_sourceslist() + self.button_revert.set_sensitive(False) # internet update setings @@ -179,6 +180,10 @@ class SoftwareProperties(SimpleGladeApp): else: self.checkbutton_unattended.set_active(False) + # Backup the source list + self.sourceslist.clearBackup(".save") + self.sourceslist.backup(".save") + # apt-key stuff self.apt_key = apt_key() self.init_keyslist() @@ -204,8 +209,7 @@ class SoftwareProperties(SimpleGladeApp): file) res = dialog.run() if res == gtk.RESPONSE_OK: - self.reload_sourceslist() - self.modified = True + self.modified_sourceslist() def on_sources_drag_data_received(self, widget, context, x, y, selection, target_type, timestamp): @@ -244,13 +248,27 @@ class SoftwareProperties(SimpleGladeApp): self.sourceslist = aptsources.SourcesList() self.matcher = aptsources.SourceEntryMatcher() + def on_channel_activate(self, treeview, path, column): + """Open the edit dialog if a channel was double clicked""" + self.on_edit_clicked(treeview) + + def on_treeview_sources_cursor_changed(self, treeview): + """Enable the buttons remove and edit if a channel is selected""" + sel = self.treeview_sources.get_selection() + (model, iter) = sel.get_selected() + if iter: + self.button_edit.set_sensitive(True) + self.button_remove.set_sensitive(True) + else: + self.button_edit.set_sensitive(False) + self.button_remove.set_sensitive(False) + def on_channel_toggled(self, cell_toggle, path): """Enable or disable the selected channel""" iter = self.source_store.get_iter((int(path),)) source_entry = self.source_store.get_value(iter, LIST_ENTRY_OBJ) source_entry.disabled = not source_entry.disabled - self.reload_sourceslist() - self.modified = True + self.modified_sourceslist() def init_keyslist(self): self.keys_store = gtk.ListStore(str) @@ -261,6 +279,21 @@ class SoftwareProperties(SimpleGladeApp): keys_col = gtk.TreeViewColumn("Key", tr, text=0) self.treeview2.append_column(keys_col) + def on_button_revert_clicked(self, button): + """Restore the source list from the startup of the dialog""" + self.sourceslist.restoreBackup(".save") + self.sourceslist.clearBackup(".save") + self.sourceslist.backup(".save") + self.sourceslist.refresh() + self.reload_sourceslist() + self.button_revert.set_sensitive(False) + + def modified_sourceslist(self): + """The sources list was changed and now needs to be saved and reloaded""" + self.button_revert.set_sensitive(True) + self.save_sourceslist() + self.reload_sourceslist() + def reload_sourceslist(self): self.source_store.clear() self.sourceslist.check_for_endangered_dists() @@ -377,18 +410,17 @@ class SoftwareProperties(SimpleGladeApp): def save_sourceslist(self): #location = "/etc/apt/sources.list" #shutil.copy(location, location + ".save") - self.sourceslist.clearBackup(".save") - self.sourceslist.backup(".save") self.sourceslist.save() - + def on_add_clicked(self, widget): + """Open a dialog to add new channels""" dialog = dialog_add.dialog_add(self.window_main, self.sourceslist, self.datadir) if dialog.run() == gtk.RESPONSE_OK: - self.reload_sourceslist() - self.modified = True - + self.modified_sourceslist() + def on_edit_clicked(self, widget): + """Open a dialog to edit the currently selected dialog""" sel = self.treeview_sources.get_selection() (model, iter) = sel.get_selected() if not iter: @@ -397,17 +429,17 @@ class SoftwareProperties(SimpleGladeApp): dialog = dialog_edit.dialog_edit(self.window_main, self.sourceslist, source_entry, self.datadir) if dialog.run() == gtk.RESPONSE_OK: - self.reload_sourceslist() - self.modified = True - + self.modified_sourceslist() + def on_remove_clicked(self, widget): sel = self.treeview_sources.get_selection() (model, iter) = sel.get_selected() if iter: source = model.get_value(iter, LIST_ENTRY_OBJ) self.sourceslist.remove(source) - self.reload_sourceslist() - self.modified = True + self.modified_sourceslist() + self.button_edit.set_sensitive(False) + self.button_remove.set_sensitive(False) def add_key_clicked(self, widget): chooser = gtk.FileChooserDialog(title=_("Import key"), @@ -492,8 +524,7 @@ class SoftwareProperties(SimpleGladeApp): if line != "": full_path = "%s%s" % (apt_pkg.Config.FindDir("Dir::Etc"),saved_entry) self.sourceslist.list.append(aptsources.SourceEntry(line,full_path)) - self.reload_sourceslist() - self.modified = True + self.modified_sourceslist() # FIXME: move this into a different file diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade index 27f53404..9a5edbeb 100644 --- a/data/SoftwareProperties.glade +++ b/data/SoftwareProperties.glade @@ -5,7 +5,6 @@ 6 - 580 400 True Software Preferences @@ -93,6 +92,8 @@ False False False + + @@ -107,135 +108,167 @@ True False - 6 + 12 - + True - True - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - True - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - True - True - True - gtk-edit - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - + False + 6 - - - True - True - True - GTK_RELIEF_NORMAL - True - + + + True + True + True + gtk-add + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + - + True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 + True + True + GTK_RELIEF_NORMAL + True + - + True - False - 2 + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 - + True - gtk-cdrom - 4 - 0.5 - 0.5 - 0 - 0 + False + 2 + + + + True + gtk-cdrom + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Add _Cdrom + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + - - 0 - False - False - - - - - - True - Add _Cdrom - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - + + 0 + False + False + + + + + + True + False + True + True + gtk-remove + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + + True + False + True + True + gtk-edit + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + 0 + True + True + + + + + + True + True + gtk-revert-to-saved + True + GTK_RELIEF_NORMAL + True + + 0 False @@ -608,43 +641,42 @@ 0 False False + GTK_PACK_END - + True + Import the public key from a trusted software provider True - gtk-remove - True + _Import Key File + True GTK_RELIEF_NORMAL True - + 0 False False - GTK_PACK_END - + True - Import the public key from a trusted software provider True - _Import Key File - True + gtk-remove + True GTK_RELIEF_NORMAL True - + 0 False False - GTK_PACK_END -- cgit v1.2.3 From a47225de2eb2809aec10b2d7c260963f0ab0a91b Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Sun, 26 Feb 2006 14:21:08 +0100 Subject: * Only enable the button add in the dialog add channel if a comp is selected --- SoftwareProperties/dialog_add.py | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/SoftwareProperties/dialog_add.py b/SoftwareProperties/dialog_add.py index 8ccd2080..a1ac713b 100644 --- a/SoftwareProperties/dialog_add.py +++ b/SoftwareProperties/dialog_add.py @@ -45,7 +45,9 @@ class dialog_add: self.main = widget = self.gladexml.get_widget("dialog_add") self.main.set_transient_for(self.parent) - + + self.vbox = self.gladexml.get_widget("vbox_comps") + # Setup the official channel widgets self.combo = self.gladexml.get_widget("combobox_what") self.gladexml.signal_connect("on_combobox_what_changed", self.on_combobox_what_changed, None) @@ -102,7 +104,7 @@ class dialog_add: for check in self.comps: check.set_sensitive(state) self.official = state - self.button_add.set_sensitive(state) + self.count_comps() def fill_combo(self,combo): liststore = gtk.ListStore(gobject.TYPE_STRING,gobject.TYPE_PYOBJECT) @@ -113,8 +115,7 @@ class dialog_add: def on_combobox_what_changed(self, combobox, user): #print "on_combobox_what_changed" - vbox = self.gladexml.get_widget("vbox_comps") - vbox.foreach(lambda widget,vbox: vbox.remove(widget), vbox) + self.vbox.foreach(lambda widget,vbox: self.vbox.remove(widget), self.vbox) liststore = combobox.get_model() a_iter = liststore.iter_nth_child(None, combobox.get_active()) (name, template) = liststore.get(a_iter, 0,1) @@ -125,22 +126,31 @@ class dialog_add: checkbox = gtk.CheckButton(c.description) checkbox.set_active(c.on_by_default) checkbox.set_data("name",c.name) - vbox.pack_start(checkbox) + checkbox.connect("toggled", self.count_comps) + self.vbox.pack_start(checkbox) checkbox.show() self.comps.append(checkbox) + self.count_comps() def get_enabled_comps(self, checkbutton): if checkbutton.get_active(): self.selected_comps.append(checkbutton.get_data("name")) + def count_comps(self, *args): + button_add = self.gladexml.get_widget("button_add_channel") + self.selected_comps=[] + self.vbox.foreach(self.get_enabled_comps) + if len(self.selected_comps) > 0: + button_add.set_sensitive(True) + else: + button_add.set_sensitive(False) + def run(self): res = self.main.run() if res == gtk.RESPONSE_OK: # add repository if self.official == True: self.selected_comps = [] - vbox = self.gladexml.get_widget("vbox_comps") - vbox.foreach(self.get_enabled_comps) self.sourceslist.add(self.selected.type, self.selected.uri, self.selected.dist, -- cgit v1.2.3 From b37fef4c14a3d48e1a1360373ca6b92876357c49 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Sun, 26 Feb 2006 14:27:04 +0100 Subject: * Fixed wrong title of the dialog edit channel --- data/SoftwarePropertiesDialogs.glade | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/data/SoftwarePropertiesDialogs.glade b/data/SoftwarePropertiesDialogs.glade index 175d152b..ed350003 100644 --- a/data/SoftwarePropertiesDialogs.glade +++ b/data/SoftwarePropertiesDialogs.glade @@ -181,21 +181,26 @@ - + True False - 6 - - - - + 0 - - + + True + False + 6 - - + + + + + + 0 + True + True + @@ -591,7 +596,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 -- cgit v1.2.3 From 97a21a72b7ae7e0cd0bba858655ae9110e96644d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 27 Feb 2006 12:18:02 +0100 Subject: * SoftwareProperties/SoftwareProperties.py: - moved render_source() from aptsources.py here - if a endangered dist is added, show a revert button * channels/Ubuntu.info.in: - added security and updates --- SoftwareProperties/SoftwareProperties.py | 35 ++++++++++++++++++++++++++----- SoftwareProperties/aptsources.py | 28 +++++-------------------- SoftwareProperties/dialog_sources_list.py | 6 ++++-- SoftwareProperties/utils.py | 2 ++ channels/Ubuntu.info.in | 28 ++++++++++++------------- 5 files changed, 55 insertions(+), 44 deletions(-) diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index f7f7f6f2..d5070240 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -88,10 +88,10 @@ class SoftwareProperties(SimpleGladeApp): if options and options.toplevel != None: toplevel = gtk.gdk.window_foreign_new(int(options.toplevel)) self.window_main.window.set_transient_for(toplevel) - + + self.button_revert.set_sensitive(False) self.init_sourceslist() self.reload_sourceslist() - self.button_revert.set_sensitive(False) # internet update setings @@ -203,8 +203,9 @@ class SoftwareProperties(SimpleGladeApp): def open_file(self, file): """Show an confirmation for adding the channels of the specified file""" - dialog = dialog_sources_list.AddSourcesList(self.window_main, + dialog = dialog_sources_list.AddSourcesList(self.window_main, self.sourceslist, + self.render_source, self.datadir, file) res = dialog.run() @@ -294,13 +295,37 @@ class SoftwareProperties(SimpleGladeApp): self.save_sourceslist() self.reload_sourceslist() + def render_source(self, source): + """Render a nice output to show the source in a treeview""" + (nice_type, nice_dist, nice_comps, special) = self.matcher.match(source) + + if special in (aptsources.SOURCE_UPDATES, + aptsources.SOURCE_BACKPORTS, + aptsources.SOURCE_SECURITY): + contents = "%s" % nice_dist + elif special == aptsources.SOURCE_SYSTEM: + contents = "%s" % nice_dist + if source.type in ("deb-src", "rpm-src"): + contents += " (%s)" % nice_type + for comp in nice_comps: + contents += "\n%s" % comp + else: + contents = "%s" % nice_dist + if source.type in ("deb-src", "rpm-src"): + contents += " (%s)" % nice_type + for comp in nice_comps: + contents += "%s" % comp + return contents + def reload_sourceslist(self): self.source_store.clear() - self.sourceslist.check_for_endangered_dists() + if self.sourceslist.check_for_endangered_dists(): + self.button_revert.set_sensitive(True) + self.save_sourceslist() for source in self.sourceslist.list: if source.invalid: continue - contents = self.sourceslist.render_source(source) + contents = self.render_source(source) self.source_store.append([not source.disabled, contents, source]) def reload_keyslist(self): diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py index 532600fd..0340e211 100644 --- a/SoftwareProperties/aptsources.py +++ b/SoftwareProperties/aptsources.py @@ -291,26 +291,6 @@ class SourcesList: file = self.list[index].file self.list[index] = SourceEntry(line, file) - def render_source(self, source): - """Render a nice output to show the source in a treeview""" - (nice_type, nice_dist, nice_comps, special) = self.matcher.match(source) - - if special in (SOURCE_UPDATES, SOURCE_BACKPORTS, SOURCE_SECURITY): - contents = "%s" % nice_dist - elif special == SOURCE_SYSTEM: - contents = "%s" % nice_dist - if source.type in ("deb-src", "rpm-src"): - contents += " (%s)" % nice_type - for comp in nice_comps: - contents += "\n%s" % comp - else: - contents = "%s" % nice_dist - if source.type in ("deb-src", "rpm-src"): - contents += " (%s)" % nice_type - for comp in nice_comps: - contents += "%s" % comp - return contents - def remove(self, source_entry): self.list.remove(source_entry) @@ -407,9 +387,11 @@ class SourcesList: # Check if each security source contains all components of # the same dist - self.check_updates(self.sources_security) - self.check_updates(self.sources_updates) - self.check_updates(self.sources_backports) + res = False + res |= self.check_updates(self.sources_security) + res |= self.check_updates(self.sources_updates) + res |= self.check_updates(self.sources_backports) + return res def check_updates(self, updates): modified = False diff --git a/SoftwareProperties/dialog_sources_list.py b/SoftwareProperties/dialog_sources_list.py index a09542c8..d35b9b51 100644 --- a/SoftwareProperties/dialog_sources_list.py +++ b/SoftwareProperties/dialog_sources_list.py @@ -9,11 +9,13 @@ from aptsources import SourcesList, SourceEntryMatcher from gettext import gettext as _ import gettext import urllib +from utils import * class AddSourcesList: - def __init__(self, parent, sourceslist, datadir, file): + def __init__(self, parent, sourceslist, source_renderer, datadir, file): print file self.parent = parent + self.source_renderer = source_renderer self.sources_old = sourceslist self.file = self.format_uri(file) self.glade = gtk.glade.XML(os.path.join(datadir, @@ -60,7 +62,7 @@ class AddSourcesList: if source.invalid or source.disabled: continue counter = counter +1 - line = self.sources.render_source(source) + line = self.source_renderer(source) self.store.append([line]) if counter == 0: self.error() diff --git a/SoftwareProperties/utils.py b/SoftwareProperties/utils.py index cf9a3343..2886507f 100644 --- a/SoftwareProperties/utils.py +++ b/SoftwareProperties/utils.py @@ -1,5 +1,7 @@ import gtk + + def dialog_error(parent, primary, secondary): p = "%s" % primary dialog = gtk.MessageDialog(parent,gtk.DIALOG_MODAL, diff --git a/channels/Ubuntu.info.in b/channels/Ubuntu.info.in index 00ccbfe4..f3316390 100644 --- a/channels/Ubuntu.info.in +++ b/channels/Ubuntu.info.in @@ -17,10 +17,10 @@ Component: multiverse Enabled: 0 _CompDescription: Non-free (Multiverse) -Suite: breezy +Suite: dapper-security RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 5.10 'Breezy Badger' +BaseURI: http://security.ubuntu.com/ubuntu/ +_Description: Ubuntu 6.04 Security Updates Component: main Enabled: 1 _CompDescription: Oficially supported @@ -34,10 +34,10 @@ Component: multiverse Enabled: 0 _CompDescription: Non-free (Multiverse) -Suite: breezy-security +Suite: dapper-updates RepositoryType: deb -BaseURI: http://security.ubuntu.com/ubuntu/ -_Description: Ubuntu 5.10 Security Updates +BaseURI: http://archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 6.04 Updates Component: main Enabled: 1 _CompDescription: Oficially supported @@ -51,10 +51,10 @@ Component: multiverse Enabled: 0 _CompDescription: Non-free (Multiverse) -Suite: breezy-updates +Suite: breezy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 5.10 Updates +_Description: Ubuntu 5.10 'Breezy Badger' Component: main Enabled: 1 _CompDescription: Oficially supported @@ -68,10 +68,10 @@ Component: multiverse Enabled: 0 _CompDescription: Non-free (Multiverse) -Suite: hoary +Suite: breezy-security RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 5.04 'Hoary Hedgehog' +BaseURI: http://security.ubuntu.com/ubuntu/ +_Description: Ubuntu 5.10 Security Updates Component: main Enabled: 1 _CompDescription: Oficially supported @@ -85,10 +85,10 @@ Component: multiverse Enabled: 0 _CompDescription: Non-free (Multiverse) -Suite: hoary-security +Suite: breezy-updates RepositoryType: deb -BaseURI: http://security.ubuntu.com/ubuntu/ -_Description: Ubuntu 5.04 Security Updates +BaseURI: http://archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 5.10 Updates Component: main Enabled: 1 _CompDescription: Oficially supported -- cgit v1.2.3 From 48e198078f09e9f561b04897d4554dc262920036 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 27 Feb 2006 14:56:16 +0100 Subject: * TODO updated --- DistUpgrade/TODO | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/DistUpgrade/TODO b/DistUpgrade/TODO index df64b54b..04c507be 100644 --- a/DistUpgrade/TODO +++ b/DistUpgrade/TODO @@ -1,24 +1,29 @@ +MUSTFIX: +-------- +* debconf gnome dosn't work (can't connect to the session) +* display a message that all applications should be closed for the + dist-upgrade (and that strange things like a crashing panel can + happen) + -hoary->breezy -------------- -- stop gnome-volume-manager before the hoary->breezy upgrade - (it will crash otherwise) -- send a "\n" on the libc6 question on hoary->breezy breezy->dapper -------------- - gnome-icon-theme changes a lot, icons move from hicolor to gnome. this might have caused a specatular crash during a upgrade + +hoary->breezy +------------- +- stop gnome-volume-manager before the hoary->breezy upgrade + (it will crash otherwise) +- send a "\n" on the libc6 question on hoary->breezy + general ------- - CDROM upgrades !!! -- display a message that all applications should be closed for the - dist-upgrade (and that strange things like a crashing panel can - happen) - whitelist removal (pattern? e.g. c102 -> c2a etc)? -- logging for the dpkg install run - check authentication and don't upgrade anything that is not authenticated (maybe just comment unauthenticated stuff out?) -- cgit v1.2.3 From 844dbc885a1b7e5cec27811f65a0e5e5104748bc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 27 Feb 2006 15:04:21 +0100 Subject: * po/pt.po: added pt.po translation * debian/changelog: updated changelog (pt.po, pt_BR.po) --- debian/changelog | 3 +- po/pt.po | 737 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 739 insertions(+), 1 deletion(-) create mode 100644 po/pt.po diff --git a/debian/changelog b/debian/changelog index 811bd52f..ad495326 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,8 @@ update-manager (0.42.2ubuntu6) dapper; urgency=low * SoftwareProperties/*: fix some UI problems (thanks to Sebastian Heinlein) * debian/control: arch: all now - * po/pt_BR.po: updated translation (thanks to + * po/pt_BR.po: updated translation (thanks to Carlos Eduardo) + * po/pt.po: updated Portugise translation (thanks to Rui Azevedo) Carlos Eduardo Pedroza Santiviago) * data/gnome-software-properties.desktop.in, update-manager.desktop.in: * debian/rules: undo the detection in favour of the simpler update of diff --git a/po/pt.po b/po/pt.po new file mode 100644 index 00000000..f35b3b33 --- /dev/null +++ b/po/pt.po @@ -0,0 +1,737 @@ +# Portuguese translation of update-manager. +# Copyright (C) 2005 Free Software Foundation, Inc. +# This file is distributed under the same license as the update-manager package. +# +msgid "" +msgstr "" +"Project-Id-Version: update-manager\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-02-09 17:05+0100\n" +"PO-Revision-Date: 2005-03-29 13:36-0300\n" +"Last-Translator: Rui Az. \n" +"Language-Team: Ubuntu Portuguese Team \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../data/SoftwareProperties.glade.h:1 +msgid "Channels" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:2 +msgid "Internet updates" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:3 +msgid "Keys" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:4 +msgid "Add _Cdrom" +msgstr "Adicionar _CD" + +#: ../data/SoftwareProperties.glade.h:5 +msgid "Authentication" +msgstr "Autenticação" + +#: ../data/SoftwareProperties.glade.h:6 +msgid "D_elete downloaded software files:" +msgstr "Apagar ficheiros descarregados:" + +#: ../data/SoftwareProperties.glade.h:7 +msgid "Import the public key from a trusted software provider" +msgstr "Importar a chave pública de um fornecedor de software confiável" + +#: ../data/SoftwareProperties.glade.h:8 +msgid "Installation Media" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:9 +msgid "Internet Updates" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:10 +msgid "Restore _Defaults" +msgstr "Restaurar _Definições" + +#: ../data/SoftwareProperties.glade.h:11 +msgid "Restore the default keys of your distribution" +msgstr "Restaurar as chaves padrão da sua distribuição" + +#: ../data/SoftwareProperties.glade.h:12 +msgid "Software Preferences" +msgstr "Preferências de Software" + +#: ../data/SoftwareProperties.glade.h:13 +msgid "_Check for updates automatically:" +msgstr "_Procurar por actualizações automaticamente:" + +#: ../data/SoftwareProperties.glade.h:14 +msgid "_Download updates in the backgound, but do not install them" +msgstr "_Descarregar actualizações silenciosamente, sem as instalar" + +#: ../data/SoftwareProperties.glade.h:15 +msgid "_Install new updates without confirmation" +msgstr "_Instalar novas actualizações sem confirmação" + +#: ../data/UpdateManager.glade.h:1 +msgid "" +"You need to manually reload the latest information about updates\n" +"\n" +"Your system does not check for updates automatically. You can configure this " +"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +msgstr "" +"Tem de reler manualmente a última informação sobre actualizações\n" +"\n" +"O seu sistema não procura por actualizações automaticamente. Pode configurar " +"este comportamento em \"Sistema\" -> \"Administração\" -> \"Propriedades do " +"Software\"." + +#: ../data/UpdateManager.glade.h:4 +msgid "" +"Checking for available updates\n" +"\n" +"Software updates can correct errors, eliminate security vulnerabilities, and " +"provide new features to you." +msgstr "" +"A procurar por actualizações disponíveis\n" +"\n" +"Actualizações de software podem corrigir erros, eliminar problemas de " +"segurança, e fornecer novas funcionalidades." + +#: ../data/UpdateManager.glade.h:7 +msgid "Keep your system up-to-date" +msgstr "Mantenha o seu sistema actualizado" + +#: ../data/UpdateManager.glade.h:8 +msgid "" +"Downloading changes\n" +"\n" +"Need to get the changes from the central server" +msgstr "" +"A efectuar download de alterações\n" +"\n" +"É necessário obter as alterações de um servidor central" + +#: ../data/UpdateManager.glade.h:11 +msgid "Cancel _Download" +msgstr "Cancelar _Descarregamento" + +#: ../data/UpdateManager.glade.h:12 +msgid "Changes" +msgstr "Alterações" + +#: ../data/UpdateManager.glade.h:13 +msgid "Description" +msgstr "Descrição" + +#: ../data/UpdateManager.glade.h:14 +msgid "Release Notes" +msgstr "Notas de lançamento" + +#: ../data/UpdateManager.glade.h:15 +msgid "Reload the latest information about updates" +msgstr "Reler a última informação sobre actualizações" + +#: ../data/UpdateManager.glade.h:16 +msgid "Show details" +msgstr "Mostrar detalhes" + +#: ../data/UpdateManager.glade.h:17 +msgid "Show progress of single files" +msgstr "Mostrar progresso de ficheiros individuais" + +#: ../data/UpdateManager.glade.h:18 +msgid "Software Updates" +msgstr "Actualizações de Software" + +#: ../data/UpdateManager.glade.h:19 +msgid "" +"Software updates can correct errors, eliminate security vulnerabilities, and " +"provide new features to you." +msgstr "" +"Actualizações de software podem corrigir erros, eliminar problemas de " +"segurança, e fornecer novas funcionalidades." + +#: ../data/UpdateManager.glade.h:20 +msgid "U_pgrade" +msgstr "A_ctualização" + +#: ../data/UpdateManager.glade.h:21 +msgid "Upgrade to the latest version of Ubuntu" +msgstr "Actualize para a última versão do Ubuntu" + +#: ../data/UpdateManager.glade.h:22 +msgid "_Install Updates" +msgstr "_Instalar Actualizações" + +#: ../data/UpdateManager.glade.h:23 +msgid "_Reload" +msgstr "Reler" + +#. ChangelogURI +#: ../channels/Ubuntu.info.in.h:4 +#, no-c-format +msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "" + +#. Description +#: ../channels/Ubuntu.info.in:6 +msgid "Ubuntu 6.04 \"Dapper Drake\"" +msgstr "Ubuntu 6.04 \"Dapper Drake\"" + +#. Description +#: ../channels/Ubuntu.info.in:23 +msgid "Ubuntu 5.10 \"Breezy Badger\"" +msgstr "Ubuntu 5.10 \"Breezy Badger\"" + +#. Description +#: ../channels/Ubuntu.info.in:40 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 Actualizações de Segurança" + +#. Description +#: ../channels/Ubuntu.info.in:57 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 Actualizações" + +#. Description +#: ../channels/Ubuntu.info.in:74 +msgid "Ubuntu 5.04 \"Hoary Hedgehog\"" +msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../channels/Ubuntu.info.in:91 +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.04 Actualizações de Segurança" + +#. CompDescription +#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51 +msgid "Oficially supported" +msgstr "Suportado Oficialmente" + +#. CompDescription +#: ../channels/Ubuntu.info.in:97 +msgid "Restricted copyright" +msgstr "Direitos de autor restritos" + +#. CompDescription +#: ../channels/Ubuntu.info.in:100 +msgid "Community maintained (Universe)" +msgstr "Mantido pela comunidade (Universe)" + +#. CompDescription +#: ../channels/Ubuntu.info.in:103 +msgid "Non-free (Multiverse)" +msgstr "Não-livre (Multiverse)" + +#. ChangelogURI +#: ../channels/Debian.info.in.h:4 +#, no-c-format +msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "" + +#. Description +#: ../channels/Debian.info.in:6 +msgid "Debian 3.1 \"Sarge\"" +msgstr "Debian 3.1 \"Sarge\"" + +#. BaseURI +#: ../channels/Debian.info.in:19 +msgid "http://security.debian.org/" +msgstr "http://security.debian.org/" + +#. Description +#: ../channels/Debian.info.in:20 +msgid "Debian 3.1 \"Sarge\" Security Updates" +msgstr "Debian 3.1 \"Sarge\" Actualizações de Segurança" + +#. Description +#: ../channels/Debian.info.in:34 +msgid "Debian \"Etch\" (testing)" +msgstr "Debian \"Etch\" (testing)" + +#. BaseURI +#: ../channels/Debian.info.in:47 +msgid "http://http.us.debian.org/debian/" +msgstr "http://http.us.debian.org/debian/" + +#. Description +#: ../channels/Debian.info.in:48 +msgid "Debian \"Sid\" (unstable)" +msgstr "Debian \"Sid\" (unstable)" + +#. CompDescription +#: ../channels/Debian.info.in:54 +msgid "DFSG-compatible Software with Non-Free Dependencies" +msgstr "Software compatível-DFSG com Dependências Não-Livres" + +#. CompDescription +#: ../channels/Debian.info.in:57 +msgid "Non-DFSG-compatible Software" +msgstr "Software compatível-DFSG" + +#: ../SoftwareProperties/SoftwareProperties.py:102 +#, python-format +msgid "Every %s days" +msgstr "Todos os % dias" + +#: ../SoftwareProperties/SoftwareProperties.py:132 +#, python-format +msgid "After %s days" +msgstr "Depois de %s dias" + +#: ../SoftwareProperties/SoftwareProperties.py:330 +msgid "Import key" +msgstr "Importar chave" + +#: ../SoftwareProperties/SoftwareProperties.py:340 +msgid "Error importing selected file" +msgstr "Erro ao importar ficheiro seleccionado" + +#: ../SoftwareProperties/SoftwareProperties.py:341 +msgid "The selected file may not be a GPG key file or it might be corrupt." +msgstr "" +"O ficheiro seleccionado pode não ser um ficheiro de chave GPG ou pode estar " +"corrompido." + +#: ../SoftwareProperties/SoftwareProperties.py:353 +msgid "Error removing the key" +msgstr "Erro ao remover a chave" + +#: ../SoftwareProperties/SoftwareProperties.py:354 +msgid "The key you selected could not be removed. Please report this as a bug." +msgstr "" +"A chave que seleccionou não pôde ser removida. Por favor reporte este erro." + +#: ../SoftwareProperties/SoftwareProperties.py:397 +#, python-format +msgid "" +"Error scaning the CD\n" +"\n" +"%s" +msgstr "" +"Erro ao ler o CD\n" +"\n" +"%s" + +#: ../SoftwareProperties/SoftwareProperties.py:447 +msgid "Please enter a name for the disc" +msgstr "Por favor introduza um nome para o disco" + +#: ../SoftwareProperties/SoftwareProperties.py:463 +msgid "Please insert a disc in the drive:" +msgstr "Por favor introduza um disco no leitor:" + +#: ../DistUpgrade/DistUpgradeCache.py:92 +msgid "Broken packages" +msgstr "Pacotes Quebrados" + +#: ../DistUpgrade/DistUpgradeCache.py:93 +msgid "" +"Your system contains broken packages that couldn't be fixed with this " +"software. Please fix them first using synaptic or apt-get before proceeding." +msgstr "" +"O seu sistema contém pacotes quebrados que não puderam ser corrigidos com " +"este software. Por favor corrija-os usando o synaptic ou apt-get antes de " +"continuar." + +#: ../DistUpgrade/DistUpgradeCache.py:135 +msgid "Can't upgrade required meta-packages" +msgstr "Não foi possível actualizar os meta-pacotes necessários" + +#: ../DistUpgrade/DistUpgradeCache.py:142 +msgid "A essential package would have to be removed" +msgstr "Um pacote essencial teria que ser removido" + +#. FIXME: change the text to something more useful +#: ../DistUpgrade/DistUpgradeCache.py:145 +msgid "Could not calculate the upgrade" +msgstr "Impossível de calcular a actualização" + +#: ../DistUpgrade/DistUpgradeCache.py:146 +msgid "" +"A unresolvable problem occured while calculating the upgrade. Please report " +"this as a bug. " +msgstr "" +"Um problema irresolúvel ocorreu ao calcular a actualização. Por favor " +"reporte este erro. " + +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:168 +msgid "Error authenticating some packages" +msgstr "Erro ao autenticar alguns pacotes" + +#: ../DistUpgrade/DistUpgradeCache.py:169 +msgid "" +"It was not possible to authenticate some packages. This may be a transient " +"network problem. You may want to try again later. See below for a list of " +"unauthenticated packages." +msgstr "" +"Não foi possível autenticar alguns pacotes. Este pode ser um problema de " +"rede transitório. Pode tentar novamente mais tarde. Verifique abaixo uma " +"lista de pacotes não autenticados." + +#: ../DistUpgrade/DistUpgradeCache.py:232 +#, python-format +msgid "Can't install '%s'" +msgstr "Impossível de instalar '%s'" + +#: ../DistUpgrade/DistUpgradeCache.py:233 +msgid "" +"It was impossible to install a required package. Please report this as a " +"bug. " +msgstr "" +"Foi impossível instalar um pacote essencial. Por favor reporte este erro. " + +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:240 +msgid "Can't guess meta-package" +msgstr "Impossível de descobrir meta-pacote" + +#: ../DistUpgrade/DistUpgradeCache.py:241 +msgid "" +"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" +"desktop package and it was not possible to detect which version of ubuntu " +"you are runing.\n" +" Please install one of the packages above first using synaptic or apt-get " +"before proceeding." +msgstr "" +"O seu sistema não contém o pacote ubuntu-desktop, kubuntu-desktop ou " +"edubuntu-desktop e portanto não foi possível detectar que versão do ubuntu " +"está a executar.\n" +" Por favor instale um dos pacotes acima mencionados usando o synaptic ou apt-" +"get antes de continuar." + +#: ../DistUpgrade/DistUpgradeControler.py:42 +msgid "Reading cache" +msgstr "A ler a cache" + +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:107 +msgid "No valid entry found" +msgstr "Nenhuma entrada válida encontrada" + +#: ../DistUpgrade/DistUpgradeControler.py:108 +msgid "" +"While scaning your repository information no valid entry for the upgrade was " +"found.\n" +msgstr "" +"Ao pesquisar o seu repositório de informação não foi encontrada nenhuma " +"entrada válida de actualização.\n" + +#: ../DistUpgrade/DistUpgradeControler.py:125 +msgid "Repository information invalid" +msgstr "Informação de repositório inválida" + +#: ../DistUpgrade/DistUpgradeControler.py:126 +msgid "" +"Upgrading the repository information resulted in a invalid file. Please " +"report this as a bug." +msgstr "" +"A actualização da informação de repositório resultou num ficheiro inválido. " +"Por favor reporte este erro." + +#: ../DistUpgrade/DistUpgradeControler.py:171 +msgid "Error during update" +msgstr "Erro durante a actualização" + +#: ../DistUpgrade/DistUpgradeControler.py:172 +msgid "" +"A problem occured during the update. This is usually some sort of network " +"problem, please check your network connection and retry." +msgstr "" +"Ocorreu um problema durante a actualização. Habitualmente trata-se de algum " +"tipo de problema na rede, por favor verifique a sua ligação à rede e volte a " +"tentar." + +#: ../DistUpgrade/DistUpgradeControler.py:190 +msgid "Not enough free space" +msgstr "Não existe espaço livre suficiente" + +#: ../DistUpgrade/DistUpgradeControler.py:191 +msgid "" +"There is not enough free space on your system to download the required " +"pacakges. Please free some space before trying again with e.g. 'sudo apt-get " +"clean'" +msgstr "" +"Não existe espaço suficiente no seu sistema para descarregar os pacotes " +"necessários. Por favor liberte algum espaço antes de tentar novamente por " +"exemplo usando 'sudo apt-get clean'" + +#: ../DistUpgrade/DistUpgradeControler.py:196 +msgid "Perform Upgrade?" +msgstr "Efectuar Actualização?" + +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:211 +#: ../DistUpgrade/DistUpgradeControler.py:280 +msgid "Error during commit" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:212 +msgid "" +"Some problem occured during the upgrade. Most likely packages failed to " +"install. Try 'sudo apt-get install -f' or synaptic to fix your system." +msgstr "" +"Ocorreu algum problema durante a actualização. Provavelmente a instalação de " +"alguns pacotes falhou. Tente 'sudo apt-get install -f' ou use o synaptic " +"para corrigir o seu sistema." + +#: ../DistUpgrade/DistUpgradeControler.py:228 +msgid "Error fetching the packages" +msgstr "Erro ao descarregar os pacotes" + +#: ../DistUpgrade/DistUpgradeControler.py:229 +msgid "" +"Some problem occured during the fetching of the packages. This is most " +"likely a network problem. Please check your network and try again. " +msgstr "" +"Ocorreu algum problema ao descarregar pacotes. Trata-se provavelmente de um " +"problema de rede. Por favor verifique a rede e tente novamente. " + +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete Packages?" +msgstr "Remover Pacotes obsoletos?" + +#: ../DistUpgrade/DistUpgradeControler.py:281 +msgid "" +"Some problem occured during the clean-up. Please see the below message for " +"more information. " +msgstr "" +"Ocorreu algum problema durante a limpeza. Por favor verifique a mensagem " +"abaixo para mais informação. " + +#. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:318 +msgid "Checking package manager" +msgstr "A verificar gestor de pacotes" + +#: ../DistUpgrade/DistUpgradeControler.py:310 +msgid "Updating repository information" +msgstr "A Actualizar informação de repositórios" + +#: ../DistUpgrade/DistUpgradeControler.py:324 +msgid "Asking for confirmation" +msgstr "A pedir confirmação" + +#: ../DistUpgrade/DistUpgradeControler.py:328 +msgid "Upgrading" +msgstr "A actualizar" + +#: ../DistUpgrade/DistUpgradeControler.py:335 +msgid "Searching for obsolete software" +msgstr "À procura de software obsoleto" + +#: ../DistUpgrade/DistUpgradeControler.py:340 +msgid "System upgrade is complete." +msgstr "A actualização do sistema está completa." + +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:76 +#, python-format +msgid "Please insert '%s' into the drive '%s'" +msgstr "Por favor insira '%s' no leitor '%s'" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:94 +msgid "Download is complete" +msgstr "O Download está completo" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:105 +#, python-format +msgid "Downloading file %li of %li with %s/s" +msgstr "A fazer o download de ficheiro %li de %li com %s/s" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#, python-format +msgid "%s remaining" +msgstr "%s restantes" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#, python-format +msgid "Downloading file %li of %li with unknown speed" +msgstr "A fazer o download de ficheiro %li de %li a velocidade desconhecida" + +#. FIXME: add support for the timeout +#. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:131 +msgid "Installing updates" +msgstr "A instalar actualizações" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:144 +#, python-format +msgid "Could not install '%s'" +msgstr "Não foi possível instalar '%s'" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:145 +msgid "The upgrade will abort. Please report the bug." +msgstr "A actualização abortará. Reporte este erro." + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 +msgid "A fatal error occured" +msgstr "Ocorreu um erro fatal" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:217 +msgid "" +"During the operation a fatal error occured. Please report this as a bug and " +"include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your " +"report. The upgrade will abort now. " +msgstr "" +"Durante a operação ocorreu um erro fatal. Por favor reporte este erro e " +"inclua os ficheiros ~/dist-upgrade.log e ~/dist-upgrade-apt.log no seu " +"relatório. A actualização abortará agora. " + +#: ../DistUpgrade/DistUpgradeViewGtk.py:293 +#, python-format +msgid "" +"%s packages are going to be removed.\n" +"%s packages are going to be newly installed.\n" +"%s packages are going to be upgraded.\n" +"\n" +"%s needs to be fetched" +msgstr "" +"%s pacotes serão removidos.\n" +"%s pacotes novos serão instalados.\n" +"%s pacotes serão actualizados.\n" +"\n" +"%s precisam de ser descarregados" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:304 +#, python-format +msgid "To be removed: %s" +msgstr "A ser removido: %s" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:306 +#, python-format +msgid "To be installed: %s" +msgstr "A ser instalado: %s" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:308 +#, python-format +msgid "To be upgraded: %s" +msgstr "A ser actualizado: %s" + +#. print "on_window_main_delete_event()" +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 +msgid "Are you sure you want cancel?" +msgstr "Tem a certeza que pretende cancelar?" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:340 +msgid "" +"Canceling during a upgrade can leave the system in a unstable state. It is " +"strongly adviced to continue the operation. " +msgstr "" +"Cancelar durante uma actualização pode deixar o seu sistema num estado " +"instável. É fortemente aconselhado a prosseguir a operação. " + +#: ../DistUpgrade/DistUpgradeView.py:67 +msgid "Reboot required" +msgstr "Necessário reiniciar" + +#: ../DistUpgrade/DistUpgradeView.py:68 +msgid "" +"The upgrade is finished now. A reboot is required to now, do you want to do " +"this now?" +msgstr "" +"A actualização terminou agora. É necessário reiniciar, deseja efectuá-lo " +"agora?" + +#. testcode to see if the bullets look nice in the dialog +#. for i in range(4): +#. view.setStep(i+1) +#. app.openCache() +#: ../DistUpgrade/DistUpgrade.glade.h:1 +msgid " " +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:2 +msgid "Restart the system to complete the upgrade" +msgstr "Reinicie o sistema para completar a actualização" + +#: ../DistUpgrade/DistUpgrade.glade.h:3 +msgid "Start the upgrade?" +msgstr "Iniciar a actualização?" + +#: ../DistUpgrade/DistUpgrade.glade.h:4 +msgid "" +"Upgrading to Ubuntu \"Dapper\" 6.04" +msgstr "" +"A actualizar para Ubuntu \"Dapper\" " +"6.04" + +#: ../DistUpgrade/DistUpgrade.glade.h:5 +msgid "Cleaning up" +msgstr "A efectuar limpeza" + +#: ../DistUpgrade/DistUpgrade.glade.h:6 +msgid "Details" +msgstr "Detalhes" + +#: ../DistUpgrade/DistUpgrade.glade.h:7 +msgid "Downloading and installing the upgrades" +msgstr "A efectuar o download e a instalar actualizações" + +#: ../DistUpgrade/DistUpgrade.glade.h:8 +msgid "Modifing the software channels" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:9 +msgid "Preparing the upgrade" +msgstr "A preparar actualização" + +#: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Terminal" +msgstr "Terminal" + +#: ../DistUpgrade/DistUpgrade.glade.h:11 +msgid "Upgrading Ubuntu" +msgstr "A actualizar o Ubuntu" + +#: ../DistUpgrade/DistUpgrade.glade.h:12 +msgid "_Report Bug" +msgstr "_Reportar um erro" + +#: ../DistUpgrade/DistUpgrade.glade.h:13 +msgid "_Restart Now" +msgstr "_Reiniciar agora" + +#, fuzzy +#~ msgid "Sources" +#~ msgstr "Fontes de Software" + +#~ msgid "Components" +#~ msgstr "Componentes" + +#~ msgid "URI:" +#~ msgstr "URI:" + +#~ msgid "APT line:" +#~ msgstr "Linha do APT:" + +#~ msgid "Clean interval in days: " +#~ msgstr "Intervalo de limpeza em dias: " + +#~ msgid "Delete _old packages in the package cache" +#~ msgstr "Excluir pacotes _antigos da cache de pacotes" + +#~ msgid "Your system has broken packages!" +#~ msgstr "O seu sistema tem pacotes quebrados!" + +#~ msgid "Your system is up-to-date!" +#~ msgstr "O seu sistema está actualizado!" + +#~ msgid "Never show this message again" +#~ msgstr "Nunca exibir esta mensagem novamente" + +#~ msgid "Software Properties" +#~ msgstr "Propriedades dos Software" + +#~ msgid "CD" +#~ msgstr "CD" -- cgit v1.2.3 From 979d4cafb3d30920b95dfaf26e204bda408d4591 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 27 Feb 2006 15:16:55 +0100 Subject: * Typos --- DistUpgrade/DistUpgradeView.py | 6 +++--- SoftwareProperties/SoftwareProperties.py | 2 +- data/SoftwareProperties.glade | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py index 4c9103ba..8e9a3d3f 100644 --- a/DistUpgrade/DistUpgradeView.py +++ b/DistUpgrade/DistUpgradeView.py @@ -65,9 +65,9 @@ class DistUpgradeView(object): def confirmRestart(self): " generic ask about the restart, can be overriden " summary = _("Reboot required") - msg = _("The upgrade is finished now. " - "A reboot is required to " - "now, do you want to do this " + msg = _("The upgrade is finished and " + "a reboot is required. " + "Do you want to do this " "now?") return self.askYesNoQuestion(summary, msg) def error(self, summary, msg, extended_msg=None): diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index d5070240..99ec292f 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -534,7 +534,7 @@ class SoftwareProperties(SimpleGladeApp): type=gtk.MESSAGE_ERROR, buttons=gtk.BUTTONS_OK, message_format=None) - dialog.set_markup(_("Error scaning the CD\n\n%s"%msg)) + dialog.set_markup(_("Error scanning the CD\n\n%s"%msg)) res = dialog.run() dialog.destroy() return diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade index 9a5edbeb..5e5c2b7a 100644 --- a/data/SoftwareProperties.glade +++ b/data/SoftwareProperties.glade @@ -424,7 +424,7 @@ True True - _Download updates in the backgound, but do not install them + _Download updates in the background, but do not install them True GTK_RELIEF_NORMAL True -- cgit v1.2.3 From 77b2f46a4079c35ca7a5fc4ff2bb80d57e3ba024 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 27 Feb 2006 16:02:35 +0100 Subject: * show the already enabled components for a given dist if "add" is clicked --- SoftwareProperties/aptsources.py | 2 +- SoftwareProperties/dialog_add.py | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py index 0340e211..0546ef0a 100644 --- a/SoftwareProperties/aptsources.py +++ b/SoftwareProperties/aptsources.py @@ -448,7 +448,7 @@ class SourceCompTemplate: self.on_by_default = on_by_default class SourceEntryTemplates: - def __init__(self,datadir): + def __init__(self, datadir): _ = gettext.gettext self.templates = [] diff --git a/SoftwareProperties/dialog_add.py b/SoftwareProperties/dialog_add.py index a1ac713b..05737769 100644 --- a/SoftwareProperties/dialog_add.py +++ b/SoftwareProperties/dialog_add.py @@ -120,11 +120,26 @@ class dialog_add: a_iter = liststore.iter_nth_child(None, combobox.get_active()) (name, template) = liststore.get(a_iter, 0,1) self.selected = template + + # figure what is currently active in the sources.list + already_enabled_comps = [] + for entry in self.sourceslist: + if entry.disabled or entry.invalid or entry.type != "deb": + continue + if template.dist == entry.dist and \ + self.sourceslist.is_mirror(template.uri, entry.uri): + already_enabled_comps = entry.comps + comps = template.comps self.comps=[] for c in comps: checkbox = gtk.CheckButton(c.description) - checkbox.set_active(c.on_by_default) + # show what should be enabled by default if the source was not found + # else show the already enabled ones + if len(already_enabled_comps) == 0: + checkbox.set_active(c.on_by_default) + else: + checkbox.set_active(c.name in already_enabled_comps) checkbox.set_data("name",c.name) checkbox.connect("toggled", self.count_comps) self.vbox.pack_start(checkbox) @@ -150,7 +165,7 @@ class dialog_add: if res == gtk.RESPONSE_OK: # add repository if self.official == True: - self.selected_comps = [] + #self.selected_comps = [] self.sourceslist.add(self.selected.type, self.selected.uri, self.selected.dist, -- cgit v1.2.3 From 04aed87e0f74aa65f82216706c41085fa539a28f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 27 Feb 2006 17:36:47 +0100 Subject: * fixed the changelog --- debian/changelog | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index ad495326..50eb7a1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,14 @@ update-manager (0.42.2ubuntu6) dapper; urgency=low * SoftwareProperties/*: fix some UI problems (thanks to Sebastian Heinlein) - * debian/control: arch: all now - * po/pt_BR.po: updated translation (thanks to Carlos Eduardo) + * po/pt_BR.po: updated translation + (thanks to Carlos Eduardo Pedroza Santiviago) * po/pt.po: updated Portugise translation (thanks to Rui Azevedo) - Carlos Eduardo Pedroza Santiviago) - * data/gnome-software-properties.desktop.in, update-manager.desktop.in: + * debian/control: arch: all now * debian/rules: undo the detection in favour of the simpler update of the desktop files + * data/gnome-software-properties.desktop.in, update-manager.desktop.in: + - added X-Ubuntu-Gettext-Domain -- Michael Vogt Mon, 20 Feb 2006 15:58:09 +0100 -- cgit v1.2.3 From 160dcc7d66fb94b95932b81787358d3a1b615412 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 27 Feb 2006 17:56:31 +0100 Subject: * don't hide the details for the security upgrades yet --- SoftwareProperties/SoftwareProperties.py | 20 +++++++++++++------- SoftwareProperties/aptsources.py | 4 ++-- debian/changelog | 4 +++- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index 99ec292f..1c6963a0 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -299,11 +299,16 @@ class SoftwareProperties(SimpleGladeApp): """Render a nice output to show the source in a treeview""" (nice_type, nice_dist, nice_comps, special) = self.matcher.match(source) + # FIXME: add this back when it's more consistent + #if special in (aptsources.SOURCE_UPDATES, + # aptsources.SOURCE_BACKPORTS, + # aptsources.SOURCE_SECURITY): + # contents = "%s" % nice_dist + #elif special == aptsources.SOURCE_SYSTEM: if special in (aptsources.SOURCE_UPDATES, - aptsources.SOURCE_BACKPORTS, - aptsources.SOURCE_SECURITY): - contents = "%s" % nice_dist - elif special == aptsources.SOURCE_SYSTEM: + aptsources.SOURCE_BACKPORTS, + aptsources.SOURCE_SECURITY, + aptsources.SOURCE_SYSTEM): contents = "%s" % nice_dist if source.type in ("deb-src", "rpm-src"): contents += " (%s)" % nice_type @@ -319,9 +324,10 @@ class SoftwareProperties(SimpleGladeApp): def reload_sourceslist(self): self.source_store.clear() - if self.sourceslist.check_for_endangered_dists(): - self.button_revert.set_sensitive(True) - self.save_sourceslist() + # FIXME: this happens with way too much magic, we need to either + # ask the user or provide a different way to present this + # )maybe some sort of configuration is enough?) + self.sourceslist.check_for_endangered_dists() for source in self.sourceslist.list: if source.invalid: continue diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py index 0546ef0a..820e6e77 100644 --- a/SoftwareProperties/aptsources.py +++ b/SoftwareProperties/aptsources.py @@ -362,7 +362,7 @@ class SourcesList: self.matcher = SourceEntryMatcher() for source in self.list: - if source.invalid: + if source.invalid or source.type != "deb": continue (nice_type, nice_dist, nice_comps, special) = self.matcher.match(source) #print "match: %s %s" % (source.dist, special) @@ -406,7 +406,7 @@ class SourcesList: comps_sec = set(source.comps) # Are there components without updates? comps_endangered = comps_sys - comps_sec - #print "In Danger: %s " % comps_endangered + #print "In Danger: %s - %s = %s " % (comps_sys, comps_sec, comps_endangered) if len(comps_endangered) > 0: # convert the set into a list comps_write="" diff --git a/debian/changelog b/debian/changelog index 50eb7a1c..e5c87e50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ update-manager (0.42.2ubuntu6) dapper; urgency=low - * SoftwareProperties/*: fix some UI problems (thanks to Sebastian Heinlein) + * SoftwareProperties/: + - fix some UI problems (thanks to Sebastian Heinlein) + - add breezy-updates, breezy-security to the Add dialog * po/pt_BR.po: updated translation (thanks to Carlos Eduardo Pedroza Santiviago) * po/pt.po: updated Portugise translation (thanks to Rui Azevedo) -- cgit v1.2.3 From 4a1c03022c92d3c477c333c1592c888cf216b19d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 27 Feb 2006 18:37:25 +0100 Subject: * UpdateManager/MetaRelease.py, DistUpgradeFetcher: - make the authentication work reliable * DistUpgrade/DistUpgradeViewGtk.py: - exit on fatal uncaught exceptions * SoftwareProperties/SoftwareProperties.py: - fix a indent error when adding gpg keys --- DistUpgrade/DistUpgradeViewGtk.py | 1 + SoftwareProperties/SoftwareProperties.py | 2 +- UpdateManager/DistUpgradeFetcher.py | 48 +++++++++++++++++++++++--------- UpdateManager/MetaRelease.py | 8 ++++-- 4 files changed, 43 insertions(+), 16 deletions(-) diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 7298b31e..2f7e3fed 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -230,6 +230,7 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): "files ~/dist-upgrade.log and ~/dist-upgrade-apt.log " "in your report. The upgrade aborts now. "), "\n".join(lines)) + sys.exit(1) def create_terminal(self, arg1,arg2,arg3,arg4): " helper to create a vte terminal " diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index 1c6963a0..0e892182 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -486,7 +486,7 @@ class SoftwareProperties(SimpleGladeApp): _("Error importing selected file"), _("The selected file may not be a GPG key file " \ "or it might be corrupt.")) - self.reload_keyslist() + self.reload_keyslist() def remove_key_clicked(self, widget): selection = self.treeview2.get_selection() diff --git a/UpdateManager/DistUpgradeFetcher.py b/UpdateManager/DistUpgradeFetcher.py index 7af32865..676f064b 100644 --- a/UpdateManager/DistUpgradeFetcher.py +++ b/UpdateManager/DistUpgradeFetcher.py @@ -91,7 +91,19 @@ class DistUpgradeFetcher(object): return False return True - def authenticate(self, file, signature, keyring='/etc/apt/trusted.gpg'): + def authenticate(self): + if self.new_dist.upgradeToolSig: + f = self.tmpdir+"/"+os.path.basename(self.new_dist.upgradeTool) + sig = self.tmpdir+"/"+os.path.basename(self.new_dist.upgradeToolSig) + print "authenticate '%s' against '%s' " % (f,sig) + if not self.gpgauthenticate(f, sig): + return False + + # we may return False here by default if we want to make a sig + # mandatory + return True + + def gpgauthenticate(self, file, signature, keyring='/etc/apt/trusted.gpg'): """ authenticated a file against a given signature, if no keyring is given use the apt default keyring """ @@ -101,6 +113,7 @@ class DistUpgradeFetcher(object): proc = gpg.run(['--verify', signature, file], create_fhs=['status','logger','stderr']) gpgres = proc.handles['status'].read() + proc.wait() if "VALIDSIG" in gpgres: return True return False @@ -140,23 +153,32 @@ class DistUpgradeFetcher(object): # now download the tarball with the upgrade script self.tmpdir = tmpdir = tempfile.mkdtemp() os.chdir(tmpdir) + + # turn debugging on here (if required) + #apt_pkg.Config.Set("Debug::Acquire::http","1") + + progress = GtkProgress.GtkFetchProgress(self.parent, + _("Downloading the upgrade " + "tool"), + _("The upgrade tool will " + "guide you through the " + "upgrade process.")) + fetcher = apt_pkg.GetAcquire(progress) + + if self.new_dist.upgradeToolSig != None: + uri = self.new_dist.upgradeToolSig + af = apt_pkg.GetPkgAcqFile(fetcher,uri, descr=_("Upgrade tool signature")) if self.new_dist.upgradeTool != None: - progress = GtkProgress.GtkFetchProgress(self.parent, - _("Downloading the upgrade " - "tool"), - _("The upgrade tool will " - "guide you through the " - "upgrade process.")) - fetcher = apt_pkg.GetAcquire(progress) self.uri = self.new_dist.upgradeTool af = apt_pkg.GetPkgAcqFile(fetcher,self.uri, descr=_("Upgrade tool")) if fetcher.Run() != fetcher.ResultContinue: return False return True + return False def runDistUpgrader(self): #print "runing: %s" % script - os.execv(script,[]) + os.execv(self.script,[]) def cleanup(self): # cleanup @@ -185,10 +207,10 @@ class DistUpgradeFetcher(object): print "verify failed" self.cleanup() return - #if not self.authenticate(distUpgradeTar, distUpgradeSig): - # print "authenticate failed" - # self.cleanup() - # return + if not self.authenticate(): + print "authenticate failed" + self.cleanup() + return self.runDistUpgrader() diff --git a/UpdateManager/MetaRelease.py b/UpdateManager/MetaRelease.py index cd56970f..fde705bb 100644 --- a/UpdateManager/MetaRelease.py +++ b/UpdateManager/MetaRelease.py @@ -38,12 +38,13 @@ class Dist(object): self.supported = supported self.releaseNotesURI = None self.upgradeTool = None + self.upgradeToolSig = None class MetaRelease(gobject.GObject): # some constants - #METARELEASE_URI = "http://changelogs.ubuntu.com/meta-release" - METARELEASE_URI = "http://people.ubuntu.com/~mvo/dist-upgrader/meta-release-test.save" + METARELEASE_URI = "http://changelogs.ubuntu.com/meta-release" + #METARELEASE_URI = "http://people.ubuntu.com/~mvo/dist-upgrader/meta-release-test2" METARELEASE_FILE = "/var/lib/update-manager/meta-release" __gsignals__ = { @@ -73,6 +74,7 @@ class MetaRelease(gobject.GObject): if res != 0: sys.stderr.write("lsb_release returned exitcode: %i\n" % res) dist = string.strip(p.stdout.readline()) + #dist = "breezy" return dist def check(self): @@ -107,6 +109,8 @@ class MetaRelease(gobject.GObject): dist.releaseNotesURI = index_tag.Section["ReleaseNotes"] if index_tag.Section.has_key("UpgradeTool"): dist.upgradeTool = index_tag.Section["UpgradeTool"] + if index_tag.Section.has_key("UpgradeToolSignature"): + dist.upgradeToolSig = index_tag.Section["UpgradeToolSignature"] dists.append(dist) if name == current_dist_name: current_dist = dist -- cgit v1.2.3 From 67389517a2f4c58ee03b3ba6ee540df4f8f073f7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 27 Feb 2006 19:27:51 +0100 Subject: * fix the setting of the SoftwareProperties.modified flag (important for the calling apps like synaptic ) --- SoftwareProperties/SoftwareProperties.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index 0e892182..d3fef36a 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -288,12 +288,14 @@ class SoftwareProperties(SimpleGladeApp): self.sourceslist.refresh() self.reload_sourceslist() self.button_revert.set_sensitive(False) + self.modified = False def modified_sourceslist(self): """The sources list was changed and now needs to be saved and reloaded""" self.button_revert.set_sensitive(True) self.save_sourceslist() self.reload_sourceslist() + self.modified = True def render_source(self, source): """Render a nice output to show the source in a treeview""" -- cgit v1.2.3